@aptre/protobuf-es-lite 0.2.1 → 0.2.4

package/dist/binary.js

@@ -12,7 +12,11 @@ function readField(target, // eslint-disable-line @typescript-eslint/no-explicit
 reader, field, wireType, options) {
     let { repeated, localName } = field;
     if (field.oneof) {
-        target = target[field.oneof.localName];
+        var oneofMsg = target[field.oneof.localName];
+        if (!oneofMsg) {
+            oneofMsg = target[field.oneof.localName] = {};
+        }
+        target = oneofMsg;
         if (target.case != localName) {
             delete target.value;
         }
@@ -29,18 +33,21 @@ reader, field, wireType, options) {
                 read = readScalarLTString;
             }
             if (repeated) {
-                let arr = target[localName]; // safe to assume presence of array, oneof cannot contain repeated values
+                var tgtArr = target[localName];
+                if (!Array.isArray(tgtArr)) {
+                    tgtArr = target[localName] = [];
+                }
                 const isPacked = wireType == protobuf_1.WireType.LengthDelimited &&
                     scalarType != protobuf_1.ScalarType.STRING &&
                     scalarType != protobuf_1.ScalarType.BYTES;
                 if (isPacked) {
                     let e = reader.uint32() + reader.pos;
                     while (reader.pos < e) {
-                        arr.push(read(reader, scalarType));
+                        tgtArr.push(read(reader, scalarType));
                     }
                 }
                 else {
-                    arr.push(read(reader, scalarType));
+                    tgtArr.push(read(reader, scalarType));
                 }
             }
             else {
@@ -50,8 +57,11 @@ reader, field, wireType, options) {
         case "message":
             const messageType = field.T;
             if (repeated) {
-                // safe to assume presence of array, oneof cannot contain repeated values
-                target[localName].push(readMessageField(reader, messageType.create(), messageType.fields, options, field));
+                var tgtArr = target[localName];
+                if (!Array.isArray(tgtArr)) {
+                    tgtArr = target[localName] = [];
+                }
+                tgtArr.push(readMessageField(reader, messageType.create(), messageType.fields, options, field));
             }
             else {
                 if ((0, is_message_js_1.isCompleteMessage)(target[localName], messageType.fields.list())) {
@@ -67,6 +77,9 @@ reader, field, wireType, options) {
             break;
         case "map":
             let [mapKey, mapVal] = readMapEntry(field, reader, options);
+            if (typeof target[localName] !== "object") {
+                target[localName] = {};
+            }
             // safe to assume presence of map object, oneof cannot contain repeated values
             target[localName][mapKey] = mapVal;
             break;

package/dist/json.js

@@ -165,7 +165,10 @@ function readField(target, jsonValue, field, options) {
         if (!Array.isArray(jsonValue)) {
             throw new Error(`cannot decode field ${field.name} from JSON: ${debugJsonValue(jsonValue)}`);
         }
-        const targetArray = target[localName];
+        var targetArray = target[localName];
+        if (!Array.isArray(targetArray)) {
+            targetArray = target[localName] = [];
+        }
         for (const jsonItem of jsonValue) {
             if (jsonItem === null) {
                 throw new Error(`cannot decode field ${field.name} from JSON: ${debugJsonValue(jsonItem)}`);
@@ -202,7 +205,10 @@ function readField(target, jsonValue, field, options) {
         if (typeof jsonValue != "object" || Array.isArray(jsonValue)) {
             throw new Error(`cannot decode field ${field.name} from JSON: ${debugJsonValue(jsonValue)}`);
         }
-        const targetMap = target[localName];
+        var targetMap = target[localName];
+        if (typeof targetMap !== "object") {
+            targetMap = target[localName] = {};
+        }
         for (const [jsonMapKey, jsonMapValue] of Object.entries(jsonValue)) {
             if (jsonMapValue === null) {
                 throw new Error(`cannot decode field ${field.name} from JSON: map value null`);

package/dist/typescript.js

@@ -36,24 +36,30 @@ function generateTs(schema) {
         const messageTypes = [];
         const dependencies = new Map();
         function collectMessages(message) {
-            if (message.file === file) {
-                messageTypes.push(message);
-                const deps = new Set();
-                for (const field of message.fields) {
-                    if (field.fieldKind === "message" && field.message.file === file) {
-                        deps.add(field.message);
-                    }
+            if (message.file !== file) {
+                return;
+            }
+            messageTypes.push(message);
+            const deps = new Set();
+            for (const field of message.fields) {
+                if (field.fieldKind === "message" && field.message.file === file) {
+                    deps.add(field.message);
                 }
-                dependencies.set(message, deps);
-                for (const nestedMessage of message.nestedMessages) {
-                    collectMessages(nestedMessage);
+                else if (field.fieldKind === "map" &&
+                    field.mapValue.kind === "message" &&
+                    field.mapValue.message.file === file) {
+                    deps.add(field.mapValue.message);
                 }
             }
+            dependencies.set(message, deps);
+            for (const nestedMessage of message.nestedMessages) {
+                collectMessages(nestedMessage);
+            }
         }
         for (const message of file.messages) {
             collectMessages(message);
         }
-        // Topological sort toensure consts are declared in the right order.
+        // Topological sort to ensure consts are declared in the right order.
         const sortedMessageTypes = topologicalSort(messageTypes, dependencies);
         for (const message of sortedMessageTypes) {
             generateMessage(schema, f, message);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptre/protobuf-es-lite",
   "description": "Lightweight Protobuf codegen for TypeScript and JavaScript.",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"
@@ -41,7 +41,7 @@
     "typecheck": "tsc --noEmit --project tsconfig.json --outDir ./dist",
     "example": "npm run build && protoc --plugin=./bin/protoc-gen-es-lite --es-lite_out=. --es-lite_opt target=ts --es-lite_opt ts_nocheck=false ./example/example.proto",
     "format": "prettier --write './src/**/(*.ts|*.tsx|*.html|*.css|*.scss)'",
-    "precommit": "npm run format"
+    "precommit": "lint-staged"
   },
   "preferUnplugged": true,
   "pre-commit": [
@@ -60,9 +60,14 @@
     }
   },
   "devDependencies": {
+    "lint-staged": ">=10",
     "pre-commit": "^1.2.2",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
     "typescript": "^5.4.5"
+  },
+  "lint-staged": {
+    "package.json": "prettier --write",
+    "./src/**/(*.ts|*.tsx|*.html|*.css|*.scss)": "prettier --write"
   }
 }