@hackfed/toolbox 0.1.4 → 0.2.1

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@hackfed/toolbox",
   "description": "Tools for Hackfed Registry",
-  "version": "0.1.4",
+  "version": "0.2.1",
   "bin": {
     "hackfed-toolbox": "src/index.ts"
   },
   "dependencies": {
-    "@hackfed/schemas": "^0.7.0",
+    "@hackfed/schemas": "^0.8.0",
     "commander": "^14.0.2",
     "ipaddr.js": "^2.3.0",
     "tslog": "^4.10.2",
@@ -36,6 +36,6 @@
   },
   "type": "module",
   "scripts": {
-    "lint": "tsc --noEmit && eslint ."
+    "check": "tsc --noEmit && eslint ."
   }
 }

package/src/cmds/check-registry/index.ts

@@ -167,7 +167,6 @@ async function checkTelephonyService (context: CheckServiceContext): Promise<voi
     }
 
     const orgExchanges = new Set<string>()
-    const orgPrefixes = new Set<string>()
 
     if (org.spec.services.telephony.exchanges) {
       for (const exchange of org.spec.services.telephony.exchanges) {
@@ -189,32 +188,14 @@ async function checkTelephonyService (context: CheckServiceContext): Promise<voi
           process.exit(1)
         }
 
-        orgExchanges.add(exchange.id)
-      }
-    }
-
-    if (org.spec.services.telephony.prefixes) {
-      for (const prefix of org.spec.services.telephony.prefixes) {
         // Check for duplicate prefixes across organizations
-        if (prefixes.has(prefix.prefix)) {
-          context.logger.error('(%s) duplicate Telephony prefix found: %s', org.spec.id, prefix.prefix)
+        if (prefixes.has(exchange.prefix)) {
+          context.logger.error('(%s) duplicate Telephony prefix found: %s', org.spec.id, exchange.prefix)
           process.exit(1)
         }
 
-        // Check for duplicate prefixes within organization
-        if (orgPrefixes.has(prefix.prefix)) {
-          context.logger.error('(%s) duplicate Telephony prefix found within organization: %s', org.spec.id, prefix.prefix)
-          process.exit(1)
-        }
-
-        // Verify that referenced exchange exists
-        if (!orgExchanges.has(prefix.exchange)) {
-          context.logger.error('(%s) Telephony prefix references unknown exchange: %s', org.spec.id, prefix.exchange)
-          process.exit(1)
-        }
-
-        prefixes.add(prefix.prefix)
-        orgPrefixes.add(prefix.prefix)
+        prefixes.add(exchange.prefix)
+        orgExchanges.add(exchange.id)
       }
     }
   }

package/src/cmds/generate-telephony/index.ts

@@ -1,6 +1,12 @@
 import type { Command } from 'commander'
 
-import { OrganizationSchema, type TelephonyDirectory, type TelephonyDirectoryExchange, type TelephonyDirectoryOrg } from '@hackfed/schemas/v1'
+import {
+  OrganizationSchema,
+  type TelephonyDirectory,
+  type TelephonyDirectoryExchange,
+  type TelephonyDirectoryOrg,
+  TelephonyDirectorySchema,
+} from '@hackfed/schemas/v1'
 import { Glob, YAML } from 'bun'
 import path from 'node:path'
 import { type Logger } from 'tslog'
@@ -44,14 +50,6 @@ async function generateTelephonyDirectory (
       continue
     }
 
-    // Map prefixes to exchanges
-    const exchangePrefixes = new Map<string, Set<string>>()
-    for (const prefix of org.spec.services.telephony.prefixes ?? []) {
-      const prefixes = exchangePrefixes.get(prefix.exchange) ?? new Set<string>()
-      prefixes.add(prefix.prefix)
-      exchangePrefixes.set(prefix.exchange, prefixes)
-    }
-
     // Map exchanges
     const exchanges = new Map<string, TelephonyDirectoryExchange>()
     for (const exchange of org.spec.services.telephony.exchanges ?? []) {
@@ -59,7 +57,7 @@ async function generateTelephonyDirectory (
         codecs: exchange.codecs,
         endpoint: exchange.address,
         id: exchange.id,
-        prefixes: [...exchangePrefixes.get(exchange.id) ?? []],
+        prefix: exchange.prefix,
         protocol: exchange.protocol
       })
     }
@@ -68,15 +66,15 @@ async function generateTelephonyDirectory (
       exchanges: [...exchanges.values()],
       name: org.spec.name,
       orgId: org.spec.id,
-      phonebooks: org.spec.services.telephony.phonebook ?? []
+      phonebook: org.spec.services.telephony.phonebook,
     })
 
     logger.debug('Added organization: %s (%s)', org.spec.name, org.spec.id)
   }
 
-  const directory: TelephonyDirectory = {
+  const directory = TelephonyDirectorySchema.parse({
     orgs,
-  }
+  } satisfies TelephonyDirectory)
 
   const file = Bun.file(path.resolve(options.output))
   await Bun.write(file, JSON.stringify(directory))