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

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

@@ -32,7 +32,7 @@ ENV NODE_ENV production`;
 }
 defineTemplate({
     id: "dockerfile.yarn",
-    label: "Dockerfile",
+    label: "Dockerfile (Yarn classic)",
     fileName: "Dockerfile",
     outputDir: ".",
     ext: null,
@@ -71,7 +71,7 @@ CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"]
 });
 defineTemplate({
     id: "dockerfile.yarn_berry",
-    label: "Dockerfile",
+    label: "Dockerfile (Yarn Berry)",
     fileName: "Dockerfile",
     outputDir: ".",
     ext: null,
@@ -113,7 +113,7 @@ CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"]
 });
 defineTemplate({
     id: "dockerfile.npm",
-    label: "Dockerfile",
+    label: "Dockerfile (NPM)",
     fileName: "Dockerfile",
     outputDir: ".",
     ext: null,
@@ -151,7 +151,7 @@ CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"]`;
 });
 defineTemplate({
     id: "dockerfile.pnpm",
-    label: "Dockerfile",
+    label: "Dockerfile (PNPM)",
     fileName: "Dockerfile",
     outputDir: ".",
     ext: null,
@@ -190,7 +190,7 @@ CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"]
 });
 defineTemplate({
     id: "dockerfile.bun",
-    label: "Dockerfile",
+    label: "Dockerfile (Bun)",
     fileName: "Dockerfile",
     outputDir: ".",
     ext: null,

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

@@ -4,6 +4,7 @@ export default defineTemplate({
     label: "CLI Entry Point",
     description: "Create a new CLI entry point file",
     outputDir: "{{srcDir}}/bin",
+    hidden: true,
     render() {
         return `#!/usr/bin/env node
 import {CliCore} from "@tsed/cli-core";

package/lib/esm/templates/index.config.utils.template.js

@@ -8,7 +8,7 @@ export default defineTemplate({
     outputDir: "{{srcDir}}/config/utils",
     preserveCase: true,
     hidden: true,
-    render(_, data) {
+    render() {
         return `process.env.NODE_ENV = process.env.NODE_ENV || "development";
 
 export const isProduction = process.env.NODE_ENV === "production";

package/lib/esm/templates/index.js

@@ -30,3 +30,4 @@ import "./docker-compose.template.js";
 import "./dockerfile.template.js";
 import "./pm2.template.js";
 import "./readme.template.js";
+import "./new-template.template.js";

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

@@ -7,7 +7,8 @@ export default defineTemplate({
     outputDir: "{{srcDir}}/config/logger",
     fileName: "index",
     preserveCase: true,
-    render(_, data) {
+    hidden: true,
+    render() {
         return `import {DILoggerOptions} from "@tsed/di";
 import {$log} from "@tsed/logger";
 import {isProduction} from "../utils/index.js";

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

@@ -4,21 +4,23 @@ export default defineTemplate({
     label: "Middleware",
     fileName: "{{symbolName}}.middleware",
     outputDir: "{{srcDir}}/middlewares",
-    prompts: (data) => [
-        {
-            type: "list",
-            name: "middlewarePosition",
-            message: () => `The middleware should be called:`,
-            choices: [
-                { name: "Before the endpoint", value: "before" },
-                { name: "After the endpoint", value: "after" }
-            ],
-            when(state) {
-                return !!((["decorator"].includes(state.type || data.type) && ["middleware"].includes(state.templateType)) ||
-                    data.middlewarePosition);
+    prompts(context) {
+        return [
+            {
+                type: "list",
+                name: "middlewarePosition",
+                message: () => `The middleware should be called:`,
+                choices: [
+                    { name: "Before the endpoint", value: "before" },
+                    { name: "After the endpoint", value: "after" }
+                ],
+                when(state) {
+                    return !!((["decorator"].includes(state.type || context.type) && ["middleware"].includes(state.templateType)) ||
+                        context.middlewarePosition);
+                }
             }
-        }
-    ],
+        ];
+    },
     render(symbolName) {
         return `import {Middleware, MiddlewareMethods} from "@tsed/platform-middlewares";
 import {Context} from "@tsed/platform-params";

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

@@ -0,0 +1,67 @@
+import { defineTemplate } from "../utils/defineTemplate.js";
+defineTemplate({
+    id: "new-template",
+    label: "New Template",
+    fileName: "{{symbolName}}.template",
+    preserveCase: true,
+    outputDir: "./.templates",
+    hidden: true,
+    render(_, context) {
+        if (context.from === "new") {
+            return `import {defineTemplate} from "@tsed/cli";
+    
+defineTemplate({
+  id: "${context.templateId}",
+  label: "${context.name}",
+  fileName: "{{symbolName}}.services",
+  outputDir: "{{srcDir}}/services",
+  render(symbolName, context) {
+    return \`export class \${symbolName} {}\`
+  }
+});`;
+        }
+        if (context.template) {
+            const { id, ...props } = context.template;
+            const render = props.render.toString();
+            if (render.includes(""))
+                return `import {defineTemplate} from "@tsed/cli";      
+    
+defineTemplate({
+  id: "${context.override ? id : context.templateId}",
+  label: "${context.name}",
+  fileName: "${props.fileName}",
+  outputDir: "${props.outputDir}",
+  ${props.prompts ? `${props.prompts.toString()},` : ""}
+  ${props.render.toString()}
+});`;
+        }
+    },
+    hooks: {
+        $afterCreateSourceFile(sourceFile) {
+            const sourceFileText = sourceFile.getFullText();
+            if (sourceFileText.includes("camelCase")) {
+                sourceFile.addImportDeclaration({
+                    namedImports: ["camelCase"],
+                    moduleSpecifier: "change-case"
+                });
+            }
+            if (sourceFileText.includes("pascalCase")) {
+                sourceFile.addImportDeclaration({
+                    namedImports: ["pascalCase"],
+                    moduleSpecifier: "change-case"
+                });
+            }
+            if (sourceFileText.includes("kebabCase")) {
+                sourceFile.addImportDeclaration({
+                    namedImports: ["kebabCase"],
+                    moduleSpecifier: "change-case"
+                });
+            }
+            sourceFile.formatText({
+                indentSize: 2
+            });
+            sourceFile.saveSync();
+            return sourceFile;
+        }
+    }
+});

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

@@ -8,14 +8,14 @@ export default defineTemplate({
     ext: "md",
     preserveCase: true,
     hidden: true,
-    render(_, data) {
-        const pkgCmd = data.packageManager === PackageManager.YARN_BERRY ? "yarn" : data.packageManager;
+    render(_, context) {
+        const pkgCmd = context.packageManager === PackageManager.YARN_BERRY ? "yarn" : context.packageManager;
         return `<p style="text-align: center" align="center">
   <a href="https://tsed.dev" target="_blank"><img src="https://tsed.dev/tsed-og.png" width="200" alt="Ts.ED logo"/></a>
 </p>
 
 <div align="center">
-  <h1>Ts.ED - ${data.projectName}</h1>
+  <h1>Ts.ED - ${context.projectName}</h1>
   <br />
   <div align="center">
     <a href="https://cli.tsed.dev/">Website</a>

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

@@ -1,13 +1,14 @@
 import { defineTemplate } from "../utils/defineTemplate.js";
 export default defineTemplate({
     id: "tsconfig.spec.json",
-    label: "TSConfig",
+    label: "TSConfig spec",
     description: "Create a tsconfig.json file.",
     fileName: "tsconfig",
     outputDir: ".",
     ext: "json",
     preserveCase: true,
-    render: function (_, data) {
+    hidden: true,
+    render: function (_, context) {
         const tsconfig = {
             extends: "./tsconfig.base.json",
             compilerOptions: {
@@ -22,10 +23,10 @@ export default defineTemplate({
             include: ["src/**/*"],
             exclude: ["dist", "coverage", "node_modules"]
         };
-        if (data.jest) {
+        if (context.jest) {
             tsconfig.compilerOptions.types.push("jest");
         }
-        if (data.vitest) {
+        if (context.vitest) {
             tsconfig.compilerOptions.types.push("vitest/globals", "vitest/importMeta", "vite/client", "vitest");
             tsconfig.include.push("vitest.config.mts");
         }

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

@@ -6,8 +6,9 @@ export default defineTemplate({
     fileName: "tsconfig",
     outputDir: ".",
     ext: "json",
+    hidden: true,
     preserveCase: true,
-    render(_, data) {
+    render(_, context) {
         const tsconfig = {
             extends: "./tsconfig.base.json",
             compilerOptions: {
@@ -21,7 +22,7 @@ export default defineTemplate({
                 }
             ]
         };
-        if (data.testing) {
+        if (context.testing) {
             tsconfig.references?.push({
                 path: "./tsconfig.test.json"
             });

package/lib/esm/utils/defineTemplate.js

@@ -1,4 +1,4 @@
-import { injectable } from "@tsed/di";
+import { injectable } from "@tsed/cli-core";
 export function defineTemplate(opts) {
     const provider = injectable(Symbol.for(`TEMPLATE:${opts.id}`))
         .type("CLI_TEMPLATES")
@@ -9,5 +9,5 @@ export function defineTemplate(opts) {
     if (opts.hooks) {
         provider.hooks(opts.hooks);
     }
-    return opts;
+    return provider.token();
 }