@hello.nrfcloud.com/proto-map 12.0.0 → 12.1.1

package/lwm2m/validate.spec.ts

@@ -1,14 +1,13 @@
 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,
+			ObjectID: 14201,
 			ObjectVersion: '1.0',
 			Resources: {
 				'0': 62.469414,
@@ -45,4 +44,17 @@ void describe('validate()', () => {
 		const maybeValid = v(object)
 		assert.deepEqual('object' in maybeValid && maybeValid.object, object)
 	})
+
+	void it('should validate an object with multiple instance resource', () => {
+		const object = {
+			ObjectID: 14401,
+			ObjectVersion: '1.0',
+			Resources: {
+				'0': ['BOOT', 'MODEM', 'APP'],
+				'99': 1717409966000,
+			},
+		}
+		const maybeValid = v(object)
+		assert.deepEqual('object' in maybeValid && maybeValid.object, object)
+	})
 })

package/lwm2m/validation.spec.ts

@@ -0,0 +1,55 @@
+import assert from 'node:assert'
+import { describe, it } from 'node:test'
+import {
+	MultipleInstanceResource,
+	OptionalResource,
+	StringResource,
+} from './validation.js'
+
+void describe('MultipleInstanceResource()', () => {
+	void it('should validate a multiple instance resource', () => {
+		assert.equal(
+			true,
+			MultipleInstanceResource(StringResource)(['BOOT', 'MODEM', 'APP']),
+		)
+	})
+})
+
+void describe('StringResource()', () => {
+	void it('should validate a string', () => {
+		assert.equal(true, StringResource('test'))
+	})
+})
+
+void describe('OptionalResource()', () => {
+	void it('should validate an undefined resource', () => {
+		assert.equal(true, OptionalResource(StringResource)(undefined))
+	})
+	void it('should validate an defined resource', () => {
+		assert.equal(true, OptionalResource(StringResource)('foo'))
+	})
+	void it('should not validate an invalid defined resource', () => {
+		assert.equal(false, OptionalResource(StringResource)(true))
+	})
+})
+
+void describe('combination', () => {
+	void it('should validate OptionalResource(MultipleInstanceResource(StringResource))', () => {
+		assert.equal(
+			true,
+			OptionalResource(MultipleInstanceResource(StringResource))([
+				'BOOT',
+				'MODEM',
+				'APP',
+			]),
+		)
+		assert.equal(
+			true,
+			OptionalResource(MultipleInstanceResource(StringResource))(undefined),
+		)
+		assert.equal(
+			false,
+			OptionalResource(MultipleInstanceResource(StringResource))('foo'),
+		)
+	})
+})

package/lwm2m/validation.ts

@@ -50,15 +50,23 @@ export const isLwM2MObject = (
 		return error(`All resource IDs must be a number`)
 	// All values must be number, string, boolean
 	for (const v of Object.values(object.Resources)) {
-		if (v === undefined) continue
-		if (typeof v === 'string') continue
-		if (typeof v === 'boolean') continue
-		if (typeof v === 'number') continue
+		if (isSimpleResource(v)) continue
+		if (Array.isArray(v) && v.every((v) => isSimpleResource(v))) continue
 		return error(`Invalid value type ${typeof v}`)
 	}
 	return { object: object as LwM2MObjectInstance }
 }
 
+const isSimpleResource = (
+	v?: unknown,
+): v is number | string | boolean | undefined => {
+	if (v === undefined) return true
+	if (typeof v === 'string') return true
+	if (typeof v === 'boolean') return true
+	if (typeof v === 'number') return true
+	return false
+}
+
 export const validateInstance =
 	<O extends LwM2MObjectInstance>(
 		ObjectID: LwM2MObjectID,
@@ -99,12 +107,11 @@ export const BooleanResource = (r: unknown): r is boolean =>
 	typeof r === 'boolean'
 
 export const OptionalResource =
-	(
-		validator:
-			| typeof NumberResource
-			| typeof TimeResource
-			| typeof StringResource
-			| typeof BooleanResource,
-	) =>
+	(validator: (r: unknown) => boolean) =>
 	(r: unknown): boolean =>
 		r === undefined ? true : validator(r)
+
+export const MultipleInstanceResource =
+	(validator: (r: unknown) => boolean) =>
+	(r: unknown): boolean =>
+		Array.isArray(r) && r.every(validator)

package/lwm2m/validators.ts

@@ -10,6 +10,7 @@ import { validate14220 } from "./object/validate14220.js";
 import { validate14230 } from "./object/validate14230.js";
 import { validate14240 } from "./object/validate14240.js";
 import { validate14301 } from "./object/validate14301.js";
+import { validate14401 } from "./object/validate14401.js";
 /**
  * Contains the validators for all registered LwM2M objects.
  */
@@ -27,4 +28,5 @@ validators.set(LwM2MObjectID.SolarCharge_14210, validate14210)
 validators.set(LwM2MObjectID.ButtonPress_14220, validate14220)
 validators.set(LwM2MObjectID.SeaWaterLevel_14230, validate14230)
 validators.set(LwM2MObjectID.RGBLED_14240, validate14240)
-validators.set(LwM2MObjectID.ApplicationConfiguration_14301, validate14301)
+validators.set(LwM2MObjectID.ApplicationConfiguration_14301, validate14301)
+validators.set(LwM2MObjectID.NRFCloudServiceInfo_14401, validate14401)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hello.nrfcloud.com/proto-map",
-  "version": "12.0.0",
+  "version": "12.1.1",
   "description": "Documents the communication protocol between devices, the hello.nrfcloud.com/map backend and web application",
   "type": "module",
   "exports": {
@@ -36,11 +36,11 @@
   },
   "devDependencies": {
     "@bifravst/eslint-config-typescript": "6.1.2",
-    "@bifravst/prettier-config": "1.0.1",
+    "@bifravst/prettier-config": "1.0.2",
     "@commitlint/config-conventional": "19.2.2",
     "@swc/cli": "0.3.12",
-    "@swc/core": "1.5.24",
-    "@types/node": "20.14.1",
+    "@swc/core": "1.5.25",
+    "@types/node": "20.14.2",
     "@types/xml2js": "0.4.14",
     "chalk": "5.3.0",
     "globstar": "1.0.0",
@@ -50,7 +50,7 @@
     "remark": "15.0.1",
     "remark-frontmatter": "5.0.0",
     "tsmatchers": "5.0.2",
-    "tsx": "4.11.2",
+    "tsx": "4.13.2",
     "xml2js": "0.6.2",
     "yaml": "2.4.3"
   },