@tsed/cli 7.0.0-alpha.5 → 7.0.0-alpha.7

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

@@ -298,7 +298,7 @@ export class InitCmd {
         // files with higher priority
         const promises = [
             "tsconfig.base.json",
-            "tsconfig.config.json",
+            "tsconfig.json",
             "tsconfig.spec.json",
             "tsconfig.node.json",
             "docker-compose.yml",
@@ -311,6 +311,7 @@ export class InitCmd {
             "index.config.util",
             "index.logger",
             "index.controller",
+            ctx.commands && "index.command",
             "barrels",
             "readme",
             `pm2.${pm2}`,

package/lib/esm/commands/template/CreateTemplateCommand.js

@@ -1,5 +1,6 @@
 import { command, inject, ProjectPackageJson } from "@tsed/cli-core";
 import { snakeCase } from "change-case";
+import { PKG } from "../../constants/index.js";
 import { render } from "../../fn/render.js";
 import { CliTemplatesService } from "../../services/CliTemplatesService.js";
 const searchFactory = (list) => {
@@ -67,6 +68,7 @@ export class CreateTemplateCommand {
         };
     }
     $exec(ctx) {
+        this.projectPackageJson.addDevDependencies({ "@tsed/cli": PKG.version });
         return [
             {
                 title: "Generate " + ctx.from === "new" ? `new template ${ctx.templateId}` : `template ${ctx.templateId} from ${ctx.from}`,

package/lib/esm/processors/transformConfigFile.js

@@ -1,23 +1,23 @@
 export function transformConfigFile(project, data) {
     if (!data.config && data.commandName === "init") {
         project.addConfigSource("EnvsConfigSource", {
-            moduleSpecifier: "@tsedio/config-envs/envs"
+            moduleSpecifier: "@tsed/config/envs"
         });
     }
     if (data.config) {
         if (data.configDotenv) {
             project.addConfigSource("DotenvConfigSource", {
-                moduleSpecifier: "@tsedio/config-envs/dotenv"
+                moduleSpecifier: "@tsed/config/dotenv"
             });
         }
         else if (data.configEnvs) {
             project.addConfigSource("EnvsConfigSource", {
-                moduleSpecifier: "@tsedio/config-envs/envs"
+                moduleSpecifier: "@tsed/config/envs"
             });
         }
         if (data.configJson) {
             project.addConfigSource("JsonConfigSource", {
-                moduleSpecifier: "@tsedio/config-envs/json",
+                moduleSpecifier: "@tsed/config/json",
                 content: `withOptions(JsonConfigSource, {
       path: "./config.json"
     })`
@@ -25,7 +25,7 @@ export function transformConfigFile(project, data) {
         }
         if (data.configYaml) {
             project.addConfigSource("YamlConfigSource", {
-                moduleSpecifier: "@tsedio/config-envs/yaml",
+                moduleSpecifier: "@tsed/config/yaml",
                 content: `withOptions(YamlConfigSource, {
       path: "./config.yaml"
     })`

package/lib/esm/templates/barrels.template.js

@@ -14,7 +14,11 @@ export default defineTemplate({
     },
     render(_, context) {
         const barrels = $alter("$alterBarrels", {
-            directory: ["./src/controllers/rest", (context.swagger || context.oidc) && "./src/controllers/pages"].filter(Boolean),
+            directory: [
+                "./src/controllers/rest",
+                context.commands && "./src/bin/commands",
+                (context.swagger || context.oidc) && "./src/controllers/pages"
+            ].filter(Boolean),
             exclude: ["**/__mock__", "**/__mocks__", "**/*.spec.ts"],
             delete: true
         });

package/lib/esm/templates/index.command.template.js

@@ -4,15 +4,18 @@ export default defineTemplate({
     label: "CLI Entry Point",
     description: "Create a new CLI entry point file",
     outputDir: "{{srcDir}}/bin",
+    fileName: "index",
     hidden: true,
+    preserveCase: true,
     render() {
         return `#!/usr/bin/env node
 import {CliCore} from "@tsed/cli-core";
-import {config} from "@/config";
+import {config} from "@/config/config.js";
+import * commands from "@/bin/commands/index.js";
 
 CliCore.bootstrap({
   ...config,
-  commands: []
+  commands: [...Object.values(commands)]
 }).catch(console.error);
 `;
     }

package/lib/esm/templates/index.js

@@ -24,7 +24,6 @@ import "./index.controller.template.js";
 import "./index.command.template.js";
 import "./index.logger.template.js";
 import "./index.config.utils.template.js";
-import "./tsconfig.template.js";
 import "./tsconfig.spec.template.js";
 import "./docker-compose.template.js";
 import "./dockerfile.template.js";

package/lib/esm/templates/new-template.template.js

@@ -10,7 +10,7 @@ defineTemplate({
         if (context.from === "new") {
             return `import {defineTemplate} from "@tsed/cli";
     
-defineTemplate({
+export default defineTemplate({
   id: "${context.templateId}",
   label: "${context.name}",
   fileName: "{{symbolName}}.services",

package/lib/esm/templates/tsconfig.spec.template.js

@@ -3,7 +3,7 @@ export default defineTemplate({
     id: "tsconfig.spec.json",
     label: "TSConfig spec",
     description: "Create a tsconfig.json file.",
-    fileName: "tsconfig",
+    fileName: "tsconfig.spec",
     outputDir: ".",
     ext: "json",
     preserveCase: true,