create-gtkx 1.6.0 → 2.0.0-beta.2

package/README.md

@@ -13,7 +13,7 @@
 <p align="center">
   <a href="https://www.npmjs.com/package/create-gtkx"><img src="https://img.shields.io/npm/v/create-gtkx?color=cb3837&logo=npm&label=create-gtkx" alt="npm version" /></a>
   <a href="https://www.npmjs.com/package/create-gtkx"><img src="https://img.shields.io/npm/dm/create-gtkx?color=cb3837&logo=npm&label=downloads" alt="npm downloads" /></a>
-  <img src="https://img.shields.io/badge/node-%E2%89%A524-339933?logo=node.js&logoColor=white" alt="Node >= 24" />
+  <img src="https://img.shields.io/badge/node-%E2%89%A526.7-339933?logo=node.js&logoColor=white" alt="Node >= 26.7" />
   <a href="https://github.com/gtkx-org/gtkx/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MPL--2.0-blue.svg" alt="License: MPL-2.0" /></a>
   <a href="https://github.com/gtkx-org/gtkx/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/gtkx-org/gtkx/ci.yml?branch=main&logo=github&label=CI" alt="CI status" /></a>
   <img src="https://img.shields.io/badge/TypeScript-strict-3178c6?logo=typescript&logoColor=white" alt="TypeScript" />
@@ -116,7 +116,7 @@ At runtime, the native Rust core calls straight into the system GTK4, Adwaita, a
 
 ## Quick start
 
-GTKX is Linux-only and needs Node.js 24 or later. See [Requirements](#requirements).
+GTKX is Linux-only and needs Node.js 26.7 or later. See [Requirements](#requirements).
 
 Scaffold a new app with the `create-gtkx` initializer:
 
@@ -145,8 +145,8 @@ The documentation at **[gtkx.dev](https://gtkx.dev)** includes a step-by-step tu
 
 GTKX is Linux-only. You need:
 
-- Linux with the GTK4 (4.20 or later) and GLib development libraries, plus Adwaita (1.8 or later) once your project binds `Adw-1`
-- Node.js 24 or later
+- Linux with the GTK4 (4.20 or later), Adwaita (1.8 or later), and GLib development libraries
+- Node.js 26.7 or later
 
 The `@gtkx/native` addon ships prebuilt for x64 and arm64 glibc Linux; other targets need to build it from the GTKX repository, which requires a Rust toolchain.
 
@@ -167,7 +167,7 @@ GTKX is stable and ready for production use.
 
 ## Contributing
 
-Contributions are welcome. See [CONTRIBUTING.md](https://github.com/gtkx-org/gtkx/blob/main/CONTRIBUTING.md), the [Code of Conduct](https://github.com/gtkx-org/gtkx/blob/main/CODE_OF_CONDUCT.md), and the [security policy](https://github.com/gtkx-org/gtkx/blob/main/SECURITY.md). Building the repo needs Node.js 24 or later, pnpm, and a Rust toolchain.
+Contributions are welcome. See [CONTRIBUTING.md](https://github.com/gtkx-org/gtkx/blob/main/CONTRIBUTING.md), the [Code of Conduct](https://github.com/gtkx-org/gtkx/blob/main/CODE_OF_CONDUCT.md), and the [security policy](https://github.com/gtkx-org/gtkx/blob/main/SECURITY.md). Building the repo needs Node.js 26.7 or later, pnpm, and a Rust toolchain.
 
 ## License
 

package/dist/command.d.ts

@@ -8,6 +8,10 @@ declare const scaffoldCommand: import("citty").CommandDef<{
         readonly type: "string";
         readonly description: "Application ID (e.g., com.example.myapp)";
     };
+    readonly "display-name": {
+        readonly type: "string";
+        readonly description: "Application display name (e.g., My App)";
+    };
     readonly "package-manager": {
         readonly type: "string";
         readonly alias: "p";
@@ -34,7 +38,7 @@ declare const scaffoldCommand: import("citty").CommandDef<{
     readonly overwrite: {
         readonly type: "boolean";
         readonly alias: "f";
-        readonly description: "Overwrite the contents of a non-empty target directory when running without prompts";
+        readonly description: "Replace scaffold files in a non-empty target directory when running without prompts";
     };
 }>;
 export { scaffoldCommand };

package/dist/command.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"AAmBA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmDnB,CAAC;AAiCH,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/dist/command.js

@@ -19,6 +19,10 @@ const scaffoldCommand = defineCommand({
             type: "string",
             description: "Application ID (e.g., com.example.myapp)",
         },
+        "display-name": {
+            type: "string",
+            description: "Application display name (e.g., My App)",
+        },
         "package-manager": {
             type: "string",
             alias: "p",
@@ -46,7 +50,7 @@ const scaffoldCommand = defineCommand({
         overwrite: {
             type: "boolean",
             alias: "f",
-            description: "Overwrite the contents of a non-empty target directory when running without prompts",
+            description: "Replace scaffold files in a non-empty target directory when running without prompts",
         },
     },
     run: ({ args }) => runCreate(args),
@@ -66,6 +70,7 @@ const runCreate = async (args) => {
         await scaffold({
             name: args.name,
             applicationId: args["application-id"],
+            displayName: args["display-name"],
             packageManager: args["package-manager"],
             isTypescript: args.typescript,
             shouldIncludeTesting: args.vitest,

package/dist/command.js.map

@@ -1 +1 @@
-{"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"]}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"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","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    \"display-name\"?: 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        \"display-name\": {\n            type: \"string\",\n            description: \"Application display name (e.g., My App)\",\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: \"Replace scaffold files in 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            displayName: args[\"display-name\"],\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/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,KAAG,IAO3F,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,KAAG,IAY3F,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/manifest.js

@@ -1,13 +1,19 @@
-import { readFileSync, renameSync, writeFileSync } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 const PACKAGE_JSON_FILE = "package.json";
 const updateManifest = (root, mutate) => {
     const manifestPath = join(root, PACKAGE_JSON_FILE);
     const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
     mutate(manifest);
-    const pendingPath = `${manifestPath}.pending`;
-    writeFileSync(pendingPath, `${JSON.stringify(manifest, null, 4)}\n`);
-    renameSync(pendingPath, manifestPath);
+    const pendingPath = join(root, `.package-${randomUUID()}.json`);
+    try {
+        writeFileSync(pendingPath, `${JSON.stringify(manifest, null, 4)}\n`, { flag: "wx", mode: 0o600 });
+        renameSync(pendingPath, manifestPath);
+    }
+    finally {
+        rmSync(pendingPath, { force: true });
+    }
 };
 export { updateManifest };
 //# sourceMappingURL=manifest.js.map

package/dist/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAEzC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,MAAmD,EAAQ,EAAE;IAC/F,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAA4B,CAAC;IAC3F,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjB,MAAM,WAAW,GAAG,GAAG,YAAY,UAAU,CAAC;IAC9C,aAAa,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACrE,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AAC1C,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC","sourcesContent":["import { readFileSync, renameSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\nconst PACKAGE_JSON_FILE = \"package.json\";\n\nconst updateManifest = (root: string, mutate: (manifest: Record<string, unknown>) => void): void => {\n    const manifestPath = join(root, PACKAGE_JSON_FILE);\n    const manifest = JSON.parse(readFileSync(manifestPath, \"utf8\")) as Record<string, unknown>;\n    mutate(manifest);\n    const pendingPath = `${manifestPath}.pending`;\n    writeFileSync(pendingPath, `${JSON.stringify(manifest, null, 4)}\\n`);\n    renameSync(pendingPath, manifestPath);\n};\n\nexport { updateManifest };\n"]}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAEzC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,MAAmD,EAAQ,EAAE;IAC/F,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAA4B,CAAC;IAC3F,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,UAAU,EAAE,OAAO,CAAC,CAAC;IAEhE,IAAI,CAAC;QACD,aAAa,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAClG,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC1C,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC","sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport { readFileSync, renameSync, rmSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\nconst PACKAGE_JSON_FILE = \"package.json\";\n\nconst updateManifest = (root: string, mutate: (manifest: Record<string, unknown>) => void): void => {\n    const manifestPath = join(root, PACKAGE_JSON_FILE);\n    const manifest = JSON.parse(readFileSync(manifestPath, \"utf8\")) as Record<string, unknown>;\n    mutate(manifest);\n    const pendingPath = join(root, `.package-${randomUUID()}.json`);\n\n    try {\n        writeFileSync(pendingPath, `${JSON.stringify(manifest, null, 4)}\\n`, { flag: \"wx\", mode: 0o600 });\n        renameSync(pendingPath, manifestPath);\n    } finally {\n        rmSync(pendingPath, { force: true });\n    }\n};\n\nexport { updateManifest };\n"]}

package/dist/scaffolder.d.ts

@@ -1,6 +1,7 @@
 type CreateOptions = {
     name?: string | undefined;
     applicationId?: string | undefined;
+    displayName?: string | undefined;
     packageManager?: string | undefined;
     isTypescript?: boolean | undefined;
     shouldIncludeTesting?: boolean | undefined;

package/dist/scaffolder.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,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;AA0sBF,QAAA,MAAM,QAAQ,GAAU,UAAS,aAAkB,KAAG,OAAO,CAAC,IAAI,CAUjE,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/scaffolder.js

@@ -2,8 +2,8 @@ import * as p from "@clack/prompts";
 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 { lstatSync, mkdirSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { addDependency, detectPackageManager as nypmDetectPackageManager } from "nypm";
 import { x } from "tinyexec";
 import packageManifest from "../package.json" with { type: "json" };
@@ -39,10 +39,7 @@ 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 displayNameFromProjectName = (name) => name.split("-").map((part) => upperFirst(part)).join(" ");
 const gitConfigValue = (key) => {
     const git = tryResolveExecutable("git");
     if (git === undefined) {
@@ -74,6 +71,10 @@ const isDirEmpty = (dir) => {
     const entries = readdirSync(dir);
     return entries.length === 0 || (entries.length === 1 && entries[0] === ".git");
 };
+const shouldInitializeGit = (root) => {
+    const entry = lstatSync(root, { throwIfNoEntry: false });
+    return entry === undefined || (entry.isDirectory() && readdirSync(root).length === 0);
+};
 const getDevDependencies = ({ isTypescript, shouldIncludeTesting, }) => {
     const devDeps = [...DEV_DEPENDENCIES];
     if (isTypescript) {
@@ -103,6 +104,13 @@ const validateProjectName = (value) => {
 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 validateDisplayName = (value) => {
+    if (value === undefined || value.trim().length === 0) {
+        return "Display name is required";
+    }
+    return value.includes("\n") || value.includes("\r") ? "Display name must be a single line" : undefined;
+};
+const validateDisplayNameAnswer = (value) => value ? validateDisplayName(value) : undefined;
 const fail = (message) => {
     p.log.error(message);
     throw new ScaffoldAbortedError(message);
@@ -116,14 +124,6 @@ const requestedPackageManager = (value) => {
     }
     return value;
 };
-const targetStats = (root) => {
-    try {
-        return statSync(root, { throwIfNoEntry: false });
-    }
-    catch {
-        return undefined;
-    }
-};
 const validateTargetDir = (target) => {
     if (!target) {
         return "Project directory is required";
@@ -145,29 +145,29 @@ const promptApplicationId = async (name) => {
         validate: validateApplicationIdAnswer,
     }));
 };
-const detectPackageManager = async (cwd) => {
-    const detected = await nypmDetectPackageManager(cwd, { includeParentDirs: true });
-    if (!detected) {
-        return undefined;
-    }
-    return isKnownPackageManager(detected.name) ? detected.name : undefined;
+const promptDisplayName = async (name) => {
+    const defaultDisplayName = displayNameFromProjectName(name);
+    return guardCancellation(await p.text({
+        message: "Display name",
+        placeholder: defaultDisplayName,
+        defaultValue: defaultDisplayName,
+        validate: validateDisplayNameAnswer,
+    }));
 };
-const packageManagerHint = (manager, detected) => {
+const packageManagerOption = (manager, detected) => {
+    let hint;
     if (detected === manager.value) {
-        return "detected";
+        hint = "detected";
     }
-    if (manager.isRecommended) {
-        return "recommended";
+    else if (manager.isRecommended) {
+        hint = "recommended";
     }
-    return undefined;
-};
-const packageManagerOption = (manager, detected) => {
-    const hint = packageManagerHint(manager, detected);
     return { value: manager.value, label: manager.label, ...(hint !== undefined && { hint }) };
 };
 const detectedPackageManager = async () => {
     try {
-        return await detectPackageManager(process.cwd());
+        const detected = await nypmDetectPackageManager(process.cwd(), { includeParentDirs: true });
+        return detected && isKnownPackageManager(detected.name) ? detected.name : undefined;
     }
     catch {
         return undefined;
@@ -182,52 +182,34 @@ const promptPackageManager = async () => {
         initialValue: initial,
     }));
 };
-const shouldUseTypeScript = async () => guardCancellation(await p.confirm({
-    message: "Use TypeScript?",
-    initialValue: true,
-}));
-const shouldSetUpTesting = async () => guardCancellation(await p.confirm({
-    message: "Include testing setup (Vitest)?",
-    initialValue: true,
-}));
-const emptyDir = (root) => {
-    for (const entry of readdirSync(root)) {
-        if (entry === ".git") {
-            continue;
-        }
-        rmSync(join(root, entry), { recursive: true, force: true });
-    }
-};
-const prepareTargetDirectory = (root, shouldEmptyTarget) => {
-    mkdirSync(root, { recursive: true });
-    if (shouldEmptyTarget) {
-        emptyDir(root);
-    }
-};
+const isOptionEnabled = async (value, isInteractive, message) => value ??
+    (isInteractive
+        ? guardCancellation(await p.confirm({ message, initialValue: true }))
+        : true);
 const shouldOverwriteDirectory = async (target, options) => {
     if (!options.isInteractive) {
         return options.shouldOverwrite === true;
     }
     return guardCancellation(await p.confirm({
-        message: `Directory "${target}" is not empty. Overwrite its contents?`,
+        message: `Directory "${target}" is not empty. Replace scaffold files?`,
         initialValue: false,
     }));
 };
-const shouldEmptyTargetDirectory = async (root, target, options) => {
-    const stats = targetStats(root);
+const validateTargetAvailability = async (root, target, options) => {
+    const stats = statSync(root, { throwIfNoEntry: false });
     if (stats === undefined) {
-        return false;
+        return;
     }
     if (!stats.isDirectory()) {
         return fail(`Target "${target}" is not a directory`);
     }
     if (isDirEmpty(root)) {
-        return false;
+        return;
     }
     if (await shouldOverwriteDirectory(target, options)) {
-        return true;
+        return;
     }
-    return fail(`Directory "${target}" is not empty`);
+    fail(`Directory "${target}" is not empty`);
 };
 const resolveTarget = async (options) => {
     if (options.name === undefined && options.isInteractive) {
@@ -243,6 +225,12 @@ const resolveApplicationId = async (options, name) => {
     const error = validateApplicationIdInput(applicationId);
     return error === undefined ? applicationId : fail(error);
 };
+const resolveDisplayName = async (options, name) => {
+    const value = options.displayName ??
+        (options.isInteractive ? await promptDisplayName(name) : displayNameFromProjectName(name));
+    const error = validateDisplayName(value);
+    return error === undefined ? value.trim() : fail(error);
+};
 const resolvePackageManager = async (requested, options) => {
     if (requested !== undefined) {
         return requested;
@@ -252,39 +240,30 @@ const resolvePackageManager = async (requested, options) => {
     }
     return (await detectedPackageManager()) ?? "pnpm";
 };
-const isTypescriptSelected = async (options) => {
-    if (options.isTypescript !== undefined) {
-        return options.isTypescript;
-    }
-    return options.isInteractive ? shouldUseTypeScript() : true;
-};
-const isTestingIncluded = async (options) => {
-    if (options.shouldIncludeTesting !== undefined) {
-        return options.shouldIncludeTesting;
-    }
-    return options.isInteractive ? shouldSetUpTesting() : true;
-};
 const resolveOptions = async (options) => {
     const requested = requestedPackageManager(options.packageManager);
     const target = await resolveTarget(options);
     const name = deriveProjectName(target);
+    const displayName = await resolveDisplayName(options, name);
     const applicationId = await resolveApplicationId(options, name);
     const root = resolve(process.cwd(), target);
     const isCurrentDirectory = root === process.cwd();
-    const shouldEmptyTarget = await shouldEmptyTargetDirectory(root, target, options);
+    const shouldInitialize = shouldInitializeGit(root);
+    await validateTargetAvailability(root, target, options);
     const packageManager = await resolvePackageManager(requested, options);
-    const isTypescript = await isTypescriptSelected(options);
-    const shouldIncludeTesting = await isTestingIncluded(options);
+    const isTypescript = await isOptionEnabled(options.isTypescript, options.isInteractive, "Use TypeScript?");
+    const shouldIncludeTesting = await isOptionEnabled(options.shouldIncludeTesting, options.isInteractive, "Include testing setup (Vitest)?");
     return {
         target,
         root,
         isCurrentDirectory,
         name,
+        displayName,
         applicationId,
         packageManager,
         isTypescript,
         shouldIncludeTesting,
-        shouldEmptyTarget,
+        shouldInitializeGit: shouldInitialize,
     };
 };
 const isTemplateIncluded = (templateRelativePath, resolved) => {
@@ -296,37 +275,112 @@ const isTemplateIncluded = (templateRelativePath, resolved) => {
     }
     return true;
 };
-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 destinationPath = (template, resolved) => {
+    const scriptPath = resolved.isTypescript ? template : template.replace(/\.tsx$/, ".jsx").replace(/\.ts$/, ".js");
+    return scriptPath.endsWith(ICON_TEMPLATE_NAME)
+        ? `${scriptPath.slice(0, -ICON_TEMPLATE_NAME.length)}${resolved.applicationId}.svg`
+        : scriptPath;
 };
 const templateContext = (resolved) => ({
     name: resolved.name,
     applicationId: resolved.applicationId,
-    title: titleFromName(resolved.name),
+    displayName: resolved.displayName,
     shouldIncludeTesting: resolved.shouldIncludeTesting,
     isTypescript: resolved.isTypescript,
     importExtension: resolved.isTypescript ? ".js" : ".jsx",
-    developerName: gitConfigValue("user.name") ?? titleFromName(resolved.name),
+    developerName: gitConfigValue("user.name") ?? resolved.displayName,
     developerEmail: gitConfigValue("user.email"),
 });
-const scaffoldProject = async (root, resolved) => {
-    const { applicationId, isTypescript, shouldIncludeTesting } = resolved;
+const replaceTemplateDestination = (destination) => {
+    const entry = lstatSync(destination, { throwIfNoEntry: false });
+    if (entry === undefined) {
+        return;
+    }
+    if (!entry.isFile() && !entry.isSymbolicLink()) {
+        fail(`Cannot replace scaffold file because its destination is not a file: ${destination}`);
+    }
+    rmSync(destination, { force: true });
+};
+const projectRelativeDestination = (root, destination) => {
+    const relativePath = relative(root, destination);
+    const isOutsideProject = relativePath.length === 0 || relativePath.startsWith(`..${sep}`) ||
+        isAbsolute(relativePath);
+    if (isOutsideProject) {
+        fail(`Scaffold destination is outside the project: ${destination}`);
+    }
+    return relativePath;
+};
+const assertRootIsNotSymbolicLink = (root) => {
+    const rootEntry = lstatSync(root, { throwIfNoEntry: false });
+    if (rootEntry?.isSymbolicLink()) {
+        fail(`Cannot scaffold through a symbolic link: ${root}`);
+    }
+};
+const assertSafeAncestor = (ancestor) => {
+    const entry = lstatSync(ancestor, { throwIfNoEntry: false });
+    if (entry?.isSymbolicLink()) {
+        fail(`Cannot scaffold through a symbolic link: ${ancestor}`);
+    }
+    if (entry !== undefined && !entry.isDirectory()) {
+        fail(`Cannot scaffold through a non-directory path: ${ancestor}`);
+    }
+};
+const assertSafeAncestors = (root, relativePath) => {
+    let ancestor = root;
+    const segments = relativePath.split(sep);
+    const ancestorSegments = segments.slice(0, -1);
+    for (const segment of ancestorSegments) {
+        ancestor = join(ancestor, segment);
+        assertSafeAncestor(ancestor);
+    }
+};
+const assertReplaceableDestination = (destination) => {
+    const entry = lstatSync(destination, { throwIfNoEntry: false });
+    const isReplaceable = entry === undefined || entry.isFile() || entry.isSymbolicLink();
+    if (!isReplaceable) {
+        fail(`Cannot replace scaffold file because its destination is not a file: ${destination}`);
+    }
+};
+const assertSafeDestination = (root, destination) => {
+    const relativePath = projectRelativeDestination(root, destination);
+    assertRootIsNotSymbolicLink(root);
+    assertSafeAncestors(root, relativePath);
+    assertReplaceableDestination(destination);
+};
+const plannedScaffoldFiles = async (root, resolved) => {
     const context = templateContext(resolved);
+    const files = [];
     for (const template of listTemplates()) {
-        if (!isTemplateIncluded(template, resolved)) {
-            continue;
+        if (isTemplateIncluded(template, resolved)) {
+            files.push({
+                destination: join(root, destinationPath(template, resolved)),
+                contents: await renderFile(template, context),
+            });
         }
-        const destination = join(root, toDestinationPath(template, isTypescript, applicationId));
-        mkdirSync(dirname(destination), { recursive: true });
-        writeFileSync(destination, await renderFile(template, context));
     }
-    if (shouldIncludeTesting) {
-        addTestScript(root);
+    return files;
+};
+const auxiliaryDestinations = (root, resolved) => [
+    ...(resolved.packageManager === "pnpm" ? [join(root, "pnpm-workspace.yaml")] : []),
+    ...(resolved.isTypescript ? [join(root, "node_modules", ".gtkx", "env.d.ts")] : []),
+];
+const scaffoldProject = async (root, resolved) => {
+    const files = await plannedScaffoldFiles(root, resolved);
+    const destinations = [...files.map((file) => file.destination), ...auxiliaryDestinations(root, resolved)];
+    for (const destination of destinations) {
+        assertSafeDestination(root, destination);
+    }
+    for (const destination of destinations) {
+        replaceTemplateDestination(destination);
+    }
+    for (const file of files) {
+        mkdirSync(dirname(file.destination), { recursive: true });
+        writeFileSync(file.destination, file.contents);
+    }
+    if (resolved.shouldIncludeTesting) {
+        updateManifest(root, (manifest) => {
+            manifest.scripts.test = "vitest run";
+        });
     }
 };
 const withoutInheritedScriptPolicy = async (run) => {
@@ -351,9 +405,9 @@ const installDependencies = async (options) => {
         await addDependency(dependencies, { cwd, packageManager, dev: isDev, silent: true });
     });
 };
-const pin = (names) => names.map((dependency) => pinGtkxDependency(dependency, selfVersion));
+const pin = (names) => names.map((dependency) => dependency.startsWith("@gtkx/") ? `${dependency}@^${selfVersion}` : dependency);
 const formatRecovery = ({ resolved, devDependencies }) => {
-    const add = getAddCommand(resolved.packageManager);
+    const add = ADD_COMMAND[resolved.packageManager];
     const steps = [
         ...(resolved.isCurrentDirectory ? [] : [`cd ${resolved.target}`]),
         `${add} ${pin(DEPENDENCIES).join(" ")}`,
@@ -404,7 +458,23 @@ const writeInitialEnvModule = (root) => {
     mkdirSync(storeDir, { recursive: true });
     writeFileSync(join(storeDir, "env.d.ts"), `${GTKX_ENV_MODULE_HEADER}\n`);
 };
-const initializeGitRepo = async (root) => {
+const isInsideGitRepository = (root) => {
+    const git = tryResolveExecutable("git");
+    if (git === undefined) {
+        return false;
+    }
+    try {
+        execFileSync(git, ["-C", root, "rev-parse", "--show-toplevel"], { stdio: "ignore" });
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
+const initializeGitRepo = async (root, shouldInitialize) => {
+    if (!shouldInitialize || isInsideGitRepository(root)) {
+        return;
+    }
     const spinner = p.spinner();
     spinner.start("Initializing git repository...");
     try {
@@ -419,7 +489,7 @@ const initializeGitRepo = async (root) => {
     }
 };
 const printNextSteps = (resolved) => {
-    const devCmd = getDevCommand(resolved.packageManager);
+    const devCmd = DEV_COMMAND[resolved.packageManager];
     const cdStep = resolved.isCurrentDirectory ? "" : `cd ${resolved.target}\n`;
     const testingNote = resolved.shouldIncludeTesting ? HEADLESS_COMPOSITOR_NOTE : "";
     p.note(`${cdStep}${devCmd}${testingNote}`, "Next steps");
@@ -430,9 +500,12 @@ const createProjectStructure = async (root, resolved) => {
         done: "Project structure created",
         failed: "Failed to create the project structure",
         run: async () => {
-            prepareTargetDirectory(root, resolved.shouldEmptyTarget);
+            mkdirSync(root, { recursive: true });
             await scaffoldProject(root, resolved);
             writeBuildAllowance(root, resolved.packageManager);
+            if (resolved.isTypescript) {
+                writeInitialEnvModule(root);
+            }
         },
     });
 };
@@ -443,10 +516,7 @@ const scaffold = async (options = {}) => {
     const devDeps = getDevDependencies(resolved);
     await createProjectStructure(root, resolved);
     await installAllDependencies({ resolved, devDependencies: devDeps });
-    if (resolved.isTypescript) {
-        writeInitialEnvModule(root);
-    }
-    await initializeGitRepo(root);
+    await initializeGitRepo(root, resolved.shouldInitializeGit);
     printNextSteps(resolved);
 };
 export { scaffold };