@gjsify/cli 0.4.28 → 0.4.30

package/lib/config.js

@@ -41,7 +41,10 @@ function merge(target, ...sources) {
     return target;
 }
 function isPlainObject(val) {
-    return typeof val === 'object' && val !== null && !Array.isArray(val) && Object.getPrototypeOf(val) === Object.prototype;
+    return (typeof val === 'object' &&
+        val !== null &&
+        !Array.isArray(val) &&
+        Object.getPrototypeOf(val) === Object.prototype);
 }
 /**
  * Read a dotted path (`a.b.c`) from a plain object. Returns `undefined` for
@@ -85,13 +88,12 @@ export class Config {
         //      package.json#gjsify exists.
         const fileExplorer = cosmiconfig(APP_NAME, {
             ...this.loadOptions,
-            searchPlaces: (this.loadOptions.searchPlaces ?? defaultSearchPlaces(APP_NAME))
-                .filter((p) => p !== 'package.json'),
+            searchPlaces: (this.loadOptions.searchPlaces ?? defaultSearchPlaces(APP_NAME)).filter((p) => p !== 'package.json'),
         });
-        const fileResult = await fileExplorer.search(searchFrom);
+        const fileResult = (await fileExplorer.search(searchFrom));
         const merged = {};
         try {
-            const pkg = await this.readPackageJSON(searchFrom);
+            const pkg = (await this.readPackageJSON(searchFrom));
             if (isPlainObject(pkg?.gjsify))
                 merge(merged, pkg.gjsify);
         }
@@ -125,8 +127,8 @@ export class Config {
         const configFile = await this.load(process.cwd());
         const configData = { ...configFile.config };
         const configFilePath = configFile.filepath || process.cwd();
-        const pkg = await this.readPackageJSON(configFilePath);
-        const tsConfig = await this.readTSConfig(configFilePath);
+        const pkg = (await this.readPackageJSON(configFilePath));
+        const tsConfig = (await this.readTSConfig(configFilePath));
         tsConfig.reflection ||= cliArgs.reflection;
         // TODO replace with `cliArgs.logLevel`
         configData.verbose = cliArgs.verbose || false;
@@ -141,12 +143,15 @@ export class Config {
             const raw = Array.isArray(cliArgs.excludeGlobals)
                 ? cliArgs.excludeGlobals.join(',')
                 : String(cliArgs.excludeGlobals);
-            const ids = raw.split(',').map((s) => s.trim()).filter(Boolean);
+            const ids = raw
+                .split(',')
+                .map((s) => s.trim())
+                .filter(Boolean);
             if (ids.length)
                 configData.excludeGlobals = [...(configData.excludeGlobals ?? []), ...ids];
         }
-        merge(configData.library ??= {}, pkg, configData.library);
-        merge(configData.typescript ??= {}, tsConfig, configData.typescript);
+        merge((configData.library ??= {}), pkg, configData.library);
+        merge((configData.typescript ??= {}), tsConfig, configData.typescript);
         // Parse `KEY=VALUE` style flags into Record<string, string>.
         // - `--define`: VALUE is a JS expression (string literals must be
         //   pre-quoted by the caller, e.g. `'"1.2.3"'`).
@@ -170,7 +175,7 @@ export class Config {
         const defineMap = parseKvPairs(cliArgs.define ?? [], 'define');
         const aliasMap = parseKvPairs(cliArgs.alias ?? [], 'alias');
         if (Object.keys(aliasMap).length) {
-            configData.aliases = { ...(configData.aliases ?? {}), ...aliasMap };
+            configData.aliases = { ...configData.aliases, ...aliasMap };
         }
         // Resolve `defineFromPackageJson` / `defineFromEnv` into raw
         // KEY=<JSON-stringified value> entries that get merged into the
@@ -289,14 +294,14 @@ export class Config {
             // CLI --define wins over package.json/env (manual overrides during
             // debugging beat declarative config).
             transform.define = {
-                ...(transform.define ?? {}),
+                ...transform.define,
                 ...fromPkgDefines,
                 ...fromEnvDefines,
                 ...defineMap,
             };
         }
         if (configData.verbose)
-            console.debug("configData", configData);
+            console.debug('configData', configData);
         return configData;
     }
 }

package/lib/index.js

@@ -18,7 +18,9 @@ function runtimeLabel() {
             return `GJS ${Math.floor(v / 10000)}.${Math.floor((v % 10000) / 100)}.${v % 100} (SpiderMonkey)`;
         }
     }
-    catch { /* not GJS */ }
+    catch {
+        /* not GJS */
+    }
     if (typeof process !== 'undefined' && typeof process.versions?.node === 'string') {
         return `Node.js ${process.version}`;
     }

package/lib/templates/install.mjs.tmpl

@@ -45,14 +45,17 @@ Gio._promisify(Gio.Subprocess.prototype, 'wait_check_async');
 // Substituted by `gjsify generate-installer` for end-user apps.
 const DEFAULT_TARGET = '@gjsify/cli';
 const DEFAULT_BIN_NAME = 'gjsify';
-const DEFAULT_BOOTSTRAP_URL =
-    'https://github.com/gjsify/gjsify/releases/latest/download/cli.gjs.mjs';
+const DEFAULT_BOOTSTRAP_URL = 'https://github.com/gjsify/gjsify/releases/latest/download/cli.gjs.mjs';
 const DEFAULT_BOOTSTRAP_SHA256_URL = `${DEFAULT_BOOTSTRAP_URL}.sha256`;
 
 const USER_AGENT = 'gjsify-installer/1.0';
 
-function info(msg) { print(`[gjsify] ${msg}`); }
-function error(msg) { printerr(`[gjsify] ERROR: ${msg}`); }
+function info(msg) {
+    print(`[gjsify] ${msg}`);
+}
+function error(msg) {
+    printerr(`[gjsify] ERROR: ${msg}`);
+}
 
 function parseArgs() {
     const argv = system?.programArgs ?? [];
@@ -63,9 +66,8 @@ function parseArgs() {
     let bootstrapUrl = GLib.getenv('GJSIFY_INSTALL_BOOTSTRAP_URL') || DEFAULT_BOOTSTRAP_URL;
     let bootstrapSha256Url = GLib.getenv('GJSIFY_INSTALL_BOOTSTRAP_SHA256_URL');
     if (bootstrapSha256Url === null || bootstrapSha256Url === undefined) {
-        bootstrapSha256Url = bootstrapUrl === DEFAULT_BOOTSTRAP_URL
-            ? DEFAULT_BOOTSTRAP_SHA256_URL
-            : `${bootstrapUrl}.sha256`;
+        bootstrapSha256Url =
+            bootstrapUrl === DEFAULT_BOOTSTRAP_URL ? DEFAULT_BOOTSTRAP_SHA256_URL : `${bootstrapUrl}.sha256`;
     }
     for (let i = 0; i < argv.length; i++) {
         const a = argv[i];
@@ -154,8 +156,7 @@ function sha256Hex(bytes) {
 function cacheDir() {
     const override = GLib.getenv('GJSIFY_INSTALL_BOOTSTRAP_CACHE');
     if (override) return override;
-    const xdg = GLib.getenv('XDG_CACHE_HOME') ||
-        GLib.build_filenamev([GLib.get_home_dir(), '.cache']);
+    const xdg = GLib.getenv('XDG_CACHE_HOME') || GLib.build_filenamev([GLib.get_home_dir(), '.cache']);
     return GLib.build_filenamev([xdg, 'gjsify', 'bootstrap']);
 }
 
@@ -164,9 +165,7 @@ function ensureDir(dir) {
 }
 
 function writeBytes(path, bytes) {
-    Gio.File.new_for_path(path).replace_contents(
-        bytes, null, false, Gio.FileCreateFlags.REPLACE_DESTINATION, null,
-    );
+    Gio.File.new_for_path(path).replace_contents(bytes, null, false, Gio.FileCreateFlags.REPLACE_DESTINATION, null);
 }
 
 async function downloadBootstrap(session, bootstrapUrl, sha256Url) {
@@ -190,7 +189,11 @@ async function downloadBootstrap(session, bootstrapUrl, sha256Url) {
         }
     }
     const dir = cacheDir();
-    try { ensureDir(dir); } catch { /* exists */ }
+    try {
+        ensureDir(dir);
+    } catch {
+        /* exists */
+    }
     const bundlePath = GLib.build_filenamev([dir, 'cli.gjs.mjs']);
     writeBytes(bundlePath, bundleBytes);
     info(`Bootstrap cached at ${bundlePath} (${bundleBytes.length} bytes)`);
@@ -220,7 +223,10 @@ async function runInstall(bundlePath, spec) {
 
 async function main() {
     const opts = parseArgs();
-    if (opts.help) { printUsage(); exit(0); }
+    if (opts.help) {
+        printUsage();
+        exit(0);
+    }
     checkGjsVersion();
 
     const session = new Soup.Session();

package/lib/templates/oxfmtrc.tmpl

@@ -0,0 +1,54 @@
+{
+    "$schema": "./node_modules/oxfmt/configuration_schema.json",
+    "useTabs": false,
+    "tabWidth": 4,
+    "printWidth": 120,
+    "singleQuote": true,
+    "jsxSingleQuote": false,
+    "quoteProps": "as-needed",
+    "trailingComma": "all",
+    "semi": true,
+    "arrowParens": "always",
+    "bracketSameLine": false,
+    "bracketSpacing": true,
+    "ignorePatterns": [
+        "**/*.json",
+        "**/*.jsonc",
+        "**/*.json5",
+        "**/*.css",
+        "**/*.scss",
+        "**/*.sass",
+        "**/*.less",
+        "**/*.html",
+        "**/*.htm",
+        "**/*.md",
+        "**/*.mdx",
+        "**/*.yml",
+        "**/*.yaml",
+        "**/*.vue",
+        "**/*.svelte",
+        "**/*.toml",
+        "**/*.graphql",
+        "**/*.gql",
+        "**/node_modules",
+        "**/dist",
+        "**/lib",
+        "**/build",
+        "**/build-dir",
+        "**/builddir",
+        "**/flatpak-build",
+        "**/.flatpak-builder",
+        "**/repo",
+        "**/coverage",
+        "**/refs",
+        "**/@types",
+        "**/templates",
+        "**/prebuilds",
+        "**/cli.gjs.mjs",
+        "**/test.gjs.mjs",
+        "**/test.node.mjs",
+        "**/*.gresource",
+        "**/*.compiled",
+        "**/*.metainfo.xml"
+    ]
+}

package/lib/templates/oxlintrc.json.tmpl

@@ -0,0 +1,35 @@
+{
+    "$schema": "./node_modules/oxlint/configuration_schema.json",
+    "categories": {
+        "correctness": "error"
+    },
+    "rules": {
+        "typescript/consistent-type-imports": "warn",
+        "typescript/no-explicit-any": "warn",
+        "typescript/no-non-null-assertion": "off",
+        "unicorn/prefer-node-protocol": "error",
+        "eslint/no-unused-vars": "warn"
+    },
+    "ignorePatterns": [
+        "**/node_modules",
+        "**/dist",
+        "**/lib",
+        "**/build",
+        "**/build-dir",
+        "**/builddir",
+        "**/flatpak-build",
+        "**/.flatpak-builder",
+        "**/repo",
+        "**/coverage",
+        "**/refs",
+        "**/@types",
+        "**/templates",
+        "**/prebuilds",
+        "**/cli.gjs.mjs",
+        "**/test.gjs.mjs",
+        "**/test.node.mjs",
+        "**/*.gresource",
+        "**/*.compiled",
+        "**/*.metainfo.xml"
+    ]
+}

package/lib/types/command.d.ts

@@ -1,5 +1,5 @@
 import type { ArgumentsCamelCase, MiddlewareFunction, BuilderCallback } from 'yargs';
-export interface Command<T = any, U = T> {
+export interface Command<T = unknown, U = T> {
     command: string | ReadonlyArray<string>;
     description: string;
     builder?: BuilderCallback<T, U>;

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

@@ -165,20 +165,30 @@ export interface ConfigData {
     }>;
     /**
      * Extension → loader-kind map for files Rolldown does not classify
-     * natively. Currently only `'text'` is implemented — the file's content
-     * becomes the JS string default export (`export default "<content>"`).
-     * Replaces the legacy esbuild `loader: { '.ui': 'text' }` pattern.
+     * natively. Replaces the legacy esbuild `loader: { '.ui': 'text', '.png': 'dataurl' }`
+     * pattern.
+     *
+     * Loader kinds:
+     *   `'text'`    — file contents as a JS string default export
+     *                 (`export default "<source>"`). Good for GLSL shaders,
+     *                 `.ui` GtkBuilder XML, `.asm`, etc.
+     *   `'dataurl'` — `data:<mime>;base64,<b64>` string default export.
+     *                 MIME is inferred from the extension (.png → image/png,
+     *                 .jpg → image/jpeg, .gif → image/gif, .svg → image/svg+xml,
+     *                 .webp → image/webp, fallback application/octet-stream).
+     *                 Good for Excalibur's `ImageSource` and any library that
+     *                 accepts a data: URL rather than a separate asset file.
      *
      * Example:
      * ```jsonc
-     * "loaders": { ".ui": "text", ".asm": "text" }
+     * "loaders": { ".ui": "text", ".glsl": "text", ".png": "dataurl" }
      * ```
      *
      * Lives at the top level (not under `bundler`) so it doesn't leak into
-     * Rolldown's options on pass-through; the CLI converts it into a
-     * `text-loader` plugin prepended to the bundler's plugin chain.
+     * Rolldown's options on pass-through; the CLI converts it into a plugin
+     * prepended to the bundler's plugin chain.
      */
-    loaders?: Record<string, 'text'>;
+    loaders?: Record<string, 'text' | 'dataurl'>;
     /**
      * Flatpak-related configuration consumed by `gjsify flatpak <sub>`.
      * Lives in its own top-level namespace so the bundler config doesn't
@@ -188,8 +198,8 @@ export interface ConfigData {
     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.
+     * `gjsify fix`. Thin shell — oxc's own `.oxfmtrc.json` / `.oxlintrc.json`
+     * are the real configuration files; we only need a pointer here.
      */
     format?: ConfigDataFormat;
     /**
@@ -198,12 +208,12 @@ export interface ConfigData {
      */
     test?: ConfigDataTest;
 }
-/** Optional pointer to a non-default biome.json. */
+/** Optional pointer to a non-default oxc config file. */
 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`).
+     * Path to an `.oxfmtrc.json` / `.oxlintrc.json`. Default: walks up from
+     * cwd to find one; falls back to the recommended templates shipped with
+     * `gjsify` (writable via `gjsify format --init`).
      */
     configPath?: string;
 }

package/lib/types/cosmiconfig-result.d.ts

@@ -1,4 +1,4 @@
-export type CosmiconfigResult<C = any> = {
+export type CosmiconfigResult<C = unknown> = {
     config: C;
     filepath: string;
     isEmpty?: boolean;

package/lib/utils/check-system-deps.js

@@ -29,7 +29,7 @@ function checkBinary(id, name, binary, versionArgs, severity, parseVersion, requ
     const out = tryExecFile(binary, versionArgs);
     if (out === null)
         return { id, name, found: false, severity, requiredBy };
-    const version = parseVersion ? parseVersion(out) : out.split('\n')[0] ?? out;
+    const version = parseVersion ? parseVersion(out) : (out.split('\n')[0] ?? out);
     return { id, name, found: true, version, severity, requiredBy };
 }
 /** Check a pkg-config library. pkg-config --modversion returns version on stdout. */
@@ -51,7 +51,9 @@ function checkNpmPackage(id, name, packageName, cwd, severity, requiredBy) {
         requireFromCwd.resolve(packageName);
         return { id, name, found: true, severity, requiredBy };
     }
-    catch { /* not in project, try CLI fallback */ }
+    catch {
+        /* not in project, try CLI fallback */
+    }
     // 2. Fallback: CLI's own node_modules
     try {
         const requireFromCli = createRequire(import.meta.url);
@@ -156,7 +158,9 @@ function discoverGjsifyPackages(cwd) {
     try {
         topPkg = JSON.parse(readFileSync(pkgJsonPath, 'utf-8'));
     }
-    catch { /* ignore */ }
+    catch {
+        /* ignore */
+    }
     const directDeps = {
         ...topPkg.dependencies,
         ...topPkg.devDependencies,
@@ -169,7 +173,9 @@ function discoverGjsifyPackages(cwd) {
             }
         }
     }
-    catch { /* ignore */ }
+    catch {
+        /* ignore */
+    }
     // Also include direct deps even if node_modules walk failed
     for (const dep of Object.keys(directDeps)) {
         if (dep.startsWith('@gjsify/'))

package/lib/utils/detect-native-packages.js

@@ -131,7 +131,7 @@ export function detectNativePackages(startDir) {
  * Prepends the new paths to any existing values from the environment.
  */
 export function buildNativeEnv(packages) {
-    const dirs = packages.map(p => p.prebuildsDir);
+    const dirs = packages.map((p) => p.prebuildsDir);
     const existing_ld = process.env['LD_LIBRARY_PATH'] ?? '';
     const existing_gi = process.env['GI_TYPELIB_PATH'] ?? '';
     const LD_LIBRARY_PATH = [...dirs, ...(existing_ld ? [existing_ld] : [])].join(':');

package/lib/utils/dlx-cache.js

@@ -84,13 +84,8 @@ export function symlinkSwap(cacheDir, prepareDir) {
     const linkPath = join(cacheDir, 'pkg');
     const tmpName = `pkg.tmp-${Date.now().toString(16)}-${process.pid.toString(16)}`;
     const tmpLink = join(cacheDir, tmpName);
-    try {
-        symlinkSync(prepareDir, tmpLink, 'dir');
-    }
-    catch (err) {
-        // If we cannot even create the tmp link, give up.
-        throw err;
-    }
+    // If we cannot even create the tmp link, give up (the error propagates).
+    symlinkSync(prepareDir, tmpLink, 'dir');
     try {
         renameSync(tmpLink, linkPath);
     }

package/lib/utils/install-backend-native.d.ts

@@ -1,5 +1,5 @@
-import { type Packument } from "@gjsify/npm-registry";
-import type { InstallOptions } from "./install-backend.ts";
+import { type Packument } from '@gjsify/npm-registry';
+import type { InstallOptions } from './install-backend.ts';
 interface ParsedSpec {
     name: string;
     range: string;