@openhps/protobuf 1.0.1 → 1.1.0

package/src/generator/ObjectGenerator.ts

@@ -12,20 +12,26 @@ import {
 import chalk from 'chalk';
 import { AnyT, Constructor } from 'typedjson';
 import { HEADER } from './constants';
-import { ProtobufGenerator, ProtobufMessage } from './ProtobufGenerator';
+import { ProtobufGenerator, ProtobufMessage, TypeMapping } from './ProtobufGenerator';
 import { ProjectBuildOptions } from './types';
 
+// Re-exported so the generator's public surface does not change
+export type { ProtobufPrimitive, TypeMapping } from './ProtobufGenerator';
+
 /**
  * Protobuf object generator
  */
-export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disable-line
-    processObject(object: Constructor<Object>, metaData: ObjectMemberMetadata): Promise<void> { // eslint-disable-line
+// `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<Object> {
+    processObject(object: Constructor<Object>, metaData: ObjectMemberMetadata): Promise<void> {
         throw new Error('Method not implemented.');
     }
 
-    generate(object: Constructor<Object>, metaData: ObjectMemberMetadata): Promise<ProtobufMessage> { // eslint-disable-line
+    generate(object: Constructor<Object>, metaData: ObjectMemberMetadata): Promise<ProtobufMessage> {
         throw new Error('Method not implemented.');
     }
+    /* eslint-enable @typescript-eslint/no-wrapper-object-types */
 
     protected static typeMapping(
         object: ObjectMetadata,
@@ -35,6 +41,7 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
     ): TypeMapping {
         switch (type.ctor) {
             case String:
+            case Date:
                 return {
                     syntax: 'string',
                 };
@@ -63,6 +70,14 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
                     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],
@@ -132,12 +147,17 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
     }
 
     static processObject(object: ObjectMetadata, buildOptions: ProjectBuildOptions): void {
-        object.protobuf = object.protobuf ?? {
-            generator: {
-                subModules: new Set(),
-                subTypes: [],
-                allowOverride: true,
-            },
+        // 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 = object.protobuf ?? ({} as any);
+        object.protobuf.generator = object.protobuf.generator ?? {
+            subModules: new Set(),
+            subTypes: [],
+            allowOverride: true,
         };
 
         const dataMembers = object.dataMembers;
@@ -189,7 +209,8 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
                 object.protobuf.generator.type = object.protobuf.generator.type ?? object.classType;
                 subTypes.forEach((type) => {
                     const subTypeMeta = DataSerializerUtils.getOwnMetadata(type);
-                    subTypeMeta.protobuf = subTypeMeta.protobuf ?? { generator: {} };
+                    subTypeMeta.protobuf = subTypeMeta.protobuf ?? ({} as any);
+                    subTypeMeta.protobuf.generator = subTypeMeta.protobuf.generator ?? {};
                     subTypeMeta.protobuf.generator.type = object.classType;
                 });
             }
@@ -249,7 +270,7 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
             .map((member) => {
                 const options: any =
                     member.options && (member.options as any).protobuf ? (member.options as any).protobuf : {};
-                let type: TypeMapping = undefined;
+                let type: TypeMapping;
                 const memberName = options.name ?? member.name;
 
                 if (memberName === 'uid') {
@@ -348,7 +369,7 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
         return [
             packageStr,
             HEADER +
-                `package ${packageStr.replace('@', '').replace('/', '.')};\n` +
+                `package ${packageStr.replace(/[@/-]/g, '')};\n` +
                 `syntax = "proto3";\n` +
                 imports
                     .filter((value, idx) => {
@@ -367,11 +388,3 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
         ];
     }
 }
-
-export type ProtobufPrimitive = 'string' | 'int32' | 'bool' | 'bytes';
-export interface TypeMapping {
-    syntax: ProtobufPrimitive | string;
-    types?: TypeMapping[];
-    package?: string;
-    name?: string;
-}

package/src/generator/ProjectGenerator.ts

@@ -13,35 +13,79 @@ export class ProjectGenerator extends DataSerializer {
     private static _modules: Set<string> = new Set();
     private static _packages: Set<string> = new Set();
 
+    static findAllModules(dir: string): NodeModule[] {
+        const packageFile = path.resolve(path.join(dir, 'package.json'));
+        // require.main is undefined when mocha runs the specs through its ESM loader.
+        const mainPath = require.main?.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 = { ...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) as NodeModule[];
+            return allModules;
+        }
+    }
+
     static findModule(dir: string): string {
-        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: Array<Serializable<any>>, module: NodeModule = 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 is NodeModule => 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);
             }
         });
     }
@@ -55,6 +99,10 @@ export class ProjectGenerator extends DataSerializer {
 
     static loadClasses(): Array<ObjectMetadata> {
         const declarations: Array<ObjectMetadata> = [];
+        // 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);
             if (metadata) {
@@ -94,37 +142,47 @@ export class ProjectGenerator extends DataSerializer {
 
     static buildProject(directory: string, options: ProjectBuildOptions = {}): Promise<number> {
         return new Promise((resolve, reject) => {
-            // Prepare directories
-            if (fs.existsSync(directory)) {
-                fs.rmSync(directory, { recursive: true });
-            }
-            fs.mkdirSync(directory, { recursive: true });
+            (async () => {
+                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.`,
+                    );
+                }
 
-            // 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) => {
-                    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], {
-                            encoding: 'utf-8',
-                        });
-                    });
+                // Prepare directories
+                if (await fs.pathExists(resolvedDirectory)) {
+                    await fs.promises.rm(resolvedDirectory, { recursive: true });
+                }
+                await fs.promises.mkdir(resolvedDirectory, { recursive: true });
 
-                    fs.writeFileSync(path.join(directory, 'common.proto'), COMMON, {
+                // Get all class sources
+                if (options.logLevel > 0) {
+                    console.log('Generating protocol buffer messages ...');
+                    console.log('Use of any types = ', options.useAnyType);
+                }
+                const classes = await ProjectGenerator.generateProtoMessages(options);
+                if (options.logLevel > 0) console.log('Saving generating protocol buffer messages ...');
+                for (const [key, value] of classes) {
+                    const packageDir = path.join(resolvedDirectory, ...value[0].split('.'));
+                    await fs.ensureDir(packageDir);
+                    await fs.promises.writeFile(path.join(packageDir, key + '.proto'), value[1], {
                         encoding: 'utf-8',
                     });
+                }
 
-                    resolve(classes.size);
-                })
-                .catch(reject);
+                await fs.promises.writeFile(path.join(resolvedDirectory, 'common.proto'), COMMON, {
+                    encoding: 'utf-8',
+                });
+
+                resolve(classes.size);
+            })().catch(reject);
         });
     }
 }

package/src/generator/constants.ts

@@ -2,16 +2,23 @@ export const 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
 `;
 
 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/esm5/InternalProtobufDeserializer.js

@@ -1,147 +0,0 @@
-import { ConcreteTypeDescriptor, Deserializer, TypedJSON, UUID, } from '@openhps/core';
-import * as protobuf from 'protobufjs';
-import { AnyT, JsonObjectMetadata } from 'typedjson';
-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;
-            }
-            else if (typeof object === 'string') {
-                return Number(object);
-            }
-            else if (object.toNumber) {
-                return object.toNumber();
-            }
-            return object;
-        });
-        this.setDeserializationStrategy(Map, (object, typeDescriptor, knownTypes, memberName, deserializer, memberOptions, serializerOptions) => {
-            const result = new Map();
-            Object.keys(object).forEach((key) => {
-                result.set(key, deserializer.convertSingleValue(object[key], typeDescriptor.valueType, knownTypes, memberName, memberOptions, serializerOptions));
-            });
-            return result;
-        });
-    }
-    convertSingleValue(sourceObject, typeDescriptor, knownTypes, memberName, memberOptions, serializerOptions) {
-        if (this.retrievePreserveNull(memberOptions) && sourceObject === null) {
-            return null;
-        }
-        else if (!TypedJSON.utils.isValueDefined(sourceObject)) {
-            return;
-        }
-        const deserializer = this.deserializationStrategy.get(typeDescriptor.ctor);
-        if (deserializer !== undefined) {
-            return deserializer(sourceObject, typeDescriptor, knownTypes, memberName, this, memberOptions, serializerOptions);
-        }
-        if (typeof sourceObject === 'object') {
-            return this.convertAsObject(sourceObject, typeDescriptor, knownTypes, memberName, this, memberOptions, serializerOptions);
-        }
-        let error = `Could not deserialize '${memberName}'; don't know how to deserialize type`;
-        if (typeDescriptor.hasFriendlyName()) {
-            error += ` '${typeDescriptor.ctor.name}'`;
-        }
-        this.errorHandler(new TypeError(`${error}.`));
-    }
-    convertAsObject(sourceObject, typeDescriptor, knownTypes, memberName, deserializer, memberOptions, serializerOptions) {
-        let expectedSelfType = typeDescriptor.ctor;
-        let sourceObjectMetadata = JsonObjectMetadata.getFromConstructor(expectedSelfType);
-        if (sourceObject.hasOwnProperty('_type') && sourceObject._type !== 0) {
-            const enumTypeClassname = sourceObjectMetadata.protobuf.enumMapping.get(sourceObject._type);
-            if (enumTypeClassname) {
-                const enumType = knownTypes.get(enumTypeClassname);
-                if (enumType !== expectedSelfType) {
-                    expectedSelfType = enumType;
-                    sourceObjectMetadata = JsonObjectMetadata.getFromConstructor(expectedSelfType);
-                }
-            }
-        }
-        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;
-        }
-        const sourceMetadata = sourceObjectMetadata;
-        // Strong-typed deserialization available, get to it.
-        // First deserialize properties into a temporary object.
-        const sourceObjectWithDeserializedProperties = {};
-        // Deserialize by expected properties.
-        sourceMetadata.dataMembers.forEach((objMemberMetadata, propKey) => {
-            var _a;
-            const objMemberDebugName = `${TypedJSON.utils.nameof(sourceMetadata.classType)}.${propKey}`;
-            const objMemberOptions = TypedJSON.options.mergeOptions(sourceMetadata.options, objMemberMetadata.options);
-            const memberName = (_a = (objMemberOptions && objMemberOptions.protobuf
-                ? objMemberOptions.protobuf.name
-                : objMemberMetadata.name)) !== null && _a !== void 0 ? _a : objMemberMetadata.name;
-            const objMemberValue = sourceObject[memberName];
-            let revivedValue;
-            if (objMemberMetadata.name === 'uid') {
-                if (sourceObject.hasOwnProperty('uid_bytes') && sourceObject['uid_bytes'].byteLength > 0) {
-                    revivedValue = UUID.fromBuffer(sourceObject['uid_bytes']).toString();
-                }
-                else if (sourceObject.hasOwnProperty('uid_string')) {
-                    revivedValue = sourceObject['uid_string'];
-                }
-                else {
-                    return;
-                }
-            }
-            else if (!sourceObject.hasOwnProperty(memberName) || !objMemberValue) {
-                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);
-                }
-                else if (objMemberValue.value) {
-                    const message = InternalProtobufDeserializer.primitiveWrapper.decode(objMemberValue.value);
-                    switch (objMemberValue.type_url) {
-                        case 'Boolean':
-                            revivedValue = Boolean(message.value);
-                            break;
-                        case 'Number':
-                            revivedValue = Number(message.value);
-                            break;
-                        case 'String':
-                        default:
-                            revivedValue = message.value;
-                    }
-                }
-            }
-            else {
-                revivedValue = deserializer.convertSingleValue(objMemberValue, objMemberMetadata.type(), knownTypes, objMemberDebugName, objMemberOptions, serializerOptions);
-            }
-            if (TypedJSON.utils.isValueDefined(revivedValue)) {
-                sourceObjectWithDeserializedProperties[objMemberMetadata.key] = revivedValue;
-            }
-        });
-        // Next, instantiate target object.
-        const targetObject = deserializer.instantiateType(expectedSelfType);
-        // Finally, assign deserialized properties to target object.
-        Object.assign(targetObject, sourceObjectWithDeserializedProperties);
-        // Call onDeserialized method (if any).
-        const methodName = sourceObjectMetadata.onDeserializedMethodName;
-        if (methodName != null) {
-            if (typeof targetObject[methodName] === 'function') {
-                // check for member first
-                targetObject[methodName]();
-            }
-            else if (typeof targetObject.constructor[methodName] === 'function') {
-                // check for static
-                targetObject.constructor[methodName]();
-            }
-            else {
-                deserializer.getErrorHandler()(new TypeError(`onDeserialized callback` +
-                    `'${TypedJSON.utils.nameof(sourceObjectMetadata.classType)}.${methodName}' is not a method.`));
-            }
-        }
-        return targetObject;
-    }
-}
-//# sourceMappingURL=InternalProtobufDeserializer.js.map

package/dist/esm5/InternalProtobufDeserializer.js.map

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

package/dist/esm5/InternalProtobufSerializer.js

@@ -1,132 +0,0 @@
-import { Serializer, TypedJSON, UUID, } from '@openhps/core';
-import { AnyT, JsonObjectMetadata } from 'typedjson';
-import * as protobuf from 'protobufjs';
-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)) {
-            return;
-        }
-        if (!TypedJSON.utils.isInstanceOf(sourceObject, typeDescriptor.ctor)) {
-            const expectedName = TypedJSON.utils.nameof(typeDescriptor.ctor);
-            const actualName = TypedJSON.utils.nameof(sourceObject.constructor);
-            this.errorHandler(new TypeError(`Could not serialize '${memberName}': expected '${expectedName}',` + ` got '${actualName}'.`));
-            return;
-        }
-        const serializer = this.serializationStrategy.get(typeDescriptor.ctor);
-        if (serializer !== undefined) {
-            return serializer(sourceObject, typeDescriptor, memberName, this, memberOptions, serializerOptions);
-        }
-        // if not present in the strategy do property by property serialization
-        if (typeof sourceObject === 'object') {
-            return this.convertAsObject(sourceObject, typeDescriptor, memberName, this, memberOptions, serializerOptions);
-        }
-        let error = `Could not serialize '${memberName}'; don't know how to serialize type`;
-        if (typeDescriptor.hasFriendlyName()) {
-            error += ` '${typeDescriptor.ctor.name}'`;
-        }
-        this.errorHandler(new TypeError(`${error}.`));
-    }
-    convertAsObject(sourceObject, typeDescriptor, memberName, serializer, memberOptions, serializerOptions) {
-        const typeMetadata = JsonObjectMetadata.getFromConstructor(typeDescriptor.ctor);
-        let sourceTypeMetadata = JsonObjectMetadata.getFromConstructor(sourceObject.constructor);
-        if (!sourceTypeMetadata) {
-            sourceTypeMetadata = typeMetadata;
-        }
-        let targetObject;
-        const sourceMeta = sourceTypeMetadata;
-        targetObject = {};
-        const classOptions = TypedJSON.options.mergeOptions(serializer.options, sourceMeta.options);
-        sourceMeta.dataMembers.forEach((objMemberMetadata) => {
-            var _a;
-            const objMemberOptions = TypedJSON.options.mergeOptions(classOptions, objMemberMetadata.options);
-            let serialized;
-            let memberName = (_a = (objMemberOptions && objMemberOptions.protobuf
-                ? objMemberOptions.protobuf.name
-                : objMemberMetadata.name)) !== null && _a !== void 0 ? _a : objMemberMetadata.name;
-            if (sourceObject[objMemberMetadata.key] === undefined) {
-                return;
-            }
-            if (objMemberMetadata.type == null) {
-                throw new TypeError(`Could not serialize ${objMemberMetadata.name}, there is` +
-                    ` no constructor nor serialization function to use.`);
-            }
-            else if (objMemberMetadata.name === 'uid') {
-                const uuid = UUID.fromString(sourceObject[objMemberMetadata.key]);
-                if (uuid) {
-                    serialized = uuid.toBuffer();
-                    memberName += '_bytes';
-                }
-                else {
-                    serialized = sourceObject[objMemberMetadata.key];
-                    memberName += '_string';
-                }
-            }
-            else {
-                const MessageType = sourceTypeMetadata.protobuf.messageType;
-                const field = MessageType.get(objMemberMetadata.name);
-                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)) {
-                if (objMemberMetadata.type() === AnyT) {
-                    const MessageType = serializerOptions.types.get(sourceObject[objMemberMetadata.key].constructor.name);
-                    if (MessageType) {
-                        const message = MessageType.create(serialized);
-                        serialized = {
-                            type_url: sourceObject[objMemberMetadata.key].constructor.name,
-                            value: MessageType.encode(message).finish(),
-                        };
-                    }
-                    else {
-                        const message = InternalProtobufSerializer.primitiveWrapper.create({
-                            value: String(sourceObject[objMemberMetadata.key]),
-                        });
-                        serialized = {
-                            type_url: sourceObject[objMemberMetadata.key].constructor.name,
-                            value: InternalProtobufSerializer.primitiveWrapper.encode(message).finish(),
-                        };
-                    }
-                }
-                targetObject[memberName] = serialized;
-            }
-        });
-        const isAnyField = serializerOptions.field && serializerOptions.field.type === 'google.protobuf.Any';
-        if (!isAnyField && typeMetadata.knownTypes.size > 1) {
-            const MessageType = sourceTypeMetadata.protobuf.messageType;
-            const message = MessageType.create(Object.assign(Object.assign({}, targetObject), { _type: sourceTypeMetadata.protobuf.messageTypeEnum }));
-            targetObject = message;
-        }
-        else if (isAnyField) {
-            const MessageType = sourceTypeMetadata.protobuf.messageType;
-            const message = MessageType.create(targetObject);
-            targetObject = {
-                type_url: sourceObject.constructor.name,
-                value: MessageType.encode(message).finish(),
-            };
-        }
-        return targetObject;
-    }
-    /**
-     * Performs the conversion of a map of typed objects (or primitive values) into an array
-     * of simple javascript objects with `key` and `value` properties.
-     * @param sourceObject
-     * @param typeDescriptor
-     * @param memberName
-     * @param serializer
-     * @param memberOptions
-     * @param serializerOptions
-     */
-    convertAsMap(sourceObject, typeDescriptor, memberName, serializer, memberOptions, serializerOptions) {
-        const result = {};
-        sourceObject.forEach((value, key) => {
-            result[key] = serializer.convertSingleValue(value, typeDescriptor.valueType, memberName, memberOptions, serializerOptions);
-        });
-        return result;
-    }
-}
-//# sourceMappingURL=InternalProtobufSerializer.js.map

package/dist/esm5/InternalProtobufSerializer.js.map

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