create-gtkx 1.0.0 → 1.1.0

package/README.md

@@ -161,7 +161,7 @@ Explore the [example apps](https://github.com/gtkx-org/gtkx/tree/main/examples):
 
 ## Status
 
-GTKX 1.0 is released.
+GTKX is stable and ready for production use.
 
 ## Contributing
 

package/dist/cli.js

@@ -1,7 +1,7 @@
-import { packageVersion } from "@gtkx/utils";
 import { defineCommand, runMain } from "citty";
+import packageManifest from "../package.json" with { type: "json" };
 import { scaffoldCommand } from "./command.js";
-const version = packageVersion(import.meta.url, "../package.json");
+const version = packageManifest.version;
 const main = defineCommand({
     ...scaffoldCommand,
     meta: {

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AAEnE,MAAM,IAAI,GAAG,aAAa,CAAC;IACvB,GAAG,eAAe;IAClB,IAAI,EAAE;QACF,IAAI,EAAE,aAAa;QACnB,OAAO;QACP,WAAW,EAAE,iCAAiC;KACjD;CACJ,CAAC,CAAC;AAEH,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC","sourcesContent":["import { packageVersion } from \"@gtkx/utils\";\nimport { defineCommand, runMain } from \"citty\";\nimport { scaffoldCommand } from \"./command.js\";\n\nconst version = packageVersion(import.meta.url, \"../package.json\");\n\nconst main = defineCommand({\n    ...scaffoldCommand,\n    meta: {\n        name: \"create-gtkx\",\n        version,\n        description: \"Scaffold a new GTKX application\",\n    },\n});\n\nvoid runMain(main);\n"]}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,eAAe,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;AAExC,MAAM,IAAI,GAAG,aAAa,CAAC;IACvB,GAAG,eAAe;IAClB,IAAI,EAAE;QACF,IAAI,EAAE,aAAa;QACnB,OAAO;QACP,WAAW,EAAE,iCAAiC;KACjD;CACJ,CAAC,CAAC;AAEH,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC","sourcesContent":["import { defineCommand, runMain } from \"citty\";\nimport packageManifest from \"../package.json\" with { type: \"json\" };\nimport { scaffoldCommand } from \"./command.js\";\n\nconst version = packageManifest.version;\n\nconst main = defineCommand({\n    ...scaffoldCommand,\n    meta: {\n        name: \"create-gtkx\",\n        version,\n        description: \"Scaffold a new GTKX application\",\n    },\n});\n\nvoid runMain(main);\n"]}

package/dist/command.d.ts

@@ -1,13 +1,3 @@
-type CreateCommandArgs = {
-    name?: string | undefined;
-    "application-id"?: string | undefined;
-    "package-manager"?: string | undefined;
-    typescript?: boolean | undefined;
-    vitest?: boolean | undefined;
-    yes?: boolean | undefined;
-    "no-interactive"?: boolean | undefined;
-    overwrite?: boolean | undefined;
-};
 declare const scaffoldCommand: import("citty").CommandDef<{
     readonly name: {
         readonly type: "positional";
@@ -20,7 +10,7 @@ declare const scaffoldCommand: import("citty").CommandDef<{
     };
     readonly "package-manager": {
         readonly type: "string";
-        readonly alias: "pm";
+        readonly alias: "p";
         readonly description: string;
     };
     readonly typescript: {
@@ -43,10 +33,9 @@ declare const scaffoldCommand: import("citty").CommandDef<{
     };
     readonly overwrite: {
         readonly type: "boolean";
-        readonly alias: "force";
+        readonly alias: "f";
         readonly description: "Overwrite the contents of a non-empty target directory when running without prompts";
     };
 }>;
-declare const runCreate: (args: CreateCommandArgs) => Promise<void>;
-export { scaffoldCommand, runCreate };
+export { scaffoldCommand };
 //# sourceMappingURL=command.d.ts.map

package/dist/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAKA,KAAK,iBAAiB,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CnB,CAAC;AA4BH,QAAA,MAAM,SAAS,GAAU,MAAM,iBAAiB,KAAG,OAAO,CAAC,IAAI,CAiB9D,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAkBA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+CnB,CAAC;AAgCH,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/dist/command.js

@@ -1,6 +1,8 @@
+import * as p from "@clack/prompts";
+import { errorMessage } from "@gtkx/utils";
 import { defineCommand } from "citty";
 import { OperationCanceledError, ScaffoldAbortedError } from "./errors.js";
-import { isKnownPackageManager, PACKAGE_MANAGER_FLAG_DESCRIPTION } from "./package-managers.js";
+import { PACKAGE_MANAGER_FLAG_DESCRIPTION } from "./package-managers.js";
 import { scaffold } from "./scaffolder.js";
 const scaffoldCommand = defineCommand({
     meta: {
@@ -19,7 +21,7 @@ const scaffoldCommand = defineCommand({
         },
         "package-manager": {
             type: "string",
-            alias: "pm",
+            alias: "p",
             description: PACKAGE_MANAGER_FLAG_DESCRIPTION,
         },
         typescript: {
@@ -43,39 +45,28 @@ const scaffoldCommand = defineCommand({
         },
         overwrite: {
             type: "boolean",
-            alias: "force",
+            alias: "f",
             description: "Overwrite the contents of a non-empty target directory when running without prompts",
         },
     },
     run: ({ args }) => runCreate(args),
 });
-const parsePackageManager = (value) => {
-    if (value === undefined) {
-        return undefined;
-    }
-    if (!isKnownPackageManager(value)) {
-        throw new Error(`Unknown package manager "${value}". Expected one of: ${PACKAGE_MANAGER_FLAG_DESCRIPTION}.`);
-    }
-    return value;
-};
 const settleScaffoldFailure = (error) => {
     if (error instanceof OperationCanceledError) {
         return;
     }
-    if (error instanceof ScaffoldAbortedError) {
-        process.exitCode = 1;
-        return;
+    if (!(error instanceof ScaffoldAbortedError)) {
+        p.log.error(errorMessage(error));
     }
-    throw error;
+    process.exitCode = 1;
 };
 const runCreate = async (args) => {
     const isInteractive = args["no-interactive"] || args.yes ? false : process.stdin.isTTY;
-    const packageManager = parsePackageManager(args["package-manager"]);
     try {
         await scaffold({
             name: args.name,
             applicationId: args["application-id"],
-            packageManager,
+            packageManager: args["package-manager"],
             isTypescript: args.typescript,
             shouldIncludeTesting: args.vitest,
             isInteractive,
@@ -86,5 +77,5 @@ const runCreate = async (args) => {
         settleScaffoldFailure(error);
     }
 };
-export { scaffoldCommand, runCreate };
+export { scaffoldCommand };
 //# sourceMappingURL=command.js.map

package/dist/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"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","sourcesContent":["import { defineCommand } from \"citty\";\nimport { OperationCanceledError, ScaffoldAbortedError } from \"./errors.js\";\nimport { isKnownPackageManager, PACKAGE_MANAGER_FLAG_DESCRIPTION, type PackageManager } from \"./package-managers.js\";\nimport { scaffold } from \"./scaffolder.js\";\n\ntype CreateCommandArgs = {\n    name?: string | undefined;\n    \"application-id\"?: string | undefined;\n    \"package-manager\"?: string | undefined;\n    typescript?: boolean | undefined;\n    vitest?: boolean | undefined;\n    yes?: boolean | undefined;\n    \"no-interactive\"?: boolean | undefined;\n    overwrite?: boolean | undefined;\n};\n\nconst scaffoldCommand = defineCommand({\n    meta: {\n        name: \"create\",\n        description: \"Create a new GTKX application\",\n    },\n    args: {\n        name: {\n            type: \"positional\",\n            description: \"Target directory or project name (e.g. my-app, ., apps/my-app)\",\n            required: false,\n        },\n        \"application-id\": {\n            type: \"string\",\n            description: \"Application ID (e.g., com.example.myapp)\",\n        },\n        \"package-manager\": {\n            type: \"string\",\n            alias: \"pm\",\n            description: PACKAGE_MANAGER_FLAG_DESCRIPTION,\n        },\n        typescript: {\n            type: \"boolean\",\n            negativeDescription: \"Scaffold the application in JavaScript instead of TypeScript\",\n            description: \"Scaffold the application in TypeScript\",\n        },\n        vitest: {\n            type: \"boolean\",\n            description: \"Include a Vitest testing setup\",\n        },\n        yes: {\n            type: \"boolean\",\n            alias: \"y\",\n            description: \"Skip prompts and accept defaults for unspecified options\",\n        },\n        \"no-interactive\": {\n            type: \"boolean\",\n            description:\n                \"Run without prompts, using the default for every option not passed on the command line \" +\n                \"(same as --yes)\",\n        },\n        overwrite: {\n            type: \"boolean\",\n            alias: \"force\",\n            description: \"Overwrite the contents of a non-empty target directory when running without prompts\",\n        },\n    },\n    run: ({ args }) => runCreate(args),\n});\n\nconst parsePackageManager = (value: string | undefined): PackageManager | undefined => {\n    if (value === undefined) {\n        return undefined;\n    }\n\n    if (!isKnownPackageManager(value)) {\n        throw new Error(`Unknown package manager \"${value}\". Expected one of: ${PACKAGE_MANAGER_FLAG_DESCRIPTION}.`);\n    }\n\n    return value;\n};\n\nconst settleScaffoldFailure = (error: unknown): void => {\n    if (error instanceof OperationCanceledError) {\n        return;\n    }\n\n    if (error instanceof ScaffoldAbortedError) {\n        process.exitCode = 1;\n\n        return;\n    }\n\n    throw error;\n};\n\nconst runCreate = async (args: CreateCommandArgs): Promise<void> => {\n    const isInteractive = args[\"no-interactive\"] || args.yes ? false : process.stdin.isTTY;\n    const packageManager = parsePackageManager(args[\"package-manager\"]);\n\n    try {\n        await scaffold({\n            name: args.name,\n            applicationId: args[\"application-id\"],\n            packageManager,\n            isTypescript: args.typescript,\n            shouldIncludeTesting: args.vitest,\n            isInteractive,\n            shouldOverwrite: args.overwrite,\n        });\n    } catch (error) {\n        settleScaffoldFailure(error);\n    }\n};\n\nexport { scaffoldCommand, runCreate };\n"]}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,gCAAgC,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAa3C,MAAM,eAAe,GAAG,aAAa,CAAC;IAClC,IAAI,EAAE;QACF,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,+BAA+B;KAC/C;IACD,IAAI,EAAE;QACF,IAAI,EAAE;YACF,IAAI,EAAE,YAAY;YAClB,WAAW,EAAE,gEAAgE;YAC7E,QAAQ,EAAE,KAAK;SAClB;QACD,gBAAgB,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,0CAA0C;SAC1D;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,gCAAgC;SAChD;QACD,UAAU,EAAE;YACR,IAAI,EAAE,SAAS;YACf,mBAAmB,EAAE,8DAA8D;YACnF,WAAW,EAAE,wCAAwC;SACxD;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,gCAAgC;SAChD;QACD,GAAG,EAAE;YACD,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,0DAA0D;SAC1E;QACD,gBAAgB,EAAE;YACd,IAAI,EAAE,SAAS;YACf,WAAW,EACP,yFAAyF;gBACzF,iBAAiB;SACxB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,qFAAqF;SACrG;KACJ;IACD,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,CAAC,KAAc,EAAQ,EAAE;IACnD,IAAI,KAAK,YAAY,sBAAsB,EAAE,CAAC;QAC1C,OAAO;IACX,CAAC;IAED,IAAI,CAAC,CAAC,KAAK,YAAY,oBAAoB,CAAC,EAAE,CAAC;QAC3C,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,EAAE,IAAuB,EAAiB,EAAE;IAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;IAEvF,IAAI,CAAC;QACD,MAAM,QAAQ,CAAC;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,aAAa,EAAE,IAAI,CAAC,gBAAgB,CAAC;YACrC,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC;YACvC,YAAY,EAAE,IAAI,CAAC,UAAU;YAC7B,oBAAoB,EAAE,IAAI,CAAC,MAAM;YACjC,aAAa;YACb,eAAe,EAAE,IAAI,CAAC,SAAS;SAClC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import * as p from \"@clack/prompts\";\nimport { errorMessage } from \"@gtkx/utils\";\nimport { defineCommand } from \"citty\";\nimport { OperationCanceledError, ScaffoldAbortedError } from \"./errors.js\";\nimport { PACKAGE_MANAGER_FLAG_DESCRIPTION } from \"./package-managers.js\";\nimport { scaffold } from \"./scaffolder.js\";\n\ntype CreateCommandArgs = {\n    name?: string | undefined;\n    \"application-id\"?: string | undefined;\n    \"package-manager\"?: string | undefined;\n    typescript?: boolean | undefined;\n    vitest?: boolean | undefined;\n    yes?: boolean | undefined;\n    \"no-interactive\"?: boolean | undefined;\n    overwrite?: boolean | undefined;\n};\n\nconst scaffoldCommand = defineCommand({\n    meta: {\n        name: \"create\",\n        description: \"Create a new GTKX application\",\n    },\n    args: {\n        name: {\n            type: \"positional\",\n            description: \"Target directory or project name (e.g. my-app, ., apps/my-app)\",\n            required: false,\n        },\n        \"application-id\": {\n            type: \"string\",\n            description: \"Application ID (e.g., com.example.myapp)\",\n        },\n        \"package-manager\": {\n            type: \"string\",\n            alias: \"p\",\n            description: PACKAGE_MANAGER_FLAG_DESCRIPTION,\n        },\n        typescript: {\n            type: \"boolean\",\n            negativeDescription: \"Scaffold the application in JavaScript instead of TypeScript\",\n            description: \"Scaffold the application in TypeScript\",\n        },\n        vitest: {\n            type: \"boolean\",\n            description: \"Include a Vitest testing setup\",\n        },\n        yes: {\n            type: \"boolean\",\n            alias: \"y\",\n            description: \"Skip prompts and accept defaults for unspecified options\",\n        },\n        \"no-interactive\": {\n            type: \"boolean\",\n            description:\n                \"Run without prompts, using the default for every option not passed on the command line \" +\n                \"(same as --yes)\",\n        },\n        overwrite: {\n            type: \"boolean\",\n            alias: \"f\",\n            description: \"Overwrite the contents of a non-empty target directory when running without prompts\",\n        },\n    },\n    run: ({ args }) => runCreate(args),\n});\n\nconst settleScaffoldFailure = (error: unknown): void => {\n    if (error instanceof OperationCanceledError) {\n        return;\n    }\n\n    if (!(error instanceof ScaffoldAbortedError)) {\n        p.log.error(errorMessage(error));\n    }\n\n    process.exitCode = 1;\n};\n\nconst runCreate = async (args: CreateCommandArgs): Promise<void> => {\n    const isInteractive = args[\"no-interactive\"] || args.yes ? false : process.stdin.isTTY;\n\n    try {\n        await scaffold({\n            name: args.name,\n            applicationId: args[\"application-id\"],\n            packageManager: args[\"package-manager\"],\n            isTypescript: args.typescript,\n            shouldIncludeTesting: args.vitest,\n            isInteractive,\n            shouldOverwrite: args.overwrite,\n        });\n    } catch (error) {\n        settleScaffoldFailure(error);\n    }\n};\n\nexport { scaffoldCommand };\n"]}

package/dist/package-managers.d.ts

@@ -18,7 +18,8 @@ declare const PACKAGE_MANAGERS: readonly [{
     readonly addCommand: "yarn add";
     readonly isRecommended: false;
 }];
+declare const PACKAGE_MANAGER_VALUES: PackageManager[];
 declare const PACKAGE_MANAGER_FLAG_DESCRIPTION: string;
 declare const isKnownPackageManager: (name: string) => name is PackageManager;
-export { PACKAGE_MANAGERS, PACKAGE_MANAGER_FLAG_DESCRIPTION, isKnownPackageManager, type PackageManager };
+export { PACKAGE_MANAGERS, PACKAGE_MANAGER_FLAG_DESCRIPTION, PACKAGE_MANAGER_VALUES, isKnownPackageManager, type PackageManager, };
 //# sourceMappingURL=package-managers.d.ts.map

package/dist/package-managers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-managers.d.ts","sourceRoot":"","sources":["../src/package-managers.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;AAEjE,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;EAIZ,CAAC;AAGX,QAAA,MAAM,gCAAgC,QAA2D,CAAC;AAElG,QAAA,MAAM,qBAAqB,GAAI,MAAM,MAAM,KAAG,IAAI,IAAI,cACC,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,gCAAgC,EAAE,qBAAqB,EAAE,KAAK,cAAc,EAAE,CAAC"}
+{"version":3,"file":"package-managers.d.ts","sourceRoot":"","sources":["../src/package-managers.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;AAEjE,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;EAIZ,CAAC;AAEX,QAAA,MAAM,sBAAsB,EAAE,cAAc,EAAqD,CAAC;AAClG,QAAA,MAAM,gCAAgC,QAA2D,CAAC;AAElG,QAAA,MAAM,qBAAqB,GAAI,MAAM,MAAM,KAAG,IAAI,IAAI,cACC,CAAC;AAExD,OAAO,EACH,gBAAgB,EAChB,gCAAgC,EAChC,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,cAAc,GACtB,CAAC"}

package/dist/package-managers.js

@@ -6,5 +6,5 @@ const PACKAGE_MANAGERS = [
 const PACKAGE_MANAGER_VALUES = PACKAGE_MANAGERS.map((manager) => manager.value);
 const PACKAGE_MANAGER_FLAG_DESCRIPTION = `Package manager (${PACKAGE_MANAGER_VALUES.join(", ")})`;
 const isKnownPackageManager = (name) => PACKAGE_MANAGER_VALUES.includes(name);
-export { PACKAGE_MANAGERS, PACKAGE_MANAGER_FLAG_DESCRIPTION, isKnownPackageManager };
+export { PACKAGE_MANAGERS, PACKAGE_MANAGER_FLAG_DESCRIPTION, PACKAGE_MANAGER_VALUES, isKnownPackageManager, };
 //# sourceMappingURL=package-managers.js.map

package/dist/package-managers.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-managers.js","sourceRoot":"","sources":["../src/package-managers.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAG;IACrB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE;IACrG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE;IAC1G,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE;CAChG,CAAC;AAEX,MAAM,sBAAsB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAClG,MAAM,gCAAgC,GAAG,oBAAoB,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AAElG,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAA0B,EAAE,CAClE,sBAAmC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,gCAAgC,EAAE,qBAAqB,EAAuB,CAAC","sourcesContent":["type PackageManager = (typeof PACKAGE_MANAGERS)[number][\"value\"];\n\nconst PACKAGE_MANAGERS = [\n    { value: \"pnpm\", label: \"pnpm\", devCommand: \"pnpm dev\", addCommand: \"pnpm add\", isRecommended: true },\n    { value: \"npm\", label: \"npm\", devCommand: \"npm run dev\", addCommand: \"npm install\", isRecommended: false },\n    { value: \"yarn\", label: \"yarn\", devCommand: \"yarn dev\", addCommand: \"yarn add\", isRecommended: false },\n] as const;\n\nconst PACKAGE_MANAGER_VALUES: PackageManager[] = PACKAGE_MANAGERS.map((manager) => manager.value);\nconst PACKAGE_MANAGER_FLAG_DESCRIPTION = `Package manager (${PACKAGE_MANAGER_VALUES.join(\", \")})`;\n\nconst isKnownPackageManager = (name: string): name is PackageManager =>\n    (PACKAGE_MANAGER_VALUES as string[]).includes(name);\n\nexport { PACKAGE_MANAGERS, PACKAGE_MANAGER_FLAG_DESCRIPTION, isKnownPackageManager, type PackageManager };\n"]}
+{"version":3,"file":"package-managers.js","sourceRoot":"","sources":["../src/package-managers.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAG;IACrB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE;IACrG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE;IAC1G,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE;CAChG,CAAC;AAEX,MAAM,sBAAsB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAClG,MAAM,gCAAgC,GAAG,oBAAoB,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AAElG,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAA0B,EAAE,CAClE,sBAAmC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAExD,OAAO,EACH,gBAAgB,EAChB,gCAAgC,EAChC,sBAAsB,EACtB,qBAAqB,GAExB,CAAC","sourcesContent":["type PackageManager = (typeof PACKAGE_MANAGERS)[number][\"value\"];\n\nconst PACKAGE_MANAGERS = [\n    { value: \"pnpm\", label: \"pnpm\", devCommand: \"pnpm dev\", addCommand: \"pnpm add\", isRecommended: true },\n    { value: \"npm\", label: \"npm\", devCommand: \"npm run dev\", addCommand: \"npm install\", isRecommended: false },\n    { value: \"yarn\", label: \"yarn\", devCommand: \"yarn dev\", addCommand: \"yarn add\", isRecommended: false },\n] as const;\n\nconst PACKAGE_MANAGER_VALUES: PackageManager[] = PACKAGE_MANAGERS.map((manager) => manager.value);\nconst PACKAGE_MANAGER_FLAG_DESCRIPTION = `Package manager (${PACKAGE_MANAGER_VALUES.join(\", \")})`;\n\nconst isKnownPackageManager = (name: string): name is PackageManager =>\n    (PACKAGE_MANAGER_VALUES as string[]).includes(name);\n\nexport {\n    PACKAGE_MANAGERS,\n    PACKAGE_MANAGER_FLAG_DESCRIPTION,\n    PACKAGE_MANAGER_VALUES,\n    isKnownPackageManager,\n    type PackageManager,\n};\n"]}

package/dist/scaffolder.d.ts

@@ -1,13 +1,12 @@
-import { type PackageManager } from "./package-managers.js";
 type CreateOptions = {
     name?: string | undefined;
     applicationId?: string | undefined;
-    packageManager?: PackageManager | undefined;
+    packageManager?: string | undefined;
     isTypescript?: boolean | undefined;
     shouldIncludeTesting?: boolean | undefined;
     isInteractive?: boolean | undefined;
     shouldOverwrite?: boolean | undefined;
 };
 declare const scaffold: (options?: CreateOptions) => Promise<void>;
-export { scaffold, type CreateOptions };
+export { scaffold };
 //# sourceMappingURL=scaffolder.d.ts.map

package/dist/scaffolder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffolder.d.ts","sourceRoot":"","sources":["../src/scaffolder.ts"],"names":[],"mappings":"AAWA,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIrG,KAAK,aAAa,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,cAAc,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IAC5C,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3C,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACzC,CAAC;AAwfF,QAAA,MAAM,QAAQ,GAAU,UAAS,aAAkB,KAAG,OAAO,CAAC,IAAI,CAwBjE,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,CAAC"}
+{"version":3,"file":"scaffolder.d.ts","sourceRoot":"","sources":["../src/scaffolder.ts"],"names":[],"mappings":"AAsBA,KAAK,aAAa,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC3C,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACzC,CAAC;AAumBF,QAAA,MAAM,QAAQ,GAAU,UAAS,aAAkB,KAAG,OAAO,CAAC,IAAI,CAcjE,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/scaffolder.js

@@ -1,18 +1,21 @@
 import * as p from "@clack/prompts";
-import { isValidApplicationId } from "@gtkx/config/internal";
-import { errorMessage, packageVersion, upperFirst } from "@gtkx/utils";
-import { existsSync, mkdirSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { APPLICATION_ID_MAX_LENGTH, isValidApplicationId } from "@gtkx/config/internal";
+import { errorMessage, tryResolveExecutable, upperFirst } from "@gtkx/utils";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { addDependency, detectPackageManager as nypmDetectPackageManager } from "nypm";
 import { x } from "tinyexec";
+import packageManifest from "../package.json" with { type: "json" };
 import { writeBuildAllowance } from "./build-allowance.js";
 import { OperationCanceledError, ScaffoldAbortedError } from "./errors.js";
 import { getInstallHint } from "./install-hints.js";
 import { updateManifest } from "./manifest.js";
-import { isKnownPackageManager, PACKAGE_MANAGERS } from "./package-managers.js";
+import { isKnownPackageManager, PACKAGE_MANAGER_VALUES, PACKAGE_MANAGERS, } from "./package-managers.js";
 import { isValidProjectName } from "./project-name.js";
 import { listTemplates, renderFile } from "./templates.js";
-const selfVersion = packageVersion(import.meta.url, "../package.json");
+const selfVersion = packageManifest.version;
+const ICON_TEMPLATE_NAME = "icon.svg";
 const GTKX_ENV_MODULE_HEADER = `/**
  * Generated by \`gtkx codegen\`, \`gtkx dev\`, and \`gtkx build\`; do not edit.
  */`;
@@ -31,11 +34,33 @@ To run tests, you need a headless Wayland compositor installed:
   Fedora: sudo dnf install sway
   Ubuntu: sudo apt install sway`;
 const RECOVERY_HEADING = "Finish the setup by adding the dependencies again, which is safe to repeat:";
+const APPLICATION_ID_FORMAT_ERROR = "Application ID must be reverse domain notation (e.g., com.example.myapp)";
+const APPLICATION_ID_PREFIX = "com.";
+const APPLICATION_ID_SUFFIX = ".app";
+const APPLICATION_ID_SEGMENT_LIMIT = APPLICATION_ID_MAX_LENGTH - APPLICATION_ID_PREFIX.length -
+    APPLICATION_ID_SUFFIX.length;
 const pinGtkxDependency = (name, version) => name.startsWith("@gtkx/") ? `${name}@^${version}` : name;
 const getDevCommand = (packageManager) => DEV_COMMAND[packageManager];
 const getAddCommand = (packageManager) => ADD_COMMAND[packageManager];
 const titleFromName = (name) => name.split("-").map((part) => upperFirst(part)).join(" ");
-const suggestApplicationId = (name) => `com.${name.replaceAll("-", "")}.app`;
+const gitConfigValue = (key) => {
+    const git = tryResolveExecutable("git");
+    if (git === undefined) {
+        return null;
+    }
+    try {
+        return execFileSync(git, ["config", "--get", key], { encoding: "utf8" }).trim() || null;
+    }
+    catch {
+        return null;
+    }
+};
+const applicationIdSegment = (name) => {
+    const compact = name.replaceAll("-", "");
+    const segment = /^[A-Za-z_]/.test(compact) ? compact : `_${compact}`;
+    return segment.slice(0, APPLICATION_ID_SEGMENT_LIMIT);
+};
+const suggestApplicationId = (name) => `${APPLICATION_ID_PREFIX}${applicationIdSegment(name)}${APPLICATION_ID_SUFFIX}`;
 const stripTrailingSlashes = (value) => {
     let end = value.length;
     while (end > 0 && value[end - 1] === "/") {
@@ -75,37 +100,49 @@ const validateProjectName = (value) => {
     }
     return undefined;
 };
-const validateApplicationIdInput = (value) => {
-    if (!value) {
-        return "Application ID is required";
-    }
-    if (!isValidApplicationId(value)) {
-        return "Application ID must be reverse domain notation (e.g., com.example.myapp)";
-    }
-    return undefined;
-};
+const validateApplicationIdFormat = (value) => isValidApplicationId(value) ? undefined : APPLICATION_ID_FORMAT_ERROR;
+const validateApplicationIdInput = (value) => value ? validateApplicationIdFormat(value) : "Application ID is required";
+const validateApplicationIdAnswer = (value) => value ? validateApplicationIdFormat(value) : undefined;
 const fail = (message) => {
     p.log.error(message);
     throw new ScaffoldAbortedError(message);
 };
-const validateTarget = (value) => {
-    if (!value) {
+const requestedPackageManager = (value) => {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (!isKnownPackageManager(value)) {
+        return fail(`Unknown package manager "${value}". Expected one of: ${PACKAGE_MANAGER_VALUES.join(", ")}`);
+    }
+    return value;
+};
+const targetStats = (root) => {
+    try {
+        return statSync(root, { throwIfNoEntry: false });
+    }
+    catch {
+        return undefined;
+    }
+};
+const validateTargetDir = (target) => {
+    if (!target) {
         return "Project directory is required";
     }
-    return validateProjectName(deriveProjectName(formatTargetDir(value)));
+    return validateProjectName(deriveProjectName(target));
 };
-const promptTarget = async () => guardCancellation(await p.text({
+const validateTargetAnswer = (value) => validateTargetDir(formatTargetDir(value ?? ""));
+const promptTarget = async () => formatTargetDir(guardCancellation(await p.text({
     message: "Project directory",
     placeholder: "my-app",
-    validate: validateTarget,
-}));
+    validate: validateTargetAnswer,
+})));
 const promptApplicationId = async (name) => {
     const defaultApplicationId = suggestApplicationId(name);
     return guardCancellation(await p.text({
         message: "Application ID",
         placeholder: defaultApplicationId,
-        initialValue: defaultApplicationId,
-        validate: validateApplicationIdInput,
+        defaultValue: defaultApplicationId,
+        validate: validateApplicationIdAnswer,
     }));
 };
 const detectPackageManager = async (cwd) => {
@@ -161,14 +198,10 @@ const emptyDir = (root) => {
         rmSync(join(root, entry), { recursive: true, force: true });
     }
 };
-const validateResolvedOptions = (name, applicationId) => {
-    const nameError = validateProjectName(name);
-    if (nameError) {
-        fail(nameError);
-    }
-    const applicationIdError = validateApplicationIdInput(applicationId);
-    if (applicationIdError) {
-        fail(applicationIdError);
+const prepareTargetDirectory = (root, shouldEmptyTarget) => {
+    mkdirSync(root, { recursive: true });
+    if (shouldEmptyTarget) {
+        emptyDir(root);
     }
 };
 const shouldOverwriteDirectory = async (target, options) => {
@@ -180,34 +213,39 @@ const shouldOverwriteDirectory = async (target, options) => {
         initialValue: false,
     }));
 };
-const handleTargetDirectory = async (root, target, options) => {
-    if (!existsSync(root) || isDirEmpty(root)) {
-        return;
+const shouldEmptyTargetDirectory = async (root, target, options) => {
+    const stats = targetStats(root);
+    if (stats === undefined) {
+        return false;
+    }
+    if (!stats.isDirectory()) {
+        return fail(`Target "${target}" is not a directory`);
+    }
+    if (isDirEmpty(root)) {
+        return false;
     }
     if (await shouldOverwriteDirectory(target, options)) {
-        emptyDir(root);
-        return;
+        return true;
     }
-    fail(`Directory "${target}" is not empty`);
+    return fail(`Directory "${target}" is not empty`);
 };
 const resolveTarget = async (options) => {
-    if (options.name !== undefined) {
-        return formatTargetDir(options.name);
+    if (options.name === undefined && options.isInteractive) {
+        return promptTarget();
     }
-    if (!options.isInteractive) {
-        return fail("Project directory is required");
-    }
-    return formatTargetDir(await promptTarget());
+    const target = formatTargetDir(options.name ?? "");
+    const error = validateTargetDir(target);
+    return error === undefined ? target : fail(error);
 };
 const resolveApplicationId = async (options, name) => {
-    if (options.applicationId !== undefined) {
-        return options.applicationId;
-    }
-    return options.isInteractive ? promptApplicationId(name) : suggestApplicationId(name);
+    const applicationId = options.applicationId ??
+        (options.isInteractive ? await promptApplicationId(name) : suggestApplicationId(name));
+    const error = validateApplicationIdInput(applicationId);
+    return error === undefined ? applicationId : fail(error);
 };
-const resolvePackageManager = async (options) => {
-    if (options.packageManager !== undefined) {
-        return options.packageManager;
+const resolvePackageManager = async (requested, options) => {
+    if (requested !== undefined) {
+        return requested;
     }
     if (options.isInteractive) {
         return promptPackageManager();
@@ -227,16 +265,27 @@ const isTestingIncluded = async (options) => {
     return options.isInteractive ? shouldSetUpTesting() : true;
 };
 const resolveOptions = async (options) => {
+    const requested = requestedPackageManager(options.packageManager);
     const target = await resolveTarget(options);
     const name = deriveProjectName(target);
     const applicationId = await resolveApplicationId(options, name);
-    validateResolvedOptions(name, applicationId);
     const root = resolve(process.cwd(), target);
-    await handleTargetDirectory(root, target, options);
-    const packageManager = await resolvePackageManager(options);
+    const isCurrentDirectory = root === process.cwd();
+    const shouldEmptyTarget = await shouldEmptyTargetDirectory(root, target, options);
+    const packageManager = await resolvePackageManager(requested, options);
     const isTypescript = await isTypescriptSelected(options);
     const shouldIncludeTesting = await isTestingIncluded(options);
-    return { target, name, applicationId, packageManager, isTypescript, shouldIncludeTesting };
+    return {
+        target,
+        root,
+        isCurrentDirectory,
+        name,
+        applicationId,
+        packageManager,
+        isTypescript,
+        shouldIncludeTesting,
+        shouldEmptyTarget,
+    };
 };
 const isTemplateIncluded = (templateRelativePath, resolved) => {
     if (TESTING_TEMPLATES.has(templateRelativePath)) {
@@ -247,28 +296,32 @@ const isTemplateIncluded = (templateRelativePath, resolved) => {
     }
     return true;
 };
-const toDestinationPath = (templateRelativePath, isTypescript) => isTypescript ? templateRelativePath : templateRelativePath.replace(/\.tsx$/, ".jsx").replace(/\.ts$/, ".js");
+const toScriptExtension = (templateRelativePath, isTypescript) => isTypescript ? templateRelativePath : templateRelativePath.replace(/\.tsx$/, ".jsx").replace(/\.ts$/, ".js");
+const toIconPath = (path, applicationId) => path.endsWith(ICON_TEMPLATE_NAME) ? `${path.slice(0, -ICON_TEMPLATE_NAME.length)}${applicationId}.svg` : path;
+const toDestinationPath = (templateRelativePath, isTypescript, applicationId) => toIconPath(toScriptExtension(templateRelativePath, isTypescript), applicationId);
 const addTestScript = (root) => {
     updateManifest(root, (manifest) => {
         manifest.scripts.test = "vitest run";
     });
 };
+const templateContext = (resolved) => ({
+    name: resolved.name,
+    applicationId: resolved.applicationId,
+    title: titleFromName(resolved.name),
+    shouldIncludeTesting: resolved.shouldIncludeTesting,
+    isTypescript: resolved.isTypescript,
+    importExtension: resolved.isTypescript ? ".js" : ".jsx",
+    developerName: gitConfigValue("user.name") ?? titleFromName(resolved.name),
+    developerEmail: gitConfigValue("user.email"),
+});
 const scaffoldProject = async (root, resolved) => {
-    const { name, applicationId, isTypescript, shouldIncludeTesting } = resolved;
-    const context = {
-        name,
-        applicationId,
-        title: titleFromName(name),
-        shouldIncludeTesting,
-        isTypescript,
-        importExtension: isTypescript ? ".js" : ".jsx",
-    };
-    mkdirSync(root, { recursive: true });
+    const { applicationId, isTypescript, shouldIncludeTesting } = resolved;
+    const context = templateContext(resolved);
     for (const template of listTemplates()) {
         if (!isTemplateIncluded(template, resolved)) {
             continue;
         }
-        const destination = join(root, toDestinationPath(template, isTypescript));
+        const destination = join(root, toDestinationPath(template, isTypescript, applicationId));
         mkdirSync(dirname(destination), { recursive: true });
         writeFileSync(destination, await renderFile(template, context));
     }
@@ -299,40 +352,53 @@ const installDependencies = async (options) => {
     });
 };
 const pin = (names) => names.map((dependency) => pinGtkxDependency(dependency, selfVersion));
-const formatRecovery = ({ target, packageManager, devDependencies }) => {
-    const add = getAddCommand(packageManager);
+const formatRecovery = ({ resolved, devDependencies }) => {
+    const add = getAddCommand(resolved.packageManager);
     const steps = [
-        ...(target === "." ? [] : [`cd ${target}`]),
+        ...(resolved.isCurrentDirectory ? [] : [`cd ${resolved.target}`]),
         `${add} ${pin(DEPENDENCIES).join(" ")}`,
         `${add} -D ${pin(devDependencies).join(" ")}`,
     ];
     const indented = steps.map((step) => `  ${step}`).join("\n");
     return `${RECOVERY_HEADING}\n${indented}`;
 };
-const reportInstallFailure = (options) => {
-    const message = errorMessage(options.error);
-    p.log.error(`Failed to install dependencies: ${message}`);
-    const hint = getInstallHint(message);
+const explainInstallFailure = (options) => {
+    const hint = getInstallHint(errorMessage(options.error));
     if (hint !== undefined) {
         p.log.warn(hint);
     }
     p.log.info(formatRecovery(options));
 };
-const installAllDependencies = async (options) => {
-    const { root, target, packageManager, devDependencies } = options;
+const runWithSpinner = async (step) => {
     const spinner = p.spinner();
-    spinner.start("Installing dependencies...");
+    spinner.start(step.pending);
     try {
-        await installDependencies({ cwd: root, packageManager, dependencies: pin(DEPENDENCIES), isDev: false });
-        await installDependencies({ cwd: root, packageManager, dependencies: pin(devDependencies), isDev: true });
-        spinner.stop("Dependencies installed");
+        await step.run();
+        spinner.stop(step.done);
     }
     catch (error) {
-        spinner.stop("Failed to install dependencies");
-        reportInstallFailure({ error, target, packageManager, devDependencies });
-        throw new ScaffoldAbortedError("Failed to install dependencies");
+        spinner.error(step.failed);
+        p.log.error(errorMessage(error));
+        step.explain?.(error);
+        throw new ScaffoldAbortedError(step.failed);
     }
 };
+const installAllDependencies = async (options) => {
+    const { resolved, devDependencies } = options;
+    const { root, packageManager } = resolved;
+    await runWithSpinner({
+        pending: "Installing dependencies...",
+        done: "Dependencies installed",
+        failed: "Failed to install dependencies",
+        run: async () => {
+            await installDependencies({ cwd: root, packageManager, dependencies: pin(DEPENDENCIES), isDev: false });
+            await installDependencies({ cwd: root, packageManager, dependencies: pin(devDependencies), isDev: true });
+        },
+        explain: (error) => {
+            explainInstallFailure({ error, resolved, devDependencies });
+        },
+    });
+};
 const writeInitialEnvModule = (root) => {
     const storeDir = join(root, "node_modules", ".gtkx");
     mkdirSync(storeDir, { recursive: true });
@@ -349,31 +415,34 @@ const initializeGitRepo = async (root) => {
         spinner.stop("Git repository initialized");
     }
     catch {
-        spinner.stop("Failed to initialize git repository");
+        spinner.error("Failed to initialize git repository");
     }
 };
 const printNextSteps = (resolved) => {
     const devCmd = getDevCommand(resolved.packageManager);
-    const cdStep = resolved.target === "." ? "" : `cd ${resolved.target}\n`;
+    const cdStep = resolved.isCurrentDirectory ? "" : `cd ${resolved.target}\n`;
     const testingNote = resolved.shouldIncludeTesting ? HEADLESS_COMPOSITOR_NOTE : "";
     p.note(`${cdStep}${devCmd}${testingNote}`, "Next steps");
 };
+const createProjectStructure = async (root, resolved) => {
+    await runWithSpinner({
+        pending: "Creating project structure...",
+        done: "Project structure created",
+        failed: "Failed to create the project structure",
+        run: async () => {
+            prepareTargetDirectory(root, resolved.shouldEmptyTarget);
+            await scaffoldProject(root, resolved);
+            writeBuildAllowance(root, resolved.packageManager);
+        },
+    });
+};
 const scaffold = async (options = {}) => {
     p.intro("Create GTKX App");
     const resolved = await resolveOptions(options);
-    const root = resolve(process.cwd(), resolved.target);
+    const { root } = resolved;
     const devDeps = getDevDependencies(resolved);
-    const projectSpinner = p.spinner();
-    projectSpinner.start("Creating project structure...");
-    await scaffoldProject(root, resolved);
-    writeBuildAllowance(root, resolved.packageManager);
-    projectSpinner.stop("Project structure created");
-    await installAllDependencies({
-        root,
-        target: resolved.target,
-        packageManager: resolved.packageManager,
-        devDependencies: devDeps,
-    });
+    await createProjectStructure(root, resolved);
+    await installAllDependencies({ resolved, devDependencies: devDeps });
     if (resolved.isTypescript) {
         writeInitialEnvModule(root);
     }