@openhps/protobuf 1.0.2 → 1.1.0

package/dist/esm/bin/generator.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import chalk from 'chalk';
-import { ProjectGenerator } from '../generator/';
+import { ProjectGenerator } from '../generator/index.js';
 import '@openhps/rf';
 import * as path from 'path';
 import { input } from '@inquirer/prompts';
 import * as yargs from 'yargs';
 import { Absolute3DPosition, Accuracy1D, AngleUnit, DataFrame, DataObject, DataSerializer, LengthUnit, LinearVelocity, LinearVelocityUnit, Orientation, RelativeDistance, } from '@openhps/core';
-import { ProtobufSerializer } from '../ProtobufSerializer';
-import { expect } from 'chai';
+import { ProtobufSerializer } from '../ProtobufSerializer.js';
+import assert from 'node:assert/strict';
 const args = yargs.argv;
 const data = {
     directory: path.normalize('tmp'),
@@ -87,13 +87,13 @@ function test() {
             frame.addObject(new DataObject('test2', 'Test Object 2'));
             const buffer = ProtobufSerializer.serialize(frame);
             const deserialized = ProtobufSerializer.deserialize(buffer);
-            expect(deserialized).to.not.be.undefined;
+            assert.notStrictEqual(deserialized, undefined, 'deserialization returned undefined');
             const compare1 = JSON.stringify(DataSerializer.serialize(deserialized), null, 2);
             const compare2 = JSON.stringify(DataSerializer.serialize(frame), null, 2);
             // console.log(compare1);
             // console.log('\n');
             // console.log(compare2);
-            expect(compare1).to.eql(compare2);
+            assert.deepStrictEqual(compare1, compare2, 'round-tripped frame differs from the original');
             console.log(chalk.green(`Basic serialization and deserialization test completed!`));
             resolve();
         })

package/dist/esm/bin/generator.js.map

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

package/dist/esm/decorators/index.js

@@ -1,2 +1,2 @@
-import './options';
+import './options.js';
 //# sourceMappingURL=index.js.map

package/dist/esm/generator/ObjectGenerator.js

@@ -1,11 +1,13 @@
 import { DataSerializerUtils, SerializationUtils, ConcreteTypeDescriptor, } from '@openhps/core';
 import chalk from 'chalk';
 import { AnyT } from 'typedjson';
-import { HEADER } from './constants';
-import { ProtobufGenerator } from './ProtobufGenerator';
+import { HEADER } from './constants.js';
+import { ProtobufGenerator } from './ProtobufGenerator.js';
 /**
  * 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 */
 export class ObjectGenerator extends ProtobufGenerator {
     processObject(object, metaData) {
         throw new Error('Method not implemented.');
@@ -13,6 +15,7 @@ export class ObjectGenerator extends 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:
@@ -36,6 +39,14 @@ export class ObjectGenerator extends 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],
@@ -93,13 +104,18 @@ export class ObjectGenerator extends 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
@@ -145,11 +161,12 @@ export class ObjectGenerator extends 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 = 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;
                 });
             }
@@ -197,7 +214,7 @@ export class ObjectGenerator extends 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

package/dist/esm/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/esm/generator/ProjectGenerator.js

@@ -1,9 +1,10 @@
+import { __awaiter } from "tslib";
 import { DataSerializer, DataSerializerUtils } from '@openhps/core';
-import { ObjectGenerator } from './ObjectGenerator';
+import { ObjectGenerator } from './ObjectGenerator.js';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import chalk from 'chalk';
-import { COMMON } from './constants';
+import { COMMON } from './constants.js';
 /**
  * Project generator
  */
@@ -11,7 +12,9 @@ export class ProjectGenerator extends DataSerializer {
     static findAllModules(dir) {
         var _a;
         const packageFile = path.resolve(path.join(dir, 'package.json'));
-        if (packageFile === path.resolve((_a = require.main) === null || _a === void 0 ? void 0 : _a.path)) {
+        // 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)) {
@@ -37,21 +40,28 @@ export class ProjectGenerator extends DataSerializer {
         }
     }
     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);
@@ -64,9 +74,12 @@ export class ProjectGenerator extends DataSerializer {
                 }
             });
         }
-        module.children.forEach((module) => {
-            if (!this._modules.has(module.id)) {
-                this.loadModules(objects, module);
+        if (!Array.isArray(module.children)) {
+            return;
+        }
+        module.children.forEach((child) => {
+            if (child !== undefined && !this._modules.has(child.id)) {
+                this.loadModules(objects, child);
             }
         });
     }
@@ -78,6 +91,9 @@ export class ProjectGenerator extends 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 = DataSerializerUtils.getOwnMetadata(value);
@@ -109,35 +125,40 @@ export class ProjectGenerator extends 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) => {
+            (() => __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'), COMMON, {
+                }
+                yield fs.promises.writeFile(path.join(resolvedDirectory, 'common.proto'), COMMON, {
                     encoding: 'utf-8',
                 });
                 resolve(classes.size);
-            })
-                .catch(reject);
+            }))().catch(reject);
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ProjectGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAgC,MAAM,eAAe,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,cAAc;IAIhD,MAAM,CAAC,cAAc,CAAC,GAAW;;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;QACjE,IAAI,WAAW,KAAK,IAAI,CAAC,OAAO,CAAC,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,CAAC,EAAE,CAAC;YACnD,OAAO,EAAE,CAAC;QACd,CAAC;QAED,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,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;YAC9C,MAAM,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;YAEpD,2CAA2C;YAC3C,MAAM,eAAe,mCAAQ,YAAY,GAAK,eAAe,CAAE,CAAC;YAEhE,+BAA+B;YAC/B,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,cAAc;iBAC5B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACV,IAAI,CAAC;oBACD,OAAO,CAAC,IAAI,CAAC,CAAC;oBACd,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAiB,CAAC;YACrC,OAAO,UAAU,CAAC;QACtB,CAAC;IACL,CAAC;IAED,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,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACxC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACxC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAChC,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;oBAC1F,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;gBACtD,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QACD,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,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC9B,MAAM,QAAQ,GAAG,mBAAmB,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,eAAe,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,KAAK,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,eAAe,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,MAAM,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;;AArJc,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/esm/generator/ServiceGenerator.js

@@ -1,4 +1,4 @@
-import { ProtobufGenerator } from './ProtobufGenerator';
+import { ProtobufGenerator } from './ProtobufGenerator.js';
 export class ServiceGenerator extends ProtobufGenerator {
     processObject(object, metaData) {
         throw new Error('Method not implemented.');

package/dist/esm/generator/constants.js

@@ -2,14 +2,21 @@ export const HEADER = `/**
  * OpenHPS Protocol Buffer 
  *  This file was automatically generated with @openhps/protobuf
  * 
- * (c) 2019-2024 Maxim Van de Wynckel & Vrije Universiteit Brussel
+ * (c) 2019-2026 Maxim Van de Wynckel & Vrije Universiteit Brussel
  **/\n
 `;
 export const COMMON = 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/esm/generator/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/generator/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,MAAM,GAAG;;;;;;CAMrB,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GACf,MAAM;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,MAAM,CAAC,MAAM,MAAM,GAAG;;;;;;CAMrB,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GACf,MAAM;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/esm/generator/index.js

@@ -1,4 +1,4 @@
-export * from './ObjectGenerator';
-export * from './ProjectGenerator';
-export * from '../decorators';
+export * from './ObjectGenerator.js';
+export * from './ProjectGenerator.js';
+export * from '../decorators/index.js';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js

@@ -1,3 +1,3 @@
-export * from './ProtobufSerializer';
-export * from './decorators';
+export * from './ProtobufSerializer.js';
+export * from './decorators/index.js';
 //# sourceMappingURL=index.js.map

package/dist/esm/package.json

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

package/dist/esm/tsconfig.bundle.esm.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/tsconfig.bundle.types.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/types/InternalProtobufDeserializer.d.ts

@@ -1,7 +1,5 @@
 import { ConcreteTypeDescriptor, Deserializer, IndexedObject, ObjectMemberMetadata, Serializable, TypeDescriptor } from '@openhps/core';
-import * as protobuf from 'protobufjs';
 export declare class InternalProtobufDeserializer extends Deserializer {
-    protected static primitiveWrapper: protobuf.Type;
     constructor();
     convertSingleValue(sourceObject: any, typeDescriptor: TypeDescriptor, knownTypes: Map<string, Serializable<any>>, memberName?: string, memberOptions?: ObjectMemberMetadata, serializerOptions?: any): any;
     convertAsObject<T>(sourceObject: IndexedObject, typeDescriptor: ConcreteTypeDescriptor, knownTypes: Map<string, Serializable<any>>, memberName: string, deserializer: InternalProtobufDeserializer, memberOptions?: ObjectMemberMetadata, serializerOptions?: any): IndexedObject | T | undefined;

package/dist/types/InternalProtobufDeserializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalProtobufDeserializer.d.ts","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,YAAY,EACZ,aAAa,EAEb,oBAAoB,EAEpB,YAAY,EACZ,cAAc,EAGjB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AAGvC,qBAAa,4BAA6B,SAAQ,YAAY;IAC1D,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,IAAI,CAAC;;IAgDjD,kBAAkB,CACd,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAC1C,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,GAAG;IAyCN,eAAe,CAAC,CAAC,EACb,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,sBAAsB,EACtC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAC1C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,4BAA4B,EAC1C,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,aAAa,GAAG,CAAC,GAAG,SAAS;CA4HnC"}
+{"version":3,"file":"InternalProtobufDeserializer.d.ts","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,YAAY,EACZ,aAAa,EAEb,oBAAoB,EAEpB,YAAY,EACZ,cAAc,EAGjB,MAAM,eAAe,CAAC;AAKvB,qBAAa,4BAA6B,SAAQ,YAAY;;IA4C1D,kBAAkB,CACd,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAC1C,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,GAAG;IAyCN,eAAe,CAAC,CAAC,EACb,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,sBAAsB,EACtC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAC1C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,4BAA4B,EAC1C,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,aAAa,GAAG,CAAC,GAAG,SAAS;CAkJnC"}

package/dist/types/InternalProtobufSerializer.d.ts

@@ -1,7 +1,5 @@
 import { ConcreteTypeDescriptor, IndexedObject, MapTypeDescriptor, ObjectMemberMetadata, Serializer, TypeDescriptor } from '@openhps/core';
-import { Type } from 'protobufjs';
 export declare class InternalProtobufSerializer extends Serializer {
-    protected static primitiveWrapper: Type;
     constructor();
     convertSingleValue(sourceObject: any, typeDescriptor: TypeDescriptor, memberName?: string, memberOptions?: ObjectMemberMetadata, serializerOptions?: any): any;
     convertAsObject(sourceObject: IndexedObject, typeDescriptor: ConcreteTypeDescriptor, memberName: string, serializer: InternalProtobufSerializer, memberOptions?: ObjectMemberMetadata, serializerOptions?: any): IndexedObject;

package/dist/types/InternalProtobufSerializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalProtobufSerializer.d.ts","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EAEpB,UAAU,EACV,cAAc,EAGjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIlC,qBAAa,0BAA2B,SAAQ,UAAU;IACtD,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC;;IASxC,kBAAkB,CACd,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,cAAc,EAC9B,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,GAAG;IA0CN,eAAe,CACX,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,sBAAsB,EACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,0BAA0B,EACtC,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG;IAsG3B;;;;;;;;;OASG;IACH,YAAY,CACR,YAAY,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,EAC3B,cAAc,EAAE,iBAAiB,EACjC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,EACtB,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,aAAa,GAAG,KAAK,CAAC;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC;CAarD"}
+{"version":3,"file":"InternalProtobufSerializer.d.ts","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EAEpB,UAAU,EACV,cAAc,EAGjB,MAAM,eAAe,CAAC;AAKvB,qBAAa,0BAA2B,SAAQ,UAAU;;IAMtD,kBAAkB,CACd,YAAY,EAAE,GAAG,EACjB,cAAc,EAAE,cAAc,EAC9B,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,GAAG;IA0CN,eAAe,CACX,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,sBAAsB,EACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,0BAA0B,EACtC,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG;IAyG3B;;;;;;;;;OASG;IACH,YAAY,CACR,YAAY,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,EAC3B,cAAc,EAAE,iBAAiB,EACjC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,EACtB,aAAa,CAAC,EAAE,oBAAoB,EACpC,iBAAiB,CAAC,EAAE,GAAG,GACxB,aAAa,GAAG,KAAK,CAAC;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC;CAarD"}

package/dist/types/PrimitiveWrapper.d.ts

@@ -0,0 +1,8 @@
+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 declare const primitiveWrapper: protobuf.Type;
+//# sourceMappingURL=PrimitiveWrapper.d.ts.map

package/dist/types/PrimitiveWrapper.d.ts.map

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

package/dist/types/ProtobufSerializer.d.ts

@@ -2,6 +2,12 @@ import { Constructor, DataSerializer, DataSerializerConfig } from '@openhps/core
 import * as protobuf from 'protobufjs';
 export declare class ProtobufSerializer extends DataSerializer {
     protected static wrapperMessage: protobuf.Type;
+    /**
+     * Root holding {@link wrapperMessage}. protobufjs 8 resolves edition features by
+     * walking up to a root, and throws "Unable to find a parent for WrapperMessage" for
+     * a Type that was never added to one. Held as a field so it stays reachable.
+     */
+    protected static wrapperRoot: protobuf.Root;
     protected static options: ProtobufSerializerConfig;
     protected static root: protobuf.Root;
     private static getFiles;

package/dist/types/ProtobufSerializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProtobufSerializer.d.ts","sourceRoot":"","sources":["../../src/ProtobufSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,oBAAoB,EAAuB,MAAM,eAAe,CAAC;AAEvG,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AAMvC,qBAAa,kBAAmB,SAAQ,cAAc;IAClD,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC;IAC/C,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,wBAAwB,CAIhD;IACF,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IAErC,OAAO,CAAC,MAAM,CAAC,QAAQ;IAgBvB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0EpD;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,oBAAoB,GAAG,UAAU;IAgBvE;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,CAAC,EAChB,cAAc,EAAE,UAAU,GAAG,GAAG,EAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EACzB,MAAM,CAAC,EAAE,oBAAoB,GAC9B,CAAC;CAkBP;AAED,MAAM,WAAW,wBAAyB,SAAQ,oBAAoB;IAClE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACrC"}
+{"version":3,"file":"ProtobufSerializer.d.ts","sourceRoot":"","sources":["../../src/ProtobufSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,oBAAoB,EAAuB,MAAM,eAAe,CAAC;AAEvG,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AAMvC,qBAAa,kBAAmB,SAAQ,cAAc;IAClD,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC;IAC/C;;;;OAIG;IACH,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC;IAC5C,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,wBAAwB,CAIhD;IACF,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IAErC,OAAO,CAAC,MAAM,CAAC,QAAQ;IAgBvB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiGpD;;;;;OAKG;IACH,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,oBAAoB,GAAG,UAAU;IAgBvE;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,CAAC,EAChB,cAAc,EAAE,UAAU,GAAG,GAAG,EAChC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,EACzB,MAAM,CAAC,EAAE,oBAAoB,GAC9B,CAAC;CAqBP;AAED,MAAM,WAAW,wBAAyB,SAAQ,oBAAoB;IAClE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACrC"}

package/dist/types/generator/ObjectGenerator.d.ts

@@ -1,7 +1,8 @@
 import { ObjectMemberMetadata, ObjectMetadata, TypeDescriptor } from '@openhps/core';
 import { Constructor } from 'typedjson';
-import { ProtobufGenerator, ProtobufMessage } from './ProtobufGenerator';
+import { ProtobufGenerator, ProtobufMessage, TypeMapping } from './ProtobufGenerator';
 import { ProjectBuildOptions } from './types';
+export type { ProtobufPrimitive, TypeMapping } from './ProtobufGenerator';
 /**
  * Protobuf object generator
  */
@@ -12,11 +13,4 @@ export declare class ObjectGenerator extends ProtobufGenerator<Object> {
     static processObject(object: ObjectMetadata, buildOptions: ProjectBuildOptions): void;
     static createProtoMessage(object: ObjectMetadata, buildOptions: ProjectBuildOptions): [string, string];
 }
-export type ProtobufPrimitive = 'string' | 'int32' | 'bool' | 'bytes';
-export interface TypeMapping {
-    syntax: ProtobufPrimitive | string;
-    types?: TypeMapping[];
-    package?: string;
-    name?: string;
-}
 //# sourceMappingURL=ObjectGenerator.d.ts.map

package/dist/types/generator/ObjectGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/ObjectGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,oBAAoB,EACpB,cAAc,EAEd,cAAc,EAGjB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAQ,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAC1D,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzF,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;IAI/F,SAAS,CAAC,MAAM,CAAC,WAAW,CACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,oBAAoB,EACnC,YAAY,EAAE,mBAAmB,GAClC,WAAW;IAoGd,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,mBAAmB,GAAG,IAAI;IAiErF,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,mBAAmB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CA0KzG;AAED,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;AACtE,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAAC;IACnC,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"ObjectGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/ObjectGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,oBAAoB,EACpB,cAAc,EAEd,cAAc,EAGjB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAQ,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAG9C,YAAY,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE1E;;GAEG;AAGH,qBAAa,eAAgB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAC1D,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzF,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;IAK/F,SAAS,CAAC,MAAM,CAAC,WAAW,CACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,oBAAoB,EACnC,YAAY,EAAE,mBAAmB,GAClC,WAAW;IA4Gd,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,mBAAmB,GAAG,IAAI;IAuErF,MAAM,CAAC,kBAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,mBAAmB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CA0KzG"}

package/dist/types/generator/ProjectGenerator.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { DataSerializer, ObjectMetadata, Serializable } from '@openhps/core';
 import { ProjectBuildOptions } from './types';
 /**

package/dist/types/generator/ProjectGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/ProjectGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAuB,cAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAMlG,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,cAAc;IAChD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA0B;IACjD,OAAO,CAAC,MAAM,CAAC,SAAS,CAA0B;IAElD,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE;IA8BhD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAYtC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAE,UAAyB;IAuBvF,MAAM,CAAC,WAAW,IAAI,MAAM,EAAE;IAO9B,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,cAAc,CAAC;IAa3C,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IA2BlG,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;CAmC7F"}
+{"version":3,"file":"ProjectGenerator.d.ts","sourceRoot":"","sources":["../../../src/generator/ProjectGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAuB,cAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAMlG,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,cAAc;IAChD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA0B;IACjD,OAAO,CAAC,MAAM,CAAC,SAAS,CAA0B;IAElD,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE;IAgChD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAgBtC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAE,UAAyB;IA6BvF,MAAM,CAAC,WAAW,IAAI,MAAM,EAAE;IAO9B,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,cAAc,CAAC;IAgB3C,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IA2BlG,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;CA6C7F"}

package/dist/types/generator/constants.d.ts

@@ -1,3 +1,3 @@
-export declare const HEADER = "/**\n * OpenHPS Protocol Buffer \n *  This file was automatically generated with @openhps/protobuf\n * \n * (c) 2019-2024 Maxim Van de Wynckel & Vrije Universiteit Brussel\n **/\n\n";
+export declare const HEADER = "/**\n * OpenHPS Protocol Buffer \n *  This file was automatically generated with @openhps/protobuf\n * \n * (c) 2019-2026 Maxim Van de Wynckel & Vrije Universiteit Brussel\n **/\n\n";
 export declare const COMMON: string;
 //# sourceMappingURL=constants.d.ts.map

package/dist/types/generator/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/generator/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM,0LAMlB,CAAC;AAEF,eAAO,MAAM,MAAM,QAMV,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/generator/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM,0LAMlB,CAAC;AAEF,eAAO,MAAM,MAAM,QAaV,CAAC"}