@gtkx/cli 1.2.2 → 1.4.0

package/dist/vite-plugins/undeclared-library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"undeclared-library.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/undeclared-library.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAC;AAyG/C,iBAAS,qBAAqB,CAAC,UAAU,GAAE,YAAmC,GAAG,MAAM,CA+BtF;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"undeclared-library.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/undeclared-library.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,MAAM,CAAC;AA2H/C,iBAAS,qBAAqB,CAAC,UAAU,GAAE,YAAmC,GAAG,MAAM,CA+BtF;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC"}

package/dist/vite-plugins/undeclared-library.js

@@ -13,6 +13,9 @@ const girSearchPaths = async (state) => {
 const getNamespace = (identifier) => identifier.slice(0, identifier.indexOf("-")).toLowerCase();
 const findGirIdentifier = (girPath, namespace) => discoverGirNamespaces(girPath).find((identifier) => getNamespace(identifier) === namespace);
 const parseGeneratedModule = (source, importer) => {
+    if (source === "@gtkx/jsx") {
+        return { source, kind: "jsx", namespace: null, importer: importer ?? "the project's sources" };
+    }
     const matched = GENERATED_MODULE_PATTERN.exec(source);
     const kind = matched?.[1];
     const namespace = matched?.[2];
@@ -30,35 +33,44 @@ const getStoreOptions = (root, kind) => {
         return null;
     }
 };
-const hasNamespaceModule = (storeDir, namespace) => {
+const hasStoreModule = (storeDir, exportKey) => {
     const manifest = join(storeDir, "package.json");
     if (!existsSync(manifest)) {
         return false;
     }
     const { exports } = JSON.parse(readFileSync(manifest, "utf8"));
-    return exports?.[`./${namespace}`] !== undefined;
+    return exports?.[exportKey] !== undefined;
+};
+const unreachableStoreError = (generated, options) => {
+    const provided = generated.namespace === null ? "its index module" : `"${generated.namespace}"`;
+    return new Error(`Cannot resolve "${generated.source}": the generated store in ${options.storeDir} does provide ` +
+        `${provided}, but its link at ${options.linkDir} is not on the module resolution path of ` +
+        `${generated.importer}. Codegen writes the store into the node_modules the installed @gtkx packages ` +
+        "resolve from; install them where the importing file reaches them, then run gtkx codegen again.");
 };
-const unreachableStoreError = (generated, options) => new Error(`Cannot resolve "${generated.source}": the generated store in ${options.storeDir} does provide ` +
-    `"${generated.namespace}", but its link at ${options.linkDir} is not on the module resolution path of ` +
-    `${generated.importer}. Codegen writes the store into the node_modules the installed @gtkx packages ` +
-    "resolve from; install them where the importing file reaches them, then run gtkx codegen again.");
-const undeclaredLibraryError = (generated, girPath) => {
-    const identifier = findGirIdentifier(girPath, generated.namespace);
+const missingIndexError = (generated) => new Error(`Cannot resolve "${generated.source}": the binding store has no index module. ` +
+    "Run gtkx codegen to regenerate the store.");
+const undeclaredLibraryError = (source, namespace, girPath) => {
+    const identifier = findGirIdentifier(girPath, namespace);
     if (identifier === undefined) {
-        return new Error(`Cannot resolve "${generated.source}": the binding store has no "${generated.namespace}" module, and no ` +
-            `GIR data for it was found in [${girPath.join(", ")}]. If "${generated.namespace}" is a library, ` +
+        return new Error(`Cannot resolve "${source}": the binding store has no "${namespace}" module, and no ` +
+            `GIR data for it was found in [${girPath.join(", ")}]. If "${namespace}" is a library, ` +
             "install its gobject-introspection data package and add its GIR identifier to `libraries` in " +
             "gtkx.config.ts. Otherwise run gtkx codegen to regenerate the store.");
     }
-    return new Error(`Cannot resolve "${generated.source}": the "${identifier}" bindings have not been generated. ` +
+    return new Error(`Cannot resolve "${source}": the "${identifier}" bindings have not been generated. ` +
         `Add "${identifier}" to \`libraries\` in gtkx.config.ts, then run gtkx dev or gtkx build again.`);
 };
 const unresolvedModuleError = async (state, generated) => {
     const options = getStoreOptions(state.root, generated.kind);
-    if (options !== null && hasNamespaceModule(options.storeDir, generated.namespace)) {
+    const exportKey = generated.namespace === null ? "." : `./${generated.namespace}`;
+    if (options !== null && hasStoreModule(options.storeDir, exportKey)) {
         return unreachableStoreError(generated, options);
     }
-    return undeclaredLibraryError(generated, await girSearchPaths(state));
+    if (generated.namespace === null) {
+        return missingIndexError(generated);
+    }
+    return undeclaredLibraryError(generated.source, generated.namespace, await girSearchPaths(state));
 };
 function gtkxUndeclaredLibrary(loadConfig = createConfigLoader()) {
     const state = {

package/dist/vite-plugins/undeclared-library.js.map

@@ -1 +1 @@
-{"version":3,"file":"undeclared-library.js","sourceRoot":"","sources":["../../src/vite-plugins/undeclared-library.ts"],"names":[],"mappings":"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","sourcesContent":["import type { StoreOptions } from \"@gtkx/codegen\";\nimport type { ConfigLoader } from \"@gtkx/config\";\nimport type { Plugin, UserConfig } from \"vite\";\nimport { discoverGirNamespaces, resolveGirPath, resolveStore } from \"@gtkx/codegen\";\nimport { createConfigLoader } from \"@gtkx/config/internal\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\ntype PluginState = {\n    root: string;\n    loadConfig: ConfigLoader;\n    girPath: string[] | null;\n};\n\ntype GeneratedModule = {\n    source: string;\n    kind: string;\n    namespace: string;\n    importer: string;\n};\n\nconst GENERATED_MODULE_PATTERN = /^@gtkx\\/(gi|jsx)\\/([a-z0-9]+)$/;\n\nconst girSearchPaths = async (state: PluginState): Promise<string[]> => {\n    if (state.girPath === null) {\n        const { config } = await state.loadConfig.load(state.root);\n        state.girPath = resolveGirPath(config.girPath);\n    }\n\n    return state.girPath;\n};\n\nconst getNamespace = (identifier: string): string => identifier.slice(0, identifier.indexOf(\"-\")).toLowerCase();\n\nconst findGirIdentifier = (girPath: string[], namespace: string): string | undefined =>\n    discoverGirNamespaces(girPath).find((identifier) => getNamespace(identifier) === namespace);\n\nconst parseGeneratedModule = (source: string, importer: string | undefined): GeneratedModule | null => {\n    const matched = GENERATED_MODULE_PATTERN.exec(source);\n    const kind = matched?.[1];\n    const namespace = matched?.[2];\n\n    if (kind === undefined || namespace === undefined) {\n        return null;\n    }\n\n    return { source, kind, namespace, importer: importer ?? \"the project's sources\" };\n};\n\nconst getStoreOptions = (root: string, kind: string): StoreOptions | null => {\n    try {\n        const store = resolveStore(root);\n\n        return kind === \"gi\" ? store.gi : store.jsx;\n    } catch {\n        return null;\n    }\n};\n\nconst hasNamespaceModule = (storeDir: string, namespace: string): boolean => {\n    const manifest = join(storeDir, \"package.json\");\n\n    if (!existsSync(manifest)) {\n        return false;\n    }\n\n    const { exports } = JSON.parse(readFileSync(manifest, \"utf8\")) as { exports?: Record<string, unknown> };\n\n    return exports?.[`./${namespace}`] !== undefined;\n};\n\nconst unreachableStoreError = (generated: GeneratedModule, options: StoreOptions): Error =>\n    new Error(\n        `Cannot resolve \"${generated.source}\": the generated store in ${options.storeDir} does provide ` +\n        `\"${generated.namespace}\", but its link at ${options.linkDir} is not on the module resolution path of ` +\n        `${generated.importer}. Codegen writes the store into the node_modules the installed @gtkx packages ` +\n        \"resolve from; install them where the importing file reaches them, then run gtkx codegen again.\",\n    );\n\nconst undeclaredLibraryError = (generated: GeneratedModule, girPath: string[]): Error => {\n    const identifier = findGirIdentifier(girPath, generated.namespace);\n\n    if (identifier === undefined) {\n        return new Error(\n            `Cannot resolve \"${generated.source}\": the binding store has no \"${generated.namespace}\" module, and no ` +\n            `GIR data for it was found in [${girPath.join(\", \")}]. If \"${generated.namespace}\" is a library, ` +\n            \"install its gobject-introspection data package and add its GIR identifier to `libraries` in \" +\n            \"gtkx.config.ts. Otherwise run gtkx codegen to regenerate the store.\",\n        );\n    }\n\n    return new Error(\n        `Cannot resolve \"${generated.source}\": the \"${identifier}\" bindings have not been generated. ` +\n        `Add \"${identifier}\" to \\`libraries\\` in gtkx.config.ts, then run gtkx dev or gtkx build again.`,\n    );\n};\n\nconst unresolvedModuleError = async (state: PluginState, generated: GeneratedModule): Promise<Error> => {\n    const options = getStoreOptions(state.root, generated.kind);\n\n    if (options !== null && hasNamespaceModule(options.storeDir, generated.namespace)) {\n        return unreachableStoreError(generated, options);\n    }\n\n    return undeclaredLibraryError(generated, await girSearchPaths(state));\n};\n\nfunction gtkxUndeclaredLibrary(loadConfig: ConfigLoader = createConfigLoader()): Plugin {\n    const state: PluginState = {\n        root: \"\",\n        loadConfig,\n        girPath: null,\n    };\n\n    return {\n        name: \"gtkx:undeclared-library\",\n        enforce: \"pre\",\n\n        config(config: UserConfig) {\n            state.root = config.root ?? process.cwd();\n        },\n\n        async resolveId(source, importer, options) {\n            const generated = parseGeneratedModule(source, importer);\n\n            if (generated === null) {\n                return;\n            }\n\n            const resolved = await this.resolve(source, importer, { ...options, skipSelf: true });\n\n            if (resolved !== null) {\n                return;\n            }\n\n            throw await unresolvedModuleError(state, generated);\n        },\n    };\n}\n\nexport { gtkxUndeclaredLibrary };\n"]}
+{"version":3,"file":"undeclared-library.js","sourceRoot":"","sources":["../../src/vite-plugins/undeclared-library.ts"],"names":[],"mappings":"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","sourcesContent":["import type { StoreOptions } from \"@gtkx/codegen\";\nimport type { ConfigLoader } from \"@gtkx/config\";\nimport type { Plugin, UserConfig } from \"vite\";\nimport { discoverGirNamespaces, resolveGirPath, resolveStore } from \"@gtkx/codegen\";\nimport { createConfigLoader } from \"@gtkx/config/internal\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\ntype PluginState = {\n    root: string;\n    loadConfig: ConfigLoader;\n    girPath: string[] | null;\n};\n\ntype GeneratedModule = {\n    source: string;\n    kind: string;\n    namespace: string | null;\n    importer: string;\n};\n\nconst GENERATED_MODULE_PATTERN = /^@gtkx\\/(gi|jsx)\\/([a-z0-9]+)$/;\n\nconst girSearchPaths = async (state: PluginState): Promise<string[]> => {\n    if (state.girPath === null) {\n        const { config } = await state.loadConfig.load(state.root);\n        state.girPath = resolveGirPath(config.girPath);\n    }\n\n    return state.girPath;\n};\n\nconst getNamespace = (identifier: string): string => identifier.slice(0, identifier.indexOf(\"-\")).toLowerCase();\n\nconst findGirIdentifier = (girPath: string[], namespace: string): string | undefined =>\n    discoverGirNamespaces(girPath).find((identifier) => getNamespace(identifier) === namespace);\n\nconst parseGeneratedModule = (source: string, importer: string | undefined): GeneratedModule | null => {\n    if (source === \"@gtkx/jsx\") {\n        return { source, kind: \"jsx\", namespace: null, importer: importer ?? \"the project's sources\" };\n    }\n\n    const matched = GENERATED_MODULE_PATTERN.exec(source);\n    const kind = matched?.[1];\n    const namespace = matched?.[2];\n\n    if (kind === undefined || namespace === undefined) {\n        return null;\n    }\n\n    return { source, kind, namespace, importer: importer ?? \"the project's sources\" };\n};\n\nconst getStoreOptions = (root: string, kind: string): StoreOptions | null => {\n    try {\n        const store = resolveStore(root);\n\n        return kind === \"gi\" ? store.gi : store.jsx;\n    } catch {\n        return null;\n    }\n};\n\nconst hasStoreModule = (storeDir: string, exportKey: string): boolean => {\n    const manifest = join(storeDir, \"package.json\");\n\n    if (!existsSync(manifest)) {\n        return false;\n    }\n\n    const { exports } = JSON.parse(readFileSync(manifest, \"utf8\")) as { exports?: Record<string, unknown> };\n\n    return exports?.[exportKey] !== undefined;\n};\n\nconst unreachableStoreError = (generated: GeneratedModule, options: StoreOptions): Error => {\n    const provided = generated.namespace === null ? \"its index module\" : `\"${generated.namespace}\"`;\n\n    return new Error(\n        `Cannot resolve \"${generated.source}\": the generated store in ${options.storeDir} does provide ` +\n        `${provided}, but its link at ${options.linkDir} is not on the module resolution path of ` +\n        `${generated.importer}. Codegen writes the store into the node_modules the installed @gtkx packages ` +\n        \"resolve from; install them where the importing file reaches them, then run gtkx codegen again.\",\n    );\n};\n\nconst missingIndexError = (generated: GeneratedModule): Error =>\n    new Error(\n        `Cannot resolve \"${generated.source}\": the binding store has no index module. ` +\n        \"Run gtkx codegen to regenerate the store.\",\n    );\n\nconst undeclaredLibraryError = (source: string, namespace: string, girPath: string[]): Error => {\n    const identifier = findGirIdentifier(girPath, namespace);\n\n    if (identifier === undefined) {\n        return new Error(\n            `Cannot resolve \"${source}\": the binding store has no \"${namespace}\" module, and no ` +\n            `GIR data for it was found in [${girPath.join(\", \")}]. If \"${namespace}\" is a library, ` +\n            \"install its gobject-introspection data package and add its GIR identifier to `libraries` in \" +\n            \"gtkx.config.ts. Otherwise run gtkx codegen to regenerate the store.\",\n        );\n    }\n\n    return new Error(\n        `Cannot resolve \"${source}\": the \"${identifier}\" bindings have not been generated. ` +\n        `Add \"${identifier}\" to \\`libraries\\` in gtkx.config.ts, then run gtkx dev or gtkx build again.`,\n    );\n};\n\nconst unresolvedModuleError = async (state: PluginState, generated: GeneratedModule): Promise<Error> => {\n    const options = getStoreOptions(state.root, generated.kind);\n    const exportKey = generated.namespace === null ? \".\" : `./${generated.namespace}`;\n\n    if (options !== null && hasStoreModule(options.storeDir, exportKey)) {\n        return unreachableStoreError(generated, options);\n    }\n\n    if (generated.namespace === null) {\n        return missingIndexError(generated);\n    }\n\n    return undeclaredLibraryError(generated.source, generated.namespace, await girSearchPaths(state));\n};\n\nfunction gtkxUndeclaredLibrary(loadConfig: ConfigLoader = createConfigLoader()): Plugin {\n    const state: PluginState = {\n        root: \"\",\n        loadConfig,\n        girPath: null,\n    };\n\n    return {\n        name: \"gtkx:undeclared-library\",\n        enforce: \"pre\",\n\n        config(config: UserConfig) {\n            state.root = config.root ?? process.cwd();\n        },\n\n        async resolveId(source, importer, options) {\n            const generated = parseGeneratedModule(source, importer);\n\n            if (generated === null) {\n                return;\n            }\n\n            const resolved = await this.resolve(source, importer, { ...options, skipSelf: true });\n\n            if (resolved !== null) {\n                return;\n            }\n\n            throw await unresolvedModuleError(state, generated);\n        },\n    };\n}\n\nexport { gtkxUndeclaredLibrary };\n"]}

package/env.d.ts

@@ -1,204 +1,23 @@
 /// <reference types="vite/client" />
 /// <reference types="@gtkx/react/env" />
 
-declare module "#data/*.aac" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
+declare module "*?resource" {
+    /** GResource path of the bundled asset. */
+    const path: string;
+    export { path };
+    export default path;
 }
 
-declare module "#data/*.avif" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.data" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.eot" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.flac" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.gif" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.gpa" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.ico" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.jpeg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.jpg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.mp3" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.mp4" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.ogg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.otf" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.png" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.svg" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.ttf" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.wav" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.webm" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.webp" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.woff" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "#data/*.woff2" {
-    /** `resource://` URI of the bundled asset, accepted anywhere GTK takes a URI. */
-    const resourceUri: string;
-    /** GResource path of the bundled asset, for use with the `Gio.resources*` lookup functions. */
-    export const path: string;
-    export default resourceUri;
-}
-
-declare module "*.data" {
-    /**
-     * URL of the emitted asset: a dev server URL under `gtkx dev`, an absolute filesystem path once built.
-     * Import it under `#data/` instead for a GResource path and a `resource://` URI.
-     */
-    const assetUrl: string;
-    export default assetUrl;
-}
-
-declare module "*.gpa" {
-    /**
-     * URL of the emitted asset: a dev server URL under `gtkx dev`, an absolute filesystem path once built.
-     * Import it under `#data/` instead for a GResource path and a `resource://` URI.
-     */
-    const assetUrl: string;
-    export default assetUrl;
+declare module "*?icon" {
+    /** Icon-theme name of the bundled asset. */
+    const iconName: string;
+    export default iconName;
 }
 
 declare module "*.css?url" {
     /**
-     * URL of the emitted stylesheet, imported without installing it on the default display: a dev server URL
-     * under `gtkx dev`, an absolute filesystem path once built.
+     * Absolute filesystem path of the source stylesheet under `gtkx dev` or the emitted stylesheet once built,
+     * imported without installing it on the default display.
      */
     const styleSheetUrl: string;
     export default styleSheetUrl;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gtkx/cli",
-  "version": "1.2.2",
-  "description": "Command-line tool and Vite plugin stack that scaffolds, develops, builds, and documents GTKX applications",
+  "version": "1.4.0",
+  "description": "GTK app toolchain for React: scaffold, dev server, build, docs.",
   "keywords": [
     "gtkx",
     "gtk",
@@ -66,26 +66,26 @@
   "dependencies": {
     "@babel/core": "^8.0.1",
     "@babel/preset-typescript": "^8.0.1",
-    "@swc/core": "^1.15.47",
+    "@swc/core": "^1.16.1",
     "babel-plugin-react-compiler": "^1.0.0",
     "citty": "^0.2.2",
-    "fast-xml-parser": "^5.10.1",
+    "fast-xml-parser": "^5.11.0",
     "react-refresh": "^0.18.0",
-    "vite": "^8.2.1",
+    "vite": "^8.2.2",
     "yaml": "^2.9.0",
-    "@gtkx/config": "1.2.2",
-    "@gtkx/runtime": "1.2.2",
-    "@gtkx/utils": "1.2.2",
-    "@gtkx/mcp": "1.2.2",
-    "@gtkx/codegen": "1.2.2",
-    "create-gtkx": "1.2.2",
-    "@gtkx/vitest": "1.2.2"
+    "@gtkx/codegen": "1.4.0",
+    "@gtkx/config": "1.4.0",
+    "@gtkx/mcp": "1.4.0",
+    "@gtkx/utils": "1.4.0",
+    "@gtkx/runtime": "1.4.0",
+    "@gtkx/vitest": "1.4.0",
+    "create-gtkx": "1.4.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
     "@types/react-refresh": "^0.14.7",
-    "vitest": "^4.1.10",
-    "@gtkx/testing": "1.2.2"
+    "vitest": "^4.1.11",
+    "@gtkx/testing": "1.4.0"
   },
   "peerDependencies": {
     "react": "^19"

package/src/builder.ts

@@ -1,7 +1,7 @@
 import { join, posix } from "node:path";
 import { type InlineConfig, mergeConfig, build as viteBuild } from "vite";
-import { gtkxBuiltUrl } from "./vite-plugins/built-url.js";
-import { gtkxBundledPackages } from "./vite-plugins/bundled-packages.js";
+import { createBuildManifestCollector } from "./internal/build-manifest.js";
+import { gtkxBuildManifest } from "./vite-plugins/build-manifest.js";
 import { BUNDLE_FILENAME, ESM_EXTENSION } from "./vite-plugins/esm-extension.js";
 import { gtkxVitePlugins } from "./vite-plugins/index.js";
 import { gtkxNative } from "./vite-plugins/native.js";
@@ -10,7 +10,6 @@ import { gtkxWorker } from "./vite-plugins/worker.js";
 
 type BuildOptions = {
     entry: string;
-    assetBase?: string | undefined;
     vite?: InlineConfig | undefined;
 };
 
@@ -33,17 +32,17 @@ const buildDefaults: InlineConfig = {
 };
 
 const build = async (options: BuildOptions): Promise<string> => {
-    const { entry, assetBase, vite: viteConfig } = options;
+    const { entry, vite: viteConfig } = options;
     const root = viteConfig?.root ?? process.cwd();
     const assetsDir = viteConfig?.build?.assetsDir ?? DEFAULT_ASSETS_DIR;
+    const buildManifest = createBuildManifestCollector();
 
     const forced: InlineConfig = {
         plugins: [
-            ...gtkxVitePlugins(BUILD_MODE),
+            ...gtkxVitePlugins(BUILD_MODE, undefined, buildManifest),
             gtkxWorker(),
-            gtkxBuiltUrl(assetBase),
             gtkxNative(root),
-            gtkxBundledPackages(root),
+            gtkxBuildManifest(root, buildManifest),
             gtkxSelfContained(),
         ],
         build: {

package/src/codegen/freshness.ts

@@ -10,7 +10,7 @@ type CodegenInputs = {
     store: CodegenStore;
 };
 
-const REACT_GENERATED_MODULES: string[] = ["metadata.js", join("gtk", "gtk.js")];
+const REACT_GENERATED_MODULES: string[] = ["index.js", "metadata.js", join("gtk", "gtk.js")];
 
 const resolveCodegenInputs = (cwd: string, config: Config): CodegenInputs => {
     const girPath = resolveGirPath(config.girPath);

package/src/codegen/run-codegen.ts

@@ -7,7 +7,7 @@ import {
     resolveLazyElements,
     resolveOmittedProps,
 } from "@gtkx/config/internal";
-import { info } from "@gtkx/utils";
+import { info, warn } from "@gtkx/utils";
 import { rmSync } from "node:fs";
 import { resolve } from "node:path";
 import { resolveDataDir } from "../internal/data-dir.js";
@@ -32,6 +32,7 @@ type RunCodegenResult = {
     isRegenerated: boolean;
     namespaces: number;
     intrinsicElements: number;
+    notices: string[];
     duration: number;
     girPath?: string[] | undefined;
     configFile?: string | undefined;
@@ -45,6 +46,9 @@ type CodegenOptionsInput = {
     girPath: string[];
     elements: Config["elements"];
     isByteArrayTyped: boolean;
+    isValueUnwrapped: boolean;
+    isFinishTrimmed: boolean;
+    isInoutInPlace: boolean;
 };
 
 type PreparedCodegen = CodegenInputs & { isForced: boolean };
@@ -73,10 +77,13 @@ const removeShadowingStores = (cwd: string): void => {
     removeStores(getShadowingStorePaths(cwd));
 };
 
-const codegenOptions = ({ store, libraries, girPath, elements, isByteArrayTyped }: CodegenOptionsInput) => ({
+const codegenOptions = ({ store, libraries, girPath, elements, ...future }: CodegenOptionsInput) => ({
     libraries,
     girPath,
-    isByteArrayTyped,
+    isByteArrayTyped: future.isByteArrayTyped,
+    isValueUnwrapped: future.isValueUnwrapped,
+    isFinishTrimmed: future.isFinishTrimmed,
+    isInoutInPlace: future.isInoutInPlace,
     gi: {
         storeDir: store.giStoreDir,
         linkDir: store.giLinkDir,
@@ -106,12 +113,19 @@ const disabledCodegenResult = (configFile: string): RunCodegenResult => ({
     isRegenerated: false,
     namespaces: 0,
     intrinsicElements: 0,
+    notices: [],
     duration: 0,
     girPath: [],
     configFile,
     libraries: [],
 });
 
+const warnNotices = (notices: string[]): void => {
+    for (const notice of notices) {
+        warn(notice);
+    }
+};
+
 const regeneratedStorePaths = (store: CodegenStore): string[] => {
     if (store.react === null) {
         return [store.giStoreDir, store.giLinkDir];
@@ -142,6 +156,7 @@ const prepareCodegen = (options: RunCodegenOptions, cwd: string, config: Config)
 const runCodegen = async (options: RunCodegenOptions = {}): Promise<RunCodegenResult> => {
     const cwd = options.cwd ?? process.cwd();
     const { config, configFile } = await resolveLoadedConfig(options, cwd);
+    syncSchemaEnv(cwd, config.future?.v2ResourceImports === true);
 
     if (config.codegen === false) {
         removeShadowingStores(cwd);
@@ -162,14 +177,20 @@ const runCodegen = async (options: RunCodegenOptions = {}): Promise<RunCodegenRe
             girPath,
             elements: config.elements,
             isByteArrayTyped: config.future?.v2ByteArrays === true,
+            isValueUnwrapped: config.future?.v2ValueReturns === true,
+            isFinishTrimmed: config.future?.v2FinishResults === true,
+            isInoutInPlace: config.future?.v2InoutReturns === true,
         }),
         isForced,
     });
 
+    warnNotices(result.notices);
+
     return {
         isRegenerated: result.isRegenerated,
         namespaces: result.namespaces,
         intrinsicElements: result.intrinsicElements,
+        notices: result.notices,
         duration: result.duration,
         girPath,
         configFile,
@@ -188,8 +209,9 @@ const isCodegenDisabled = async (cwd: string, mode?: string): Promise<boolean> =
     }
 };
 
-const syncSchemaEnv = (cwd: string): void => {
-    emitSchemaEnv(cwd, resolveDataDir(cwd));
+const syncSchemaEnv = (cwd: string, isV2ResourceImports = false): void => {
+    const dataDir = isV2ResourceImports ? null : resolveDataDir(cwd);
+    emitSchemaEnv(cwd, dataDir, isV2ResourceImports);
 };
 
 const resolveInputsOrNull = (cwd: string, config: Config): CodegenInputs | null => {
@@ -223,12 +245,14 @@ const isPreflightSkipped = (options: EnsureGeneratedOptions): boolean =>
 
 /* eslint-disable-next-line unicorn/consistent-boolean-name -- the boolean reports whether codegen ran */
 const generate = async (context: CodegenContext, options: EnsureGeneratedOptions): Promise<boolean> => {
-    syncSchemaEnv(context.root);
-
     if (context.config.codegen === false) {
-        removeShadowingStores(context.root);
+        const result = await runCodegen({
+            cwd: context.root,
+            mode: options.mode,
+            resolved: { config: context.config, configFile: context.configFile },
+        });
 
-        return false;
+        return result.isRegenerated;
     }
 
     const inputs = resolveInputsOrNull(context.root, context.config);
@@ -266,7 +290,6 @@ const resolveConfigWatch = async (
 export {
     runCodegen,
     isCodegenDisabled,
-    syncSchemaEnv,
     ensureGenerated,
     ensureGeneratedIn,
     resolveConfigWatch,

package/src/commands/build.ts

@@ -13,10 +13,6 @@ const build = defineCommand({
     },
     args: {
         ...entryArg,
-        "asset-base": {
-            type: "string",
-            description: "Asset base path relative to executable directory (e.g., ../share/my-app)",
-        },
     },
     async run({ args }) {
         const { cwd, entry } = await prepareProject(args, BUILD_MODE);
@@ -24,7 +20,6 @@ const build = defineCommand({
 
         const bundlePath = await buildApp({
             entry,
-            assetBase: args["asset-base"],
             vite: {
                 root: cwd,
             },

package/src/commands/codegen.ts

@@ -1,7 +1,7 @@
 import { info } from "@gtkx/utils";
 import { defineCommand } from "citty";
 import { formatCodegenResult } from "../codegen/report.js";
-import { ensureGenerated, isCodegenDisabled, runCodegen, syncSchemaEnv } from "../codegen/run-codegen.js";
+import { ensureGenerated, isCodegenDisabled, runCodegen } from "../codegen/run-codegen.js";
 import { cwdArg, resolveCwd } from "../internal/entry-arg.js";
 
 const FORCED_WHILE_DISABLED_MESSAGE =
@@ -29,7 +29,6 @@ const codegen = defineCommand({
 
         if (isDisabled) {
             await runCodegen({ cwd });
-            syncSchemaEnv(cwd);
             info("codegen: disabled for this project; reusing an installed binding store");
 
             return;
@@ -44,7 +43,6 @@ const codegen = defineCommand({
 
         const startedAt = Date.now();
         const result = await runCodegen({ cwd, isForced: true });
-        syncSchemaEnv(cwd);
         const lines = formatCodegenResult(result, Date.now() - startedAt);
 
         for (const line of lines) {

package/src/commands/docs.ts

@@ -79,6 +79,9 @@ const docs = defineCommand({
             omittedProps: mergeOmittedProps(builtin.omittedProps, resolveOmittedProps(config.elements)),
             isForced: args.force,
             isByteArrayTyped: config.future?.v2ByteArrays === true,
+            isValueUnwrapped: config.future?.v2ValueReturns === true,
+            isFinishTrimmed: config.future?.v2FinishResults === true,
+            isInoutInPlace: config.future?.v2InoutReturns === true,
         });
 
         if (!isRegenerated) {