@gtkx/cli 1.6.0 → 2.0.0-beta.1

package/src/deploy/settings/build-manifest.ts

@@ -1,6 +1,6 @@
-import { isRecord, sortStrings } from "@gtkx/utils";
+import { isPathInside, isRecord, sortStrings } from "@gtkx/utils";
 import { existsSync, readFileSync, statSync } from "node:fs";
-import { isAbsolute, join, relative, resolve, sep } from "node:path";
+import { isAbsolute, join, resolve } from "node:path";
 import type { DeploySettings } from "../types.js";
 import {
     BUILD_MANIFEST_FILENAME,
@@ -67,19 +67,7 @@ const parseBuildManifest = (value: unknown, path: string): BuildManifest => {
     };
 };
 
-const isFile = (path: string): boolean => {
-    try {
-        return statSync(path, { throwIfNoEntry: false })?.isFile() === true;
-    } catch {
-        return false;
-    }
-};
-
-const isInsideProject = (root: string, filePath: string): boolean => {
-    const rel = relative(root, filePath);
-
-    return rel.length > 0 && rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
-};
+const isFile = (path: string): boolean => statSync(path, { throwIfNoEntry: false })?.isFile() === true;
 
 const resolveRecordedSchema = (root: string, manifestPath: string, entry: string): string => {
     if (isAbsolute(entry) || !entry.endsWith(SCHEMA_SUFFIX)) {
@@ -88,7 +76,7 @@ const resolveRecordedSchema = (root: string, manifestPath: string, entry: string
 
     const filePath = resolve(root, entry);
 
-    if (!isInsideProject(root, filePath)) {
+    if (!isPathInside(root, filePath)) {
         throw new Error(`Cannot deploy: ${manifestPath} records a GSettings schema outside the project.`);
     }
 

package/src/deploy/settings/libraries.ts

@@ -3,10 +3,8 @@ import {
     resolveLibraries as expandLibraries,
     type GeneratedLibraries,
     readGeneratedLibraries,
-    resolveGirPath,
     resolveStore,
 } from "@gtkx/codegen";
-import { resolveFuture } from "@gtkx/config/internal";
 
 type ResolvedLibraries = {
     libraries: string[];
@@ -21,28 +19,9 @@ const generatedLibraries = (root: string): GeneratedLibraries | null => {
     }
 };
 
-const discoveredLibraries = (config: Config, isAdwaitaDefault: boolean): string[] | null => {
-    try {
-        return expandLibraries(config.libraries, resolveGirPath(config.girPath), isAdwaitaDefault);
-    } catch {
-        return null;
-    }
-};
-
-const configLibraries = (config: Config): string[] => {
-    const { isAdwaitaDefault } = resolveFuture(config.future);
-    const libraries = config.libraries;
-
-    if (Array.isArray(libraries)) {
-        return expandLibraries(libraries, [], isAdwaitaDefault);
-    }
-
-    return discoveredLibraries(config, isAdwaitaDefault) ?? expandLibraries(undefined, [], isAdwaitaDefault);
-};
-
 const resolveLibraries = (root: string, config: Config): ResolvedLibraries => {
     const generated = generatedLibraries(root);
-    const libraries = generated?.libraries ?? configLibraries(config);
+    const libraries = generated?.libraries ?? expandLibraries(config.libraries);
     const deploy = config.deploy ?? {};
 
     return {

package/src/deploy/settings/paths.ts

@@ -1,6 +1,7 @@
 import type { Config } from "@gtkx/config";
+import { isPathInside } from "@gtkx/utils";
 import { statSync } from "node:fs";
-import { isAbsolute, join, relative, resolve } from "node:path";
+import { join, resolve } from "node:path";
 import type { DeployConfig, DeployPaths } from "../types.js";
 import { resolveApplicationIcon } from "../../internal/icon-path.js";
 
@@ -16,30 +17,19 @@ const DEFAULT_OUT_DIR = "build";
 const DIST_DIR = "dist";
 const LICENSE_CANDIDATES = ["LICENSE", "LICENSE.md", "LICENSE.txt", "COPYING", "COPYING.md"];
 
-const isInside = (parent: string, candidate: string): boolean => {
-    const rel = relative(parent, candidate);
-
-    return rel.length > 0 && !rel.startsWith("..") && !isAbsolute(rel);
-};
-
 const resolveOutDir = ({ root, deploy, outDirOverride }: PathsRequest): string => {
     const configured = outDirOverride ?? deploy.outDir ?? DEFAULT_OUT_DIR;
     const outDir = resolve(root, configured);
 
-    if (!isInside(root, outDir)) {
+    if (!isPathInside(root, outDir)) {
         throw new Error(`Cannot use "${configured}" as the deploy output directory: it is outside ${root}`);
     }
 
     return outDir;
 };
 
-const existingFile = (path: string): string | null => {
-    try {
-        return statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;
-    } catch {
-        return null;
-    }
-};
+const existingFile = (path: string): string | null =>
+    statSync(path, { throwIfNoEntry: false })?.isFile() === true ? path : null;
 
 const resolveLicenseFile = (root: string, configured: string | undefined): string | null => {
     if (configured !== undefined) {
@@ -75,4 +65,4 @@ const resolvePaths = (request: PathsRequest): DeployPaths => {
     };
 };
 
-export { isInside, resolvePaths };
+export { resolvePaths };

package/src/deploy/settings/screenshots.ts

@@ -1,3 +1,4 @@
+import hostedGitInfo from "hosted-git-info";
 import type { DeployConfig, DeployScreenshot } from "../types.js";
 import { gitRemoteUrl, runGit } from "../git.js";
 
@@ -6,23 +7,9 @@ type ScreenshotRequest = {
     deploy: DeployConfig;
 };
 
-type RemoteParts = {
-    host: string;
-    owner: string;
-    repo: string;
-};
-
 const DEFAULT_BRANCH = "main";
-const GIT_SUFFIX = ".git";
-const PORTED_HOST = /^([^/]*):\d+(?=\/|$)/;
-const SCHEME_SEPARATOR = "://";
 const TRAILING_SLASH = "/";
 
-const RAW_BASE_BY_HOST: Record<string, (owner: string, repo: string, branch: string) => string> = {
-    "github.com": (owner, repo, branch) => `https://raw.githubusercontent.com/${owner}/${repo}/${branch}`,
-    "gitlab.com": (owner, repo, branch) => `https://gitlab.com/${owner}/${repo}/-/raw/${branch}`,
-};
-
 const readRepositoryPrefix = (root: string): string =>
     trimTrailingSlash(runGit(root, ["rev-parse", "--show-prefix"]) ?? "");
 
@@ -35,29 +22,6 @@ const trimLeadingSlash = (value: string): string => {
     return withoutDot.startsWith(TRAILING_SLASH) ? withoutDot.slice(1) : withoutDot;
 };
 
-const afterMarker = (value: string, marker: string): string => {
-    const index = value.indexOf(marker);
-
-    return index === -1 ? value : value.slice(index + marker.length);
-};
-
-const normalizeLocation = (trimmed: string): string => {
-    const location = afterMarker(afterMarker(trimmed, SCHEME_SEPARATOR), "@");
-
-    return trimmed.includes(SCHEME_SEPARATOR) ? location.replace(PORTED_HOST, "$1") : location.replace(":", "/");
-};
-
-const parseRemote = (remote: string): RemoteParts | null => {
-    const trimmed = remote.endsWith(GIT_SUFFIX) ? remote.slice(0, -GIT_SUFFIX.length) : remote;
-    const [host, owner, repo, ...extra] = normalizeLocation(trimmed).split("/");
-
-    if (repo === undefined || extra.length > 0) {
-        return null;
-    }
-
-    return { host: host ?? "", owner: owner ?? "", repo };
-};
-
 const readDefaultBranch = (root: string): string => {
     const head = runGit(root, ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]);
 
@@ -70,16 +34,16 @@ const readDefaultBranch = (root: string): string => {
     return separator === -1 ? head : head.slice(separator + 1);
 };
 
-const baseForRemote = (remote: string, branch: string): string | null => {
-    const parts = parseRemote(remote);
+const baseForRemote = (root: string, remote: string): string | null => {
+    const repository = hostedGitInfo.fromUrl(remote);
 
-    if (parts === null) {
+    if (repository === undefined || (repository.type !== "github" && repository.type !== "gitlab")) {
         return null;
     }
 
-    const build = RAW_BASE_BY_HOST[parts.host];
-
-    return build === undefined ? null : build(parts.owner, parts.repo, branch);
+    return trimTrailingSlash(
+        repository.file(readRepositoryPrefix(root), { committish: readDefaultBranch(root) }),
+    );
 };
 
 const resolveScreenshotBaseUrl = ({ root, deploy }: ScreenshotRequest): string | null => {
@@ -88,10 +52,8 @@ const resolveScreenshotBaseUrl = ({ root, deploy }: ScreenshotRequest): string |
     }
 
     const remote = gitRemoteUrl(root);
-    const base = remote === null ? null : baseForRemote(remote, readDefaultBranch(root));
-    const prefix = base === null ? "" : readRepositoryPrefix(root);
 
-    return base === null || prefix.length === 0 ? base : `${base}/${prefix}`;
+    return remote === null ? null : baseForRemote(root, remote);
 };
 
 const urlForScreenshot = (file: string, baseUrl: string | null): string => {

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

@@ -9,12 +9,12 @@ type PnpmPin = {
     sha512: string;
 };
 
-const PNPM_VERSION = "11.22.0";
+const PNPM_VERSION = "11.25.0";
 const PNPM_MAJOR = 11;
-const PNPM_MINOR = 22;
+const PNPM_MINOR = 25;
 
-const PNPM_SHA512 = "1ff870c4c6133dfd88fb2afc46dd13d47f09c9794b438c6fdb47ca98caf3bc16381ee0be9" +
-    "3a091b8e3824cf01f889f46d7d9e20910fb0be1ab0fb5baa80dd621";
+const PNPM_SHA512 = "5cde925b4f075f725eb71fbae18a42ffe784524789f19b61c731cb8721ec28aaee160e01a" +
+    "8d5af4fedb2a42cdbf300efe23db356b0d4a17b4d63e11f8ab7c956";
 
 const PNPM_DIR = "flatpak-pnpm";
 const PNPM_COMMAND = "pnpm";

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;
     }
 

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/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 };
 };