@hello.nrfcloud.com/proto-map 8.1.1 → 9.0.0

package/lwm2m/object/14205.d.ts

@@ -25,8 +25,7 @@ export type Environment_14205 = LwM2MObject<{
          * Humidity (%)
          *
          * Environmental humidity in percent. Examples: 44.2, 72.
-         */
-        /**
+         *
          * Minimum: 0
          * Maximum: 100
          */

package/lwm2m/object/14240.d.ts

@@ -13,8 +13,7 @@ export type RGBLED_14240 = LwM2MObject<{
          * Red
          *
          * The red brightness level of the LED.
-         */
-        /**
+         *
          * Minimum: 0
          * Maximum: 255
          */
@@ -23,8 +22,7 @@ export type RGBLED_14240 = LwM2MObject<{
          * Green
          *
          * The green brightness level of the LED.
-         */
-        /**
+         *
          * Minimum: 0
          * Maximum: 255
          */
@@ -33,8 +31,7 @@ export type RGBLED_14240 = LwM2MObject<{
          * Blue
          *
          * The blue brightness level of the LED.
-         */
-        /**
+         *
          * Minimum: 0
          * Maximum: 255
          */

package/lwm2m/object/validate14201.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { NumberResource, StringResource, DateResource, OptionalResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { NumberResource, StringResource, DateResource, OptionalResource, validateInstance } from "../validation.js";
 import type { Geolocation_14201 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14201.xml.
  */
-export const validate14201 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<Geolocation_14201> => validate(LwM2MObjectID.Geolocation_14201, "1.0", { 0: NumberResource, 1: NumberResource, 6: StringResource, 99: DateResource, 2: OptionalResource(NumberResource), 3: OptionalResource(NumberResource), 4: OptionalResource(NumberResource), 5: OptionalResource(NumberResource) })(o, onError);
+export const validate14201 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<Geolocation_14201>;
+} => validateInstance<Geolocation_14201>(LwM2MObjectID.Geolocation_14201, "1.0", { 0: NumberResource, 1: NumberResource, 6: StringResource, 99: DateResource, 2: OptionalResource(NumberResource), 3: OptionalResource(NumberResource), 4: OptionalResource(NumberResource), 5: OptionalResource(NumberResource) })(o);

package/lwm2m/object/validate14202.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { DateResource, NumberResource, OptionalResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { DateResource, NumberResource, OptionalResource, validateInstance } from "../validation.js";
 import type { BatteryAndPower_14202 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14202.xml.
  */
-export const validate14202 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<BatteryAndPower_14202> => validate(LwM2MObjectID.BatteryAndPower_14202, "1.0", { 99: DateResource, 0: OptionalResource(NumberResource), 1: OptionalResource(NumberResource), 2: OptionalResource(NumberResource), 3: OptionalResource(NumberResource), 4: OptionalResource(NumberResource), 5: OptionalResource(NumberResource) })(o, onError);
+export const validate14202 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<BatteryAndPower_14202>;
+} => validateInstance<BatteryAndPower_14202>(LwM2MObjectID.BatteryAndPower_14202, "1.0", { 99: DateResource, 0: OptionalResource(NumberResource), 1: OptionalResource(NumberResource), 2: OptionalResource(NumberResource), 3: OptionalResource(NumberResource), 4: OptionalResource(NumberResource), 5: OptionalResource(NumberResource) })(o);

package/lwm2m/object/validate14203.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { DateResource, StringResource, OptionalResource, NumberResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { DateResource, StringResource, OptionalResource, NumberResource, validateInstance } from "../validation.js";
 import type { ConnectionInformation_14203 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14203.xml.
  */
-export const validate14203 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<ConnectionInformation_14203> => validate(LwM2MObjectID.ConnectionInformation_14203, "1.0", { 99: DateResource, 0: OptionalResource(StringResource), 1: OptionalResource(NumberResource), 2: OptionalResource(NumberResource), 3: OptionalResource(NumberResource), 4: OptionalResource(NumberResource), 5: OptionalResource(NumberResource), 6: OptionalResource(StringResource), 11: OptionalResource(NumberResource) })(o, onError);
+export const validate14203 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<ConnectionInformation_14203>;
+} => validateInstance<ConnectionInformation_14203>(LwM2MObjectID.ConnectionInformation_14203, "1.0", { 99: DateResource, 0: OptionalResource(StringResource), 1: OptionalResource(NumberResource), 2: OptionalResource(NumberResource), 3: OptionalResource(NumberResource), 4: OptionalResource(NumberResource), 5: OptionalResource(NumberResource), 6: OptionalResource(StringResource), 11: OptionalResource(NumberResource) })(o);

package/lwm2m/object/validate14204.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { StringResource, DateResource, OptionalResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { StringResource, DateResource, OptionalResource, validateInstance } from "../validation.js";
 import type { DeviceInformation_14204 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14204.xml.
  */
-export const validate14204 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<DeviceInformation_14204> => validate(LwM2MObjectID.DeviceInformation_14204, "1.0", { 0: StringResource, 2: StringResource, 3: StringResource, 4: StringResource, 99: DateResource, 1: OptionalResource(StringResource), 5: OptionalResource(StringResource) })(o, onError);
+export const validate14204 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<DeviceInformation_14204>;
+} => validateInstance<DeviceInformation_14204>(LwM2MObjectID.DeviceInformation_14204, "1.0", { 0: StringResource, 2: StringResource, 3: StringResource, 4: StringResource, 99: DateResource, 1: OptionalResource(StringResource), 5: OptionalResource(StringResource) })(o);

package/lwm2m/object/validate14205.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { DateResource, NumberResource, OptionalResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { DateResource, NumberResource, OptionalResource, validateInstance } from "../validation.js";
 import type { Environment_14205 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14205.xml.
  */
-export const validate14205 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<Environment_14205> => validate(LwM2MObjectID.Environment_14205, "1.0", { 99: DateResource, 0: OptionalResource(NumberResource), 1: OptionalResource(NumberResource), 2: OptionalResource(NumberResource), 10: OptionalResource(NumberResource) })(o, onError);
+export const validate14205 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<Environment_14205>;
+} => validateInstance<Environment_14205>(LwM2MObjectID.Environment_14205, "1.0", { 99: DateResource, 0: OptionalResource(NumberResource), 1: OptionalResource(NumberResource), 2: OptionalResource(NumberResource), 10: OptionalResource(NumberResource) })(o);

package/lwm2m/object/validate14210.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { NumberResource, DateResource, OptionalResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { NumberResource, DateResource, OptionalResource, validateInstance } from "../validation.js";
 import type { SolarCharge_14210 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14210.xml.
  */
-export const validate14210 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<SolarCharge_14210> => validate(LwM2MObjectID.SolarCharge_14210, "1.0", { 0: NumberResource, 99: DateResource, 1: OptionalResource(NumberResource) })(o, onError);
+export const validate14210 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<SolarCharge_14210>;
+} => validateInstance<SolarCharge_14210>(LwM2MObjectID.SolarCharge_14210, "1.0", { 0: NumberResource, 99: DateResource, 1: OptionalResource(NumberResource) })(o);

package/lwm2m/object/validate14220.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { NumberResource, DateResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { NumberResource, DateResource, validateInstance } from "../validation.js";
 import type { ButtonPress_14220 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14220.xml.
  */
-export const validate14220 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<ButtonPress_14220> => validate(LwM2MObjectID.ButtonPress_14220, "1.0", { 0: NumberResource, 99: DateResource })(o, onError);
+export const validate14220 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<ButtonPress_14220>;
+} => validateInstance<ButtonPress_14220>(LwM2MObjectID.ButtonPress_14220, "1.0", { 0: NumberResource, 99: DateResource })(o);

package/lwm2m/object/validate14230.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { NumberResource, StringResource, DateResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { NumberResource, StringResource, DateResource, validateInstance } from "../validation.js";
 import type { SeaWaterLevel_14230 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14230.xml.
  */
-export const validate14230 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<SeaWaterLevel_14230> => validate(LwM2MObjectID.SeaWaterLevel_14230, "1.0", { 0: NumberResource, 1: StringResource, 99: DateResource })(o, onError);
+export const validate14230 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<SeaWaterLevel_14230>;
+} => validateInstance<SeaWaterLevel_14230>(LwM2MObjectID.SeaWaterLevel_14230, "1.0", { 0: NumberResource, 1: StringResource, 99: DateResource })(o);

package/lwm2m/object/validate14240.ts

@@ -1,5 +1,5 @@
-import type { LwM2MObject } from "../LwM2MObject.js";
-import { NumberResource, DateResource, validate } from "../validation.js";
+import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
+import { NumberResource, DateResource, validateInstance } from "../validation.js";
 import type { RGBLED_14240 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -7,4 +7,8 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  *
  * Ensures the given object is an LwM2M object according to the schema 14240.xml.
  */
-export const validate14240 = (o: unknown, onError?: (error: Error) => void): o is LwM2MObject<RGBLED_14240> => validate(LwM2MObjectID.RGBLED_14240, "1.0", { 0: NumberResource, 1: NumberResource, 2: NumberResource, 99: DateResource })(o, onError);
+export const validate14240 = (o: unknown): {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance<RGBLED_14240>;
+} => validateInstance<RGBLED_14240>(LwM2MObjectID.RGBLED_14240, "1.0", { 0: NumberResource, 1: NumberResource, 2: NumberResource, 99: DateResource })(o);

package/lwm2m/validate.spec.ts

@@ -0,0 +1,29 @@
+import { describe, it } from 'node:test'
+import { validate } from './validate.js'
+import { validators } from './validators.js'
+import { LwM2MObjectID } from './LwM2MObjectID.js'
+import assert from 'node:assert'
+
+void describe('validate()', () => {
+	const v = validate(validators)
+	void it('should validate a LwM2M object instance', () => {
+		const object = {
+			ObjectID: LwM2MObjectID.Geolocation_14201,
+			ObjectVersion: '1.0',
+			Resources: {
+				'0': 62.469414,
+				'1': 6.151946,
+				'6': 'Fixed',
+				'3': 1,
+				'99': new Date(1710147413003),
+			},
+		}
+		const maybeValid = v(object)
+		assert.deepEqual('object' in maybeValid && maybeValid.object, object)
+	})
+
+	void it('should return an error for an invalid object', () => {
+		const maybeValid = v({})
+		assert.equal('error' in maybeValid, true)
+	})
+})

package/lwm2m/validate.ts

@@ -1,30 +1,23 @@
-import type { LwM2MObject } from './LwM2MObject.js'
-import { isLwM2MObject } from './validation.js'
+import type { LwM2MObjectInstance } from './LwM2MObjectInstance.js'
 import { LwM2MObjectID } from './LwM2MObjectID.js'
-import type { LwM2MResourceValue } from '../senml/senMLtoLwM2M.js'
+import { isLwM2MObject } from './validation.js'
 
 export const validate =
 	(
 		validators: Map<
 			LwM2MObjectID,
-			(o: unknown, onError?: (error: Error) => void) => boolean
+			(o: unknown) => { object: LwM2MObjectInstance } | { error: Error }
 		>,
 	) =>
-	(
-		o: unknown,
-		onError?: (error: Error) => void,
-	): o is LwM2MObject<{
-		ObjectID: LwM2MObjectID
-		ObjectVersion: string
-		Resources: Record<number, LwM2MResourceValue | undefined>
-	}> => {
-		if (!isLwM2MObject(o, onError)) {
-			return false
-		}
-		const validator = validators.get(o.ObjectID)
+	(o: unknown): { object: LwM2MObjectInstance } | { error: Error } => {
+		const maybeValidInstance = isLwM2MObject(o)
+		if ('error' in maybeValidInstance) return maybeValidInstance
+		const i = maybeValidInstance.object
+		const validator = validators.get(i.ObjectID)
 		if (validator === undefined) {
-			onError?.(new Error(`No validator defined for ObjectID: ${o.ObjectID}!`))
-			return false
+			return {
+				error: new Error(`No validator defined for ObjectID: ${i.ObjectID}!`),
+			}
 		}
-		return validator(o, onError)
+		return validator(o)
 	}

package/lwm2m/validation.ts

@@ -1,25 +1,10 @@
-import type { LwM2MResourceValue } from '../senml/senMLtoLwM2M.js'
+import type { LwM2MObjectInstance } from './LwM2MObjectInstance.js'
 import { LwM2MObjectIDs, type LwM2MObjectID } from './LwM2MObjectID.js'
 
 export const isLwM2MObject = (
 	object: unknown,
-	onError?: (error: Error) => void,
-): object is {
-	ObjectID: LwM2MObjectID
-	/**
-	 * The Object Version of an Object is composed of 2 digits separated by a dot '.'
-	 *
-	 * @see https://www.openmobilealliance.org/release/LightweightM2M/V1_1_1-20190617-A/OMA-TS-LightweightM2M_Core-V1_1_1-20190617-A.pdf Section 7.2.2
-	 *
-	 * @default 1.0
-	 */
-	ObjectVersion?: string
-	Resources: Record<number, LwM2MResourceValue>
-} => {
-	const error = (message: string) => {
-		onError?.(new Error(message))
-		return false
-	}
+): { object: LwM2MObjectInstance } | { error: Error } => {
+	const error = (message: string) => ({ error: new Error(message) })
 	// Must be an object
 	if (typeof object !== 'object' || object === null)
 		return error(`Not an object`)
@@ -42,6 +27,14 @@ export const isLwM2MObject = (
 		)
 			return error(`Invalid ObjectVersion`)
 	}
+	// ObjectInstanceID must be valid
+	if ('ObjectInstanceID' in object) {
+		if (
+			typeof object.ObjectInstanceID !== 'number' ||
+			object.ObjectInstanceID < 0
+		)
+			return error(`Invalid ObjectInstanceID`)
+	}
 	// Must have valid resources
 	if (
 		!('Resources' in object) ||
@@ -63,39 +56,37 @@ export const isLwM2MObject = (
 		if (typeof v === 'object' && v instanceof Date) continue
 		return error(`Invalid value type ${typeof v}`)
 	}
-	return true
+	return { object: object as LwM2MObjectInstance }
 }
 
-export const validate =
-	(
+export const validateInstance =
+	<O extends LwM2MObjectInstance>(
 		ObjectID: LwM2MObjectID,
 		ObjectVersion: string,
 		Resources: Record<number, (r: unknown) => boolean>,
 	) =>
-	(o: unknown, onError?: (error: Error) => void): boolean => {
-		const error = (message: string) => {
-			onError?.(new Error(message))
-			return false
-		}
-		if (!isLwM2MObject(o, onError)) return false
-		if (o.ObjectID !== ObjectID)
+	(o: unknown): { object: LwM2MObjectInstance<O> } | { error: Error } => {
+		const error = (message: string) => ({ error: new Error(message) })
+		const maybeValidLwM2MObject = isLwM2MObject(o)
+		if ('error' in maybeValidLwM2MObject) return maybeValidLwM2MObject
+		const i = maybeValidLwM2MObject.object
+		if (i.ObjectID !== ObjectID) {
 			return error(
-				`Given Object ID ${o.ObjectID} does not match expected ${ObjectID}`,
+				`Given Object ID ${i.ObjectID} does not match expected ${ObjectID}`,
 			)
-		if ((o.ObjectVersion ?? '1.0') !== ObjectVersion)
+		}
+		if ((i.ObjectVersion ?? '1.0') !== ObjectVersion) {
 			return error(
-				`Given Object version ${o.ObjectVersion} does not match expected ${ObjectVersion}`,
+				`Given Object version ${i.ObjectVersion} does not match expected ${ObjectVersion}`,
 			)
-		return Object.entries(Resources).reduce(
-			(allValid, [ResourceID, validator]) => {
-				if (!allValid) return false
-				if (validator(o.Resources[parseInt(ResourceID, 10)]) === false) {
-					return error(`Resource ${ResourceID} is invalid.`)
-				}
-				return allValid
-			},
-			true,
-		)
+		}
+
+		for (const [ResourceID, validator] of Object.entries(Resources)) {
+			if (validator(i.Resources[parseInt(ResourceID, 10)]) === false) {
+				return error(`Resource ${ResourceID} is invalid.`)
+			}
+		}
+		return { object: o as LwM2MObjectInstance<O> }
 	}
 
 export const NumberResource = (r: unknown): r is number => typeof r === 'number'

package/lwm2m/validators.ts

@@ -1,4 +1,5 @@
 import { LwM2MObjectID } from "./LwM2MObjectID.js";
+import type { LwM2MObjectInstance } from "./LwM2MObjectInstance.js";
 import { validate14201 } from "./object/validate14201.js";
 import { validate14202 } from "./object/validate14202.js";
 import { validate14203 } from "./object/validate14203.js";
@@ -11,7 +12,11 @@ import { validate14240 } from "./object/validate14240.js";
 /**
  * Contains the validators for all registered LwM2M objects.
  */
-export const validators = new Map<LwM2MObjectID, (o: unknown) => boolean>();
+export const validators = new Map<LwM2MObjectID, (o: unknown) => {
+    error: Error;
+} | {
+    object: LwM2MObjectInstance;
+}>();
 validators.set(LwM2MObjectID.Geolocation_14201, validate14201)
 validators.set(LwM2MObjectID.BatteryAndPower_14202, validate14202)
 validators.set(LwM2MObjectID.ConnectionInformation_14203, validate14203)

package/models/index.ts

@@ -0,0 +1,2 @@
+export * from './models.js'
+export * from './types.js'

package/models/models.ts

@@ -2,7 +2,8 @@
  * The Model IDs defined in this repo.
  */
 export enum ModelID {
-    Kartverket_vasstandsdata = "kartverket-vasstandsdata"
+    Kartverket_vasstandsdata = "kartverket-vasstandsdata",
+    Thingy91x = "thingy91x"
 }
 export type Model = {
     /**
@@ -26,4 +27,4 @@ export type Model = {
 /**
  * The models defined for hello.nrfcloud.com
  */
-export const models: Readonly<Record<ModelID, Model>> = { [ModelID.Kartverket_vasstandsdata]: { "id": ModelID.Kartverket_vasstandsdata, "about": { "title": "Kartverket Vasstandsdata", "description": "A simulated device reporting the current sea level as provided by the Kartverket's (Norwegian Mapping Authority) API for vasstandsdata (API for water level data).\nReports sea water level using the Object 14230.\nThe data is licensed by the Norwegian Mapping Authority\u2019s under the Creative Commons Attribution 4.0 International (CC BY 4.0) license." } } } as const;
+export const models: Readonly<Record<ModelID, Model>> = { [ModelID.Kartverket_vasstandsdata]: { "id": ModelID.Kartverket_vasstandsdata, "about": { "title": "Kartverket Vasstandsdata", "description": "A simulated device reporting the current sea level as provided by the Kartverket's (Norwegian Mapping Authority) API for vasstandsdata (API for water level data).\nReports sea water level using the Object 14230.\nThe data is licensed by the Norwegian Mapping Authority\u2019s under the Creative Commons Attribution 4.0 International (CC BY 4.0) license." } }, [ModelID.Thingy91x]: { "id": ModelID.Thingy91x, "about": { "title": "Thingy:91 X", "description": "Nordic Semiconductor\u2019s latest Cellular IoT prototyping platform, the Thingy:91 X. Built around Nordic\u2019s recently announced nRF9151 System-in-Package (SiP), Thingy:91 X supports LTE-M, NB-IoT, GNSS, and DECT NR+ connectivity. The platform also integrates Nordic\u2019s nRF7002 Companion IC for Wi-Fi locationing, the nPM1300 Power Management IC (PMIC), which features innovative system management features and efficient fuel gauging, and the nRF5340 dual-core, multiprotocol SoC." } } } as const;

package/models/thingy91x/README.md

@@ -0,0 +1,9 @@
+# Thingy:91 X
+
+Nordic Semiconductor’s latest Cellular IoT prototyping platform, the Thingy:91
+X. Built around Nordic’s recently announced nRF9151 System-in-Package (SiP),
+Thingy:91 X supports LTE-M, NB-IoT, GNSS, and DECT NR+ connectivity. The
+platform also integrates Nordic’s nRF7002 Companion IC for Wi-Fi locationing,
+the nPM1300 Power Management IC (PMIC), which features innovative system
+management features and efficient fuel gauging, and the nRF5340 dual-core,
+multiprotocol SoC.

package/package.json

@@ -1,13 +1,9 @@
 {
   "name": "@hello.nrfcloud.com/proto-map",
-  "version": "8.1.1",
+  "version": "9.0.0",
   "description": "Documents the communication protocol between devices, the hello.nrfcloud.com/map backend and web application",
   "type": "module",
   "exports": {
-    ".": {
-      "default": "./export.js",
-      "types": "./index.d.ts"
-    },
     "./*": {
       "default": "./dist/*/index.js",
       "types": "./*/index.ts"
@@ -96,8 +92,6 @@
     "LICENSE",
     "README.md",
     "dist",
-    "export.js",
-    "index.d.ts",
     "api",
     "senml",
     "models",

package/senml/index.ts

@@ -0,0 +1,4 @@
+export * from './SenMLSchema.js'
+export * from './senMLtoLwM2M.js'
+export * from './lwm2mToSenML.js'
+export * from './fromCBOR.js'

package/senml/lwm2mToSenML.spec.ts

@@ -6,7 +6,7 @@ import type {
 } from '../lwm2m/objects.js'
 import { LwM2MObjectID } from '../lwm2m/LwM2MObjectID.js'
 import assert from 'node:assert/strict'
-import type { LwM2MObjectInstance } from './senMLtoLwM2M.js'
+import type { LwM2MObjectInstance } from '../lwm2m/LwM2MObjectInstance.js'
 import { lwm2mToSenML } from './lwm2mToSenML.js'
 
 void describe('lwm2mToSenML()', () => {

package/senml/lwm2mToSenML.ts

@@ -1,6 +1,9 @@
 import type { SenMLType } from './SenMLSchema.js'
 import { instanceTs } from '../lwm2m/instanceTs.js'
-import type { LwM2MObjectInstance, LwM2MResourceValue } from './senMLtoLwM2M.js'
+import type {
+	LwM2MObjectInstance,
+	LwM2MResourceValue,
+} from '../lwm2m/LwM2MObjectInstance.js'
 import { timestampResources } from '../lwm2m/timestampResources.js'
 import { definitions } from '../lwm2m/definitions.js'
 import { ResourceType, type LWM2MObjectInfo } from '../lwm2m/LWM2MObjectInfo.js'

package/senml/senMLtoLwM2M.spec.ts

@@ -1,6 +1,7 @@
 import assert from 'node:assert/strict'
 import { describe, it } from 'node:test'
-import { senMLtoLwM2M, type LwM2MObjectInstance } from './senMLtoLwM2M.js'
+import { senMLtoLwM2M } from './senMLtoLwM2M.js'
+import { type LwM2MObjectInstance } from '../lwm2m/LwM2MObjectInstance.js'
 import type { SenMLType } from './SenMLSchema.js'
 
 void describe('senMLtoLwM2M()', () => {

package/senml/senMLtoLwM2M.ts

@@ -2,41 +2,7 @@ import type { MeasurementType, SenMLType } from './SenMLSchema.js'
 import { timestampResources } from '../lwm2m/timestampResources.js'
 import { parseResourceId, type ResourceID } from './parseResourceId.js'
 import { hasValue } from './hasValue.js'
-import type { LwM2MObjectID } from '../lwm2m/LwM2MObjectID.js'
-
-export type LwM2MResourceValue = string | number | boolean | Date
-type GenericLwM2MObjectInstance = {
-	ObjectID: LwM2MObjectID
-	/**
-	 * @default 0
-	 */
-	ObjectInstanceID?: number
-	/**
-	 * @default '1.0'
-	 */
-	ObjectVersion?: string
-	/**
-	 * Key range: 0..65534
-	 */
-	Resources: Partial<Record<number, LwM2MResourceValue>>
-}
-export type LwM2MObjectInstance<
-	Instance extends GenericLwM2MObjectInstance = GenericLwM2MObjectInstance,
-> = {
-	ObjectID: LwM2MObjectID
-	/**
-	 * @default 0
-	 */
-	ObjectInstanceID?: number
-	/**
-	 * @default '1.0'
-	 */
-	ObjectVersion?: Instance['ObjectVersion']
-	/**
-	 * Key range: 0..65534
-	 */
-	Resources: Instance['Resources']
-}
+import type { LwM2MObjectInstance } from '../lwm2m/LwM2MObjectInstance.js'
 
 const isInfoForDifferentInstance = (
 	currentObject: LwM2MObjectInstance,

package/dist/lwm2m/isRegisteredLwM2MObject.js

@@ -1,3 +0,0 @@
-import { validators } from './validators.js';
-import { validate } from './validate.js';
-export var isRegisteredLwM2MObject = validate(validators);

package/dist/lwm2m/isRegisteredLwM2MObject.spec.js

@@ -1,45 +0,0 @@
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-import { isRegisteredLwM2MObject } from './isRegisteredLwM2MObject.js';
-void describe('isRegisteredLwM2MObject()', function() {
-    void it('should validate a LwM2M object', function() {
-        var o = {
-            ObjectID: 14201,
-            ObjectVersion: '1.0',
-            Resources: {
-                0: 33.98771459323253,
-                1: -84.50632147267358,
-                2: 241.9342498779297,
-                3: 11.317643165588379,
-                4: 0.03478508070111275,
-                5: 90.31222534179688,
-                6: 'GNSS',
-                99: new Date(1699049744000)
-            }
-        };
-        assert.equal(isRegisteredLwM2MObject(o), true);
-    });
-    void it('should validate a LwM2M object with optional resources', function() {
-        var o = {
-            ObjectID: 14201,
-            ObjectVersion: '1.0',
-            Resources: {
-                0: 33.98771459323253,
-                1: -84.50632147267358,
-                6: 'GNSS',
-                99: new Date(1699049744000)
-            }
-        };
-        assert.equal(isRegisteredLwM2MObject(o), true);
-    });
-    void it('should not validate an unknown LwM2M object', function() {
-        var o = {
-            ObjectID: 666,
-            ObjectVersion: '1.0',
-            Resources: {
-                0: 42
-            }
-        };
-        assert.equal(isRegisteredLwM2MObject(o), false);
-    });
-});

package/export.js

@@ -1,14 +0,0 @@
-export * from './dist/senml/SenMLSchema.js'
-export * from './dist/senml/senMLtoLwM2M.js'
-export * from './dist/senml/lwm2mToSenML.js'
-export * from './dist/senml/fromCBOR.js'
-export * from './dist/models/models.js'
-export * from './dist/models/types.js'
-export * from './dist/lwm2m/timestampResources.js'
-export * from './dist/lwm2m/objects.js'
-export * from './dist/lwm2m/definitions.js'
-export * from './dist/lwm2m/LWM2MObjectInfo.js'
-export * from './dist/lwm2m/validators.js'
-export * from './dist/lwm2m/LwM2MObjectID.js'
-export * from './dist/lwm2m/validation.js'
-export * from './dist/lwm2m/instanceTs.js'

package/index.d.ts

@@ -1,15 +0,0 @@
-export * from './senml/SenMLSchema.js'
-export * from './senml/senMLtoLwM2M.js'
-export * from './senml/lwm2mToSenML.js'
-export * from './senml/fromCBOR.js'
-export * from './models/models.js'
-export * from './models/types.js'
-export * from './lwm2m/timestampResources.js'
-export * from './lwm2m/LwM2MObject.js'
-export * from './lwm2m/LwM2MObjectID.js'
-export * from './lwm2m/objects.js'
-export * from './lwm2m/definitions.js'
-export * from './lwm2m/LWM2MObjectInfo.js'
-export * from './lwm2m/validators.js'
-export * from './lwm2m/validation.js'
-export * from './lwm2m/instanceTs.js'