@tsed/cli 7.0.0-alpha.9 → 7.0.0-beta.2

package/lib/esm/bin/tsed.js

@@ -15,8 +15,28 @@ register(pathToFileURL(join(import.meta.dirname, `../loaders/alias.hook.${EXT}`)
     },
     transferList: []
 });
-const { Cli } = await import("../Cli.js");
-Cli.bootstrap({}).catch((error) => {
+const { commands, CliCore, PKG, TEMPLATE_DIR, ArchitectureConvention, ProjectConvention } = await import("../index.js");
+CliCore.bootstrap({
+    name: "tsed",
+    pkg: PKG,
+    templateDir: TEMPLATE_DIR,
+    plugins: true,
+    updateNotifier: true,
+    checkPrecondition: true,
+    commands,
+    defaultProjectPreferences() {
+        return {
+            convention: ProjectConvention.DEFAULT,
+            architecture: ArchitectureConvention.DEFAULT
+        };
+    },
+    project: {
+        reinstallAfterRun: true
+    },
+    logger: {
+        level: "info"
+    }
+}).catch((error) => {
     console.error(error);
     process.exit(-1);
 });

package/lib/esm/commands/init/InitCmd.js

@@ -115,7 +115,7 @@ export class InitCmd {
         ctx.runtime && this.packageJson.setPreference("runtime", ctx.runtime);
         ctx.architecture && this.packageJson.setPreference("architecture", ctx.architecture);
         ctx.convention && this.packageJson.setPreference("convention", ctx.convention);
-        ctx.platform && this.packageJson.setPreference("platform", ctx.convention);
+        ctx.platform && this.packageJson.setPreference("platform", ctx.platform);
         ctx.GH_TOKEN && this.packageJson.setGhToken(ctx.GH_TOKEN);
         await createTasksRunner([
             {
@@ -230,7 +230,7 @@ export class InitCmd {
         if (ctx.eslint || ctx.testing) {
             const runtime = this.runtimes.get();
             const scripts = {
-                test: [ctx.eslint && runtime.run("test:lint"), ctx.testing && runtime.run("test:coverage")].filter(Boolean).join("&&")
+                test: [ctx.eslint && runtime.run("test:lint"), ctx.testing && runtime.run("test:coverage")].filter(Boolean).join(" && ")
             };
             this.packageJson.addScripts(scripts);
         }

package/lib/esm/index.js

@@ -1,7 +1,8 @@
+import "@tsed/logger-std";
 import "./templates/index.js";
-export * from "./Cli.js";
 export * from "./commands/add/AddCmd.js";
 export * from "./commands/generate/GenerateCmd.js";
+export { default as commands } from "./commands/index.js";
 export * from "./commands/init/config/FeaturesPrompt.js";
 export * from "./commands/init/config/FeaturesPrompt.js";
 export * from "./commands/init/InitCmd.js";
@@ -17,3 +18,4 @@ export * from "./services/CliProjectService.js";
 export * from "./services/CliTemplatesService.js";
 export * from "./services/ProjectClient.js";
 export * from "./utils/defineTemplate.js";
+export { CliCore } from "@tsed/cli-core";

package/lib/esm/services/CliProjectService.js

@@ -15,7 +15,9 @@ import { CliTemplatesService } from "./CliTemplatesService.js";
 export class CliProjectService {
     constructor() {
         this.templates = inject(CliTemplatesService);
-        this.rootDir = constant("project.rootDir", process.cwd());
+    }
+    get rootDir() {
+        return constant("project.rootDir", "");
     }
     get srcDir() {
         return join(...[this.rootDir, constant("project.srcDir")].filter(Boolean));
@@ -32,7 +34,7 @@ export class CliProjectService {
         this.project = new ProjectClient({
             rootDir: this.rootDir
         });
-        const files = fs.globSync(["!**/node_modules/**", join(constant("project.rootDir", process.cwd()), "**/*.ts")]);
+        const files = fs.globSync(["!**/node_modules/**", join(this.rootDir, "**/*.ts")]);
         files.forEach((file) => {
             this.project.createSourceFile(file, fs.readFileSync(file, "utf8"), {
                 overwrite: true

package/lib/esm/services/CliTemplatesService.js

@@ -6,12 +6,13 @@ import { TEMPLATE_DIR } from "../constants/index.js";
 import { mapDefaultTemplateOptions } from "./mappers/mapDefaultTemplateOptions.js";
 export class CliTemplatesService {
     constructor() {
-        this.rootDir = constant("project.rootDir", process.cwd());
         this.fs = inject(CliFs);
-        this.#templates = new Map();
+        this.renderedFiles = [];
     }
     #customTemplates;
-    #templates;
+    get rootDir() {
+        return constant("project.rootDir", "");
+    }
     get srcDir() {
         return join(...[this.rootDir, constant("project.srcDir")].filter(Boolean));
     }
@@ -89,7 +90,7 @@ export class CliTemplatesService {
                 template.fileName?.replace("{{symbolName}}", opts.symbolName)?.replace("{{srcDir}}", this.srcDir) ||
                 opts.symbolName;
             const outputPath = `${filePath}${template.ext ? "." + template.ext : ""}`;
-            return {
+            return this.pushRenderResult({
                 templateId,
                 content: render,
                 outputPath,
@@ -97,20 +98,24 @@ export class CliTemplatesService {
                 symbolName: opts.symbolName,
                 symbolPath: opts.symbolPath,
                 symbolPathBasename: opts.symbolPathBasename
-            };
+            });
         }
         else {
             const from = data.from || TEMPLATE_DIR;
             const fromPath = join(from, templateId.replace("{{srcDir}}", "src"));
             if (await this.fs.fileExists(fromPath)) {
                 const content = await inject(CliFs).readFile(fromPath);
-                return {
+                return this.pushRenderResult({
                     templateId,
                     content,
                     outputPath: templateId.replace("{{srcDir}}", constant("project.srcDir", ""))
-                };
+                });
             }
         }
     }
+    pushRenderResult(renderedFile) {
+        this.renderedFiles.push(renderedFile);
+        return renderedFile;
+    }
 }
 injectable(CliTemplatesService);