@springfield/ham-radio-api 2.0.0 → 4.0.0

package/dist/radio/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/radio/module.ts"],"names":[],"mappings":"","sourcesContent":["import { RadioDriver } from './driver.js';\nimport { RadioModel } from './model.js';\nimport { RadioSchema } from './schema.js';\n\nexport interface RadioModule {\n  getId(): string;\n  getModels(): RadioModel[];\n  getSchema(modelId: string): Promise<RadioSchema>;\n  getDriver(modelId: string): RadioDriver;\n}\n"]}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/radio/module.ts"],"names":[],"mappings":"","sourcesContent":["import { RadioModelId } from '../branded-types/radio-model-id.js';\nimport { RadioModuleId } from '../branded-types/radio-module-id.js';\nimport { RadioDriver } from './driver.js';\nimport { RadioModel } from './model.js';\nimport { RadioSchema } from './schema.js';\n\nexport interface RadioModule {\n  getId(): RadioModuleId;\n  getModels(): RadioModel[];\n  getSchema(model: RadioModelId): Promise<RadioSchema>;\n  getDriver(model: RadioModelId): RadioDriver;\n}\n"]}

package/dist/radio/program.d.ts

@@ -1,7 +1,8 @@
+import { RadioId } from '../branded-types/radio-id.js';
 import { RadioProgrammedChannel } from './programmed-channel.js';
 import { RadioSettings } from './settings.js';
 export interface RadioProgram {
-    radioId?: string;
+    radio: RadioId;
     settings: RadioSettings;
     channels: RadioProgrammedChannel[];
 }

package/dist/radio/program.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../../src/radio/program.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,aAAa,CAAC;IACxB,QAAQ,EAAE,sBAAsB,EAAE,CAAC;CACpC"}
+{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../../src/radio/program.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,aAAa,CAAC;IACxB,QAAQ,EAAE,sBAAsB,EAAE,CAAC;CACpC"}

package/dist/radio/program.js.map

@@ -1 +1 @@
-{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/radio/program.ts"],"names":[],"mappings":"","sourcesContent":["import { RadioProgrammedChannel } from './programmed-channel.js';\nimport { RadioSettings } from './settings.js';\n\nexport interface RadioProgram {\n  radioId?: string;\n  settings: RadioSettings;\n  channels: RadioProgrammedChannel[];\n}\n"]}
+{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/radio/program.ts"],"names":[],"mappings":"","sourcesContent":["import { RadioId } from '../branded-types/radio-id.js';\nimport { RadioProgrammedChannel } from './programmed-channel.js';\nimport { RadioSettings } from './settings.js';\n\nexport interface RadioProgram {\n  radio: RadioId;\n  settings: RadioSettings;\n  channels: RadioProgrammedChannel[];\n}\n"]}

package/dist/radio/radio.d.ts

@@ -1,6 +1,8 @@
+import { RadioId } from '../branded-types/radio-id.js';
+import { RadioModelId } from '../branded-types/radio-model-id.js';
 export interface Radio {
-    id: string;
+    id: RadioId;
     name: string;
-    modelId: string;
+    model: RadioModelId;
 }
 //# sourceMappingURL=radio.d.ts.map

package/dist/radio/radio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"radio.d.ts","sourceRoot":"","sources":["../../src/radio/radio.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"radio.d.ts","sourceRoot":"","sources":["../../src/radio/radio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,MAAM,WAAW,KAAK;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;CACrB"}

package/dist/radio/radio.js.map

@@ -1 +1 @@
-{"version":3,"file":"radio.js","sourceRoot":"","sources":["../../src/radio/radio.ts"],"names":[],"mappings":"","sourcesContent":["export interface Radio {\n  id: string;\n  name: string;\n  modelId: string;\n}\n"]}
+{"version":3,"file":"radio.js","sourceRoot":"","sources":["../../src/radio/radio.ts"],"names":[],"mappings":"","sourcesContent":["import { RadioId } from '../branded-types/radio-id.js';\nimport { RadioModelId } from '../branded-types/radio-model-id.js';\n\nexport interface Radio {\n  id: RadioId;\n  name: string;\n  model: RadioModelId;\n}\n"]}

package/dist/radio/schema.d.ts

@@ -1,5 +1,6 @@
+import { RadioModelId } from '../branded-types/radio-model-id.js';
 export interface RadioSchema {
-    modelId: string;
+    model: RadioModelId;
     settingsSchema: any;
     channelSchema: any;
 }

package/dist/radio/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/radio/schema.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,GAAG,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC;CACpB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/radio/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,YAAY,CAAC;IACpB,cAAc,EAAE,GAAG,CAAC;IACpB,aAAa,EAAE,GAAG,CAAC;CACpB"}

package/dist/radio/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/radio/schema.ts"],"names":[],"mappings":"","sourcesContent":["export interface RadioSchema {\n  modelId: string;\n  settingsSchema: any;\n  channelSchema: any;\n}\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/radio/schema.ts"],"names":[],"mappings":"","sourcesContent":["import { RadioModelId } from '../branded-types/radio-model-id.js';\n\nexport interface RadioSchema {\n  model: RadioModelId;\n  settingsSchema: any;\n  channelSchema: any;\n}\n"]}

package/dist/radio/tone.d.ts

@@ -1,9 +1,11 @@
+import { CTCSS } from './ctcss.js';
+import { DCS } from './dcs.js';
 export declare enum RadioToneType {
     CTCSS = 0,
     DCS = 1
 }
 export interface RadioTone {
-    tone: number;
+    tone: CTCSS | DCS;
     type: RadioToneType;
 }
 //# sourceMappingURL=tone.d.ts.map

package/dist/radio/tone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tone.d.ts","sourceRoot":"","sources":["../../src/radio/tone.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,KAAK,IAAA;IACL,GAAG,IAAA;CACJ;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC;CACrB"}
+{"version":3,"file":"tone.d.ts","sourceRoot":"","sources":["../../src/radio/tone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAE/B,oBAAY,aAAa;IACvB,KAAK,IAAA;IACL,GAAG,IAAA;CACJ;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,KAAK,GAAG,GAAG,CAAC;IAClB,IAAI,EAAE,aAAa,CAAC;CACrB"}

package/dist/radio/tone.js.map

@@ -1 +1 @@
-{"version":3,"file":"tone.js","sourceRoot":"","sources":["../../src/radio/tone.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,mDAAK,CAAA;IACL,+CAAG,CAAA;AACL,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB","sourcesContent":["export enum RadioToneType {\n  CTCSS,\n  DCS,\n}\n\nexport interface RadioTone {\n  tone: number;\n  type: RadioToneType;\n}\n"]}
+{"version":3,"file":"tone.js","sourceRoot":"","sources":["../../src/radio/tone.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,mDAAK,CAAA;IACL,+CAAG,CAAA;AACL,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB","sourcesContent":["import { CTCSS } from './ctcss.js';\nimport { DCS } from './dcs.js';\n\nexport enum RadioToneType {\n  CTCSS,\n  DCS,\n}\n\nexport interface RadioTone {\n  tone: CTCSS | DCS;\n  type: RadioToneType;\n}\n"]}

package/dist/spectrum/band.d.ts

@@ -1,13 +1,17 @@
+import { Frequency } from '../branded-types/frequency.js';
+import { LicenseClassId } from '../branded-types/license-class-id.js';
+import { SpectrumBandId } from '../branded-types/spectrum-band-id.js';
+import { Wavelength } from '../branded-types/wavelength.js';
 import { SpectrumChannel } from './channel.js';
 export interface SpectrumBand {
-    id?: string;
+    id: SpectrumBandId;
     name: string;
-    wavelength: number;
-    lowerFrequency: number;
-    upperFrequency: number;
+    wavelength: Wavelength;
+    lowerFrequency: Frequency;
+    upperFrequency: Frequency;
     frequencyDisplayBaseMultiplier: number;
     frequencyDisplayNumberDecimals: number;
-    privilegeIds: string[];
+    privileges: LicenseClassId[];
     channels?: SpectrumChannel[];
 }
 //# sourceMappingURL=band.d.ts.map

package/dist/spectrum/band.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"band.d.ts","sourceRoot":"","sources":["../../src/spectrum/band.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,8BAA8B,EAAE,MAAM,CAAC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IACvC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;CAC9B"}
+{"version":3,"file":"band.d.ts","sourceRoot":"","sources":["../../src/spectrum/band.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;IACvB,cAAc,EAAE,SAAS,CAAC;IAC1B,cAAc,EAAE,SAAS,CAAC;IAC1B,8BAA8B,EAAE,MAAM,CAAC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IACvC,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,eAAe,EAAE,CAAC;CAC9B"}

package/dist/spectrum/band.js.map

@@ -1 +1 @@
-{"version":3,"file":"band.js","sourceRoot":"","sources":["../../src/spectrum/band.ts"],"names":[],"mappings":"","sourcesContent":["import { SpectrumChannel } from './channel.js';\n\nexport interface SpectrumBand {\n  id?: string;\n  name: string;\n  wavelength: number;\n  lowerFrequency: number;\n  upperFrequency: number;\n  frequencyDisplayBaseMultiplier: number;\n  frequencyDisplayNumberDecimals: number;\n  privilegeIds: string[];\n  channels?: SpectrumChannel[];\n}\n"]}
+{"version":3,"file":"band.js","sourceRoot":"","sources":["../../src/spectrum/band.ts"],"names":[],"mappings":"","sourcesContent":["import { Frequency } from '../branded-types/frequency.js';\nimport { LicenseClassId } from '../branded-types/license-class-id.js';\nimport { SpectrumBandId } from '../branded-types/spectrum-band-id.js';\nimport { Wavelength } from '../branded-types/wavelength.js';\nimport { SpectrumChannel } from './channel.js';\n\nexport interface SpectrumBand {\n  id: SpectrumBandId;\n  name: string;\n  wavelength: Wavelength;\n  lowerFrequency: Frequency;\n  upperFrequency: Frequency;\n  frequencyDisplayBaseMultiplier: number;\n  frequencyDisplayNumberDecimals: number;\n  privileges: LicenseClassId[];\n  channels?: SpectrumChannel[];\n}\n"]}

package/dist/spectrum/channel.d.ts

@@ -1,5 +1,6 @@
+import { Frequency } from '../branded-types/frequency.js';
 export interface SpectrumChannel {
     name: string;
-    frequency: number;
+    frequency: Frequency;
 }
 //# sourceMappingURL=channel.d.ts.map

package/dist/spectrum/channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/spectrum/channel.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/spectrum/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;CACtB"}

package/dist/spectrum/channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../src/spectrum/channel.ts"],"names":[],"mappings":"","sourcesContent":["export interface SpectrumChannel {\n  name: string;\n  frequency: number;\n}\n"]}
+{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../src/spectrum/channel.ts"],"names":[],"mappings":"","sourcesContent":["import { Frequency } from '../branded-types/frequency.js';\n\nexport interface SpectrumChannel {\n  name: string;\n  frequency: Frequency;\n}\n"]}

package/dist/spectrum/mode.d.ts

@@ -1,5 +1,6 @@
+import { SpectrumModeId } from '../branded-types/spectrum-mode-id.js';
 export interface SpectrumMode {
-    id?: string;
+    id: SpectrumModeId;
     name: string;
 }
 //# sourceMappingURL=mode.d.ts.map

package/dist/spectrum/mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mode.d.ts","sourceRoot":"","sources":["../../src/spectrum/mode.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd"}
+{"version":3,"file":"mode.d.ts","sourceRoot":"","sources":["../../src/spectrum/mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd"}

package/dist/spectrum/mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../src/spectrum/mode.ts"],"names":[],"mappings":"","sourcesContent":["export interface SpectrumMode {\n  id?: string;\n  name: string;\n}\n"]}
+{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../src/spectrum/mode.ts"],"names":[],"mappings":"","sourcesContent":["import { SpectrumModeId } from '../branded-types/spectrum-mode-id.js';\n\nexport interface SpectrumMode {\n  id: SpectrumModeId;\n  name: string;\n}\n"]}

package/dist/spectrum/privilege.d.ts

@@ -1,9 +1,14 @@
+import { Frequency } from '../branded-types/frequency.js';
+import { LicenseClassId } from '../branded-types/license-class-id.js';
+import { SpectrumBandId } from '../branded-types/spectrum-band-id.js';
+import { SpectrumModeId } from '../branded-types/spectrum-mode-id.js';
+import { SpectrumPrivilegeId } from '../branded-types/spectrum-privlege-id.js';
 export interface SpectrumPrivilege {
-    id?: string;
-    licenseClassId: string;
-    modeId: string;
-    bandId: string;
-    lowerFrequency: string;
-    upperFrequency: string;
+    id: SpectrumPrivilegeId;
+    licenseClassId: LicenseClassId;
+    mode: SpectrumModeId;
+    band: SpectrumBandId;
+    lowerFrequency: Frequency;
+    upperFrequency: Frequency;
 }
 //# sourceMappingURL=privilege.d.ts.map

package/dist/spectrum/privilege.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"privilege.d.ts","sourceRoot":"","sources":["../../src/spectrum/privilege.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB"}
+{"version":3,"file":"privilege.d.ts","sourceRoot":"","sources":["../../src/spectrum/privilege.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAE/E,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,mBAAmB,CAAC;IACxB,cAAc,EAAE,cAAc,CAAC;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,cAAc,CAAC;IACrB,cAAc,EAAE,SAAS,CAAC;IAC1B,cAAc,EAAE,SAAS,CAAC;CAC3B"}

package/dist/spectrum/privilege.js.map

@@ -1 +1 @@
-{"version":3,"file":"privilege.js","sourceRoot":"","sources":["../../src/spectrum/privilege.ts"],"names":[],"mappings":"","sourcesContent":["export interface SpectrumPrivilege {\n  id?: string;\n  licenseClassId: string;\n  modeId: string;\n  bandId: string;\n  lowerFrequency: string;\n  upperFrequency: string;\n}\n"]}
+{"version":3,"file":"privilege.js","sourceRoot":"","sources":["../../src/spectrum/privilege.ts"],"names":[],"mappings":"","sourcesContent":["import { Frequency } from '../branded-types/frequency.js';\nimport { LicenseClassId } from '../branded-types/license-class-id.js';\nimport { SpectrumBandId } from '../branded-types/spectrum-band-id.js';\nimport { SpectrumModeId } from '../branded-types/spectrum-mode-id.js';\nimport { SpectrumPrivilegeId } from '../branded-types/spectrum-privlege-id.js';\n\nexport interface SpectrumPrivilege {\n  id: SpectrumPrivilegeId;\n  licenseClassId: LicenseClassId;\n  mode: SpectrumModeId;\n  band: SpectrumBandId;\n  lowerFrequency: Frequency;\n  upperFrequency: Frequency;\n}\n"]}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@springfield/ham-radio-api",
-  "version": "2.0.0",
+  "version": "4.0.0",
   "author": "Bryan Hunt",
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.8.1",
   "main": "dist/index.js",
   "type": "module",
   "types": "dist/index.d.ts",
@@ -47,14 +47,17 @@
     "access": "public"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.6.0",
-    "@commitlint/config-conventional": "19.6.0",
+    "@commitlint/cli": "19.8.0",
+    "@commitlint/config-conventional": "19.8.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/gitlab": "13.2.1",
+    "@semantic-release/gitlab": "13.2.4",
     "husky": "9.1.7",
     "semantic-release": "23.1.1",
     "semantic-release-yarn": "3.0.2",
-    "typescript": "5.7.2"
+    "typescript": "5.8.2"
+  },
+  "dependencies": {
+    "ts-brand": "^0.2.0"
   }
 }

package/src/branded-types/frequency.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type Frequency = Brand<number, 'frequency'>;
+export const Frequency = make<Frequency>();

package/src/branded-types/license-class-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type LicenseClassId = Brand<number, 'license-class-id'>;
+export const LicenseClassId = make<LicenseClassId>();

package/src/branded-types/radio-channel-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type RadioChannelId = Brand<number, 'radio-channel-id'>;
+export const RadioChannelId = make<RadioChannelId>();

package/src/branded-types/radio-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type RadioId = Brand<number, 'radio-id'>;
+export const RadioId = make<RadioId>();

package/src/branded-types/radio-model-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type RadioModelId = Brand<number, 'radio-model-id'>;
+export const RadioModelId = make<RadioModelId>();

package/src/branded-types/radio-module-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type RadioModuleId = Brand<number, 'radio-module-id'>;
+export const RadioModuleId = make<RadioModuleId>();

package/src/branded-types/spectrum-band-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type SpectrumBandId = Brand<number, 'spectrum-band-id'>;
+export const SpectrumBandId = make<SpectrumBandId>();

package/src/branded-types/spectrum-mode-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type SpectrumModeId = Brand<number, 'spectrum-mode-id'>;
+export const SpectrumModeId = make<SpectrumModeId>();

package/src/branded-types/spectrum-privlege-id.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type SpectrumPrivilegeId = Brand<number, 'spectrum-privilege-id'>;
+export const SpectrumPrivilegeId = make<SpectrumPrivilegeId>();

package/src/branded-types/wavelength.ts

@@ -0,0 +1,4 @@
+import { Brand, make } from 'ts-brand';
+
+export type Wavelength = Brand<number, 'wavelength'>;
+export const Wavelength = make<Wavelength>();

package/src/index.ts

@@ -1,8 +1,21 @@
+export * from './branded-types/frequency.js';
+export * from './branded-types/license-class-id.js';
+export * from './branded-types/radio-channel-id.js';
+export * from './branded-types/radio-id.js';
+export * from './branded-types/radio-model-id.js';
+export * from './branded-types/radio-module-id.js';
+export * from './branded-types/spectrum-band-id.js';
+export * from './branded-types/spectrum-mode-id.js';
+export * from './branded-types/spectrum-privlege-id.js';
+export * from './branded-types/wavelength.js';
+
 export * from './license/class.js';
 
 export * from './radio/channel.js';
 export * from './radio/codec.js';
 export * from './radio/connection.js';
+export * from './radio/ctcss.js';
+export * from './radio/dcs.js';
 export * from './radio/driver.js';
 export * from './radio/memory.js';
 export * from './radio/model.js';
@@ -18,4 +31,4 @@ export * from './radio/tone.js';
 export * from './spectrum/band.js';
 export * from './spectrum/channel.js';
 export * from './spectrum/mode.js';
-export * from './spectrum/privilege.js'
+export * from './spectrum/privilege.js';

package/src/license/class.ts

@@ -1,4 +1,6 @@
+import { LicenseClassId } from '../branded-types/license-class-id.js';
+
 export interface LicenseClass {
-  id?: string;
+  id: LicenseClassId;
   name: string;
 }

package/src/radio/channel.ts

@@ -1,10 +1,12 @@
+import { Frequency } from '../branded-types/frequency.js';
+import { RadioChannelId } from '../branded-types/radio-channel-id.js';
 import { RadioTone } from './tone.js';
 
 export interface RadioChannel {
-  id?: string;
+  id?: RadioChannelId;
   name?: string;
-  transmitFrequency: number;
-  receiveFrequency: number;
+  transmitFrequency: Frequency;
+  receiveFrequency: Frequency;
   transmitTone: RadioTone;
   receiveTone: RadioTone;
 }

package/src/radio/connection.ts

@@ -1,4 +1,6 @@
+import { RadioModel } from './model.js';
+
 export interface RadioConnection {
   serialPortPath: string;
-  modelId: string;
+  model: RadioModel;
 }

package/src/radio/ctcss.ts

@@ -0,0 +1,40 @@
+export enum CTCSS {
+  TONE_67_0 = '67.0 Hz',
+  TONE_69_3 = '69.3 Hz',
+  TONE_71_9 = '71.9 Hz',
+  TONE_74_4 = '74.4 Hz',
+  TONE_77_0 = '77.0 Hz',
+  TONE_79_7 = '79.7 Hz',
+  TONE_82_5 = '82.5 Hz',
+  TONE_85_4 = '85.4 Hz',
+  TONE_88_5 = '88.5 Hz',
+  TONE_91_5 = '91.5 Hz',
+  TONE_94_8 = '94.8 Hz',
+  TONE_97_4 = '97.4 Hz',
+  TONE_100_0 = '100.0 Hz',
+  TONE_103_5 = '103.5 Hz',
+  TONE_107_2 = '107.2 Hz',
+  TONE_110_9 = '110.9 Hz',
+  TONE_114_8 = '114.8 Hz',
+  TONE_118_8 = '118.8 Hz',
+  TONE_123_0 = '123.0 Hz',
+  TONE_127_3 = '127.3 Hz',
+  TONE_131_8 = '131.8 Hz',
+  TONE_136_5 = '136.5 Hz',
+  TONE_141_3 = '141.3 Hz',
+  TONE_146_2 = '146.2 Hz',
+  TONE_151_4 = '151.4 Hz',
+  TONE_156_7 = '156.7 Hz',
+  TONE_162_2 = '162.2 Hz',
+  TONE_167_9 = '167.9 Hz',
+  TONE_173_8 = '173.8 Hz',
+  TONE_179_9 = '179.9 Hz',
+  TONE_186_2 = '186.2 Hz',
+  TONE_192_8 = '192.8 Hz',
+  TONE_203_5 = '203.5 Hz',
+  TONE_210_7 = '210.7 Hz',
+  TONE_218_1 = '218.1 Hz',
+  TONE_225_7 = '225.7 Hz',
+  TONE_233_6 = '233.6 Hz',
+  TONE_241_8 = '241.8 Hz',
+}

package/src/radio/dcs.ts

@@ -0,0 +1,31 @@
+export enum DCS {
+  D023 = '023',
+  D025 = '025',
+  D026 = '026',
+  D031 = '031',
+  D032 = '032',
+  D036 = '036',
+  D043 = '043',
+  D047 = '047',
+  D051 = '051',
+  D053 = '053',
+  D065 = '065',
+  D071 = '071',
+  D072 = '072',
+  D073 = '073',
+  D074 = '074',
+  D114 = '114',
+  D115 = '115',
+  D116 = '116',
+  D125 = '125',
+  D131 = '131',
+  D132 = '132',
+  D134 = '134',
+  D143 = '143',
+  D145 = '145',
+  D152 = '152',
+  D155 = '155',
+  D156 = '156',
+  D162 = '162',
+  D165 = '165',
+}

package/src/radio/memory.ts

@@ -1,4 +1,6 @@
+import { RadioModelId } from '../branded-types/radio-model-id.js';
+
 export interface RadioMemory {
-  radioModelId: string;
+  radioModel: RadioModelId;
   contents: any;
 }

package/src/radio/model.ts

@@ -1,6 +1,9 @@
+import { RadioModelId } from '../branded-types/radio-model-id.js';
+import { RadioModuleId } from '../branded-types/radio-module-id.js';
+
 export interface RadioModel {
-  id: string;
-  moduleId: string;
+  id: RadioModelId;
+  module: RadioModuleId;
   name: string;
   manufacturer: string;
 }

package/src/radio/module.ts

@@ -1,10 +1,12 @@
+import { RadioModelId } from '../branded-types/radio-model-id.js';
+import { RadioModuleId } from '../branded-types/radio-module-id.js';
 import { RadioDriver } from './driver.js';
 import { RadioModel } from './model.js';
 import { RadioSchema } from './schema.js';
 
 export interface RadioModule {
-  getId(): string;
+  getId(): RadioModuleId;
   getModels(): RadioModel[];
-  getSchema(modelId: string): Promise<RadioSchema>;
-  getDriver(modelId: string): RadioDriver;
+  getSchema(model: RadioModelId): Promise<RadioSchema>;
+  getDriver(model: RadioModelId): RadioDriver;
 }

package/src/radio/program.ts

@@ -1,8 +1,9 @@
+import { RadioId } from '../branded-types/radio-id.js';
 import { RadioProgrammedChannel } from './programmed-channel.js';
 import { RadioSettings } from './settings.js';
 
 export interface RadioProgram {
-  radioId?: string;
+  radio: RadioId;
   settings: RadioSettings;
   channels: RadioProgrammedChannel[];
 }

package/src/radio/radio.ts

@@ -1,5 +1,8 @@
+import { RadioId } from '../branded-types/radio-id.js';
+import { RadioModelId } from '../branded-types/radio-model-id.js';
+
 export interface Radio {
-  id: string;
+  id: RadioId;
   name: string;
-  modelId: string;
+  model: RadioModelId;
 }

package/src/radio/schema.ts

@@ -1,5 +1,7 @@
+import { RadioModelId } from '../branded-types/radio-model-id.js';
+
 export interface RadioSchema {
-  modelId: string;
+  model: RadioModelId;
   settingsSchema: any;
   channelSchema: any;
 }

package/src/radio/tone.ts

@@ -1,9 +1,12 @@
+import { CTCSS } from './ctcss.js';
+import { DCS } from './dcs.js';
+
 export enum RadioToneType {
   CTCSS,
   DCS,
 }
 
 export interface RadioTone {
-  tone: number;
+  tone: CTCSS | DCS;
   type: RadioToneType;
 }

package/src/spectrum/band.ts

@@ -1,13 +1,17 @@
+import { Frequency } from '../branded-types/frequency.js';
+import { LicenseClassId } from '../branded-types/license-class-id.js';
+import { SpectrumBandId } from '../branded-types/spectrum-band-id.js';
+import { Wavelength } from '../branded-types/wavelength.js';
 import { SpectrumChannel } from './channel.js';
 
 export interface SpectrumBand {
-  id?: string;
+  id: SpectrumBandId;
   name: string;
-  wavelength: number;
-  lowerFrequency: number;
-  upperFrequency: number;
+  wavelength: Wavelength;
+  lowerFrequency: Frequency;
+  upperFrequency: Frequency;
   frequencyDisplayBaseMultiplier: number;
   frequencyDisplayNumberDecimals: number;
-  privilegeIds: string[];
+  privileges: LicenseClassId[];
   channels?: SpectrumChannel[];
 }

package/src/spectrum/channel.ts

@@ -1,4 +1,6 @@
+import { Frequency } from '../branded-types/frequency.js';
+
 export interface SpectrumChannel {
   name: string;
-  frequency: number;
+  frequency: Frequency;
 }

package/src/spectrum/mode.ts

@@ -1,4 +1,6 @@
+import { SpectrumModeId } from '../branded-types/spectrum-mode-id.js';
+
 export interface SpectrumMode {
-  id?: string;
+  id: SpectrumModeId;
   name: string;
 }

package/src/spectrum/privilege.ts

@@ -1,8 +1,14 @@
+import { Frequency } from '../branded-types/frequency.js';
+import { LicenseClassId } from '../branded-types/license-class-id.js';
+import { SpectrumBandId } from '../branded-types/spectrum-band-id.js';
+import { SpectrumModeId } from '../branded-types/spectrum-mode-id.js';
+import { SpectrumPrivilegeId } from '../branded-types/spectrum-privlege-id.js';
+
 export interface SpectrumPrivilege {
-  id?: string;
-  licenseClassId: string;
-  modeId: string;
-  bandId: string;
-  lowerFrequency: string;
-  upperFrequency: string;
+  id: SpectrumPrivilegeId;
+  licenseClassId: LicenseClassId;
+  mode: SpectrumModeId;
+  band: SpectrumBandId;
+  lowerFrequency: Frequency;
+  upperFrequency: Frequency;
 }

package/src/brand.ts

@@ -1,3 +0,0 @@
-declare const brand: unique symbol;
-
-export type Brand<T, TBrand extends string> = T & { [brand]: TBrand };