@gjsify/cli 0.4.12 → 0.4.14

package/lib/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { buildCommand as build, runCommand as run, infoCommand as info, checkCommand as check, showcaseCommand as showcase, createCommand as create, gresourceCommand as gresource, gettextCommand as gettext, gsettingsCommand as gsettings, flatpakCommand as flatpak, dlxCommand as dlx, installCommand as install, foreachCommand as foreach, workspaceCommand as workspace, packCommand as pack, publishCommand as publish, selfUpdateCommand as selfUpdate, generateInstallerCommand as generateInstaller, uninstallCommand as uninstall, } from './commands/index.js';
+import { buildCommand as build, testCommand as test, runCommand as run, infoCommand as info, checkCommand as check, showcaseCommand as showcase, createCommand as create, gresourceCommand as gresource, gettextCommand as gettext, gsettingsCommand as gsettings, flatpakCommand as flatpak, dlxCommand as dlx, installCommand as install, foreachCommand as foreach, workspaceCommand as workspace, packCommand as pack, publishCommand as publish, selfUpdateCommand as selfUpdate, generateInstallerCommand as generateInstaller, uninstallCommand as uninstall, formatCommand as format, lintCommand as lint, fixCommand as fix, upgradeCommand as upgrade, } from './commands/index.js';
 import { APP_NAME } from './constants.js';
 // `parseAsync()` instead of `.argv` so the top-level await keeps the
 // process alive until command handlers complete. Under Node this is
@@ -14,6 +14,7 @@ await yargs(hideBin(process.argv))
     .command(create.command, create.description, create.builder, create.handler)
     .command(install.command, install.description, install.builder, install.handler)
     .command(build.command, build.description, build.builder, build.handler)
+    .command(test.command, test.description, test.builder, test.handler)
     .command(run.command, run.description, run.builder, run.handler)
     .command(dlx.command, dlx.description, dlx.builder, dlx.handler)
     .command(info.command, info.description, info.builder, info.handler)
@@ -30,6 +31,10 @@ await yargs(hideBin(process.argv))
     .command(selfUpdate.command, selfUpdate.description, selfUpdate.builder, selfUpdate.handler)
     .command(generateInstaller.command, generateInstaller.description, generateInstaller.builder, generateInstaller.handler)
     .command(uninstall.command, uninstall.description, uninstall.builder, uninstall.handler)
+    .command(upgrade.command, upgrade.description, upgrade.builder, upgrade.handler)
+    .command(format.command, format.description, format.builder, format.handler)
+    .command(lint.command, lint.description, lint.builder, lint.handler)
+    .command(fix.command, fix.description, fix.builder, fix.handler)
     .demandCommand(1)
     .help()
     .parseAsync();

package/lib/templates/biome.json.tmpl

@@ -0,0 +1,79 @@
+{
+    "$schema": "https://biomejs.dev/schemas/2.4.13/schema.json",
+    "formatter": {
+        "enabled": true,
+        "indentStyle": "space",
+        "indentWidth": 4,
+        "lineWidth": 120,
+        "lineEnding": "lf"
+    },
+    "linter": {
+        "enabled": true,
+        "rules": {
+            "recommended": true,
+            "style": {
+                "useImportType": "warn",
+                "useNodejsImportProtocol": "error",
+                "noNonNullAssertion": "off"
+            },
+            "suspicious": {
+                "noExplicitAny": "warn",
+                "noConsole": "off"
+            },
+            "correctness": {
+                "noUnusedImports": "warn"
+            }
+        }
+    },
+    "javascript": {
+        "formatter": {
+            "quoteStyle": "single",
+            "jsxQuoteStyle": "double",
+            "semicolons": "always",
+            "trailingCommas": "all",
+            "arrowParentheses": "always",
+            "bracketSpacing": true,
+            "bracketSameLine": false
+        }
+    },
+    "json": {
+        "formatter": {
+            "indentWidth": 2,
+            "trailingCommas": "none",
+            "lineWidth": 120
+        }
+    },
+    "css": {
+        "formatter": {
+            "indentWidth": 2,
+            "quoteStyle": "single"
+        }
+    },
+    "files": {
+        "includes": [
+            "**",
+            "!**/node_modules",
+            "!**/dist",
+            "!**/lib",
+            "!**/build",
+            "!**/build-dir",
+            "!**/builddir",
+            "!**/flatpak-build",
+            "!**/.flatpak-builder",
+            "!**/repo",
+            "!**/coverage",
+            "!**/refs",
+            "!**/@types",
+            "!**/templates",
+            "!**/prebuilds",
+            "!**/.yarn/cache",
+            "!**/.yarn/install-state.gz",
+            "!**/cli.gjs.mjs",
+            "!**/test.gjs.mjs",
+            "!**/test.node.mjs",
+            "!**/*.gresource",
+            "!**/*.compiled",
+            "!**/*.metainfo.xml"
+        ]
+    }
+}

package/lib/types/cli-build-options.d.ts

@@ -96,4 +96,11 @@ export interface CliBuildOptions {
      * Example: `--exclude-globals fetch,XMLHttpRequest`
      */
     excludeGlobals?: string[];
+    /**
+     * Watch source files and rebuild on change. Logs each rebuild with
+     * duration; SIGINT/SIGTERM cleanly closes the watcher. Only valid with
+     * `--app gjs|node|browser` (rejected with `--library`). Requires the
+     * npm `rolldown` engine — run under Node.
+     */
+    watch?: boolean;
 }

package/lib/types/config-data.d.ts

@@ -186,6 +186,38 @@ export interface ConfigData {
      * declaratively. CLI flags override these values.
      */
     flatpak?: ConfigDataFlatpak;
+    /**
+     * Format/lint config consumed by `gjsify format` / `gjsify lint` /
+     * `gjsify fix`. Thin shell — Biome's own `biome.json` is the real
+     * configuration file; we only need a pointer here.
+     */
+    format?: ConfigDataFormat;
+    /**
+     * Test-runner configuration consumed by `gjsify test`. CLI flags
+     * (--entry, --outdir, --runtime) override these values.
+     */
+    test?: ConfigDataTest;
+}
+/** Optional pointer to a non-default biome.json. */
+export interface ConfigDataFormat {
+    /**
+     * Path to biome.json. Default: walks up from cwd to find one;
+     * falls back to the recommended template shipped with `gjsify`
+     * (writable via `gjsify format --init`).
+     */
+    configPath?: string;
+}
+/**
+ * `gjsify test` configuration. All fields optional — sensible defaults
+ * apply when missing.
+ */
+export interface ConfigDataTest {
+    /** Path to the test entry. Default: `src/test.mts`. */
+    entry?: string;
+    /** Output directory for the built test bundles. Default: `dist/`. */
+    outdir?: string;
+    /** Default runtimes when `--runtime` not specified. Default: `['gjs', 'node']`. */
+    runtimes?: Array<'gjs' | 'node'>;
 }
 /**
  * Flatpak-toolchain config consumed by the `gjsify flatpak` subcommand
@@ -241,6 +273,14 @@ export interface ConfigDataFlatpak {
      * `gjsify flatpak init`.
      */
     kind?: 'app' | 'cli';
+    /**
+     * App display name (`.desktop` `Name=` + MetaInfo `<name>`). Defaults
+     * to a friendly derivation of `package.json#name` — that works when
+     * `name` is the reverse-DNS app id, but breaks when it's an npm
+     * package name like `learn6502`. Set this explicitly to the
+     * human-readable name shown in app stores (e.g. `"Learn 6502 Assembly"`).
+     */
+    name?: string;
     /**
      * Developer attribution required by Flathub. `id` must be reverse-DNS.
      * `email` (optional) becomes `<email>` inside `<developer>`.
@@ -409,6 +449,13 @@ export interface ConfigDataFlatpak {
         displayLengthMin?: number;
         controls?: Array<'keyboard' | 'pointing' | 'touch' | 'gamepad' | 'tablet' | 'console'>;
     };
+    /**
+     * Flathub tracking-repo override for `gjsify flatpak sync-flathub` /
+     * `gjsify flatpak diff`. Default: `flathub/<appId>` (e.g.
+     * `flathub/eu.jumplink.Learn6502`). Set this when the upstream repo
+     * deviates from that convention.
+     */
+    flathubRepo?: string;
 }
 /**
  * A single block inside a MetaInfo `<description>`. Either a paragraph

package/lib/utils/biome-resolve.d.ts

@@ -0,0 +1,47 @@
+/**
+ * Resolve the absolute path to the biome native binary for the current
+ * platform. Walks cwd → workspace-root looking for the matching
+ * `@biomejs/cli-<platform>-<arch>` package.
+ *
+ * Throws with a clear install-hint when not found.
+ */
+export declare function findBiomeBin(cwd?: string): string;
+export declare class BiomeNotFoundError extends Error {
+    pkg: string;
+    cwd: string;
+    constructor(pkg: string, cwd: string);
+}
+/**
+ * Walk up from a starting directory to find the nearest `biome.json` or
+ * `biome.jsonc`. Returns absolute path or null. Workspace-aware: also
+ * probes the workspace root.
+ */
+export declare function findBiomeConfig(cwd?: string): string | null;
+export interface RunBiomeOptions {
+    cwd?: string;
+    verbose?: boolean;
+}
+/**
+ * Spawn biome with the given args. Inherits stdio so biome's own output
+ * (formatted source, lint diagnostics, summary lines) reaches the user.
+ *
+ * Returns the exit code as a number; never throws on non-zero exit
+ * (callers check the code).
+ */
+export declare function runBiome(args: string[], opts?: RunBiomeOptions): Promise<number>;
+/**
+ * Lazy-load the embedded `biome.json.tmpl` content. The static-read-inliner
+ * matches this readFileSync(new URL(<lit>, import.meta.url), 'utf-8')
+ * shape at build time and inlines the file into the GJS bundle, so the
+ * template is available without runtime file I/O against the install dir.
+ */
+export declare function loadBiomeTemplate(): string;
+/** Helper for callers to surface the install hint to the user cleanly. */
+export declare function printBiomeNotFound(err: BiomeNotFoundError): void;
+/**
+ * Has `@biomejs/biome` (the npm wrapper package) been declared in the
+ * project's `package.json` devDependencies or dependencies? Useful as a
+ * cheap pre-flight check — `gjsify flatpak init`'s G.2 post-format hook
+ * uses this to decide whether to auto-format its outputs.
+ */
+export declare function hasBiomeDevDep(cwd?: string): boolean;

package/lib/utils/biome-resolve.js

@@ -0,0 +1,204 @@
+// biome native-binary resolution + spawn helpers.
+//
+// Biome ships its real binary as per-platform optionalDependencies of
+// `@biomejs/biome` (e.g. `@biomejs/cli-linux-x64/biome`). The published
+// `bin/biome` script in @biomejs/biome is a Node.js launcher that picks
+// the right platform package and spawns its binary. gjsify skips that
+// Node launcher and resolves the platform-specific binary directly —
+// same pattern as gjsify resolves @gjsify/<vala>-native prebuilds from
+// node_modules at runtime.
+//
+// Resolution order (workspace-aware):
+//   1. Project's local node_modules (cwd → cwd/node_modules)
+//   2. Workspace root's node_modules (walk up via findWorkspaceRoot)
+//   3. ENOENT → install hint
+import { existsSync, readFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { spawn } from 'node:child_process';
+import { findWorkspaceRoot } from './workspace-root.js';
+/** Map Node.js `process.platform` + `arch` to the biome platform-package suffix. */
+function biomePackageSuffix() {
+    const platform = process.platform;
+    const arch = process.arch;
+    let plat;
+    if (platform === 'linux')
+        plat = 'linux';
+    else if (platform === 'darwin')
+        plat = 'darwin';
+    else if (platform === 'win32')
+        plat = 'win32';
+    else
+        throw new Error(`[gjsify biome] Unsupported platform: ${platform}`);
+    let a;
+    if (arch === 'x64')
+        a = 'x64';
+    else if (arch === 'arm64')
+        a = 'arm64';
+    else
+        throw new Error(`[gjsify biome] Unsupported arch on ${plat}: ${arch}`);
+    // musl detection on Linux — biome ships separate musl binaries.
+    // Standard approach (matches biome's own launcher): probe for the
+    // musl loader. glibc systems have `/lib/ld-linux-*`, musl has
+    // `/lib/ld-musl-*`.
+    if (plat === 'linux') {
+        try {
+            const { readdirSync } = require('node:fs');
+            const libEntries = readdirSync('/lib');
+            if (libEntries.some((e) => e.startsWith('ld-musl-'))) {
+                return `${plat}-${a}-musl`;
+            }
+        }
+        catch {
+            // /lib unreadable — fall through, glibc is the safer default
+        }
+    }
+    return `${plat}-${a}`;
+}
+/** Binary filename inside the platform package — `.exe` on Windows. */
+function biomeBinFilename() {
+    return process.platform === 'win32' ? 'biome.exe' : 'biome';
+}
+/**
+ * Search a starting directory's `node_modules/<pkg>/<binFile>` for the
+ * biome binary. Returns absolute path or null if not present.
+ */
+function probeNodeModules(dir, pkg, binFile) {
+    const candidate = join(dir, 'node_modules', pkg, binFile);
+    return existsSync(candidate) ? candidate : null;
+}
+/**
+ * Resolve the absolute path to the biome native binary for the current
+ * platform. Walks cwd → workspace-root looking for the matching
+ * `@biomejs/cli-<platform>-<arch>` package.
+ *
+ * Throws with a clear install-hint when not found.
+ */
+export function findBiomeBin(cwd = process.cwd()) {
+    const suffix = biomePackageSuffix();
+    const pkg = `@biomejs/cli-${suffix}`;
+    const binFile = biomeBinFilename();
+    // 1. Local node_modules
+    const local = probeNodeModules(cwd, pkg, binFile);
+    if (local)
+        return local;
+    // 2. Walk up to workspace root, probe its node_modules
+    const wsRoot = findWorkspaceRoot(cwd);
+    if (wsRoot && wsRoot !== cwd) {
+        const fromRoot = probeNodeModules(wsRoot, pkg, binFile);
+        if (fromRoot)
+            return fromRoot;
+    }
+    // 3. Walk parent dirs as a last resort (handles nested-without-workspace setups)
+    let dir = resolve(cwd, '..');
+    for (let i = 0; i < 6; i++) {
+        const found = probeNodeModules(dir, pkg, binFile);
+        if (found)
+            return found;
+        const parent = resolve(dir, '..');
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    throw new BiomeNotFoundError(pkg, cwd);
+}
+export class BiomeNotFoundError extends Error {
+    pkg;
+    cwd;
+    constructor(pkg, cwd) {
+        super(`[gjsify biome] biome native binary not found.\n` +
+            `  Expected: ${pkg}/biome in node_modules of ${cwd} or any workspace root above it.\n` +
+            `  Install it via: gjsify install -D @biomejs/biome\n` +
+            `  (this adds @biomejs/biome to devDependencies; the matching @biomejs/cli-<platform>-<arch> ` +
+            `package lands automatically as an optionalDependency.)`);
+        this.pkg = pkg;
+        this.cwd = cwd;
+        this.name = 'BiomeNotFoundError';
+    }
+}
+/**
+ * Walk up from a starting directory to find the nearest `biome.json` or
+ * `biome.jsonc`. Returns absolute path or null. Workspace-aware: also
+ * probes the workspace root.
+ */
+export function findBiomeConfig(cwd = process.cwd()) {
+    const candidates = ['biome.json', 'biome.jsonc'];
+    let dir = cwd;
+    for (let i = 0; i < 12; i++) {
+        for (const name of candidates) {
+            const path = join(dir, name);
+            if (existsSync(path))
+                return path;
+        }
+        const parent = resolve(dir, '..');
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+/**
+ * Spawn biome with the given args. Inherits stdio so biome's own output
+ * (formatted source, lint diagnostics, summary lines) reaches the user.
+ *
+ * Returns the exit code as a number; never throws on non-zero exit
+ * (callers check the code).
+ */
+export function runBiome(args, opts = {}) {
+    const cwd = opts.cwd ?? process.cwd();
+    const bin = findBiomeBin(cwd);
+    if (opts.verbose) {
+        console.log(`[gjsify biome] ${bin} ${args.join(' ')}`);
+    }
+    return new Promise((res, rej) => {
+        const spawnOpts = { stdio: 'inherit', cwd };
+        const child = spawn(bin, args, spawnOpts);
+        child.on('error', (err) => {
+            if (err.code === 'ENOENT') {
+                rej(new BiomeNotFoundError(`<resolved bin>`, cwd));
+            }
+            else {
+                rej(err);
+            }
+        });
+        child.on('exit', (code, signal) => {
+            if (signal) {
+                console.error(`[gjsify biome] terminated by signal ${signal}`);
+                res(1);
+                return;
+            }
+            res(code ?? 0);
+        });
+    });
+}
+/**
+ * Lazy-load the embedded `biome.json.tmpl` content. The static-read-inliner
+ * matches this readFileSync(new URL(<lit>, import.meta.url), 'utf-8')
+ * shape at build time and inlines the file into the GJS bundle, so the
+ * template is available without runtime file I/O against the install dir.
+ */
+export function loadBiomeTemplate() {
+    return readFileSync(new URL('../templates/biome.json.tmpl', import.meta.url), 'utf-8');
+}
+/** Helper for callers to surface the install hint to the user cleanly. */
+export function printBiomeNotFound(err) {
+    console.error(err.message);
+}
+/**
+ * Has `@biomejs/biome` (the npm wrapper package) been declared in the
+ * project's `package.json` devDependencies or dependencies? Useful as a
+ * cheap pre-flight check — `gjsify flatpak init`'s G.2 post-format hook
+ * uses this to decide whether to auto-format its outputs.
+ */
+export function hasBiomeDevDep(cwd = process.cwd()) {
+    const pkgPath = join(cwd, 'package.json');
+    if (!existsSync(pkgPath))
+        return false;
+    try {
+        const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+        return Boolean(pkg?.devDependencies?.['@biomejs/biome'] ||
+            pkg?.dependencies?.['@biomejs/biome']);
+    }
+    catch {
+        return false;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.4.12",
+    "version": "0.4.14",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -23,7 +23,7 @@
         "clear": "rm -rf lib dist tsconfig.tsbuildinfo || exit 0",
         "check": "tsc --noEmit",
         "start": "node lib/index.js",
-        "build": "tsc && mkdir -p lib/templates/flatpak && cp -L src/templates/install.mjs.tmpl lib/templates/install.mjs.tmpl && cp src/templates/flatpak/*.tmpl lib/templates/flatpak/ && gjsify run chmod",
+        "build": "tsc && mkdir -p lib/templates/flatpak && cp -L src/templates/install.mjs.tmpl lib/templates/install.mjs.tmpl && cp src/templates/flatpak/*.tmpl lib/templates/flatpak/ && cp src/templates/biome.json.tmpl lib/templates/biome.json.tmpl && gjsify run chmod",
         "build:gjs-bundle": "node lib/index.js build src/index.ts --app gjs --outfile dist/cli.gjs.mjs --shebang",
         "chmod": "chmod +x ./lib/index.js",
         "build:test:node": "node lib/index.js build src/test.mts --app node --outfile dist/test.node.mjs",
@@ -37,18 +37,18 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/buffer": "^0.4.12",
-        "@gjsify/create-app": "^0.4.12",
-        "@gjsify/node-globals": "^0.4.12",
-        "@gjsify/node-polyfills": "^0.4.12",
-        "@gjsify/npm-registry": "^0.4.12",
-        "@gjsify/resolve-npm": "^0.4.12",
-        "@gjsify/rolldown-plugin-gjsify": "^0.4.12",
-        "@gjsify/rolldown-plugin-pnp": "^0.4.12",
-        "@gjsify/semver": "^0.4.12",
-        "@gjsify/tar": "^0.4.12",
-        "@gjsify/web-polyfills": "^0.4.12",
-        "@gjsify/workspace": "^0.4.12",
+        "@gjsify/buffer": "^0.4.14",
+        "@gjsify/create-app": "^0.4.14",
+        "@gjsify/node-globals": "^0.4.14",
+        "@gjsify/node-polyfills": "^0.4.14",
+        "@gjsify/npm-registry": "^0.4.14",
+        "@gjsify/resolve-npm": "^0.4.14",
+        "@gjsify/rolldown-plugin-gjsify": "^0.4.14",
+        "@gjsify/rolldown-plugin-pnp": "^0.4.14",
+        "@gjsify/semver": "^0.4.14",
+        "@gjsify/tar": "^0.4.14",
+        "@gjsify/web-polyfills": "^0.4.14",
+        "@gjsify/workspace": "^0.4.14",
         "cosmiconfig": "^9.0.1",
         "get-tsconfig": "^4.14.0",
         "pkg-types": "^2.3.1",
@@ -56,12 +56,12 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.4.12",
+        "@gjsify/unit": "^0.4.14",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/rolldown-native": "^0.4.12"
+        "@gjsify/rolldown-native": "^0.4.14"
     },
     "peerDependenciesMeta": {
         "@gjsify/rolldown-native": {