@common-stack/generate-plugin 6.0.6-alpha.1 → 6.0.6-alpha.100

package/lib/utils/index.mjs

@@ -1,6 +1,32 @@
-import'node:fs';const isValid = (val) => {
+import'node:fs';import*as path from'path';const isValid = (val) => {
     return (val && val.trim()) ? true : false;
 };
 const getValid = (val) => {
     return val ? val.trim() : null;
-};export{getValid,isValid};//# sourceMappingURL=index.mjs.map
+};
+const convertHttpsToSsh = (url) => {
+    const httpsPattern = /^https:\/\/(.+?)\/(.+?)\/(.+?)(\.git)?$/;
+    const match = url.match(httpsPattern);
+    if (match) {
+        const domain = match[1];
+        const user = match[2];
+        const repo = match[3];
+        return `git@${domain}:${user}/${repo}.git`;
+    }
+    else {
+        throw new Error("Invalid HTTPS URL format");
+    }
+};
+const readDir = (tree, dirPath) => {
+    const files = tree.children(dirPath);
+    const result = {};
+    files.forEach(file => {
+        if (tree.isFile(path.join(dirPath, file))) {
+            result[file] = JSON.parse(tree.read(path.join(dirPath, file)).toString());
+        }
+        else {
+            result[file] = readDir(tree, path.join(dirPath, file));
+        }
+    });
+    return result;
+};export{convertHttpsToSsh,getValid,isValid,readDir};//# sourceMappingURL=index.mjs.map

package/lib/utils/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../src/utils/index.ts"],"sourcesContent":[null],"names":[],"mappings":"gBAWa,MAAA,OAAO,GAAG,CAAC,GAAW,KAAI;AACnC,IAAA,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC;AAC9C,EAAC;AAEY,MAAA,QAAQ,GAAG,CAAC,GAAW,KAAI;AACpC,IAAA,OAAO,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;AACnC"}
+{"version":3,"file":"index.mjs","sources":["../../src/utils/index.ts"],"sourcesContent":[null],"names":[],"mappings":"0CAaa,MAAA,OAAO,GAAG,CAAC,GAAW,KAAI;AACnC,IAAA,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC;AAC9C,EAAC;AAEY,MAAA,QAAQ,GAAG,CAAC,GAAW,KAAI;AACpC,IAAA,OAAO,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;AACnC,EAAC;AAEY,MAAA,iBAAiB,GAAG,CAAC,GAAG,KAAI;IACrC,MAAM,YAAY,GAAG,yCAAyC,CAAC;IAE/D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEtC,IAAI,KAAK,EAAE;AACP,QAAA,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACxB,QAAA,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACtB,QAAA,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AAEtB,QAAA,OAAO,OAAO,MAAM,CAAA,CAAA,EAAI,IAAI,CAAI,CAAA,EAAA,IAAI,MAAM,CAAC;KAC9C;SAAM;AACH,QAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC/C;AACL,EAAC;MAEY,OAAO,GAAG,CAAC,IAAU,EAAE,OAAe,KAAI;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,EAAE,CAAC;AAClB,IAAA,KAAK,CAAC,OAAO,CAAC,IAAI,IAAG;AACjB,QAAA,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE;YACvC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC7E;aAAM;AACH,YAAA,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;SAC1D;AACL,KAAC,CAAC,CAAC;AACH,IAAA,OAAO,MAAM,CAAC;AAClB"}

package/lib/utils/syncConfig.cjs

@@ -0,0 +1,116 @@
+'use strict';var devkit=require('@nx/devkit'),path=require('path'),parser=require('@babel/parser'),traverse=require('@babel/traverse'),lodash=require('lodash'),index=require('./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);const DEFAULT_PACKAGE = 'core';
+const syncConfig = (tree, projectRoot, options) => {
+    var _a, _b;
+    // synchronize package in package.json and lerna.json
+    syncPackage(tree, options);
+    const configPath = 'cde-config.json';
+    if (tree.exists(configPath)) {
+        try {
+            const directory = (_a = index.getValid(options.directory)) !== null && _a !== void 0 ? _a : 'packages';
+            const type = (_b = index.getValid(options.type)) !== null && _b !== void 0 ? _b : DEFAULT_PACKAGE;
+            const moduleName = options.name; // name should not be null
+            const envConfigContent = getEnvConfigFileContent(tree, projectRoot);
+            const localesContent = getLocalesFileContent(tree, projectRoot);
+            const packageContent = {
+                type: `packages-${type}`,
+                files: {
+                    "config/env-config.ts": envConfigContent !== null && envConfigContent !== void 0 ? envConfigContent : {},
+                    "cdm-locales": localesContent !== null && localesContent !== void 0 ? localesContent : {},
+                },
+            };
+            devkit.updateJson(tree, configPath, (config) => {
+                lodash.set(config, [directory, 'modules', moduleName, type], packageContent);
+                return config;
+            });
+        }
+        catch (e) {
+            console.error('Failed to change env-config', e);
+        }
+    }
+    else {
+        console.log('No exist env-config file at ', path__namespace.join(tree.root, configPath));
+    }
+};
+const getEnvConfigFileContent = (tree, projectRoot) => {
+    const filePath = path__namespace.join(projectRoot, 'src/config/env-config.ts');
+    if (tree.exists(filePath)) {
+        try {
+            const result = {};
+            let fileContent = tree.read(filePath).toString();
+            const ast = parser.parse(fileContent, {
+                sourceType: 'module',
+                plugins: ['typescript', 'dynamicImport'],
+            });
+            traverse.default(ast, {
+                enter(astroPath) {
+                    if (astroPath.node.type === "VariableDeclarator" && astroPath.node.id.name === "config") {
+                        astroPath.node.init.arguments[1].properties.forEach(prop => {
+                            const key = prop.key.name;
+                            const callee = prop.value.callee.name;
+                            let value;
+                            if (prop.value.arguments && prop.value.arguments.length > 0) {
+                                value = {};
+                                prop.value.arguments[0].properties.forEach(p => {
+                                    if (p.value.elements && p.value.elements.length > 0) {
+                                        value[p.key.name] = [];
+                                        p.value.elements.forEach(ele => value[p.key.name].push(ele.value));
+                                    }
+                                    else {
+                                        value[p.key.name] = callee == 'json' ? JSON.parse(p.value.value) : p.value.value;
+                                    }
+                                });
+                            }
+                            else {
+                                value = '';
+                            }
+                            console.log(`${key}:`, `${callee}(${JSON.stringify(value)})`);
+                            result[key] = { type: callee, value: value };
+                        });
+                    }
+                },
+            });
+            return result;
+        }
+        catch (e) {
+            console.error('Failed to change env-config', e);
+        }
+    }
+    else {
+        console.log('No exist env-config file at ', filePath);
+    }
+    return null;
+};
+const getLocalesFileContent = (tree, projectRoot) => {
+    const dirPath = path__namespace.join(projectRoot, 'src/cdm-locales');
+    if (tree.exists(dirPath)) {
+        try {
+            return index.readDir(tree, dirPath);
+        }
+        catch (e) {
+            console.error(e);
+        }
+    }
+    else {
+        console.log('No exist cdm-locales directory at ', dirPath);
+    }
+    return null;
+};
+const syncPackage = (tree, options) => {
+    var _a;
+    const directory = (_a = index.getValid(options.directory)) !== null && _a !== void 0 ? _a : 'packages';
+    devkit.updateJson(tree, 'package.json', (packageJson) => {
+        var _a;
+        const packages = ((_a = packageJson.workspaces) === null || _a === void 0 ? void 0 : _a.packages) || [];
+        if (!packages.includes(`${directory}/*`)) {
+            packageJson.workspaces.packages.push(`${directory}/*`);
+        }
+        return packageJson;
+    });
+    devkit.updateJson(tree, 'lerna.json', (lernaJson) => {
+        const packages = lernaJson.packages || [];
+        if (!packages.includes(`${directory}/*`)) {
+            lernaJson.packages.push(`${directory}/*`);
+        }
+        return lernaJson;
+    });
+};exports.syncConfig=syncConfig;exports.syncPackage=syncPackage;//# sourceMappingURL=syncConfig.cjs.map

package/lib/utils/syncConfig.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"syncConfig.cjs","sources":["../../src/utils/syncConfig.ts"],"sourcesContent":[null],"names":["getValid","updateJson","set","path","parse","readDir"],"mappings":"2hBAcA,MAAM,eAAe,GAAG,MAAM,CAAC;AAElB,MAAA,UAAU,GAAG,CAAC,IAAU,EAAE,WAAmB,EAAE,OAA0B,KAAI;;;AAEtF,IAAA,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE3B,MAAM,UAAU,GAAG,iBAAiB,CAAC;AACrC,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;AACzB,QAAA,IAAI;YACA,MAAM,SAAS,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,UAAU,CAAC;YAC5D,MAAM,IAAI,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,eAAe,CAAC;AACvD,YAAA,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAEhC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACpE,MAAM,cAAc,GAAG,qBAAqB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAChE,YAAA,MAAM,cAAc,GAAG;gBACnB,IAAI,EAAE,CAAY,SAAA,EAAA,IAAI,CAAE,CAAA;AACxB,gBAAA,KAAK,EAAE;AACH,oBAAA,sBAAsB,EAAE,gBAAgB,KAAA,IAAA,IAAhB,gBAAgB,KAAhB,KAAA,CAAA,GAAA,gBAAgB,GAAI,EAAE;AAC9C,oBAAA,aAAa,EAAE,cAAc,KAAA,IAAA,IAAd,cAAc,KAAd,KAAA,CAAA,GAAA,cAAc,GAAI,EAAE;AACtC,iBAAA;aACJ,CAAC;YAEFC,iBAAU,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,MAAW,KAAI;AACzC,gBAAAC,UAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,cAAc,CAAC,CAAC;AACtE,gBAAA,OAAO,MAAM,CAAC;AAClB,aAAC,CAAC,CAAC;SACN;QAAC,OAAM,CAAC,EAAE;AACP,YAAA,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;SACnD;KACJ;SAAM;AACH,QAAA,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAEC,eAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;KACjF;AACL,EAAC;AAED,MAAM,uBAAuB,GAAG,CAAC,IAAU,EAAE,WAAmB,KAAI;IAChE,MAAM,QAAQ,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;AACpE,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;AACvB,QAAA,IAAI;YACA,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,IAAI,WAAW,GAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;AACzD,YAAA,MAAM,GAAG,GAAGC,YAAK,CAAC,WAAW,EAAE;AAC3B,gBAAA,UAAU,EAAE,QAAQ;AACpB,gBAAA,OAAO,EAAE,CAAC,YAAY,EAAE,eAAe,CAAC;AAC3C,aAAA,CAAC,CAAC;AACF,YAAA,QAAgB,CAAC,OAAO,CAAC,GAAG,EAAE;AAC3B,gBAAA,KAAK,CAAC,SAAS,EAAA;AACX,oBAAA,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,oBAAoB,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,EAAE;AACrF,wBAAA,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAG;AACvD,4BAAA,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;4BAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;AACtC,4BAAA,IAAI,KAAU,CAAC;AACf,4BAAA,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gCACzD,KAAK,GAAG,EAAE,CAAC;AACX,gCAAA,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAG;AAC3C,oCAAA,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;wCACjD,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;wCACvB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;qCACtE;yCAAM;AACH,wCAAA,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;qCACpF;AACL,iCAAC,CAAC,CAAC;6BACN;iCAAM;gCACH,KAAK,GAAG,EAAE,CAAC;6BACd;AACD,4BAAA,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA,CAAA,CAAG,EAAE,CAAG,EAAA,MAAM,CAAI,CAAA,EAAA,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;AAC9D,4BAAA,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AACjD,yBAAC,CAAC,CAAC;qBACN;iBACJ;AACJ,aAAA,CAAC,CAAC;AACH,YAAA,OAAO,MAAM,CAAC;SACjB;QAAC,OAAM,CAAC,EAAE;AACP,YAAA,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,CAAC,CAAC,CAAC;SACnD;KACJ;SAAM;AACH,QAAA,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,QAAQ,CAAC,CAAC;KACzD;AACD,IAAA,OAAO,IAAI,CAAC;AAChB,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,IAAU,EAAE,WAAmB,KAAI;IAC9D,MAAM,OAAO,GAAGD,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAC1D,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;AACtB,QAAA,IAAI;AACA,YAAA,OAAOE,aAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;AACR,YAAA,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpB;KACJ;SAAM;AACH,QAAA,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;KAC9D;AACD,IAAA,OAAO,IAAI,CAAC;AAChB,CAAC,CAAA;MAEY,WAAW,GAAG,CAAC,IAAU,EAAE,OAAY,KAAI;;IACpD,MAAM,SAAS,GAAG,CAAA,EAAA,GAAAL,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,UAAU,CAAC;IAE5DC,iBAAU,CAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAgB,KAAI;;QAClD,MAAM,QAAQ,GAAG,CAAA,CAAA,EAAA,GAAA,WAAW,CAAC,UAAU,MAAE,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,QAAQ,KAAI,EAAE,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAA,EAAA,CAAI,CAAC,EAAE;YACtC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAG,EAAA,SAAS,CAAI,EAAA,CAAA,CAAC,CAAC;SAC1D;AACD,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;IAEHA,iBAAU,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,SAAc,KAAI;AAC9C,QAAA,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAA,EAAA,CAAI,CAAC,EAAE;YACtC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAG,EAAA,SAAS,CAAI,EAAA,CAAA,CAAC,CAAC;SAC7C;AACD,QAAA,OAAO,SAAS,CAAC;AACrB,KAAC,CAAC,CAAC;AACP"}

package/lib/utils/syncConfig.d.ts

@@ -0,0 +1,9 @@
+import { Tree } from '@nx/devkit';
+export interface SyncConfigOptions {
+    name: string;
+    type: string;
+    directory: string;
+    ns?: string;
+}
+export declare const syncConfig: (tree: Tree, projectRoot: string, options: SyncConfigOptions) => void;
+export declare const syncPackage: (tree: Tree, options: any) => void;

package/lib/utils/syncConfig.mjs

@@ -0,0 +1,116 @@
+import {updateJson}from'@nx/devkit';import*as path from'path';import {parse}from'@babel/parser';import traverse from'@babel/traverse';import {set}from'lodash';import {getValid,readDir}from'./index.mjs';const DEFAULT_PACKAGE = 'core';
+const syncConfig = (tree, projectRoot, options) => {
+    var _a, _b;
+    // synchronize package in package.json and lerna.json
+    syncPackage(tree, options);
+    const configPath = 'cde-config.json';
+    if (tree.exists(configPath)) {
+        try {
+            const directory = (_a = getValid(options.directory)) !== null && _a !== void 0 ? _a : 'packages';
+            const type = (_b = getValid(options.type)) !== null && _b !== void 0 ? _b : DEFAULT_PACKAGE;
+            const moduleName = options.name; // name should not be null
+            const envConfigContent = getEnvConfigFileContent(tree, projectRoot);
+            const localesContent = getLocalesFileContent(tree, projectRoot);
+            const packageContent = {
+                type: `packages-${type}`,
+                files: {
+                    "config/env-config.ts": envConfigContent !== null && envConfigContent !== void 0 ? envConfigContent : {},
+                    "cdm-locales": localesContent !== null && localesContent !== void 0 ? localesContent : {},
+                },
+            };
+            updateJson(tree, configPath, (config) => {
+                set(config, [directory, 'modules', moduleName, type], packageContent);
+                return config;
+            });
+        }
+        catch (e) {
+            console.error('Failed to change env-config', e);
+        }
+    }
+    else {
+        console.log('No exist env-config file at ', path.join(tree.root, configPath));
+    }
+};
+const getEnvConfigFileContent = (tree, projectRoot) => {
+    const filePath = path.join(projectRoot, 'src/config/env-config.ts');
+    if (tree.exists(filePath)) {
+        try {
+            const result = {};
+            let fileContent = tree.read(filePath).toString();
+            const ast = parse(fileContent, {
+                sourceType: 'module',
+                plugins: ['typescript', 'dynamicImport'],
+            });
+            traverse.default(ast, {
+                enter(astroPath) {
+                    if (astroPath.node.type === "VariableDeclarator" && astroPath.node.id.name === "config") {
+                        astroPath.node.init.arguments[1].properties.forEach(prop => {
+                            const key = prop.key.name;
+                            const callee = prop.value.callee.name;
+                            let value;
+                            if (prop.value.arguments && prop.value.arguments.length > 0) {
+                                value = {};
+                                prop.value.arguments[0].properties.forEach(p => {
+                                    if (p.value.elements && p.value.elements.length > 0) {
+                                        value[p.key.name] = [];
+                                        p.value.elements.forEach(ele => value[p.key.name].push(ele.value));
+                                    }
+                                    else {
+                                        value[p.key.name] = callee == 'json' ? JSON.parse(p.value.value) : p.value.value;
+                                    }
+                                });
+                            }
+                            else {
+                                value = '';
+                            }
+                            console.log(`${key}:`, `${callee}(${JSON.stringify(value)})`);
+                            result[key] = { type: callee, value: value };
+                        });
+                    }
+                },
+            });
+            return result;
+        }
+        catch (e) {
+            console.error('Failed to change env-config', e);
+        }
+    }
+    else {
+        console.log('No exist env-config file at ', filePath);
+    }
+    return null;
+};
+const getLocalesFileContent = (tree, projectRoot) => {
+    const dirPath = path.join(projectRoot, 'src/cdm-locales');
+    if (tree.exists(dirPath)) {
+        try {
+            return readDir(tree, dirPath);
+        }
+        catch (e) {
+            console.error(e);
+        }
+    }
+    else {
+        console.log('No exist cdm-locales directory at ', dirPath);
+    }
+    return null;
+};
+const syncPackage = (tree, options) => {
+    var _a;
+    const directory = (_a = getValid(options.directory)) !== null && _a !== void 0 ? _a : 'packages';
+    updateJson(tree, 'package.json', (packageJson) => {
+        var _a;
+        const packages = ((_a = packageJson.workspaces) === null || _a === void 0 ? void 0 : _a.packages) || [];
+        if (!packages.includes(`${directory}/*`)) {
+            packageJson.workspaces.packages.push(`${directory}/*`);
+        }
+        return packageJson;
+    });
+    updateJson(tree, 'lerna.json', (lernaJson) => {
+        const packages = lernaJson.packages || [];
+        if (!packages.includes(`${directory}/*`)) {
+            lernaJson.packages.push(`${directory}/*`);
+        }
+        return lernaJson;
+    });
+};export{syncConfig,syncPackage};//# sourceMappingURL=syncConfig.mjs.map

package/lib/utils/syncConfig.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"syncConfig.mjs","sources":["../../src/utils/syncConfig.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/package.json

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

package/rollup.config.mjs

@@ -33,14 +33,8 @@ const baseConfig = {
         { src: 'src/generators/add-fullstack/files/*', dest: 'lib/generators/add-fullstack/files' },
         { src: 'src/generators/add-moleculer/schema.json', dest: 'lib/generators/add-moleculer' },
         { src: 'src/generators/add-moleculer/files/*', dest: 'lib/generators/add-moleculer/files' },
-        { src: 'src/generators/add-browser-package/schema.json', dest: 'lib/generators/add-browser-package' },
-        { src: 'src/generators/add-browser-package/files/*', dest: 'lib/generators/add-browser-package/files' },
-        { src: 'src/generators/add-client-package/schema.json', dest: 'lib/generators/add-client-package' },
-        { src: 'src/generators/add-client-package/files/*', dest: 'lib/generators/add-client-package/files' },
-        { src: 'src/generators/add-core-package/schema.json', dest: 'lib/generators/add-core-package' },
-        { src: 'src/generators/add-core-package/files/*', dest: 'lib/generators/add-core-package/files' },
-        { src: 'src/generators/add-server-package/schema.json', dest: 'lib/generators/add-server-package' },
-        { src: 'src/generators/add-server-package/files/*', dest: 'lib/generators/add-server-package/files' },
+        { src: 'src/generators/add-package/schema.json', dest: 'lib/generators/add-package' },
+        { src: 'src/generators/add-package/files/*', dest: 'lib/generators/add-package/files' },
         { src: 'src/executors/update-deploy-version/schema.json', dest: 'lib/executors/update-deploy-version' },
         { src: 'src/executors/sort-package-json/schema.json', dest: 'lib/executors/sort-package-json' },
       ],

package/src/executors/sort-package-json/executor.spec.ts

@@ -1,18 +1,18 @@
-import { ExecutorContext } from '@nx/devkit';
+// import { ExecutorContext } from '@nx/devkit';
 
-import { SortPackageJsonExecutorSchema } from './schema';
-import executor from './executor';
+// import { SortPackageJsonExecutorSchema } from './schema';
+// import executor from './executor';
 
-const options: SortPackageJsonExecutorSchema = {};
-const context: ExecutorContext = {
-    root: '',
-    cwd: process.cwd(),
-    isVerbose: false,
-};
+// const options: SortPackageJsonExecutorSchema = {};
+// const context: ExecutorContext = {
+//     root: '',
+//     cwd: process.cwd(),
+//     isVerbose: false,
+// };
 
-describe('SortPackageJson Executor', () => {
-    it('can run', async () => {
-        const output = await executor(options, context);
-        expect(output.success).toBe(true);
-    });
-});
+// describe('SortPackageJson Executor', () => {
+//     it('can run', async () => {
+//         const output = await executor(options, context);
+//         expect(output.success).toBe(true);
+//     });
+// });

package/src/executors/update-deploy-version/executor.spec.ts

@@ -1,18 +1,18 @@
-import { ExecutorContext } from '@nx/devkit';
+// import { ExecutorContext } from '@nx/devkit';
 
-import { UpdateDeployVersionExecutorSchema } from './schema';
-import executor from './executor';
+// import { UpdateDeployVersionExecutorSchema } from './schema';
+// import executor from './executor';
 
-const options: UpdateDeployVersionExecutorSchema = {"version": "v01"};
-const context: ExecutorContext = {
-    root: '',
-    cwd: process.cwd(),
-    isVerbose: false,
-};
+// const options: UpdateDeployVersionExecutorSchema = {"version": "v01"};
+// const context: ExecutorContext = {
+//     root: '',
+//     cwd: process.cwd(),
+//     isVerbose: false,
+// };
 
-describe('UpdateDeployVersion Executor', () => {
-    it('can run', async () => {
-        const output = await executor(options, context);
-        expect(output.success).toBe(true);
-    });
-});
+// describe('UpdateDeployVersion Executor', () => {
+//     it('can run', async () => {
+//         const output = await executor(options, context);
+//         expect(output.success).toBe(true);
+//     });
+// });

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

@@ -1,18 +1,22 @@
 import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
 import * as path from 'path';
+import { deepMerge } from '@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';
 import { AddBackendGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
+const DEFAULT_SERVER_NAME = 'backend-server';
+
 export async function addBackendGenerator(tree: Tree, options: AddBackendGeneratorSchema) {
-    const projectName = isValid(options.ns) ? `backend-${getValid(options.ns)}-server` : 'backend-server';
+    const projectName = isValid(options.name) ? `backend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
     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';
+    let projectName = getValid(options.name) ?? DEFAULT_SERVER_NAME;
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
     // resetProject(`${basePath}/${projectRoot}`);
     
     // addProjectConfiguration(tree, framework, {
@@ -27,7 +31,14 @@ export const generateBackend = async (tree: Tree, options: any) => {
         packageJson['name'] = projectName;
         return packageJson;
     });
-    
+    if (options['config.json']) {
+        updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
+            const addtionalConfigs = options['config.json'];
+            configJson = deepMerge(configJson, addtionalConfigs);
+        
+            return configJson;
+        });
+    }
     await formatFiles(tree);
 }
 

package/src/generators/add-backend/schema.d.ts

@@ -1,4 +1,5 @@
 export interface AddBackendGeneratorSchema {
     ns: string;
     directory: string;
+    name?: string;
 }

package/src/generators/add-backend/schema.json

@@ -7,12 +7,17 @@
         "ns": {
             "type": "string",
             "description": "The project namespace",
-            "x-prompt": "What name would you like to use?"
+            "x-prompt": "What namespace would you like to use?"
         },
         "directory": {
             "type": "string",
             "description": "",
             "x-prompt": "What directory would you like to create in?"
+        },
+        "name": {
+            "type": "string",
+            "description": "The module name(optional)",
+            "x-prompt": "What name would you like to use for this backend server module?(optional)"
         }
     },
     "required": ["ns", "directory"]

package/src/generators/add-frontend/frameworks/antui/root.tsx.template

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import * as React from 'react';
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData, useRouteError, json } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
 // @ts-ignore
 import publicEnv from '@src/config/public-config';
 import { PluginArea } from '@common-stack/client-react';
@@ -34,7 +34,7 @@ export function shouldRevalidate(params: any) {
 }
 
 export function Layout({ children }: { children: React.ReactNode }) {
-    const data = useLoaderData<{ locale: any}>();
+    const data = useRouteLoaderData<{ locale: any }>('root');
     const locale = data?.locale;
 
     const { i18n } = useTranslation();

package/src/generators/add-frontend/frameworks/chakraui/root.tsx.template

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import * as React from 'react';
 
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData } from '@remix-run/react';
 import { json } from '@remix-run/node';
 import { PluginArea } from '@common-stack/client-react';
 import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
@@ -79,8 +79,9 @@ export function shouldRevalidate(params: any) {
 }
 
 export default function App() {
-    // const { locale } = useLoaderData();
-    const locale = 'en';
+    const data = useRouteLoaderData<{ locale: any }>('root');
+    const locale = data?.locale;
+    
     useChangeLanguage(locale);
 
     React.useEffect(() => {

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

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import * as React from 'react';
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData, useRouteError, json } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
 import type { LinksFunction } from "@remix-run/node";
 // @ts-ignore
 import publicEnv from '@src/config/public-config';
@@ -36,7 +36,7 @@ export function shouldRevalidate(params: any) {
 }
 
 export function Layout({ children }: { children: React.ReactNode }) {
-    const data = useLoaderData<{ locale: any }>();
+    const data = useRouteLoaderData<{ locale: any }>('root');
     const locale = data?.locale;
 
     const { i18n } = useTranslation();

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

@@ -4,20 +4,22 @@ import * as fs from 'node:fs';
 import { deepMerge } from '@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';
 import { AddFrontendGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
-import { FRAMEWORK_ANTUI, FRAMEWORK_CHAKRAUI, FRAMEWORK_TAILWINDUI } from '../../constants';
+import { FRAMEWORK_ANTUI, FRAMEWORK_CHAKRAUI, FRAMEWORK_TAILWINDUI } from '../../common/constants';
 
 const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
+const DEFAULT_SERVER_NAME = 'frontend-server';
 
 export async function addFrontendGenerator(tree: Tree, options: AddFrontendGeneratorSchema) {
-    const projectName = isValid(options.ns) ? `frontend-${getValid(options.ns)}-server` : 'frontend-server';
+    const projectName = isValid(options.name) ? `frontend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
     const configs: any = {...options, name: projectName};
 
     return await generateFrontend(tree, configs);
 }
 
 export const generateFrontend = async (tree: Tree, options: any) => {
-    const projectName = getValid(options.name) ?? 'frontend-server';
+    let projectName = getValid(options.name) ?? DEFAULT_SERVER_NAME;
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
     const projectSrc = `${projectRoot}/src`;
     
     const framework = getValid(options.framework) ?? DEFAULT_FRAMEWORK;
@@ -38,17 +40,20 @@ export const generateFrontend = async (tree: Tree, options: any) => {
         packageJson['name'] = projectName;
         if (framework === FRAMEWORK_ANTUI) {
             packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
-            packageJson['dependencies']["@admin-layout/ant-ui"] = "latest";
-            packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
-            packageJson['dependencies']["@ant-design/pro-layout"] = "^7.6.1";
             packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0"; 
+            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
             packageJson['dependencies']["antd"] = "^5.14.0";
         } else if (framework === FRAMEWORK_CHAKRAUI) {
-            packageJson['dependencies']["@admin-layout/chakra-design-pro"] = "latest";
-            packageJson['dependencies']["@admin-layout/chakra-ui"] = "latest";
-            packageJson['dependencies']["@adminide-stack/user-auth0-browser-chakra"] = "latest";
+            packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
+            packageJson['dependencies']["framer-motion"] = "^11.5.4"; 
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0"; 
             packageJson['dependencies']["@emotion/css"] = "^11.10.0";
             packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
+
         } else if (framework === FRAMEWORK_TAILWINDUI) {
             packageJson['devDependencies']["tailwindcss"] = "^3.4.10";
             packageJson['devDependencies']["postcss"] = "^8.4.41";

package/src/generators/add-frontend/schema.d.ts

@@ -2,4 +2,5 @@ export interface AddFrontendGeneratorSchema {
     ns: string;
     directory: string;
     framework?: string;
+    name?: string;
 }

package/src/generators/add-frontend/schema.json

@@ -7,18 +7,23 @@
         "ns": {
             "type": "string",
             "description": "The project namespace",
-            "x-prompt": "What name would you like to use?"
+            "x-prompt": "What namespace would you like to use?"
         },
         "directory": {
             "type": "string",
             "description": "",
             "x-prompt": "What directory would you like to create in?"
         },
+        "name": {
+            "type": "string",
+            "description": "The module name(optional)",
+            "x-prompt": "What name would you like to use for this frontend server module?(optional)"
+        },
         "framework": {
             "type": "string",
             "description": "",
-            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?"
+            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?(default: antui)"
         }
     },
-    "required": ["ns", "directory", "framework"]
+    "required": ["ns", "directory"]
 }