@tsed/cli 7.0.1 → 7.1.0

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

@@ -59,7 +59,9 @@ export class CreateTemplateCommand {
         };
     }
     $exec(ctx) {
-        this.projectPackageJson.addDevDependencies({ "@tsed/cli": PKG.version });
+        if (this.projectPackageJson.devDependencies["@tsed/cli"] === undefined) {
+            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/services/CliStats.js

@@ -10,13 +10,13 @@ export class CliStats extends CliHttpClient {
     }
     sendInit(opts) {
         if (!this.disabled) {
-            console.log();
             const data = {
                 features: [],
                 is_success: true,
                 ...opts,
                 os: os.type(),
                 convention: this.projectPackage.preferences.convention === "conv_default" ? "tsed" : "angular",
+                style: this.projectPackage.preferences.architecture === "arc_default" ? "tsed" : "angular",
                 platform: this.projectPackage.preferences.platform,
                 package_manager: this.projectPackage.preferences.packageManager,
                 runtime: this.projectPackage.preferences.runtime,
@@ -36,6 +36,8 @@ export class CliStats extends CliHttpClient {
             return this.sendInit({
                 channel: "cli",
                 is_success: !er,
+                error_name: er?.name || "",
+                error_message: er?.message,
                 features: data.features
             });
         }

package/lib/esm/services/CliTemplatesService.js

@@ -1,6 +1,6 @@
 import { join } from "node:path";
 import { CliFs } from "@tsed/cli-core";
-import { constant, context, inject, injectable, injectMany, logger } from "@tsed/di";
+import { constant, context, inject, injectable, injectMany, lazyInject, logger } from "@tsed/di";
 import { globby } from "globby";
 import { TEMPLATE_DIR } from "../constants/index.js";
 import { mapDefaultTemplateOptions } from "./mappers/mapDefaultTemplateOptions.js";
@@ -29,18 +29,17 @@ export class CliTemplatesService {
             });
             const promises = files.map(async (file) => {
                 try {
-                    const files = join(this.templatesDir, file);
-                    const { default: token } = await import(files.replace(".ts", ".js"));
-                    if (token) {
-                        return inject(token);
-                    }
+                    const modulePath = join(this.templatesDir, file);
+                    return await lazyInject(() => import(modulePath));
                 }
                 catch (er) {
                     logger().warn("Unable to load custom template %s: %s", file, er.message);
                 }
             });
             let customs = await Promise.all(promises);
-            this.#customTemplates = customs.map((template) => {
+            this.#customTemplates = customs
+                .filter((template) => !!template)
+                .map((template) => {
                 return {
                     ...template,
                     label: template.label + " (custom)"

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

@@ -16,7 +16,7 @@ export default defineTemplate({
   fileName: "{{symbolName}}.services",
   outputDir: "{{srcDir}}/services",
   render(symbolName, context) {
-    return \`export class \${symbolName} {}\`
+    return \`export class \${symbolName} {}\`;
   }
 });`;
         }