@tsed/cli 7.3.4 → 7.4.0

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

@@ -1,6 +1,6 @@
 import * as os from "node:os";
 import { basename, join } from "node:path";
-import { CliExeca, CliFs, CliLoadFile, cliPackageJson, CliPlugins, command, Configuration, inject, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
+import { CliExeca, CliFs, CliLoadFile, cliPackageJson, CliPlugins, command, Configuration, inject, PackageManager, PackageManagersModule, ProjectPackageJson } from "@tsed/cli-core";
 import { tasks } from "@tsed/cli-tasks";
 import { isString } from "@tsed/core";
 import { constant } from "@tsed/di";
@@ -46,8 +46,16 @@ export class InitCmd {
         if (initialOptions.skipPrompt) {
             return [];
         }
-        const packageManagers = this.packageManagers.list();
-        const runtimes = this.runtimes.list();
+        const forceBunRuntime = this.isLaunchedWithBunx();
+        const packageManagers = forceBunRuntime ? this.filterOnlyBun(this.packageManagers.list()) : this.packageManagers.list();
+        const runtimes = forceBunRuntime ? this.filterOnlyBun(this.runtimes.list()) : this.runtimes.list();
+        const promptOptions = forceBunRuntime
+            ? {
+                ...initialOptions,
+                runtime: "bun",
+                packageManager: PackageManager.BUN
+            }
+            : initialOptions;
         return [
             {
                 type: "input",
@@ -59,12 +67,16 @@ export class InitCmd {
                     return kebabCase(input);
                 }
             },
-            ...getFeaturesPrompt(runtimes, packageManagers.filter((o) => o !== "bun"), initialOptions)
+            ...getFeaturesPrompt(runtimes, forceBunRuntime ? packageManagers : packageManagers.filter((o) => o !== "bun"), promptOptions)
         ];
     }
     $mapContext(ctx) {
         this.resolveRootDir(ctx);
         ctx = mapToContext(ctx);
+        if (this.isLaunchedWithBunx()) {
+            ctx.runtime = "bun";
+            ctx.packageManager = "bun";
+        }
         this.runtimes.init(ctx);
         this.runtimes.list().forEach((key) => {
             ctx[key] = ctx.runtime === key;
@@ -78,6 +90,16 @@ export class InitCmd {
             srcDir: constant("project.srcDir", "src")
         };
     }
+    isLaunchedWithBunx() {
+        return Boolean(globalThis.Bun);
+    }
+    filterOnlyBun(values) {
+        const filtered = values.filter((value) => value === "bun");
+        return filtered.length ? filtered : values;
+    }
+    async writeRcFiles(ctx) {
+        await Promise.all([render(".npmrc", ctx), render(".yarnrc", ctx)]);
+    }
     preExec(ctx) {
         this.fs.ensureDirSync(this.packageJson.cwd);
         ctx.projectName && (this.packageJson.name = ctx.projectName);
@@ -91,9 +113,7 @@ export class InitCmd {
             {
                 title: "Write RC files",
                 skip: () => !ctx.premium,
-                task: () => {
-                    return Promise.all([render(".npmrc", ctx), render(".yarnrc", ctx)]);
-                }
+                task: () => this.writeRcFiles(ctx)
             },
             {
                 title: "Initialize package.json",

package/lib/esm/commands/init/utils/hasFeature.js

@@ -3,8 +3,11 @@ export function hasValue(expression, value) {
     return (ctx) => [].concat(value).includes(getValue(expression, ctx));
 }
 export function hasFeature(feature) {
-    return (ctx) => !!ctx.features.find((item) => item === feature);
+    return (ctx) => !!ctx.features?.find((item) => item === feature);
 }
 export function hasValuePremium() {
-    return (ctx) => !!ctx.features.find((item) => item.endsWith(":premium"));
+    return (ctx) => Object.entries(ctx)
+        .filter(([key]) => key.startsWith("features"))
+        .flatMap(([, value]) => [].concat(value))
+        .some((item) => typeof item === "string" && item.endsWith(":premium"));
 }