@gtkx/codegen 1.0.0-rc.1 → 1.0.0-rc.3

package/dist/react/element-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"element-config.d.ts","sourceRoot":"","sources":["../../src/react/element-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,oGAAoG;AACpG,KAAK,cAAc,GAAG;IAAE,SAAS,CAAC,EAAE,YAAY,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,YAAY,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAE/G,qFAAqF;AACrF,KAAK,eAAe,GAAG;IACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACpC,SAAS,EAAE,YAAY,CAAC;CAC3B,CAAC;AAsEF,QAAA,MAAM,mBAAmB,GAAU,iBAAiB,MAAM,EAAE,EAAE,YAAY,MAAM,KAAG,OAAO,CAAC,eAAe,CAUzG,CAAC;AAEF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,KAAK,cAAc,EAAE,KAAK,eAAe,EAAE,CAAC"}

package/dist/react/element-config.js

@@ -0,0 +1,64 @@
+import { readdirSync } from "node:fs";
+const CONFIG_ENTRYPOINT = "config";
+const CONFIG_SUFFIX = `/${CONFIG_ENTRYPOINT}`;
+const presentNamespaceDirs = (giStoreDir) => {
+    const dirs = new Set();
+    const entries = readdirSync(giStoreDir, { withFileTypes: true });
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            dirs.add(entry.name);
+        }
+    }
+    return dirs;
+};
+/**
+ * The clean, reconciler-free `@gtkx/react` config entrypoints to import: the base `config` entry plus
+ * each namespace's `<ns>/config` entry whose GIR namespace is present in the gi store.
+ */
+const configEntrypoints = (reactSubexports, present) => reactSubexports.filter((sub) => {
+    if (sub === CONFIG_ENTRYPOINT) {
+        return true;
+    }
+    return sub.endsWith(CONFIG_SUFFIX) && present.has(sub.slice(0, sub.length - CONFIG_SUFFIX.length));
+});
+const importBuiltinElements = async (entrypoint) => {
+    const specifier = `@gtkx/react/${entrypoint}`;
+    const imported = (await import(/* @vite-ignore */ specifier));
+    return imported.BUILTIN_ELEMENTS ?? {};
+};
+const applyBuiltinElement = (target, type, config) => {
+    if (config.component !== undefined) {
+        target.components[type] = config.component;
+    }
+    if (config.props !== undefined) {
+        target.props[type] = config.props;
+    }
+    if (config.omitProps !== undefined) {
+        target.omitProps[type] = [...(target.omitProps[type] ?? []), ...config.omitProps];
+    }
+    if (config.lazy === true) {
+        target.lazyElements.push(type);
+    }
+};
+/**
+ * Reads the framework's built-in element config by importing the freshly linked `@gtkx/react` config
+ * entrypoints. These are reconciler-free, so importing them resolves `@gtkx/gi` but never `virtual:gtkx-config`;
+ * it must run only after the gi store has been linked.
+ */
+const collectBuiltinElements = (target, elements) => {
+    for (const [type, config] of Object.entries(elements)) {
+        applyBuiltinElement(target, type, config);
+    }
+};
+const readBuiltinElements = async (reactSubexports, giStoreDir) => {
+    const present = presentNamespaceDirs(giStoreDir);
+    const entrypoints = configEntrypoints(reactSubexports, present);
+    const result = { components: {}, lazyElements: [], props: {}, omitProps: {} };
+    for (const entrypoint of entrypoints) {
+        collectBuiltinElements(result, await importBuiltinElements(entrypoint));
+    }
+    return result;
+};
+export {} from "@gtkx/react/config";
+export { readBuiltinElements };
+//# sourceMappingURL=element-config.js.map

package/dist/react/element-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"element-config.js","sourceRoot":"","sources":["../../src/react/element-config.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ModuleExport } from \"@gtkx/react/config\";\nimport { readdirSync } from \"node:fs\";\nimport type { OmittedProps } from \"../store/jsx/omitted-props.js\";\n\n/** The codegen-relevant subset of a React element config; behaviors are ignored at codegen time. */\ntype BuiltinElement = { component?: ModuleExport; lazy?: boolean; props?: ModuleExport; omitProps?: string[] };\n\n/** The framework's built-in element config, split into the maps codegen consumes. */\ntype BuiltinElements = {\n    components: Record<string, ModuleExport>;\n    lazyElements: string[];\n    props: Record<string, ModuleExport>;\n    omitProps: OmittedProps;\n};\n\nconst CONFIG_ENTRYPOINT = \"config\";\nconst CONFIG_SUFFIX = `/${CONFIG_ENTRYPOINT}`;\n\nconst presentNamespaceDirs = (giStoreDir: string): Set<string> => {\n    const dirs: Set<string> = new Set();\n    const entries = readdirSync(giStoreDir, { withFileTypes: true });\n\n    for (const entry of entries) {\n        if (entry.isDirectory()) {\n            dirs.add(entry.name);\n        }\n    }\n\n    return dirs;\n};\n\n/**\n * The clean, reconciler-free `@gtkx/react` config entrypoints to import: the base `config` entry plus\n * each namespace's `<ns>/config` entry whose GIR namespace is present in the gi store.\n */\nconst configEntrypoints = (reactSubexports: string[], present: Set<string>): string[] =>\n    reactSubexports.filter((sub) => {\n        if (sub === CONFIG_ENTRYPOINT) {\n            return true;\n        }\n\n        return sub.endsWith(CONFIG_SUFFIX) && present.has(sub.slice(0, sub.length - CONFIG_SUFFIX.length));\n    });\n\nconst importBuiltinElements = async (entrypoint: string): Promise<Record<string, BuiltinElement>> => {\n    const specifier = `@gtkx/react/${entrypoint}`;\n\n    const imported = (await import(/* @vite-ignore */ specifier)) as {\n        BUILTIN_ELEMENTS?: Record<string, BuiltinElement>;\n    };\n\n    return imported.BUILTIN_ELEMENTS ?? {};\n};\n\nconst applyBuiltinElement = (target: BuiltinElements, type: string, config: BuiltinElement): void => {\n    if (config.component !== undefined) {\n        target.components[type] = config.component;\n    }\n\n    if (config.props !== undefined) {\n        target.props[type] = config.props;\n    }\n\n    if (config.omitProps !== undefined) {\n        target.omitProps[type] = [...(target.omitProps[type] ?? []), ...config.omitProps];\n    }\n\n    if (config.lazy === true) {\n        target.lazyElements.push(type);\n    }\n};\n\n/**\n * Reads the framework's built-in element config by importing the freshly linked `@gtkx/react` config\n * entrypoints. These are reconciler-free, so importing them resolves `@gtkx/gi` but never `virtual:gtkx-config`;\n * it must run only after the gi store has been linked.\n */\nconst collectBuiltinElements = (target: BuiltinElements, elements: Record<string, BuiltinElement>): void => {\n    for (const [type, config] of Object.entries(elements)) {\n        applyBuiltinElement(target, type, config);\n    }\n};\n\nconst readBuiltinElements = async (reactSubexports: string[], giStoreDir: string): Promise<BuiltinElements> => {\n    const present = presentNamespaceDirs(giStoreDir);\n    const entrypoints = configEntrypoints(reactSubexports, present);\n    const result: BuiltinElements = { components: {}, lazyElements: [], props: {}, omitProps: {} };\n\n    for (const entrypoint of entrypoints) {\n        collectBuiltinElements(result, await importBuiltinElements(entrypoint));\n    }\n\n    return result;\n};\n\nexport { type ModuleExport } from \"@gtkx/react/config\";\nexport { readBuiltinElements, type BuiltinElement, type BuiltinElements };\n"]}

package/dist/runner.d.ts

@@ -1,23 +1,31 @@
-import type { ElementProp } from "@gtkx/config";
+import type { GiStoreOptions } from "./store/gi-store.js";
+import type { JsxStoreOptions } from "./store/jsx-store.js";
+import type { OmittedProps } from "./store/jsx/omitted-props.js";
 import { type GlGenerationReport } from "./khronos/pipeline.js";
-import { type GiStoreOptions } from "./store/gi-store.js";
-import { type JsxStoreOptions } from "./store/jsx-store.js";
-export type GlCodegenOptions = {
+type ModuleExport = {
+    module: string;
+    export: string;
+};
+type GlCodegenOptions = {
     registryPath: string;
     overrideExports: Set<string>;
     outputDir: string;
     resolveFrom: string;
 };
-export type CodegenRunnerOptions = {
+type CodegenRunnerOptions = {
     libraries?: string[];
     girPath?: string[];
-    elementProps?: Record<string, ElementProp[]> | undefined;
     gi?: GiStoreOptions;
     jsx?: JsxStoreOptions | undefined;
+    reactSubexports?: string[];
+    userComponents?: Record<string, ModuleExport>;
+    userLazyElements?: string[];
+    userProps?: Record<string, ModuleExport>;
+    userOmitProps?: OmittedProps;
     gl?: GlCodegenOptions;
     force?: boolean;
 };
-export type CodegenRunnerResult = {
+type CodegenRunnerResult = {
     regenerated: boolean;
     namespaces: number;
     intrinsicElements: number;
@@ -27,11 +35,12 @@ export type CodegenRunnerResult = {
 /**
  * Runs the `@gtkx` code generators, producing the `@gtkx/gi`, `@gtkx/jsx`, and `@gtkx/gl` bindings from the
  * configured GObject-introspection libraries and OpenGL registry. The gi store is regenerated only when its
- * fingerprint is stale unless `options.force` is set, while the OpenGL modules are regenerated whenever
- * `options.gl` is provided.
+ * fingerprint is stale unless `options.force` is set, then the jsx store is regenerated when the gi store or
+ * the React element config changed; the OpenGL modules are regenerated whenever `options.gl` is provided.
  *
  * @param options - What to generate and where to write it.
  * @returns A summary of what was regenerated and how long the run took.
  */
-export declare const runCodegen: (options: CodegenRunnerOptions) => Promise<CodegenRunnerResult>;
+declare const runCodegen: (options: CodegenRunnerOptions) => Promise<CodegenRunnerResult>;
+export { runCodegen, type GlCodegenOptions, type CodegenRunnerOptions, type CodegenRunnerResult };
 //# sourceMappingURL=runner.d.ts.map

package/dist/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAKhD,OAAO,EAAE,KAAK,kBAAkB,EAAqB,MAAM,uBAAuB,CAAC;AAEnF,OAAO,EAAyB,KAAK,cAAc,EAAgB,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,sBAAsB,CAAC;AAG3E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,GAAG,SAAS,CAAC;IACzD,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,GAAG,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IAClC,EAAE,CAAC,EAAE,gBAAgB,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACvC,CAAC;AAOF;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,YAAmB,oBAAoB,KAAG,OAAO,CAAC,mBAAmB,CAW3F,CAAC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAKjE,OAAO,EAAqB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEnF,KAAK,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvD,KAAK,gBAAgB,GAAG;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,GAAG,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IAClC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC9C,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,EAAE,CAAC,EAAE,gBAAgB,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACvC,CAAC;AAQF;;;;;;;;GAQG;AACH,QAAA,MAAM,UAAU,GAAU,SAAS,oBAAoB,KAAG,OAAO,CAAC,mBAAmB,CAYpF,CAAC;AAmGF,OAAO,EAAE,UAAU,EAAE,KAAK,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,CAAC"}

package/dist/runner.js

@@ -1,31 +1,27 @@
 import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { checkModules } from "./compile.js";
-import { computeFingerprint, isStoreFresh } from "./fingerprint.js";
+import { isGiStoreFresh } from "./fingerprint.js";
+import { runGiCodegen } from "./gi.js";
 import { Library } from "./gir/library.js";
-import { namespaceDirectory } from "./gir/namespace.js";
 import { generateGlModules } from "./khronos/pipeline.js";
-import { generateNamespaceModule } from "./store/gi/pipeline.js";
-import { writeGiStore } from "./store/gi-store.js";
-import { writeJsxStore } from "./store/jsx-store.js";
-import { generateJsxFiles } from "./store/react/pipeline.js";
 /**
  * Runs the `@gtkx` code generators, producing the `@gtkx/gi`, `@gtkx/jsx`, and `@gtkx/gl` bindings from the
  * configured GObject-introspection libraries and OpenGL registry. The gi store is regenerated only when its
- * fingerprint is stale unless `options.force` is set, while the OpenGL modules are regenerated whenever
- * `options.gl` is provided.
+ * fingerprint is stale unless `options.force` is set, then the jsx store is regenerated when the gi store or
+ * the React element config changed; the OpenGL modules are regenerated whenever `options.gl` is provided.
  *
  * @param options - What to generate and where to write it.
  * @returns A summary of what was regenerated and how long the run took.
  */
-export const runCodegen = async (options) => {
+const runCodegen = async (options) => {
     const start = Date.now();
     const gl = options.gl === undefined ? undefined : emitGlModules(options.gl);
-    const gi = emitGiStoreIfStale(options);
+    const store = await emitStores(options);
     return {
-        regenerated: gi !== undefined,
-        namespaces: gi?.namespaces ?? 0,
-        intrinsicElements: gi?.intrinsicElements ?? 0,
+        regenerated: store.regenerated,
+        namespaces: store.namespaces,
+        intrinsicElements: store.intrinsicElements,
         duration: Date.now() - start,
         gl,
     };
@@ -46,40 +42,49 @@ const emitGlModules = (options) => {
     }
     return report;
 };
-const emitGiStoreIfStale = (options) => {
-    const { gi, libraries, girPath } = options;
-    if (gi === undefined || libraries === undefined || girPath === undefined)
-        return undefined;
-    const elementProps = options.elementProps ?? {};
-    if (options.force !== true && isStoreFresh(gi.storeDir, libraries, elementProps))
-        return undefined;
-    const library = Library.load(libraries, girPath);
-    emitGiStore(gi, libraries, elementProps, library);
+const jsxUserOptions = (options) => ({
+    reactSubexports: options.reactSubexports ?? [],
+    userComponents: options.userComponents ?? {},
+    userLazyElements: options.userLazyElements ?? [],
+    userProps: options.userProps ?? {},
+    userOmitProps: options.userOmitProps ?? {},
+});
+const emitJsxStore = async (input) => {
+    const { options, jsx, gi, loadLibrary, giRegenerated, namespaces } = input;
+    const { runJsxCodegen } = await import("./jsx.js");
+    const jsxResult = await runJsxCodegen({
+        getLibrary: loadLibrary,
+        jsx,
+        giStoreDir: gi.storeDir,
+        ...jsxUserOptions(options),
+        giRegenerated,
+        force: options.force === true,
+    });
     return {
-        namespaces: library.namespaces.size,
-        intrinsicElements: emitJsxStore(options.jsx, elementProps, library),
+        regenerated: giRegenerated || jsxResult.regenerated,
+        namespaces,
+        intrinsicElements: jsxResult.intrinsicElementCount,
     };
 };
-const emitGiStore = (gi, libraries, elementProps, library) => {
-    const namespaces = [];
-    for (const namespace of library.namespaces.values()) {
-        namespaces.push({
-            directory: namespaceDirectory(namespace),
-            rawSource: generateNamespaceModule(namespace, library),
-        });
+const emitStoresWithConfig = async (config) => {
+    const { options, gi, jsx, libraries, girPath } = config;
+    let library;
+    const loadLibrary = () => (library ??= Library.load(libraries, girPath));
+    const isGiRegenerated = options.force === true || !isGiStoreFresh(gi.storeDir, libraries, girPath);
+    const namespaces = isGiRegenerated
+        ? runGiCodegen(loadLibrary(), { gi, libraries, girPath })
+        : 0;
+    if (jsx === undefined) {
+        return { regenerated: isGiRegenerated, namespaces, intrinsicElements: 0 };
     }
-    const libs = [...libraries];
-    writeGiStore(gi, namespaces, {
-        value: computeFingerprint(library.girFiles, libs, elementProps),
-        girFiles: library.girFiles,
-        libraries: libs,
-    });
+    return emitJsxStore({ options, jsx, gi, loadLibrary, giRegenerated: isGiRegenerated, namespaces });
 };
-const emitJsxStore = (jsx, elementProps, library) => {
-    if (jsx === undefined)
-        return 0;
-    const reactPipeline = generateJsxFiles(library, elementProps);
-    writeJsxStore(jsx, reactPipeline.namespaces, reactPipeline.metadata);
-    return reactPipeline.intrinsicElementCount;
+const emitStores = async (options) => {
+    const { gi, jsx, libraries, girPath } = options;
+    if (gi === undefined || libraries === undefined || girPath === undefined) {
+        return { regenerated: false, namespaces: 0, intrinsicElements: 0 };
+    }
+    return emitStoresWithConfig({ options, gi, jsx, libraries, girPath });
 };
+export { runCodegen };
 //# sourceMappingURL=runner.js.map

package/dist/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"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","sourcesContent":["import { mkdirSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport type { ElementProp } from \"@gtkx/config\";\nimport { checkModules } from \"./compile.js\";\nimport { computeFingerprint, isStoreFresh } from \"./fingerprint.js\";\nimport { Library } from \"./gir/library.js\";\nimport { namespaceDirectory } from \"./gir/namespace.js\";\nimport { type GlGenerationReport, generateGlModules } from \"./khronos/pipeline.js\";\nimport { generateNamespaceModule } from \"./store/gi/pipeline.js\";\nimport { type GiNamespaceInput, type GiStoreOptions, writeGiStore } from \"./store/gi-store.js\";\nimport { type JsxStoreOptions, writeJsxStore } from \"./store/jsx-store.js\";\nimport { generateJsxFiles } from \"./store/react/pipeline.js\";\n\nexport type GlCodegenOptions = {\n    registryPath: string;\n    overrideExports: Set<string>;\n    outputDir: string;\n    resolveFrom: string;\n};\n\nexport type CodegenRunnerOptions = {\n    libraries?: string[];\n    girPath?: string[];\n    elementProps?: Record<string, ElementProp[]> | undefined;\n    gi?: GiStoreOptions;\n    jsx?: JsxStoreOptions | undefined;\n    gl?: GlCodegenOptions;\n    force?: boolean;\n};\n\nexport type CodegenRunnerResult = {\n    regenerated: boolean;\n    namespaces: number;\n    intrinsicElements: number;\n    duration: number;\n    gl?: GlGenerationReport | undefined;\n};\n\ntype GiEmitResult = {\n    namespaces: number;\n    intrinsicElements: number;\n};\n\n/**\n * Runs the `@gtkx` code generators, producing the `@gtkx/gi`, `@gtkx/jsx`, and `@gtkx/gl` bindings from the\n * configured GObject-introspection libraries and OpenGL registry. The gi store is regenerated only when its\n * fingerprint is stale unless `options.force` is set, while the OpenGL modules are regenerated whenever\n * `options.gl` is provided.\n *\n * @param options - What to generate and where to write it.\n * @returns A summary of what was regenerated and how long the run took.\n */\nexport const runCodegen = async (options: CodegenRunnerOptions): Promise<CodegenRunnerResult> => {\n    const start = Date.now();\n    const gl = options.gl === undefined ? undefined : emitGlModules(options.gl);\n    const gi = emitGiStoreIfStale(options);\n    return {\n        regenerated: gi !== undefined,\n        namespaces: gi?.namespaces ?? 0,\n        intrinsicElements: gi?.intrinsicElements ?? 0,\n        duration: Date.now() - start,\n        gl,\n    };\n};\n\nconst emitGlModules = (options: GlCodegenOptions): GlGenerationReport => {\n    const { files, report } = generateGlModules({\n        registryPath: options.registryPath,\n        overrideExports: options.overrideExports,\n    });\n    checkModules({\n        modules: [...files].map(([fileName, source]) => ({ fileName, source })),\n        resolveFrom: options.resolveFrom,\n        label: \"the generated gl modules\",\n    });\n    mkdirSync(options.outputDir, { recursive: true });\n    for (const [fileName, source] of files) {\n        writeFileSync(join(options.outputDir, fileName), source);\n    }\n    return report;\n};\n\nconst emitGiStoreIfStale = (options: CodegenRunnerOptions): GiEmitResult | undefined => {\n    const { gi, libraries, girPath } = options;\n    if (gi === undefined || libraries === undefined || girPath === undefined) return undefined;\n    const elementProps = options.elementProps ?? {};\n    if (options.force !== true && isStoreFresh(gi.storeDir, libraries, elementProps)) return undefined;\n    const library = Library.load(libraries, girPath);\n    emitGiStore(gi, libraries, elementProps, library);\n    return {\n        namespaces: library.namespaces.size,\n        intrinsicElements: emitJsxStore(options.jsx, elementProps, library),\n    };\n};\n\nconst emitGiStore = (\n    gi: GiStoreOptions,\n    libraries: string[],\n    elementProps: Record<string, ElementProp[]>,\n    library: Library,\n): void => {\n    const namespaces: GiNamespaceInput[] = [];\n    for (const namespace of library.namespaces.values()) {\n        namespaces.push({\n            directory: namespaceDirectory(namespace),\n            rawSource: generateNamespaceModule(namespace, library),\n        });\n    }\n    const libs = [...libraries];\n    writeGiStore(gi, namespaces, {\n        value: computeFingerprint(library.girFiles, libs, elementProps),\n        girFiles: library.girFiles,\n        libraries: libs,\n    });\n};\n\nconst emitJsxStore = (\n    jsx: JsxStoreOptions | undefined,\n    elementProps: Record<string, ElementProp[]>,\n    library: Library,\n): number => {\n    if (jsx === undefined) return 0;\n    const reactPipeline = generateJsxFiles(library, elementProps);\n    writeJsxStore(jsx, reactPipeline.namespaces, reactPipeline.metadata);\n    return reactPipeline.intrinsicElementCount;\n};\n"]}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"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","sourcesContent":["import { mkdirSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport type { GiStoreOptions } from \"./store/gi-store.js\";\nimport type { JsxStoreOptions } from \"./store/jsx-store.js\";\nimport type { OmittedProps } from \"./store/jsx/omitted-props.js\";\nimport { checkModules } from \"./compile.js\";\nimport { isGiStoreFresh } from \"./fingerprint.js\";\nimport { runGiCodegen } from \"./gi.js\";\nimport { Library } from \"./gir/library.js\";\nimport { generateGlModules, type GlGenerationReport } from \"./khronos/pipeline.js\";\n\ntype ModuleExport = { module: string; export: string };\n\ntype GlCodegenOptions = {\n    registryPath: string;\n    overrideExports: Set<string>;\n    outputDir: string;\n    resolveFrom: string;\n};\n\ntype CodegenRunnerOptions = {\n    libraries?: string[];\n    girPath?: string[];\n    gi?: GiStoreOptions;\n    jsx?: JsxStoreOptions | undefined;\n    reactSubexports?: string[];\n    userComponents?: Record<string, ModuleExport>;\n    userLazyElements?: string[];\n    userProps?: Record<string, ModuleExport>;\n    userOmitProps?: OmittedProps;\n    gl?: GlCodegenOptions;\n    force?: boolean;\n};\n\ntype CodegenRunnerResult = {\n    regenerated: boolean;\n    namespaces: number;\n    intrinsicElements: number;\n    duration: number;\n    gl?: GlGenerationReport | undefined;\n};\n\ntype StoreResult = {\n    regenerated: boolean;\n    namespaces: number;\n    intrinsicElements: number;\n};\n\n/**\n * Runs the `@gtkx` code generators, producing the `@gtkx/gi`, `@gtkx/jsx`, and `@gtkx/gl` bindings from the\n * configured GObject-introspection libraries and OpenGL registry. The gi store is regenerated only when its\n * fingerprint is stale unless `options.force` is set, then the jsx store is regenerated when the gi store or\n * the React element config changed; the OpenGL modules are regenerated whenever `options.gl` is provided.\n *\n * @param options - What to generate and where to write it.\n * @returns A summary of what was regenerated and how long the run took.\n */\nconst runCodegen = async (options: CodegenRunnerOptions): Promise<CodegenRunnerResult> => {\n    const start = Date.now();\n    const gl = options.gl === undefined ? undefined : emitGlModules(options.gl);\n    const store = await emitStores(options);\n\n    return {\n        regenerated: store.regenerated,\n        namespaces: store.namespaces,\n        intrinsicElements: store.intrinsicElements,\n        duration: Date.now() - start,\n        gl,\n    };\n};\n\nconst emitGlModules = (options: GlCodegenOptions): GlGenerationReport => {\n    const { files, report } = generateGlModules({\n        registryPath: options.registryPath,\n        overrideExports: options.overrideExports,\n    });\n\n    checkModules({\n        modules: [...files].map(([fileName, source]) => ({ fileName, source })),\n        resolveFrom: options.resolveFrom,\n        label: \"the generated gl modules\",\n    });\n\n    mkdirSync(options.outputDir, { recursive: true });\n\n    for (const [fileName, source] of files) {\n        writeFileSync(join(options.outputDir, fileName), source);\n    }\n\n    return report;\n};\n\nconst jsxUserOptions = (\n    options: CodegenRunnerOptions,\n): {\n    reactSubexports: string[];\n    userComponents: Record<string, ModuleExport>;\n    userLazyElements: string[];\n    userProps: Record<string, ModuleExport>;\n    userOmitProps: OmittedProps;\n} => ({\n    reactSubexports: options.reactSubexports ?? [],\n    userComponents: options.userComponents ?? {},\n    userLazyElements: options.userLazyElements ?? [],\n    userProps: options.userProps ?? {},\n    userOmitProps: options.userOmitProps ?? {},\n});\n\nconst emitJsxStore = async (input: {\n    options: CodegenRunnerOptions;\n    jsx: JsxStoreOptions;\n    gi: GiStoreOptions;\n    loadLibrary: () => Library;\n    giRegenerated: boolean;\n    namespaces: number;\n}): Promise<StoreResult> => {\n    const { options, jsx, gi, loadLibrary, giRegenerated, namespaces } = input;\n    const { runJsxCodegen } = await import(\"./jsx.js\");\n\n    const jsxResult = await runJsxCodegen({\n        getLibrary: loadLibrary,\n        jsx,\n        giStoreDir: gi.storeDir,\n        ...jsxUserOptions(options),\n        giRegenerated,\n        force: options.force === true,\n    });\n\n    return {\n        regenerated: giRegenerated || jsxResult.regenerated,\n        namespaces,\n        intrinsicElements: jsxResult.intrinsicElementCount,\n    };\n};\n\nconst emitStoresWithConfig = async (config: {\n    options: CodegenRunnerOptions;\n    gi: GiStoreOptions;\n    jsx: JsxStoreOptions | undefined;\n    libraries: string[];\n    girPath: string[];\n}): Promise<StoreResult> => {\n    const { options, gi, jsx, libraries, girPath } = config;\n    let library: Library | undefined;\n    const loadLibrary = (): Library => (library ??= Library.load(libraries, girPath));\n    const isGiRegenerated = options.force === true || !isGiStoreFresh(gi.storeDir, libraries, girPath);\n\n    const namespaces = isGiRegenerated\n        ? runGiCodegen(loadLibrary(), { gi, libraries, girPath })\n        : 0;\n\n    if (jsx === undefined) {\n        return { regenerated: isGiRegenerated, namespaces, intrinsicElements: 0 };\n    }\n\n    return emitJsxStore({ options, jsx, gi, loadLibrary, giRegenerated: isGiRegenerated, namespaces });\n};\n\nconst emitStores = async (options: CodegenRunnerOptions): Promise<StoreResult> => {\n    const { gi, jsx, libraries, girPath } = options;\n\n    if (gi === undefined || libraries === undefined || girPath === undefined) {\n        return { regenerated: false, namespaces: 0, intrinsicElements: 0 };\n    }\n\n    return emitStoresWithConfig({ options, gi, jsx, libraries, girPath });\n};\n\nexport { runCodegen, type GlCodegenOptions, type CodegenRunnerOptions, type CodegenRunnerResult };\n"]}

package/dist/store/compile-store.d.ts

@@ -1,9 +1,11 @@
 import { type SourceModule } from "../compile.js";
-export type CompileStoreParams = {
+type CompileStoreParams = {
     storeDir: string;
     files: SourceModule[];
     packageName: string;
-    exports: Record<string, unknown>;
+    /** Declare `virtual:gtkx-config` for the typecheck, needed when it follows imports into `@gtkx/react` source. */
+    configEnv?: boolean;
 };
-export declare const compileStore: (params: CompileStoreParams) => void;
+declare const compileStore: (params: CompileStoreParams) => void;
+export { compileStore, type CompileStoreParams };
 //# sourceMappingURL=compile-store.d.ts.map

package/dist/store/compile-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile-store.d.ts","sourceRoot":"","sources":["../../src/store/compile-store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAElE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,CAAC;AA4BF,eAAO,MAAM,YAAY,WAAY,kBAAkB,KAAG,IAWzD,CAAC"}
+{"version":3,"file":"compile-store.d.ts","sourceRoot":"","sources":["../../src/store/compile-store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAElE,KAAK,kBAAkB,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,iHAAiH;IACjH,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAqBF,QAAA,MAAM,YAAY,GAAI,QAAQ,kBAAkB,KAAG,IAqBlD,CAAC;AAEF,OAAO,EAAE,YAAY,EAAE,KAAK,kBAAkB,EAAE,CAAC"}

package/dist/store/compile-store.js

@@ -1,4 +1,4 @@
-import { rmSync } from "node:fs";
+import { rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { compileProject } from "../compile.js";
 const EMIT_OPTIONS = {
@@ -6,33 +6,35 @@ const EMIT_OPTIONS = {
     removeComments: false,
     sourceMap: false,
     declarationMap: false,
-    noEmitOnError: true,
     rootDir: ".",
     outDir: ".",
 };
-const selfPaths = (packageName, exportsMap, storeDir) => {
-    const paths = {};
-    for (const [key, value] of Object.entries(exportsMap)) {
-        if (key === "./package.json" || typeof value !== "object" || value === null)
-            continue;
-        const target = value.default;
-        if (typeof target !== "string")
-            continue;
-        const stem = target.replace(/^\.\//, "").replace(/\.js$/, "");
-        paths[`${packageName}${key.slice(1)}`] = [join(storeDir, stem)];
-    }
-    return paths;
+const ENV_REFERENCE_FILE = "__gtkx-env__.d.ts";
+const writeEnvReference = (storeDir) => {
+    writeFileSync(join(storeDir, ENV_REFERENCE_FILE), "/// <reference types=\"@gtkx/react/env\" />\n");
+    return () => {
+        rmSync(join(storeDir, ENV_REFERENCE_FILE), { force: true });
+    };
 };
-export const compileStore = (params) => {
-    compileProject({
-        projectDir: params.storeDir,
-        fileNames: params.files.map((file) => file.fileName),
-        compilerOptions: EMIT_OPTIONS,
-        paths: selfPaths(params.packageName, params.exports, params.storeDir),
-        label: `the generated ${params.packageName} store`,
-    });
+const compileStore = (params) => {
+    const fileNames = params.files.map((file) => file.fileName);
+    const removeEnvReference = params.configEnv === true
+        ? writeEnvReference(params.storeDir)
+        : () => undefined;
+    try {
+        compileProject({
+            projectDir: params.storeDir,
+            fileNames: params.configEnv === true ? [ENV_REFERENCE_FILE, ...fileNames] : fileNames,
+            compilerOptions: EMIT_OPTIONS,
+            label: `the generated ${params.packageName} store`,
+        });
+    }
+    finally {
+        removeEnvReference();
+    }
     for (const file of params.files) {
         rmSync(join(params.storeDir, file.fileName), { force: true });
     }
 };
+export { compileStore };
 //# sourceMappingURL=compile-store.js.map

package/dist/store/compile-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-store.js","sourceRoot":"","sources":["../../src/store/compile-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,cAAc,EAAqB,MAAM,eAAe,CAAC;AASlE,MAAM,YAAY,GAAG;IACjB,WAAW,EAAE,IAAI;IACjB,cAAc,EAAE,KAAK;IACrB,SAAS,EAAE,KAAK;IAChB,cAAc,EAAE,KAAK;IACrB,aAAa,EAAE,IAAI;IACnB,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,GAAG;CACd,CAAC;AAEF,MAAM,SAAS,GAAG,CACd,WAAmB,EACnB,UAAmC,EACnC,QAAgB,EACQ,EAAE;IAC1B,MAAM,KAAK,GAA6B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACpD,IAAI,GAAG,KAAK,gBAAgB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;YAAE,SAAS;QACtF,MAAM,MAAM,GAAI,KAA+B,CAAC,OAAO,CAAC;QACxD,IAAI,OAAO,MAAM,KAAK,QAAQ;YAAE,SAAS;QACzC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC9D,KAAK,CAAC,GAAG,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAA0B,EAAQ,EAAE;IAC7D,cAAc,CAAC;QACX,UAAU,EAAE,MAAM,CAAC,QAAQ;QAC3B,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpD,eAAe,EAAE,YAAY;QAC7B,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;QACrE,KAAK,EAAE,iBAAiB,MAAM,CAAC,WAAW,QAAQ;KACrD,CAAC,CAAC;IACH,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { rmSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { compileProject, type SourceModule } from \"../compile.js\";\n\nexport type CompileStoreParams = {\n    storeDir: string;\n    files: SourceModule[];\n    packageName: string;\n    exports: Record<string, unknown>;\n};\n\nconst EMIT_OPTIONS = {\n    declaration: true,\n    removeComments: false,\n    sourceMap: false,\n    declarationMap: false,\n    noEmitOnError: true,\n    rootDir: \".\",\n    outDir: \".\",\n};\n\nconst selfPaths = (\n    packageName: string,\n    exportsMap: Record<string, unknown>,\n    storeDir: string,\n): Record<string, string[]> => {\n    const paths: Record<string, string[]> = {};\n    for (const [key, value] of Object.entries(exportsMap)) {\n        if (key === \"./package.json\" || typeof value !== \"object\" || value === null) continue;\n        const target = (value as { default?: unknown }).default;\n        if (typeof target !== \"string\") continue;\n        const stem = target.replace(/^\\.\\//, \"\").replace(/\\.js$/, \"\");\n        paths[`${packageName}${key.slice(1)}`] = [join(storeDir, stem)];\n    }\n    return paths;\n};\n\nexport const compileStore = (params: CompileStoreParams): void => {\n    compileProject({\n        projectDir: params.storeDir,\n        fileNames: params.files.map((file) => file.fileName),\n        compilerOptions: EMIT_OPTIONS,\n        paths: selfPaths(params.packageName, params.exports, params.storeDir),\n        label: `the generated ${params.packageName} store`,\n    });\n    for (const file of params.files) {\n        rmSync(join(params.storeDir, file.fileName), { force: true });\n    }\n};\n"]}
+{"version":3,"file":"compile-store.js","sourceRoot":"","sources":["../../src/store/compile-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,cAAc,EAAqB,MAAM,eAAe,CAAC;AAUlE,MAAM,YAAY,GAAG;IACjB,WAAW,EAAE,IAAI;IACjB,cAAc,EAAE,KAAK;IACrB,SAAS,EAAE,KAAK;IAChB,cAAc,EAAE,KAAK;IACrB,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,GAAG;CACd,CAAC;AAEF,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;AAE/C,MAAM,iBAAiB,GAAG,CAAC,QAAgB,EAAgB,EAAE;IACzD,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,+CAA+C,CAAC,CAAC;IAEnG,OAAO,GAAG,EAAE;QACR,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,MAA0B,EAAQ,EAAE;IACtD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE5D,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,KAAK,IAAI;QAChD,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC;QACpC,CAAC,CAAC,GAAS,EAAE,CAAC,SAAS,CAAC;IAE5B,IAAI,CAAC;QACD,cAAc,CAAC;YACX,UAAU,EAAE,MAAM,CAAC,QAAQ;YAC3B,SAAS,EAAE,MAAM,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;YACrF,eAAe,EAAE,YAAY;YAC7B,KAAK,EAAE,iBAAiB,MAAM,CAAC,WAAW,QAAQ;SACrD,CAAC,CAAC;IACP,CAAC;YAAS,CAAC;QACP,kBAAkB,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,YAAY,EAA2B,CAAC","sourcesContent":["import { rmSync, writeFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { compileProject, type SourceModule } from \"../compile.js\";\n\ntype CompileStoreParams = {\n    storeDir: string;\n    files: SourceModule[];\n    packageName: string;\n    /** Declare `virtual:gtkx-config` for the typecheck, needed when it follows imports into `@gtkx/react` source. */\n    configEnv?: boolean;\n};\n\nconst EMIT_OPTIONS = {\n    declaration: true,\n    removeComments: false,\n    sourceMap: false,\n    declarationMap: false,\n    rootDir: \".\",\n    outDir: \".\",\n};\n\nconst ENV_REFERENCE_FILE = \"__gtkx-env__.d.ts\";\n\nconst writeEnvReference = (storeDir: string): (() => void) => {\n    writeFileSync(join(storeDir, ENV_REFERENCE_FILE), \"/// <reference types=\\\"@gtkx/react/env\\\" />\\n\");\n\n    return () => {\n        rmSync(join(storeDir, ENV_REFERENCE_FILE), { force: true });\n    };\n};\n\nconst compileStore = (params: CompileStoreParams): void => {\n    const fileNames = params.files.map((file) => file.fileName);\n\n    const removeEnvReference = params.configEnv === true\n        ? writeEnvReference(params.storeDir)\n        : (): void => undefined;\n\n    try {\n        compileProject({\n            projectDir: params.storeDir,\n            fileNames: params.configEnv === true ? [ENV_REFERENCE_FILE, ...fileNames] : fileNames,\n            compilerOptions: EMIT_OPTIONS,\n            label: `the generated ${params.packageName} store`,\n        });\n    } finally {\n        removeEnvReference();\n    }\n\n    for (const file of params.files) {\n        rmSync(join(params.storeDir, file.fileName), { force: true });\n    }\n};\n\nexport { compileStore, type CompileStoreParams };\n"]}

package/dist/store/gi/async.d.ts

@@ -1,4 +1,5 @@
 import type { GirFunction } from "../../gir/function.js";
 import type { Library } from "../../gir/library.js";
-export declare const matchAsyncFinish: (library: Library, fn: GirFunction, siblings: GirFunction[]) => GirFunction | undefined;
+declare const matchAsyncFinish: (library: Library, fn: GirFunction, siblings: GirFunction[]) => GirFunction | undefined;
+export { matchAsyncFinish };
 //# sourceMappingURL=async.d.ts.map

package/dist/store/gi/async.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"async.d.ts","sourceRoot":"","sources":["../../../src/store/gi/async.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,eAAO,MAAM,gBAAgB,YAChB,OAAO,MACZ,WAAW,YACL,WAAW,EAAE,KACxB,WAAW,GAAG,SAOhB,CAAC"}
+{"version":3,"file":"async.d.ts","sourceRoot":"","sources":["../../../src/store/gi/async.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAIpD,QAAA,MAAM,gBAAgB,GAClB,SAAS,OAAO,EAChB,IAAI,WAAW,EACf,UAAU,WAAW,EAAE,KACxB,WAAW,GAAG,SAYhB,CAAC;AA+CF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/store/gi/async.js

@@ -1,41 +1,45 @@
 import { inputParameters } from "../../analysis/param-structure.js";
-export const matchAsyncFinish = (library, fn, siblings) => {
-    if (!hasCanonicalAsyncCallback(library, fn))
+const matchAsyncFinish = (library, fn, siblings) => {
+    if (!hasCanonicalAsyncCallback(library, fn)) {
         return undefined;
-    const finishName = matchAsyncFinishName(fn, siblings);
-    if (finishName === undefined)
-        return undefined;
-    const finishFn = siblings.find((sibling) => sibling.name === finishName);
-    if (finishFn === undefined || !isPromisifiableFinish(library, finishFn))
+    }
+    const finishFn = findFinishSibling(fn, siblings);
+    if (finishFn === undefined || !isPromisifiableFinish(library, finishFn)) {
         return undefined;
+    }
     return finishFn;
 };
-const matchAsyncFinishName = (fn, siblings) => {
-    if (fn.name.endsWith("_finish"))
+const findFinishSibling = (fn, siblings) => {
+    const annotated = fn.finishFunc;
+    if (annotated !== undefined) {
+        return siblings.find((sibling) => sibling.name === annotated || sibling.cIdentifier === annotated);
+    }
+    if (fn.name.endsWith("_finish")) {
         return undefined;
+    }
     const root = fn.name.endsWith("_async") ? fn.name.slice(0, -"_async".length) : fn.name;
     const finishName = `${root}_finish`;
-    return siblings.some((sibling) => sibling.name === finishName) ? finishName : undefined;
+    return siblings.find((sibling) => sibling.name === finishName);
 };
-const hasCanonicalAsyncCallback = (library, fn) => {
-    let asyncReadyCallbacks = 0;
-    let otherCallbacks = 0;
-    for (const parameter of fn.parameters) {
-        const ref = parameter.type;
-        if (ref === undefined || library.typeOf(ref)?.kind !== "callback")
-            continue;
-        if (library.nameOf(ref)?.typeName === "AsyncReadyCallback")
-            asyncReadyCallbacks += 1;
-        else
-            otherCallbacks += 1;
+const callbackParameterName = (library, ref) => {
+    if (ref === undefined || library.typeFor(ref)?.kind !== "callback") {
+        return undefined;
     }
-    return asyncReadyCallbacks === 1 && otherCallbacks === 0;
+    return library.nameFor(ref)?.typeName;
+};
+const hasCanonicalAsyncCallback = (library, fn) => {
+    const callbackNames = fn.parameters
+        .map((parameter) => callbackParameterName(library, parameter.type))
+        .filter((name) => name !== undefined);
+    return callbackNames.length === 1 && callbackNames[0] === "AsyncReadyCallback";
 };
 const isPromisifiableFinish = (library, finishFn) => {
     const inputs = inputParameters(library, finishFn);
-    if (inputs.length !== 1)
+    if (inputs.length !== 1) {
         return false;
+    }
     const only = inputs[0];
-    return only?.parameter.type !== undefined && library.nameOf(only.parameter.type)?.typeName === "AsyncResult";
+    return only?.parameter.type !== undefined && library.nameFor(only.parameter.type)?.typeName === "AsyncResult";
 };
+export { matchAsyncFinish };
 //# sourceMappingURL=async.js.map

package/dist/store/gi/async.js.map

@@ -1 +1 @@
-{"version":3,"file":"async.js","sourceRoot":"","sources":["../../../src/store/gi/async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAIpE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,OAAgB,EAChB,EAAe,EACf,QAAuB,EACA,EAAE;IACzB,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,EAAE,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9D,MAAM,UAAU,GAAG,oBAAoB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACtD,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC/C,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IACzE,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1F,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,EAAe,EAAE,QAAuB,EAAsB,EAAE;IAC1F,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IAClD,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;IACvF,MAAM,UAAU,GAAG,GAAG,IAAI,SAAS,CAAC;IACpC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5F,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAW,EAAE;IAC7E,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,KAAK,MAAM,SAAS,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC;QAC3B,IAAI,GAAG,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,KAAK,UAAU;YAAE,SAAS;QAC5E,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,KAAK,oBAAoB;YAAE,mBAAmB,IAAI,CAAC,CAAC;;YAChF,cAAc,IAAI,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,mBAAmB,KAAK,CAAC,IAAI,cAAc,KAAK,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,QAAqB,EAAW,EAAE;IAC/E,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACvB,OAAO,IAAI,EAAE,SAAS,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,KAAK,aAAa,CAAC;AACjH,CAAC,CAAC","sourcesContent":["import { inputParameters } from \"../../analysis/param-structure.js\";\nimport type { GirFunction } from \"../../gir/function.js\";\nimport type { Library } from \"../../gir/library.js\";\n\nexport const matchAsyncFinish = (\n    library: Library,\n    fn: GirFunction,\n    siblings: GirFunction[],\n): GirFunction | undefined => {\n    if (!hasCanonicalAsyncCallback(library, fn)) return undefined;\n    const finishName = matchAsyncFinishName(fn, siblings);\n    if (finishName === undefined) return undefined;\n    const finishFn = siblings.find((sibling) => sibling.name === finishName);\n    if (finishFn === undefined || !isPromisifiableFinish(library, finishFn)) return undefined;\n    return finishFn;\n};\n\nconst matchAsyncFinishName = (fn: GirFunction, siblings: GirFunction[]): string | undefined => {\n    if (fn.name.endsWith(\"_finish\")) return undefined;\n    const root = fn.name.endsWith(\"_async\") ? fn.name.slice(0, -\"_async\".length) : fn.name;\n    const finishName = `${root}_finish`;\n    return siblings.some((sibling) => sibling.name === finishName) ? finishName : undefined;\n};\n\nconst hasCanonicalAsyncCallback = (library: Library, fn: GirFunction): boolean => {\n    let asyncReadyCallbacks = 0;\n    let otherCallbacks = 0;\n    for (const parameter of fn.parameters) {\n        const ref = parameter.type;\n        if (ref === undefined || library.typeOf(ref)?.kind !== \"callback\") continue;\n        if (library.nameOf(ref)?.typeName === \"AsyncReadyCallback\") asyncReadyCallbacks += 1;\n        else otherCallbacks += 1;\n    }\n    return asyncReadyCallbacks === 1 && otherCallbacks === 0;\n};\n\nconst isPromisifiableFinish = (library: Library, finishFn: GirFunction): boolean => {\n    const inputs = inputParameters(library, finishFn);\n    if (inputs.length !== 1) return false;\n    const only = inputs[0];\n    return only?.parameter.type !== undefined && library.nameOf(only.parameter.type)?.typeName === \"AsyncResult\";\n};\n"]}
+{"version":3,"file":"async.js","sourceRoot":"","sources":["../../../src/store/gi/async.ts"],"names":[],"mappings":"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","sourcesContent":["import type { GirFunction } from \"../../gir/function.js\";\nimport type { Library } from \"../../gir/library.js\";\nimport type { TypeId } from \"../../gir/type-id.js\";\nimport { inputParameters } from \"../../analysis/param-structure.js\";\n\nconst matchAsyncFinish = (\n    library: Library,\n    fn: GirFunction,\n    siblings: GirFunction[],\n): GirFunction | undefined => {\n    if (!hasCanonicalAsyncCallback(library, fn)) {\n        return undefined;\n    }\n\n    const finishFn = findFinishSibling(fn, siblings);\n\n    if (finishFn === undefined || !isPromisifiableFinish(library, finishFn)) {\n        return undefined;\n    }\n\n    return finishFn;\n};\n\nconst findFinishSibling = (fn: GirFunction, siblings: GirFunction[]): GirFunction | undefined => {\n    const annotated = fn.finishFunc;\n\n    if (annotated !== undefined) {\n        return siblings.find((sibling) => sibling.name === annotated || sibling.cIdentifier === annotated);\n    }\n\n    if (fn.name.endsWith(\"_finish\")) {\n        return undefined;\n    }\n\n    const root = fn.name.endsWith(\"_async\") ? fn.name.slice(0, -\"_async\".length) : fn.name;\n    const finishName = `${root}_finish`;\n\n    return siblings.find((sibling) => sibling.name === finishName);\n};\n\nconst callbackParameterName = (library: Library, ref: TypeId | undefined): string | undefined => {\n    if (ref === undefined || library.typeFor(ref)?.kind !== \"callback\") {\n        return undefined;\n    }\n\n    return library.nameFor(ref)?.typeName;\n};\n\nconst hasCanonicalAsyncCallback = (library: Library, fn: GirFunction): boolean => {\n    const callbackNames = fn.parameters\n        .map((parameter) => callbackParameterName(library, parameter.type))\n        .filter((name): name is string => name !== undefined);\n\n    return callbackNames.length === 1 && callbackNames[0] === \"AsyncReadyCallback\";\n};\n\nconst isPromisifiableFinish = (library: Library, finishFn: GirFunction): boolean => {\n    const inputs = inputParameters(library, finishFn);\n\n    if (inputs.length !== 1) {\n        return false;\n    }\n\n    const only = inputs[0];\n\n    return only?.parameter.type !== undefined && library.nameFor(only.parameter.type)?.typeName === \"AsyncResult\";\n};\n\nexport { matchAsyncFinish };\n"]}