@hello.nrfcloud.com/proto-map 10.0.2 → 10.0.4

package/dist/lwm2m/validate.spec.js

@@ -24,4 +24,22 @@ void describe('validate()', function() {
         var maybeValid = v({});
         assert.equal('error' in maybeValid, true);
     });
+    void it('should validate an object with undefined optional resources', function() {
+        var object = {
+            ObjectID: 14203,
+            ObjectVersion: '1.0',
+            Resources: {
+                '0': 'LTE-M GPS',
+                '1': 20,
+                '3': 33187,
+                '4': 52661514,
+                '5': 24201,
+                '6': '10.234.105.140',
+                11: undefined,
+                '99': 1716988087000
+            }
+        };
+        var maybeValid = v(object);
+        assert.deepEqual('object' in maybeValid && maybeValid.object, object);
+    });
 });

package/dist/lwm2m/validation.js

@@ -80,6 +80,7 @@ export var isLwM2MObject = function(object) {
         // All values must be number, string, boolean
         for(var _iterator = Object.values(object.Resources)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var v = _step.value;
+            if (v === undefined) continue;
             if (typeof v === 'string') continue;
             if (typeof v === 'boolean') continue;
             if (typeof v === 'number') continue;
@@ -125,7 +126,7 @@ export var validateInstance = function(ObjectID, ObjectVersion, Resources) {
             for(var _iterator = Object.entries(Resources)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                 var _step_value = _sliced_to_array(_step.value, 2), ResourceID = _step_value[0], validator = _step_value[1];
                 if (validator(i.Resources[parseInt(ResourceID, 10)]) === false) {
-                    return error("Resource ".concat(ResourceID, " is invalid."));
+                    return error("Resource ".concat(ResourceID, " for Object ").concat(ObjectID, " is invalid."));
                 }
             }
         } catch (err) {

package/lwm2m/validate.spec.ts

@@ -26,4 +26,23 @@ void describe('validate()', () => {
 		const maybeValid = v({})
 		assert.equal('error' in maybeValid, true)
 	})
+
+	void it('should validate an object with undefined optional resources', () => {
+		const object = {
+			ObjectID: 14203,
+			ObjectVersion: '1.0',
+			Resources: {
+				'0': 'LTE-M GPS',
+				'1': 20,
+				'3': 33187,
+				'4': 52661514,
+				'5': 24201,
+				'6': '10.234.105.140',
+				11: undefined,
+				'99': 1716988087000,
+			},
+		}
+		const maybeValid = v(object)
+		assert.deepEqual('object' in maybeValid && maybeValid.object, object)
+	})
 })

package/lwm2m/validation.ts

@@ -50,6 +50,7 @@ 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
@@ -82,7 +83,9 @@ export const validateInstance =
 
 		for (const [ResourceID, validator] of Object.entries(Resources)) {
 			if (validator(i.Resources[parseInt(ResourceID, 10)]) === false) {
-				return error(`Resource ${ResourceID} is invalid.`)
+				return error(
+					`Resource ${ResourceID} for Object ${ObjectID} is invalid.`,
+				)
 			}
 		}
 		return { object: o as LwM2MObjectInstance<O> }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hello.nrfcloud.com/proto-map",
-  "version": "10.0.2",
+  "version": "10.0.4",
   "description": "Documents the communication protocol between devices, the hello.nrfcloud.com/map backend and web application",
   "type": "module",
   "exports": {