fix: issues with init process and esbuild (#242)

* fix: issues with init process and esbuild

* fix: issue with test

Author: nmerget

docs/API.md

@@ -25,7 +25,7 @@ Creates a new GodotJS project with TypeScript support
 
 | long            | short | description                                            | required | defaultValue |
 | :-------------- | :---: | :----------------------------------------------------- | :------: | :----------- |
-| `--name`        |       | The name of your project                               |    `✅`   | `"MyGame"`   |
+| `--name`        |       | The name of your project                               |    `✅`   | `"my-game"`  |
 | `--out`         |       | Relative path where project is written                 |    `❌`   | `"."`        |
 | `--forceDelete` |       | Removes project dir if it's already there              |    `❌`   |              |
 | `--dry`         |       | Do a dry run with this command - prints/returns output |    `❌`   |              |

src/commands/init/data.ts

@@ -10,7 +10,7 @@ export type InitConfigType = {
 export const initOptions: ProgramOptionsType[] = [
   {
     name: "name",
-    defaultValue: "MyGame",
+    defaultValue: "my-game",
     description: "The name of your project",
     required: true,
     inquirer: {

src/utils/esbuild.ts

@@ -1,41 +1,13 @@
-import { readFileSync, writeFileSync } from "node:fs";
 import { glob } from "glob";
-import { BuildOptions, OnLoadArgs, Plugin } from "esbuild";
-import { pathClean, stripRelativePath } from "./path";
+import { BuildOptions } from "esbuild";
+import { pathClean } from "./path";
 
-const defaultOutdir = "scripts";
-const defaultOutbase = "src";
-
-const godotTsPlugin: Plugin = {
-  name: "godotTsPlugin",
-  setup(build) {
-    const absolutePaths: string[] = [];
-    build.onLoad({ filter: /\.ts$/ }, (args: OnLoadArgs) => {
-      absolutePaths.push(args.path);
-      return undefined;
-    });
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    build.onEnd(async (_) => {
-      const { outdir, outbase, outExtension } = build.initialOptions;
-      const extension = outExtension?.[".js"] ?? ".js";
-      for (const filePath of absolutePaths) {
-        const genFilePath = filePath
-          // Workaround for windows
-          .replaceAll("\\", "/")
-          .replace(stripRelativePath(outbase), stripRelativePath(outdir))
-          .replace(".ts", extension);
-        const content = readFileSync(genFilePath);
-        const genContent = `//generatedPath=${filePath}\n${content.toString("utf8")}`;
-        writeFileSync(genFilePath, genContent);
-      }
-    });
-  },
-};
+const defaultOutdir = "./.godot/GodotJS";
+const defaultOutbase = ".";
 
 const options: BuildOptions = {
   format: "cjs",
   target: "esnext",
-  plugins: [godotTsPlugin],
 };
 
 export type ESBuildType = {
@@ -55,9 +27,11 @@ export const getESBuildOptions = async ({
   const outdir = pathClean(out ?? defaultOutdir);
 
   const entryPointsClasses = await glob(`${outbase}/**/*.ts`, {
-    ignore: [`${outbase}/**/*.bundle.ts`, `${outbase}/**/*.d.ts`],
+    ignore: [`${outbase}/**/*.bundle.ts`, `**/*.d.ts`, `**/node_modules/**`],
+  });
+  const entryPointsBundle = await glob(`${outbase}/**/*.bundle.ts`, {
+    ignore: [`**/*.d.ts`, `**/node_modules/**`],
   });
-  const entryPointsBundle = await glob(`${outbase}/**/*.bundle.ts`);
   const classOptions: BuildOptions = {
     entryPoints: entryPointsClasses,
     outExtension: { ".js": ".js" },

src/utils/inquirer-process.ts

@@ -15,7 +15,7 @@ export const startInquirerProcess = async <T>(
       inquirer?.input &&
       (!config[option.name] || config[option.name] === option.defaultValue)
     ) {
-      config[option.name] = await input({
+      copyConfig[option.name] = await input({
         message: inquirer.input.message,
         default: option.defaultValue?.toString(),
         required: option.required,

test/esbuild/config.test.ts

@@ -12,10 +12,8 @@ const buildResult = JSON.stringify({
     outExtension: { ".js": ".js" },
     format: "cjs",
     target: "esnext",
-    minify: undefined,
     outbase: "./scripts",
-    outdir: "scripts",
-    sourcemap: undefined,
+    outdir: "./.godot/GodotJS",
   },
   bundleOptions: {
     entryPoints: [],
@@ -25,8 +23,7 @@ const buildResult = JSON.stringify({
     format: "cjs",
     target: "esnext",
     outbase: "./scripts",
-    outdir: "scripts",
-    sourcemap: undefined,
+    outdir: "./.godot/GodotJS",
   },
 });
 
@@ -36,8 +33,6 @@ describe("config", () => {
       dry: true,
       config: "./test/esbuild/.config/godot-ts.json",
     });
-    delete result.bundleOptions.plugins;
-    delete result.classOptions.plugins;
     expect(JSON.stringify(result)).toEqual(buildResult);
   });
 });