@gtkx/cli 1.6.0 → 2.0.0-beta.2

package/src/deploy/targets/flatpak-source.ts

@@ -1,3 +1,4 @@
+import { isPathInside, toPosixPath } from "@gtkx/utils";
 import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { posix, relative, resolve } from "node:path";
 import type { DeployPayload, DeploySettings } from "../types.js";
@@ -11,7 +12,6 @@ import { executableModeFor } from "../payload/copy-tree.js";
 import { iconPathFor } from "../payload/icons.js";
 import { renderLauncher } from "../payload/launcher.js";
 import { licenseDestination, nodeLicenseDestination, NOTICES_FILENAME, noticesDestination } from "../payload/stage.js";
-import { isInside } from "../settings/paths.js";
 import { pnpmPathFor, type PnpmPin, pnpmSources } from "./flatpak-pnpm.js";
 import { DESTINATION, type FlatpakModule, postInstallCommands, validationCommands } from "./flatpak-prebuilt.js";
 import {
@@ -46,7 +46,7 @@ const inlineSource = (fileName: string, contents: string): FlatpakModule => ({
 });
 
 const projectRelative = (settings: DeploySettings, path: string): string =>
-    relative(settings.paths.root, path).replaceAll("\\", "/");
+    toPosixPath(relative(settings.paths.root, path));
 
 const shellArgument = (value: string): string =>
     PLAIN_ARGUMENT.test(value) ? value : `'${value.split("'").join(QUOTE_ESCAPE)}'`;
@@ -155,7 +155,7 @@ const schemaInstallCommands = (settings: DeploySettings): string[] =>
 const iconInstallCommand = (settings: DeploySettings, source: string, rel: string): string =>
     installCommand(
         projectRelative(settings, source),
-        `${DESTINATION}/share/icons/${shellArgument(rel.replaceAll("\\", "/"))}`,
+        `${DESTINATION}/share/icons/${shellArgument(toPosixPath(rel))}`,
         "m644",
     );
 
@@ -177,7 +177,7 @@ const assertInsideProject = (settings: DeploySettings, installed: InstalledFile)
     const { resolved } = installed;
     const target = existsSync(resolved) ? realpathSync(resolved) : resolved;
 
-    if (isInside(settings.paths.root, target)) {
+    if (isPathInside(settings.paths.root, target)) {
         return;
     }
 
@@ -244,6 +244,17 @@ const appendPathFor = (settings: DeploySettings, pin: PnpmPin | null, nodeExtens
         ? `${nodeExtensionPath}/bin`
         : `${pnpmPathFor(moduleDirFor(settings))}:${nodeExtensionPath}/bin`;
 
+const sourceBuildCommand = (settings: DeploySettings): string => {
+    const configFile = projectRelative(settings, settings.configFile);
+    assertInsideProject(settings, {
+        destination: "the Flatpak build configuration",
+        source: configFile,
+        resolved: settings.configFile,
+    });
+
+    return `npx gtkx build --config ${pathArgument(configFile)}`;
+};
+
 const flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {
     const settings = payload.settings;
     const manager = detectPackageManager(settings);
@@ -271,14 +282,14 @@ const flatpakSourceModule = (payload: DeployPayload): FlatpakModule => {
         ],
         "build-commands": [
             installCommandFor(settings, manager),
-            "npx gtkx build",
+            sourceBuildCommand(settings),
             ...runtimeInstallCommands(settings, nodeExtensionPath),
+            ...extraFileInstallCommands(settings),
             ...metadataInstallCommands(settings),
             ...schemaInstallCommands(settings),
             ...iconInstallCommands(settings),
             ...licenseInstallCommands(settings),
             ...noticesInstallCommands(settings),
-            ...extraFileInstallCommands(settings),
             ...(settings.deploy.flatpak?.buildCommands ?? []),
             ...validationCommands(settings),
         ],

package/src/deploy/targets/flatpak-sources.ts

@@ -26,7 +26,7 @@ type GitRevision = {
 const GENERATED_SOURCES = "generated-sources.json";
 const COMMIT_PEEL = "^{commit}";
 const FETCHABLE_URL = /^https?:\/\//;
-const DEFAULT_NODE_EXTENSION = "org.freedesktop.Sdk.Extension.node24";
+const DEFAULT_NODE_EXTENSION = "org.freedesktop.Sdk.Extension.node26";
 const NODE_EXTENSION_PREFIX = "org.freedesktop.Sdk.Extension.";
 const SDK_EXTENSION_ROOT = "/usr/lib/sdk";
 

package/src/deploy/types.ts

@@ -114,6 +114,7 @@ type DeployPaths = {
 
 type DeploySettings = {
     applicationId: string;
+    configFile: string;
     binaryName: string;
     name: string;
     genericName: string | null;

package/src/dev/headless.ts

@@ -0,0 +1,40 @@
+import { MCP_SOCKET_PATH_ENV, resolveMcpSocketPath } from "@gtkx/mcp/internal";
+import { resolveHeadlessOptions, startHeadlessDisplay } from "@gtkx/vitest/headless";
+
+const restoreEnvironment = (name: string, value: string | undefined): void => {
+    if (value === undefined) {
+        Reflect.deleteProperty(process.env, name);
+    } else {
+        process.env[name] = value;
+    }
+};
+
+const startHeadlessDevDisplay = async (size?: string): Promise<() => void> => {
+    const previousSocketPath = process.env[MCP_SOCKET_PATH_ENV];
+    process.env[MCP_SOCKET_PATH_ENV] = resolveMcpSocketPath();
+
+    try {
+        const stopDisplay = await startHeadlessDisplay(resolveHeadlessOptions({ ...(size !== undefined && { size }) }));
+        let isStopped = false;
+
+        const stop = (): void => {
+            if (isStopped) {
+                return;
+            }
+
+            isStopped = true;
+            process.removeListener("exit", stop);
+            stopDisplay();
+            restoreEnvironment(MCP_SOCKET_PATH_ENV, previousSocketPath);
+        };
+
+        process.once("exit", stop);
+
+        return stop;
+    } catch (error) {
+        restoreEnvironment(MCP_SOCKET_PATH_ENV, previousSocketPath);
+        throw error;
+    }
+};
+
+export { startHeadlessDevDisplay };

package/src/dev/runner-deps.ts

@@ -87,7 +87,7 @@ const defaultDevRunnerDeps = (): DevRunnerDeps => ({
     staleExportName,
     readFileRevision,
     plugins: (entryPath) => [
-        ...gtkxVitePlugins(DEV_MODE, entryPath),
+        ...gtkxVitePlugins({ mode: DEV_MODE, entryPath }),
         ...gtkxFastRefresh(),
         gtkxReactDomPrebundle(),
     ],

package/src/dev/runner-main.ts

@@ -1,5 +1,4 @@
 import { loadConfig } from "@gtkx/config";
-import { resolveFuture } from "@gtkx/config/internal";
 import { error } from "@gtkx/utils";
 import { resolve } from "node:path";
 import { DEV_ENTRY_ENV } from "./entry-env.js";
@@ -25,7 +24,7 @@ const main = async (): Promise<void> => {
 
     const { config, root } = await loadConfig(cwd, { mode: "development" });
     prepareDevLocaleDir(root, config.applicationId);
-    prepareDevSchemaDir(root, resolveFuture(config.future).isResourceImported);
+    prepareDevSchemaDir(root);
     prepareDevIconDir(root, config.applicationId, config.applicationIcon);
     const entryPath = resolve(cwd, entryArg);
     const { defaultDevRunnerDeps } = await import("./runner-deps.js");

package/src/dev/schema-dir.ts

@@ -1,9 +1,7 @@
-import { resolveDataDir } from "../internal/data-dir.js";
 import { prependSchemaDir, stageAndCompileProjectSchemas } from "../settings/schema.js";
 
-const prepareDevSchemaDir = (root: string, isV2ResourceImports: boolean): string | null => {
-    const dataDir = isV2ResourceImports ? null : resolveDataDir(root);
-    const dir = stageAndCompileProjectSchemas(root, dataDir);
+const prepareDevSchemaDir = (root: string): string | null => {
+    const dir = stageAndCompileProjectSchemas(root);
 
     if (dir === null) {
         return null;

package/src/i18n/catalogs.ts

@@ -1,3 +1,4 @@
+import { isPathInside } from "@gtkx/utils";
 import {
     chmodSync,
     existsSync,
@@ -198,7 +199,7 @@ const isCatalogSource = (root: string, path: string): boolean => {
     const sourcePath = isAbsolute(path) ? resolve(path) : resolve(projectRoot, path);
     const poPath = relative(join(projectRoot, PO_DIRNAME), sourcePath);
 
-    if (poPath === "" || poPath === ".." || poPath.startsWith(`..${sep}`) || isAbsolute(poPath)) {
+    if (!isPathInside(join(projectRoot, PO_DIRNAME), sourcePath)) {
         return false;
     }
 

package/src/i18n/metadata-templates.ts

@@ -1,3 +1,4 @@
+import { toPosixPath } from "@gtkx/utils";
 import { join, relative } from "node:path";
 import type { CatalogProject } from "./catalogs.js";
 
@@ -14,7 +15,7 @@ const METADATA_TEMPLATE_DIRNAME = ".gtkx-metadata";
 
 const metadataTemplateFile = (project: CatalogProject, kind: MetadataTemplateKind): MetadataTemplateFile => {
     const path = join(project.poDir, METADATA_TEMPLATE_DIRNAME, `${project.domain}.template.${kind}`);
-    const relativePath = relative(project.root, path).replaceAll("\\", "/");
+    const relativePath = toPosixPath(relative(project.root, path));
 
     return { kind, path, relativePath };
 };