Merge branch 'feat/ipv4-subnet-enh' into chore/all-my-stuffs

# Conflicts:
#	components.d.ts
#	package.json
#	pnpm-lock.yaml
#	src/utils/ip.test.ts

Author: sharevb

pnpm-lock.yaml

@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import { convertBase } from '../integer-base-converter/integer-base-converter.model';
+import { getIPClass } from '../ipv4-subnet-calculator/ipv4-subnet-calculator.models';
 import { ipv4ToInt, ipv4ToIpv6, isValidIpv4 } from './ipv4-address-converter.service';
+import { getIPNetworkType, to6to4Prefix, toARPA, toIPv4MappedAddressDecimal } from '@/utils/ip';
 import { useValidation } from '@/composable/validation';
 
-const rawIpAddress = useStorage('ipv4-converter:ip', '192.168.1.1');
+const rawIpAddress = useStorage('ipv4-converter:ip', '192.168.1.1'); // NOSONAR
 
 const convertedSections = computed(() => {
   const ipInDecimal = ipv4ToInt({ ip: rawIpAddress.value });
@@ -29,6 +31,30 @@ const convertedSections = computed(() => {
       label: 'Ipv6 (short): ',
       value: ipv4ToIpv6({ ip: rawIpAddress.value, prefix: '::ffff:' }),
     },
+    {
+      label: 'Ipv6 (decimal): ',
+      value: toIPv4MappedAddressDecimal(rawIpAddress.value),
+    },
+    {
+      label: '6to4 prefix',
+      value: to6to4Prefix(rawIpAddress.value),
+    },
+    {
+      label: 'CIDR notation',
+      value: `${rawIpAddress.value}/32`,
+    },
+    {
+      label: 'ARPA',
+      value: toARPA(rawIpAddress.value),
+    },
+    {
+      label: 'IP class',
+      value: getIPClass({ ip: rawIpAddress.value }),
+    },
+    {
+      label: 'Type',
+      value: getIPNetworkType(rawIpAddress.value),
+    },
   ];
 });
 

src/tools/ipv4-address-converter/ipv4-address-converter.vue

@@ -6,17 +6,18 @@ import { getIPClass } from './ipv4-subnet-calculator.models';
 import { withDefaultOnError } from '@/utils/defaults';
 import { isNotThrowing } from '@/utils/boolean';
 import SpanCopyable from '@/components/SpanCopyable.vue';
+import { getIPNetworkType, getNetworksCount, getSubnets, parseAsCIDR, to6to4Prefix, toARPA, toIPv4MappedAddress, toIPv4MappedAddressDecimal } from '@/utils/ip';
 
 const ip = useStorage('ipv4-subnet-calculator:ip', '192.168.0.1/24');
 
-const getNetworkInfo = (address: string) => new Netmask(address.trim());
+const getNetworkInfo = (address: string) => new Netmask(parseAsCIDR(address.trim()) || address.trim());
 
 const networkInfo = computed(() => withDefaultOnError(() => getNetworkInfo(ip.value), undefined));
 
 const ipValidationRules = [
   {
     message: 'We cannot parse this address, check the format',
-    validator: (value: string) => isNotThrowing(() => getNetworkInfo(value.trim())),
+    validator: (value: string) => isNotThrowing(() => getNetworkInfo(value)),
   },
 ];
 
@@ -53,6 +54,14 @@ const sections: {
     label: 'Network size',
     getValue: ({ size }) => String(size),
   },
+  {
+    label: 'Subnets count',
+    getValue: ({ base: ip, bitmask }) => getNetworksCount(`${ip}/${bitmask}`)?.toString() || '',
+  },
+  {
+    label: 'Subnets',
+    getValue: ({ base: ip, bitmask }) => getSubnets(`${ip}/${bitmask}`).join(', '),
+  },
   {
     label: 'First address',
     getValue: ({ first }) => first,
@@ -66,11 +75,31 @@ const sections: {
     getValue: ({ broadcast }) => broadcast,
     undefinedFallback: 'No broadcast address with this mask',
   },
+  {
+    label: 'ARPA',
+    getValue: ({ base: ip }) => toARPA(ip),
+  },
+  {
+    label: 'IPv4 Mapped Address',
+    getValue: ({ base: ip }) => toIPv4MappedAddress(ip),
+  },
+  {
+    label: 'IPv4 Mapped Address (decimal)',
+    getValue: ({ base: ip }) => toIPv4MappedAddressDecimal(ip),
+  },
+  {
+    label: '6to4 prefix',
+    getValue: ({ base: ip }) => to6to4Prefix(ip),
+  },
   {
     label: 'IP class',
     getValue: ({ base: ip }) => getIPClass({ ip }),
     undefinedFallback: 'Unknown class type',
   },
+  {
+    label: 'Type',
+    getValue: ({ base: ip }) => getIPNetworkType(ip),
+  },
 ];
 
 function switchToBlock({ count = 1 }: { count?: number }) {
@@ -86,7 +115,7 @@ function switchToBlock({ count = 1 }: { count?: number }) {
   <div>
     <c-input-text
       v-model:value="ip"
-      label="An IPv4 address with or without mask"
+      label="An IPv4 address with or without mask (CIDR/IP Range/Wildcard IP/IP Mask)"
       placeholder="The ipv4 address..."
       :validation-rules="ipValidationRules"
       mb-4