@common-stack/generate-plugin 5.0.6-alpha.5 → 5.0.6-alpha.8

package/lib/generators/add-fullstack/updates/index.d.ts

@@ -0,0 +1,2 @@
+export * from './jenkinsfileUpdate';
+export * from './packageJsonUpdate';

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.cjs

@@ -0,0 +1,36 @@
+'use strict';var fs=require('fs');function updateJenkinsFile(filePath, name) {
+    const paramsToUpdate = {
+        BASE_NAMESPACE: name,
+        CONNECTION_ID: name,
+        WORKSPACE_ID: name,
+        UNIQUE_NAME: name,
+    };
+    let jenkinsFileContent = '';
+    if (fs.existsSync(filePath)) {
+        jenkinsFileContent = fs.readFileSync(filePath, 'utf-8');
+    }
+    let labelExists = false;
+    const updatedContent = jenkinsFileContent.split('\n').map(line => {
+        // Check if the label is already defined and skip modifying it
+        if (line.includes('label') && line.includes('kubernetes')) {
+            labelExists = true;
+        }
+        // Update only the specified parameters
+        for (const param in paramsToUpdate) {
+            if (line.includes(`string(name: '${param}'`)) {
+                return line.replace(/defaultValue: '.*'/, `defaultValue: '${paramsToUpdate[param]}'`);
+            }
+        }
+        return line;
+    }).join('\n');
+    // Add missing parameters if they don't exist
+    Object.keys(paramsToUpdate).forEach(param => {
+        if (!updatedContent.includes(`string(name: '${param}'`)) {
+            updatedContent.concat(`string(name: '${param}', defaultValue: '${paramsToUpdate[param]}', description: '${param.replace(/_/g, ' ').toLowerCase()}')\n`);
+        }
+    });
+    // Only write back to the file if we have made changes
+    if (!labelExists || Object.keys(paramsToUpdate).some(param => !updatedContent.includes(`string(name: '${param}'`))) {
+        fs.writeFileSync(filePath, updatedContent, 'utf-8');
+    }
+}exports.updateJenkinsFile=updateJenkinsFile;//# sourceMappingURL=jenkinsfileUpdate.cjs.map

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"jenkinsfileUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/jenkinsfileUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"kCAGgB,SAAA,iBAAiB,CAAC,QAAgB,EAAE,IAAY,EAAA;AAC5D,IAAA,MAAM,cAAc,GAAG;AACnB,QAAA,cAAc,EAAE,IAAI;AACpB,QAAA,aAAa,EAAE,IAAI;AACnB,QAAA,YAAY,EAAE,IAAI;AAClB,QAAA,WAAW,EAAE,IAAI;KACpB,CAAC;IAEF,IAAI,kBAAkB,GAAG,EAAE,CAAC;AAC5B,IAAA,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QACzB,kBAAkB,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC3D;IAED,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,IAAA,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAG;;AAE7D,QAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvD,WAAW,GAAG,IAAI,CAAC;SACtB;;AAGD,QAAA,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE;YAChC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;AAC1C,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAA,cAAc,CAAC,KAAK,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACzF;SACJ;AACD,QAAA,OAAO,IAAI,CAAC;AAChB,KAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;IAGd,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,IAAG;QACxC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;YACrD,cAAc,CAAC,MAAM,CACjB,CAAiB,cAAA,EAAA,KAAK,qBAAqB,cAAc,CAAC,KAAK,CAAC,CAAoB,iBAAA,EAAA,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAM,IAAA,CAAA,CACnI,CAAC;SACL;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAiB,cAAA,EAAA,KAAK,CAAG,CAAA,CAAA,CAAC,CAAC,EAAE;QAChH,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;KACvD;AACL"}

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.d.ts

@@ -0,0 +1 @@
+export declare function updateJenkinsFile(filePath: string, name: string): void;

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.mjs

@@ -0,0 +1,36 @@
+import fs__default from'fs';function updateJenkinsFile(filePath, name) {
+    const paramsToUpdate = {
+        BASE_NAMESPACE: name,
+        CONNECTION_ID: name,
+        WORKSPACE_ID: name,
+        UNIQUE_NAME: name,
+    };
+    let jenkinsFileContent = '';
+    if (fs__default.existsSync(filePath)) {
+        jenkinsFileContent = fs__default.readFileSync(filePath, 'utf-8');
+    }
+    let labelExists = false;
+    const updatedContent = jenkinsFileContent.split('\n').map(line => {
+        // Check if the label is already defined and skip modifying it
+        if (line.includes('label') && line.includes('kubernetes')) {
+            labelExists = true;
+        }
+        // Update only the specified parameters
+        for (const param in paramsToUpdate) {
+            if (line.includes(`string(name: '${param}'`)) {
+                return line.replace(/defaultValue: '.*'/, `defaultValue: '${paramsToUpdate[param]}'`);
+            }
+        }
+        return line;
+    }).join('\n');
+    // Add missing parameters if they don't exist
+    Object.keys(paramsToUpdate).forEach(param => {
+        if (!updatedContent.includes(`string(name: '${param}'`)) {
+            updatedContent.concat(`string(name: '${param}', defaultValue: '${paramsToUpdate[param]}', description: '${param.replace(/_/g, ' ').toLowerCase()}')\n`);
+        }
+    });
+    // Only write back to the file if we have made changes
+    if (!labelExists || Object.keys(paramsToUpdate).some(param => !updatedContent.includes(`string(name: '${param}'`))) {
+        fs__default.writeFileSync(filePath, updatedContent, 'utf-8');
+    }
+}export{updateJenkinsFile};//# sourceMappingURL=jenkinsfileUpdate.mjs.map

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"jenkinsfileUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/jenkinsfileUpdate.ts"],"sourcesContent":[null],"names":["fs"],"mappings":"4BAGgB,SAAA,iBAAiB,CAAC,QAAgB,EAAE,IAAY,EAAA;AAC5D,IAAA,MAAM,cAAc,GAAG;AACnB,QAAA,cAAc,EAAE,IAAI;AACpB,QAAA,aAAa,EAAE,IAAI;AACnB,QAAA,YAAY,EAAE,IAAI;AAClB,QAAA,WAAW,EAAE,IAAI;KACpB,CAAC;IAEF,IAAI,kBAAkB,GAAG,EAAE,CAAC;AAC5B,IAAA,IAAIA,WAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QACzB,kBAAkB,GAAGA,WAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC3D;IAED,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,IAAA,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAG;;AAE7D,QAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvD,WAAW,GAAG,IAAI,CAAC;SACtB;;AAGD,QAAA,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE;YAChC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;AAC1C,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAA,cAAc,CAAC,KAAK,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACzF;SACJ;AACD,QAAA,OAAO,IAAI,CAAC;AAChB,KAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;IAGd,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,IAAG;QACxC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;YACrD,cAAc,CAAC,MAAM,CACjB,CAAiB,cAAA,EAAA,KAAK,qBAAqB,cAAc,CAAC,KAAK,CAAC,CAAoB,iBAAA,EAAA,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAM,IAAA,CAAA,CACnI,CAAC;SACL;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAiB,cAAA,EAAA,KAAK,CAAG,CAAA,CAAA,CAAC,CAAC,EAAE;QAChHA,WAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;KACvD;AACL"}

package/lib/generators/add-fullstack/updates/packageJsonUpdate.cjs

@@ -0,0 +1,8 @@
+'use strict';var devkit=require('@nx/devkit'),path=require('path');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function updatePackageJson(tree, projectRoot, name) {
+    const packageJsonPath = path__namespace.join(projectRoot, 'package.json');
+    devkit.updateJson(tree, packageJsonPath, (packageJson) => {
+        packageJson['name'] = name;
+        // You can add more custom logic here if needed
+        return packageJson;
+    });
+}exports.updatePackageJson=updatePackageJson;//# sourceMappingURL=packageJsonUpdate.cjs.map

package/lib/generators/add-fullstack/updates/packageJsonUpdate.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"packageJsonUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":["path","updateJson"],"mappings":"0aAGgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAY,EAAA;IAC3E,MAAM,eAAe,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC/DC,iBAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAW,KAAI;AAC9C,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;;AAE3B,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP"}

package/lib/generators/add-fullstack/updates/packageJsonUpdate.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function updatePackageJson(tree: Tree, projectRoot: string, name: string): void;

package/lib/generators/add-fullstack/updates/packageJsonUpdate.mjs

@@ -0,0 +1,8 @@
+import {updateJson}from'@nx/devkit';import*as path from'path';function updatePackageJson(tree, projectRoot, name) {
+    const packageJsonPath = path.join(projectRoot, 'package.json');
+    updateJson(tree, packageJsonPath, (packageJson) => {
+        packageJson['name'] = name;
+        // You can add more custom logic here if needed
+        return packageJson;
+    });
+}export{updatePackageJson};//# sourceMappingURL=packageJsonUpdate.mjs.map

package/lib/generators/add-fullstack/updates/packageJsonUpdate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"packageJsonUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"uEAGgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAY,EAAA;IAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC/D,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAW,KAAI;AAC9C,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;;AAE3B,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP"}

package/lib/generators/add-moleculer/files/package.json

@@ -26,12 +26,12 @@
     },
     "dependencies": {
         "@casl/ability": "^4.1.5",
-        "@cdm-logger/client": "9.0.3",
+        "@cdm-logger/client": "^9.0.3",
         "@cdm-logger/server": "^9.0.3",
         "@common-stack/client-core": "5.0.6-alpha.3",
         "@common-stack/core": "5.0.6-alpha.3",
         "@common-stack/server-core": "5.0.6-alpha.3",
-        "@common-stack/server-stack": "5.0.6-alpha.3",
+        "@common-stack/server-stack": "5.0.6-alpha.7",
         "@common-stack/store-mongo": "5.0.6-alpha.3",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "app-root-path": "^3.0.0",
@@ -41,11 +41,11 @@
         "dotenv": "^7.0.0",
         "envalid": "~7.2.2",
         "esm": "^3.2.25",
+        "graphql-tools": "^9.0.0",
         "helmet": "^3.21.2",
         "inversify": "^6.0.2",
         "ioredis": "^4.14.1",
         "lodash": "^4.17.15",
-        "graphql-tools": "^8.0.0",
         "moleculer": "^0.14.2",
         "mongoose": "^6.3.3",
         "mongoose-execution-time": "^1.1.0",

package/lib/generators/add-moleculer/generator.cjs

@@ -1,19 +1,17 @@
 'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function addMoleculerGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'moleculer-server';
-        const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
-        // addProjectConfiguration(tree, options.name, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
-        devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
-        devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = options.name;
-            return packageJson;
-        });
-        yield devkit.formatFiles(tree);
+        const configs = Object.assign({}, options);
+        return yield generateMoleculer(tree, configs);
     });
-}exports.addMoleculerGenerator=addMoleculerGenerator;exports.default=addMoleculerGenerator;//# sourceMappingURL=generator.cjs.map
+}
+const generateMoleculer = (tree, options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'moleculer-server';
+    const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
+    devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
+    devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson['name'] = options.name;
+        return packageJson;
+    });
+    yield devkit.formatFiles(tree);
+});exports.addMoleculerGenerator=addMoleculerGenerator;exports.default=addMoleculerGenerator;exports.generateMoleculer=generateMoleculer;//# sourceMappingURL=generator.cjs.map

package/lib/generators/add-moleculer/generator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":["getValid","isValid","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;;QACxF,MAAM,WAAW,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,kBAAkB,CAAC;QACjE,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGD,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;AAO/G,QAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AACnC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":["__awaiter","getValid","isValid","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;AACxF,QAAA,MAAM,OAAO,GAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAY,OAAO,CAAC,CAAC;AAClC,QAAA,OAAO,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD,CAAA,CAAA;AAAA,CAAA;MAEY,iBAAiB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIA,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAChE,MAAM,WAAW,GAAG,CAAA,EAAA,GAAAC,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,kBAAkB,CAAC;IACjE,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGD,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AAE/G,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AACnC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

package/lib/generators/add-moleculer/generator.d.ts

@@ -1,4 +1,5 @@
 import { Tree } from '@nx/devkit';
 import { AddMoleculerGeneratorSchema } from './schema';
 export declare function addMoleculerGenerator(tree: Tree, options: AddMoleculerGeneratorSchema): Promise<void>;
+export declare const generateMoleculer: (tree: Tree, options: any) => Promise<void>;
 export default addMoleculerGenerator;

package/lib/generators/add-moleculer/generator.mjs

@@ -1,19 +1,17 @@
 import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {getValid,isValid}from'../../utils/index.mjs';function addMoleculerGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'moleculer-server';
-        const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-        // addProjectConfiguration(tree, options.name, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
-        generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
-        updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = options.name;
-            return packageJson;
-        });
-        yield formatFiles(tree);
+        const configs = Object.assign({}, options);
+        return yield generateMoleculer(tree, configs);
     });
-}export{addMoleculerGenerator,addMoleculerGenerator as default};//# sourceMappingURL=generator.mjs.map
+}
+const generateMoleculer = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'moleculer-server';
+    const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
+    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson['name'] = options.name;
+        return packageJson;
+    });
+    yield formatFiles(tree);
+});export{addMoleculerGenerator,addMoleculerGenerator as default,generateMoleculer};//# sourceMappingURL=generator.mjs.map

package/lib/generators/add-moleculer/generator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2KAKsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;;QACxF,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,kBAAkB,CAAC;QACjE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;AAO/G,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AACnC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-moleculer/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2KAKsB,SAAA,qBAAqB,CAAC,IAAU,EAAE,OAAoC,EAAA;;AACxF,QAAA,MAAM,OAAO,GAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAY,OAAO,CAAC,CAAC;AAClC,QAAA,OAAO,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD,CAAA,CAAA;AAAA,CAAA;MAEY,iBAAiB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAChE,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,kBAAkB,CAAC;IACjE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AAE/G,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;AACnC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

package/lib/generators/add-server-package/files/package.json

@@ -4,8 +4,8 @@
     "description": "Sample core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
-    "main": "lib/index.js",
     "type": "module",
+    "main": "lib/index.js",
     "module": "lib/index.js",
     "typings": "lib/index.d.ts",
     "scripts": {
@@ -61,7 +61,7 @@
     },
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
-        "@cdm-logger/server": "^7.0.12",
+        "@cdm-logger/server": ">=9.0.3",
         "@common-stack/core": "5.0.6-alpha.3",
         "@common-stack/server-core": "5.0.6-alpha.3",
         "@common-stack/store-mongo": "5.0.6-alpha.3",

package/lib/generators/add-server-package/generator.cjs

@@ -1,19 +1,17 @@
 'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function addServerPackageGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'server-package';
-        const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
-        // addProjectConfiguration(tree, options.name, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
-        devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
-        devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = projectName;
-            return packageJson;
-        });
-        yield devkit.formatFiles(tree);
+        const configs = Object.assign({}, options);
+        return yield generateServerPackage(tree, configs);
     });
-}exports.addServerPackageGenerator=addServerPackageGenerator;exports.default=addServerPackageGenerator;//# sourceMappingURL=generator.cjs.map
+}
+const generateServerPackage = (tree, options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'server-package';
+    const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
+    devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
+    devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson['name'] = projectName;
+        return packageJson;
+    });
+    yield devkit.formatFiles(tree);
+});exports.addServerPackageGenerator=addServerPackageGenerator;exports.default=addServerPackageGenerator;exports.generateServerPackage=generateServerPackage;//# sourceMappingURL=generator.cjs.map

package/lib/generators/add-server-package/generator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-server-package/generator.ts"],"sourcesContent":[null],"names":["getValid","isValid","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKsB,SAAA,yBAAyB,CAAC,IAAU,EAAE,OAAwC,EAAA;;;QAChG,MAAM,WAAW,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,gBAAgB,CAAC;QAC/D,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGD,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;AAO/G,QAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-server-package/generator.ts"],"sourcesContent":[null],"names":["__awaiter","getValid","isValid","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKsB,SAAA,yBAAyB,CAAC,IAAU,EAAE,OAAwC,EAAA;;AAChG,QAAA,MAAM,OAAO,GAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAY,OAAO,CAAC,CAAC;AAClC,QAAA,OAAO,MAAM,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACrD,CAAA,CAAA;AAAA,CAAA;MAEY,qBAAqB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIA,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IACpE,MAAM,WAAW,GAAG,CAAA,EAAA,GAAAC,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,gBAAgB,CAAC;IAC/D,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGD,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AAE/G,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

package/lib/generators/add-server-package/generator.d.ts

@@ -1,4 +1,5 @@
 import { Tree } from '@nx/devkit';
 import { AddServerPackageGeneratorSchema } from './schema';
 export declare function addServerPackageGenerator(tree: Tree, options: AddServerPackageGeneratorSchema): Promise<void>;
+export declare const generateServerPackage: (tree: Tree, options: any) => Promise<void>;
 export default addServerPackageGenerator;

package/lib/generators/add-server-package/generator.mjs

@@ -1,19 +1,17 @@
 import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {getValid,isValid}from'../../utils/index.mjs';function addServerPackageGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'server-package';
-        const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-        // addProjectConfiguration(tree, options.name, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
-        generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
-        updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = projectName;
-            return packageJson;
-        });
-        yield formatFiles(tree);
+        const configs = Object.assign({}, options);
+        return yield generateServerPackage(tree, configs);
     });
-}export{addServerPackageGenerator,addServerPackageGenerator as default};//# sourceMappingURL=generator.mjs.map
+}
+const generateServerPackage = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'server-package';
+    const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
+    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson['name'] = projectName;
+        return packageJson;
+    });
+    yield formatFiles(tree);
+});export{addServerPackageGenerator,addServerPackageGenerator as default,generateServerPackage};//# sourceMappingURL=generator.mjs.map

package/lib/generators/add-server-package/generator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-server-package/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2KAKsB,SAAA,yBAAyB,CAAC,IAAU,EAAE,OAAwC,EAAA;;;QAChG,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,gBAAgB,CAAC;QAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;AAO/G,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-server-package/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2KAKsB,SAAA,yBAAyB,CAAC,IAAU,EAAE,OAAwC,EAAA;;AAChG,QAAA,MAAM,OAAO,GAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAY,OAAO,CAAC,CAAC;AAClC,QAAA,OAAO,MAAM,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACrD,CAAA,CAAA;AAAA,CAAA;MAEY,qBAAqB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IACpE,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,gBAAgB,CAAC;IAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AAE/G,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

package/lib/index.cjs

@@ -1 +1 @@
-'use strict';var generator=require('./generators/add-frontend/generator.cjs'),generator$1=require('./generators/add-backend/generator.cjs'),generator$2=require('./generators/add-fullstack/generator.cjs'),generator$3=require('./generators/add-moleculer/generator.cjs'),generator$4=require('./generators/add-browser-package/generator.cjs'),generator$5=require('./generators/add-client-package/generator.cjs'),generator$6=require('./generators/add-core-package/generator.cjs'),generator$7=require('./generators/add-server-package/generator.cjs'),executor=require('./executors/update-deploy-version/executor.cjs'),executor$1=require('./executors/sort-package-json/executor.cjs');exports.addFrontendGenerator=generator.addFrontendGenerator;exports.addBackendGenerator=generator$1.addBackendGenerator;exports.addFullstackGenerator=generator$2.addFullstackGenerator;exports.addMoleculerGenerator=generator$3.addMoleculerGenerator;exports.addBrowserPackageGenerator=generator$4.addBrowserPackageGenerator;exports.addClientPackageGenerator=generator$5.addClientPackageGenerator;exports.addCorePackageGenerator=generator$6.addCorePackageGenerator;exports.addServerPackageGenerator=generator$7.addServerPackageGenerator;exports.updateDeployVersion=executor.runExecutor;exports.sortPackageJson=executor$1.runExecutor;//# sourceMappingURL=index.cjs.map
+'use strict';var generator=require('./generators/add-frontend/generator.cjs'),generator$1=require('./generators/add-backend/generator.cjs'),generator$2=require('./generators/add-fullstack/generator.cjs'),generator$3=require('./generators/add-moleculer/generator.cjs'),generator$4=require('./generators/add-browser-package/generator.cjs'),generator$5=require('./generators/add-client-package/generator.cjs'),generator$6=require('./generators/add-core-package/generator.cjs'),generator$7=require('./generators/add-server-package/generator.cjs'),executor=require('./executors/update-deploy-version/executor.cjs'),executor$1=require('./executors/sort-package-json/executor.cjs');exports.addFrontendGenerator=generator.addFrontendGenerator;exports.generateFrontend=generator.generateFrontend;exports.addBackendGenerator=generator$1.addBackendGenerator;exports.generateBackend=generator$1.generateBackend;exports.addFullstackGenerator=generator$2.addFullstackGenerator;exports.addMoleculerGenerator=generator$3.addMoleculerGenerator;exports.generateMoleculer=generator$3.generateMoleculer;exports.addBrowserPackageGenerator=generator$4.addBrowserPackageGenerator;exports.generateBrowserPackage=generator$4.generateBrowserPackage;exports.addClientPackageGenerator=generator$5.addClientPackageGenerator;exports.generateClientPackage=generator$5.generateClientPackage;exports.addCorePackageGenerator=generator$6.addCorePackageGenerator;exports.generateCorePackage=generator$6.generateCorePackage;exports.addServerPackageGenerator=generator$7.addServerPackageGenerator;exports.generateServerPackage=generator$7.generateServerPackage;exports.updateDeployVersion=executor.runExecutor;exports.sortPackageJson=executor$1.runExecutor;//# sourceMappingURL=index.cjs.map

package/lib/index.mjs

@@ -1 +1 @@
-export{addFrontendGenerator}from'./generators/add-frontend/generator.mjs';export{addBackendGenerator}from'./generators/add-backend/generator.mjs';export{addFullstackGenerator}from'./generators/add-fullstack/generator.mjs';export{addMoleculerGenerator}from'./generators/add-moleculer/generator.mjs';export{addBrowserPackageGenerator}from'./generators/add-browser-package/generator.mjs';export{addClientPackageGenerator}from'./generators/add-client-package/generator.mjs';export{addCorePackageGenerator}from'./generators/add-core-package/generator.mjs';export{addServerPackageGenerator}from'./generators/add-server-package/generator.mjs';export{runExecutor as updateDeployVersion}from'./executors/update-deploy-version/executor.mjs';export{runExecutor as sortPackageJson}from'./executors/sort-package-json/executor.mjs';//# sourceMappingURL=index.mjs.map
+export{addFrontendGenerator,generateFrontend}from'./generators/add-frontend/generator.mjs';export{addBackendGenerator,generateBackend}from'./generators/add-backend/generator.mjs';export{addFullstackGenerator}from'./generators/add-fullstack/generator.mjs';export{addMoleculerGenerator,generateMoleculer}from'./generators/add-moleculer/generator.mjs';export{addBrowserPackageGenerator,generateBrowserPackage}from'./generators/add-browser-package/generator.mjs';export{addClientPackageGenerator,generateClientPackage}from'./generators/add-client-package/generator.mjs';export{addCorePackageGenerator,generateCorePackage}from'./generators/add-core-package/generator.mjs';export{addServerPackageGenerator,generateServerPackage}from'./generators/add-server-package/generator.mjs';export{runExecutor as updateDeployVersion}from'./executors/update-deploy-version/executor.mjs';export{runExecutor as sortPackageJson}from'./executors/sort-package-json/executor.mjs';//# sourceMappingURL=index.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "5.0.6-alpha.5",
+    "version": "5.0.6-alpha.8",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -17,6 +17,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
+        "@common-stack/rollup-vite-utils": "5.0.6-alpha.7",
         "@nx/devkit": "19.5.1",
         "tslib": "^2.3.0"
     },
@@ -25,5 +26,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "f61120cda9ddd24678443f3e157d5aae46fa214d"
+    "gitHead": "d9c290196527ca50f45b5cf95d48f83c5bb9c8d1"
 }

package/src/constants/index.ts

@@ -1,2 +1,3 @@
 export const FRAMEWORK_ANTUI = 'antui';
-export const FRAMEWORK_CHAKRAUI = 'chakraui';
+export const FRAMEWORK_CHAKRAUI = 'chakraui';
+export const FRAMEWORK_TAILWINDUI = 'tailwindui';

package/src/generators/add-backend/generator.ts

@@ -4,11 +4,15 @@ import { AddBackendGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
 export async function addBackendGenerator(tree: Tree, options: AddBackendGeneratorSchema) {
-    // const basePath = process.cwd();
     const projectName = isValid(options.ns) ? `backend-${getValid(options.ns)}-server` : 'backend-server';
+    const configs: any = {...options, name: projectName};
+
+    return await generateBackend(tree, configs);
+}
+
+export const generateBackend = async (tree: Tree, options: any) => {
+    const projectName = getValid(options.name) ?? 'backend-server';
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-    // const projectSrc = `${projectRoot}/src`;
-    
     // resetProject(`${basePath}/${projectRoot}`);
     
     // addProjectConfiguration(tree, framework, {
@@ -17,7 +21,7 @@ export async function addBackendGenerator(tree: Tree, options: AddBackendGenerat
     //     sourceRoot: projectSrc,
     //     targets: {},
     // });
-    
+
     generateFiles(tree, path.join(__dirname, 'files'), projectRoot, {});
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
         packageJson['name'] = projectName;

package/src/generators/add-browser-package/generator.ts

@@ -4,19 +4,20 @@ import { AddBrowserPackageGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
 export async function addBrowserPackageGenerator(tree: Tree, options: AddBrowserPackageGeneratorSchema) {
+    const configs: any = {...options};
+    return await generateBrowserPackage(tree, configs);
+}
+
+export const generateBrowserPackage = async (tree: Tree, options: any) => {
     const projectName = getValid(options.name) ?? 'browser-package';
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-    // addProjectConfiguration(tree, options.name, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: `${projectRoot}/src`,
-    //     targets: {},
-    // });
+
     generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
         packageJson['name'] = projectName;
         return packageJson;
     });
+
     await formatFiles(tree);
 }
 

package/src/generators/add-client-package/generator.ts

@@ -4,19 +4,20 @@ import { AddClientPackageGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
 export async function addClientPackageGenerator(tree: Tree, options: AddClientPackageGeneratorSchema) {
+    const configs: any = {...options};
+    return await generateClientPackage(tree, configs);
+}
+
+export const generateClientPackage = async (tree: Tree, options: any) => {
     const projectName = getValid(options.name) ?? 'client-package';
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-    // addProjectConfiguration(tree, options.name, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: `${projectRoot}/src`,
-    //     targets: {},
-    // });
+
     generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
         packageJson['name'] = projectName;
         return packageJson;
     });
+
     await formatFiles(tree);
 }
 

package/src/generators/add-core-package/generator.ts

@@ -4,19 +4,20 @@ import { AddCorePackageGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
 export async function addCorePackageGenerator(tree: Tree, options: AddCorePackageGeneratorSchema) {
+    const configs: any = {...options};
+    return await generateCorePackage(tree, configs);
+}
+
+export const generateCorePackage = async (tree: Tree, options: any) => {
     const projectName = getValid(options.name) ?? 'core-package';
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
-    // addProjectConfiguration(tree, options.name, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: `${projectRoot}/src`,
-    //     targets: {},
-    // });
+    
     generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
         packageJson['name'] = projectName;
         return packageJson;
     });
+    
     await formatFiles(tree);
 }
 

package/src/generators/add-frontend/frameworks/tailwindui/entry.client.tsx.template

@@ -0,0 +1,90 @@
+/**
+ * By default, Remix will handle hydrating your app on the client for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.client
+ */
+import * as React from 'react';
+import 'reflect-metadata';
+import { RemixBrowser } from '@remix-run/react';
+import { startTransition, StrictMode } from 'react';
+import { hydrateRoot } from 'react-dom/client';
+import { ApolloProvider } from '@apollo/client/index.js';
+import { SlotFillProvider, removeUniversalPortals } from '@common-stack/components-pro';
+import { InversifyProvider } from '@common-stack/client-react';
+import { Provider as ReduxProvider } from 'react-redux';
+import { PersistGate } from 'redux-persist/integration/react';
+import { persistStore } from 'redux-persist';
+import i18next from 'i18next';
+import { I18nextProvider, initReactI18next } from 'react-i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
+import Backend from 'i18next-http-backend';
+// @ts-ignore
+import { getInitialNamespaces } from 'remix-i18next/client';
+// @ts-ignore
+import { createReduxStore } from '@app/frontend-stack-react/config/redux-config.js';
+// @ts-ignore
+import { createClientContainer } from '@app/frontend-stack-react/config/client.service';
+// @ts-ignore
+import clientModules from '@app/frontend-stack-react/modules.js';
+// @ts-ignore
+import config from '@app/cde-webconfig.json';
+
+const { apolloClient: client, container, serviceFunc } = createClientContainer();
+const { store } = createReduxStore(client, serviceFunc(), container);
+const persistor = persistStore(store);
+
+(window as any).__remixStore = store;
+removeUniversalPortals((window as any).__SLOT_FILLS__ || []);
+
+async function hydrate() {
+    if (!i18next.isInitialized && config.i18n.enabled) {
+        await i18next
+            .use(initReactI18next)
+            .use(LanguageDetector)
+            .use(Backend)
+            .init({
+                fallbackLng: config.i18n.fallbackLng,
+                defaultNS: config.i18n.defaultNS,
+                react: config.i18n.react,
+                supportedLngs: config.i18n.supportedLngs,
+                backend: config.i18n.backend,
+                ns: getInitialNamespaces(),
+                detection: {
+                    order: ['htmlTag'],
+                    caches: [],
+                },
+            });
+    }
+    startTransition(() => {
+        hydrateRoot(
+            document,
+            (
+                <I18nextProvider i18n={i18next}>
+                    <StrictMode>
+                        <ReduxProvider store={store}>
+                            <SlotFillProvider>
+                                <InversifyProvider container={container} modules={clientModules}>
+                                    <PersistGate loading={null} persistor={persistor}>
+                                        {() => (
+                                            <ApolloProvider client={client}>
+                                                <RemixBrowser />
+                                            </ApolloProvider>
+                                        )}
+                                    </PersistGate>
+                                </InversifyProvider>
+                            </SlotFillProvider>
+                        </ReduxProvider>
+                    </StrictMode>
+                </I18nextProvider>
+            ) as any,
+        );
+    });
+}
+
+if (window.requestIdleCallback) {
+    window.requestIdleCallback(hydrate);
+} else {
+    // Safari doesn't support requestIdleCallback
+    // https://caniuse.com/requestidlecallback
+    window.setTimeout(hydrate, 1);
+}