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

package/dist/generator/generateLwM2MDefinitions.js

@@ -23,42 +23,9 @@ export var generateLwM2MDefinitions = function(definitions) {
                 ts.factory.createPropertyAssignment('ObjectVersion', ts.factory.createStringLiteral((_definition_ObjectVersion = definition.ObjectVersion) !== null && _definition_ObjectVersion !== void 0 ? _definition_ObjectVersion : '1.0')),
                 ts.factory.createPropertyAssignment('Name', ts.factory.createStringLiteral(definition.Name)),
                 ts.factory.createPropertyAssignment('Description', ts.factory.createStringLiteral(definition.Description1)),
-                ts.factory.createPropertyAssignment('Resources', ts.factory.createObjectLiteralExpression(definition.Resources.Item.map(function(Resource) {
-                    var range = undefined;
-                    if (Resource.RangeEnumeration.length > 0) {
-                        var maybeRange = parseRangeEnumeration(Resource.RangeEnumeration);
-                        if ('error' in maybeRange) throw maybeRange.error;
-                        range = maybeRange.range;
-                    }
-                    var props = [
-                        ts.factory.createPropertyAssignment('ResourceID', ts.factory.createNumericLiteral(Resource.$.ID)),
-                        ts.factory.createPropertyAssignment('Name', ts.factory.createStringLiteral(Resource.Name)),
-                        ts.factory.createPropertyAssignment('Mandatory', ts.factory.createIdentifier(Resource.Mandatory === 'Mandatory' ? 'true' : 'false')),
-                        ts.factory.createPropertyAssignment('Type', ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('ResourceType'), Resource.Type)),
-                        ts.factory.createPropertyAssignment('Description', ts.factory.createStringLiteral(Resource.Description))
-                    ];
-                    if (Resource.RangeEnumeration.length > 0) {
-                        var maybeRange1 = parseRangeEnumeration(Resource.RangeEnumeration);
-                        if ('error' in maybeRange1) throw maybeRange1.error;
-                        var _maybeRange_range = maybeRange1.range, min = _maybeRange_range.min, max = _maybeRange_range.max;
-                        props.push(ts.factory.createPropertyAssignment('RangeEnumeration', ts.factory.createObjectLiteralExpression([
-                            ts.factory.createPropertyAssignment('min', createNumber(min)),
-                            ts.factory.createPropertyAssignment('max', createNumber(max))
-                        ])));
-                    }
-                    if (Resource.Units.length > 0) props.push(ts.factory.createPropertyAssignment('Units', ts.factory.createStringLiteral(Resource.Units)));
-                    var resourceDef = ts.factory.createPropertyAssignment(ts.factory.createNumericLiteral(Resource.$.ID), ts.factory.createObjectLiteralExpression(props));
-                    var docStrings = [
-                        "".concat(Resource.Name, " (").concat(Resource.Type, ")"),
-                        "",
-                        Resource.Description
-                    ];
-                    if (range !== undefined) {
-                        docStrings.push("", "Minimum: ".concat(range.min), "Maximum: ".concat(range.max));
-                    }
-                    addDocBlock(docStrings, resourceDef);
-                    return resourceDef;
-                })))
+                ts.factory.createPropertyAssignment('Resources', ts.factory.createObjectLiteralExpression(Array.isArray(definition.Resources.Item) ? definition.Resources.Item.map(createResource) : [
+                    createResource(definition.Resources.Item)
+                ]))
             ]));
             addDocBlock([
                 "".concat(definition.Name, " (").concat(definition.ObjectID, ")"),
@@ -80,3 +47,39 @@ export var generateLwM2MDefinitions = function(definitions) {
 var createNumber = function(n) {
     return n < 0 ? ts.factory.createPrefixUnaryExpression(ts.SyntaxKind.MinusToken, ts.factory.createNumericLiteral(-n)) : ts.factory.createNumericLiteral(n);
 };
+var createResource = function(Resource) {
+    var range = undefined;
+    if (Resource.RangeEnumeration.length > 0) {
+        var maybeRange = parseRangeEnumeration(Resource.RangeEnumeration);
+        if ('error' in maybeRange) throw maybeRange.error;
+        range = maybeRange.range;
+    }
+    var props = [
+        ts.factory.createPropertyAssignment('ResourceID', ts.factory.createNumericLiteral(Resource.$.ID)),
+        ts.factory.createPropertyAssignment('Name', ts.factory.createStringLiteral(Resource.Name)),
+        ts.factory.createPropertyAssignment('Mandatory', ts.factory.createIdentifier(Resource.Mandatory === 'Mandatory' ? 'true' : 'false')),
+        ts.factory.createPropertyAssignment('Type', ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('ResourceType'), Resource.Type)),
+        ts.factory.createPropertyAssignment('Description', ts.factory.createStringLiteral(Resource.Description))
+    ];
+    if (Resource.RangeEnumeration.length > 0) {
+        var maybeRange1 = parseRangeEnumeration(Resource.RangeEnumeration);
+        if ('error' in maybeRange1) throw maybeRange1.error;
+        var _maybeRange_range = maybeRange1.range, min = _maybeRange_range.min, max = _maybeRange_range.max;
+        props.push(ts.factory.createPropertyAssignment('RangeEnumeration', ts.factory.createObjectLiteralExpression([
+            ts.factory.createPropertyAssignment('min', createNumber(min)),
+            ts.factory.createPropertyAssignment('max', createNumber(max))
+        ])));
+    }
+    if (Resource.Units.length > 0) props.push(ts.factory.createPropertyAssignment('Units', ts.factory.createStringLiteral(Resource.Units)));
+    var resourceDef = ts.factory.createPropertyAssignment(ts.factory.createNumericLiteral(Resource.$.ID), ts.factory.createObjectLiteralExpression(props));
+    var docStrings = [
+        "".concat(Resource.Name, " (").concat(Resource.Type, ")"),
+        "",
+        Resource.Description
+    ];
+    if (range !== undefined) {
+        docStrings.push("", "Minimum: ".concat(range.min), "Maximum: ".concat(range.max));
+    }
+    addDocBlock(docStrings, resourceDef);
+    return resourceDef;
+};

package/dist/generator/generateType.js

@@ -22,7 +22,9 @@ export var generateType = function(param) {
         ts.factory.createTypeLiteralNode([
             ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('ObjectID'), undefined, ts.factory.createTypeReferenceNode("LwM2MObjectID.".concat(name), undefined)),
             ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('ObjectVersion'), undefined, ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(ObjectVersion !== null && ObjectVersion !== void 0 ? ObjectVersion : '1.0'))),
-            ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('Resources'), undefined, ts.factory.createTypeLiteralNode(byImportance(Resources.Item).map(function(resource) {
+            ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier('Resources'), undefined, ts.factory.createTypeLiteralNode(byImportance(Array.isArray(Resources.Item) ? Resources.Item : [
+                Resources.Item
+            ]).map(function(resource) {
                 var res = ts.factory.createPropertySignature(undefined, ts.factory.createIdentifier("".concat(resource.$.ID)), resource.Mandatory === 'Mandatory' ? undefined : ts.factory.createToken(ts.SyntaxKind.QuestionToken), typeScriptResourceType(resource.Type));
                 var docs = [
                     "".concat(resource.Name).concat(resource.Units.length > 0 ? " (".concat(resource.Units, ")") : ''),

package/dist/generator/generateValidator.js

@@ -79,7 +79,9 @@ export var generateValidator = function(param) {
         ], [
             ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('LwM2MObjectID'), ts.factory.createIdentifier(name)),
             ts.factory.createStringLiteral(ObjectVersion !== null && ObjectVersion !== void 0 ? ObjectVersion : '1.0'),
-            ts.factory.createObjectLiteralExpression(Resources.Item.map(function(Resource) {
+            ts.factory.createObjectLiteralExpression((Array.isArray(Resources.Item) ? Resources.Item : [
+                Resources.Item
+            ]).map(function(Resource) {
                 var validator = ts.factory.createPropertyAssignment(ts.factory.createNumericLiteral(Resource.$.ID), toResourceValidator(Resource));
                 return validator;
             }))
@@ -125,7 +127,9 @@ var typeToValidator = function(Type) {
 };
 var getResourceValidators = function(param) {
     var Resources = param.Resources;
-    return new Set(Object.values(Resources.Item).map(function(param) {
+    return new Set((Array.isArray(Resources.Item) ? Resources.Item : [
+        Resources.Item
+    ]).map(function(param) {
         var Type = param.Type, Mandatory = param.Mandatory;
         return [
             typeToValidator(Type),

package/dist/generator/lwm2m.js

@@ -74,12 +74,19 @@ var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorErro
 try {
     for(var _iterator1 = definitions[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
         var definition1 = _step1.value;
-        var _definition_Resources_Item_find;
         var ObjectID = parseInt(definition1.ObjectID, 10);
-        var ResourceId = parseInt((_definition_Resources_Item_find = definition1.Resources.Item.find(function(param) {
-            var Type = param.Type;
-            return Type === 'Time';
-        })) === null || _definition_Resources_Item_find === void 0 ? void 0 : _definition_Resources_Item_find.$.ID, 10);
+        var Item = definition1.Resources.Item;
+        var ResourceId = undefined;
+        if (Array.isArray(Item)) {
+            var _Item_find;
+            ResourceId = parseInt((_Item_find = Item.find(function(param) {
+                var Type = param.Type;
+                return Type === 'Time';
+            })) === null || _Item_find === void 0 ? void 0 : _Item_find.$.ID, 10);
+        } else {
+            if (Item.Type === 'Time') ResourceId = parseInt(Item.$.ID, 10);
+        }
+        if (ResourceId === undefined) throw new Error("No Time resource found in ".concat(ObjectID, "!"));
         timestampResources[ObjectID] = ResourceId;
         console.log('  ', chalk.gray('·'), "".concat(chalk.white(ObjectID)).concat(chalk.gray('.')).concat(chalk.white(ResourceId)));
     }

package/dist/lwm2m/LwM2MObjectID.js

@@ -35,7 +35,7 @@
     /**
      * Button press (14220)
      *
-     * Describes a button press event.
+     * Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.
      */ LwM2MObjectID[LwM2MObjectID["ButtonPress_14220"] = 14220] = "ButtonPress_14220";
     /**
      * Sea Water Level (14230)

package/dist/lwm2m/check-lwm2m-rules.js

@@ -295,7 +295,7 @@ var listLwm2mDefinitions = function() {
                         9
                     ]);
                     _loop = function() {
-                        var _ref, file, _TimeResources_, _TimeResources_1, objectDefinitionFile, schemaValidated, ObjectID, ObjectURN, definition, _, objectDef, maybeValid, _maybeValid_value, Name, Resources, TimeResources, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step1, _step_value, id, resource, _resource_Units;
+                        var _ref, file, _TimeResources_, _TimeResources_1, objectDefinitionFile, schemaValidated, ObjectID, ObjectURN, definition, _, objectDef, Item, maybeValid, _maybeValid_value, Name, Resources, TimeResources, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step1, _step_value, id, resource, _resource_Units;
                         return _ts_generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
@@ -359,7 +359,11 @@ var listLwm2mDefinitions = function() {
                                     console.log(chalk.green('✔'), chalk.blue(ObjectURN), chalk.gray('ObjectID and URN match filename and schema'));
                                     objectDef = _object_spread_props(_object_spread({}, definition), {
                                         LWM2MVersion: '1.1',
-                                        Resources: definition.Resources.Item.reduce(function(resources, _param) {
+                                        Resources: {}
+                                    });
+                                    Item = definition.Resources.Item;
+                                    if (Array.isArray(Item)) {
+                                        objectDef.Resources = Item.reduce(function(resources, _param) {
                                             var $ = _param.$, item = _object_without_properties(_param, [
                                                 "$"
                                             ]);
@@ -369,8 +373,11 @@ var listLwm2mDefinitions = function() {
                                                 if ('error' in maybeRange) throw maybeRange.error;
                                             }
                                             return _object_spread_props(_object_spread({}, resources), _define_property({}, $.ID, item));
-                                        }, {})
-                                    });
+                                        }, {});
+                                    } else {
+                                        // Object only has one Resource
+                                        objectDef.Resources = _define_property({}, Item.$.ID, Item);
+                                    }
                                     maybeValid = v(objectDef);
                                     if ('errors' in maybeValid) {
                                         console.error(maybeValid.errors);

package/dist/lwm2m/definitions.js

@@ -533,25 +533,14 @@ var _obj;
 }), /**
      * Button press (14220)
      *
-     * Describes a button press event.
+     * Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.
      */ _define_property(_obj, LwM2MObjectID.ButtonPress_14220, {
     ObjectID: LwM2MObjectID.ButtonPress_14220,
     ObjectVersion: "1.0",
     Name: "Button press",
-    Description: "Describes a button press event.",
+    Description: "Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.",
     Resources: {
-        0: {
-            ResourceID: 0,
-            Name: "Button ID",
-            Mandatory: true,
-            Type: ResourceType.Integer,
-            Description: "The ID of the button that was pressed. Examples: 1, 2."
-        },
-        /**
-             * Timestamp (Time)
-             *
-             * The timestamp of when the button was pressed.
-             */ 99: {
+        99: {
             ResourceID: 99,
             Name: "Timestamp",
             Mandatory: true,

package/dist/lwm2m/object/14220.d.js

@@ -1,5 +1,5 @@
 /**
  * Button press (14220)
  *
- * Describes a button press event.
+ * Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.
  */ export { };

package/dist/lwm2m/object/validate14220.js

@@ -1,4 +1,4 @@
-import { NumberResource, TimeResource, validateInstance } from "../validation.js";
+import { TimeResource, validateInstance } from "../validation.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
  * Validate Button press (14220)
@@ -6,7 +6,6 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
  * Ensures the given object is an LwM2M object according to the schema 14220.xml.
  */ export var validate14220 = function(o) {
     return validateInstance(LwM2MObjectID.ButtonPress_14220, "1.0", {
-        0: NumberResource,
         99: TimeResource
     })(o);
 };

package/dist/lwm2m/validation.js

@@ -57,7 +57,7 @@ export var isLwM2MObject = function(object) {
         };
     };
     // Must be an object
-    if (typeof object !== 'object' || object === null) return error("Not an object");
+    if ((typeof object === "undefined" ? "undefined" : _type_of(object)) !== 'object' || object === null) return error("Not an object");
     // Must have valid ObjectID
     if (!('ObjectID' in object) || typeof object.ObjectID !== 'number' || object.ObjectID < 14200 || object.ObjectID > 15000 || LwM2MObjectIDs.includes(object.ObjectID) === false) return error("Not an valid Object ID: ".concat(JSON.stringify(object.ObjectID)));
     // ObjectVersion must be valid
@@ -69,7 +69,7 @@ export var isLwM2MObject = function(object) {
         if (typeof object.ObjectInstanceID !== 'number' || object.ObjectInstanceID < 0) return error("Invalid ObjectInstanceID");
     }
     // Must have valid resources
-    if (!('Resources' in object) || typeof object.Resources !== 'object' || object.Resources === null) return error("Resources must be an object");
+    if (!('Resources' in object) || _type_of(object.Resources) !== 'object' || object.Resources === null) return error("Resources must be an object");
     var _Object_keys_find_length;
     // All keys must be numbers
     if (((_Object_keys_find_length = (_Object_keys_find = Object.keys(object.Resources).find(function(k) {

package/dist/senml/hasValue.js

@@ -1,6 +1,10 @@
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 export var hasValue = function(m) {
     if (m === null) return false;
-    if (typeof m !== 'object') return false;
+    if ((typeof m === "undefined" ? "undefined" : _type_of(m)) !== 'object') return false;
     var _ref, _ref1, _ref2, _ref3;
     var v = (_ref3 = (_ref2 = (_ref1 = (_ref = 'bv' in m ? m.bv : undefined) !== null && _ref !== void 0 ? _ref : 'v' in m ? m.v : undefined) !== null && _ref1 !== void 0 ? _ref1 : 'vs' in m ? m.vs : undefined) !== null && _ref2 !== void 0 ? _ref2 : 'vb' in m ? m.vb : undefined) !== null && _ref3 !== void 0 ? _ref3 : 'vd' in m ? m.vd : undefined;
     if (v === null || v === undefined) return false;

package/lwm2m/14220.xml

@@ -2,22 +2,12 @@
 <LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://openmobilealliance.org/tech/profiles/LWM2M-v1_1.xsd">
   <Object ObjectType="MODefinition">
     <Name>Button press</Name>
-    <Description1><![CDATA[Describes a button press event.]]></Description1>
+    <Description1><![CDATA[Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.]]></Description1>
     <ObjectID>14220</ObjectID>
     <ObjectURN>urn:oma:lwm2m:x:14220</ObjectURN>
     <MultipleInstances>Multiple</MultipleInstances>
     <Mandatory>Optional</Mandatory>
     <Resources>
-      <Item ID="0">
-        <Name>Button ID</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Mandatory</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration/>
-        <Units/>
-        <Description><![CDATA[The ID of the button that was pressed. Examples: 1, 2.]]></Description>
-      </Item>
       <Item ID="99">
         <Name>Timestamp</Name>
         <Operations>R</Operations>

package/lwm2m/LwM2MObjectID.ts

@@ -41,7 +41,7 @@ export enum LwM2MObjectID {
     /**
      * Button press (14220)
      *
-     * Describes a button press event.
+     * Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.
      */
     ButtonPress_14220 = 14220,
     /**

package/lwm2m/ParsedLwM2MObjectDefinition.ts

@@ -22,7 +22,10 @@ export type ParsedLwM2MObjectDefinition = {
 	MultipleInstances: 'Multiple'
 	Mandatory: 'Optional'
 	Resources: {
-		Item: Resource[]
+		Item:
+			| Resource[]
+			// if Object only has one Resource
+			| Resource
 	}
 	Description2: string // e.g. ''
 }

package/lwm2m/check-lwm2m-rules.ts

@@ -87,7 +87,12 @@ const listLwm2mDefinitions = async (
 		const objectDef: LWM2MObjectDefinitionType = {
 			...definition,
 			LWM2MVersion: '1.1',
-			Resources: definition.Resources.Item.reduce<Record<string, any>>(
+			Resources: {},
+		}
+
+		const Item = definition.Resources.Item
+		if (Array.isArray(Item)) {
+			objectDef.Resources = Item.reduce<Record<string, any>>(
 				(resources, { $, ...item }) => {
 					if (resources[$.ID] !== undefined)
 						throw new Error(`Duplicate resource ID: ${$.ID}`)
@@ -101,7 +106,12 @@ const listLwm2mDefinitions = async (
 					}
 				},
 				{},
-			),
+			)
+		} else {
+			// Object only has one Resource
+			objectDef.Resources = {
+				[Item.$.ID]: Item,
+			}
 		}
 
 		const maybeValid = v(objectDef)

package/lwm2m/definitions.ts

@@ -246,14 +246,9 @@ export const definitions: Record<LwM2MObjectID, LWM2MObjectInfo> = { /**
             99: { ResourceID: 99, Name: "Timestamp", Mandatory: true, Type: ResourceType.Time, Description: "The timestamp of when the measurement was performed." } } }, /**
      * Button press (14220)
      *
-     * Describes a button press event.
+     * Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.
      */
-    [LwM2MObjectID.ButtonPress_14220]: { ObjectID: LwM2MObjectID.ButtonPress_14220, ObjectVersion: "1.0", Name: "Button press", Description: "Describes a button press event.", Resources: { /**
-             * Button ID (Integer)
-             *
-             * The ID of the button that was pressed. Examples: 1, 2.
-             */
-            0: { ResourceID: 0, Name: "Button ID", Mandatory: true, Type: ResourceType.Integer, Description: "The ID of the button that was pressed. Examples: 1, 2." }, /**
+    [LwM2MObjectID.ButtonPress_14220]: { ObjectID: LwM2MObjectID.ButtonPress_14220, ObjectVersion: "1.0", Name: "Button press", Description: "Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.", Resources: { /**
              * Timestamp (Time)
              *
              * The timestamp of when the button was pressed.

package/lwm2m/object/14220.d.ts

@@ -3,18 +3,12 @@ import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
  * Button press (14220)
  *
- * Describes a button press event.
+ * Describes a button press event. The ObjectInstanceID is used to describe which button has been pressed.
  */
 export type ButtonPress_14220 = LwM2MObject<{
     ObjectID: LwM2MObjectID.ButtonPress_14220;
     ObjectVersion: "1.0";
     Resources: {
-        /**
-         * Button ID
-         *
-         * The ID of the button that was pressed. Examples: 1, 2.
-         */
-        0: number;
         /**
          * Timestamp
          *

package/lwm2m/object/validate14220.ts

@@ -1,5 +1,5 @@
 import type { LwM2MObjectInstance } from "../LwM2MObjectInstance.js";
-import { NumberResource, TimeResource, validateInstance } from "../validation.js";
+import { TimeResource, validateInstance } from "../validation.js";
 import type { ButtonPress_14220 } from "../objects.js";
 import { LwM2MObjectID } from "../LwM2MObjectID.js";
 /**
@@ -11,4 +11,4 @@ export const validate14220 = (o: unknown): {
     error: Error;
 } | {
     object: LwM2MObjectInstance<ButtonPress_14220>;
-} => validateInstance<ButtonPress_14220>(LwM2MObjectID.ButtonPress_14220, "1.0", { 0: NumberResource, 99: TimeResource })(o);
+} => validateInstance<ButtonPress_14220>(LwM2MObjectID.ButtonPress_14220, "1.0", { 99: TimeResource })(o);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hello.nrfcloud.com/proto-map",
-  "version": "10.0.4",
+  "version": "11.0.0",
   "description": "Documents the communication protocol between devices, the hello.nrfcloud.com/map backend and web application",
   "type": "module",
   "exports": {
@@ -39,8 +39,8 @@
     "@bifravst/prettier-config": "1.0.0",
     "@commitlint/config-conventional": "19.2.2",
     "@swc/cli": "0.3.12",
-    "@swc/core": "1.5.7",
-    "@types/node": "20.12.12",
+    "@swc/core": "1.5.24",
+    "@types/node": "20.12.13",
     "@types/xml2js": "0.4.14",
     "chalk": "5.3.0",
     "globstar": "1.0.0",