@nanoforge-dev/cli 1.1.0 → 1.1.1

package/dist/command.loader.js

@@ -96,7 +96,7 @@ var Prefixes = {
 import * as ansis from "ansis";
 import { watch } from "chokidar";
 import * as console2 from "console";
-import { dirname, join as join2 } from "path";
+import { dirname, join as join3 } from "path";
 
 // src/lib/input/base-inputs.ts
 var getStringInput = /* @__PURE__ */ __name((input2, field) => {
@@ -237,7 +237,7 @@ var getInstallNamesInputOrAsk = /* @__PURE__ */ __name((inputs) => {
 }, "getInstallNamesInputOrAsk");
 
 // src/lib/package-manager/package-manager.factory.ts
-import fs from "fs";
+import fs2 from "fs";
 import { resolve as resolve2 } from "path";
 
 // src/lib/runner/runner.factory.ts
@@ -311,7 +311,8 @@ var BunRunner = class extends AbstractRunner {
 };
 
 // src/lib/utils/path.ts
-import { resolve } from "path";
+import fs from "fs";
+import { join, resolve } from "path";
 var getCwd = /* @__PURE__ */ __name((directory) => {
   return resolve(directory);
 }, "getCwd");
@@ -320,9 +321,19 @@ var getModulePath = /* @__PURE__ */ __name((name, removeLast = false) => {
   if (removeLast) return path.split("/").slice(0, -1).join("/");
   return path;
 }, "getModulePath");
-var getNodeBinaryPath = /* @__PURE__ */ __name((name) => {
-  return resolve("node_modules", ".bin", name);
-}, "getNodeBinaryPath");
+var resolveCLINodeBinaryPath = /* @__PURE__ */ __name((name) => {
+  let base = join(getModulePath(".", true), "..");
+  while (base.length >= 1) {
+    const path = join(base, "node_modules", ".bin", name);
+    try {
+      fs.accessSync(path);
+      return path;
+    } catch {
+      base = join(base, "..");
+    }
+  }
+  throw new Error("Could not find module path");
+}, "resolveCLINodeBinaryPath");
 
 // src/lib/runner/runners/local-bun.runner.ts
 var LocalBunRunner = class extends AbstractRunner {
@@ -330,7 +341,7 @@ var LocalBunRunner = class extends AbstractRunner {
     __name(this, "LocalBunRunner");
   }
   constructor() {
-    super(getNodeBinaryPath("bun"));
+    super(resolveCLINodeBinaryPath("bun"));
   }
 };
 
@@ -512,7 +523,7 @@ var AbstractPackageManager = class {
   }
   async runDev(directory, command, env2 = {}, flags = [], collect = true) {
     try {
-      const commandArgs = [this.cli.run, command, ...flags];
+      const commandArgs = [this.cli.exec, command, ...flags];
       await this.runner.run(commandArgs, collect, getCwd(directory), env2);
       return true;
     } catch {
@@ -590,6 +601,7 @@ var BunPackageManager = class extends AbstractPackageManager {
       add: "add",
       update: "update",
       remove: "remove",
+      exec: "exec",
       run: "run",
       saveFlag: "--save",
       saveDevFlag: "--dev",
@@ -615,6 +627,7 @@ var LocalBunPackageManager = class extends AbstractPackageManager {
       add: "add",
       update: "update",
       remove: "remove",
+      exec: "exec",
       run: "run",
       build: "build",
       runFile: "run",
@@ -642,6 +655,7 @@ var NpmPackageManager = class extends AbstractPackageManager {
       add: "install",
       update: "update",
       remove: "uninstall",
+      exec: "exec",
       run: "run",
       saveFlag: "--save",
       saveDevFlag: "--save-dev",
@@ -667,6 +681,7 @@ var PnpmPackageManager = class extends AbstractPackageManager {
       add: "add",
       update: "update",
       remove: "remove",
+      exec: "exec",
       run: "run",
       saveFlag: "-P",
       saveDevFlag: "-D",
@@ -692,6 +707,7 @@ var YarnPackageManager = class extends AbstractPackageManager {
       add: "add",
       update: "update",
       remove: "remove",
+      exec: "exec",
       run: "run",
       saveFlag: "",
       saveDevFlag: "-D",
@@ -724,7 +740,7 @@ var PackageManagerFactory = class {
   static async find(directory = ".") {
     const DEFAULT_PACKAGE_MANAGER = "npm" /* NPM */;
     try {
-      const files = await fs.promises.readdir(resolve2(directory));
+      const files = await fs2.promises.readdir(resolve2(directory));
       if (files.includes("bun.lock")) {
         return this.create("bun" /* BUN */);
       }
@@ -867,7 +883,7 @@ __decorateClass([
 import { plainToInstance } from "class-transformer";
 import { validate } from "class-validator";
 import { existsSync, readFileSync } from "fs";
-import { join } from "path";
+import { join as join2 } from "path";
 
 // src/lib/utils/object.ts
 var isObject = /* @__PURE__ */ __name((item) => {
@@ -922,10 +938,10 @@ var CONFIG_DEFAULTS = {
 var config;
 var getConfigPath = /* @__PURE__ */ __name((directory, name) => {
   if (name) {
-    return join(directory, name);
+    return join2(directory, name);
   } else {
     for (const n of ["nanoforge.config.json"]) {
-      const path = join(directory, n);
+      const path = join2(directory, n);
       if (existsSync(path)) return path;
     }
     throw new Error(`Unsupported config: ${name}`);
@@ -997,8 +1013,11 @@ var BuildAction = class extends AbstractAction {
         console2.info();
         return;
       }
-      if (!res) console2.info(Messages.BUILD_FAILED);
-      else console2.info(Messages.BUILD_SUCCESS);
+      if (!res) {
+        console2.info(Messages.BUILD_FAILED);
+        process.exit(1);
+      }
+      console2.info(Messages.BUILD_SUCCESS);
       process.exit(0);
     } catch (e) {
       console2.error(e);
@@ -1039,7 +1058,7 @@ var buildPart = /* @__PURE__ */ __name(async (name, part, directory, options) =>
     }
   }, "build");
   if (options?.watch)
-    watch(dirname(join2(getCwd(directory), part.entry))).on("change", () => build(true));
+    watch(dirname(join3(getCwd(directory), part.entry))).on("change", () => build(true));
   return await build();
 }, "buildPart");
 
@@ -1082,7 +1101,7 @@ var runAction = /* @__PURE__ */ __name(async (command, params, directory, stdout
 
 // src/action/actions/generate.action.ts
 import * as console3 from "console";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 
 // src/lib/schematics/abstract.collection.ts
 var AbstractCollection = class {
@@ -1210,7 +1229,7 @@ var SchematicOption = class {
       }
     } else if (typeof this.value === "boolean") {
       const str = normalizedName;
-      return this.value ? [`--${str}`] : [`--no-${str}`];
+      return this.value ? [`--${str}=true`] : [`--${str}=false`];
     } else if (Array.isArray(this.value)) {
       return this.value.reduce(
         (old, option) => [
@@ -1323,7 +1342,7 @@ var generateFiles = /* @__PURE__ */ __name(async (values, directory, watch3) =>
       language: values.language,
       initFunctions: values.initFunctions
     },
-    watch3 ? join3(getCwd(directory), values.directory, ".nanoforge", "client.save.json") : void 0
+    watch3 ? join4(getCwd(directory), values.directory, ".nanoforge", "client.save.json") : void 0
   );
   if (values.server) {
     await executeSchematic(
@@ -1337,7 +1356,7 @@ var generateFiles = /* @__PURE__ */ __name(async (values, directory, watch3) =>
         language: values.language,
         initFunctions: values.initFunctions
       },
-      join3(getCwd(directory), values.directory, ".nanoforge", "server.save.json")
+      join4(getCwd(directory), values.directory, ".nanoforge", "server.save.json")
     );
   }
 }, "generateFiles");
@@ -1366,17 +1385,20 @@ var InstallAction = class extends AbstractAction {
 var installPackages = /* @__PURE__ */ __name(async (names, directory) => {
   try {
     const packageManager = await PackageManagerFactory.find(directory);
-    await packageManager.addProduction(directory, names);
+    const res = await packageManager.addProduction(directory, names);
+    if (!res) process3.exit(1);
   } catch (error4) {
     if (error4 && error4.message) {
       console.error(ansis3.red(error4.message));
     }
+    process3.exit(1);
   }
 }, "installPackages");
 
 // src/action/actions/new.action.ts
 import * as ansis4 from "ansis";
 import console4 from "console";
+import * as process4 from "process";
 
 // src/lib/input/inputs/new/init-functions.input.ts
 var getNewInitFunctionsWithDefault = /* @__PURE__ */ __name((inputs) => {
@@ -1479,10 +1501,10 @@ var NewAction = class extends AbstractAction {
       if (!values.skipInstall) await runInstall(directory, values.packageManager);
       console4.info();
       console4.info(Messages.NEW_SUCCESS);
-      process.exit(0);
+      process4.exit(0);
     } catch {
       console4.error(Messages.NEW_FAILED);
-      process.exit(1);
+      process4.exit(1);
     }
   }
 };
@@ -1556,13 +1578,15 @@ var runInstall = /* @__PURE__ */ __name(async (directory, pkgManagerName) => {
     if (error4 && error4.message) {
       console4.error(ansis4.red(error4.message));
     }
+    process4.exit(1);
   }
 }, "runInstall");
 
 // src/action/actions/start.action.ts
 import * as ansis5 from "ansis";
 import * as console5 from "console";
-import { join as join4 } from "path";
+import * as process5 from "process";
+import { join as join5 } from "path";
 var StartAction = class extends AbstractAction {
   static {
     __name(this, "StartAction");
@@ -1576,30 +1600,41 @@ var StartAction = class extends AbstractAction {
       const clientDir = config2.client.runtime.dir;
       const serverDir = config2.server.runtime.dir;
       const clientPort = getStringInputWithDefault(options, "clientPort", config2.client.port);
+      const cert = getStringInput(options, "cert");
+      const key = getStringInput(options, "key");
       const watch3 = getWatchInput(options);
       await Promise.all([
         config2.server.enable ? this.startServer(directory, serverDir, watch3) : void 0,
-        this.startClient(clientPort, directory, clientDir, {
-          watch: watch3,
-          serverGameDir: config2.server.enable ? serverDir : void 0
-        })
+        this.startClient(
+          clientPort,
+          directory,
+          clientDir,
+          {
+            watch: watch3,
+            serverGameDir: config2.server.enable ? serverDir : void 0
+          },
+          cert,
+          key
+        )
       ]);
-      process.exit(0);
+      process5.exit(0);
     } catch (e) {
       console5.error(e);
-      process.exit(1);
+      process5.exit(1);
     }
   }
-  async startClient(port, directory, gameDir, options) {
+  async startClient(port, directory, gameDir, options, cert, key) {
     const path = getModulePath("@nanoforge-dev/loader-client/package.json", true);
     const params = {
       PORT: port,
-      GAME_DIR: getCwd(join4(directory, gameDir))
+      GAME_DIR: getCwd(join5(directory, gameDir)),
+      CERT: cert ? join5(getCwd(directory), cert) : void 0,
+      KEY: key ? join5(getCwd(directory), key) : void 0
     };
     if (options?.watch) {
       params["WATCH"] = "true";
       if (options?.serverGameDir) {
-        params["WATCH_SERVER_GAME_DIR"] = getCwd(join4(directory, options.serverGameDir));
+        params["WATCH_SERVER_GAME_DIR"] = getCwd(join5(directory, options.serverGameDir));
       }
     }
     return runPart("Client", path, params);
@@ -1607,7 +1642,7 @@ var StartAction = class extends AbstractAction {
   startServer(directory, gameDir, watch3) {
     const path = getModulePath("@nanoforge-dev/loader-server/package.json", true);
     const params = {
-      GAME_DIR: getCwd(join4(directory, gameDir))
+      GAME_DIR: getCwd(join5(directory, gameDir))
     };
     if (watch3) params["WATCH"] = "true";
     return runPart("Server", path, params);
@@ -1735,7 +1770,7 @@ var StartCommand = class extends AbstractCommand {
     program.command("start").description("start your game").option("-d, --directory [directory]", "specify the directory of your project").option("-c, --config [config]", "path to the config file", "nanoforge.config.json").option(
       "-p, --client-port [clientPort]",
       "specify the port of the loader (the website to load the game)"
-    ).option("--game-exposure-port [gameExposurePort]", "specify the port of the game exposure").option("--server-port [serverPort]", "specify the port of the server").option("--watch", "run app in watching mode", false).action(async (rawOptions) => {
+    ).option("--game-exposure-port [gameExposurePort]", "specify the port of the game exposure").option("--server-port [serverPort]", "specify the port of the server").option("--watch", "run app in watching mode", false).option("--cert [cert]", "path to the SSL certificate for HTTPS").option("--key [key]", "path to the SSL key for HTTPS").action(async (rawOptions) => {
       const options = /* @__PURE__ */ new Map();
       options.set("directory", { value: rawOptions.directory });
       options.set("config", { value: rawOptions.config });
@@ -1745,6 +1780,8 @@ var StartCommand = class extends AbstractCommand {
       });
       options.set("serverPort", { value: rawOptions.serverPort });
       options.set("watch", { value: rawOptions.watch });
+      options.set("cert", { value: rawOptions.cert });
+      options.set("key", { value: rawOptions.key });
       const args = /* @__PURE__ */ new Map();
       await this.action.handle(args, options);
     });