@hello.nrfcloud.com/proto-map 5.6.1 → 5.6.3

package/dist/senml/hasValue.js

@@ -1,8 +1,8 @@
 export var hasValue = function(m) {
     if (m === null) return false;
-    if (typeof m !== "object") return false;
+    if (typeof 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;
+    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;
     return true;
 };

package/dist/senml/hasValue.spec.js

@@ -44,10 +44,10 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-import { describe, it } from "node:test";
-import assert from "node:assert/strict";
-import { hasValue } from "./hasValue.js";
-void describe("hasValue() should determine whether an object has a value", function() {
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { hasValue } from './hasValue.js';
+void describe('hasValue() should determine whether an object has a value', function() {
     var _loop = function(_i, _iter) {
         var _iter__i = _sliced_to_array(_iter[_i], 2), record = _iter__i[0], expected = _iter__i[1];
         void it("should determine that ".concat(JSON.stringify(record), " has a value: ").concat(JSON.stringify(expected)), function() {

package/dist/senml/lwm2mToSenML.js

@@ -84,10 +84,10 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-import { instanceTs } from "../lwm2m/instanceTs.js";
-import { timestampResources } from "../lwm2m/timestampResources.js";
-import { definitions } from "../lwm2m/definitions.js";
-import { ResourceType } from "../lwm2m/LWM2MObjectInfo.js";
+import { instanceTs } from '../lwm2m/instanceTs.js';
+import { timestampResources } from '../lwm2m/timestampResources.js';
+import { definitions } from '../lwm2m/definitions.js';
+import { ResourceType } from '../lwm2m/LWM2MObjectInfo.js';
 /**
  * Convert LwM2M Object Instances to senML
  */ export var lwm2mToSenML = function(lwm2m) {
@@ -122,15 +122,15 @@ var toKey = function(def, resourceId) {
     var _def_Resources_resourceId;
     switch((_def_Resources_resourceId = def.Resources[resourceId]) === null || _def_Resources_resourceId === void 0 ? void 0 : _def_Resources_resourceId.Type){
         case ResourceType.String:
-            return "vs";
+            return 'vs';
         case ResourceType.Boolean:
-            return "vb";
+            return 'vb';
         case ResourceType.Float:
         case ResourceType.Integer:
         case ResourceType.Time:
-            return "v";
+            return 'v';
         case ResourceType.Opaque:
-            return "vd";
+            return 'vd';
         default:
             throw new Error("Unknown ResourceID ".concat(resourceId, " for LwM2M Object ").concat(def.ObjectID, "!"));
     }

package/dist/senml/lwm2mToSenML.spec.js

@@ -1,46 +1,46 @@
-import { it, describe } from "node:test";
-import { LwM2MObjectID } from "../lwm2m/LwM2MObjectID.js";
-import assert from "node:assert/strict";
-import { lwm2mToSenML } from "./lwm2mToSenML.js";
-void describe("lwm2mToSenML()", function() {
-    void it("should convert LwM2M to SenML", function() {
+import { it, describe } from 'node:test';
+import { LwM2MObjectID } from '../lwm2m/LwM2MObjectID.js';
+import assert from 'node:assert/strict';
+import { lwm2mToSenML } from './lwm2mToSenML.js';
+void describe('lwm2mToSenML()', function() {
+    void it('should convert LwM2M to SenML', function() {
         var location = {
             ObjectID: LwM2MObjectID.Geolocation_14201,
-            ObjectVersion: "1.0",
+            ObjectVersion: '1.0',
             Resources: {
-                "0": 62.469414,
-                "1": 6.151946,
-                "6": "Fixed",
-                "3": 1,
-                "99": new Date(1710147413003)
+                '0': 62.469414,
+                '1': 6.151946,
+                '6': 'Fixed',
+                '3': 1,
+                '99': new Date(1710147413003)
             }
         };
         var level1 = {
             ObjectID: LwM2MObjectID.SeaWaterLevel_14230,
-            ObjectVersion: "1.0",
+            ObjectVersion: '1.0',
             Resources: {
-                "0": 84.3,
-                "1": "AES",
-                "99": new Date(1710140400000)
+                '0': 84.3,
+                '1': 'AES',
+                '99': new Date(1710140400000)
             }
         };
         var level2 = {
             ObjectID: LwM2MObjectID.SeaWaterLevel_14230,
-            ObjectVersion: "1.0",
+            ObjectVersion: '1.0',
             Resources: {
-                "0": 140.4,
-                "1": "AES",
-                "99": new Date(1710144000000)
+                '0': 140.4,
+                '1': 'AES',
+                '99': new Date(1710144000000)
             }
         };
         var level3 = {
             ObjectID: LwM2MObjectID.SeaWaterLevel_14230,
-            ObjectVersion: "1.0",
+            ObjectVersion: '1.0',
             ObjectInstanceID: 1,
             Resources: {
-                "0": 140.7,
-                "1": "AES",
-                "99": new Date(1710144001000)
+                '0': 140.7,
+                '1': 'AES',
+                '99': new Date(1710144001000)
             }
         };
         var lwm2m = [
@@ -51,52 +51,52 @@ void describe("lwm2mToSenML()", function() {
         ];
         var expected = [
             {
-                bn: "14201/0/",
-                n: "0",
+                bn: '14201/0/',
+                n: '0',
                 v: 62.469414,
                 bt: 1710147413003
             },
             {
-                n: "1",
+                n: '1',
                 v: 6.151946
             },
             {
-                n: "3",
+                n: '3',
                 v: 1
             },
             {
-                n: "6",
-                vs: "Fixed"
+                n: '6',
+                vs: 'Fixed'
             },
             {
-                bn: "14230/0/",
-                n: "0",
+                bn: '14230/0/',
+                n: '0',
                 v: 84.3,
                 bt: 1710140400000
             },
             {
-                n: "1",
-                vs: "AES"
+                n: '1',
+                vs: 'AES'
             },
             {
-                bn: "14230/0/",
-                n: "0",
+                bn: '14230/0/',
+                n: '0',
                 v: 140.4,
                 bt: 1710144000000
             },
             {
-                n: "1",
-                vs: "AES"
+                n: '1',
+                vs: 'AES'
             },
             {
-                bn: "14230/1/",
-                n: "0",
+                bn: '14230/1/',
+                n: '0',
                 v: 140.7,
                 bt: 1710144001000
             },
             {
-                n: "1",
-                vs: "AES"
+                n: '1',
+                vs: 'AES'
             }
         ];
         assert.deepEqual(lwm2mToSenML(lwm2m), expected);

package/dist/senml/parseResourceId.js

@@ -46,7 +46,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 export var parseResourceId = function(resourceId) {
     if (!/^\d+\/\d+\/\d+\/\d+$/.test(resourceId)) return null;
-    var _resourceId_split_map = _sliced_to_array(resourceId.split("/").map(function(s) {
+    var _resourceId_split_map = _sliced_to_array(resourceId.split('/').map(function(s) {
         return parseInt(s, 10);
     }), 4), ObjectID = _resourceId_split_map[0], ObjectInstanceID = _resourceId_split_map[1], ResourceID = _resourceId_split_map[2], ResourceInstanceId = _resourceId_split_map[3];
     return {

package/dist/senml/parseResourceId.spec.js

@@ -1,9 +1,9 @@
-import assert from "node:assert";
-import { describe, it } from "node:test";
-import { parseResourceId } from "./parseResourceId.js";
-void describe("parseResourceId()", function() {
-    void it("should parse an LwM2M resource ID", function() {
-        return assert.deepEqual(parseResourceId("14201/1/2/0"), {
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { parseResourceId } from './parseResourceId.js';
+void describe('parseResourceId()', function() {
+    void it('should parse an LwM2M resource ID', function() {
+        return assert.deepEqual(parseResourceId('14201/1/2/0'), {
             ObjectID: 14201,
             ObjectInstanceID: 1,
             ResourceID: 2,

package/dist/senml/senMLtoLwM2M.js

@@ -50,9 +50,9 @@ function _object_spread_props(target, source) {
     }
     return target;
 }
-import { timestampResources } from "../lwm2m/timestampResources.js";
-import { parseResourceId } from "./parseResourceId.js";
-import { hasValue } from "./hasValue.js";
+import { timestampResources } from '../lwm2m/timestampResources.js';
+import { parseResourceId } from './parseResourceId.js';
+import { hasValue } from './hasValue.js';
 var isInfoForDifferentInstance = function(currentObject, resourceID, currentBaseTime) {
     var _currentObject_Resources_tsRes, _currentObject_Resources;
     if (currentObject === undefined) return true;
@@ -65,16 +65,16 @@ var isInfoForDifferentInstance = function(currentObject, resourceID, currentBase
     return false;
 };
 var getValue = function(measurement) {
-    if ("bv" in measurement && !("v" in measurement)) return measurement.bv;
-    if ("bv" in measurement && "v" in measurement) return measurement.bv + measurement.v;
-    if ("v" in measurement) return measurement.v;
-    if ("vs" in measurement) return measurement.vs;
-    if ("vb" in measurement) return measurement.vb;
-    if ("vd" in measurement) return measurement.vd;
+    if ('bv' in measurement && !('v' in measurement)) return measurement.bv;
+    if ('bv' in measurement && 'v' in measurement) return measurement.bv + measurement.v;
+    if ('v' in measurement) return measurement.v;
+    if ('vs' in measurement) return measurement.vs;
+    if ('vb' in measurement) return measurement.vb;
+    if ('vd' in measurement) return measurement.vd;
     return undefined;
 };
 export var senMLtoLwM2M = function(senML) {
-    var currentBaseName = "";
+    var currentBaseName = '';
     var currentBaseTime = undefined;
     var currentObject = undefined;
     var items = [];
@@ -82,11 +82,11 @@ export var senMLtoLwM2M = function(senML) {
     try {
         for(var _iterator = senML[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var item = _step.value;
-            if ("bn" in item && item.bn !== undefined) currentBaseName = item.bn;
-            if ("bt" in item && item.bt !== undefined) currentBaseTime = item.bt;
+            if ('bn' in item && item.bn !== undefined) currentBaseName = item.bn;
+            if ('bt' in item && item.bt !== undefined) currentBaseTime = item.bt;
             if (!hasValue(item)) continue;
             var _item_n;
-            var itemResourceId = "".concat(currentBaseName).concat((_item_n = item.n) !== null && _item_n !== void 0 ? _item_n : "", "/0");
+            var itemResourceId = "".concat(currentBaseName).concat((_item_n = item.n) !== null && _item_n !== void 0 ? _item_n : '', "/0");
             var resourceId = parseResourceId(itemResourceId);
             if (resourceId === null) throw new Error("Invalid resource ID: ".concat(itemResourceId));
             if (currentObject === undefined || currentBaseTime !== undefined && isInfoForDifferentInstance(currentObject, resourceId, currentBaseTime)) {
@@ -99,7 +99,7 @@ export var senMLtoLwM2M = function(senML) {
                     Resources: _define_property({}, tsRes, new Date(currentBaseTime))
                 };
                 if (resourceId.ObjectInstanceID !== 0) currentObject.ObjectInstanceID = resourceId.ObjectInstanceID;
-                if ("blv" in item) currentObject.ObjectVersion = item.blv;
+                if ('blv' in item) currentObject.ObjectVersion = item.blv;
             }
             if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.Resources) === undefined) continue;
             var value = getValue(item);

package/dist/senml/senMLtoLwM2M.spec.js

@@ -1,34 +1,34 @@
-import assert from "node:assert/strict";
-import { describe, it } from "node:test";
-import { senMLtoLwM2M } from "./senMLtoLwM2M.js";
-void describe("senMLtoLwM2M()", function() {
-    void it("should resolve a senML message into objects", function() {
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { senMLtoLwM2M } from './senMLtoLwM2M.js';
+void describe('senMLtoLwM2M()', function() {
+    void it('should resolve a senML message into objects', function() {
         var input = [
             {
-                bn: "14201/1/",
-                blv: "1.1",
+                bn: '14201/1/',
+                blv: '1.1',
                 bt: 1698155694999,
-                n: "0",
+                n: '0',
                 v: 33.98755678796222
             },
             {
-                n: "1",
+                n: '1',
                 v: -84.506132079174634
             },
             {
-                n: "2",
+                n: '2',
                 v: 295.468994140625
             },
             {
-                n: "3",
+                n: '3',
                 v: 17.74077033996582
             },
             {
-                n: "4",
+                n: '4',
                 v: 26.376304626464844
             },
             {
-                n: "5",
+                n: '5',
                 v: 359.1545715332
             }
         ];
@@ -36,7 +36,7 @@ void describe("senMLtoLwM2M()", function() {
             {
                 ObjectID: 14201,
                 ObjectInstanceID: 1,
-                ObjectVersion: "1.1",
+                ObjectVersion: '1.1',
                 Resources: {
                     0: 33.98755678796222,
                     1: -84.506132079174634,
@@ -50,96 +50,96 @@ void describe("senMLtoLwM2M()", function() {
         ];
         assert.deepEqual(senMLtoLwM2M(input), expected);
     });
-    void it("should drop empty resources", function() {
+    void it('should drop empty resources', function() {
         var input = [
             {
-                bn: "14203/0/",
-                n: "0",
-                vs: "LTE-M",
+                bn: '14203/0/',
+                n: '0',
+                vs: 'LTE-M',
                 bt: 1676369307222
             },
             {
-                n: "1",
+                n: '1',
                 v: 20
             },
             {
-                n: "2",
+                n: '2',
                 v: -79
             },
             {
-                n: "3",
+                n: '3',
                 v: 6
             },
             {
-                n: "4",
+                n: '4',
                 v: 56879116
             },
             {
-                n: "5",
+                n: '5',
                 v: 24001
             },
             {
-                n: "6",
-                vs: "10.160.243.113"
+                n: '6',
+                vs: '10.160.243.113'
             },
             {
-                n: "11"
+                n: '11'
             }
         ];
         var expected = [
             {
                 ObjectID: 14203,
                 Resources: {
-                    0: "LTE-M",
+                    0: 'LTE-M',
                     1: 20,
                     2: -79,
                     3: 6,
                     4: 56879116,
                     5: 24001,
-                    6: "10.160.243.113",
+                    6: '10.160.243.113',
                     99: new Date(1676369307222)
                 }
             }
         ];
         assert.deepEqual(senMLtoLwM2M(input), expected);
     });
-    void it("should ignore repeated base properties", function() {
+    void it('should ignore repeated base properties', function() {
         var input = [
             {
-                bn: "14203/0/",
-                n: "0",
-                vs: "LTE-M",
+                bn: '14203/0/',
+                n: '0',
+                vs: 'LTE-M',
                 bt: 1699049665511
             },
             {
-                n: "1",
+                n: '1',
                 v: 20
             },
             {
-                bn: "14203/0/",
-                n: "2",
+                bn: '14203/0/',
+                n: '2',
                 v: -89,
                 bt: 1699049665511
             },
             {
-                n: "3",
+                n: '3',
                 v: 2305
             },
             {
-                n: "4",
+                n: '4',
                 v: 34784790
             },
             {
-                n: "5",
+                n: '5',
                 v: 24202
             },
             {
-                n: "6",
-                vs: "100.81.95.75"
+                n: '6',
+                vs: '100.81.95.75'
             },
             {
-                bn: "14203/0/",
-                n: "11",
+                bn: '14203/0/',
+                n: '11',
                 v: 7,
                 bt: 1699049665511
             }
@@ -148,13 +148,13 @@ void describe("senMLtoLwM2M()", function() {
             {
                 ObjectID: 14203,
                 Resources: {
-                    0: "LTE-M",
+                    0: 'LTE-M',
                     1: 20,
                     2: -89,
                     3: 2305,
                     4: 34784790,
                     5: 24202,
-                    6: "100.81.95.75",
+                    6: '100.81.95.75',
                     11: 7,
                     99: new Date(1699049665511)
                 }
@@ -162,29 +162,29 @@ void describe("senMLtoLwM2M()", function() {
         ];
         assert.deepEqual(senMLtoLwM2M(input), expected);
     });
-    void it("should handle multiple measurements for the same resource", function() {
+    void it('should handle multiple measurements for the same resource', function() {
         var input = [
             {
-                bn: "14205/0/",
-                n: "0",
+                bn: '14205/0/',
+                n: '0',
                 v: 21,
                 bt: 1699049600000
             },
             {
-                bn: "14205/1/",
-                n: "0",
+                bn: '14205/1/',
+                n: '0',
                 v: 31,
                 bt: 1699049600000
             },
             {
-                bn: "14205/0/",
-                n: "0",
+                bn: '14205/0/',
+                n: '0',
                 v: 22,
                 bt: 1699049700000
             },
             {
-                bn: "14205/1/",
-                n: "0",
+                bn: '14205/1/',
+                n: '0',
                 v: 32,
                 bt: 1699049700000
             }

package/dist/senml/validateSenML.js

@@ -1,5 +1,5 @@
-import { SenML } from "../senml/SenMLSchema.js";
-import { validate } from "../validate.js";
+import { SenML } from '../senml/SenMLSchema.js';
+import { validate } from '../validate.js';
 var validator = validate(SenML);
 export var validateSenML = function(maybeSenML) {
     return validator(maybeSenML);

package/dist/senml/validateSenML.spec.js

@@ -1,26 +1,26 @@
-import { describe, it } from "node:test";
-import assert from "node:assert/strict";
-import { validateSenML } from "./validateSenML.js";
-void describe("validateSenML()", function() {
-    void it("should validate", function() {
+import { describe, it } from 'node:test';
+import assert from 'node:assert/strict';
+import { validateSenML } from './validateSenML.js';
+void describe('validateSenML()', function() {
+    void it('should validate', function() {
         var senMl = [
             {
-                bn: "14202/1/",
-                blv: "1.1",
-                n: "0",
+                bn: '14202/1/',
+                blv: '1.1',
+                n: '0',
                 v: 99,
                 bt: 1699049685992
             },
             {
-                n: "1",
+                n: '1',
                 v: 4.179
             },
             {
-                n: "2",
+                n: '2',
                 v: 0
             },
             {
-                n: "3",
+                n: '3',
                 v: 25.7
             }
         ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hello.nrfcloud.com/proto-map",
-  "version": "5.6.1",
+  "version": "5.6.3",
   "description": "Documents the communication protocol between devices, the hello.nrfcloud.com/map backend and web application",
   "type": "module",
   "exports": {
@@ -39,11 +39,11 @@
     "prepublishOnly": "./compile.sh"
   },
   "devDependencies": {
-    "@bifravst/eslint-config-typescript": "6.0.23",
+    "@bifravst/eslint-config-typescript": "6.0.24",
     "@bifravst/prettier-config": "1.0.0",
     "@commitlint/config-conventional": "19.2.2",
     "@swc/cli": "0.3.12",
-    "@swc/core": "1.4.16",
+    "@swc/core": "1.4.17",
     "@types/node": "20.12.7",
     "@types/xml2js": "0.4.14",
     "chalk": "5.3.0",
@@ -73,11 +73,7 @@
   "prettier": "@bifravst/prettier-config",
   "release": {
     "branches": [
-      "saga",
-      {
-        "name": "!(saga|v[0-9].[0-9].x|*_*|*/*)",
-        "prerelease": true
-      }
+      "saga"
     ],
     "remoteTags": true,
     "plugins": [

package/dist/api/ResourceUpdate.js

@@ -1,17 +0,0 @@
-import { Type } from "@sinclair/typebox";
-import { Context } from "./Context.js";
-import { ObjectID, ObjectInstanceID, ObjectVersion, Resources } from "./LwM2M.js";
-import { PublicDeviceId } from "./DeviceId.js";
-import { Timestamp } from "./Timestamp.js";
-export var ResourceUpdate = Type.Object({
-    "@context": Type.Literal(Context.resourceUpdate.toString()),
-    ObjectID: ObjectID,
-    ObjectInstanceID: ObjectInstanceID,
-    ObjectVersion: ObjectVersion,
-    Resources: Resources,
-    ts: Timestamp,
-    deviceId: PublicDeviceId
-}, {
-    title: "Resource update",
-    description: "Describes an update to a LwM2M resource for a device."
-});