@gjsify/cli 0.64.2 → 0.64.3-next.260

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

@@ -606,6 +606,19 @@ export interface ConfigDataShip extends AppMetadata {
      * bundle seal and `dlopen` both refuse. A target with no key stages nothing.
      */
     bundledTypelibs?: string[] | ShipBundledTypelibsOptions;
+    /**
+     * Additions for ONE package format — `deb` or `rpm` — on top of everything above.
+     *
+     * Exists for a library the distros disagree about: one that Fedora ships and Ubuntu does
+     * not (libgda 6), where the `.rpm` should use the system copy and only the `.deb` needs to
+     * carry its own. `bundledTypelibs` and `extraFiles` are staged for every format of a
+     * layout, so there is no way to say "the `.deb` only" with them.
+     *
+     * What a format carries here is read back off its package like any other staged file, so a
+     * namespace bundled this way no longer becomes a `Depends:` entry of THAT package — and
+     * still does in the other format's.
+     */
+    formats?: Partial<Record<'deb' | 'rpm', ShipFormatOptions>>;
     /**
      * Directory holding COMPILED gettext catalogues in the layout `bindtextdomain` reads —
      * `<lang>/LC_MESSAGES/<domain>.mo` — e.g. `"dist/locale"`, which is what
@@ -708,6 +721,21 @@ export interface ShipBundleOptions {
     /** The entry the Windows program directory carries. */
     win32?: string;
 }
+/** One entry of `gjsify.ship.formats`: the staged files only that package format carries. */
+export interface ShipFormatOptions {
+    /**
+     * Directories whose `*.typelib` and shared libraries this format carries, staged flat into
+     * `lib/<name>/gi/` like {@link ConfigDataShip.bundledTypelibs}. The launcher puts that
+     * directory on `GI_TYPELIB_PATH` and `LD_LIBRARY_PATH` when it exists.
+     */
+    bundledTypelibs?: string[];
+    /**
+     * Destination (relative to the install prefix) → source file, like
+     * {@link ConfigDataShip.extraFiles} but for this format only, e.g. a plugin directory the
+     * bundled library finds by a path baked in at build time.
+     */
+    extraFiles?: Record<string, string>;
+}
 /**
  * `gjsify.ship.bundledTypelibs` as a table — the directories per OS, the twin of
  * {@link ShipBundleOptions}.

package/lib/utils/ship/discover.d.ts

@@ -33,6 +33,18 @@ export declare function discoverPayload(input: DiscoverInput): DiscoveredPayload
  * `windows` would otherwise leave that target without its typelib and print nothing.
  */
 export declare function resolveBundledTypelibs(declared: string[] | ShipBundledTypelibsOptions | undefined, layoutOs: HostOs | undefined): string[];
+/**
+ * Typelibs (and their shared libraries) the PROJECT ships itself.
+ *
+ * Necessary because gjsify's own GI libraries — `Gwebgl` for the WebGL bridge, the GTK runtime
+ * bundles, the napi host — arrive as npm prebuilds, not as distro packages. An app using one has
+ * no `gir1.2-…` to depend on: it must carry the files, and something must point GI at them.
+ *
+ * A directory rather than a list of files, because a typelib is never alone: `Gwebgl-0.1.typelib`
+ * is useless without `libgwebgl.so`, and staging one without the other produces a package that
+ * installs and then fails at the first import.
+ */
+export declare function discoverTypelibs(projectDir: string, dirs: string[] | undefined): string[];
 /**
  * Every regular file under `dir`, as POSIX-separated relative paths.
  *

package/lib/utils/ship/discover.js

@@ -52,12 +52,35 @@ export function discoverPayload(input) {
         iconFiles: discoverIcons(projectDir, ship.icon ?? input.flatpakIcon),
         schemaFiles: discoverSchemas(projectDir, ship.schemas),
         typelibFiles: discoverTypelibs(projectDir, resolveBundledTypelibs(ship.bundledTypelibs, input.layoutOs)),
+        formatFiles: discoverFormatFiles(projectDir, ship, input.layoutOs),
         localeFiles,
         fontFiles: discoverFonts(projectDir, ship.fonts),
         licenseFile: discoverLicense(projectDir, ship.licenseFile),
         changelogFile: discoverChangelog(projectDir, ship.changelogFile),
     };
 }
+/**
+ * `gjsify.ship.formats`, resolved to absolute paths. A key other than `deb`/`rpm` is refused: a
+ * format that is not a distro package has no overlay to carry the files, so they would be
+ * dropped without a word.
+ */
+function discoverFormatFiles(projectDir, ship, layoutOs) {
+    const out = {};
+    // deb and rpm exist on the Linux layout only. Looking for their files while assembling a macOS or
+    // Windows target would fail on a directory that only the Linux build produces.
+    if (layoutOs !== undefined && layoutOs !== 'linux')
+        return out;
+    for (const [id, options] of Object.entries(ship.formats ?? {})) {
+        if (id !== 'deb' && id !== 'rpm') {
+            throw new Error(`gjsify ship: \`gjsify.ship.formats.${id}\` is not a format that carries its own files. Known: deb, rpm.`);
+        }
+        out[id] = {
+            typelibFiles: discoverTypelibs(projectDir, options?.bundledTypelibs),
+            extraFiles: Object.fromEntries(Object.entries(options?.extraFiles ?? {}).map(([dest, source]) => [dest, resolve(projectDir, source)])),
+        };
+    }
+    return out;
+}
 /**
  * The directories `gjsify.ship.bundledTypelibs` names for ONE layout.
  *
@@ -92,7 +115,7 @@ export function resolveBundledTypelibs(declared, layoutOs) {
  * is useless without `libgwebgl.so`, and staging one without the other produces a package that
  * installs and then fails at the first import.
  */
-function discoverTypelibs(projectDir, dirs) {
+export function discoverTypelibs(projectDir, dirs) {
     const out = [];
     for (const dir of dirs ?? []) {
         const root = resolve(projectDir, dir);

package/lib/utils/ship/launcher.js

@@ -143,6 +143,16 @@ function renderPrefixLauncher(settings, bundleRelPath, layout) {
             lines.push(`${variable}=${giDir}\${${variable}:+:$${variable}}`, `export ${variable}`);
         }
     }
+    // Typelibs only one format carries (`gjsify.ship.formats`). The launcher is shared by the
+    // layout, so the directory is tested at run time instead of decided here.
+    else if (Object.values(settings.formatFiles).some((f) => f.typelibFiles.length > 0)) {
+        const giDir = `"$prefix"/${dirs.native}`;
+        lines.push(`if [ -d ${giDir} ]; then`);
+        for (const variable of ['GI_TYPELIB_PATH', 'LD_LIBRARY_PATH']) {
+            lines.push(`  ${variable}=${giDir}\${${variable}:+:$${variable}}`, `  export ${variable}`);
+        }
+        lines.push('fi');
+    }
     // Where the app's gettext catalogues landed. `bindtextdomain` takes a DIRECTORY and there is no
     // standard environment variable it reads on its own (`TEXTDOMAINDIR` is honoured by the gettext
     // command-line tools, not by the library), so the prefix has to reach the app somehow. Passing

package/lib/utils/ship/plan.js

@@ -7,6 +7,7 @@ import { gzipDeterministic, POLICY_MAX_COMPRESSION } from './gzip.js';
 import { iconThemeDir, isSymbolicIcon } from './icons.js';
 import { renderMimePackage } from './mime.js';
 import { SHARE } from './share-dirs.js';
+import { readFile } from 'node:fs/promises';
 import { basename, extname, posix } from 'node:path';
 /**
  * Build the prefix-relative payload.
@@ -190,6 +191,26 @@ export async function planOverlay(settings, format, inputs) {
             },
         });
     }
+    // `gjsify.ship.formats.<id>`: files only THIS format carries (a library built against the
+    // distro's own sonames cannot ship in the other format). Typelibs land beside the bundle in
+    // `gi/`, where the launcher's guarded block finds them.
+    // READ here, as the changelog is compressed here: a stage manifest carries rendered bytes only
+    // (`--from-stage` rehydrates the overlay from the sidecar and never touches the project).
+    const own = settings.formatFiles[format.id];
+    for (const file of own?.typelibFiles ?? []) {
+        files.push({
+            path: posix.join('lib', settings.binaryName, 'gi', basename(file)),
+            mode: 0o755,
+            source: { kind: 'bytes', data: new Uint8Array(await readFile(file)) },
+        });
+    }
+    for (const [dest, source] of Object.entries(own?.extraFiles ?? {})) {
+        files.push({
+            path: assertInsidePrefix(dest),
+            mode: dest.endsWith('.so') ? 0o755 : 0o644,
+            source: { kind: 'bytes', data: new Uint8Array(await readFile(source)) },
+        });
+    }
     return files;
 }
 /**

package/lib/utils/ship/settings.d.ts

@@ -29,6 +29,8 @@ export interface DiscoveredPayload {
     schemaFiles: string[];
     /** Absolute paths of the typelibs + shared libraries the project ships itself. */
     typelibFiles: string[];
+    /** Per-format typelibs + files (`gjsify.ship.formats`), keyed by format id. */
+    formatFiles: ShipSettings['formatFiles'];
     /** Compiled gettext catalogues, each with its `<lang>/LC_MESSAGES/<domain>.mo` path. */
     localeFiles: {
         rel: string;

package/lib/utils/ship/settings.js

@@ -216,6 +216,7 @@ export function resolveShipSettings(input) {
         iconFiles: discovered.iconFiles,
         schemaFiles: discovered.schemaFiles,
         typelibFiles: discovered.typelibFiles,
+        formatFiles: discovered.formatFiles,
         localeFiles: discovered.localeFiles,
         fontFiles: discovered.fontFiles,
         extraFiles: ship.extraFiles ?? {},

package/lib/utils/ship/types.d.ts

@@ -473,6 +473,14 @@ export interface ShipSettings extends PackSettings {
      * has nothing to depend on and must ship the files — with the launcher pointing GI at them.
      */
     typelibFiles: string[];
+    /**
+     * What ONLY one package format carries (`gjsify.ship.formats`), resolved to absolute paths.
+     * Staged into that format's overlay, not the shared payload — which is the whole point.
+     */
+    formatFiles: Partial<Record<DistroFormatId, {
+        typelibFiles: string[];
+        extraFiles: Record<string, string>;
+    }>>;
     /**
      * Compiled gettext catalogues (`gjsify.ship.localeDir`), each keeping its
      * `<lang>/LC_MESSAGES/<domain>.mo` path so `share/locale/` comes out in the layout

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.64.2",
+    "version": "0.64.3-next.260",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -142,22 +142,22 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/blueprint": "^0.64.2",
-        "@gjsify/buffer": "^0.64.2",
-        "@gjsify/create-app": "^0.64.2",
-        "@gjsify/node-globals": "^0.64.2",
-        "@gjsify/node-polyfills": "^0.64.2",
-        "@gjsify/npm-registry": "^0.64.2",
-        "@gjsify/resolve-npm": "^0.64.2",
-        "@gjsify/rolldown-plugin-gjsify": "^0.64.2",
-        "@gjsify/vite-plugin-blueprint": "^0.64.2",
-        "@gjsify/rolldown-plugin-pnp": "^0.64.2",
-        "@gjsify/semver": "^0.64.2",
-        "@gjsify/tar": "^0.64.2",
-        "@gjsify/tsc": "^0.64.2",
-        "@gjsify/utils": "^0.64.2",
-        "@gjsify/web-polyfills": "^0.64.2",
-        "@gjsify/workspace": "^0.64.2",
+        "@gjsify/blueprint": "0.64.3-next.260",
+        "@gjsify/buffer": "0.64.3-next.260",
+        "@gjsify/create-app": "0.64.3-next.260",
+        "@gjsify/node-globals": "0.64.3-next.260",
+        "@gjsify/node-polyfills": "0.64.3-next.260",
+        "@gjsify/npm-registry": "0.64.3-next.260",
+        "@gjsify/resolve-npm": "0.64.3-next.260",
+        "@gjsify/rolldown-plugin-gjsify": "0.64.3-next.260",
+        "@gjsify/vite-plugin-blueprint": "0.64.3-next.260",
+        "@gjsify/rolldown-plugin-pnp": "0.64.3-next.260",
+        "@gjsify/semver": "0.64.3-next.260",
+        "@gjsify/tar": "0.64.3-next.260",
+        "@gjsify/tsc": "0.64.3-next.260",
+        "@gjsify/utils": "0.64.3-next.260",
+        "@gjsify/web-polyfills": "0.64.3-next.260",
+        "@gjsify/workspace": "0.64.3-next.260",
         "acorn": "^8.17.0",
         "cosmiconfig": "^9.0.2",
         "get-tsconfig": "^4.14.0",
@@ -166,13 +166,13 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.64.2",
+        "@gjsify/unit": "0.64.3-next.260",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/oxfmt-native": "^0.64.2",
-        "@gjsify/rolldown-native": "^0.64.2"
+        "@gjsify/oxfmt-native": "0.64.3-next.260",
+        "@gjsify/rolldown-native": "0.64.3-next.260"
     },
     "peerDependenciesMeta": {
         "@gjsify/oxfmt-native": {
@@ -191,5 +191,6 @@
     "bugs": {
         "url": "https://github.com/gjsify/gjsify/issues"
     },
-    "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/infra/cli#readme"
+    "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/infra/cli#readme",
+    "gitHead": "886de21be840429ce043cdbf8195172530e230d4"
 }