@gtkx/cli 1.4.0 → 1.6.0

package/src/deploy/tools.ts

@@ -56,6 +56,36 @@ const FLATPAK_NODE_GENERATOR_PNPM: DeployTool = {
     isPresent: () => hasGeneratorPnpmSupport(),
 };
 
+const MSGFMT: DeployTool = {
+    command: "msgfmt",
+    purpose: "compiles the gettext catalogs and localized metadata",
+    isOptional: false,
+};
+
+const MSGGREP: DeployTool = {
+    command: "msggrep",
+    purpose: "retains generated metadata while refreshing the catalog template",
+    isOptional: false,
+};
+
+const MSGINIT: DeployTool = {
+    command: "msginit",
+    purpose: "initializes newly listed gettext catalogs",
+    isOptional: false,
+};
+
+const MSGMERGE: DeployTool = {
+    command: "msgmerge",
+    purpose: "synchronizes translations with the catalog template",
+    isOptional: false,
+};
+
+const XGETTEXT: DeployTool = {
+    command: "xgettext",
+    purpose: "extracts the gettext catalog template",
+    isOptional: false,
+};
+
 const STRIP: DeployTool = {
     command: "strip",
     purpose: "would shrink the bundled Node.js by removing its symbols",
@@ -115,11 +145,9 @@ const toolLines = (tool: DeployTool, hints: string[]): string[] => [
 const missingToolsMessage = (report: ToolReport): string => {
     const family = detectPackageFamily();
     const required = report.missingRequired.flatMap((tool) => toolLines(tool, installHints(tool.command, family)));
-    const count = report.missingRequired.length;
-    const plural = count === 1 ? "tool is" : "tools are";
 
     return [
-        `Cannot deploy: ${String(count)} required ${plural} missing.`,
+        "Cannot deploy without these tools:",
         "",
         ...required,
         "",
@@ -149,8 +177,13 @@ export {
     FILE_TOOL,
     FLATPAK,
     FLATPAK_BUILDER,
+    MSGFMT,
+    MSGGREP,
+    MSGINIT,
+    MSGMERGE,
     probeTools,
     STRIP,
     TAR,
     warnMissingOptional,
+    XGETTEXT,
 };

package/src/dev/locale-dir.ts

@@ -0,0 +1,22 @@
+import { compileCatalogs, resolveCatalogProject, synchronizeCatalogs } from "../i18n/catalogs.js";
+import { createRetainedStagingDir } from "../internal/staging-dir.js";
+
+const LOCALE_DIR_ENV = "GTKX_LOCALE_DIR";
+const localeDir = createRetainedStagingDir("locale");
+
+const prepareDevLocaleDir = (root: string, domain: string): string | null => {
+    const project = resolveCatalogProject(root, domain);
+
+    if (project === null) {
+        return null;
+    }
+
+    const outputDir = localeDir.retain();
+    synchronizeCatalogs(project);
+    compileCatalogs(project, outputDir);
+    process.env[LOCALE_DIR_ENV] = outputDir;
+
+    return outputDir;
+};
+
+export { prepareDevLocaleDir };

package/src/dev/runner-main.ts

@@ -1,8 +1,10 @@
 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";
 import { prepareDevIconDir } from "./icon-dir.js";
+import { prepareDevLocaleDir } from "./locale-dir.js";
 import { createDevRunner } from "./runner.js";
 import { prepareDevSchemaDir } from "./schema-dir.js";
 
@@ -22,7 +24,8 @@ const main = async (): Promise<void> => {
     }
 
     const { config, root } = await loadConfig(cwd, { mode: "development" });
-    prepareDevSchemaDir(root, config.future?.v2ResourceImports === true);
+    prepareDevLocaleDir(root, config.applicationId);
+    prepareDevSchemaDir(root, resolveFuture(config.future).isResourceImported);
     prepareDevIconDir(root, config.applicationId, config.applicationIcon);
     const entryPath = resolve(cwd, entryArg);
     const { defaultDevRunnerDeps } = await import("./runner-deps.js");

package/src/dev/runner.ts

@@ -1,6 +1,7 @@
 import type { ApplicationInstance } from "@gtkx/runtime/internal";
 import type { InlineConfig, Plugin } from "vite";
 import { error, warn } from "@gtkx/utils";
+import { isCatalogSource } from "../i18n/catalogs.js";
 import { loadModuleExclusively, withExclusiveLoad } from "../internal/module-loads.js";
 import { createChangeQueue, type WatchedChange } from "./change-queue.js";
 import { createFailureTracker, type FailureTracker } from "./failure-tracker.js";
@@ -374,6 +375,13 @@ const applyChange = async (session: DevSession, change: WatchedChange): Promise<
         return;
     }
 
+    if (isCatalogSource(session.server.config.root, change.path)) {
+        session.deps.log(`Translation catalog changed: ${change.path}`);
+        await requestRestart(session);
+
+        return;
+    }
+
     if (isServerConfigFile(session.server.config, change.path)) {
         await restartForServerConfig(session, change.path);
 

package/src/dev/vite-dev-server.ts

@@ -20,6 +20,7 @@ type DevServerConfig = {
     configFileDependencies: string[];
     envDir: string | false;
     mode: string;
+    root: string;
 };
 
 type DevServer = {