@gtkx/cli 0.6.0 → 0.7.0

package/dist/create.js

@@ -573,7 +573,7 @@ const generateExamplesMd = () => {
 ### Basic App with State
 
 \`\`\`tsx
-import { Orientation } from "@gtkx/ffi/gtk";
+import * as Gtk from "@gtkx/ffi/gtk";
 import { ApplicationWindow, Box, Label, quit } from "@gtkx/react";
 import { useCallback, useState } from "react";
 
@@ -602,7 +602,7 @@ export const App = () => {
 
     return (
         <ApplicationWindow title="Todo App" defaultWidth={400} defaultHeight={500} onCloseRequest={quit}>
-            <Box orientation={Orientation.VERTICAL} spacing={16} marginTop={16} marginStart={16} marginEnd={16}>
+            <Box orientation={Gtk.Orientation.VERTICAL} spacing={16} marginTop={16} marginStart={16} marginEnd={16}>
                 <Label label="Todo App" />
             </Box>
         </ApplicationWindow>
@@ -751,8 +751,8 @@ const MenuDemo = () => {
 ### List Item Component
 
 \`\`\`tsx
+import * as Gtk from "@gtkx/ffi/gtk";
 import { Box, Button, CheckButton, Label } from "@gtkx/react";
-import { Orientation } from "@gtkx/ffi/gtk";
 
 interface Todo {
     id: number;
@@ -767,7 +767,7 @@ interface TodoItemProps {
 }
 
 export const TodoItem = ({ todo, onToggle, onDelete }: TodoItemProps) => (
-    <Box orientation={Orientation.HORIZONTAL} spacing={8}>
+    <Box orientation={Gtk.Orientation.HORIZONTAL} spacing={8}>
         <CheckButton active={todo.completed} onToggled={() => onToggle(todo.id)} />
         <Label label={todo.text} hexpand cssClasses={todo.completed ? ["dim-label"] : []} />
         <Button iconName="edit-delete-symbolic" onClicked={() => onDelete(todo.id)} cssClasses={["flat"]} />
@@ -786,7 +786,7 @@ import { strict as assert } from "node:assert";`;
     const afterEachFn = testing === "node" ? "after" : "afterEach";
     const assertion = testing === "node" ? `assert.ok(button, "Button should be rendered");` : `expect(button).toBeDefined();`;
     return `${imports}
-import { AccessibleRole } from "@gtkx/ffi/gtk";
+import * as Gtk from "@gtkx/ffi/gtk";
 import { cleanup, render, screen } from "@gtkx/testing";
 import App from "../src/app.js";
 
@@ -797,7 +797,7 @@ ${afterEachFn}(async () => {
 describe("App", () => {
     it("renders the increment button", async () => {
         await render(<App />, { wrapper: false });
-        const button = await screen.findByRole(AccessibleRole.BUTTON, { name: "Increment" });
+        const button = await screen.findByRole(Gtk.AccessibleRole.BUTTON, { name: "Increment" });
         ${assertion}
     });
 });
@@ -882,15 +882,16 @@ const suggestAppId = (name) => {
     const sanitized = name.replace(/-/g, "");
     return `org.gtkx.${sanitized}`;
 };
-/**
- * Creates a new GTKX application with interactive prompts.
- * Scaffolds project structure, installs dependencies, and sets up configuration.
- * @param options - Pre-filled options to skip interactive prompts
- */
-export const createApp = async (options = {}) => {
-    p.intro("Create GTKX App");
+const checkCancelled = (value) => {
+    if (p.isCancel(value)) {
+        p.cancel("Operation cancelled");
+        process.exit(0);
+    }
+    return value;
+};
+const promptForOptions = async (options) => {
     const name = options.name ??
-        (await p.text({
+        checkCancelled(await p.text({
             message: "Project name",
             placeholder: "my-app",
             validate: (value) => {
@@ -905,13 +906,9 @@ export const createApp = async (options = {}) => {
                 return undefined;
             },
         }));
-    if (p.isCancel(name)) {
-        p.cancel("Operation cancelled");
-        process.exit(0);
-    }
     const defaultAppId = suggestAppId(name);
     const appId = options.appId ??
-        (await p.text({
+        checkCancelled(await p.text({
             message: "App ID",
             placeholder: defaultAppId,
             initialValue: defaultAppId,
@@ -924,12 +921,8 @@ export const createApp = async (options = {}) => {
                 return undefined;
             },
         }));
-    if (p.isCancel(appId)) {
-        p.cancel("Operation cancelled");
-        process.exit(0);
-    }
     const packageManager = options.packageManager ??
-        (await p.select({
+        checkCancelled(await p.select({
             message: "Package manager",
             options: [
                 { value: "pnpm", label: "pnpm", hint: "recommended" },
@@ -939,12 +932,8 @@ export const createApp = async (options = {}) => {
             ],
             initialValue: "pnpm",
         }));
-    if (p.isCancel(packageManager)) {
-        p.cancel("Operation cancelled");
-        process.exit(0);
-    }
     const testing = options.testing ??
-        (await p.select({
+        checkCancelled(await p.select({
             message: "Testing framework",
             options: [
                 { value: "vitest", label: "Vitest", hint: "recommended" },
@@ -954,22 +943,15 @@ export const createApp = async (options = {}) => {
             ],
             initialValue: "vitest",
         }));
-    if (p.isCancel(testing)) {
-        p.cancel("Operation cancelled");
-        process.exit(0);
-    }
     const claudeSkills = options.claudeSkills ??
-        (await p.confirm({
+        checkCancelled(await p.confirm({
             message: "Include Claude Code skills?",
             initialValue: true,
         }));
-    if (p.isCancel(claudeSkills)) {
-        p.cancel("Operation cancelled");
-        process.exit(0);
-    }
-    const projectPath = resolve(process.cwd(), name);
-    const s = p.spinner();
-    s.start("Creating project structure...");
+    return { name, appId, packageManager, testing, claudeSkills };
+};
+const scaffoldProject = (projectPath, resolved) => {
+    const { name, appId, testing, claudeSkills } = resolved;
     mkdirSync(projectPath, { recursive: true });
     mkdirSync(join(projectPath, "src"), { recursive: true });
     if (testing !== "none") {
@@ -998,9 +980,8 @@ export const createApp = async (options = {}) => {
     else if (testing === "node") {
         writeFileSync(join(projectPath, "tests", "app.test.tsx"), generateExampleTest(testing));
     }
-    s.stop("Project structure created!");
-    const installSpinner = p.spinner();
-    installSpinner.start("Installing dependencies...");
+};
+const getDevDependencies = (testing) => {
     const devDeps = [...DEV_DEPENDENCIES];
     if (testing !== "none") {
         devDeps.push(...TESTING_DEV_DEPENDENCIES[testing]);
@@ -1008,6 +989,11 @@ export const createApp = async (options = {}) => {
             devDeps.push("tsx");
         }
     }
+    return devDeps;
+};
+const installDependencies = async (projectPath, name, packageManager, devDeps) => {
+    const installSpinner = p.spinner();
+    installSpinner.start("Installing dependencies...");
     try {
         const addCmd = getAddCommand(packageManager, DEPENDENCIES, false);
         await runCommand(addCmd, projectPath);
@@ -1023,9 +1009,10 @@ export const createApp = async (options = {}) => {
         p.log.info(`  ${getAddCommand(packageManager, DEPENDENCIES, false)}`);
         p.log.info(`  ${getAddCommand(packageManager, devDeps, true)}`);
     }
+};
+const printNextSteps = (name, packageManager, testing) => {
     const runCmd = getRunCommand(packageManager);
-    const nextSteps = `cd ${name}
-${runCmd}`;
+    const nextSteps = `cd ${name}\n${runCmd}`;
     const testingNote = testing !== "none"
         ? `
 
@@ -1035,3 +1022,20 @@ To run tests, you need xvfb installed:
         : "";
     p.note(`${nextSteps}${testingNote}`, "Next steps");
 };
+/**
+ * Creates a new GTKX application with interactive prompts.
+ * Scaffolds project structure, installs dependencies, and sets up configuration.
+ * @param options - Pre-filled options to skip interactive prompts
+ */
+export const createApp = async (options = {}) => {
+    p.intro("Create GTKX App");
+    const resolved = await promptForOptions(options);
+    const projectPath = resolve(process.cwd(), resolved.name);
+    const s = p.spinner();
+    s.start("Creating project structure...");
+    scaffoldProject(projectPath, resolved);
+    s.stop("Project structure created!");
+    const devDeps = getDevDependencies(resolved.testing);
+    await installDependencies(projectPath, resolved.name, resolved.packageManager, devDeps);
+    printNextSteps(resolved.name, resolved.packageManager, resolved.testing);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/cli",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "CLI for GTKX - create and develop GTK4 React applications",
   "keywords": [
     "gtk",
@@ -46,9 +46,9 @@
     "@clack/prompts": "0.11.0",
     "@vitejs/plugin-react": "5.1.2",
     "citty": "0.1.6",
-    "vite": "7.2.7",
-    "@gtkx/ffi": "0.6.0",
-    "@gtkx/react": "0.6.0"
+    "vite": "7.3.0",
+    "@gtkx/react": "0.7.0",
+    "@gtkx/ffi": "0.7.0"
   },
   "peerDependencies": {
     "react": "^19"