@openhps/protobuf 1.0.1 → 1.1.0

package/dist/cjs/generator/ObjectGenerator.js

@@ -10,6 +10,8 @@ const ProtobufGenerator_1 = require("./ProtobufGenerator");
 /**
  * Protobuf object generator
  */
+// `Object` here is the global constructor interface used by Constructor<T>, not the wrapper type.
+/* eslint-disable @typescript-eslint/no-wrapper-object-types */
 class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
     processObject(object, metaData) {
         throw new Error('Method not implemented.');
@@ -17,9 +19,11 @@ class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
     generate(object, metaData) {
         throw new Error('Method not implemented.');
     }
+    /* eslint-enable @typescript-eslint/no-wrapper-object-types */
     static typeMapping(object, type, memberOptions, buildOptions) {
         switch (type.ctor) {
             case String:
+            case Date:
                 return {
                     syntax: 'string',
                 };
@@ -39,6 +43,14 @@ class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
                 };
             case Array: {
                 const mappings = this.typeMapping(object, type.elementType, memberOptions, buildOptions);
+                // An array of a type protobuf cannot express — Set, Object, Function or
+                // a member with a custom serializer — maps to undefined, exactly as the
+                // Map case below already handles. Reading .syntax off it threw
+                // "Cannot read properties of undefined". The caller treats undefined as
+                // "omit this field".
+                if (mappings === undefined) {
+                    return undefined;
+                }
                 return {
                     syntax: `repeated ${mappings.syntax}`,
                     types: [mappings],
@@ -96,13 +108,18 @@ class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
         }
     }
     static processObject(object, buildOptions) {
-        var _a, _b;
-        object.protobuf = (_a = object.protobuf) !== null && _a !== void 0 ? _a : {
-            generator: {
-                subModules: new Set(),
-                subTypes: [],
-                allowOverride: true,
-            },
+        var _a, _b, _c;
+        // object.protobuf is a slot shared with the runtime serializer, which fills it in
+        // as {messageType, messageTypeEnum, enumMapping} with no `generator` key. Guarding
+        // the whole object with `??` kept that value and then dereferenced a `generator`
+        // that was not there, so ProtobufSerializer.initialize() threw if anything had
+        // already initialised the serializer in the same process. Guard the two levels
+        // separately.
+        object.protobuf = (_a = object.protobuf) !== null && _a !== void 0 ? _a : {};
+        object.protobuf.generator = (_b = object.protobuf.generator) !== null && _b !== void 0 ? _b : {
+            subModules: new Set(),
+            subTypes: [],
+            allowOverride: true,
         };
         const dataMembers = object.dataMembers;
         // Parse object itself
@@ -148,11 +165,12 @@ class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
             object.protobuf.generator.subModules = modules;
             if (subTypes.length > 0 && (modules.size === 1 || !buildOptions.useAnyType)) {
                 object.protobuf.generator.dataMembers = dataMembersClone;
-                object.protobuf.generator.type = (_b = object.protobuf.generator.type) !== null && _b !== void 0 ? _b : object.classType;
+                object.protobuf.generator.type = (_c = object.protobuf.generator.type) !== null && _c !== void 0 ? _c : object.classType;
                 subTypes.forEach((type) => {
-                    var _a;
+                    var _a, _b;
                     const subTypeMeta = core_1.DataSerializerUtils.getOwnMetadata(type);
-                    subTypeMeta.protobuf = (_a = subTypeMeta.protobuf) !== null && _a !== void 0 ? _a : { generator: {} };
+                    subTypeMeta.protobuf = (_a = subTypeMeta.protobuf) !== null && _a !== void 0 ? _a : {};
+                    subTypeMeta.protobuf.generator = (_b = subTypeMeta.protobuf.generator) !== null && _b !== void 0 ? _b : {};
                     subTypeMeta.protobuf.generator.type = object.classType;
                 });
             }
@@ -200,7 +218,7 @@ class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
             .map((member) => {
             var _a;
             const options = member.options && member.options.protobuf ? member.options.protobuf : {};
-            let type = undefined;
+            let type;
             const memberName = (_a = options.name) !== null && _a !== void 0 ? _a : member.name;
             if (memberName === 'uid') {
                 // Handle as UUID or string
@@ -293,7 +311,7 @@ class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
         return [
             packageStr,
             constants_1.HEADER +
-                `package ${packageStr.replace('@', '').replace('/', '.')};\n` +
+                `package ${packageStr.replace(/[@/-]/g, '')};\n` +
                 `syntax = "proto3";\n` +
                 imports
                     .filter((value, idx) => {

package/dist/cjs/generator/ObjectGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ObjectGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ObjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ObjectGenerator.ts"],"names":[],"mappings":"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"}

package/dist/cjs/generator/ProjectGenerator.js

@@ -12,35 +12,77 @@ const constants_1 = require("./constants");
  * Project generator
  */
 class ProjectGenerator extends core_1.DataSerializer {
+    static findAllModules(dir) {
+        var _a;
+        const packageFile = path.resolve(path.join(dir, 'package.json'));
+        // require.main is undefined when mocha runs the specs through its ESM loader.
+        const mainPath = (_a = require.main) === null || _a === void 0 ? void 0 : _a.path;
+        if (mainPath !== undefined && packageFile === path.resolve(mainPath)) {
+            return [];
+        }
+        if (fs.existsSync(packageFile)) {
+            const packageJson = JSON.parse(fs.readFileSync(packageFile, { encoding: 'utf-8' }));
+            const dependencies = packageJson.dependencies;
+            const devDependencies = packageJson.devDependencies;
+            // Combine dependencies and devDependencies
+            const allDependencies = Object.assign(Object.assign({}, dependencies), devDependencies);
+            // Get the names of all modules
+            const allModuleNames = Object.keys(allDependencies);
+            const allModules = allModuleNames
+                .map((name) => {
+                try {
+                    require(name);
+                    return require.cache[require.resolve(name)];
+                }
+                catch (error) {
+                    return null;
+                }
+            })
+                .filter(Boolean);
+            return allModules;
+        }
+    }
     static findModule(dir) {
-        const packageFile = path.join(dir, 'package.json');
+        const resolvedDir = path.resolve(dir);
+        const packageFile = path.join(resolvedDir, 'package.json');
         if (fs.existsSync(packageFile)) {
             const packageJson = JSON.parse(fs.readFileSync(packageFile, { encoding: 'utf-8' }));
             return packageJson.name;
         }
         else {
-            const completeDir = dir.split(path.sep);
-            completeDir.pop();
-            return this.findModule(completeDir.join(path.sep));
+            const parentDir = path.dirname(resolvedDir);
+            if (parentDir === resolvedDir) {
+                // Reached the filesystem root without finding a manifest
+                throw new Error(`Unable to find a package.json above '${dir}'`);
+            }
+            return this.findModule(parentDir);
         }
     }
     static loadModules(objects, module = require.main) {
         if (module === undefined) {
-            // Use cache instead
-            Object.values(require.cache).map((m) => this.loadModules(objects, m));
+            // Use cache instead. require.main is undefined under mocha's ESM loader, and
+            // the cache is typed as possibly holding undefined entries.
+            Object.values(require.cache)
+                .filter((cached) => cached !== undefined && Array.isArray(cached.children))
+                .forEach((cached) => this.loadModules(objects, cached));
             return;
         }
         this._modules.add(module.id);
-        Object.keys(module.exports).forEach((key) => {
-            const childModule = module.exports[key];
-            if (objects.includes(childModule)) {
-                childModule.prototype._module = this.findModule(path.dirname(require.resolve(module.id)));
-                this._packages.add(childModule.prototype._module);
-            }
-        });
-        module.children.forEach((module) => {
-            if (!this._modules.has(module.id)) {
-                this.loadModules(objects, module);
+        if (module.exports) {
+            Object.keys(module.exports).forEach((key) => {
+                const childModule = module.exports[key];
+                if (objects.includes(childModule)) {
+                    childModule.prototype._module = this.findModule(path.dirname(require.resolve(module.id)));
+                    this._packages.add(childModule.prototype._module);
+                }
+            });
+        }
+        if (!Array.isArray(module.children)) {
+            return;
+        }
+        module.children.forEach((child) => {
+            if (child !== undefined && !this._modules.has(child.id)) {
+                this.loadModules(objects, child);
             }
         });
     }
@@ -52,6 +94,10 @@ class ProjectGenerator extends core_1.DataSerializer {
     }
     static loadClasses() {
         const declarations = [];
+        // Reset so a second build in the same process does not reuse stale module/package state
+        this._modules = new Set();
+        this._packages = new Set();
+        this.findAllModules('./');
         this.knownTypes.forEach((value) => {
             const metadata = core_1.DataSerializerUtils.getOwnMetadata(value);
             if (metadata) {
@@ -82,35 +128,40 @@ class ProjectGenerator extends core_1.DataSerializer {
     }
     static buildProject(directory, options = {}) {
         return new Promise((resolve, reject) => {
-            // Prepare directories
-            if (fs.existsSync(directory)) {
-                fs.rmSync(directory, { recursive: true });
-            }
-            fs.mkdirSync(directory, { recursive: true });
-            // Get all class sources
-            if (options.logLevel > 0) {
-                console.log('Generating protocol buffer messages ...');
-                console.log('Use of any types = ', options.useAnyType);
-            }
-            ProjectGenerator.generateProtoMessages(options)
-                .then((classes) => {
+            (() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const resolvedDirectory = path.resolve(directory);
+                // The CLI passes -d <dir> verbatim: refuse to delete the current working
+                // directory, one of its parents, or the filesystem root
+                if (resolvedDirectory === path.parse(resolvedDirectory).root ||
+                    resolvedDirectory === process.cwd() ||
+                    process.cwd().startsWith(resolvedDirectory + path.sep)) {
+                    throw new Error(`Refusing to use '${resolvedDirectory}': it is the current working directory, a parent of it, or the filesystem root.`);
+                }
+                // Prepare directories
+                if (yield fs.pathExists(resolvedDirectory)) {
+                    yield fs.promises.rm(resolvedDirectory, { recursive: true });
+                }
+                yield fs.promises.mkdir(resolvedDirectory, { recursive: true });
+                // Get all class sources
+                if (options.logLevel > 0) {
+                    console.log('Generating protocol buffer messages ...');
+                    console.log('Use of any types = ', options.useAnyType);
+                }
+                const classes = yield ProjectGenerator.generateProtoMessages(options);
                 if (options.logLevel > 0)
                     console.log('Saving generating protocol buffer messages ...');
-                classes.forEach((value, key) => {
-                    const packageDir = path.join(directory, ...value[0].split('.'));
-                    if (!fs.existsSync(packageDir)) {
-                        fs.mkdirsSync(packageDir);
-                    }
-                    fs.writeFileSync(path.join(packageDir, key + '.proto'), value[1], {
+                for (const [key, value] of classes) {
+                    const packageDir = path.join(resolvedDirectory, ...value[0].split('.'));
+                    yield fs.ensureDir(packageDir);
+                    yield fs.promises.writeFile(path.join(packageDir, key + '.proto'), value[1], {
                         encoding: 'utf-8',
                     });
-                });
-                fs.writeFileSync(path.join(directory, 'common.proto'), constants_1.COMMON, {
+                }
+                yield fs.promises.writeFile(path.join(resolvedDirectory, 'common.proto'), constants_1.COMMON, {
                     encoding: 'utf-8',
                 });
                 resolve(classes.size);
-            })
-                .catch(reject);
+            }))().catch(reject);
         });
     }
 }

package/dist/cjs/generator/ProjectGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ProjectGenerator.ts"],"names":[],"mappings":";;;;AAAA,wCAAkG;AAClG,uDAAoD;AACpD,qDAA+B;AAC/B,mDAA6B;AAC7B,0DAA0B;AAC1B,2CAAqC;AAGrC;;GAEG;AACH,MAAa,gBAAiB,SAAQ,qBAAc;IAIhD,MAAM,CAAC,UAAU,CAAC,GAAW;QACzB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACnD,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACpF,OAAO,WAAW,CAAC,IAAI,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxC,WAAW,CAAC,GAAG,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,OAAiC,EAAE,SAAqB,OAAO,CAAC,IAAI;QACnF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,oBAAoB;YACpB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;YACtE,OAAO;QACX,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBAChC,WAAW,CAAC,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1F,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACtD,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACtC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,WAAW;QACd,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,WAAW;QACd,MAAM,YAAY,GAA0B,EAAE,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC9B,MAAM,QAAQ,GAAG,0BAAmB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,QAAQ,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACvD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,qBAAqB,CAAC,OAA4B;QACrD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAEpC,QAAQ,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBAChC,iCAAe,CAAC,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBAChC,IAAI,OAAO,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;oBACvB,OAAO,CAAC,GAAG,CACP,eAAK,CAAC,MAAM,CACR,cAAc,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,EAC7C,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO;wBACtC,CAAC,CAAC,aAAa,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE;wBAC3D,CAAC,CAAC,EAAE,CACX,CACJ,CAAC;gBACN,CAAC;gBACD,MAAM,SAAS,GAAG,iCAAe,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAC9E,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,SAAiB,EAAE,UAA+B,EAAE;QACpE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,sBAAsB;YACtB,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9C,CAAC;YACD,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE7C,wBAAwB;YACxB,IAAI,OAAO,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;gBACvD,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YAC3D,CAAC;YACD,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,CAAC;iBAC1C,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACd,IAAI,OAAO,CAAC,QAAQ,GAAG,CAAC;oBAAE,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;gBACxF,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;oBAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;oBAChE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;wBAC7B,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;oBAC9B,CAAC;oBACD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,GAAG,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE;wBAC9D,QAAQ,EAAE,OAAO;qBACpB,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC;gBAEH,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,kBAAM,EAAE;oBAC3D,QAAQ,EAAE,OAAO;iBACpB,CAAC,CAAC;gBAEH,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC,CAAC;iBACD,KAAK,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACP,CAAC;;AArHL,4CAsHC;AArHkB,yBAAQ,GAAgB,IAAI,GAAG,EAAE,CAAC;AAClC,0BAAS,GAAgB,IAAI,GAAG,EAAE,CAAC"}
+{"version":3,"file":"ProjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ProjectGenerator.ts"],"names":[],"mappings":"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"}

package/dist/cjs/generator/constants.js

@@ -5,14 +5,21 @@ exports.HEADER = `/**
  * OpenHPS Protocol Buffer 
  *  This file was automatically generated with @openhps/protobuf
  * 
- * (c) 2019-2023 Maxim Van de Wynckel & Vrije Universiteit Brussel
+ * (c) 2019-2026 Maxim Van de Wynckel & Vrije Universiteit Brussel
  **/\n
 `;
 exports.COMMON = exports.HEADER +
     `syntax = "proto3";` +
-    `\n\nextend google.protobuf.EnumValueOptions {\n` +
-    `\toptional string className = 1;\n` +
-    `\toptional string packageName = 2;\n` +
+    // EnumValueOptions is declared in descriptor.proto. Extending it without importing
+    // that file leaves protobufjs unable to resolve the extension, and loading the
+    // generated schema fails with "unresolvable extensions".
+    `\nimport "google/protobuf/descriptor.proto";\n` +
+    `\nextend google.protobuf.EnumValueOptions {\n` +
+    // Field numbers 1 and 2 belong to EnumValueOptions' own fields; reusing them made
+    // protobufjs reject the schema with "duplicate id 1". Custom options must sit in
+    // the 50000-99999 range protobuf reserves for third-party extensions.
+    `\toptional string className = 50001;\n` +
+    `\toptional string packageName = 50002;\n` +
     `}\n`;
 // `\nextend google.protobuf.MessageOptions {\n` +
 // `\toptional string className = 1001;\n` +

package/dist/cjs/generator/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/generator/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;;;;;;CAMrB,CAAC;AAEW,QAAA,MAAM,GACf,cAAM;IACN,oBAAoB;IACpB,iDAAiD;IACjD,oCAAoC;IACpC,sCAAsC;IACtC,KAAK,CAAC;AACV,kDAAkD;AAClD,4CAA4C;AAC5C,8CAA8C;AAC9C,SAAS"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/generator/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;;;;;;CAMrB,CAAC;AAEW,QAAA,MAAM,GACf,cAAM;IACN,oBAAoB;IACpB,mFAAmF;IACnF,+EAA+E;IAC/E,yDAAyD;IACzD,gDAAgD;IAChD,+CAA+C;IAC/C,kFAAkF;IAClF,iFAAiF;IACjF,sEAAsE;IACtE,wCAAwC;IACxC,0CAA0C;IAC1C,KAAK,CAAC;AACV,kDAAkD;AAClD,4CAA4C;AAC5C,8CAA8C;AAC9C,SAAS"}

package/dist/cjs/package.json

@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}

package/dist/cjs/tsconfig.bundle.cjs.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../../src/InternalProtobufDeserializer.ts","../../src/InternalProtobufSerializer.ts","../../src/PrimitiveWrapper.ts","../../src/ProtobufSerializer.ts","../../src/index.ts","../../src/bin/generator.ts","../../src/decorators/index.ts","../../src/decorators/options.ts","../../src/generator/ObjectGenerator.ts","../../src/generator/ProjectGenerator.ts","../../src/generator/ProtobufGenerator.ts","../../src/generator/ServiceGenerator.ts","../../src/generator/constants.ts","../../src/generator/index.ts","../../src/generator/types.ts"],"version":"5.9.3"}

package/dist/esm/InternalProtobufDeserializer.js

@@ -1,11 +1,9 @@
 import { ConcreteTypeDescriptor, Deserializer, TypedJSON, UUID, } from '@openhps/core';
-import * as protobuf from 'protobufjs';
 import { AnyT, JsonObjectMetadata } from 'typedjson';
+import { primitiveWrapper } from './PrimitiveWrapper.js';
 export class InternalProtobufDeserializer extends Deserializer {
     constructor() {
         super();
-        InternalProtobufDeserializer.primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
-        InternalProtobufDeserializer.primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
         this.setDeserializationStrategy(Number, (object) => {
             if (typeof object === 'number') {
                 return object;
@@ -49,7 +47,7 @@ export class InternalProtobufDeserializer extends Deserializer {
     convertAsObject(sourceObject, typeDescriptor, knownTypes, memberName, deserializer, memberOptions, serializerOptions) {
         let expectedSelfType = typeDescriptor.ctor;
         let sourceObjectMetadata = JsonObjectMetadata.getFromConstructor(expectedSelfType);
-        if (sourceObject.hasOwnProperty('_type') && sourceObject._type !== 0) {
+        if (Object.prototype.hasOwnProperty.call(sourceObject, '_type') && sourceObject._type !== 0) {
             const enumTypeClassname = sourceObjectMetadata.protobuf.enumMapping.get(sourceObject._type);
             if (enumTypeClassname) {
                 const enumType = knownTypes.get(enumTypeClassname);
@@ -61,9 +59,21 @@ export class InternalProtobufDeserializer extends Deserializer {
         }
         else if (sourceObject.type_url && sourceObject.value) {
             const MessageType = serializerOptions.types.get(sourceObject.type_url);
-            const message = MessageType.decode(sourceObject.value);
-            const data = this.convertAsObject(message, new ConcreteTypeDescriptor(knownTypes.get(sourceObject.type_url)), knownTypes, memberName, deserializer, memberOptions, serializerOptions);
-            return data;
+            if (MessageType) {
+                const message = MessageType.decode(sourceObject.value);
+                const data = this.convertAsObject(message, new ConcreteTypeDescriptor(knownTypes.get(sourceObject.type_url)), knownTypes, memberName, deserializer, memberOptions, serializerOptions);
+                return data;
+            }
+            // Unknown type: fall back to the primitive wrapper for primitive values
+            const message = primitiveWrapper.decode(sourceObject.value);
+            switch (sourceObject.type_url) {
+                case 'Boolean':
+                    return (message.value === 'true');
+                case 'Number':
+                    return Number(message.value);
+                default:
+                    return message.value;
+            }
         }
         const sourceMetadata = sourceObjectMetadata;
         // Strong-typed deserialization available, get to it.
@@ -80,30 +90,36 @@ export class InternalProtobufDeserializer extends Deserializer {
             const objMemberValue = sourceObject[memberName];
             let revivedValue;
             if (objMemberMetadata.name === 'uid') {
-                if (sourceObject.hasOwnProperty('uid_bytes') && sourceObject['uid_bytes'].byteLength > 0) {
+                if (Object.prototype.hasOwnProperty.call(sourceObject, 'uid_bytes') &&
+                    sourceObject['uid_bytes'].byteLength > 0) {
                     revivedValue = UUID.fromBuffer(sourceObject['uid_bytes']).toString();
                 }
-                else if (sourceObject.hasOwnProperty('uid_string')) {
+                else if (Object.prototype.hasOwnProperty.call(sourceObject, 'uid_string')) {
                     revivedValue = sourceObject['uid_string'];
                 }
                 else {
                     return;
                 }
             }
-            else if (!sourceObject.hasOwnProperty(memberName) || !objMemberValue) {
+            else if (!Object.prototype.hasOwnProperty.call(sourceObject, memberName) ||
+                objMemberValue === undefined ||
+                objMemberValue === null) {
                 return;
             }
             else if (objMemberMetadata.type() === AnyT && objMemberValue.type_url) {
                 const MessageType = serializerOptions.types.get(sourceObject[memberName].type_url);
                 if (MessageType) {
-                    const message = MessageType.decode(objMemberValue.value);
-                    revivedValue = deserializer.convertSingleValue(message, new ConcreteTypeDescriptor(knownTypes.get(objMemberValue.type_url)), knownTypes, objMemberDebugName, objMemberOptions, serializerOptions);
+                    const messageType = knownTypes.get(objMemberValue.type_url);
+                    if (messageType !== undefined) {
+                        const message = MessageType.decode(objMemberValue.value);
+                        revivedValue = deserializer.convertSingleValue(message, new ConcreteTypeDescriptor(messageType), knownTypes, objMemberDebugName, objMemberOptions, serializerOptions);
+                    }
                 }
                 else if (objMemberValue.value) {
-                    const message = InternalProtobufDeserializer.primitiveWrapper.decode(objMemberValue.value);
+                    const message = primitiveWrapper.decode(objMemberValue.value);
                     switch (objMemberValue.type_url) {
                         case 'Boolean':
-                            revivedValue = Boolean(message.value);
+                            revivedValue = message.value === 'true';
                             break;
                         case 'Number':
                             revivedValue = Number(message.value);

package/dist/esm/InternalProtobufDeserializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"InternalProtobufDeserializer.js","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"InternalProtobufDeserializer.js","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"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"}

package/dist/esm/InternalProtobufSerializer.js

@@ -1,12 +1,10 @@
 import { Serializer, TypedJSON, UUID, } from '@openhps/core';
 import { AnyT, JsonObjectMetadata } from 'typedjson';
-import * as protobuf from 'protobufjs';
+import { primitiveWrapper } from './PrimitiveWrapper.js';
 export class InternalProtobufSerializer extends Serializer {
     constructor() {
         super();
         this.setSerializationStrategy(Map, this.convertAsMap.bind(this));
-        InternalProtobufSerializer.primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
-        InternalProtobufSerializer.primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
     }
     convertSingleValue(sourceObject, typeDescriptor, memberName, memberOptions, serializerOptions) {
         if (!TypedJSON.utils.isValueDefined(sourceObject)) {
@@ -69,7 +67,10 @@ export class InternalProtobufSerializer extends Serializer {
             }
             else {
                 const MessageType = sourceTypeMetadata.protobuf.messageType;
-                const field = MessageType.get(objMemberMetadata.name);
+                // Look the field up by its wire name: members renamed through
+                // `options.protobuf.name` are emitted under that name, so the
+                // metadata name would not resolve for them.
+                const field = MessageType.get(memberName);
                 serialized = this.convertSingleValue(sourceObject[objMemberMetadata.key], objMemberMetadata.type(), `${TypedJSON.utils.nameof(sourceMeta.classType)}.${objMemberMetadata.key}`, objMemberOptions, Object.assign(Object.assign({}, serializerOptions), { field }));
             }
             if (TypedJSON.utils.isValueDefined(serialized)) {
@@ -83,12 +84,12 @@ export class InternalProtobufSerializer extends Serializer {
                         };
                     }
                     else {
-                        const message = InternalProtobufSerializer.primitiveWrapper.create({
+                        const message = primitiveWrapper.create({
                             value: String(sourceObject[objMemberMetadata.key]),
                         });
                         serialized = {
                             type_url: sourceObject[objMemberMetadata.key].constructor.name,
-                            value: InternalProtobufSerializer.primitiveWrapper.encode(message).finish(),
+                            value: primitiveWrapper.encode(message).finish(),
                         };
                     }
                 }

package/dist/esm/InternalProtobufSerializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"InternalProtobufSerializer.js","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"InternalProtobufSerializer.js","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"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"}

package/dist/esm/PrimitiveWrapper.js

@@ -0,0 +1,9 @@
+import * as protobuf from 'protobufjs';
+/**
+ * Protobuf type wrapping a primitive value as a string.
+ * Shared by the serializer and the deserializer as the `google.protobuf.Any`
+ * fallback for primitive values that protobuf cannot express directly.
+ */
+export const primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
+primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
+//# sourceMappingURL=PrimitiveWrapper.js.map

package/dist/esm/PrimitiveWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PrimitiveWrapper.js","sourceRoot":"","sources":["../../src/PrimitiveWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAkB,IAAI,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;AAC5F,gBAAgB,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC"}