@lakutata/cli 1.0.21 → 1.0.24

package/build/lib/menus/manipulateMenus/ManipulateModuleProject.js

@@ -1,12 +1,18 @@
-import inquirer from 'inquirer';
-import { CreateComponentManipulator } from '../../manipulators/CreateComponentManipulator';
-import { CreateModuleManipulator } from '../../manipulators/CreateModuleManipulator';
-import { CreatePluginManipulator } from '../../manipulators/CreatePluginManipulator';
-import { CreateThreadManipulator } from '../../manipulators/CreateThreadManipulator';
-import { CreateProcessManipulator } from '../../manipulators/CreateProcessManipulator';
-export async function ManipulateModuleProject(projectPath, tsConfigFilePath, lakutataProjectInfo) {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManipulateModuleProject = void 0;
+const inquirer_1 = __importDefault(require("inquirer"));
+const CreateComponentManipulator_1 = require("../../manipulators/CreateComponentManipulator");
+const CreateModuleManipulator_1 = require("../../manipulators/CreateModuleManipulator");
+const CreatePluginManipulator_1 = require("../../manipulators/CreatePluginManipulator");
+const CreateThreadManipulator_1 = require("../../manipulators/CreateThreadManipulator");
+const CreateProcessManipulator_1 = require("../../manipulators/CreateProcessManipulator");
+async function ManipulateModuleProject(projectPath, tsConfigFilePath, lakutataProjectInfo) {
     const projectDirectories = lakutataProjectInfo.directories;
-    const opt = await inquirer.prompt([{
+    const opt = await inquirer_1.default.prompt([{
             type: 'list',
             name: 'opr',
             message: '请选择需要进行的操作',
@@ -20,23 +26,24 @@ export async function ManipulateModuleProject(projectPath, tsConfigFilePath, lak
         }]);
     switch (opt.opr) {
         case 'createComponent': {
-            return await CreateComponentManipulator(projectPath, tsConfigFilePath, projectDirectories);
+            return await (0, CreateComponentManipulator_1.CreateComponentManipulator)(projectPath, tsConfigFilePath, projectDirectories);
         }
         case 'createModule': {
-            return await CreateModuleManipulator(projectPath, tsConfigFilePath, projectDirectories);
+            return await (0, CreateModuleManipulator_1.CreateModuleManipulator)(projectPath, tsConfigFilePath, projectDirectories);
         }
         case 'createPlugin': {
-            return await CreatePluginManipulator(projectPath, tsConfigFilePath, projectDirectories);
+            return await (0, CreatePluginManipulator_1.CreatePluginManipulator)(projectPath, tsConfigFilePath, projectDirectories);
         }
         case 'createThread': {
-            return await CreateThreadManipulator(projectPath, tsConfigFilePath, projectDirectories);
+            return await (0, CreateThreadManipulator_1.CreateThreadManipulator)(projectPath, tsConfigFilePath, projectDirectories);
         }
         case 'createProcess': {
-            return await CreateProcessManipulator(projectPath, tsConfigFilePath, projectDirectories);
+            return await (0, CreateProcessManipulator_1.CreateProcessManipulator)(projectPath, tsConfigFilePath, projectDirectories);
         }
         default: {
             return console.error('无效的操作选项');
         }
     }
 }
+exports.ManipulateModuleProject = ManipulateModuleProject;
 //# sourceMappingURL=ManipulateModuleProject.js.map

package/build/lib/menus/manipulateMenus/ManipulateModuleProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"ManipulateModuleProject.js","sourceRoot":"","sources":["../../../../src/lib/menus/manipulateMenus/ManipulateModuleProject.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAC,0BAA0B,EAAC,MAAM,+CAA+C,CAAA;AACxF,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAA;AAClF,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAA;AAClF,OAAO,EAAC,uBAAuB,EAAC,MAAM,4CAA4C,CAAA;AAClF,OAAO,EAAC,wBAAwB,EAAC,MAAM,6CAA6C,CAAA;AASpF,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,WAAmB,EAAE,gBAAwB,EAAE,mBAAwB;IACjH,MAAM,kBAAkB,GAA+B,mBAAmB,CAAC,WAAW,CAAA;IACtF,MAAM,GAAG,GAAG,MAAM,QAAQ,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,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,iBAAiB,CAAC,CAAC;YACpB,OAAO,MAAM,0BAA0B,CAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC7F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,uBAAuB,CAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,uBAAuB,CAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,cAAc,CAAC,CAAC;YACjB,OAAO,MAAM,uBAAuB,CAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;SAC1F;QACD,KAAK,eAAe,CAAC,CAAC;YAClB,OAAO,MAAM,wBAAwB,CAAC,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"}
+{"version":3,"file":"ManipulateModuleProject.js","sourceRoot":"","sources":["../../../../src/lib/menus/manipulateMenus/ManipulateModuleProject.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,8FAAwF;AACxF,wFAAkF;AAClF,wFAAkF;AAClF,wFAAkF;AAClF,0FAAoF;AAS7E,KAAK,UAAU,uBAAuB,CAAC,WAAmB,EAAE,gBAAwB,EAAE,mBAAwB;IACjH,MAAM,kBAAkB,GAA+B,mBAAmB,CAAC,WAAW,CAAA;IACtF,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,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,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;AAlCD,0DAkCC"}

package/build/lib/menus/manipulateMenus/ManipulatePluginProject.js

@@ -1,5 +1,9 @@
-export async function ManipulatePluginProject(projectPath, tsConfigFilePath, lakutataProjectInfo) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ManipulatePluginProject = void 0;
+async function ManipulatePluginProject(projectPath, tsConfigFilePath, lakutataProjectInfo) {
     const projectDirectories = lakutataProjectInfo.directories;
     console.info('无可用操作');
 }
+exports.ManipulatePluginProject = ManipulatePluginProject;
 //# sourceMappingURL=ManipulatePluginProject.js.map

package/build/lib/menus/manipulateMenus/ManipulatePluginProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"ManipulatePluginProject.js","sourceRoot":"","sources":["../../../../src/lib/menus/manipulateMenus/ManipulatePluginProject.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,WAAmB,EAAE,gBAAwB,EAAE,mBAAwB;IACjH,MAAM,kBAAkB,GAA+B,mBAAmB,CAAC,WAAW,CAAA;IACtF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACzB,CAAC"}
+{"version":3,"file":"ManipulatePluginProject.js","sourceRoot":"","sources":["../../../../src/lib/menus/manipulateMenus/ManipulatePluginProject.ts"],"names":[],"mappings":";;;AASO,KAAK,UAAU,uBAAuB,CAAC,WAAmB,EAAE,gBAAwB,EAAE,mBAAwB;IACjH,MAAM,kBAAkB,GAA+B,mBAAmB,CAAC,WAAW,CAAA;IACtF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACzB,CAAC;AAHD,0DAGC"}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@lakutata/cli",
-  "version": "1.0.21",
+  "version": "1.0.24",
   "description": "Lakutata CLI Tool",
   "main": "./build/CLI.js",
   "types": "./build/CLI.d.ts",
+  "type": "commonjs",
   "bin": {
     "lakutata": "./build/CLI.js",
     "lakutata-deploy": "./build/Deploy.js"
@@ -34,9 +35,11 @@
   "author": "alex.ma",
   "license": "MIT",
   "dependencies": {
-    "inquirer": "^9.0.0",
-    "latest-version": "^7.0.0",
+    "@types/args": "^5.0.0",
+    "args": "^5.0.3",
+    "inquirer": "^8.2.4",
     "moment-timezone": "^0.5.34",
+    "package-json": "^7.0.0",
     "semver": "^7.3.7",
     "shelljs": "^0.8.5",
     "simple-git": "^3.9.0",

package/src/CLI.ts

@@ -2,7 +2,6 @@
 import fs from 'fs'
 import path from 'path'
 import {MainMenu} from './lib/menus/MainMenu'
-
 (async () => {
-    await MainMenu(JSON.parse(fs.readFileSync(path.resolve(__dirname,'../package.json')).toString()))
+    await MainMenu(JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json')).toString()))
 })()

package/src/Deploy.ts

@@ -1,13 +1,21 @@
 #!/usr/bin/env node
 (async () => {
     const path = require('path')
+    const args = require('args')
     const inquirer = require('inquirer')
     const shelljs = require('shelljs')
     const moment = require('moment-timezone')
     const packageJson = require(path.resolve(process.cwd(), './package.json'))
-    const argvLen = process.argv.length
-    const REGISTRY_ADDR = process.argv[argvLen - 1]
-    const DOCKERFILE_PATH = process.argv[argvLen - 2]
+    args
+        .option('dockerfile')
+        .option('repository')
+        .option('username')
+        .option('password')
+        .option('platform')
+        .option('tagLatest')
+    const flags = args.parse(process.argv)
+    const REGISTRY_ADDR = flags.repository
+    const DOCKERFILE_PATH = flags.dockerfile
     const REPOSITORY_ADDR = new URL(`repo://${REGISTRY_ADDR}`).hostname
     if (!REGISTRY_ADDR) throw new Error('未配置仓库地址')
     const TIMESTAMP = Date.now()
@@ -20,46 +28,53 @@
             })
         })
     }
-    const account = await inquirer.prompt([
+    const platforms = [
+        'linux/amd64',
+        'linux/arm64',
+        'linux/riscv64',
+        'linux/ppc64le',
+        'linux/s390x',
+        'linux/386',
+        'linux/arm/v7',
+        'linux/arm/v6'
+    ]
+    const username = flags.username ? flags.username : (await inquirer.prompt(
         {
             type: 'input',
             name: 'username',
             message: 'Docker仓库账号'
-        },
+        }
+    )).username
+    const password = flags.password ? flags.password : (await inquirer.prompt(
         {
             type: 'password',
             name: 'password',
             message: 'Docker仓库密码',
             mask: '*'
         }
-    ])
-    const settings = await inquirer.prompt([
+    )).password
+    const platform = flags.platform ? flags.platform : (await inquirer.prompt(
         {
             type: 'list',
             name: 'platform',
             message: '目标构建平台架构',
-            choices: [
-                'linux/amd64',
-                'linux/arm64',
-                'linux/riscv64',
-                'linux/ppc64le',
-                'linux/s390x',
-                'linux/386',
-                'linux/arm/v7',
-                'linux/arm/v6'
-            ]
-        },
+            choices: platforms
+        }
+    )).platform
+    let tagLatest = flags.tagLatest ? flags.tagLatest : (await inquirer.prompt(
         {
             type: 'confirm',
             name: 'tagLatest',
             message: '是否为镜像打上latest标签',
             default: false
         }
-    ])
-    const tagLatest: boolean = settings.tagLatest
+    )).tagLatest
+    if (typeof tagLatest === 'string') {
+        tagLatest = tagLatest !== 'false'
+    }
     try {
-        await execPromise(`docker login --username=${account.username} ${REPOSITORY_ADDR} -p${account.password}`)
-        shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${settings.platform} .`)
+        await execPromise(`docker login --username=${username} ${REPOSITORY_ADDR} -p${password}`)
+        shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${platform} .`)
         shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:${IMAGE_VERSION}`)
         if (tagLatest) {
             shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:latest`)

package/src/lib/LatestVersion.ts

@@ -0,0 +1,6 @@
+import packageJson from 'package-json'
+
+export async function LatestVersion(packageName, options?):Promise<string> {
+    const {version} = await packageJson(packageName.toLowerCase(), options)
+    return version as string
+}

package/src/lib/generators/project/ProjectGenerator.ts

@@ -9,7 +9,7 @@ import {IProjectGeneratorOptions} from '../../../interfaces/IProjectGeneratorOpt
 import {IGenerator} from '../../../interfaces/IGenerator'
 import {GitIgnore} from '../../../constants/GitIgnore'
 import {ProjectSourceFile} from './ProjectSourceFile'
-import latestVersion from 'latest-version'
+import { LatestVersion } from '../../LatestVersion'
 
 export class ProjectGenerator implements IGenerator {
     private readonly project: Project
@@ -54,7 +54,7 @@ export class ProjectGenerator implements IGenerator {
      * @private
      */
     private async checkLatestFrameworkVersion(): Promise<void> {
-        this.lakutataCoreVersion = await latestVersion(this.lakutataPackageName)
+        this.lakutataCoreVersion = await LatestVersion(this.lakutataPackageName)
     }
 
     /**
@@ -123,7 +123,7 @@ export class ProjectGenerator implements IGenerator {
         packageConfig.scripts = options.scripts ? Object.assign(packageConfig.scripts, options.scripts) : packageConfig.scripts
         packageConfig.dependencies = options.dependencies ? Object.assign(packageConfig.dependencies, options.dependencies) : packageConfig.dependencies
         packageConfig.devDependencies = Object.assign(options.devDependencies ? Object.assign(packageConfig.devDependencies, options.devDependencies) : packageConfig.devDependencies, {
-            '@lakutata/cli': await latestVersion('@lakutata/cli')
+            '@lakutata/cli': await LatestVersion('@lakutata/cli')
         })
         const gitRepository: string | null = await this.getGitRepository()
         if (gitRepository) {

package/src/lib/manipulators/CreateDockerFileManipulator.ts

@@ -72,7 +72,7 @@ export async function CreateDockerFileManipulator(projectPath: string, tsConfigF
         const dockerfiles: { [key: string]: string } = {}
         if (productionRepository) {
             dockerfiles.Dockerfile = generateDockerfileContent(timezone, 'production', outDir, 'node', mainEntry)
-            packageJson.scripts.deploy = `lakutata-deploy ./Dockerfile ${productionRepository}`
+            packageJson.scripts.deploy = `lakutata-deploy --dockerfile ./Dockerfile --repository ${productionRepository}`
         }
         if (packageJson?.scripts?.test && developmentRepository) {
             //有测试主入口并且仓库地址被正确配置
@@ -102,7 +102,7 @@ export async function CreateDockerFileManipulator(projectPath: string, tsConfigF
             }
             if (testEntryPoint && runtime) {
                 dockerfiles.DockerfileDev = generateDockerfileContent(timezone, 'development', outDir, runtime, testEntryPoint)
-                packageJson.scripts['deploy:dev'] = `lakutata-deploy ./DockerfileDev ${developmentRepository}`
+                packageJson.scripts['deploy:dev'] = `lakutata-deploy --dockerfile ./DockerfileDev --repository ${developmentRepository}`
             }
         }
         for (const dockerfileName of Object.keys(dockerfiles)) {

package/src/lib/menus/MainMenu.ts

@@ -1,16 +1,16 @@
 import inquirer from 'inquirer'
-import latestVersion from 'latest-version'
 import {InitializeApplicationProject} from './initializeMenus/InitializeApplicationProject'
 import {InitializeModuleProject} from './initializeMenus/InitializeModuleProject'
 import {InitializeComponentProject} from './initializeMenus/InitializeComponentProject'
 import {InitializePluginProject} from './initializeMenus/InitializePluginProject'
 import {gt} from 'semver'
-import * as path from 'path'
-import * as fs from 'fs'
+import path from 'path'
+import fs from 'fs'
 import {ManipulateApplicationProject} from './manipulateMenus/ManipulateApplicationProject'
 import {ManipulateModuleProject} from './manipulateMenus/ManipulateModuleProject'
 import {ManipulateComponentProject} from './manipulateMenus/ManipulateComponentProject'
 import {ManipulatePluginProject} from './manipulateMenus/ManipulatePluginProject'
+import { LatestVersion } from '../LatestVersion'
 
 export async function MainMenu(packageJson: any) {
     const mainMenuOpt = await inquirer.prompt([{
@@ -133,7 +133,7 @@ export async function MainMenu(packageJson: any) {
         case 'check-update': {
             try {
                 const localVersion: string = packageJson.version
-                const npmVersion: string = await latestVersion(packageJson.name.toString())
+                const npmVersion: string = await LatestVersion(packageJson.name.toString())
                 if (gt(npmVersion, localVersion)) {
                     console.info('有可用更新:', localVersion, '➡', npmVersion)
                     console.info('执行', `npm install -g ${packageJson.name}`, '进行更新')

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "strict": true,
-    "module": "ESNext",
+    "module": "CommonJS",
     "target": "ES2017",
     "declaration": true,
     "sourceMap": true,