npm - @lakutata/cli - Versions diffs - 1.0.11 → 1.0.15 - Mend

@lakutata/cli 1.0.11 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/build/lib/generators/application/files/AppFile.js CHANGED Viewed

@@ -19,10 +19,10 @@ class AppFile extends ProjectSourceFile_1.ProjectSourceFile {
         file.addStatements(writer => {
             writer.writeLine(`createApp(Config(${this.isTest ? 'false' : 'true'})).then(app=>{`);
             if (this.isTest) {
-                writer.writeLine('app.Logger.info(`[${app.name}] is running in development mode`)');
+                writer.writeLine('app.Logger.info(`[${app.getName()}] is running in development mode`)');
             }
             else {
-                writer.writeLine('app.Logger.info(`[${app.name}] is running`)');
+                writer.writeLine('app.Logger.info(`[${app.getName()}] is running`)');
             }
             writer.writeLine('}).catch(e=>{');
             writer.writeLine('console.error(e)');

package/build/lib/generators/application/files/AppFile.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AppFile.js","sourceRoot":"","sources":["../../../../../src/lib/generators/application/files/AppFile.ts"],"names":[],"mappings":";;;AAAA,uEAAiE;AAGjE,MAAa,OAAQ,SAAQ,qCAAiB;IAI1C,YAAY,SAAkB,KAAK;QAC/B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,YAAY,CAAA;IACnE,CAAC;IAED,cAAc,CAAC,IAAgB;QAC3B,IAAI,CAAC,oBAAoB,CAAC,EAAC,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,eAAe,EAAE,gBAAgB,EAAC,CAAC,CAAA;QAC3F,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,oBAAoB,CAAC,EAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,kBAAkB,EAAC,CAAC,CAAA;SAC7F;aAAM;YACH,IAAI,CAAC,oBAAoB,CAAC,EAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,iBAAiB,EAAC,CAAC,CAAA;SAC5F;QACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;YACxB,MAAM,CAAC,SAAS,CAAC,oBAAoB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,CAAA;YACpF,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,MAAM,CAAC,SAAS,CAAC,~~iEAAiE~~,CAAC,CAAA;~~aACtF~~;iBAAM;gBACH,MAAM,CAAC,SAAS,CAAC,~~6CAA6C~~,CAAC,CAAA;~~aAClE~~;YACD,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;YACjC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;YACpC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;YACnC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AA/BD,0BA+BC"}
1	+ {"version":3,"file":"AppFile.js","sourceRoot":"","sources":["../../../../../src/lib/generators/application/files/AppFile.ts"],"names":[],"mappings":";;;AAAA,uEAAiE;AAGjE,MAAa,OAAQ,SAAQ,qCAAiB;IAI1C,YAAY,SAAkB,KAAK;QAC/B,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,YAAY,CAAA;IACnE,CAAC;IAED,cAAc,CAAC,IAAgB;QAC3B,IAAI,CAAC,oBAAoB,CAAC,EAAC,YAAY,EAAE,CAAC,WAAW,CAAC,EAAE,eAAe,EAAE,gBAAgB,EAAC,CAAC,CAAA;QAC3F,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,oBAAoB,CAAC,EAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,kBAAkB,EAAC,CAAC,CAAA;SAC7F;aAAM;YACH,IAAI,CAAC,oBAAoB,CAAC,EAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,iBAAiB,EAAC,CAAC,CAAA;SAC5F;QACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;YACxB,MAAM,CAAC,SAAS,CAAC,oBAAoB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,CAAA;YACpF,IAAI,IAAI,CAAC,MAAM,EAAE;gBACb,MAAM,CAAC,SAAS,CAAC,sEAAsE,CAAC,CAAA;aAC3F;iBAAM;gBACH,MAAM,CAAC,SAAS,CAAC,kDAAkD,CAAC,CAAA;aACvE;YACD,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAA;YACjC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;YACpC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;YACnC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AA/BD,0BA+BC"}

package/build/lib/manipulators/CreateDockerFileManipulator.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export declare function CreateDockerFileManipulator(projectPath: string, tsConfigFilePath: string, directories: {
+    [name: string]: string;
+}): Promise<void>;

package/build/lib/manipulators/CreateDockerFileManipulator.js ADDED Viewed

@@ -0,0 +1,103 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateDockerFileManipulator = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const moment_timezone_1 = __importDefault(require("moment-timezone"));
+function generateDockerfileContent(timezone, envName, outDir, runtime, entryPoint) {
+    const dockerFileContents = [
+        'FROM node:14-buster-slim',
+        '#Set docker timezone',
+        `ENV TZ=${timezone}`,
+        `ENV NODE_ENV=${envName}`,
+        'RUN set -eux',
+        'RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime',
+        'RUN echo $TZ > /etc/timezone',
+        '#Install system level dependencies',
+        'RUN npm install -g npm typescript ts-node',
+        '#Process project directories',
+        'RUN mkdir -p /app',
+        'WORKDIR /app',
+        'COPY . /app/',
+        'RUN rm -rf /app/node_modules',
+        `RUN rm -rf ${path_1.default.resolve('/app/', outDir)}`,
+        'RUN npm install --build-from-source',
+        'RUN tsc',
+        '#Expose ports',
+        '#TODO export ports or remove this line',
+        `ENTRYPOINT ${runtime} ${path_1.default.resolve('/app/', entryPoint)}`
+    ];
+    let content = '';
+    dockerFileContents.forEach(line => {
+        if (!content) {
+            content = line;
+        }
+        else {
+            content = `${content}\n${line}`;
+        }
+    });
+    return content;
+}
+async function CreateDockerFileManipulator(projectPath, tsConfigFilePath, directories) {
+    var _a, _b;
+    try {
+        const timezone = moment_timezone_1.default.tz.guess();
+        const tsConfigJson = JSON.parse(fs_1.default.readFileSync(tsConfigFilePath).toString());
+        const outDir = (_a = tsConfigJson === null || tsConfigJson === void 0 ? void 0 : tsConfigJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.outDir;
+        if (!outDir)
+            return console.error('项目输出目录设置有误');
+        const packageJson = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(projectPath, './package.json')).toString());
+        const mainEntry = (packageJson === null || packageJson === void 0 ? void 0 : packageJson.main) ? packageJson.main : '';
+        if (!mainEntry)
+            return console.error('应用程序主入口设置有误');
+        const dockerfiles = {};
+        dockerfiles.Dockerfile = generateDockerfileContent(timezone, 'production', outDir, 'node', mainEntry);
+        if ((_b = packageJson === null || packageJson === void 0 ? void 0 : packageJson.scripts) === null || _b === void 0 ? void 0 : _b.test) {
+            const testScriptString = packageJson.scripts.test;
+            const testScriptParams = testScriptString.split(' ').reverse();
+            let testEntryPoint = '';
+            let runtime = '';
+            for (const testScriptParam of testScriptParams) {
+                const regExp = /src\//;
+                if (['.ts', '.js'].includes(path_1.default.extname(testScriptParam)) && regExp.test(testScriptParam)) {
+                    switch (path_1.default.extname(testScriptParam)) {
+                        case '.ts':
+                            {
+                                runtime = 'ts-node';
+                            }
+                            break;
+                        case '.js':
+                            {
+                                runtime = 'node';
+                            }
+                            break;
+                        default: {
+                            console.error('不正确的测试主入口扩展名');
+                        }
+                    }
+                    testEntryPoint = testScriptParam;
+                    break;
+                }
+            }
+            if (testEntryPoint && runtime) {
+                dockerfiles.DockerfileDev = generateDockerfileContent(timezone, 'development', outDir, runtime, testEntryPoint);
+            }
+        }
+        for (const dockerfileName of Object.keys(dockerfiles)) {
+            fs_1.default.writeFileSync(path_1.default.resolve(projectPath, dockerfileName), dockerfiles[dockerfileName], {
+                encoding: 'utf-8',
+                flag: 'w'
+            });
+            console.info(dockerfileName, '写入成功');
+        }
+        console.info('Dockerfile已创建成功');
+    }
+    catch (e) {
+        console.error(`Dockerfile创建错误: ${e.message}`);
+    }
+}
+exports.CreateDockerFileManipulator = CreateDockerFileManipulator;
+//# sourceMappingURL=CreateDockerFileManipulator.js.map

package/build/lib/manipulators/CreateDockerFileManipulator.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/build/lib/menus/manipulateMenus/ManipulateApplicationProject.js CHANGED Viewed

@@ -11,6 +11,7 @@ const CreateModuleManipulator_1 = require("../../manipulators/CreateModuleManipu
 const CreatePluginManipulator_1 = require("../../manipulators/CreatePluginManipulator");
 const CreateThreadManipulator_1 = require("../../manipulators/CreateThreadManipulator");
 const CreateProcessManipulator_1 = require("../../manipulators/CreateProcessManipulator");
+const CreateDockerFileManipulator_1 = require("../../manipulators/CreateDockerFileManipulator");
 async function ManipulateApplicationProject(projectPath, tsConfigFilePath, lakutataProjectInfo) {
     const projectDirectories = lakutataProjectInfo.directories;
     const configuration = lakutataProjectInfo.configuration;
@@ -24,7 +25,8 @@ async function ManipulateApplicationProject(projectPath, tsConfigFilePath, lakut
                 { name: '创建项目模块', value: 'createModule' },
                 { name: '创建项目插件', value: 'createPlugin' },
                 { name: '创建项目线程', value: 'createThread' },
-                { name: '创建项目进程', value: 'createProcess' }
+                { name: '创建项目进程', value: 'createProcess' },
+                { name: '创建DockerFile', value: 'createDockerFile' }
             ]
         }]);
     switch (opt.opr) {
@@ -46,6 +48,9 @@ async function ManipulateApplicationProject(projectPath, tsConfigFilePath, lakut
         case 'createProcess': {
             return await (0, CreateProcessManipulator_1.CreateProcessManipulator)(projectPath, tsConfigFilePath, projectDirectories);
         }
+        case 'createDockerFile': {
+            return await (0, CreateDockerFileManipulator_1.CreateDockerFileManipulator)(projectPath, tsConfigFilePath, projectDirectories);
+        }
         default: {
             return console.error('无效的操作选项');
         }

package/build/lib/menus/manipulateMenus/ManipulateApplicationProject.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ManipulateApplicationProject.js","sourceRoot":"","sources":["../../../../src/lib/menus/manipulateMenus/ManipulateApplicationProject.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,4GAAsG;AACtG,8FAAwF;AACxF,wFAAkF;AAClF,wFAAkF;AAClF,wFAAkF;AAClF,0FAAoF;~~AAS7E~~,KAAK,UAAU,4BAA4B,CAAC,WAAmB,EAAE,gBAAwB,EAAE,mBAAwB;IACtH,MAAM,kBAAkB,GAA+B,mBAAmB,CAAC,WAAW,CAAA;IACtF,MAAM,aAAa,GAAW,mBAAmB,CAAC,aAAa,CAAA;IAC/D,MAAM,GAAG,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE;gBACL,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,iBAAiB,EAAC;gBAC1C,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAC;~~aAC3C~~;SACJ,CAAC,CAAC,CAAA;IACH,QAAQ,GAAG,CAAC,GAAG,EAAE;QACb,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,yDAA2B,EAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;SACzF;QACD,KAAK,iBAAiB,CAAC,CAAC;YACpB,OAAO,MAAM,IAAA,uDAA0B,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC7F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,eAAe,CAAC,CAAC;YAClB,OAAO,MAAM,IAAA,mDAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC3F;QACD,OAAO,CAAC,CAAC;YACL,OAAO,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;SAClC;KACJ;AACL,CAAC;~~AAvCD~~,~~oEAuCC~~"}
1	+ {"version":3,"file":"ManipulateApplicationProject.js","sourceRoot":"","sources":["../../../../src/lib/menus/manipulateMenus/ManipulateApplicationProject.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,4GAAsG;AACtG,8FAAwF;AACxF,wFAAkF;AAClF,wFAAkF;AAClF,wFAAkF;AAClF,0FAAoF;AACpF,gGAA0F;AASnF,KAAK,UAAU,4BAA4B,CAAC,WAAmB,EAAE,gBAAwB,EAAE,mBAAwB;IACtH,MAAM,kBAAkB,GAA+B,mBAAmB,CAAC,WAAW,CAAA;IACtF,MAAM,aAAa,GAAW,mBAAmB,CAAC,aAAa,CAAA;IAC/D,MAAM,GAAG,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE;gBACL,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,iBAAiB,EAAC;gBAC1C,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAC;gBACvC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAC;gBACxC,EAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,kBAAkB,EAAC;aACpD;SACJ,CAAC,CAAC,CAAA;IACH,QAAQ,GAAG,CAAC,GAAG,EAAE;QACb,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,yDAA2B,EAAC,WAAW,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;SACzF;QACD,KAAK,iBAAiB,CAAC,CAAC;YACpB,OAAO,MAAM,IAAA,uDAA0B,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC7F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,IAAA,iDAAuB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,eAAe,CAAC,CAAC;YAClB,OAAO,MAAM,IAAA,mDAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC3F;QACD,KAAK,kBAAkB,CAAC,CAAC;YACrB,OAAO,MAAM,IAAA,yDAA2B,EAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC9F;QACD,OAAO,CAAC,CAAC;YACL,OAAO,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;SAClC;KACJ;AACL,CAAC;AA3CD,oEA2CC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lakutata/cli",
-  "version": "1.0.11",
+  "version": "1.0.15",
   "description": "Lakutata CLI Tool",
   "main": "./build/CLI.js",
   "types": "./build/CLI.d.ts",
@@ -35,6 +35,7 @@
   "dependencies": {
     "inquirer": "^8.2.0",
     "latest-version": "^5.1.0",
+    "moment-timezone": "^0.5.34",
     "semver": "^7.3.5",
     "shelljs": "^0.8.5",
     "simple-git": "^2.48.0",

package/src/lib/generators/application/files/AppFile.ts CHANGED Viewed

@@ -21,9 +21,9 @@ export class AppFile extends ProjectSourceFile {
         file.addStatements(writer => {
             writer.writeLine(`createApp(Config(${this.isTest ? 'false' : 'true'})).then(app=>{`)
             if (this.isTest) {
-                writer.writeLine('app.Logger.info(`[${app.name}] is running in development mode`)')
+                writer.writeLine('app.Logger.info(`[${app.getName()}] is running in development mode`)')
             } else {
-                writer.writeLine('app.Logger.info(`[${app.name}] is running`)')
+                writer.writeLine('app.Logger.info(`[${app.getName()}] is running`)')
             }
             writer.writeLine('}).catch(e=>{')
             writer.writeLine('console.error(e)')

package/src/lib/manipulators/CreateDockerFileManipulator.ts ADDED Viewed

@@ -0,0 +1,100 @@
+import fs from 'fs'
+import path from 'path'
+import moment from 'moment-timezone'
+/**
+ * 生成Dockerfile文件内容
+ * @param timezone
+ * @param envName
+ * @param outDir
+ * @param runtime
+ * @param entryPoint
+ */
+function generateDockerfileContent(timezone: string, envName: string, outDir: string, runtime: string, entryPoint: string): string {
+    const dockerFileContents: string[] = [
+        'FROM node:14-buster-slim',
+        '#Set docker timezone',
+        `ENV TZ=${timezone}`,
+        `ENV NODE_ENV=${envName}`,
+        'RUN set -eux',
+        'RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime',
+        'RUN echo $TZ > /etc/timezone',
+        '#Install system level dependencies',
+        'RUN npm install -g npm typescript ts-node',
+        '#Process project directories',
+        'RUN mkdir -p /app',
+        'WORKDIR /app',
+        'COPY . /app/',
+        'RUN rm -rf /app/node_modules',
+        `RUN rm -rf ${path.resolve('/app/', outDir)}`,
+        'RUN npm install --build-from-source',
+        'RUN tsc',
+        '#Expose ports',
+        '#TODO export ports or remove this line',
+        `ENTRYPOINT ${runtime} ${path.resolve('/app/', entryPoint)}`
+    ]
+    let content: string = ''
+    dockerFileContents.forEach(line => {
+        if (!content) {
+            content = line
+        } else {
+            content = `${content}\n${line}`
+        }
+    })
+    return content
+}
+export async function CreateDockerFileManipulator(projectPath: string, tsConfigFilePath: string, directories: { [name: string]: string }) {
+    try {
+        const timezone = moment.tz.guess()
+        const tsConfigJson = JSON.parse(fs.readFileSync(tsConfigFilePath).toString())
+        const outDir: string = tsConfigJson?.compilerOptions?.outDir
+        if (!outDir) return console.error('项目输出目录设置有误')
+        const packageJson = JSON.parse(fs.readFileSync(path.resolve(projectPath, './package.json')).toString())
+        const mainEntry: string = packageJson?.main ? packageJson.main : ''
+        if (!mainEntry) return console.error('应用程序主入口设置有误')
+        const dockerfiles: { [key: string]: string } = {}
+        dockerfiles.Dockerfile = generateDockerfileContent(timezone, 'production', outDir, 'node', mainEntry)
+        if (packageJson?.scripts?.test) {
+            //有测试主入口
+            const testScriptString: string = packageJson.scripts.test
+            const testScriptParams: string[] = testScriptString.split(' ').reverse()
+            let testEntryPoint: string = ''
+            let runtime: string = ''
+            for (const testScriptParam of testScriptParams) {
+                const regExp = /src\//
+                if (['.ts', '.js'].includes(path.extname(testScriptParam)) && regExp.test(testScriptParam)) {
+                    switch (path.extname(testScriptParam)) {
+                        case '.ts': {
+                            runtime = 'ts-node'
+                        }
+                            break
+                        case '.js': {
+                            runtime = 'node'
+                        }
+                            break
+                        default: {
+                            console.error('不正确的测试主入口扩展名')
+                        }
+                    }
+                    testEntryPoint = testScriptParam
+                    break
+                }
+            }
+            if (testEntryPoint && runtime) {
+                dockerfiles.DockerfileDev = generateDockerfileContent(timezone, 'development', outDir, runtime, testEntryPoint)
+            }
+        }
+        for (const dockerfileName of Object.keys(dockerfiles)) {
+            //生成文件
+            fs.writeFileSync(path.resolve(projectPath, dockerfileName), dockerfiles[dockerfileName], {
+                encoding: 'utf-8',
+                flag: 'w'
+            })
+            console.info(dockerfileName, '写入成功')
+        }
+        console.info('Dockerfile已创建成功')
+    } catch (e) {
+        console.error(`Dockerfile创建错误: ${(e as Error).message}`)
+    }
+}

package/src/lib/menus/manipulateMenus/ManipulateApplicationProject.ts CHANGED Viewed

@@ -5,6 +5,7 @@ import {CreateModuleManipulator} from '../../manipulators/CreateModuleManipulato
 import {CreatePluginManipulator} from '../../manipulators/CreatePluginManipulator'
 import {CreateThreadManipulator} from '../../manipulators/CreateThreadManipulator'
 import {CreateProcessManipulator} from '../../manipulators/CreateProcessManipulator'
+import {CreateDockerFileManipulator} from '../../manipulators/CreateDockerFileManipulator'
 /**
  * 操作应用程序项目
@@ -26,7 +27,8 @@ export async function ManipulateApplicationProject(projectPath: string, tsConfig
             {name: '创建项目模块', value: 'createModule'},
             {name: '创建项目插件', value: 'createPlugin'},
             {name: '创建项目线程', value: 'createThread'},
-            {name: '创建项目进程', value: 'createProcess'}
+            {name: '创建项目进程', value: 'createProcess'},
+            {name: '创建DockerFile', value: 'createDockerFile'}
         ]
     }])
     switch (opt.opr) {
@@ -48,6 +50,9 @@ export async function ManipulateApplicationProject(projectPath: string, tsConfig
         case 'createProcess': {
             return await CreateProcessManipulator(projectPath, tsConfigFilePath, projectDirectories)
         }
+        case 'createDockerFile': {
+            return await CreateDockerFileManipulator(projectPath, tsConfigFilePath, projectDirectories)
+        }
         default: {
             return console.error('无效的操作选项')
         }