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

package/dist/generator/generateLwm2mTimestampResources.js

@@ -47,23 +47,35 @@ function _unsupported_iterable_to_array(o, minLen) {
 import ts from 'typescript';
 import { addDocBlock } from './addDocBlock.js';
 export var generateLwm2mTimestampResources = function(timestampResources) {
+    var importLwM2MObjectID = ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports([
+        ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("LwM2MObjectID"))
+    ])), ts.factory.createStringLiteral('./LwM2MObjectID.js'));
     var type = ts.factory.createVariableStatement([
         ts.factory.createToken(ts.SyntaxKind.ExportKeyword)
     ], ts.factory.createVariableDeclarationList([
         ts.factory.createVariableDeclaration(ts.factory.createIdentifier("timestampResources"), undefined, ts.factory.createTypeReferenceNode('Readonly', [
-            ts.factory.createTypeReferenceNode('Record', [
-                ts.factory.createTypeReferenceNode('number'),
+            ts.factory.createTypeReferenceNode('Map', [
+                ts.factory.createTypeReferenceNode('LwM2MObjectID'),
                 ts.factory.createTypeReferenceNode('number')
             ])
-        ]), ts.factory.createObjectLiteralExpression(Object.entries(timestampResources).map(function(param) {
-            var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
-            return ts.factory.createPropertyAssignment(k, ts.factory.createNumericLiteral(v));
-        })))
+        ]), ts.factory.createNewExpression(ts.factory.createIdentifier('Map'), [
+            ts.factory.createTypeReferenceNode('LwM2MObjectID'),
+            ts.factory.createTypeReferenceNode('number')
+        ], [
+            ts.factory.createArrayLiteralExpression(Object.entries(timestampResources).map(function(param) {
+                var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
+                return ts.factory.createArrayLiteralExpression([
+                    ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('LwM2MObjectID'), ts.factory.createIdentifier(k)),
+                    ts.factory.createNumericLiteral(v)
+                ]);
+            }))
+        ]))
     ], ts.NodeFlags.Const));
     addDocBlock([
         'Contains the ID of the resource that defines the timestamp for each LwM2M object definition'
     ], type);
     return [
+        importLwM2MObjectID,
         type
     ];
 };

package/dist/generator/lwm2m.js

@@ -33,6 +33,7 @@ import { generateLwm2mTimestampResources } from './generateLwm2mTimestampResourc
 import { printNode } from './printNode.js';
 import os from 'node:os';
 import { generateLwM2MDefinitions } from './generateLwM2MDefinitions.js';
+import { generateName } from './generateType.js';
 var baseDir = process.cwd();
 var subDir = function() {
     for(var _len = arguments.length, tree = new Array(_len), _key = 0; _key < _len; _key++){
@@ -87,7 +88,7 @@ try {
             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;
+        timestampResources[generateName(definition1)] = ResourceId;
         console.log('  ', chalk.gray('·'), "".concat(chalk.white(ObjectID)).concat(chalk.gray('.')).concat(chalk.white(ResourceId)));
     }
 } catch (err) {

package/dist/lwm2m/instanceTs.js

@@ -2,7 +2,7 @@ import { definitions } from './definitions.js';
 import { timestampResources } from './timestampResources.js';
 export var instanceTs = function(instance) {
     var definition = definitions[instance.ObjectID];
-    var tsResourceId = timestampResources[definition.ObjectID]// All registered objects must have a timestamp resource
+    var tsResourceId = timestampResources.get(definition.ObjectID)// All registered objects must have a timestamp resource
     ;
     return instance.Resources[tsResourceId];
 };

package/dist/lwm2m/timestampResources.js

@@ -1,14 +1,45 @@
+import { LwM2MObjectID } from "./LwM2MObjectID.js";
 /**
  * Contains the ID of the resource that defines the timestamp for each LwM2M object definition
- */ export var timestampResources = {
-    14201: 99,
-    14202: 99,
-    14203: 99,
-    14204: 99,
-    14205: 99,
-    14210: 99,
-    14220: 99,
-    14230: 99,
-    14240: 99,
-    14301: 99
-};
+ */ export var timestampResources = new Map([
+    [
+        LwM2MObjectID.Geolocation_14201,
+        99
+    ],
+    [
+        LwM2MObjectID.BatteryAndPower_14202,
+        99
+    ],
+    [
+        LwM2MObjectID.ConnectionInformation_14203,
+        99
+    ],
+    [
+        LwM2MObjectID.DeviceInformation_14204,
+        99
+    ],
+    [
+        LwM2MObjectID.Environment_14205,
+        99
+    ],
+    [
+        LwM2MObjectID.SolarCharge_14210,
+        99
+    ],
+    [
+        LwM2MObjectID.ButtonPress_14220,
+        99
+    ],
+    [
+        LwM2MObjectID.SeaWaterLevel_14230,
+        99
+    ],
+    [
+        LwM2MObjectID.RGBLED_14240,
+        99
+    ],
+    [
+        LwM2MObjectID.ApplicationConfiguration_14301,
+        99
+    ]
+]);

package/dist/senml/lwm2mToSenML.js

@@ -84,7 +84,7 @@ import { ResourceType } from '../lwm2m/LWM2MObjectInfo.js';
  */ export var lwm2mToSenML = function(lwm2m) {
     var def = definitions[lwm2m.ObjectID];
     var i = instanceTs(lwm2m);
-    var tsResourceId = timestampResources[lwm2m.ObjectID]// All registered objects must have a timestamp resource
+    var tsResourceId = timestampResources.get(lwm2m.ObjectID)// All registered objects must have a timestamp resource
     ;
     var _Object_entries_filter = _to_array(Object.entries(_object_spread_props(_object_spread({}, lwm2m.Resources), _define_property({}, tsResourceId, undefined)))// Filter out undefined values (and timestamp resource)
     .filter(function(r) {

package/dist/senml/senMLtoLwM2M.js

@@ -91,7 +91,7 @@ export var senMLtoLwM2M = function(senML) {
                     error: new Error("Invalid resource ID: ".concat(itemResourceId))
                 };
             }
-            var tsRes = timestampResources[resourceId.ObjectID];
+            var tsRes = timestampResources.get(resourceId.ObjectID);
             if (tsRes === undefined) {
                 return {
                     error: new Error("No timestamp resource defined for object: ".concat(resourceId.ObjectID))

package/lwm2m/instanceTs.ts

@@ -4,6 +4,6 @@ import { timestampResources } from './timestampResources.js'
 
 export const instanceTs = (instance: LwM2MObjectInstance): number => {
 	const definition = definitions[instance.ObjectID]
-	const tsResourceId = timestampResources[definition.ObjectID] as number // All registered objects must have a timestamp resource
+	const tsResourceId = timestampResources.get(definition.ObjectID) as number // All registered objects must have a timestamp resource
 	return instance.Resources[tsResourceId] as number
 }

package/lwm2m/timestampResources.ts

@@ -1,4 +1,5 @@
+import { LwM2MObjectID } from "./LwM2MObjectID.js";
 /**
  * Contains the ID of the resource that defines the timestamp for each LwM2M object definition
  */
-export const timestampResources: Readonly<Record<number, number>> = { 14201: 99, 14202: 99, 14203: 99, 14204: 99, 14205: 99, 14210: 99, 14220: 99, 14230: 99, 14240: 99, 14301: 99 };
+export const timestampResources: Readonly<Map<LwM2MObjectID, number>> = new Map<LwM2MObjectID, number>([[LwM2MObjectID.Geolocation_14201, 99], [LwM2MObjectID.BatteryAndPower_14202, 99], [LwM2MObjectID.ConnectionInformation_14203, 99], [LwM2MObjectID.DeviceInformation_14204, 99], [LwM2MObjectID.Environment_14205, 99], [LwM2MObjectID.SolarCharge_14210, 99], [LwM2MObjectID.ButtonPress_14220, 99], [LwM2MObjectID.SeaWaterLevel_14230, 99], [LwM2MObjectID.RGBLED_14240, 99], [LwM2MObjectID.ApplicationConfiguration_14301, 99]]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hello.nrfcloud.com/proto-map",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "description": "Documents the communication protocol between devices, the hello.nrfcloud.com/map backend and web application",
   "type": "module",
   "exports": {
@@ -35,12 +35,12 @@
     "prepublishOnly": "./compile.sh"
   },
   "devDependencies": {
-    "@bifravst/eslint-config-typescript": "6.1.1",
-    "@bifravst/prettier-config": "1.0.0",
+    "@bifravst/eslint-config-typescript": "6.1.2",
+    "@bifravst/prettier-config": "1.0.1",
     "@commitlint/config-conventional": "19.2.2",
     "@swc/cli": "0.3.12",
     "@swc/core": "1.5.24",
-    "@types/node": "20.12.13",
+    "@types/node": "20.14.1",
     "@types/xml2js": "0.4.14",
     "chalk": "5.3.0",
     "globstar": "1.0.0",
@@ -50,9 +50,9 @@
     "remark": "15.0.1",
     "remark-frontmatter": "5.0.0",
     "tsmatchers": "5.0.2",
-    "tsx": "4.11.0",
+    "tsx": "4.11.2",
     "xml2js": "0.6.2",
-    "yaml": "2.4.2"
+    "yaml": "2.4.3"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

package/senml/lwm2mToSenML.ts

@@ -16,7 +16,7 @@ export const lwm2mToSenML = (
 ): { senML: SenMLType } | { errors: Array<Error> } => {
 	const def = definitions[lwm2m.ObjectID]
 	const i = instanceTs(lwm2m)
-	const tsResourceId = timestampResources[lwm2m.ObjectID] as number // All registered objects must have a timestamp resource
+	const tsResourceId = timestampResources.get(lwm2m.ObjectID) as number // All registered objects must have a timestamp resource
 	const [first, ...rest] = Object.entries({
 		...lwm2m.Resources,
 		[tsResourceId]: undefined,

package/senml/senMLtoLwM2M.ts

@@ -51,7 +51,7 @@ export const senMLtoLwM2M = (
 			return { error: new Error(`Invalid resource ID: ${itemResourceId}`) }
 		}
 
-		const tsRes = timestampResources[resourceId.ObjectID]
+		const tsRes = timestampResources.get(resourceId.ObjectID)
 		if (tsRes === undefined) {
 			return {
 				error: new Error(