@gtkx/cli 1.4.0 → 1.6.0

package/dist/vite-plugins/index.js

@@ -1,18 +1,21 @@
 import { createConfigLoader } from "@gtkx/config/internal";
 import createConfigPlugin from "@gtkx/config/vite-plugin";
+import { gtkxAnimated } from "./animated.js";
 import { gtkxAssetImports } from "./asset-imports.js";
 import { gtkxBuiltUrl } from "./built-url.js";
 import { gtkxCss } from "./css.js";
+import { gtkxI18n } from "./i18n.js";
 import { gtkxIcons } from "./icons.js";
 import { gtkxReactCompiler } from "./react-compiler.js";
 import { gtkxResources } from "./resources.js";
 import { gtkxSettings } from "./settings.js";
 import { gtkxStoreLinks } from "./store-links.js";
 import { gtkxUndeclaredLibrary } from "./undeclared-library.js";
-const gtkxVitePlugins = (mode, entryPath, buildManifest) => {
+const gtkxVitePlugins = (mode, entryPath, buildManifest, shouldPreserveI18nMetadata = true) => {
     const loadConfig = createConfigLoader(mode === undefined ? {} : { mode });
     return [
         createConfigPlugin({ name: "gtkx:config", loadConfig }),
+        ...(entryPath === undefined ? [] : [gtkxI18n(entryPath, loadConfig, shouldPreserveI18nMetadata)]),
         gtkxStoreLinks(),
         gtkxUndeclaredLibrary(loadConfig),
         gtkxSettings(loadConfig, buildManifest),
@@ -21,6 +24,7 @@ const gtkxVitePlugins = (mode, entryPath, buildManifest) => {
         gtkxBuiltUrl(),
         gtkxResources(loadConfig, entryPath),
         gtkxCss(),
+        gtkxAnimated(loadConfig),
         gtkxReactCompiler(loadConfig),
     ];
 };

package/dist/vite-plugins/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vite-plugins/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,eAAe,GAAG,CACpB,IAAa,EACb,SAAkB,EAClB,aAAsC,EAC9B,EAAE;IACV,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1E,OAAO;QACH,kBAAkB,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;QACvD,cAAc,EAAE;QAChB,qBAAqB,CAAC,UAAU,CAAC;QACjC,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC;QACvC,SAAS,CAAC,UAAU,CAAC;QACrB,gBAAgB,CAAC,UAAU,CAAC;QAC5B,YAAY,EAAE;QACd,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC;QACpC,OAAO,EAAE;QACT,iBAAiB,CAAC,UAAU,CAAC;KAChC,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import type { Plugin } from \"vite\";\nimport { createConfigLoader } from \"@gtkx/config/internal\";\nimport createConfigPlugin from \"@gtkx/config/vite-plugin\";\nimport type { BuildManifestCollector } from \"../internal/build-manifest.js\";\nimport { gtkxAssetImports } from \"./asset-imports.js\";\nimport { gtkxBuiltUrl } from \"./built-url.js\";\nimport { gtkxCss } from \"./css.js\";\nimport { gtkxIcons } from \"./icons.js\";\nimport { gtkxReactCompiler } from \"./react-compiler.js\";\nimport { gtkxResources } from \"./resources.js\";\nimport { gtkxSettings } from \"./settings.js\";\nimport { gtkxStoreLinks } from \"./store-links.js\";\nimport { gtkxUndeclaredLibrary } from \"./undeclared-library.js\";\n\nconst gtkxVitePlugins = (\n    mode?: string,\n    entryPath?: string,\n    buildManifest?: BuildManifestCollector,\n): Plugin[] => {\n    const loadConfig = createConfigLoader(mode === undefined ? {} : { mode });\n\n    return [\n        createConfigPlugin({ name: \"gtkx:config\", loadConfig }),\n        gtkxStoreLinks(),\n        gtkxUndeclaredLibrary(loadConfig),\n        gtkxSettings(loadConfig, buildManifest),\n        gtkxIcons(loadConfig),\n        gtkxAssetImports(loadConfig),\n        gtkxBuiltUrl(),\n        gtkxResources(loadConfig, entryPath),\n        gtkxCss(),\n        gtkxReactCompiler(loadConfig),\n    ];\n};\n\nexport { gtkxVitePlugins };\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/vite-plugins/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,eAAe,GAAG,CACpB,IAAa,EACb,SAAkB,EAClB,aAAsC,EACtC,0BAA0B,GAAG,IAAI,EACzB,EAAE;IACV,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1E,OAAO;QACH,kBAAkB,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;QACvD,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,EAAE,0BAA0B,CAAC,CAAC,CAAC;QACjG,cAAc,EAAE;QAChB,qBAAqB,CAAC,UAAU,CAAC;QACjC,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC;QACvC,SAAS,CAAC,UAAU,CAAC;QACrB,gBAAgB,CAAC,UAAU,CAAC;QAC5B,YAAY,EAAE;QACd,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC;QACpC,OAAO,EAAE;QACT,YAAY,CAAC,UAAU,CAAC;QACxB,iBAAiB,CAAC,UAAU,CAAC;KAChC,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import type { Plugin } from \"vite\";\nimport { createConfigLoader } from \"@gtkx/config/internal\";\nimport createConfigPlugin from \"@gtkx/config/vite-plugin\";\nimport type { BuildManifestCollector } from \"../internal/build-manifest.js\";\nimport { gtkxAnimated } from \"./animated.js\";\nimport { gtkxAssetImports } from \"./asset-imports.js\";\nimport { gtkxBuiltUrl } from \"./built-url.js\";\nimport { gtkxCss } from \"./css.js\";\nimport { gtkxI18n } from \"./i18n.js\";\nimport { gtkxIcons } from \"./icons.js\";\nimport { gtkxReactCompiler } from \"./react-compiler.js\";\nimport { gtkxResources } from \"./resources.js\";\nimport { gtkxSettings } from \"./settings.js\";\nimport { gtkxStoreLinks } from \"./store-links.js\";\nimport { gtkxUndeclaredLibrary } from \"./undeclared-library.js\";\n\nconst gtkxVitePlugins = (\n    mode?: string,\n    entryPath?: string,\n    buildManifest?: BuildManifestCollector,\n    shouldPreserveI18nMetadata = true,\n): Plugin[] => {\n    const loadConfig = createConfigLoader(mode === undefined ? {} : { mode });\n\n    return [\n        createConfigPlugin({ name: \"gtkx:config\", loadConfig }),\n        ...(entryPath === undefined ? [] : [gtkxI18n(entryPath, loadConfig, shouldPreserveI18nMetadata)]),\n        gtkxStoreLinks(),\n        gtkxUndeclaredLibrary(loadConfig),\n        gtkxSettings(loadConfig, buildManifest),\n        gtkxIcons(loadConfig),\n        gtkxAssetImports(loadConfig),\n        gtkxBuiltUrl(),\n        gtkxResources(loadConfig, entryPath),\n        gtkxCss(),\n        gtkxAnimated(loadConfig),\n        gtkxReactCompiler(loadConfig),\n    ];\n};\n\nexport { gtkxVitePlugins };\n"]}

package/dist/vite-plugins/resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/resources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAA6B,MAAM,EAAuD,MAAM,MAAM,CAAC;AAqpDnH,iBAAS,aAAa,CAAC,UAAU,GAAE,YAAmC,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CA2BlG;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/resources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAc,MAAM,EAAuD,MAAM,MAAM,CAAC;AAylDpG,iBAAS,aAAa,CAAC,UAAU,GAAE,YAAmC,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAyBlG;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/vite-plugins/resources.js

@@ -1,4 +1,4 @@
-import { createConfigLoader, resourceBasePath } from "@gtkx/config/internal";
+import { createConfigLoader, resolveFuture, resourceBasePath } from "@gtkx/config/internal";
 import { error, info, isRecord, sortStrings } from "@gtkx/utils";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, posix, relative, sep } from "node:path";
@@ -6,7 +6,7 @@ import { parseSync } from "vite";
 import { resolveDataDir } from "../internal/data-dir.js";
 import { listFilesRecursive } from "../internal/list-files.js";
 import { runCliTool } from "../internal/run-cli-tool.js";
-import { parseRuntimeImportsIn } from "../internal/source-imports.js";
+import { parseRuntimeImportsIn, sourceLanguage } from "../internal/source-imports.js";
 import { createRetainedStagingDir, withStagingDir } from "../internal/staging-dir.js";
 import { ASSET_RE } from "./asset-extensions.js";
 import { DATA_PREFIX, isBareRelativeAsset, isDataAsset, parseIconSpecifier, parseResourceSpecifier, } from "./asset-specifier.js";
@@ -49,16 +49,6 @@ const STOCK_ICON_CONTEXTS = new Set([
 ]);
 const ICON_SIZE_RE = /^([1-9]\d*)x\1(?:@[1-9]\d*)?$/;
 const RESERVED_ICON_NAMES = new Set(["", ".", ".."]);
-const SOURCE_LANGUAGES = new Map([
-    [".cjs", "jsx"],
-    [".cts", "ts"],
-    [".js", "jsx"],
-    [".jsx", "jsx"],
-    [".mjs", "jsx"],
-    [".mts", "ts"],
-    [".ts", "ts"],
-    [".tsx", "tsx"],
-]);
 const toForwardSlashes = (value) => value.replaceAll(/[/\\]/g, "/");
 const isWithin = (root, path) => {
     const rel = relative(root, path);
@@ -159,7 +149,7 @@ const derivedIconEntry = (state, sourcePath, requestedName) => {
     return { iconIdentity, iconName, resourcePath };
 };
 const hasSideEffectIconImport = (code, id) => {
-    const lang = SOURCE_LANGUAGES.get(extname(stripQuery(id)).toLowerCase());
+    const lang = sourceLanguage(stripQuery(id));
     if (lang === undefined || !code.includes("?icon")) {
         return false;
     }
@@ -251,14 +241,6 @@ const registerDevAsset = (state) => {
     }
 };
 const importerKey = (importer) => stripQuery(importer);
-const claimEntry = (state, resourcePath, importer) => {
-    if (importer === undefined) {
-        return;
-    }
-    const importers = state.entryImporters.get(resourcePath) ?? new Set();
-    importers.add(importerKey(importer));
-    state.entryImporters.set(resourcePath, importers);
-};
 const trackBundledSpecifier = (state, importer, source) => {
     if (importer === undefined) {
         return;
@@ -268,32 +250,22 @@ const trackBundledSpecifier = (state, importer, source) => {
     specifiers.add(source);
     state.bundledSpecifiers.set(key, specifiers);
 };
-const claimIcon = (state, iconIdentity, importer) => {
-    if (importer === undefined) {
-        return;
-    }
-    const importers = state.iconImporters.get(iconIdentity) ?? new Set();
-    importers.add(importerKey(importer));
-    state.iconImporters.set(iconIdentity, importers);
-};
 const createResourceEntry = (sourcePath, resourcePath) => ({
     sourcePath,
     stagedRelPath: resourcePath.replace(/^\/+/, ""),
     resourcePath,
 });
-const activateEntry = (state, entry, importer) => {
+const activateEntry = (state, entry) => {
     const existing = state.entries.get(entry.resourcePath);
     if (existing !== undefined) {
         if (existing.sourcePath !== entry.sourcePath) {
             throw new Error(`${existing.sourcePath} and ${entry.sourcePath} both resolve to the GResource path ` +
                 entry.resourcePath);
         }
-        claimEntry(state, entry.resourcePath, importer);
         return existing;
     }
     state.entries.set(entry.resourcePath, entry);
     state.sourcePaths.add(entry.sourcePath);
-    claimEntry(state, entry.resourcePath, importer);
     return entry;
 };
 const isDeclarativeImporter = (state, importer) => !state.isBuild && state.isV2 && importer !== undefined;
@@ -344,10 +316,6 @@ const declareResolvedIcon = (state, importer, iconIdentity, entry) => {
         declareIcon(state, importer, iconIdentity, entry);
     }
 };
-const activateIcon = (state, importer, iconIdentity, entry) => {
-    state.iconOwners.set(iconIdentity, entry);
-    claimIcon(state, iconIdentity, importer);
-};
 const registerEntry = (state, absPath, rel, importer) => {
     const resourcePath = validateResourcePath(rel.startsWith("/") ? rel : `${state.prefix}/${rel}`);
     let entry = createResourceEntry(absPath, resourcePath);
@@ -357,7 +325,7 @@ const registerEntry = (state, absPath, rel, importer) => {
             return entry;
         }
     }
-    return activateEntry(state, entry, importer);
+    return activateEntry(state, entry);
 };
 const registerIconEntry = (state, sourcePath, derived, importer) => {
     const shouldActivate = !isDeclarativeImporter(state, importer) ||
@@ -368,7 +336,7 @@ const registerIconEntry = (state, sourcePath, derived, importer) => {
     const entry = registerEntry(state, sourcePath, derived.resourcePath, importer);
     declareResolvedIcon(state, importer, derived.iconIdentity, entry);
     if (shouldActivate) {
-        activateIcon(state, importer, derived.iconIdentity, entry);
+        state.iconOwners.set(derived.iconIdentity, entry);
     }
     return entry;
 };
@@ -554,8 +522,7 @@ const isSameSpecifiers = (left, right) => left === undefined
 const bundledSpecifiersIn = (imports) => new Set(imports
     .filter((entry) => parseResourceSpecifier(entry.source) !== null || parseIconSpecifier(entry.source) !== null)
     .map((entry) => entry.source));
-const isSourceModule = (file) => !file.endsWith(".d.ts") && !file.endsWith(".d.cts") && !file.endsWith(".d.mts") &&
-    SOURCE_LANGUAGES.has(extname(file).toLowerCase());
+const isSourceModule = (file) => sourceLanguage(file) !== undefined;
 const isBundledSource = (source) => parseResourceSpecifier(source) !== null || parseIconSpecifier(source) !== null;
 const validateUnbundledV2Source = (source) => {
     if (isLegacyDataSpecifier(source)) {
@@ -689,20 +656,18 @@ const activeImporterKeys = (state) => {
     return active;
 };
 const isImporterActive = (state, importer) => activeImporterKeys(state).has(importerKey(importer));
-const activateDeclaredIcon = (state, importer, iconIdentity, entry) => {
+const activateDeclaredIcon = (state, iconIdentity, entry) => {
     const existing = state.iconOwners.get(iconIdentity);
     if (existing !== undefined && existing.sourcePath !== entry.sourcePath) {
         throw new Error(`${existing.sourcePath} and ${entry.sourcePath} both claim the themed icon ${iconIdentity}`);
     }
-    const activeEntry = activateEntry(state, entry, importer);
-    state.iconOwners.set(iconIdentity, activeEntry);
-    claimIcon(state, iconIdentity, importer);
+    state.iconOwners.set(iconIdentity, activateEntry(state, entry));
 };
 const activateDeclaredEntries = (state, importer) => {
     const entries = state.declaredEntries.get(importer)?.values() ?? [];
     for (const entry of entries) {
         if (isDeclaredSourceAvailable(state, entry.sourcePath)) {
-            activateEntry(state, entry, importer);
+            activateEntry(state, entry);
         }
     }
 };
@@ -710,7 +675,7 @@ const activateDeclaredIcons = (state, importer) => {
     const icons = state.declaredIcons.get(importer) ?? [];
     for (const [iconIdentity, entry] of icons) {
         if (isDeclaredSourceAvailable(state, entry.sourcePath)) {
-            activateDeclaredIcon(state, importer, iconIdentity, entry);
+            activateDeclaredIcon(state, iconIdentity, entry);
         }
     }
 };
@@ -723,14 +688,10 @@ const activateDeclaredClaims = (state, active) => {
 const rebuildActiveClaims = (state) => {
     const previous = {
         entries: state.entries,
-        entryImporters: state.entryImporters,
-        iconImporters: state.iconImporters,
         iconOwners: state.iconOwners,
         sourcePaths: state.sourcePaths,
     };
     state.entries = new Map();
-    state.entryImporters = new Map();
-    state.iconImporters = new Map();
     state.iconOwners = new Map();
     state.sourcePaths = new Set();
     try {
@@ -738,8 +699,6 @@ const rebuildActiveClaims = (state) => {
     }
     catch (error_) {
         state.entries = previous.entries;
-        state.entryImporters = previous.entryImporters;
-        state.iconImporters = previous.iconImporters;
         state.iconOwners = previous.iconOwners;
         state.sourcePaths = previous.sourcePaths;
         throw error_;
@@ -840,7 +799,6 @@ const prepareReconciliation = async (ctx, state, reconciliation) => {
 };
 const commitReconciliation = (state, candidate) => {
     state.entries = candidate.entries;
-    state.entryImporters = candidate.entryImporters;
     state.bundledSpecifiers = candidate.bundledSpecifiers;
     state.moduleDependencies = candidate.moduleDependencies;
     state.prunedDependencies = candidate.prunedDependencies;
@@ -849,7 +807,6 @@ const commitReconciliation = (state, candidate) => {
     state.missingSourcePaths = candidate.missingSourcePaths;
     state.sourcePaths = candidate.sourcePaths;
     state.iconOwners = candidate.iconOwners;
-    state.iconImporters = candidate.iconImporters;
 };
 const reconcileV2Importer = async (ctx, state, id) => {
     const reconciliation = await importerReconciliation(ctx, state, id);
@@ -867,7 +824,7 @@ const resolveResourceConfig = async (state, config, loadConfig) => {
     const loaded = await loadConfig.load(config.root ?? process.cwd());
     state.prefix = resourceBasePath(loaded.config.applicationId);
     state.root = loaded.root;
-    state.isV2 = loaded.config.future?.v2ResourceImports === true;
+    state.isV2 = resolveFuture(loaded.config.future).isResourceImported;
     return {
         assetsInclude: [ASSET_RE],
     };
@@ -1064,7 +1021,6 @@ function gtkxResources(loadConfig = createConfigLoader(), entryPath) {
         isBuild: false,
         isV2: false,
         entries: new Map(),
-        entryImporters: new Map(),
         bundledSpecifiers: new Map(),
         moduleDependencies: new Map(),
         prunedDependencies: new Map(),
@@ -1080,7 +1036,6 @@ function gtkxResources(loadConfig = createConfigLoader(), entryPath) {
         dataDir: null,
         bundleReferenceId: null,
         iconOwners: new Map(),
-        iconImporters: new Map(),
     };
     return createResourcesPlugin(state, loadConfig);
 }