fix(cli): fix read package on command start

tsedio · Jun 13, 2023 · 8f35a67 · 8f35a67
1 parent 63443f6
commit 8f35a67
Show file tree

Hide file tree

Showing 17 changed files with 528 additions and 385 deletions.
diff --git a/packages/cli-core/jest.config.js b/packages/cli-core/jest.config.js
@@ -9,10 +9,10 @@ module.exports = {
   },
   coverageThreshold: {
     global: {
-      statements: 71.03,
-      branches: 72.88,
-      functions: 48.71,
-      lines: 71.03
+      statements: 71.31,
+      branches: 73.06,
+      functions: 48.9,
+      lines: 71.31
     }
   },
 };
diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json
@@ -40,7 +40,7 @@
     "chalk": "4.1.2",
     "change-case": "^4.1.2",
     "commander": "9.3.0",
-    "consolidate": "0.16.0",
+    "consolidate": "1.0.1",
     "create-frame": "1.0.0",
     "enquirer": "2.3.6",
     "execa": "5.1.1",
@@ -94,4 +94,4 @@
     "@tsed/core": ">=7.14.2",
     "@tsed/di": ">=7.14.2"
   }
-}
+}
diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts
@@ -64,6 +64,8 @@ export class CliService {
    */
   public runLifecycle(cmdName: string, data: any = {}, $ctx: DIContext) {
     return runInContext($ctx, async () => {
+      await this.injector.emit("$loadPackageJson");
+
       data = await this.beforePrompt(cmdName, data);
 
       $ctx.set("data", data);
@@ -214,6 +216,7 @@ export class CliService {
 
       $ctx.set("data", data);
       $ctx.set("command", metadata);
+      this.injector.settings.set("command.metadata", metadata);
 
       return this.runLifecycle(name, data, $ctx);
     };

diff --git a/packages/cli-core/src/services/ProjectPackageJson.ts b/packages/cli-core/src/services/ProjectPackageJson.ts
@@ -82,7 +82,7 @@ export class ProjectPackageJson {
       dependencies: {},
       devDependencies: {}
     });
-    this.read();
+
     this.packageManagers = packageManagers.filter((manager) => manager.has());
   }
 
@@ -144,6 +144,10 @@ export class ProjectPackageJson {
     return this.packageManagers.map((manager) => manager.name);
   }
 
+  $loadPackageJson() {
+    return this.read();
+  }
+
   toJSON() {
     return this.raw;
   }
@@ -394,7 +398,16 @@ export class ProjectPackageJson {
     return this.fs.importModule(mod, this.dir);
   }
 
-  public runScript(scriptName: string, {ignoreError, ...opts}: {ignoreError?: boolean} & Options & Record<string, any> = {}) {
+  public runScript(
+    scriptName: string,
+    {
+      ignoreError,
+      ...opts
+    }: {
+      ignoreError?: boolean;
+    } & Options &
+      Record<string, any> = {}
+  ) {
     const options = {
       cwd: this.dir,
       ...opts
@@ -452,7 +465,7 @@ export class ProjectPackageJson {
 
   protected getPackageJson() {
     const cwd = this.configuration.get("project.rootDir");
-    const disableReadUpPkg = this.configuration.get("disableReadUpPkg");
+    const disableReadUpPkg = this.configuration.get("command.metadata.disableReadUpPkg");
     const name = this.configuration.get("name");
 
     const pkgPath = join(String(cwd), "package.json");

diff --git a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts
@@ -21,7 +21,7 @@ export class OidcProviderInitHook {
   onExec(ctx: InitCmdContext) {
     return [
       {
-        title: "Generate files",
+        title: "Generate OIDC files",
         task: () =>
           this.rootRenderer.renderAll(
             [

diff --git a/packages/cli-testing/src/CliPlatformTest.ts b/packages/cli-testing/src/CliPlatformTest.ts
@@ -54,6 +54,7 @@ export class CliPlatformTest extends DITest {
 
     await DITest.injector.load();
     await DITest.injector.emit("$onReady");
+    await DITest.injector.emit("$loadPackageJson");
 
     CliPlatformTest.get(CliService).load();
   }

diff --git a/packages/cli-testing/src/FakeCliFs.ts b/packages/cli-testing/src/FakeCliFs.ts
@@ -32,7 +32,7 @@ export class FakeCliFs {
   async readJson(file: string | Buffer | number, encoding?: any): Promise<string> {
     const content = await this.readFile(file, encoding);
 
-    return JSON.parse(content);
+    return content ? JSON.parse(content) : {};
   }
 
   readJsonSync(file: string | Buffer | number, encoding?: any): Promise<string> {

diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js
@@ -7,10 +7,10 @@ module.exports = {
 
   coverageThreshold: {
     global: {
-      statements: 91.77,
-      branches: 72.61,
+      statements: 91.69,
+      branches: 78.54,
       functions: 75.94,
-      lines: 91.77
+      lines: 91.69
     }
   }
 };
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -19,6 +19,11 @@
     "start:help:i": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -h",
     "start:version": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts --version",
     "start:init:help": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -h",
+
+    "start:init:test": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default --features=oidc --arch=default --convention=conv_default --platform=express --skip-prompt .",
+
+
+
     "start:init:run": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default",
     "start:init:params": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default --skip-prompt --features swagger,jest,lintstaged",
     "start:init:run:name": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init awesome --verbose",
@@ -87,4 +92,4 @@
     "jest": "29.5.0"
   },
   "peerDependencies": {}
-}
+}
diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts
@@ -445,12 +445,14 @@ export class InitCmd implements CommandProvider {
     ctx.features.forEach((value) => {
       const feature = FeaturesMap[value.toLowerCase()];
 
-      if (feature.dependencies) {
-        this.packageJson.addDependencies(feature.dependencies, ctx);
-      }
+      if (feature) {
+        if (feature.dependencies) {
+          this.packageJson.addDependencies(feature.dependencies, ctx);
+        }
 
-      if (feature.devDependencies) {
-        this.packageJson.addDevDependencies(feature.devDependencies, ctx);
+        if (feature.devDependencies) {
+          this.packageJson.addDevDependencies(feature.devDependencies, ctx);
+        }
       }
     });
 

diff --git a/packages/cli/src/commands/init/config/FeaturesPrompt.ts b/packages/cli/src/commands/init/config/FeaturesPrompt.ts
@@ -231,7 +231,8 @@ export const FeaturesMap: Record<string, Feature> = {
   [FeatureType.TYPEORM]: {
     name: "TypeORM",
     devDependencies: {
-      "@tsed/cli-plugin-typeorm": "{{cliVersion}}"
+      "@tsed/cli-plugin-typeorm": "{{cliVersion}}",
+      typeorm: "latest"
     }
   },
   [FeatureType.JEST]: {

diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts
@@ -155,6 +155,7 @@ describe("getFeaturesPrompt", () => {
             Object {
               "devDependencies": Object {
                 "@tsed/cli-plugin-typeorm": "{{cliVersion}}",
+                "typeorm": "latest",
               },
               "name": "TypeORM",
               "value": "typeorm",