@lakutata/cli 2.7.0 → 2.9.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.9.0](https://github.com/lakutata/lakutata-packages/compare/@lakutata/cli@2.8.0...@lakutata/cli@2.9.0) (2024-08-03)
+
+
+### Features
+
+* **cli:** add template selection for project creation ([4835107](https://github.com/lakutata/lakutata-packages/commit/4835107d86bd70738a6508529e9d60efa807c356))
+
+
+
+
+
+# [2.8.0](https://github.com/lakutata/lakutata-packages/compare/@lakutata/cli@2.7.0...@lakutata/cli@2.8.0) (2024-08-02)
+
+
+### Bug Fixes
+
+* **cli:** remove commented code in OnlineLatestVersion.ts ([8820c2b](https://github.com/lakutata/lakutata-packages/commit/8820c2bb9fb501f5139b1a8ad0e05d8bdc2ee02c))
+
+
+### Features
+
+* **creator:** add project information filling ([b230861](https://github.com/lakutata/lakutata-packages/commit/b23086112dce8a5992f3e337c9f96dae8d69d5ec))
+
+
+
+
+
 # [2.7.0](https://github.com/lakutata/lakutata-packages/compare/@lakutata/cli@2.6.1...@lakutata/cli@2.7.0) (2024-08-02)
 
 

package/dist/CLIApp.js

@@ -45,7 +45,7 @@ lakutata_1.Application.run(async () => ({
             cache: false,
             verbose: true,
             force: true,
-            repo: 'lakutata/lakutata-template'
+            baseRepo: 'lakutata/lakutata-template'
         },
         spinner: {
             class: Spinner_1.Spinner,

package/dist/lib/components/DeGitPuller.d.ts

@@ -3,12 +3,12 @@ export declare class DeGitPuller extends Component {
     protected readonly cache: boolean;
     protected readonly verbose: boolean;
     protected readonly force: boolean;
-    protected readonly repo: string;
+    protected readonly baseRepo: string;
     /**
      * get git source
-     * @param branch
+     * @param template
      */
-    getGitSource(branch: string): string;
+    getGitSource(template: string): string;
     /**
      * Exec pull
      * @param branch

package/dist/lib/components/DeGitPuller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeGitPuller.d.ts","sourceRoot":"","sources":["../../../src/lib/components/DeGitPuller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAM,MAAM,UAAU,CAAA;AAGvC,qBACa,WAAY,SAAQ,SAAS;IAGtC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAQ;IAGzC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAO;IAG1C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAO;IAGxC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAE/B;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAI3C;;;;OAIG;IACU,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOxE"}
+{"version":3,"file":"DeGitPuller.d.ts","sourceRoot":"","sources":["../../../src/lib/components/DeGitPuller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAM,MAAM,UAAU,CAAA;AAGvC,qBACa,WAAY,SAAQ,SAAS;IAGtC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAQ;IAGzC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAO;IAG1C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAO;IAGxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IAEnC;;;OAGG;IACI,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAI7C;;;;OAIG;IACU,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOxE"}

package/dist/lib/components/DeGitPuller.js

@@ -25,10 +25,10 @@ let DeGitPuller = class DeGitPuller extends lakutata_1.Component {
     }
     /**
      * get git source
-     * @param branch
+     * @param template
      */
-    getGitSource(branch) {
-        return `${this.repo}#${branch}`;
+    getGitSource(template) {
+        return `${this.baseRepo}-${template}`;
     }
     /**
      * Exec pull
@@ -59,7 +59,7 @@ __decorate([
 __decorate([
     (0, di_1.Configurable)(lakutata_1.DTO.String().required()),
     __metadata("design:type", String)
-], DeGitPuller.prototype, "repo", void 0);
+], DeGitPuller.prototype, "baseRepo", void 0);
 exports.DeGitPuller = DeGitPuller = __decorate([
     (0, di_1.Singleton)()
 ], DeGitPuller);

package/dist/lib/providers/Creator.d.ts

@@ -31,6 +31,11 @@ export declare class Creator extends Provider {
      * @protected
      */
     protected checkTargetDirectoryIsEmpty(targetDirectory: string): Promise<void>;
+    /**
+     * project information filling
+     * @protected
+     */
+    protected projectInformationFilling(targetPath: string, fields: Record<string, string>): Promise<void>;
     /**
      * Exec create
      * @param options

package/dist/lib/providers/Creator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Creator.d.ts","sourceRoot":"","sources":["../../../src/lib/providers/Creator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AACxD,OAAO,EAAC,OAAO,EAAC,MAAM,0BAA0B,CAAA;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,uCAAuC,CAAA;AAM1E,OAAO,EAAC,WAAW,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAA;AAE9C,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAA;AAK1C,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAA;AAEzD,qBAAa,OAAQ,SAAQ,QAAQ;IAGjC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAA;IAGnC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IAG9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IAGnC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;IAGtC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAA;IAG7C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAA;IAErD;;;;;OAKG;cACa,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnG;;;;OAIG;cACa,0BAA0B,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASlF;;;;OAIG;cACa,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnF;;;OAGG;IAEU,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;CAkDpE"}
+{"version":3,"file":"Creator.d.ts","sourceRoot":"","sources":["../../../src/lib/providers/Creator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AACxD,OAAO,EAAC,OAAO,EAAC,MAAM,0BAA0B,CAAA;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,uCAAuC,CAAA;AAM1E,OAAO,EAAC,WAAW,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAA;AAE9C,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAA;AAK1C,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAA;AAEzD,qBAAa,OAAQ,SAAQ,QAAQ;IAGjC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAA;IAGnC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IAG9B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IAGnC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;IAGtC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAA;IAG7C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,mBAAmB,CAAA;IAErD;;;;;OAKG;cACa,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnG;;;;OAIG;cACa,0BAA0B,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASlF;;;;OAIG;cACa,2BAA2B,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnF;;;OAGG;cACa,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5G;;;OAGG;IAEU,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;CAyDpE"}

package/dist/lib/providers/Creator.js

@@ -17,7 +17,6 @@ const Information_js_1 = require("./Information.js");
 const DeGitPuller_js_1 = require("../components/DeGitPuller.js");
 const Spinner_js_1 = require("../components/Spinner.js");
 const CreateProjectOptions_js_1 = require("../../options/CreateProjectOptions.js");
-const ProjectTypeConfig_js_1 = require("../ProjectTypeConfig.js");
 const node_path_1 = __importDefault(require("node:path"));
 const promises_1 = require("node:fs/promises");
 const SpecialChar_js_1 = require("../SpecialChar.js");
@@ -71,6 +70,22 @@ class Creator extends lakutata_1.Provider {
         }
         this.log.info(`${SpecialChar_js_1.charCheck} The target directory is empty.`);
     }
+    /**
+     * project information filling
+     * @protected
+     */
+    async projectInformationFilling(targetPath, fields) {
+        const items = await (0, helper_1.Glob)(node_path_1.default.resolve(targetPath, '**/*'));
+        for (const item of items) {
+            const stats = await (0, promises_1.stat)(item);
+            if (!stats.isFile())
+                continue;
+            const rawContent = await (0, promises_1.readFile)(item, { encoding: 'utf-8' });
+            const filledContent = (0, helper_1.Templating)(rawContent, fields, { ignoreMissing: true });
+            if (rawContent !== filledContent)
+                await (0, promises_1.writeFile)(item, filledContent, { flag: 'w' });
+        }
+    }
     /**
      * Exec create
      * @param options
@@ -79,14 +94,12 @@ class Creator extends lakutata_1.Provider {
         const appName = options.name;
         const appId = options.id;
         const appDescription = options.description;
-        // const packageName: string = appId
         const authorName = options.author;
         const licenseName = options.license;
-        const appType = options.type;
+        const appTemplate = options.template;
         const targetPath = options.overwrite ? node_path_1.default.resolve(options.path) : node_path_1.default.resolve(options.path, options.name);
-        const { branch } = ProjectTypeConfig_js_1.ProjectTypeConfig[appType];
         const table = new cli_table3_1.default();
-        table.push([{ content: ansis_1.default.bold.cyan('Project Creation Information'), colSpan: 2, hAlign: 'center' }], [ansis_1.default.blue('APP ID & Project Name'), appId], [ansis_1.default.blue('APP Name'), appName], [ansis_1.default.blue('APP Description'), appDescription], [ansis_1.default.blue('Project Create Target Path'), targetPath], [ansis_1.default.blue('Project Create Mode'), options.overwrite ? ansis_1.default.yellow('Initialize project in an existing directory') : ansis_1.default.green('Create a new folder for the project')], [ansis_1.default.blue('Project Author Name'), authorName], [ansis_1.default.blue('Project License'), licenseName], [ansis_1.default.blue('Project Template Branch'), this.puller.getGitSource(branch)]);
+        table.push([{ content: ansis_1.default.bold.cyan('Project Creation Information'), colSpan: 2, hAlign: 'center' }], [ansis_1.default.blue('APP ID & Project Name'), appId], [ansis_1.default.blue('APP Name'), appName], [ansis_1.default.blue('APP Description'), appDescription], [ansis_1.default.blue('Project Create Target Path'), targetPath], [ansis_1.default.blue('Project Create Mode'), options.overwrite ? ansis_1.default.yellow('Initialize project in an existing directory') : ansis_1.default.green('Create a new folder for the project')], [ansis_1.default.blue('Project Author Name'), authorName], [ansis_1.default.blue('Project License'), licenseName], [ansis_1.default.blue('Project Template Branch'), this.puller.getGitSource(appTemplate)]);
         console.log(table.toString());
         await new Promise(resolve => {
             let timeLeft = 15;
@@ -104,11 +117,20 @@ class Creator extends lakutata_1.Provider {
         await this.checkTargetPathIsDirectory(targetPath);
         await this.checkTargetDirectoryIsEmpty(targetPath);
         this.spinner.start('Pulling');
-        await this.puller.pull(branch, targetPath);
+        await this.puller.pull(appTemplate, targetPath);
         this.spinner.stop();
         this.log.info(`${SpecialChar_js_1.charCheck} Template pulled.`);
+        this.spinner.start('Filling information');
+        await this.projectInformationFilling(targetPath, {
+            $APP_NAME: appName,
+            $APP_ID: appId,
+            $APP_DESC: appDescription,
+            $APP_AUTHOR: authorName,
+            $APP_LICENSE: licenseName
+        });
+        this.spinner.stop();
+        this.log.info(`${SpecialChar_js_1.charCheck} Project information filling completed.`);
         this.spinner.start('Installing');
-        //TODO 将项目内的内容进行初始化
         const { execa } = await import('execa');
         await execa('npm', ['install'], { cwd: targetPath });
         await execa('npm', ['install', `${this.onlineVersion.getName()}@${await this.onlineVersion.getVersion()}`], { cwd: targetPath });

package/dist/lib/providers/OnlineLatestVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OnlineLatestVersion.d.ts","sourceRoot":"","sources":["../../../src/lib/providers/OnlineLatestVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAA;AAIjC,qBAAa,mBAAoB,SAAQ,QAAQ;IAG7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IAGlC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAE/B;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAc7C"}
+{"version":3,"file":"OnlineLatestVersion.d.ts","sourceRoot":"","sources":["../../../src/lib/providers/OnlineLatestVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,UAAU,CAAA;AAIjC,qBAAa,mBAAoB,SAAQ,QAAQ;IAG7C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IAGlC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IAE/B;;OAEG;IACI,OAAO,IAAI,MAAM;IAIxB;;OAEG;IACU,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAY7C"}

package/dist/lib/providers/OnlineLatestVersion.js

@@ -28,11 +28,9 @@ class OnlineLatestVersion extends lakutata_1.Provider {
         const prereleaseInfo = (0, semver_1.prerelease)(this.version);
         const latestVersionPackage = await import('latest-version');
         if (prereleaseInfo && prereleaseInfo[0]) {
-            // onlineLatestVersion = await require('latest-version').default(this.name, {version: prereleaseInfo[0].toString()})
             onlineLatestVersion = await latestVersionPackage.default(this.name, { version: prereleaseInfo[0].toString() });
         }
         else {
-            // onlineLatestVersion = await require('latest-version').default(this.name)
             onlineLatestVersion = await latestVersionPackage.default(this.name);
         }
         return (0, semver_1.gt)(onlineLatestVersion, this.version) ? onlineLatestVersion : this.version;

package/dist/options/CreateProjectOptions.d.ts

@@ -5,7 +5,7 @@ import { DTO } from 'lakutata';
 export declare class CreateProjectOptions extends DTO {
     name: string;
     id: string;
-    type: string;
+    template: string;
     path: string;
     overwrite: boolean;
     description: string;

package/dist/options/CreateProjectOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateProjectOptions.d.ts","sourceRoot":"","sources":["../../src/options/CreateProjectOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,UAAU,CAAA;AAG5B;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,GAAG;IASlC,IAAI,EAAE,MAAM,CAAA;IASZ,EAAE,EAAE,MAAM,CAAA;IASV,IAAI,EAAE,MAAM,CAAA;IASZ,IAAI,EAAE,MAAM,CAAA;IAUZ,SAAS,EAAE,OAAO,CAAA;IASlB,WAAW,EAAE,MAAM,CAAA;IASnB,MAAM,EAAE,MAAM,CAAA;IASd,OAAO,EAAE,MAAM,CAAA;CACzB"}
+{"version":3,"file":"CreateProjectOptions.d.ts","sourceRoot":"","sources":["../../src/options/CreateProjectOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,UAAU,CAAA;AAG5B;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,GAAG;IASlC,IAAI,EAAE,MAAM,CAAA;IASZ,EAAE,EAAE,MAAM,CAAA;IAQV,QAAQ,EAAE,MAAM,CAAA;IAShB,IAAI,EAAE,MAAM,CAAA;IAUZ,SAAS,EAAE,OAAO,CAAA;IASlB,WAAW,EAAE,MAAM,CAAA;IASnB,MAAM,EAAE,MAAM,CAAA;IASd,OAAO,EAAE,MAAM,CAAA;CACzB"}

package/dist/options/CreateProjectOptions.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateProjectOptions = void 0;
-const ProjectTypeConfig_1 = require("../lib/ProjectTypeConfig");
 const lakutata_1 = require("lakutata");
 const dto_1 = require("lakutata/decorator/dto");
 /**
@@ -39,10 +38,9 @@ __decorate([
     (0, dto_1.Expect)(lakutata_1.DTO
         .String()
         .required()
-        .valid(...Object.keys(ProjectTypeConfig_1.ProjectTypeConfig))
-        .description(`select the type of the project (choices: ${Object.keys(ProjectTypeConfig_1.ProjectTypeConfig).map((type) => `"${type}"`).join(',')})`)),
+        .description('choose a template for this project')),
     __metadata("design:type", String)
-], CreateProjectOptions.prototype, "type", void 0);
+], CreateProjectOptions.prototype, "template", void 0);
 __decorate([
     (0, dto_1.Expect)(lakutata_1.DTO
         .String()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lakutata/cli",
-  "version": "2.7.0",
+  "version": "2.9.0",
   "description": "Lakutata CLI tool",
   "keywords": [
     "lakutata",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/degit": "^2.8.6"
   },
-  "gitHead": "ae8c48953f4a2f7387bd52122a982e3dd417fe3e"
+  "gitHead": "3b365ebc61075aa8983aa47365b95ff72d8442be"
 }