@openhps/protobuf 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openhps/protobuf",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "OpenHPS Protocol Buffer Generator",
   "main": "dist/cjs/bin/generator.js",
   "bin": {

package/src/ProtobufSerializer.ts

@@ -104,7 +104,6 @@ export class ProtobufSerializer extends DataSerializer {
                     return loadPromise;
                 })
                 .then(() => {
-                    console.log(ProtobufSerializer.root.toJSON());
                     resolve();
                 })
                 .catch(reject);

package/src/generator/ObjectGenerator.ts

@@ -35,6 +35,7 @@ export class ObjectGenerator extends ProtobufGenerator<Object> { // eslint-disab
     ): TypeMapping {
         switch (type.ctor) {
             case String:
+            case Date:
                 return {
                     syntax: 'string',
                 };
@@ -348,7 +349,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) => {

package/src/generator/ProjectGenerator.ts

@@ -13,6 +13,36 @@ 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'));
+        if (packageFile === path.resolve(require.main?.path)) {
+            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');
         if (fs.existsSync(packageFile)) {
@@ -32,13 +62,15 @@ export class ProjectGenerator extends DataSerializer {
             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);
-            }
-        });
+        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);
+                }
+            });
+        }
         module.children.forEach((module) => {
             if (!this._modules.has(module.id)) {
                 this.loadModules(objects, module);
@@ -55,6 +87,7 @@ export class ProjectGenerator extends DataSerializer {
 
     static loadClasses(): Array<ObjectMetadata> {
         const declarations: Array<ObjectMetadata> = [];
+        this.findAllModules('./');
         this.knownTypes.forEach((value) => {
             const metadata = DataSerializerUtils.getOwnMetadata(value);
             if (metadata) {

package/src/generator/constants.ts

@@ -2,7 +2,7 @@ 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-2024 Maxim Van de Wynckel & Vrije Universiteit Brussel
  **/\n
 `;