@openhps/protobuf 1.0.1 → 1.0.2

package/dist/web/openhps-protobuf.js

@@ -417,7 +417,6 @@ class ProtobufSerializer extends core_1.DataSerializer {
                 return loadPromise;
             })
                 .then(() => {
-                console.log(ProtobufSerializer.root.toJSON());
                 resolve();
             })
                 .catch(reject);
@@ -522,6 +521,7 @@ class ObjectGenerator extends ProtobufGenerator_1.ProtobufGenerator {
     static typeMapping(object, type, memberOptions, buildOptions) {
         switch (type.ctor) {
             case String:
+            case Date:
                 return {
                     syntax: 'string',
                 };
@@ -795,7 +795,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) => {
@@ -840,6 +840,34 @@ const constants_1 = __webpack_require__(/*! ./constants */ "./dist/cjs/generator
  * Project generator
  */
 class ProjectGenerator extends core_1.DataSerializer {
+    static findAllModules(dir) {
+        var _a;
+        const packageFile = path.resolve(path.join(dir, 'package.json'));
+        if (packageFile === path.resolve((_a = __webpack_require__.c[__webpack_require__.s]) === null || _a === void 0 ? void 0 : _a.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 = Object.assign(Object.assign({}, dependencies), devDependencies);
+            // Get the names of all modules
+            const allModuleNames = Object.keys(allDependencies);
+            const allModules = allModuleNames
+                .map((name) => {
+                try {
+                    __webpack_require__("./dist/cjs/generator sync recursive")(name);
+                    return __webpack_require__.c[/*require.resolve*/(__webpack_require__("./dist/cjs/generator sync recursive").resolve(name))];
+                }
+                catch (error) {
+                    return null;
+                }
+            })
+                .filter(Boolean);
+            return allModules;
+        }
+    }
     static findModule(dir) {
         const packageFile = path.join(dir, 'package.json');
         if (fs.existsSync(packageFile)) {
@@ -859,13 +887,15 @@ class ProjectGenerator extends core_1.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*/(__webpack_require__("./dist/cjs/generator sync recursive").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*/(__webpack_require__("./dist/cjs/generator sync recursive").resolve(module.id))));
+                    this._packages.add(childModule.prototype._module);
+                }
+            });
+        }
         module.children.forEach((module) => {
             if (!this._modules.has(module.id)) {
                 this.loadModules(objects, module);
@@ -880,6 +910,7 @@ class ProjectGenerator extends core_1.DataSerializer {
     }
     static loadClasses() {
         const declarations = [];
+        this.findAllModules('./');
         this.knownTypes.forEach((value) => {
             const metadata = core_1.DataSerializerUtils.getOwnMetadata(value);
             if (metadata) {
@@ -1004,7 +1035,7 @@ 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-2024 Maxim Van de Wynckel & Vrije Universiteit Brussel
  **/\n
 `;
 exports.COMMON = exports.HEADER +