@gtkx/cli 1.6.0 → 2.0.0-beta.10

package/dist/vite-plugins/react-compiler.js

@@ -1,12 +1,26 @@
-import { transformAsync } from "@babel/core";
-import babelPresetTypescriptNs from "@babel/preset-typescript";
-import { createConfigLoader } from "@gtkx/config/internal";
-import babelPluginReactCompilerNs from "babel-plugin-react-compiler";
-const babelPresetTypescript = babelPresetTypescriptNs.default ?? babelPresetTypescriptNs;
-const babelPluginReactCompiler = babelPluginReactCompilerNs.default ?? babelPluginReactCompilerNs;
+import { createConfigLoader, viteProjectRoot } from "@gtkx/config/internal";
+import { createReactCompilerCache, } from "../internal/react-compiler-cache.js";
 const SOURCE_EXTENSION = /\.[jt]sx?$/;
 const TYPESCRIPT_EXTENSION = /\.tsx?$/;
 const NODE_MODULES = /(?:^|\/)node_modules\//;
+const MEMOIZABLE_SOURCE = /use[A-Z0-9]|use memo|use forget/;
+const JSX_MARK = "<";
+const PLAIN_TYPESCRIPT = ".ts";
+const ALL_FUNCTIONS = "all";
+const babel = { toolchain: undefined };
+const loadBabelToolchain = async () => {
+    const [core, preset, plugin] = await Promise.all([
+        import("@babel/core"),
+        import("@babel/preset-typescript"),
+        import("babel-plugin-react-compiler"),
+    ]);
+    return {
+        presetTypescript: preset.default.default ?? preset.default,
+        reactCompiler: plugin.default.default ?? plugin.default,
+        transformAsync: core.transformAsync,
+    };
+};
+const babelToolchain = () => (babel.toolchain ??= loadBabelToolchain());
 const isProjectSource = (root, id) => {
     if (!SOURCE_EXTENSION.test(id)) {
         return false;
@@ -19,42 +33,67 @@ const isProjectSource = (root, id) => {
     }
     return true;
 };
+const isMemoizable = (code, id, options) => {
+    if (options.compilationMode === ALL_FUNCTIONS || MEMOIZABLE_SOURCE.test(code)) {
+        return true;
+    }
+    return !id.endsWith(PLAIN_TYPESCRIPT) && code.includes(JSX_MARK);
+};
 const compileSource = async (code, id, options) => {
-    const result = await transformAsync(code, {
+    const toolchain = await babelToolchain();
+    const result = await toolchain.transformAsync(code, {
         filename: id,
         babelrc: false,
         configFile: false,
         sourceMaps: true,
-        parserOpts: { plugins: id.endsWith(".ts") ? [] : ["jsx"] },
-        presets: TYPESCRIPT_EXTENSION.test(id) ? [babelPresetTypescript] : [],
-        plugins: [[babelPluginReactCompiler, options]],
+        parserOpts: { plugins: id.endsWith(PLAIN_TYPESCRIPT) ? [] : ["jsx"] },
+        presets: TYPESCRIPT_EXTENSION.test(id) ? [toolchain.presetTypescript] : [],
+        plugins: [[toolchain.reactCompiler, options]],
     });
     if (!result?.code) {
         return;
     }
     return result.map == null ? { code: result.code } : { code: result.code, map: JSON.stringify(result.map) };
 };
+const cachedSource = async (cache, code, id, options) => {
+    const key = cache.keyFor(code, id);
+    const cached = cache.read(key);
+    if (cached !== undefined) {
+        return cached;
+    }
+    const compiled = await compileSource(code, id, options);
+    if (compiled !== undefined) {
+        cache.write(key, compiled);
+    }
+    return compiled;
+};
 function gtkxReactCompiler(loadConfig = createConfigLoader()) {
     const state = {
-        root: "",
+        cache: null,
         options: null,
+        root: "",
     };
     return {
         name: "gtkx:react-compiler",
         enforce: "pre",
         async config(config) {
-            const resolved = await loadConfig.resolve(config.root ?? process.cwd());
+            const resolved = await loadConfig.resolve(viteProjectRoot(config));
             state.options = resolved.reactCompiler;
         },
         configResolved(config) {
             state.root = config.root;
+            state.cache = state.options === null ? null : createReactCompilerCache(config.cacheDir, state.options);
         },
-        async transform(code, id) {
-            const options = state.options;
-            if (options === null || !isProjectSource(state.root, id)) {
-                return;
-            }
-            return compileSource(code, id, options);
+        transform: {
+            filter: { id: { include: SOURCE_EXTENSION, exclude: NODE_MODULES } },
+            async handler(code, id) {
+                const options = state.options;
+                if (options === null || !isProjectSource(state.root, id) || !isMemoizable(code, id, options)) {
+                    return;
+                }
+                const cache = state.cache;
+                return cache === null ? compileSource(code, id, options) : cachedSource(cache, code, id, options);
+            },
         },
     };
 }

package/dist/vite-plugins/react-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"react-compiler.js","sourceRoot":"","sources":["../../src/vite-plugins/react-compiler.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ConfigLoader } from \"@gtkx/config\";\nimport type { ResolvedReactCompilerOptions } from \"@gtkx/config/internal\";\nimport type { Plugin, ResolvedConfig, UserConfig } from \"vite\";\nimport { transformAsync } from \"@babel/core\";\nimport babelPresetTypescriptNs from \"@babel/preset-typescript\";\nimport { createConfigLoader } from \"@gtkx/config/internal\";\nimport babelPluginReactCompilerNs from \"babel-plugin-react-compiler\";\n\ntype ReactCompilerState = {\n    root: string;\n    options: ResolvedReactCompilerOptions | null;\n};\n\nconst babelPresetTypescript = babelPresetTypescriptNs.default ?? babelPresetTypescriptNs;\nconst babelPluginReactCompiler = babelPluginReactCompilerNs.default ?? babelPluginReactCompilerNs;\nconst SOURCE_EXTENSION = /\\.[jt]sx?$/;\nconst TYPESCRIPT_EXTENSION = /\\.tsx?$/;\nconst NODE_MODULES = /(?:^|\\/)node_modules\\//;\n\nconst isProjectSource = (root: string, id: string): boolean => {\n    if (!SOURCE_EXTENSION.test(id)) {\n        return false;\n    }\n\n    if (NODE_MODULES.test(id)) {\n        return false;\n    }\n\n    if (root !== \"\" && !id.startsWith(`${root}/`)) {\n        return false;\n    }\n\n    return true;\n};\n\nconst compileSource = async (code: string, id: string, options: ResolvedReactCompilerOptions) => {\n    const result = await transformAsync(code, {\n        filename: id,\n        babelrc: false,\n        configFile: false,\n        sourceMaps: true,\n        parserOpts: { plugins: id.endsWith(\".ts\") ? [] : [\"jsx\"] },\n        presets: TYPESCRIPT_EXTENSION.test(id) ? [babelPresetTypescript] : [],\n        plugins: [[babelPluginReactCompiler, options]],\n    });\n\n    if (!result?.code) {\n        return;\n    }\n\n    return result.map == null ? { code: result.code } : { code: result.code, map: JSON.stringify(result.map) };\n};\n\nfunction gtkxReactCompiler(loadConfig: ConfigLoader = createConfigLoader()): Plugin {\n    const state: ReactCompilerState = {\n        root: \"\",\n        options: null,\n    };\n\n    return {\n        name: \"gtkx:react-compiler\",\n        enforce: \"pre\",\n\n        async config(config: UserConfig) {\n            const resolved = await loadConfig.resolve(config.root ?? process.cwd());\n            state.options = resolved.reactCompiler;\n        },\n\n        configResolved(config: ResolvedConfig) {\n            state.root = config.root;\n        },\n\n        async transform(code, id) {\n            const options = state.options;\n\n            if (options === null || !isProjectSource(state.root, id)) {\n                return;\n            }\n\n            return compileSource(code, id, options);\n        },\n    };\n}\n\nexport { gtkxReactCompiler };\n"]}
+{"version":3,"file":"react-compiler.js","sourceRoot":"","sources":["../../src/vite-plugins/react-compiler.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ConfigLoader } from \"@gtkx/config\";\nimport type { ResolvedReactCompilerOptions } from \"@gtkx/config/internal\";\nimport type { Plugin, ResolvedConfig, UserConfig } from \"vite\";\nimport { createConfigLoader, viteProjectRoot } from \"@gtkx/config/internal\";\nimport {\n    type CompilerOutput,\n    createReactCompilerCache,\n    type ReactCompilerCache,\n} from \"../internal/react-compiler-cache.js\";\n\ntype ReactCompilerState = {\n    cache: ReactCompilerCache | null;\n    options: ResolvedReactCompilerOptions | null;\n    root: string;\n};\n\ntype BabelToolchain = Awaited<ReturnType<typeof loadBabelToolchain>>;\n\nconst SOURCE_EXTENSION = /\\.[jt]sx?$/;\nconst TYPESCRIPT_EXTENSION = /\\.tsx?$/;\nconst NODE_MODULES = /(?:^|\\/)node_modules\\//;\nconst MEMOIZABLE_SOURCE = /use[A-Z0-9]|use memo|use forget/;\nconst JSX_MARK = \"<\";\nconst PLAIN_TYPESCRIPT = \".ts\";\nconst ALL_FUNCTIONS = \"all\";\nconst babel: { toolchain: Promise<BabelToolchain> | undefined } = { toolchain: undefined };\n\nconst loadBabelToolchain = async () => {\n    const [core, preset, plugin] = await Promise.all([\n        import(\"@babel/core\"),\n        import(\"@babel/preset-typescript\"),\n        import(\"babel-plugin-react-compiler\"),\n    ]);\n\n    return {\n        presetTypescript: preset.default.default ?? preset.default,\n        reactCompiler: plugin.default.default ?? plugin.default,\n        transformAsync: core.transformAsync,\n    };\n};\n\nconst babelToolchain = (): Promise<BabelToolchain> => (babel.toolchain ??= loadBabelToolchain());\n\nconst isProjectSource = (root: string, id: string): boolean => {\n    if (!SOURCE_EXTENSION.test(id)) {\n        return false;\n    }\n\n    if (NODE_MODULES.test(id)) {\n        return false;\n    }\n\n    if (root !== \"\" && !id.startsWith(`${root}/`)) {\n        return false;\n    }\n\n    return true;\n};\n\nconst isMemoizable = (code: string, id: string, options: ResolvedReactCompilerOptions): boolean => {\n    if (options.compilationMode === ALL_FUNCTIONS || MEMOIZABLE_SOURCE.test(code)) {\n        return true;\n    }\n\n    return !id.endsWith(PLAIN_TYPESCRIPT) && code.includes(JSX_MARK);\n};\n\nconst compileSource = async (code: string, id: string, options: ResolvedReactCompilerOptions) => {\n    const toolchain = await babelToolchain();\n\n    const result = await toolchain.transformAsync(code, {\n        filename: id,\n        babelrc: false,\n        configFile: false,\n        sourceMaps: true,\n        parserOpts: { plugins: id.endsWith(PLAIN_TYPESCRIPT) ? [] : [\"jsx\"] },\n        presets: TYPESCRIPT_EXTENSION.test(id) ? [toolchain.presetTypescript] : [],\n        plugins: [[toolchain.reactCompiler, options]],\n    });\n\n    if (!result?.code) {\n        return;\n    }\n\n    return result.map == null ? { code: result.code } : { code: result.code, map: JSON.stringify(result.map) };\n};\n\nconst cachedSource = async (\n    cache: ReactCompilerCache,\n    code: string,\n    id: string,\n    options: ResolvedReactCompilerOptions,\n): Promise<CompilerOutput | undefined> => {\n    const key = cache.keyFor(code, id);\n    const cached = cache.read(key);\n\n    if (cached !== undefined) {\n        return cached;\n    }\n\n    const compiled = await compileSource(code, id, options);\n\n    if (compiled !== undefined) {\n        cache.write(key, compiled);\n    }\n\n    return compiled;\n};\n\nfunction gtkxReactCompiler(loadConfig: ConfigLoader = createConfigLoader()): Plugin {\n    const state: ReactCompilerState = {\n        cache: null,\n        options: null,\n        root: \"\",\n    };\n\n    return {\n        name: \"gtkx:react-compiler\",\n        enforce: \"pre\",\n\n        async config(config: UserConfig) {\n            const resolved = await loadConfig.resolve(viteProjectRoot(config));\n            state.options = resolved.reactCompiler;\n        },\n\n        configResolved(config: ResolvedConfig) {\n            state.root = config.root;\n            state.cache = state.options === null ? null : createReactCompilerCache(config.cacheDir, state.options);\n        },\n\n        transform: {\n            filter: { id: { include: SOURCE_EXTENSION, exclude: NODE_MODULES } },\n\n            async handler(code, id) {\n                const options = state.options;\n\n                if (options === null || !isProjectSource(state.root, id) || !isMemoizable(code, id, options)) {\n                    return;\n                }\n\n                const cache = state.cache;\n\n                return cache === null ? compileSource(code, id, options) : cachedSource(cache, code, id, options);\n            },\n        },\n    };\n}\n\nexport { gtkxReactCompiler };\n"]}

package/dist/vite-plugins/resource-shared.d.ts

@@ -5,7 +5,9 @@ declare const ICON_NAME_SEPARATOR = "\0icon=";
 declare const REFRESH_EXPORT = "__refresh";
 declare const REGISTER_REFRESH_EXPORT = "__registerRefresh";
 declare const RESOURCE_PATH_EXPORT = "path";
+declare const VIRTUAL_ID_RE: RegExp;
+declare const VIRTUAL_INIT_RE: RegExp;
 declare const isVirtual: (id: string) => boolean, toVirtualId: (realId: string) => string, fromVirtualId: (id: string) => string;
 declare const escapeXml: (value: string) => string;
-export { VIRTUAL_INIT, BUNDLE_FILENAME, REL_SEPARATOR, ICON_NAME_SEPARATOR, REFRESH_EXPORT, REGISTER_REFRESH_EXPORT, RESOURCE_PATH_EXPORT, escapeXml, isVirtual, toVirtualId, fromVirtualId, };
+export { VIRTUAL_ID_RE, VIRTUAL_INIT, VIRTUAL_INIT_RE, BUNDLE_FILENAME, REL_SEPARATOR, ICON_NAME_SEPARATOR, REFRESH_EXPORT, REGISTER_REFRESH_EXPORT, RESOURCE_PATH_EXPORT, escapeXml, isVirtual, toVirtualId, fromVirtualId, };
 //# sourceMappingURL=resource-shared.d.ts.map

package/dist/vite-plugins/resource-shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-shared.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/resource-shared.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,YAAY,0BAA0B,CAAC;AAC7C,QAAA,MAAM,eAAe,mBAAmB,CAAC;AACzC,QAAA,MAAM,aAAa,WAAW,CAAC;AAC/B,QAAA,MAAM,mBAAmB,YAAY,CAAC;AACtC,QAAA,MAAM,cAAc,cAAc,CAAC;AACnC,QAAA,MAAM,uBAAuB,sBAAsB,CAAC;AACpD,QAAA,MAAM,oBAAoB,SAAS,CAAC;AACpC,QAAA,MAAQ,SAAS,2BAAE,WAAW,8BAAE,aAAa,wBAA2C,CAAC;AAEzF,QAAA,MAAM,SAAS,GAAI,OAAO,MAAM,KAAG,MAmB7B,CAAC;AAEP,OAAO,EACH,YAAY,EACZ,eAAe,EACf,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,EACT,SAAS,EACT,WAAW,EACX,aAAa,GAChB,CAAC"}
+{"version":3,"file":"resource-shared.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/resource-shared.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,YAAY,0BAA0B,CAAC;AAC7C,QAAA,MAAM,eAAe,mBAAmB,CAAC;AACzC,QAAA,MAAM,aAAa,WAAW,CAAC;AAC/B,QAAA,MAAM,mBAAmB,YAAY,CAAC;AACtC,QAAA,MAAM,cAAc,cAAc,CAAC;AACnC,QAAA,MAAM,uBAAuB,sBAAsB,CAAC;AACpD,QAAA,MAAM,oBAAoB,SAAS,CAAC;AACpC,QAAA,MAAM,aAAa,QAAmC,CAAC;AACvD,QAAA,MAAM,eAAe,QAAkC,CAAC;AACxD,QAAA,MAAQ,SAAS,2BAAE,WAAW,8BAAE,aAAa,wBAA2C,CAAC;AAEzF,QAAA,MAAM,SAAS,GAAI,OAAO,MAAM,KAAG,MAmB7B,CAAC;AAEP,OAAO,EACH,aAAa,EACb,YAAY,EACZ,eAAe,EACf,eAAe,EACf,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,EACT,SAAS,EACT,WAAW,EACX,aAAa,GAChB,CAAC"}

package/dist/vite-plugins/resource-shared.js

@@ -7,6 +7,8 @@ const ICON_NAME_SEPARATOR = "\0icon=";
 const REFRESH_EXPORT = "__refresh";
 const REGISTER_REFRESH_EXPORT = "__registerRefresh";
 const RESOURCE_PATH_EXPORT = "path";
+const VIRTUAL_ID_RE = new RegExp(`^${VIRTUAL_PREFIX}`);
+const VIRTUAL_INIT_RE = new RegExp(`^${VIRTUAL_INIT}$`);
 const { isVirtual, toVirtualId, fromVirtualId } = createVirtualNamespace(VIRTUAL_PREFIX);
 const escapeXml = (value) => value.replaceAll(/[<>&"']/g, (char) => {
     switch (char) {
@@ -27,5 +29,5 @@ const escapeXml = (value) => value.replaceAll(/[<>&"']/g, (char) => {
         }
     }
 });
-export { VIRTUAL_INIT, BUNDLE_FILENAME, REL_SEPARATOR, ICON_NAME_SEPARATOR, REFRESH_EXPORT, REGISTER_REFRESH_EXPORT, RESOURCE_PATH_EXPORT, escapeXml, isVirtual, toVirtualId, fromVirtualId, };
+export { VIRTUAL_ID_RE, VIRTUAL_INIT, VIRTUAL_INIT_RE, BUNDLE_FILENAME, REL_SEPARATOR, ICON_NAME_SEPARATOR, REFRESH_EXPORT, REGISTER_REFRESH_EXPORT, RESOURCE_PATH_EXPORT, escapeXml, isVirtual, toVirtualId, fromVirtualId, };
 //# sourceMappingURL=resource-shared.js.map

package/dist/vite-plugins/resource-shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"resource-shared.js","sourceRoot":"","sources":["../../src/vite-plugins/resource-shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAC3C,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAC7C,MAAM,eAAe,GAAG,gBAAgB,CAAC;AACzC,MAAM,aAAa,GAAG,QAAQ,CAAC;AAC/B,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,cAAc,GAAG,WAAW,CAAC;AACnC,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;AACpD,MAAM,oBAAoB,GAAG,MAAM,CAAC;AACpC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;AAEzF,MAAM,SAAS,GAAG,CAAC,KAAa,EAAU,EAAE,CACxC,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;IAClC,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,GAAG,CAAC,CAAC,CAAC;YACP,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,KAAK,GAAG,CAAC,CAAC,CAAC;YACP,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,KAAK,GAAG,CAAC,CAAC,CAAC;YACP,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,KAAK,IAAI,CAAC,CAAC,CAAC;YACR,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACN,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO,EACH,YAAY,EACZ,eAAe,EACf,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,EACT,SAAS,EACT,WAAW,EACX,aAAa,GAChB,CAAC","sourcesContent":["import { createVirtualNamespace } from \"./virtual-module.js\";\n\nconst VIRTUAL_PREFIX = \"\\0gtkx-resources:\";\nconst VIRTUAL_INIT = \"\\0gtkx-resources-init\";\nconst BUNDLE_FILENAME = \"gtkx.gresource\";\nconst REL_SEPARATOR = \"\\0rel=\";\nconst ICON_NAME_SEPARATOR = \"\\0icon=\";\nconst REFRESH_EXPORT = \"__refresh\";\nconst REGISTER_REFRESH_EXPORT = \"__registerRefresh\";\nconst RESOURCE_PATH_EXPORT = \"path\";\nconst { isVirtual, toVirtualId, fromVirtualId } = createVirtualNamespace(VIRTUAL_PREFIX);\n\nconst escapeXml = (value: string): string =>\n    value.replaceAll(/[<>&\"']/g, (char) => {\n        switch (char) {\n            case \"<\": {\n                return \"&lt;\";\n            }\n            case \">\": {\n                return \"&gt;\";\n            }\n            case \"&\": {\n                return \"&amp;\";\n            }\n            case \"\\\"\": {\n                return \"&quot;\";\n            }\n            default: {\n                return \"&apos;\";\n            }\n        }\n    });\n\nexport {\n    VIRTUAL_INIT,\n    BUNDLE_FILENAME,\n    REL_SEPARATOR,\n    ICON_NAME_SEPARATOR,\n    REFRESH_EXPORT,\n    REGISTER_REFRESH_EXPORT,\n    RESOURCE_PATH_EXPORT,\n    escapeXml,\n    isVirtual,\n    toVirtualId,\n    fromVirtualId,\n};\n"]}
+{"version":3,"file":"resource-shared.js","sourceRoot":"","sources":["../../src/vite-plugins/resource-shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAC3C,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAC7C,MAAM,eAAe,GAAG,gBAAgB,CAAC;AACzC,MAAM,aAAa,GAAG,QAAQ,CAAC;AAC/B,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,cAAc,GAAG,WAAW,CAAC;AACnC,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;AACpD,MAAM,oBAAoB,GAAG,MAAM,CAAC;AACpC,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;AACvD,MAAM,eAAe,GAAG,IAAI,MAAM,CAAC,IAAI,YAAY,GAAG,CAAC,CAAC;AACxD,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;AAEzF,MAAM,SAAS,GAAG,CAAC,KAAa,EAAU,EAAE,CACxC,KAAK,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;IAClC,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,GAAG,CAAC,CAAC,CAAC;YACP,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,KAAK,GAAG,CAAC,CAAC,CAAC;YACP,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,KAAK,GAAG,CAAC,CAAC,CAAC;YACP,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,KAAK,IAAI,CAAC,CAAC,CAAC;YACR,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACN,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,OAAO,EACH,aAAa,EACb,YAAY,EACZ,eAAe,EACf,eAAe,EACf,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,uBAAuB,EACvB,oBAAoB,EACpB,SAAS,EACT,SAAS,EACT,WAAW,EACX,aAAa,GAChB,CAAC","sourcesContent":["import { createVirtualNamespace } from \"./virtual-module.js\";\n\nconst VIRTUAL_PREFIX = \"\\0gtkx-resources:\";\nconst VIRTUAL_INIT = \"\\0gtkx-resources-init\";\nconst BUNDLE_FILENAME = \"gtkx.gresource\";\nconst REL_SEPARATOR = \"\\0rel=\";\nconst ICON_NAME_SEPARATOR = \"\\0icon=\";\nconst REFRESH_EXPORT = \"__refresh\";\nconst REGISTER_REFRESH_EXPORT = \"__registerRefresh\";\nconst RESOURCE_PATH_EXPORT = \"path\";\nconst VIRTUAL_ID_RE = new RegExp(`^${VIRTUAL_PREFIX}`);\nconst VIRTUAL_INIT_RE = new RegExp(`^${VIRTUAL_INIT}$`);\nconst { isVirtual, toVirtualId, fromVirtualId } = createVirtualNamespace(VIRTUAL_PREFIX);\n\nconst escapeXml = (value: string): string =>\n    value.replaceAll(/[<>&\"']/g, (char) => {\n        switch (char) {\n            case \"<\": {\n                return \"&lt;\";\n            }\n            case \">\": {\n                return \"&gt;\";\n            }\n            case \"&\": {\n                return \"&amp;\";\n            }\n            case \"\\\"\": {\n                return \"&quot;\";\n            }\n            default: {\n                return \"&apos;\";\n            }\n        }\n    });\n\nexport {\n    VIRTUAL_ID_RE,\n    VIRTUAL_INIT,\n    VIRTUAL_INIT_RE,\n    BUNDLE_FILENAME,\n    REL_SEPARATOR,\n    ICON_NAME_SEPARATOR,\n    REFRESH_EXPORT,\n    REGISTER_REFRESH_EXPORT,\n    RESOURCE_PATH_EXPORT,\n    escapeXml,\n    isVirtual,\n    toVirtualId,\n    fromVirtualId,\n};\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,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"}
+{"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;AA0/CpG,iBAAS,aAAa,CAAC,UAAU,GAAE,YAAmC,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAuBlG;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/vite-plugins/resources.js

@@ -1,22 +1,22 @@
-import { createConfigLoader, resolveFuture, resourceBasePath } from "@gtkx/config/internal";
-import { error, info, isRecord, sortStrings } from "@gtkx/utils";
+import { createConfigLoader, resourceBasePath, viteProjectRoot } from "@gtkx/config/internal";
+import { error, info, isPathInside, isRecord, sortStrings, toPosixPath } 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";
 import { parseSync } from "vite";
-import { resolveDataDir } from "../internal/data-dir.js";
-import { listFilesRecursive } from "../internal/list-files.js";
+import { withExclusiveLoad } from "../internal/module-loads.js";
 import { runCliTool } from "../internal/run-cli-tool.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";
+import { isBareRelativeAsset, parseIconSpecifier, parseResourceSpecifier, } from "./asset-specifier.js";
 import { renderInitModule } from "./resource-init-module.js";
-import { BUNDLE_FILENAME, escapeXml, fromVirtualId, ICON_NAME_SEPARATOR, isVirtual, REFRESH_EXPORT, REGISTER_REFRESH_EXPORT, REL_SEPARATOR, RESOURCE_PATH_EXPORT, toVirtualId, VIRTUAL_INIT, } from "./resource-shared.js";
+import { BUNDLE_FILENAME, escapeXml, fromVirtualId, ICON_NAME_SEPARATOR, isVirtual, REFRESH_EXPORT, REGISTER_REFRESH_EXPORT, REL_SEPARATOR, RESOURCE_PATH_EXPORT, toVirtualId, VIRTUAL_ID_RE, VIRTUAL_INIT, VIRTUAL_INIT_RE, } from "./resource-shared.js";
 import { stripQuery } from "./strip-query.js";
 const RESOURCE_COMPILER = "glib-compile-resources";
 const MANIFEST_PREFIX = "/";
 const DEV_STAGING_PREFIX = "resources-dev";
 const MANIFEST_FILENAME = "package.json";
+const DATA_PREFIX = "#data/";
 const BUNDLED_QUERY_MENTION_RE = /[?&](?:icon|resource)(?:[=&]|$)/;
 const ICON_EXTENSIONS = new Set([".png", ".svg", ".xpm"]);
 const ICON_CONTEXTS = new Set([
@@ -49,12 +49,7 @@ 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 toForwardSlashes = (value) => value.replaceAll(/[/\\]/g, "/");
-const isWithin = (root, path) => {
-    const rel = relative(root, path);
-    return rel.length > 0 && !isAbsolute(rel) && rel !== ".." && !rel.startsWith(`..${sep}`);
-};
-const isDependencyFile = (root, path) => isWithin(root, path) && relative(root, path).split(sep).includes("node_modules");
+const isDependencyFile = (root, path) => isPathInside(root, path) && relative(root, path).split(sep).includes("node_modules");
 const packageIdentityIn = (dir) => {
     try {
         const manifest = JSON.parse(readFileSync(join(dir, MANIFEST_FILENAME), "utf8"));
@@ -84,14 +79,14 @@ const validateResourcePath = (resourcePath) => {
     return resourcePath;
 };
 const derivedResourcePath = (state, sourcePath) => {
-    if (isWithin(state.root, sourcePath) && !isDependencyFile(state.root, sourcePath)) {
-        return validateResourcePath(`${state.prefix}/${toForwardSlashes(relative(state.root, sourcePath))}`);
+    if (isPathInside(state.root, sourcePath) && !isDependencyFile(state.root, sourcePath)) {
+        return validateResourcePath(`${state.prefix}/${toPosixPath(relative(state.root, sourcePath))}`);
     }
     const owner = packageForFile(sourcePath);
-    if (owner === null || !isWithin(owner.dir, sourcePath)) {
+    if (owner === null || !isPathInside(owner.dir, sourcePath)) {
         throw new Error(`${sourcePath} is outside the application and does not belong to a named package`);
     }
-    const packagePath = toForwardSlashes(relative(owner.dir, sourcePath));
+    const packagePath = toPosixPath(relative(owner.dir, sourcePath));
     return validateResourcePath(`${state.prefix}/${owner.name}/${packagePath}`);
 };
 const iconExtension = (sourcePath) => {
@@ -134,7 +129,7 @@ const iconLayoutInParts = (parts, beforeIndex) => {
     return isIconLayout(layout) ? layout.join("/") : iconLayoutInParts(parts, index - 1);
 };
 const iconLayoutFromTree = (sourcePath) => {
-    const parts = toForwardSlashes(sourcePath).split("/");
+    const parts = toPosixPath(sourcePath).split("/");
     return iconLayoutInParts(parts, parts.length - 2);
 };
 const derivedIconEntry = (state, sourcePath, requestedName) => {
@@ -159,7 +154,7 @@ const hasSideEffectIconImport = (code, id) => {
     }
     return parsed.module.staticImports.some((statement) => statement.entries.length === 0 && parseIconSpecifier(statement.moduleRequest.value) !== null);
 };
-const retainSideEffectIconImport = (state, code, id) => state.isV2 && hasSideEffectIconImport(code, id)
+const retainSideEffectIconImport = (code, id) => hasSideEffectIconImport(code, id)
     ? { code, moduleSideEffects: true }
     : null;
 const compileBundle = (state, outputPath) => withStagingDir("resources", (dir) => {
@@ -225,16 +220,6 @@ const refreshRegisteredDevBundle = (state) => {
         refresh();
     }
 };
-const scanDataAssets = (dataDir) => listFilesRecursive(dataDir, (name) => ASSET_RE.test(name));
-const primeLegacyDevBundle = (state) => {
-    if (state.dataDir === null) {
-        return;
-    }
-    for (const { absPath, rel } of scanDataAssets(state.dataDir)) {
-        registerEntry(state, absPath, rel);
-    }
-    compileDevBundle(state);
-};
 const registerDevAsset = (state) => {
     if (entriesSignature(state) !== state.compiledSignature) {
         compileDevBundle(state);
@@ -268,7 +253,7 @@ const activateEntry = (state, entry) => {
     state.sourcePaths.add(entry.sourcePath);
     return entry;
 };
-const isDeclarativeImporter = (state, importer) => !state.isBuild && state.isV2 && importer !== undefined;
+const isDeclarativeImporter = (state, importer) => !state.isBuild && importer !== undefined;
 const setSourceAvailability = (state, file, isAvailable) => {
     if (isAvailable) {
         state.missingSourcePaths.delete(file);
@@ -394,17 +379,6 @@ const resolveIconEntry = async (ctx, state, request) => {
         iconName: derived.iconName,
     };
 };
-const resolveLegacyAssetEntry = async (ctx, state, request) => {
-    const resolved = await ctx.resolve(request.source, request.importer, { ...request.options, skipSelf: true });
-    if (!resolved || resolved.external) {
-        return undefined;
-    }
-    const sourcePath = stripQuery(resolved.id);
-    if (!isAbsolute(sourcePath)) {
-        return undefined;
-    }
-    return registerEntry(state, sourcePath, request.source.slice(DATA_PREFIX.length));
-};
 const loadInitModule = (state) => {
     if (state.isBuild) {
         if (state.bundleReferenceId === null) {
@@ -479,8 +453,7 @@ const loadAssetModule = (state, virtualId) => {
     const { absPath, iconName, rel } = virtualAssetMetadata(virtualId);
     const resourcePath = validateResourcePath(rel);
     const { entry, isRegistered } = loadedResourceEntry(state, absPath, resourcePath);
-    const uri = `resource://${entry.resourcePath}`;
-    const defaultValue = iconName ?? (state.isV2 ? entry.resourcePath : uri);
+    const defaultValue = iconName ?? entry.resourcePath;
     compileLoadedDevAsset(state, isRegistered);
     return [
         ...assetModuleImports(iconName),
@@ -524,17 +497,17 @@ const bundledSpecifiersIn = (imports) => new Set(imports
     .map((entry) => entry.source));
 const isSourceModule = (file) => sourceLanguage(file) !== undefined;
 const isBundledSource = (source) => parseResourceSpecifier(source) !== null || parseIconSpecifier(source) !== null;
-const validateUnbundledV2Source = (source) => {
+const validateUnbundledSource = (source) => {
     if (isLegacyDataSpecifier(source)) {
         throw new Error(`${JSON.stringify(source)} uses the legacy #data asset form`);
     }
-    rejectInvalidV2Specifier(source);
+    rejectInvalidSpecifier(source);
 };
 const resolvedModuleDependency = async (ctx, source, importer) => {
     if (isBundledSource(source)) {
         return null;
     }
-    validateUnbundledV2Source(source);
+    validateUnbundledSource(source);
     const resolved = await ctx.resolve(source, importer, { skipSelf: true });
     if (resolved === null) {
         throw new Error(`${JSON.stringify(source)} could not be resolved from ${importer}`);
@@ -554,7 +527,7 @@ const resolvedModuleDependencies = async (ctx, imports, importer) => {
 const importerReconciliation = async (ctx, state, id) => {
     const file = stripQuery(id);
     const key = importerKey(file);
-    if (!state.isV2 || state.isBuild || !isSourceModule(file)) {
+    if (state.isBuild || !isSourceModule(file)) {
         return null;
     }
     const imports = parseRuntimeImportsIn(file);
@@ -708,27 +681,14 @@ const forgetImporterDeclarations = (state, importer) => {
     state.declaredEntries.delete(importer);
     state.declaredIcons.delete(importer);
 };
-const cloneStringSetMap = (source) => {
-    const clone = new Map();
-    for (const [key, values] of source) {
-        clone.set(key, new Set(values));
-    }
-    return clone;
-};
-const cloneDeclarationMap = (source) => {
-    const clone = new Map();
-    for (const [key, declarations] of source) {
-        clone.set(key, new Map(declarations));
-    }
-    return clone;
-};
+const cloneMapValues = (source, clone) => new Map([...source].map(([key, value]) => [key, clone(value)]));
 const reconciliationCandidate = (state) => ({
     ...state,
-    bundledSpecifiers: cloneStringSetMap(state.bundledSpecifiers),
-    moduleDependencies: cloneStringSetMap(state.moduleDependencies),
-    prunedDependencies: cloneStringSetMap(state.prunedDependencies),
-    declaredEntries: cloneDeclarationMap(state.declaredEntries),
-    declaredIcons: cloneDeclarationMap(state.declaredIcons),
+    bundledSpecifiers: cloneMapValues(state.bundledSpecifiers, (values) => new Set(values)),
+    moduleDependencies: cloneMapValues(state.moduleDependencies, (values) => new Set(values)),
+    prunedDependencies: cloneMapValues(state.prunedDependencies, (values) => new Set(values)),
+    declaredEntries: cloneMapValues(state.declaredEntries, (entries) => new Map(entries)),
+    declaredIcons: cloneMapValues(state.declaredIcons, (entries) => new Map(entries)),
     missingSourcePaths: new Set(state.missingSourcePaths),
 });
 const storeBundledSpecifiers = (state, importer, specifiers) => {
@@ -808,7 +768,7 @@ const commitReconciliation = (state, candidate) => {
     state.sourcePaths = candidate.sourcePaths;
     state.iconOwners = candidate.iconOwners;
 };
-const reconcileV2Importer = async (ctx, state, id) => {
+const reconcileImporter = async (ctx, state, id) => {
     const reconciliation = await importerReconciliation(ctx, state, id);
     if (reconciliation === null) {
         return;
@@ -821,10 +781,9 @@ const reconcileV2Importer = async (ctx, state, id) => {
     }
 };
 const resolveResourceConfig = async (state, config, loadConfig) => {
-    const loaded = await loadConfig.load(config.root ?? process.cwd());
+    const loaded = await loadConfig.load(viteProjectRoot(config));
     state.prefix = resourceBasePath(loaded.config.applicationId);
     state.root = loaded.root;
-    state.isV2 = resolveFuture(loaded.config.future).isResourceImported;
     return {
         assetsInclude: [ASSET_RE],
     };
@@ -882,12 +841,6 @@ const attachResourceWatcher = (state, server) => {
 const applyResolvedConfig = (state, config) => {
     state.isBuild = config.command === "build";
     state.root = config.root;
-    state.dataDir = null;
-    if (state.isBuild || state.isV2) {
-        return;
-    }
-    const relativeDataDir = resolveDataDir(config.root);
-    state.dataDir = relativeDataDir === null ? null : join(config.root, relativeDataDir);
 };
 const loadResourceModule = (state, id) => {
     if (id === VIRTUAL_INIT) {
@@ -899,14 +852,14 @@ const loadResourceModule = (state, id) => {
     return loadAssetModule(state, id);
 };
 const isLegacyDataSpecifier = (source) => source.startsWith(DATA_PREFIX) && ASSET_RE.test(stripQuery(source));
-const rejectInvalidV2Specifier = (source) => {
+const rejectInvalidSpecifier = (source) => {
     if (BUNDLED_QUERY_MENTION_RE.test(source)) {
         throw new Error(`${JSON.stringify(source)} is not a valid bundled asset import; use ?resource, ` +
             "?resource=/absolute/path, ?icon, or ?icon=name");
     }
     if (isBareRelativeAsset(source)) {
         throw new Error(`${JSON.stringify(source)} must choose ?resource for a GResource, ?icon for a themed icon, ` +
-            "or ?url for an emitted file");
+            "?font for a bundled font, or ?url for an emitted file");
     }
 };
 const resolveExplicitResourceId = async (ctx, state, request) => {
@@ -937,7 +890,7 @@ const resolveIconResourceId = async (ctx, state, request) => {
         ? undefined
         : { id: virtualIconId(resolved), moduleSideEffects: true };
 };
-const resolveV2ResourceId = async (ctx, state, request) => {
+const resolveBundledResourceId = async (ctx, state, request) => {
     if (isLegacyDataSpecifier(request.source)) {
         throw new Error(`${JSON.stringify(request.source)} uses the legacy #data asset form; import it relatively with ` +
             "?resource or ?url");
@@ -952,30 +905,14 @@ const resolveV2ResourceId = async (ctx, state, request) => {
         trackBundledSpecifier(state, request.importer, request.source);
         return resolved;
     }
-    rejectInvalidV2Specifier(request.source);
+    rejectInvalidSpecifier(request.source);
     return undefined;
 };
-const resolveLegacyResourceId = async (ctx, state, request) => {
-    if (BUNDLED_QUERY_MENTION_RE.test(request.source)) {
-        throw new Error(`${JSON.stringify(request.source)} requires future.v2ResourceImports`);
-    }
-    if (!isDataAsset(request.source)) {
-        return undefined;
-    }
-    const entry = await resolveLegacyAssetEntry(ctx, state, request);
-    return entry === undefined ? undefined : virtualAssetId(entry);
-};
 const resolveResourceId = (ctx, state, request) => {
     if (request.source === VIRTUAL_INIT) {
         return Promise.resolve(VIRTUAL_INIT);
     }
-    return state.isV2
-        ? resolveV2ResourceId(ctx, state, request)
-        : resolveLegacyResourceId(ctx, state, request);
-};
-const configureResourceServer = (state, server) => {
-    attachResourceWatcher(state, server);
-    primeLegacyDevBundle(state);
+    return resolveBundledResourceId(ctx, state, request);
 };
 const createResourcesPlugin = (state, loadConfig) => ({
     name: "gtkx:resources",
@@ -986,7 +923,7 @@ const createResourcesPlugin = (state, loadConfig) => ({
         applyResolvedConfig(state, config);
     },
     configureServer: (server) => {
-        configureResourceServer(state, server);
+        attachResourceWatcher(state, server);
     },
     buildStart() {
         if (state.isBuild && state.bundleReferenceId === null) {
@@ -1000,12 +937,15 @@ const createResourcesPlugin = (state, loadConfig) => ({
     resolveId(source, importer, options) {
         return resolveResourceId(this, state, { source, importer, options });
     },
-    load(id) {
-        return loadResourceModule(state, id);
+    load: {
+        filter: { id: { include: [VIRTUAL_INIT_RE, VIRTUAL_ID_RE] } },
+        handler(id) {
+            return loadResourceModule(state, id);
+        },
     },
     async transform(code, id) {
-        await reconcileV2Importer(this, state, id);
-        return retainSideEffectIconImport(state, code, id);
+        await withExclusiveLoad(state, () => reconcileImporter(this, state, id));
+        return retainSideEffectIconImport(code, id);
     },
     generateBundle(_options, bundle) {
         finalizeBuildBundle(this, bundle, state);
@@ -1019,7 +959,6 @@ function gtkxResources(loadConfig = createConfigLoader(), entryPath) {
         prefix: "",
         root: "",
         isBuild: false,
-        isV2: false,
         entries: new Map(),
         bundledSpecifiers: new Map(),
         moduleDependencies: new Map(),
@@ -1033,7 +972,6 @@ function gtkxResources(loadConfig = createConfigLoader(), entryPath) {
         devBundlePath: "",
         server: null,
         compiledSignature: "",
-        dataDir: null,
         bundleReferenceId: null,
         iconOwners: new Map(),
     };