@gtkx/cli 1.1.0 → 1.2.0

package/dist/deploy/targets/flatpak-source.js

@@ -7,8 +7,9 @@ import { renderMetainfo } from "../freedesktop/metainfo.js";
 import { optional } from "../nfpm/optional.js";
 import { iconPathFor } from "../payload/icons.js";
 import { renderLauncher } from "../payload/launcher.js";
+import { pnpmPathFor, pnpmSources } from "./flatpak-pnpm.js";
 import { DESTINATION, postInstallCommands, validationCommands } from "./flatpak-prebuilt.js";
-import { detectPackageManager, GENERATED_SOURCES, installCommandFor, nodeExtensionPathFor, resolveGitSource, } from "./flatpak-sources.js";
+import { detectPackageManager, GENERATED_SOURCES, installCommandFor, nodeExtensionPathFor, pnpmPinFor, resolveGitSource, } from "./flatpak-sources.js";
 const LAUNCHER_FILENAME = "launcher.sh";
 const MODULE_BUILD_ROOT = "/run/build";
 const RUNTIME_PREFIX = "/app";
@@ -64,29 +65,37 @@ const iconInstallCommands = (settings) => {
     }
     return listFilesRecursive(iconsDir).map((icon) => iconInstallCommand(settings, icon.absPath, icon.rel));
 };
+const moduleDirFor = (settings) => `${MODULE_BUILD_ROOT}/${settings.binaryName}`;
 const offlineEnvFor = (manager, settings) => {
-    const moduleDir = `${MODULE_BUILD_ROOT}/${settings.binaryName}`;
+    if (manager === "pnpm") {
+        return {};
+    }
     if (manager === "yarn") {
-        return { YARN_OFFLINE_MIRROR: `${moduleDir}/${YARN_MIRROR_DIR}` };
+        return { YARN_OFFLINE_MIRROR: `${moduleDirFor(settings)}/${YARN_MIRROR_DIR}` };
     }
-    return { npm_config_cache: `${moduleDir}/${NPM_CACHE_DIR}`, npm_config_offline: "true" };
+    return { npm_config_cache: `${moduleDirFor(settings)}/${NPM_CACHE_DIR}`, npm_config_offline: "true" };
 };
+const appendPathFor = (settings, pin, nodeExtensionPath) => pin === null
+    ? `${nodeExtensionPath}/bin`
+    : `${pnpmPathFor(moduleDirFor(settings))}:${nodeExtensionPath}/bin`;
 const flatpakSourceModule = (payload) => {
     const settings = payload.settings;
     const manager = detectPackageManager(settings);
+    const pin = pnpmPinFor(settings, manager);
     const postInstall = postInstallCommands(payload);
     const nodeExtensionPath = nodeExtensionPathFor(settings);
     return {
         name: settings.binaryName,
         buildsystem: "simple",
         "build-options": {
-            "append-path": `${nodeExtensionPath}/bin`,
+            "append-path": appendPathFor(settings, pin, nodeExtensionPath),
             env: { npm_config_nodedir: nodeExtensionPath, ...offlineEnvFor(manager, settings) },
             strip: false,
             "no-debuginfo": true,
         },
         sources: [
             resolveGitSource(settings),
+            ...(pin === null ? [] : pnpmSources(pin, moduleDirFor(settings))),
             GENERATED_SOURCES,
             inlineSource(`${settings.applicationId}.desktop`, renderDesktopEntry(settings)),
             inlineSource(`${settings.applicationId}.metainfo.xml`, renderMetainfo(settings)),
@@ -94,7 +103,7 @@ const flatpakSourceModule = (payload) => {
             ...activationSource(settings),
         ],
         "build-commands": [
-            installCommandFor(manager),
+            installCommandFor(settings, manager),
             "npx gtkx build",
             ...runtimeInstallCommands(settings, nodeExtensionPath),
             ...metadataInstallCommands(settings),

package/dist/deploy/targets/flatpak-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"flatpak-source.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-source.ts"],"names":[],"mappings":"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","sourcesContent":["import { posix, relative } from \"node:path\";\nimport type { DeployPayload, DeploySettings } from \"../types.js\";\nimport { listFilesRecursive } from \"../../internal/list-files.js\";\nimport { BUNDLE_FILENAME } from \"../../vite-plugins/esm-extension.js\";\nimport { renderDbusService } from \"../freedesktop/dbus-service.js\";\nimport { renderDesktopEntry } from \"../freedesktop/desktop-entry.js\";\nimport { renderMetainfo } from \"../freedesktop/metainfo.js\";\nimport { optional } from \"../nfpm/optional.js\";\nimport { iconPathFor } from \"../payload/icons.js\";\nimport { renderLauncher } from \"../payload/launcher.js\";\nimport { DESTINATION, type FlatpakModule, postInstallCommands, validationCommands } from \"./flatpak-prebuilt.js\";\nimport {\n    detectPackageManager,\n    GENERATED_SOURCES,\n    installCommandFor,\n    nodeExtensionPathFor,\n    type PackageManager,\n    resolveGitSource,\n} from \"./flatpak-sources.js\";\n\nconst LAUNCHER_FILENAME = \"launcher.sh\";\nconst MODULE_BUILD_ROOT = \"/run/build\";\nconst RUNTIME_PREFIX = \"/app\";\nconst NPM_CACHE_DIR = \"flatpak-node/npm-cache\";\nconst YARN_MIRROR_DIR = \"flatpak-node/yarn-mirror\";\nconst PLAIN_ARGUMENT = /^[\\w./-]+$/;\nconst QUOTE_ESCAPE = String.raw`'\\''`;\n\nconst inlineSource = (fileName: string, contents: string): FlatpakModule => ({\n    type: \"inline\",\n    \"dest-filename\": fileName,\n    contents,\n});\n\nconst projectRelative = (settings: DeploySettings, path: string): string =>\n    relative(settings.paths.root, path).replaceAll(\"\\\\\", \"/\");\n\nconst shellArgument = (value: string): string =>\n    PLAIN_ARGUMENT.test(value) ? value : `'${value.split(\"'\").join(QUOTE_ESCAPE)}'`;\n\nconst pathArgument = (value: string): string => shellArgument(value.startsWith(\"-\") ? `./${value}` : value);\n\nconst installCommand = (source: string, destination: string, mode: string): string =>\n    `install -D${mode} ${pathArgument(source)} ${destination}`;\n\nconst runtimeInstallCommands = (settings: DeploySettings, nodeExtensionPath: string): string[] => {\n    const lib = `${DESTINATION}/lib/${settings.binaryName}`;\n\n    return [\n        installCommand(`${nodeExtensionPath}/bin/node`, `${lib}/node`, \"m755\"),\n        installCommand(`dist/${BUNDLE_FILENAME}`, `${lib}/${BUNDLE_FILENAME}`, \"m644\"),\n        installCommand(\"dist/gtkx.node\", `${lib}/gtkx.node`, \"m755\"),\n        \"test ! -f dist/gtkx.gresource || \" + installCommand(\"dist/gtkx.gresource\", `${lib}/gtkx.gresource`, \"m644\"),\n        \"test ! -f dist/gschemas.compiled || \" +\n        installCommand(\"dist/gschemas.compiled\", `${lib}/gschemas.compiled`, \"m644\"),\n        `test ! -d dist/assets || cp -a dist/assets ${lib}/assets`,\n        installCommand(LAUNCHER_FILENAME, `${DESTINATION}/bin/${settings.binaryName}`, \"m755\"),\n    ];\n};\n\nconst activationSource = (settings: DeploySettings): FlatpakModule[] =>\n    settings.isDbusActivatable\n        ? [inlineSource(`${settings.applicationId}.service`, renderDbusService(settings, RUNTIME_PREFIX))]\n        : [];\n\nconst activationInstallCommands = (settings: DeploySettings): string[] =>\n    settings.isDbusActivatable\n        ? [installCommand(\n                `${settings.applicationId}.service`,\n                `${DESTINATION}/share/dbus-1/services/${settings.applicationId}.service`,\n                \"m644\",\n            )]\n        : [];\n\nconst metadataInstallCommands = (settings: DeploySettings): string[] => [\n    installCommand(\n        `${settings.applicationId}.desktop`,\n        `${DESTINATION}/share/applications/${settings.applicationId}.desktop`,\n        \"m644\",\n    ),\n    installCommand(\n        `${settings.applicationId}.metainfo.xml`,\n        `${DESTINATION}/share/metainfo/${settings.applicationId}.metainfo.xml`,\n        \"m644\",\n    ),\n    ...activationInstallCommands(settings),\n];\n\nconst schemaInstallCommands = (settings: DeploySettings): string[] =>\n    settings.paths.schemaFiles.map((file) => {\n        const name = posix.basename(file);\n\n        return installCommand(\n            projectRelative(settings, file),\n            `${DESTINATION}/share/glib-2.0/schemas/${shellArgument(name)}`,\n            \"m644\",\n        );\n    });\n\nconst iconInstallCommand = (settings: DeploySettings, source: string, rel: string): string =>\n    installCommand(\n        projectRelative(settings, source),\n        `${DESTINATION}/share/icons/${shellArgument(rel.replaceAll(\"\\\\\", \"/\"))}`,\n        \"m644\",\n    );\n\nconst iconInstallCommands = (settings: DeploySettings): string[] => {\n    const { iconsDir, iconFile } = settings.paths;\n\n    if (iconFile !== null) {\n        return [iconInstallCommand(settings, iconFile, iconPathFor(settings, iconFile))];\n    }\n\n    if (iconsDir === null) {\n        return [];\n    }\n\n    return listFilesRecursive(iconsDir).map((icon) => iconInstallCommand(settings, icon.absPath, icon.rel));\n};\n\nconst offlineEnvFor = (manager: PackageManager, settings: DeploySettings): Record<string, string> => {\n    const moduleDir = `${MODULE_BUILD_ROOT}/${settings.binaryName}`;\n\n    if (manager === \"yarn\") {\n        return { YARN_OFFLINE_MIRROR: `${moduleDir}/${YARN_MIRROR_DIR}` };\n    }\n\n    return { npm_config_cache: `${moduleDir}/${NPM_CACHE_DIR}`, npm_config_offline: \"true\" };\n};\n\nconst flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {\n    const settings = payload.settings;\n    const manager = detectPackageManager(settings);\n    const postInstall = postInstallCommands(payload);\n    const nodeExtensionPath = nodeExtensionPathFor(settings);\n\n    return {\n        name: settings.binaryName,\n        buildsystem: \"simple\",\n        \"build-options\": {\n            \"append-path\": `${nodeExtensionPath}/bin`,\n            env: { npm_config_nodedir: nodeExtensionPath, ...offlineEnvFor(manager, settings) },\n            strip: false,\n            \"no-debuginfo\": true,\n        },\n        sources: [\n            resolveGitSource(settings),\n            GENERATED_SOURCES,\n            inlineSource(`${settings.applicationId}.desktop`, renderDesktopEntry(settings)),\n            inlineSource(`${settings.applicationId}.metainfo.xml`, renderMetainfo(settings)),\n            inlineSource(LAUNCHER_FILENAME, renderLauncher(settings)),\n            ...activationSource(settings),\n        ],\n        \"build-commands\": [\n            installCommandFor(manager),\n            \"npx gtkx build\",\n            ...runtimeInstallCommands(settings, nodeExtensionPath),\n            ...metadataInstallCommands(settings),\n            ...schemaInstallCommands(settings),\n            ...iconInstallCommands(settings),\n            ...(settings.deploy.flatpak?.buildCommands ?? []),\n            ...validationCommands(settings),\n        ],\n        ...optional(\"post-install\", postInstall.length === 0 ? undefined : postInstall),\n    };\n};\n\nexport { flatpakSourceModule };\n"]}
+{"version":3,"file":"flatpak-source.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-source.ts"],"names":[],"mappings":"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","sourcesContent":["import { posix, relative } from \"node:path\";\nimport type { DeployPayload, DeploySettings } from \"../types.js\";\nimport { listFilesRecursive } from \"../../internal/list-files.js\";\nimport { BUNDLE_FILENAME } from \"../../vite-plugins/esm-extension.js\";\nimport { renderDbusService } from \"../freedesktop/dbus-service.js\";\nimport { renderDesktopEntry } from \"../freedesktop/desktop-entry.js\";\nimport { renderMetainfo } from \"../freedesktop/metainfo.js\";\nimport { optional } from \"../nfpm/optional.js\";\nimport { iconPathFor } from \"../payload/icons.js\";\nimport { renderLauncher } from \"../payload/launcher.js\";\nimport { pnpmPathFor, type PnpmPin, pnpmSources } from \"./flatpak-pnpm.js\";\nimport { DESTINATION, type FlatpakModule, postInstallCommands, validationCommands } from \"./flatpak-prebuilt.js\";\nimport {\n    detectPackageManager,\n    GENERATED_SOURCES,\n    installCommandFor,\n    nodeExtensionPathFor,\n    type PackageManager,\n    pnpmPinFor,\n    resolveGitSource,\n} from \"./flatpak-sources.js\";\n\nconst LAUNCHER_FILENAME = \"launcher.sh\";\nconst MODULE_BUILD_ROOT = \"/run/build\";\nconst RUNTIME_PREFIX = \"/app\";\nconst NPM_CACHE_DIR = \"flatpak-node/npm-cache\";\nconst YARN_MIRROR_DIR = \"flatpak-node/yarn-mirror\";\nconst PLAIN_ARGUMENT = /^[\\w./-]+$/;\nconst QUOTE_ESCAPE = String.raw`'\\''`;\n\nconst inlineSource = (fileName: string, contents: string): FlatpakModule => ({\n    type: \"inline\",\n    \"dest-filename\": fileName,\n    contents,\n});\n\nconst projectRelative = (settings: DeploySettings, path: string): string =>\n    relative(settings.paths.root, path).replaceAll(\"\\\\\", \"/\");\n\nconst shellArgument = (value: string): string =>\n    PLAIN_ARGUMENT.test(value) ? value : `'${value.split(\"'\").join(QUOTE_ESCAPE)}'`;\n\nconst pathArgument = (value: string): string => shellArgument(value.startsWith(\"-\") ? `./${value}` : value);\n\nconst installCommand = (source: string, destination: string, mode: string): string =>\n    `install -D${mode} ${pathArgument(source)} ${destination}`;\n\nconst runtimeInstallCommands = (settings: DeploySettings, nodeExtensionPath: string): string[] => {\n    const lib = `${DESTINATION}/lib/${settings.binaryName}`;\n\n    return [\n        installCommand(`${nodeExtensionPath}/bin/node`, `${lib}/node`, \"m755\"),\n        installCommand(`dist/${BUNDLE_FILENAME}`, `${lib}/${BUNDLE_FILENAME}`, \"m644\"),\n        installCommand(\"dist/gtkx.node\", `${lib}/gtkx.node`, \"m755\"),\n        \"test ! -f dist/gtkx.gresource || \" + installCommand(\"dist/gtkx.gresource\", `${lib}/gtkx.gresource`, \"m644\"),\n        \"test ! -f dist/gschemas.compiled || \" +\n        installCommand(\"dist/gschemas.compiled\", `${lib}/gschemas.compiled`, \"m644\"),\n        `test ! -d dist/assets || cp -a dist/assets ${lib}/assets`,\n        installCommand(LAUNCHER_FILENAME, `${DESTINATION}/bin/${settings.binaryName}`, \"m755\"),\n    ];\n};\n\nconst activationSource = (settings: DeploySettings): FlatpakModule[] =>\n    settings.isDbusActivatable\n        ? [inlineSource(`${settings.applicationId}.service`, renderDbusService(settings, RUNTIME_PREFIX))]\n        : [];\n\nconst activationInstallCommands = (settings: DeploySettings): string[] =>\n    settings.isDbusActivatable\n        ? [installCommand(\n                `${settings.applicationId}.service`,\n                `${DESTINATION}/share/dbus-1/services/${settings.applicationId}.service`,\n                \"m644\",\n            )]\n        : [];\n\nconst metadataInstallCommands = (settings: DeploySettings): string[] => [\n    installCommand(\n        `${settings.applicationId}.desktop`,\n        `${DESTINATION}/share/applications/${settings.applicationId}.desktop`,\n        \"m644\",\n    ),\n    installCommand(\n        `${settings.applicationId}.metainfo.xml`,\n        `${DESTINATION}/share/metainfo/${settings.applicationId}.metainfo.xml`,\n        \"m644\",\n    ),\n    ...activationInstallCommands(settings),\n];\n\nconst schemaInstallCommands = (settings: DeploySettings): string[] =>\n    settings.paths.schemaFiles.map((file) => {\n        const name = posix.basename(file);\n\n        return installCommand(\n            projectRelative(settings, file),\n            `${DESTINATION}/share/glib-2.0/schemas/${shellArgument(name)}`,\n            \"m644\",\n        );\n    });\n\nconst iconInstallCommand = (settings: DeploySettings, source: string, rel: string): string =>\n    installCommand(\n        projectRelative(settings, source),\n        `${DESTINATION}/share/icons/${shellArgument(rel.replaceAll(\"\\\\\", \"/\"))}`,\n        \"m644\",\n    );\n\nconst iconInstallCommands = (settings: DeploySettings): string[] => {\n    const { iconsDir, iconFile } = settings.paths;\n\n    if (iconFile !== null) {\n        return [iconInstallCommand(settings, iconFile, iconPathFor(settings, iconFile))];\n    }\n\n    if (iconsDir === null) {\n        return [];\n    }\n\n    return listFilesRecursive(iconsDir).map((icon) => iconInstallCommand(settings, icon.absPath, icon.rel));\n};\n\nconst moduleDirFor = (settings: DeploySettings): string => `${MODULE_BUILD_ROOT}/${settings.binaryName}`;\n\nconst offlineEnvFor = (manager: PackageManager, settings: DeploySettings): Record<string, string> => {\n    if (manager === \"pnpm\") {\n        return {};\n    }\n\n    if (manager === \"yarn\") {\n        return { YARN_OFFLINE_MIRROR: `${moduleDirFor(settings)}/${YARN_MIRROR_DIR}` };\n    }\n\n    return { npm_config_cache: `${moduleDirFor(settings)}/${NPM_CACHE_DIR}`, npm_config_offline: \"true\" };\n};\n\nconst appendPathFor = (settings: DeploySettings, pin: PnpmPin | null, nodeExtensionPath: string): string =>\n    pin === null\n        ? `${nodeExtensionPath}/bin`\n        : `${pnpmPathFor(moduleDirFor(settings))}:${nodeExtensionPath}/bin`;\n\nconst flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {\n    const settings = payload.settings;\n    const manager = detectPackageManager(settings);\n    const pin = pnpmPinFor(settings, manager);\n    const postInstall = postInstallCommands(payload);\n    const nodeExtensionPath = nodeExtensionPathFor(settings);\n\n    return {\n        name: settings.binaryName,\n        buildsystem: \"simple\",\n        \"build-options\": {\n            \"append-path\": appendPathFor(settings, pin, nodeExtensionPath),\n            env: { npm_config_nodedir: nodeExtensionPath, ...offlineEnvFor(manager, settings) },\n            strip: false,\n            \"no-debuginfo\": true,\n        },\n        sources: [\n            resolveGitSource(settings),\n            ...(pin === null ? [] : pnpmSources(pin, moduleDirFor(settings))),\n            GENERATED_SOURCES,\n            inlineSource(`${settings.applicationId}.desktop`, renderDesktopEntry(settings)),\n            inlineSource(`${settings.applicationId}.metainfo.xml`, renderMetainfo(settings)),\n            inlineSource(LAUNCHER_FILENAME, renderLauncher(settings)),\n            ...activationSource(settings),\n        ],\n        \"build-commands\": [\n            installCommandFor(settings, manager),\n            \"npx gtkx build\",\n            ...runtimeInstallCommands(settings, nodeExtensionPath),\n            ...metadataInstallCommands(settings),\n            ...schemaInstallCommands(settings),\n            ...iconInstallCommands(settings),\n            ...(settings.deploy.flatpak?.buildCommands ?? []),\n            ...validationCommands(settings),\n        ],\n        ...optional(\"post-install\", postInstall.length === 0 ? undefined : postInstall),\n    };\n};\n\nexport { flatpakSourceModule };\n"]}

package/dist/deploy/targets/flatpak-sources.d.ts

@@ -1,4 +1,5 @@
 import type { DeploySettings } from "../types.js";
+import { type PnpmPin } from "./flatpak-pnpm.js";
 type PackageManager = "npm" | "pnpm" | "yarn";
 type GitSource = {
     type: "git";
@@ -8,10 +9,11 @@ type GitSource = {
 };
 declare const GENERATED_SOURCES = "generated-sources.json";
 declare const detectPackageManager: (settings: DeploySettings) => PackageManager;
-declare const installCommandFor: (manager: PackageManager) => string;
+declare const pnpmPinFor: (settings: DeploySettings, manager: PackageManager) => PnpmPin | null;
+declare const installCommandFor: (settings: DeploySettings, manager: PackageManager) => string;
 declare const nodeExtensionFor: (settings: DeploySettings) => string;
 declare const nodeExtensionPathFor: (settings: DeploySettings) => string;
 declare const resolveGitSource: (settings: DeploySettings) => GitSource;
-declare const generateNodeSources: (settings: DeploySettings, manager: PackageManager) => void;
-export { detectPackageManager, GENERATED_SOURCES, generateNodeSources, installCommandFor, nodeExtensionFor, nodeExtensionPathFor, type PackageManager, resolveGitSource, };
+declare const generateNodeSources: (settings: DeploySettings, manager: PackageManager, pin: PnpmPin | null) => void;
+export { detectPackageManager, GENERATED_SOURCES, generateNodeSources, installCommandFor, nodeExtensionFor, nodeExtensionPathFor, type PackageManager, pnpmPinFor, resolveGitSource, };
 //# sourceMappingURL=flatpak-sources.d.ts.map

package/dist/deploy/targets/flatpak-sources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flatpak-sources.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-sources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKlD,KAAK,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAE9C,KAAK,SAAS,GAAG;IACb,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAOF,QAAA,MAAM,iBAAiB,2BAA2B,CAAC;AAmBnD,QAAA,MAAM,oBAAoB,GAAI,UAAU,cAAc,KAAG,cAkBxD,CAAC;AAEF,QAAA,MAAM,iBAAiB,GAAI,SAAS,cAAc,KAAG,MAAkC,CAAC;AAExF,QAAA,MAAM,gBAAgB,GAAI,UAAU,cAAc,KAAG,MACe,CAAC;AAErE,QAAA,MAAM,oBAAoB,GAAI,UAAU,cAAc,KAAG,MAWxD,CAAC;AA0CF,QAAA,MAAM,gBAAgB,GAAI,UAAU,cAAc,KAAG,SAInD,CAAC;AAoBH,QAAA,MAAM,mBAAmB,GAAI,UAAU,cAAc,EAAE,SAAS,cAAc,KAAG,IAgBhF,CAAC;AAEF,OAAO,EACH,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,KAAK,cAAc,EACnB,gBAAgB,GACnB,CAAC"}
+{"version":3,"file":"flatpak-sources.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-sources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAsB,KAAK,OAAO,EAAuC,MAAM,mBAAmB,CAAC;AAE1G,KAAK,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAG9C,KAAK,SAAS,GAAG;IACb,IAAI,EAAE,KAAK,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAOF,QAAA,MAAM,iBAAiB,2BAA2B,CAAC;AAkBnD,QAAA,MAAM,oBAAoB,GAAI,UAAU,cAAc,KAAG,cAkBxD,CAAC;AAEF,QAAA,MAAM,UAAU,GAAI,UAAU,cAAc,EAAE,SAAS,cAAc,KAAG,OAAO,GAAG,IAC1B,CAAC;AAEzD,QAAA,MAAM,iBAAiB,GAAI,UAAU,cAAc,EAAE,SAAS,cAAc,KAAG,MACiB,CAAC;AAEjG,QAAA,MAAM,gBAAgB,GAAI,UAAU,cAAc,KAAG,MACe,CAAC;AAErE,QAAA,MAAM,oBAAoB,GAAI,UAAU,cAAc,KAAG,MAWxD,CAAC;AA2DF,QAAA,MAAM,gBAAgB,GAAI,UAAU,cAAc,KAAG,SAInD,CAAC;AAuBH,QAAA,MAAM,mBAAmB,GAAI,UAAU,cAAc,EAAE,SAAS,cAAc,EAAE,KAAK,OAAO,GAAG,IAAI,KAAG,IAgBrG,CAAC;AAEF,OAAO,EACH,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,KAAK,cAAc,EACnB,UAAU,EACV,gBAAgB,GACnB,CAAC"}

package/dist/deploy/targets/flatpak-sources.js

@@ -4,8 +4,10 @@ import { basename, dirname, join } from "node:path";
 import { runCliTool } from "../../internal/run-cli-tool.js";
 import { gitRemoteUrl, runGit } from "../git.js";
 import { optional } from "../nfpm/optional.js";
+import { FLATPAK_NODE_GENERATOR, GENERATOR_PNPM_OPTION } from "../tools.js";
+import { pnpmInstallCommand, pnpmStoreVersionFor, resolvePnpmPin } from "./flatpak-pnpm.js";
 const GENERATED_SOURCES = "generated-sources.json";
-const GENERATOR = "flatpak-node-generator";
+const COMMIT_PEEL = "^{commit}";
 const FETCHABLE_URL = /^https?:\/\//;
 const DEFAULT_NODE_EXTENSION = "org.freedesktop.Sdk.Extension.node24";
 const NODE_EXTENSION_PREFIX = "org.freedesktop.Sdk.Extension.";
@@ -17,7 +19,6 @@ const LOCKFILE_BY_MANAGER = {
 };
 const INSTALL_COMMAND = {
     npm: "npm ci --offline",
-    pnpm: "pnpm install --offline --frozen-lockfile",
     yarn: "yarn install --offline",
 };
 const detectPackageManager = (settings) => {
@@ -33,7 +34,8 @@ const detectPackageManager = (settings) => {
     }
     return found;
 };
-const installCommandFor = (manager) => INSTALL_COMMAND[manager];
+const pnpmPinFor = (settings, manager) => manager === "pnpm" ? resolvePnpmPin(settings) : null;
+const installCommandFor = (settings, manager) => manager === "pnpm" ? pnpmInstallCommand(resolvePnpmPin(settings)) : INSTALL_COMMAND[manager];
 const nodeExtensionFor = (settings) => settings.deploy.flatpak?.nodeExtension ?? DEFAULT_NODE_EXTENSION;
 const nodeExtensionPathFor = (settings) => {
     const extension = nodeExtensionFor(settings);
@@ -56,12 +58,23 @@ const resolveSourceUrl = (settings) => {
     }
     return url;
 };
+const commitForTag = (root, tag) => {
+    const commit = runGit(root, ["rev-parse", `${tag}${COMMIT_PEEL}`]);
+    if (commit === null) {
+        throw new Error(`Cannot pin the Flathub source to "${tag}": Flathub builds a fixed tree, not a movable tag, and that ` +
+            `tag does not resolve in ${root}. Create or fetch it, or set \`deploy.flatpak.source.commit\`.`);
+    }
+    return commit;
+};
 const configuredRevision = (settings) => {
     const source = settings.deploy.flatpak?.source ?? {};
     if (source.commit !== undefined) {
         return { ...optional("tag", source.tag), commit: source.commit };
     }
-    return source.tag === undefined ? null : { tag: source.tag };
+    if (source.tag === undefined) {
+        return null;
+    }
+    return { tag: source.tag, commit: commitForTag(settings.paths.root, source.tag) };
 };
 const workingTreeRevision = (settings) => {
     const root = settings.paths.root;
@@ -87,16 +100,17 @@ const isolateLockfile = (root, lockfile) => {
     copyFileSync(source, join(dir, basename(lockfile)));
     return dir;
 };
-const generateNodeSources = (settings, manager) => {
+const storeVersionArgs = (pin) => pin === null ? [] : [GENERATOR_PNPM_OPTION, pnpmStoreVersionFor(pin)];
+const generateNodeSources = (settings, manager, pin) => {
     const lockfile = settings.deploy.flatpak?.lockfile ?? LOCKFILE_BY_MANAGER[manager];
     const output = generatedSourcesPath(settings);
     mkdirSync(dirname(output), { recursive: true });
     const isolated = isolateLockfile(settings.paths.root, lockfile);
     try {
         runCliTool({
-            tool: GENERATOR,
-            args: [manager, join(isolated, basename(lockfile)), "-o", output],
-            target: "the offline npm sources",
+            tool: FLATPAK_NODE_GENERATOR.command,
+            args: [manager, join(isolated, basename(lockfile)), ...storeVersionArgs(pin), "-o", output],
+            target: "the offline dependency sources",
             shouldStream: true,
         });
     }
@@ -104,5 +118,5 @@ const generateNodeSources = (settings, manager) => {
         rmSync(isolated, { recursive: true, force: true, maxRetries: 5 });
     }
 };
-export { detectPackageManager, GENERATED_SOURCES, generateNodeSources, installCommandFor, nodeExtensionFor, nodeExtensionPathFor, resolveGitSource, };
+export { detectPackageManager, GENERATED_SOURCES, generateNodeSources, installCommandFor, nodeExtensionFor, nodeExtensionPathFor, pnpmPinFor, resolveGitSource, };
 //# sourceMappingURL=flatpak-sources.js.map

package/dist/deploy/targets/flatpak-sources.js.map

@@ -1 +1 @@
-{"version":3,"file":"flatpak-sources.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-sources.ts"],"names":[],"mappings":"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","sourcesContent":["import { copyFileSync, existsSync, mkdirSync, mkdtempSync, rmSync } from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { basename, dirname, join } from \"node:path\";\nimport type { DeploySettings } from \"../types.js\";\nimport { runCliTool } from \"../../internal/run-cli-tool.js\";\nimport { gitRemoteUrl, runGit } from \"../git.js\";\nimport { optional } from \"../nfpm/optional.js\";\n\ntype PackageManager = \"npm\" | \"pnpm\" | \"yarn\";\n\ntype GitSource = {\n    type: \"git\";\n    url: string;\n    tag?: string;\n    commit?: string;\n};\n\ntype GitRevision = {\n    tag?: string;\n    commit?: string;\n};\n\nconst GENERATED_SOURCES = \"generated-sources.json\";\nconst GENERATOR = \"flatpak-node-generator\";\nconst FETCHABLE_URL = /^https?:\\/\\//;\nconst DEFAULT_NODE_EXTENSION = \"org.freedesktop.Sdk.Extension.node24\";\nconst NODE_EXTENSION_PREFIX = \"org.freedesktop.Sdk.Extension.\";\nconst SDK_EXTENSION_ROOT = \"/usr/lib/sdk\";\n\nconst LOCKFILE_BY_MANAGER: Record<PackageManager, string> = {\n    npm: \"package-lock.json\",\n    pnpm: \"pnpm-lock.yaml\",\n    yarn: \"yarn.lock\",\n};\n\nconst INSTALL_COMMAND: Record<PackageManager, string> = {\n    npm: \"npm ci --offline\",\n    pnpm: \"pnpm install --offline --frozen-lockfile\",\n    yarn: \"yarn install --offline\",\n};\n\nconst detectPackageManager = (settings: DeploySettings): PackageManager => {\n    const configured = settings.deploy.flatpak?.packageManager;\n\n    if (configured !== undefined) {\n        return configured;\n    }\n\n    const found = ([\"pnpm\", \"yarn\", \"npm\"] as const)\n        .find((manager) => existsSync(join(settings.paths.root, LOCKFILE_BY_MANAGER[manager])));\n\n    if (found === undefined) {\n        throw new Error(\n            \"Cannot build a Flathub-ready manifest without a lockfile: the sandbox installs dependencies offline. \" +\n            \"Commit a package-lock.json, pnpm-lock.yaml, or yarn.lock, or set `deploy.flatpak.packageManager`.\",\n        );\n    }\n\n    return found;\n};\n\nconst installCommandFor = (manager: PackageManager): string => INSTALL_COMMAND[manager];\n\nconst nodeExtensionFor = (settings: DeploySettings): string =>\n    settings.deploy.flatpak?.nodeExtension ?? DEFAULT_NODE_EXTENSION;\n\nconst nodeExtensionPathFor = (settings: DeploySettings): string => {\n    const extension = nodeExtensionFor(settings);\n\n    if (!extension.startsWith(NODE_EXTENSION_PREFIX)) {\n        throw new Error(\n            `Cannot resolve where \"${extension}\" mounts: the sandbox installs Node SDK extensions under ` +\n            `${SDK_EXTENSION_ROOT}, so \\`deploy.flatpak.nodeExtension\\` has to be an ${NODE_EXTENSION_PREFIX}* id.`,\n        );\n    }\n\n    return `${SDK_EXTENSION_ROOT}/${extension.slice(NODE_EXTENSION_PREFIX.length)}`;\n};\n\nconst resolveSourceUrl = (settings: DeploySettings): string => {\n    const url = settings.deploy.flatpak?.source?.url ?? gitRemoteUrl(settings.paths.root);\n\n    if (url === null) {\n        throw new Error(\n            \"Cannot build a Flathub-ready manifest without a public source: Flathub builds from a fetchable \" +\n            \"repository, not from your working tree. Set `deploy.flatpak.source.url`.\",\n        );\n    }\n\n    if (!FETCHABLE_URL.test(url)) {\n        throw new Error(\n            `Cannot build a Flathub-ready manifest from \"${url}\": Flathub's builders clone over HTTPS and have no ` +\n            \"credentials, so an SSH remote never resolves there. Set `deploy.flatpak.source.url` to the \" +\n            \"repository's https:// URL.\",\n        );\n    }\n\n    return url;\n};\n\nconst configuredRevision = (settings: DeploySettings): GitRevision | null => {\n    const source = settings.deploy.flatpak?.source ?? {};\n\n    if (source.commit !== undefined) {\n        return { ...optional(\"tag\", source.tag), commit: source.commit };\n    }\n\n    return source.tag === undefined ? null : { tag: source.tag };\n};\n\nconst workingTreeRevision = (settings: DeploySettings): GitRevision => {\n    const root = settings.paths.root;\n\n    return {\n        ...optional(\"tag\", runGit(root, [\"describe\", \"--tags\", \"--exact-match\"]) ?? undefined),\n        ...optional(\"commit\", runGit(root, [\"rev-parse\", \"HEAD\"]) ?? undefined),\n    };\n};\n\nconst resolveGitSource = (settings: DeploySettings): GitSource => ({\n    type: \"git\",\n    url: resolveSourceUrl(settings),\n    ...(configuredRevision(settings) ?? workingTreeRevision(settings)),\n});\n\nconst generatedSourcesPath = (settings: DeploySettings): string =>\n    join(settings.paths.targets, \"flatpak\", GENERATED_SOURCES);\n\nconst isolateLockfile = (root: string, lockfile: string): string => {\n    const source = join(root, lockfile);\n\n    if (!existsSync(source)) {\n        throw new Error(`Cannot vendor the offline sources: no ${lockfile} under ${root}`);\n    }\n\n    const manifest = join(dirname(source), \"package.json\");\n    const dir = mkdtempSync(join(tmpdir(), \"gtkx-lockfile-\"));\n    copyFileSync(existsSync(manifest) ? manifest : join(root, \"package.json\"), join(dir, \"package.json\"));\n    copyFileSync(source, join(dir, basename(lockfile)));\n\n    return dir;\n};\n\nconst generateNodeSources = (settings: DeploySettings, manager: PackageManager): void => {\n    const lockfile = settings.deploy.flatpak?.lockfile ?? LOCKFILE_BY_MANAGER[manager];\n    const output = generatedSourcesPath(settings);\n    mkdirSync(dirname(output), { recursive: true });\n    const isolated = isolateLockfile(settings.paths.root, lockfile);\n\n    try {\n        runCliTool({\n            tool: GENERATOR,\n            args: [manager, join(isolated, basename(lockfile)), \"-o\", output],\n            target: \"the offline npm sources\",\n            shouldStream: true,\n        });\n    } finally {\n        rmSync(isolated, { recursive: true, force: true, maxRetries: 5 });\n    }\n};\n\nexport {\n    detectPackageManager,\n    GENERATED_SOURCES,\n    generateNodeSources,\n    installCommandFor,\n    nodeExtensionFor,\n    nodeExtensionPathFor,\n    type PackageManager,\n    resolveGitSource,\n};\n"]}
+{"version":3,"file":"flatpak-sources.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak-sources.ts"],"names":[],"mappings":"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","sourcesContent":["import { copyFileSync, existsSync, mkdirSync, mkdtempSync, rmSync } from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { basename, dirname, join } from \"node:path\";\nimport type { DeploySettings } from \"../types.js\";\nimport { runCliTool } from \"../../internal/run-cli-tool.js\";\nimport { gitRemoteUrl, runGit } from \"../git.js\";\nimport { optional } from \"../nfpm/optional.js\";\nimport { FLATPAK_NODE_GENERATOR, GENERATOR_PNPM_OPTION } from \"../tools.js\";\nimport { pnpmInstallCommand, type PnpmPin, pnpmStoreVersionFor, resolvePnpmPin } from \"./flatpak-pnpm.js\";\n\ntype PackageManager = \"npm\" | \"pnpm\" | \"yarn\";\ntype VendoredManager = Exclude<PackageManager, \"pnpm\">;\n\ntype GitSource = {\n    type: \"git\";\n    url: string;\n    tag?: string;\n    commit?: string;\n};\n\ntype GitRevision = {\n    tag?: string;\n    commit?: string;\n};\n\nconst GENERATED_SOURCES = \"generated-sources.json\";\nconst COMMIT_PEEL = \"^{commit}\";\nconst FETCHABLE_URL = /^https?:\\/\\//;\nconst DEFAULT_NODE_EXTENSION = \"org.freedesktop.Sdk.Extension.node24\";\nconst NODE_EXTENSION_PREFIX = \"org.freedesktop.Sdk.Extension.\";\nconst SDK_EXTENSION_ROOT = \"/usr/lib/sdk\";\n\nconst LOCKFILE_BY_MANAGER: Record<PackageManager, string> = {\n    npm: \"package-lock.json\",\n    pnpm: \"pnpm-lock.yaml\",\n    yarn: \"yarn.lock\",\n};\n\nconst INSTALL_COMMAND: Record<VendoredManager, string> = {\n    npm: \"npm ci --offline\",\n    yarn: \"yarn install --offline\",\n};\n\nconst detectPackageManager = (settings: DeploySettings): PackageManager => {\n    const configured = settings.deploy.flatpak?.packageManager;\n\n    if (configured !== undefined) {\n        return configured;\n    }\n\n    const found = ([\"pnpm\", \"yarn\", \"npm\"] as const)\n        .find((manager) => existsSync(join(settings.paths.root, LOCKFILE_BY_MANAGER[manager])));\n\n    if (found === undefined) {\n        throw new Error(\n            \"Cannot build a Flathub-ready manifest without a lockfile: the sandbox installs dependencies offline. \" +\n            \"Commit a package-lock.json, pnpm-lock.yaml, or yarn.lock, or set `deploy.flatpak.packageManager`.\",\n        );\n    }\n\n    return found;\n};\n\nconst pnpmPinFor = (settings: DeploySettings, manager: PackageManager): PnpmPin | null =>\n    manager === \"pnpm\" ? resolvePnpmPin(settings) : null;\n\nconst installCommandFor = (settings: DeploySettings, manager: PackageManager): string =>\n    manager === \"pnpm\" ? pnpmInstallCommand(resolvePnpmPin(settings)) : INSTALL_COMMAND[manager];\n\nconst nodeExtensionFor = (settings: DeploySettings): string =>\n    settings.deploy.flatpak?.nodeExtension ?? DEFAULT_NODE_EXTENSION;\n\nconst nodeExtensionPathFor = (settings: DeploySettings): string => {\n    const extension = nodeExtensionFor(settings);\n\n    if (!extension.startsWith(NODE_EXTENSION_PREFIX)) {\n        throw new Error(\n            `Cannot resolve where \"${extension}\" mounts: the sandbox installs Node SDK extensions under ` +\n            `${SDK_EXTENSION_ROOT}, so \\`deploy.flatpak.nodeExtension\\` has to be an ${NODE_EXTENSION_PREFIX}* id.`,\n        );\n    }\n\n    return `${SDK_EXTENSION_ROOT}/${extension.slice(NODE_EXTENSION_PREFIX.length)}`;\n};\n\nconst resolveSourceUrl = (settings: DeploySettings): string => {\n    const url = settings.deploy.flatpak?.source?.url ?? gitRemoteUrl(settings.paths.root);\n\n    if (url === null) {\n        throw new Error(\n            \"Cannot build a Flathub-ready manifest without a public source: Flathub builds from a fetchable \" +\n            \"repository, not from your working tree. Set `deploy.flatpak.source.url`.\",\n        );\n    }\n\n    if (!FETCHABLE_URL.test(url)) {\n        throw new Error(\n            `Cannot build a Flathub-ready manifest from \"${url}\": Flathub's builders clone over HTTPS and have no ` +\n            \"credentials, so an SSH remote never resolves there. Set `deploy.flatpak.source.url` to the \" +\n            \"repository's https:// URL.\",\n        );\n    }\n\n    return url;\n};\n\nconst commitForTag = (root: string, tag: string): string => {\n    const commit = runGit(root, [\"rev-parse\", `${tag}${COMMIT_PEEL}`]);\n\n    if (commit === null) {\n        throw new Error(\n            `Cannot pin the Flathub source to \"${tag}\": Flathub builds a fixed tree, not a movable tag, and that ` +\n            `tag does not resolve in ${root}. Create or fetch it, or set \\`deploy.flatpak.source.commit\\`.`,\n        );\n    }\n\n    return commit;\n};\n\nconst configuredRevision = (settings: DeploySettings): GitRevision | null => {\n    const source = settings.deploy.flatpak?.source ?? {};\n\n    if (source.commit !== undefined) {\n        return { ...optional(\"tag\", source.tag), commit: source.commit };\n    }\n\n    if (source.tag === undefined) {\n        return null;\n    }\n\n    return { tag: source.tag, commit: commitForTag(settings.paths.root, source.tag) };\n};\n\nconst workingTreeRevision = (settings: DeploySettings): GitRevision => {\n    const root = settings.paths.root;\n\n    return {\n        ...optional(\"tag\", runGit(root, [\"describe\", \"--tags\", \"--exact-match\"]) ?? undefined),\n        ...optional(\"commit\", runGit(root, [\"rev-parse\", \"HEAD\"]) ?? undefined),\n    };\n};\n\nconst resolveGitSource = (settings: DeploySettings): GitSource => ({\n    type: \"git\",\n    url: resolveSourceUrl(settings),\n    ...(configuredRevision(settings) ?? workingTreeRevision(settings)),\n});\n\nconst generatedSourcesPath = (settings: DeploySettings): string =>\n    join(settings.paths.targets, \"flatpak\", GENERATED_SOURCES);\n\nconst isolateLockfile = (root: string, lockfile: string): string => {\n    const source = join(root, lockfile);\n\n    if (!existsSync(source)) {\n        throw new Error(`Cannot vendor the offline sources: no ${lockfile} under ${root}`);\n    }\n\n    const manifest = join(dirname(source), \"package.json\");\n    const dir = mkdtempSync(join(tmpdir(), \"gtkx-lockfile-\"));\n    copyFileSync(existsSync(manifest) ? manifest : join(root, \"package.json\"), join(dir, \"package.json\"));\n    copyFileSync(source, join(dir, basename(lockfile)));\n\n    return dir;\n};\n\nconst storeVersionArgs = (pin: PnpmPin | null): string[] =>\n    pin === null ? [] : [GENERATOR_PNPM_OPTION, pnpmStoreVersionFor(pin)];\n\nconst generateNodeSources = (settings: DeploySettings, manager: PackageManager, pin: PnpmPin | null): void => {\n    const lockfile = settings.deploy.flatpak?.lockfile ?? LOCKFILE_BY_MANAGER[manager];\n    const output = generatedSourcesPath(settings);\n    mkdirSync(dirname(output), { recursive: true });\n    const isolated = isolateLockfile(settings.paths.root, lockfile);\n\n    try {\n        runCliTool({\n            tool: FLATPAK_NODE_GENERATOR.command,\n            args: [manager, join(isolated, basename(lockfile)), ...storeVersionArgs(pin), \"-o\", output],\n            target: \"the offline dependency sources\",\n            shouldStream: true,\n        });\n    } finally {\n        rmSync(isolated, { recursive: true, force: true, maxRetries: 5 });\n    }\n};\n\nexport {\n    detectPackageManager,\n    GENERATED_SOURCES,\n    generateNodeSources,\n    installCommandFor,\n    nodeExtensionFor,\n    nodeExtensionPathFor,\n    type PackageManager,\n    pnpmPinFor,\n    resolveGitSource,\n};\n"]}

package/dist/deploy/targets/flatpak.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flatpak.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAiE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgB/G,QAAA,MAAM,aAAa,EAAE,YAMpB,CAAC;AAoHF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"flatpak.d.ts","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAiE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgB/G,QAAA,MAAM,aAAa,EAAE,YAMpB,CAAC;AAqHF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/deploy/targets/flatpak.js

@@ -5,7 +5,7 @@ import { stringify } from "yaml";
 import { runCliTool } from "../../internal/run-cli-tool.js";
 import { APPSTREAMCLI, DESKTOP_FILE_VALIDATE, FLATPAK, FLATPAK_BUILDER } from "../tools.js";
 import { branchFor, renderFlatpakManifest } from "./flatpak-manifest.js";
-import { detectPackageManager, generateNodeSources } from "./flatpak-sources.js";
+import { detectPackageManager, generateNodeSources, pnpmPinFor } from "./flatpak-sources.js";
 const PREFIX = "/app";
 const TARGET_DIR = "flatpak";
 const FLATHUB_REPO = "https://dl.flathub.org/repo/flathub.flatpakrepo";
@@ -29,7 +29,8 @@ const isSourceMode = (settings) => settings.deploy.flatpak?.mode === "source";
 const renderManifests = (payload) => {
     const settings = payload.settings;
     if (isSourceMode(settings)) {
-        generateNodeSources(settings, detectPackageManager(settings));
+        const manager = detectPackageManager(settings);
+        generateNodeSources(settings, manager, pnpmPinFor(settings, manager));
     }
     return [{
             path: manifestPathFor(settings),

package/dist/deploy/targets/flatpak.js.map

@@ -1 +1 @@
-{"version":3,"file":"flatpak.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak.ts"],"names":[],"mappings":"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","sourcesContent":["import { errorMessage, info, tryResolveExecutable } from \"@gtkx/utils\";\nimport { existsSync, mkdirSync, statSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { stringify } from \"yaml\";\nimport type { DeployArtifact, DeployManifest, DeployPayload, DeploySettings, DeployTarget } from \"../types.js\";\nimport { runCliTool } from \"../../internal/run-cli-tool.js\";\nimport { APPSTREAMCLI, DESKTOP_FILE_VALIDATE, FLATPAK, FLATPAK_BUILDER } from \"../tools.js\";\nimport { branchFor, renderFlatpakManifest } from \"./flatpak-manifest.js\";\nimport { detectPackageManager, generateNodeSources } from \"./flatpak-sources.js\";\n\ntype BuilderInvocation = {\n    tool: string;\n    prefix: string[];\n};\n\nconst PREFIX = \"/app\";\nconst TARGET_DIR = \"flatpak\";\nconst FLATHUB_REPO = \"https://dl.flathub.org/repo/flathub.flatpakrepo\";\nconst BUILDER_REF = \"org.flatpak.Builder\";\n\nconst flatpakTarget: DeployTarget = {\n    name: \"flatpak\",\n    prefix: PREFIX,\n    tools: [FLATPAK, FLATPAK_BUILDER, DESKTOP_FILE_VALIDATE, APPSTREAMCLI],\n    render: (payload) => renderManifests(payload),\n    pack: (payload) => Promise.try(() => packFlatpak(payload)),\n};\n\nconst flatpakDir = (settings: DeploySettings): string => join(settings.paths.targets, TARGET_DIR);\n\nconst manifestPathFor = (settings: DeploySettings): string =>\n    join(flatpakDir(settings), `${settings.applicationId}.yml`);\n\nconst resolveBuilder = (): BuilderInvocation => {\n    if (tryResolveExecutable(FLATPAK_BUILDER.command) !== undefined) {\n        return { tool: FLATPAK_BUILDER.command, prefix: [] };\n    }\n\n    return { tool: FLATPAK.command, prefix: [\"run\", BUILDER_REF] };\n};\n\nconst isSourceMode = (settings: DeploySettings): boolean => settings.deploy.flatpak?.mode === \"source\";\n\nconst renderManifests = (payload: DeployPayload): DeployManifest[] => {\n    const settings = payload.settings;\n\n    if (isSourceMode(settings)) {\n        generateNodeSources(settings, detectPackageManager(settings));\n    }\n\n    return [{\n        path: manifestPathFor(settings),\n        contents: stringify(renderFlatpakManifest(payload), { lineWidth: 0 }),\n    }];\n};\n\nconst builderArgsFor = (settings: DeploySettings, dir: string): string[] => [\n    \"--force-clean\",\n    \"--user\",\n    \"--install-deps-from=flathub\",\n    `--default-branch=${branchFor(settings)}`,\n    ...(settings.deploy.flatpak?.shouldUseRofilesFuse === false ? [\"--disable-rofiles-fuse\"] : []),\n    `--state-dir=${join(dir, \"state\")}`,\n    `--repo=${join(dir, \"repo\")}`,\n    join(dir, \"build\"),\n    manifestPathFor(settings),\n];\n\nconst buildFlatpak = (settings: DeploySettings): void => {\n    const dir = flatpakDir(settings);\n    const builder = resolveBuilder();\n    info(\"flatpak: running flatpak-builder, this can take several minutes\");\n\n    try {\n        runCliTool({\n            tool: builder.tool,\n            args: [...builder.prefix, ...builderArgsFor(settings, dir)],\n            target: \"the flatpak\",\n            shouldStream: true,\n        });\n    } catch (error) {\n        throw new Error(\n            `${errorMessage(error)}\\n\\nIf it stopped at \"Failure spawning rofiles-fuse\", the build is running ` +\n            \"somewhere FUSE is unavailable, such as a container. Set `deploy.flatpak.shouldUseRofilesFuse: false` \" +\n            \"to build without it.\",\n            { cause: error },\n        );\n    }\n};\n\nconst bundleArgsFor = (settings: DeploySettings, target: string): string[] => {\n    const signing = settings.deploy.signing?.flatpak;\n    const runtimeRepo = settings.deploy.flatpak?.runtimeRepo ?? FLATHUB_REPO;\n\n    return [\n        \"build-bundle\",\n        join(flatpakDir(settings), \"repo\"),\n        target,\n        settings.applicationId,\n        branchFor(settings),\n        `--arch=${settings.arch.flatpak}`,\n        `--runtime-repo=${runtimeRepo}`,\n        ...(signing === undefined ? [] : [`--gpg-sign=${signing.gpgKeyId}`]),\n        ...(signing?.gpgHomeDir === undefined ? [] : [`--gpg-homedir=${signing.gpgHomeDir}`]),\n    ];\n};\n\nconst bundleFlatpak = (settings: DeploySettings): DeployArtifact => {\n    const output = settings.paths.output;\n    mkdirSync(output, { recursive: true });\n    const version = settings.versions.packageVersion;\n    const target = join(output, `${settings.applicationId}-${version}-${settings.arch.flatpak}.flatpak`);\n    runCliTool({ tool: FLATPAK.command, args: bundleArgsFor(settings, target), target: \"the flatpak bundle\" });\n\n    if (!existsSync(target)) {\n        throw new Error(`flatpak build-bundle reported success but wrote no bundle at ${target}`);\n    }\n\n    return { path: target, size: statSync(target).size };\n};\n\nconst installFlatpak = (settings: DeploySettings): void => {\n    runCliTool({\n        tool: FLATPAK.command,\n        args: [\"install\", \"--user\", \"--noninteractive\", \"--reinstall\", join(flatpakDir(settings), \"repo\"),\n            settings.applicationId],\n        target: \"the flatpak\",\n        shouldStream: true,\n    });\n};\n\nconst packFlatpak = (payload: DeployPayload): DeployArtifact[] => {\n    const settings = payload.settings;\n    buildFlatpak(settings);\n\n    if (settings.deploy.flatpak?.shouldInstall === true) {\n        installFlatpak(settings);\n    }\n\n    return settings.deploy.flatpak?.shouldEmitBundle === false ? [] : [bundleFlatpak(settings)];\n};\n\nexport { flatpakTarget };\n"]}
+{"version":3,"file":"flatpak.js","sourceRoot":"","sources":["../../../src/deploy/targets/flatpak.ts"],"names":[],"mappings":"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","sourcesContent":["import { errorMessage, info, tryResolveExecutable } from \"@gtkx/utils\";\nimport { existsSync, mkdirSync, statSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { stringify } from \"yaml\";\nimport type { DeployArtifact, DeployManifest, DeployPayload, DeploySettings, DeployTarget } from \"../types.js\";\nimport { runCliTool } from \"../../internal/run-cli-tool.js\";\nimport { APPSTREAMCLI, DESKTOP_FILE_VALIDATE, FLATPAK, FLATPAK_BUILDER } from \"../tools.js\";\nimport { branchFor, renderFlatpakManifest } from \"./flatpak-manifest.js\";\nimport { detectPackageManager, generateNodeSources, pnpmPinFor } from \"./flatpak-sources.js\";\n\ntype BuilderInvocation = {\n    tool: string;\n    prefix: string[];\n};\n\nconst PREFIX = \"/app\";\nconst TARGET_DIR = \"flatpak\";\nconst FLATHUB_REPO = \"https://dl.flathub.org/repo/flathub.flatpakrepo\";\nconst BUILDER_REF = \"org.flatpak.Builder\";\n\nconst flatpakTarget: DeployTarget = {\n    name: \"flatpak\",\n    prefix: PREFIX,\n    tools: [FLATPAK, FLATPAK_BUILDER, DESKTOP_FILE_VALIDATE, APPSTREAMCLI],\n    render: (payload) => renderManifests(payload),\n    pack: (payload) => Promise.try(() => packFlatpak(payload)),\n};\n\nconst flatpakDir = (settings: DeploySettings): string => join(settings.paths.targets, TARGET_DIR);\n\nconst manifestPathFor = (settings: DeploySettings): string =>\n    join(flatpakDir(settings), `${settings.applicationId}.yml`);\n\nconst resolveBuilder = (): BuilderInvocation => {\n    if (tryResolveExecutable(FLATPAK_BUILDER.command) !== undefined) {\n        return { tool: FLATPAK_BUILDER.command, prefix: [] };\n    }\n\n    return { tool: FLATPAK.command, prefix: [\"run\", BUILDER_REF] };\n};\n\nconst isSourceMode = (settings: DeploySettings): boolean => settings.deploy.flatpak?.mode === \"source\";\n\nconst renderManifests = (payload: DeployPayload): DeployManifest[] => {\n    const settings = payload.settings;\n\n    if (isSourceMode(settings)) {\n        const manager = detectPackageManager(settings);\n        generateNodeSources(settings, manager, pnpmPinFor(settings, manager));\n    }\n\n    return [{\n        path: manifestPathFor(settings),\n        contents: stringify(renderFlatpakManifest(payload), { lineWidth: 0 }),\n    }];\n};\n\nconst builderArgsFor = (settings: DeploySettings, dir: string): string[] => [\n    \"--force-clean\",\n    \"--user\",\n    \"--install-deps-from=flathub\",\n    `--default-branch=${branchFor(settings)}`,\n    ...(settings.deploy.flatpak?.shouldUseRofilesFuse === false ? [\"--disable-rofiles-fuse\"] : []),\n    `--state-dir=${join(dir, \"state\")}`,\n    `--repo=${join(dir, \"repo\")}`,\n    join(dir, \"build\"),\n    manifestPathFor(settings),\n];\n\nconst buildFlatpak = (settings: DeploySettings): void => {\n    const dir = flatpakDir(settings);\n    const builder = resolveBuilder();\n    info(\"flatpak: running flatpak-builder, this can take several minutes\");\n\n    try {\n        runCliTool({\n            tool: builder.tool,\n            args: [...builder.prefix, ...builderArgsFor(settings, dir)],\n            target: \"the flatpak\",\n            shouldStream: true,\n        });\n    } catch (error) {\n        throw new Error(\n            `${errorMessage(error)}\\n\\nIf it stopped at \"Failure spawning rofiles-fuse\", the build is running ` +\n            \"somewhere FUSE is unavailable, such as a container. Set `deploy.flatpak.shouldUseRofilesFuse: false` \" +\n            \"to build without it.\",\n            { cause: error },\n        );\n    }\n};\n\nconst bundleArgsFor = (settings: DeploySettings, target: string): string[] => {\n    const signing = settings.deploy.signing?.flatpak;\n    const runtimeRepo = settings.deploy.flatpak?.runtimeRepo ?? FLATHUB_REPO;\n\n    return [\n        \"build-bundle\",\n        join(flatpakDir(settings), \"repo\"),\n        target,\n        settings.applicationId,\n        branchFor(settings),\n        `--arch=${settings.arch.flatpak}`,\n        `--runtime-repo=${runtimeRepo}`,\n        ...(signing === undefined ? [] : [`--gpg-sign=${signing.gpgKeyId}`]),\n        ...(signing?.gpgHomeDir === undefined ? [] : [`--gpg-homedir=${signing.gpgHomeDir}`]),\n    ];\n};\n\nconst bundleFlatpak = (settings: DeploySettings): DeployArtifact => {\n    const output = settings.paths.output;\n    mkdirSync(output, { recursive: true });\n    const version = settings.versions.packageVersion;\n    const target = join(output, `${settings.applicationId}-${version}-${settings.arch.flatpak}.flatpak`);\n    runCliTool({ tool: FLATPAK.command, args: bundleArgsFor(settings, target), target: \"the flatpak bundle\" });\n\n    if (!existsSync(target)) {\n        throw new Error(`flatpak build-bundle reported success but wrote no bundle at ${target}`);\n    }\n\n    return { path: target, size: statSync(target).size };\n};\n\nconst installFlatpak = (settings: DeploySettings): void => {\n    runCliTool({\n        tool: FLATPAK.command,\n        args: [\"install\", \"--user\", \"--noninteractive\", \"--reinstall\", join(flatpakDir(settings), \"repo\"),\n            settings.applicationId],\n        target: \"the flatpak\",\n        shouldStream: true,\n    });\n};\n\nconst packFlatpak = (payload: DeployPayload): DeployArtifact[] => {\n    const settings = payload.settings;\n    buildFlatpak(settings);\n\n    if (settings.deploy.flatpak?.shouldInstall === true) {\n        installFlatpak(settings);\n    }\n\n    return settings.deploy.flatpak?.shouldEmitBundle === false ? [] : [bundleFlatpak(settings)];\n};\n\nexport { flatpakTarget };\n"]}

package/dist/deploy/tools.d.ts

@@ -3,16 +3,18 @@ type ToolReport = {
     missingRequired: DeployTool[];
     missingOptional: DeployTool[];
 };
+declare const GENERATOR_PNPM_OPTION = "--pnpm-store-version";
 declare const APPSTREAMCLI: DeployTool;
 declare const DESKTOP_FILE_VALIDATE: DeployTool;
 declare const FILE_TOOL: DeployTool;
 declare const FLATPAK: DeployTool;
 declare const FLATPAK_BUILDER: DeployTool;
 declare const FLATPAK_NODE_GENERATOR: DeployTool;
+declare const FLATPAK_NODE_GENERATOR_PNPM: DeployTool;
 declare const STRIP: DeployTool;
 declare const TAR: DeployTool;
 declare const probeTools: (tools: DeployTool[]) => ToolReport;
 declare const assertTools: (report: ToolReport) => void;
 declare const warnMissingOptional: (report: ToolReport) => void;
-export { APPSTREAMCLI, FLATPAK_NODE_GENERATOR, assertTools, DESKTOP_FILE_VALIDATE, FILE_TOOL, FLATPAK, FLATPAK_BUILDER, probeTools, STRIP, TAR, warnMissingOptional, };
+export { APPSTREAMCLI, FLATPAK_NODE_GENERATOR, FLATPAK_NODE_GENERATOR_PNPM, GENERATOR_PNPM_OPTION, assertTools, DESKTOP_FILE_VALIDATE, FILE_TOOL, FLATPAK, FLATPAK_BUILDER, probeTools, STRIP, TAR, warnMissingOptional, };
 //# sourceMappingURL=tools.d.ts.map

package/dist/deploy/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/deploy/tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,KAAK,UAAU,GAAG;IACd,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,eAAe,EAAE,UAAU,EAAE,CAAC;CACjC,CAAC;AAKF,QAAA,MAAM,YAAY,EAAE,UAInB,CAAC;AAEF,QAAA,MAAM,qBAAqB,EAAE,UAI5B,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,UAIhB,CAAC;AAEF,QAAA,MAAM,OAAO,EAAE,UAId,CAAC;AAEF,QAAA,MAAM,eAAe,EAAE,UAMtB,CAAC;AAEF,QAAA,MAAM,sBAAsB,EAAE,UAI7B,CAAC;AAEF,QAAA,MAAM,KAAK,EAAE,UAIZ,CAAC;AAEF,QAAA,MAAM,GAAG,EAAE,UAIV,CAAC;AAkBF,QAAA,MAAM,UAAU,GAAI,OAAO,UAAU,EAAE,KAAG,UAOzC,CAAC;AAwBF,QAAA,MAAM,WAAW,GAAI,QAAQ,UAAU,KAAG,IAIzC,CAAC;AAEF,QAAA,MAAM,mBAAmB,GAAI,QAAQ,UAAU,KAAG,IAIjD,CAAC;AAEF,OAAO,EACH,YAAY,EACZ,sBAAsB,EACtB,WAAW,EACX,qBAAqB,EACrB,SAAS,EACT,OAAO,EACP,eAAe,EACf,UAAU,EACV,KAAK,EACL,GAAG,EACH,mBAAmB,GACtB,CAAC"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/deploy/tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,KAAK,UAAU,GAAG;IACd,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,eAAe,EAAE,UAAU,EAAE,CAAC;CACjC,CAAC;AAKF,QAAA,MAAM,qBAAqB,yBAAyB,CAAC;AAErD,QAAA,MAAM,YAAY,EAAE,UAInB,CAAC;AAEF,QAAA,MAAM,qBAAqB,EAAE,UAI5B,CAAC;AAEF,QAAA,MAAM,SAAS,EAAE,UAIhB,CAAC;AAEF,QAAA,MAAM,OAAO,EAAE,UAId,CAAC;AAEF,QAAA,MAAM,eAAe,EAAE,UAMtB,CAAC;AAEF,QAAA,MAAM,sBAAsB,EAAE,UAI7B,CAAC;AAEF,QAAA,MAAM,2BAA2B,EAAE,UAGlC,CAAC;AAEF,QAAA,MAAM,KAAK,EAAE,UAIZ,CAAC;AAEF,QAAA,MAAM,GAAG,EAAE,UAIV,CAAC;AA8BF,QAAA,MAAM,UAAU,GAAI,OAAO,UAAU,EAAE,KAAG,UAOzC,CAAC;AAwBF,QAAA,MAAM,WAAW,GAAI,QAAQ,UAAU,KAAG,IAIzC,CAAC;AAEF,QAAA,MAAM,mBAAmB,GAAI,QAAQ,UAAU,KAAG,IAIjD,CAAC;AAEF,OAAO,EACH,YAAY,EACZ,sBAAsB,EACtB,2BAA2B,EAC3B,qBAAqB,EACrB,WAAW,EACX,qBAAqB,EACrB,SAAS,EACT,OAAO,EACP,eAAe,EACf,UAAU,EACV,KAAK,EACL,GAAG,EACH,mBAAmB,GACtB,CAAC"}

package/dist/deploy/tools.js

@@ -3,6 +3,8 @@ import { spawnSync } from "node:child_process";
 import { detectPackageFamily, installHints } from "./install-hints.js";
 const DETAIL_COLUMN = 26;
 const FLATPAK_BUILDER_REF = "org.flatpak.Builder";
+const FLATPAK_NODE_GENERATOR_COMMAND = "flatpak-node-generator";
+const GENERATOR_PNPM_OPTION = "--pnpm-store-version";
 const APPSTREAMCLI = {
     command: "appstreamcli",
     purpose: "validates the AppStream metainfo",
@@ -30,10 +32,14 @@ const FLATPAK_BUILDER = {
     isPresent: () => tryResolveExecutable("flatpak-builder") !== undefined || isFlatpakRefInstalled(FLATPAK_BUILDER_REF),
 };
 const FLATPAK_NODE_GENERATOR = {
-    command: "flatpak-node-generator",
-    purpose: "vendors the npm dependencies a Flathub build installs offline",
+    command: FLATPAK_NODE_GENERATOR_COMMAND,
+    purpose: "vendors the dependencies a Flathub build installs offline",
     isOptional: false,
 };
+const FLATPAK_NODE_GENERATOR_PNPM = {
+    ...FLATPAK_NODE_GENERATOR,
+    isPresent: () => hasGeneratorPnpmSupport(),
+};
 const STRIP = {
     command: "strip",
     purpose: "would shrink the bundled Node.js by removing its symbols",
@@ -51,6 +57,14 @@ const isFlatpakRefInstalled = (ref) => {
     }
     return spawnSync(flatpak, ["info", ref], { stdio: "ignore" }).status === 0;
 };
+const hasGeneratorPnpmSupport = () => {
+    const generator = tryResolveExecutable(FLATPAK_NODE_GENERATOR_COMMAND);
+    if (generator === undefined) {
+        return false;
+    }
+    const help = spawnSync(generator, ["--help"], { encoding: "utf8" });
+    return help.error === undefined && help.output.join("").includes(GENERATOR_PNPM_OPTION);
+};
 const isToolPresent = (tool) => tool.isPresent === undefined ? tryResolveExecutable(tool.command) !== undefined : tool.isPresent();
 const uniqueTools = (tools) => new Map(tools.map((tool) => [tool.command, tool])).values().toArray();
 const probeTools = (tools) => {
@@ -88,5 +102,5 @@ const warnMissingOptional = (report) => {
         warn(`${tool.command} is not installed: it ${tool.purpose}`);
     }
 };
-export { APPSTREAMCLI, FLATPAK_NODE_GENERATOR, assertTools, DESKTOP_FILE_VALIDATE, FILE_TOOL, FLATPAK, FLATPAK_BUILDER, probeTools, STRIP, TAR, warnMissingOptional, };
+export { APPSTREAMCLI, FLATPAK_NODE_GENERATOR, FLATPAK_NODE_GENERATOR_PNPM, GENERATOR_PNPM_OPTION, assertTools, DESKTOP_FILE_VALIDATE, FILE_TOOL, FLATPAK, FLATPAK_BUILDER, probeTools, STRIP, TAR, warnMissingOptional, };
 //# sourceMappingURL=tools.js.map

package/dist/deploy/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/deploy/tools.ts"],"names":[],"mappings":"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","sourcesContent":["import { tryResolveExecutable, warn } from \"@gtkx/utils\";\nimport { spawnSync } from \"node:child_process\";\nimport type { DeployTool } from \"./types.js\";\nimport { detectPackageFamily, installHints } from \"./install-hints.js\";\n\ntype ToolReport = {\n    missingRequired: DeployTool[];\n    missingOptional: DeployTool[];\n};\n\nconst DETAIL_COLUMN = 26;\nconst FLATPAK_BUILDER_REF = \"org.flatpak.Builder\";\n\nconst APPSTREAMCLI: DeployTool = {\n    command: \"appstreamcli\",\n    purpose: \"validates the AppStream metainfo\",\n    isOptional: false,\n};\n\nconst DESKTOP_FILE_VALIDATE: DeployTool = {\n    command: \"desktop-file-validate\",\n    purpose: \"validates the desktop entry\",\n    isOptional: false,\n};\n\nconst FILE_TOOL: DeployTool = {\n    command: \"file\",\n    purpose: \"required by appimagetool to inspect the payload\",\n    isOptional: false,\n};\n\nconst FLATPAK: DeployTool = {\n    command: \"flatpak\",\n    purpose: \"installs the runtime and writes the bundle\",\n    isOptional: false,\n};\n\nconst FLATPAK_BUILDER: DeployTool = {\n    command: \"flatpak-builder\",\n    purpose: \"builds the Flatpak\",\n    isOptional: false,\n    isPresent: () =>\n        tryResolveExecutable(\"flatpak-builder\") !== undefined || isFlatpakRefInstalled(FLATPAK_BUILDER_REF),\n};\n\nconst FLATPAK_NODE_GENERATOR: DeployTool = {\n    command: \"flatpak-node-generator\",\n    purpose: \"vendors the npm dependencies a Flathub build installs offline\",\n    isOptional: false,\n};\n\nconst STRIP: DeployTool = {\n    command: \"strip\",\n    purpose: \"would shrink the bundled Node.js by removing its symbols\",\n    isOptional: true,\n};\n\nconst TAR: DeployTool = {\n    command: \"tar\",\n    purpose: \"unpacks the downloaded Node.js and packaging tools\",\n    isOptional: false,\n};\n\nconst isFlatpakRefInstalled = (ref: string): boolean => {\n    const flatpak = tryResolveExecutable(FLATPAK.command);\n\n    if (flatpak === undefined) {\n        return false;\n    }\n\n    return spawnSync(flatpak, [\"info\", ref], { stdio: \"ignore\" }).status === 0;\n};\n\nconst isToolPresent = (tool: DeployTool): boolean =>\n    tool.isPresent === undefined ? tryResolveExecutable(tool.command) !== undefined : tool.isPresent();\n\nconst uniqueTools = (tools: DeployTool[]): DeployTool[] =>\n    new Map(tools.map((tool) => [tool.command, tool])).values().toArray();\n\nconst probeTools = (tools: DeployTool[]): ToolReport => {\n    const missing = uniqueTools(tools).filter((tool) => !isToolPresent(tool));\n\n    return {\n        missingRequired: missing.filter((tool) => !tool.isOptional),\n        missingOptional: missing.filter((tool) => tool.isOptional),\n    };\n};\n\nconst pad = (text: string): string => text.padEnd(DETAIL_COLUMN);\n\nconst toolLines = (tool: DeployTool, hints: string[]): string[] => [\n    `  ${pad(tool.command)}${tool.purpose}`,\n    ...hints.map((hint) => `  ${pad(\"\")}${hint}`),\n];\n\nconst missingToolsMessage = (report: ToolReport): string => {\n    const family = detectPackageFamily();\n    const required = report.missingRequired.flatMap((tool) => toolLines(tool, installHints(tool.command, family)));\n    const count = report.missingRequired.length;\n    const plural = count === 1 ? \"tool is\" : \"tools are\";\n\n    return [\n        `Cannot deploy: ${String(count)} required ${plural} missing.`,\n        \"\",\n        ...required,\n        \"\",\n        \"Narrow the run with --target if you do not need every package format.\",\n    ].join(\"\\n\");\n};\n\nconst assertTools = (report: ToolReport): void => {\n    if (report.missingRequired.length > 0) {\n        throw new Error(missingToolsMessage(report));\n    }\n};\n\nconst warnMissingOptional = (report: ToolReport): void => {\n    for (const tool of report.missingOptional) {\n        warn(`${tool.command} is not installed: it ${tool.purpose}`);\n    }\n};\n\nexport {\n    APPSTREAMCLI,\n    FLATPAK_NODE_GENERATOR,\n    assertTools,\n    DESKTOP_FILE_VALIDATE,\n    FILE_TOOL,\n    FLATPAK,\n    FLATPAK_BUILDER,\n    probeTools,\n    STRIP,\n    TAR,\n    warnMissingOptional,\n};\n"]}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/deploy/tools.ts"],"names":[],"mappings":"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","sourcesContent":["import { tryResolveExecutable, warn } from \"@gtkx/utils\";\nimport { spawnSync } from \"node:child_process\";\nimport type { DeployTool } from \"./types.js\";\nimport { detectPackageFamily, installHints } from \"./install-hints.js\";\n\ntype ToolReport = {\n    missingRequired: DeployTool[];\n    missingOptional: DeployTool[];\n};\n\nconst DETAIL_COLUMN = 26;\nconst FLATPAK_BUILDER_REF = \"org.flatpak.Builder\";\nconst FLATPAK_NODE_GENERATOR_COMMAND = \"flatpak-node-generator\";\nconst GENERATOR_PNPM_OPTION = \"--pnpm-store-version\";\n\nconst APPSTREAMCLI: DeployTool = {\n    command: \"appstreamcli\",\n    purpose: \"validates the AppStream metainfo\",\n    isOptional: false,\n};\n\nconst DESKTOP_FILE_VALIDATE: DeployTool = {\n    command: \"desktop-file-validate\",\n    purpose: \"validates the desktop entry\",\n    isOptional: false,\n};\n\nconst FILE_TOOL: DeployTool = {\n    command: \"file\",\n    purpose: \"required by appimagetool to inspect the payload\",\n    isOptional: false,\n};\n\nconst FLATPAK: DeployTool = {\n    command: \"flatpak\",\n    purpose: \"installs the runtime and writes the bundle\",\n    isOptional: false,\n};\n\nconst FLATPAK_BUILDER: DeployTool = {\n    command: \"flatpak-builder\",\n    purpose: \"builds the Flatpak\",\n    isOptional: false,\n    isPresent: () =>\n        tryResolveExecutable(\"flatpak-builder\") !== undefined || isFlatpakRefInstalled(FLATPAK_BUILDER_REF),\n};\n\nconst FLATPAK_NODE_GENERATOR: DeployTool = {\n    command: FLATPAK_NODE_GENERATOR_COMMAND,\n    purpose: \"vendors the dependencies a Flathub build installs offline\",\n    isOptional: false,\n};\n\nconst FLATPAK_NODE_GENERATOR_PNPM: DeployTool = {\n    ...FLATPAK_NODE_GENERATOR,\n    isPresent: () => hasGeneratorPnpmSupport(),\n};\n\nconst STRIP: DeployTool = {\n    command: \"strip\",\n    purpose: \"would shrink the bundled Node.js by removing its symbols\",\n    isOptional: true,\n};\n\nconst TAR: DeployTool = {\n    command: \"tar\",\n    purpose: \"unpacks the downloaded Node.js and packaging tools\",\n    isOptional: false,\n};\n\nconst isFlatpakRefInstalled = (ref: string): boolean => {\n    const flatpak = tryResolveExecutable(FLATPAK.command);\n\n    if (flatpak === undefined) {\n        return false;\n    }\n\n    return spawnSync(flatpak, [\"info\", ref], { stdio: \"ignore\" }).status === 0;\n};\n\nconst hasGeneratorPnpmSupport = (): boolean => {\n    const generator = tryResolveExecutable(FLATPAK_NODE_GENERATOR_COMMAND);\n\n    if (generator === undefined) {\n        return false;\n    }\n\n    const help = spawnSync(generator, [\"--help\"], { encoding: \"utf8\" });\n\n    return help.error === undefined && help.output.join(\"\").includes(GENERATOR_PNPM_OPTION);\n};\n\nconst isToolPresent = (tool: DeployTool): boolean =>\n    tool.isPresent === undefined ? tryResolveExecutable(tool.command) !== undefined : tool.isPresent();\n\nconst uniqueTools = (tools: DeployTool[]): DeployTool[] =>\n    new Map(tools.map((tool) => [tool.command, tool])).values().toArray();\n\nconst probeTools = (tools: DeployTool[]): ToolReport => {\n    const missing = uniqueTools(tools).filter((tool) => !isToolPresent(tool));\n\n    return {\n        missingRequired: missing.filter((tool) => !tool.isOptional),\n        missingOptional: missing.filter((tool) => tool.isOptional),\n    };\n};\n\nconst pad = (text: string): string => text.padEnd(DETAIL_COLUMN);\n\nconst toolLines = (tool: DeployTool, hints: string[]): string[] => [\n    `  ${pad(tool.command)}${tool.purpose}`,\n    ...hints.map((hint) => `  ${pad(\"\")}${hint}`),\n];\n\nconst missingToolsMessage = (report: ToolReport): string => {\n    const family = detectPackageFamily();\n    const required = report.missingRequired.flatMap((tool) => toolLines(tool, installHints(tool.command, family)));\n    const count = report.missingRequired.length;\n    const plural = count === 1 ? \"tool is\" : \"tools are\";\n\n    return [\n        `Cannot deploy: ${String(count)} required ${plural} missing.`,\n        \"\",\n        ...required,\n        \"\",\n        \"Narrow the run with --target if you do not need every package format.\",\n    ].join(\"\\n\");\n};\n\nconst assertTools = (report: ToolReport): void => {\n    if (report.missingRequired.length > 0) {\n        throw new Error(missingToolsMessage(report));\n    }\n};\n\nconst warnMissingOptional = (report: ToolReport): void => {\n    for (const tool of report.missingOptional) {\n        warn(`${tool.command} is not installed: it ${tool.purpose}`);\n    }\n};\n\nexport {\n    APPSTREAMCLI,\n    FLATPAK_NODE_GENERATOR,\n    FLATPAK_NODE_GENERATOR_PNPM,\n    GENERATOR_PNPM_OPTION,\n    assertTools,\n    DESKTOP_FILE_VALIDATE,\n    FILE_TOOL,\n    FLATPAK,\n    FLATPAK_BUILDER,\n    probeTools,\n    STRIP,\n    TAR,\n    warnMissingOptional,\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/cli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Command-line tool and Vite plugin stack that scaffolds, develops, builds, and documents GTKX applications",
   "keywords": [
     "gtkx",
@@ -73,19 +73,19 @@
     "react-refresh": "^0.18.0",
     "vite": "^8.2.1",
     "yaml": "^2.9.0",
-    "@gtkx/codegen": "1.1.0",
-    "@gtkx/runtime": "1.1.0",
-    "@gtkx/mcp": "1.1.0",
-    "@gtkx/config": "1.1.0",
-    "@gtkx/utils": "1.1.0",
-    "create-gtkx": "1.1.0",
-    "@gtkx/vitest": "1.1.0"
+    "@gtkx/codegen": "1.2.0",
+    "@gtkx/config": "1.2.0",
+    "@gtkx/utils": "1.2.0",
+    "@gtkx/runtime": "1.2.0",
+    "@gtkx/mcp": "1.2.0",
+    "@gtkx/vitest": "1.2.0",
+    "create-gtkx": "1.2.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
     "@types/react-refresh": "^0.14.7",
     "vitest": "^4.1.10",
-    "@gtkx/testing": "1.1.0"
+    "@gtkx/testing": "1.2.0"
   },
   "peerDependencies": {
     "react": "^19"

package/src/codegen/report.ts

@@ -17,6 +17,10 @@ const formatCodegenResult = (result: RunCodegenResult, totalMs: number): string[
         details.push(`girPath=${result.girPath.join(":")}`);
     }
 
+    if (result.future && result.future.length > 0) {
+        details.push(`future=${result.future.join(", ")}`);
+    }
+
     details.push(
         `${String(result.namespaces)} namespaces, ${String(result.intrinsicElements)} intrinsic elements ` +
         `in ${String(result.duration)}ms (total ${String(totalMs)}ms)`,

package/src/codegen/run-codegen.ts

@@ -36,6 +36,7 @@ type RunCodegenResult = {
     girPath?: string[] | undefined;
     configFile?: string | undefined;
     libraries?: string[] | undefined;
+    future?: string[] | undefined;
 };
 
 type CodegenOptionsInput = {
@@ -43,6 +44,7 @@ type CodegenOptionsInput = {
     libraries: string[];
     girPath: string[];
     elements: Config["elements"];
+    isByteArrayTyped: boolean;
 };
 
 type PreparedCodegen = CodegenInputs & { isForced: boolean };
@@ -71,9 +73,10 @@ const removeShadowingStores = (cwd: string): void => {
     removeStores(getShadowingStorePaths(cwd));
 };
 
-const codegenOptions = ({ store, libraries, girPath, elements }: CodegenOptionsInput) => ({
+const codegenOptions = ({ store, libraries, girPath, elements, isByteArrayTyped }: CodegenOptionsInput) => ({
     libraries,
     girPath,
+    isByteArrayTyped,
     gi: {
         storeDir: store.giStoreDir,
         linkDir: store.giLinkDir,
@@ -94,6 +97,11 @@ const codegenOptions = ({ store, libraries, girPath, elements }: CodegenOptionsI
     userOmittedProps: resolveOmittedProps(elements),
 });
 
+const enabledFutureFlags = (config: Config): string[] =>
+    Object.entries(config.future ?? {})
+        .filter(([, value]) => value === true)
+        .map(([name]) => name);
+
 const disabledCodegenResult = (configFile: string): RunCodegenResult => ({
     isRegenerated: false,
     namespaces: 0,
@@ -153,6 +161,7 @@ const runCodegen = async (options: RunCodegenOptions = {}): Promise<RunCodegenRe
             libraries,
             girPath,
             elements: config.elements,
+            isByteArrayTyped: config.future?.v2ByteArrays === true,
         }),
         isForced,
     });
@@ -165,6 +174,7 @@ const runCodegen = async (options: RunCodegenOptions = {}): Promise<RunCodegenRe
         girPath,
         configFile,
         libraries,
+        future: enabledFutureFlags(config),
     };
 };
 

package/src/commands/docs.ts

@@ -78,6 +78,7 @@ const docs = defineCommand({
             props: builtin.props,
             omittedProps: mergeOmittedProps(builtin.omittedProps, resolveOmittedProps(config.elements)),
             isForced: args.force,
+            isByteArrayTyped: config.future?.v2ByteArrays === true,
         });
 
         if (!isRegenerated) {