@gtkx/codegen 1.0.0 → 1.1.0

package/dist/store/resolve-store.js

@@ -1,17 +1,26 @@
 import { existsSync, readFileSync, realpathSync } from "node:fs";
-import { dirname, join, parse } from "node:path";
+import { dirname, join, parse, relative, sep } from "node:path";
+import { sweepStagingDirs } from "../staging.js";
 const STORE_DIR = ".gtkx";
 const SCOPE = "@gtkx";
+const STORE_NAMES = ["gi", "jsx"];
+const STORE_CONSUMERS = [
+    "@gtkx/cli",
+    "@gtkx/components",
+    "@gtkx/css",
+    "@gtkx/react",
+    "@gtkx/testing",
+];
 const readManifest = (path) => JSON.parse(readFileSync(path, "utf8"));
 const subexportNames = (packageDir) => Object.keys(readManifest(join(packageDir, "package.json")).exports ?? {})
     .filter((key) => key.startsWith("./") && key !== "./package.json")
     .map((key) => key.slice(2));
-const loadPackage = (manifest) => {
+const loadPackage = (manifest, nodeModules) => {
     if (!existsSync(manifest)) {
         return null;
     }
     const real = realpathSync(manifest);
-    return { dir: dirname(real), version: readManifest(real).version ?? "0.0.0" };
+    return { dir: dirname(real), nodeModules, version: readManifest(real).version ?? "0.0.0" };
 };
 const nodeModulesChain = function* (projectRoot) {
     const { root } = parse(projectRoot);
@@ -24,42 +33,116 @@ const nodeModulesChain = function* (projectRoot) {
 };
 const resolvePackage = (projectRoot, packageName) => {
     for (const nodeModules of nodeModulesChain(projectRoot)) {
-        const found = loadPackage(join(nodeModules, packageName, "package.json"));
+        const found = loadPackage(join(nodeModules, packageName, "package.json"), nodeModules);
         if (found !== null) {
             return found;
         }
     }
-    return loadPackage(join(projectRoot, "packages", packageName.replace(/^@[^/]+\//, ""), "package.json"));
+    const unscoped = packageName.replace(/^@[^/]+\//, "");
+    return loadPackage(join(projectRoot, "packages", unscoped, "package.json"), join(projectRoot, "node_modules"));
 };
+const isWithin = (parent, child) => {
+    const path = relative(parent, child);
+    return path === "" || (path !== ".." && !path.startsWith(`..${sep}`));
+};
+const canImport = (fromNodeModules, targetNodeModules) => isWithin(dirname(targetNodeModules), dirname(fromNodeModules));
 const storeOptions = (nodeModules, name, version) => ({
     storeDir: join(nodeModules, STORE_DIR, name),
     linkDir: join(nodeModules, SCOPE, name),
     version,
 });
+const resolveRuntime = (projectRoot) => {
+    const runtime = resolvePackage(projectRoot, "@gtkx/runtime");
+    if (runtime === null) {
+        throw new Error(`Cannot resolve @gtkx/runtime from ${projectRoot}; is it installed?`);
+    }
+    return runtime;
+};
+const storeNodeModules = (runtime, react) => {
+    if (react !== null && canImport(react.nodeModules, runtime.nodeModules)) {
+        return react.nodeModules;
+    }
+    return runtime.nodeModules;
+};
+const findUnreachableConsumer = (projectRoot, nodeModules) => {
+    for (const name of STORE_CONSUMERS) {
+        const consumer = resolvePackage(projectRoot, name);
+        if (consumer !== null && !canImport(consumer.nodeModules, nodeModules)) {
+            return { name, nodeModules: consumer.nodeModules };
+        }
+    }
+    return null;
+};
+const unreachableConsumerMessage = (consumer, nodeModules) => `Cannot write the generated store to ${nodeModules}: ${consumer.name} is installed in ` +
+    `${consumer.nodeModules}, above it, so that copy can never import the generated @gtkx/gi. Install every ` +
+    "@gtkx package in one node_modules, then run gtkx codegen again.";
+const checkConsumers = (projectRoot, nodeModules) => {
+    const consumer = findUnreachableConsumer(projectRoot, nodeModules);
+    if (consumer !== null) {
+        throw new Error(unreachableConsumerMessage(consumer, nodeModules));
+    }
+};
+const jsxOptions = (react, nodeModules) => react === null ? null : storeOptions(nodeModules, "jsx", react.version);
+const getReactSubexports = (react) => react === null ? [] : subexportNames(react.dir);
+const storePaths = (nodeModules) => STORE_NAMES.flatMap((name) => [join(nodeModules, STORE_DIR, name), join(nodeModules, SCOPE, name)]);
+const findStoreNodeModules = (projectRoot) => {
+    const runtime = resolvePackage(projectRoot, "@gtkx/runtime");
+    if (runtime === null) {
+        return null;
+    }
+    return storeNodeModules(runtime, resolvePackage(projectRoot, "@gtkx/react"));
+};
+const getShadowingStorePaths = (projectRoot) => {
+    const nodeModules = join(projectRoot, "node_modules");
+    const anchored = findStoreNodeModules(projectRoot);
+    if (anchored === null || anchored === nodeModules) {
+        return [];
+    }
+    return storePaths(nodeModules);
+};
+const stagingRoots = (projectRoot) => {
+    const nodeModules = join(projectRoot, "node_modules");
+    const anchored = findStoreNodeModules(projectRoot);
+    return anchored === null || anchored === nodeModules ? [nodeModules] : [nodeModules, anchored];
+};
+const sweepProjectStaging = (projectRoot) => {
+    for (const nodeModules of stagingRoots(projectRoot)) {
+        for (const name of STORE_NAMES) {
+            sweepStagingDirs(join(nodeModules, STORE_DIR, name));
+        }
+    }
+};
 /**
  * Resolves where a project's `@gtkx/gi` and `@gtkx/jsx` stores belong, from the project root alone. The
  * result supplies every `runCodegen` input except `libraries` and `girPath`, so a caller that has
  * already resolved those can spread it straight into the call.
  *
+ * Both stores go in one `node_modules`, found by walking the project's `node_modules` chain upwards:
+ * the one `@gtkx/react` resolves from, or `@gtkx/runtime`'s when no React is installed. That is the
+ * project's own directory when it installs those packages itself, and the workspace root when npm or
+ * yarn hoisted them there. Keeping the pair together is what lets the jsx store import the gi store, and
+ * anchoring them where the `@gtkx` packages sit is what lets `@gtkx/react`, the CLI, and the project's
+ * sources all reach the bindings. A package manager that hoists therefore gives every project sharing
+ * that `node_modules` one shared store.
+ *
  * Store versions come from the installed `@gtkx/runtime` and `@gtkx/react`, so a dependency upgrade
  * invalidates the stores. Pass explicit `gi` or `jsx` options to `runCodegen` to override any of it.
  *
- * @param projectRoot Directory holding the project's `package.json` and `node_modules`.
+ * @param projectRoot Directory holding the project's `package.json`, whose `node_modules` chain is walked.
  * @returns The store locations and the React subexports that shape the jsx store.
- * @throws If `@gtkx/runtime` cannot be resolved from the project.
+ * @throws If `@gtkx/runtime` cannot be resolved from the project, or a `@gtkx` package that imports the
+ * bindings is installed above the `node_modules` the stores would go in, since it could not reach them.
  */
 const resolveStore = (projectRoot) => {
-    const runtime = resolvePackage(projectRoot, "@gtkx/runtime");
-    if (runtime === null) {
-        throw new Error(`Cannot resolve @gtkx/runtime from ${projectRoot}; is it installed?`);
-    }
+    const runtime = resolveRuntime(projectRoot);
     const react = resolvePackage(projectRoot, "@gtkx/react");
-    const nodeModules = join(projectRoot, "node_modules");
+    const nodeModules = storeNodeModules(runtime, react);
+    checkConsumers(projectRoot, nodeModules);
     return {
         gi: storeOptions(nodeModules, "gi", runtime.version),
-        jsx: react === null ? null : storeOptions(nodeModules, "jsx", react.version),
-        reactSubexports: react === null ? [] : subexportNames(react.dir),
+        jsx: jsxOptions(react, nodeModules),
+        reactSubexports: getReactSubexports(react),
     };
 };
-export { resolveStore };
+export { getShadowingStorePaths, resolveStore, sweepProjectStaging };
 //# sourceMappingURL=resolve-store.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"resolve-store.js","sourceRoot":"","sources":["../../src/store/resolve-store.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readFileSync, realpathSync } from \"node:fs\";\nimport { dirname, join, parse } from \"node:path\";\nimport type { StoreOptions } from \"./store-fs.js\";\n\n/**\n * Where a project's generated stores live, ready to spread into `runCodegen`. `jsx` is null when the\n * project has no `@gtkx/react` installed, in which case only the `@gtkx/gi` store can be generated.\n */\ntype ResolvedStore = {\n    /** Where the `@gtkx/gi` store goes, versioned by the installed `@gtkx/runtime`. */\n    gi: StoreOptions;\n    /** Where the `@gtkx/jsx` store goes, versioned by the installed `@gtkx/react`; null when it is absent. */\n    jsx: StoreOptions | null;\n    /** Subexport names of the installed `@gtkx/react`, empty when it is absent. */\n    reactSubexports: string[];\n};\n\ntype ResolvedPackage = { dir: string; version: string };\n\nconst STORE_DIR = \".gtkx\";\nconst SCOPE = \"@gtkx\";\n\nconst readManifest = (path: string): { version?: string; exports?: Record<string, unknown> } =>\n    JSON.parse(readFileSync(path, \"utf8\")) as { version?: string; exports?: Record<string, unknown> };\n\nconst subexportNames = (packageDir: string): string[] =>\n    Object.keys(readManifest(join(packageDir, \"package.json\")).exports ?? {})\n        .filter((key) => key.startsWith(\"./\") && key !== \"./package.json\")\n        .map((key) => key.slice(2));\n\nconst loadPackage = (manifest: string): ResolvedPackage | null => {\n    if (!existsSync(manifest)) {\n        return null;\n    }\n\n    const real = realpathSync(manifest);\n\n    return { dir: dirname(real), version: readManifest(real).version ?? \"0.0.0\" };\n};\n\nconst nodeModulesChain = function* (projectRoot: string): Generator<string> {\n    const { root } = parse(projectRoot);\n    let current = projectRoot;\n\n    while (current !== root) {\n        yield join(current, \"node_modules\");\n        current = dirname(current);\n    }\n\n    yield join(root, \"node_modules\");\n};\n\nconst resolvePackage = (projectRoot: string, packageName: string): ResolvedPackage | null => {\n    for (const nodeModules of nodeModulesChain(projectRoot)) {\n        const found = loadPackage(join(nodeModules, packageName, \"package.json\"));\n\n        if (found !== null) {\n            return found;\n        }\n    }\n\n    return loadPackage(join(projectRoot, \"packages\", packageName.replace(/^@[^/]+\\//, \"\"), \"package.json\"));\n};\n\nconst storeOptions = (nodeModules: string, name: string, version: string): StoreOptions => ({\n    storeDir: join(nodeModules, STORE_DIR, name),\n    linkDir: join(nodeModules, SCOPE, name),\n    version,\n});\n\n/**\n * Resolves where a project's `@gtkx/gi` and `@gtkx/jsx` stores belong, from the project root alone. The\n * result supplies every `runCodegen` input except `libraries` and `girPath`, so a caller that has\n * already resolved those can spread it straight into the call.\n *\n * Store versions come from the installed `@gtkx/runtime` and `@gtkx/react`, so a dependency upgrade\n * invalidates the stores. Pass explicit `gi` or `jsx` options to `runCodegen` to override any of it.\n *\n * @param projectRoot Directory holding the project's `package.json` and `node_modules`.\n * @returns The store locations and the React subexports that shape the jsx store.\n * @throws If `@gtkx/runtime` cannot be resolved from the project.\n */\nconst resolveStore = (projectRoot: string): ResolvedStore => {\n    const runtime = resolvePackage(projectRoot, \"@gtkx/runtime\");\n\n    if (runtime === null) {\n        throw new Error(`Cannot resolve @gtkx/runtime from ${projectRoot}; is it installed?`);\n    }\n\n    const react = resolvePackage(projectRoot, \"@gtkx/react\");\n    const nodeModules = join(projectRoot, \"node_modules\");\n\n    return {\n        gi: storeOptions(nodeModules, \"gi\", runtime.version),\n        jsx: react === null ? null : storeOptions(nodeModules, \"jsx\", react.version),\n        reactSubexports: react === null ? [] : subexportNames(react.dir),\n    };\n};\n\nexport { resolveStore, type ResolvedStore };\n"]}
+{"version":3,"file":"resolve-store.js","sourceRoot":"","sources":["../../src/store/resolve-store.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readFileSync, realpathSync } from \"node:fs\";\nimport { dirname, join, parse, relative, sep } from \"node:path\";\nimport type { StoreOptions } from \"./store-fs.js\";\nimport { sweepStagingDirs } from \"../staging.js\";\n\n/**\n * Where a project's generated stores live, ready to spread into `runCodegen`. `jsx` is null when the\n * project has no `@gtkx/react` installed, in which case only the `@gtkx/gi` store can be generated.\n */\ntype ResolvedStore = {\n    /** Where the `@gtkx/gi` store goes, versioned by the installed `@gtkx/runtime`. */\n    gi: StoreOptions;\n    /** Where the `@gtkx/jsx` store goes, versioned by the installed `@gtkx/react`; null when it is absent. */\n    jsx: StoreOptions | null;\n    /** Subexport names of the installed `@gtkx/react`, empty when it is absent. */\n    reactSubexports: string[];\n};\n\ntype ResolvedPackage = { dir: string; nodeModules: string; version: string };\ntype StoreConsumer = { name: string; nodeModules: string };\n\nconst STORE_DIR = \".gtkx\";\nconst SCOPE = \"@gtkx\";\nconst STORE_NAMES: string[] = [\"gi\", \"jsx\"];\n\nconst STORE_CONSUMERS: string[] = [\n    \"@gtkx/cli\",\n    \"@gtkx/components\",\n    \"@gtkx/css\",\n    \"@gtkx/react\",\n    \"@gtkx/testing\",\n];\n\nconst readManifest = (path: string): { version?: string; exports?: Record<string, unknown> } =>\n    JSON.parse(readFileSync(path, \"utf8\")) as { version?: string; exports?: Record<string, unknown> };\n\nconst subexportNames = (packageDir: string): string[] =>\n    Object.keys(readManifest(join(packageDir, \"package.json\")).exports ?? {})\n        .filter((key) => key.startsWith(\"./\") && key !== \"./package.json\")\n        .map((key) => key.slice(2));\n\nconst loadPackage = (manifest: string, nodeModules: string): ResolvedPackage | null => {\n    if (!existsSync(manifest)) {\n        return null;\n    }\n\n    const real = realpathSync(manifest);\n\n    return { dir: dirname(real), nodeModules, version: readManifest(real).version ?? \"0.0.0\" };\n};\n\nconst nodeModulesChain = function* (projectRoot: string): Generator<string> {\n    const { root } = parse(projectRoot);\n    let current = projectRoot;\n\n    while (current !== root) {\n        yield join(current, \"node_modules\");\n        current = dirname(current);\n    }\n\n    yield join(root, \"node_modules\");\n};\n\nconst resolvePackage = (projectRoot: string, packageName: string): ResolvedPackage | null => {\n    for (const nodeModules of nodeModulesChain(projectRoot)) {\n        const found = loadPackage(join(nodeModules, packageName, \"package.json\"), nodeModules);\n\n        if (found !== null) {\n            return found;\n        }\n    }\n\n    const unscoped = packageName.replace(/^@[^/]+\\//, \"\");\n\n    return loadPackage(join(projectRoot, \"packages\", unscoped, \"package.json\"), join(projectRoot, \"node_modules\"));\n};\n\nconst isWithin = (parent: string, child: string): boolean => {\n    const path = relative(parent, child);\n\n    return path === \"\" || (path !== \"..\" && !path.startsWith(`..${sep}`));\n};\n\nconst canImport = (fromNodeModules: string, targetNodeModules: string): boolean =>\n    isWithin(dirname(targetNodeModules), dirname(fromNodeModules));\n\nconst storeOptions = (nodeModules: string, name: string, version: string): StoreOptions => ({\n    storeDir: join(nodeModules, STORE_DIR, name),\n    linkDir: join(nodeModules, SCOPE, name),\n    version,\n});\n\nconst resolveRuntime = (projectRoot: string): ResolvedPackage => {\n    const runtime = resolvePackage(projectRoot, \"@gtkx/runtime\");\n\n    if (runtime === null) {\n        throw new Error(`Cannot resolve @gtkx/runtime from ${projectRoot}; is it installed?`);\n    }\n\n    return runtime;\n};\n\nconst storeNodeModules = (runtime: ResolvedPackage, react: ResolvedPackage | null): string => {\n    if (react !== null && canImport(react.nodeModules, runtime.nodeModules)) {\n        return react.nodeModules;\n    }\n\n    return runtime.nodeModules;\n};\n\nconst findUnreachableConsumer = (projectRoot: string, nodeModules: string): StoreConsumer | null => {\n    for (const name of STORE_CONSUMERS) {\n        const consumer = resolvePackage(projectRoot, name);\n\n        if (consumer !== null && !canImport(consumer.nodeModules, nodeModules)) {\n            return { name, nodeModules: consumer.nodeModules };\n        }\n    }\n\n    return null;\n};\n\nconst unreachableConsumerMessage = (consumer: StoreConsumer, nodeModules: string): string =>\n    `Cannot write the generated store to ${nodeModules}: ${consumer.name} is installed in ` +\n    `${consumer.nodeModules}, above it, so that copy can never import the generated @gtkx/gi. Install every ` +\n    \"@gtkx package in one node_modules, then run gtkx codegen again.\";\n\nconst checkConsumers = (projectRoot: string, nodeModules: string): void => {\n    const consumer = findUnreachableConsumer(projectRoot, nodeModules);\n\n    if (consumer !== null) {\n        throw new Error(unreachableConsumerMessage(consumer, nodeModules));\n    }\n};\n\nconst jsxOptions = (react: ResolvedPackage | null, nodeModules: string): StoreOptions | null =>\n    react === null ? null : storeOptions(nodeModules, \"jsx\", react.version);\n\nconst getReactSubexports = (react: ResolvedPackage | null): string[] =>\n    react === null ? [] : subexportNames(react.dir);\n\nconst storePaths = (nodeModules: string): string[] =>\n    STORE_NAMES.flatMap((name) => [join(nodeModules, STORE_DIR, name), join(nodeModules, SCOPE, name)]);\n\nconst findStoreNodeModules = (projectRoot: string): string | null => {\n    const runtime = resolvePackage(projectRoot, \"@gtkx/runtime\");\n\n    if (runtime === null) {\n        return null;\n    }\n\n    return storeNodeModules(runtime, resolvePackage(projectRoot, \"@gtkx/react\"));\n};\n\nconst getShadowingStorePaths = (projectRoot: string): string[] => {\n    const nodeModules = join(projectRoot, \"node_modules\");\n    const anchored = findStoreNodeModules(projectRoot);\n\n    if (anchored === null || anchored === nodeModules) {\n        return [];\n    }\n\n    return storePaths(nodeModules);\n};\n\nconst stagingRoots = (projectRoot: string): string[] => {\n    const nodeModules = join(projectRoot, \"node_modules\");\n    const anchored = findStoreNodeModules(projectRoot);\n\n    return anchored === null || anchored === nodeModules ? [nodeModules] : [nodeModules, anchored];\n};\n\nconst sweepProjectStaging = (projectRoot: string): void => {\n    for (const nodeModules of stagingRoots(projectRoot)) {\n        for (const name of STORE_NAMES) {\n            sweepStagingDirs(join(nodeModules, STORE_DIR, name));\n        }\n    }\n};\n\n/**\n * Resolves where a project's `@gtkx/gi` and `@gtkx/jsx` stores belong, from the project root alone. The\n * result supplies every `runCodegen` input except `libraries` and `girPath`, so a caller that has\n * already resolved those can spread it straight into the call.\n *\n * Both stores go in one `node_modules`, found by walking the project's `node_modules` chain upwards:\n * the one `@gtkx/react` resolves from, or `@gtkx/runtime`'s when no React is installed. That is the\n * project's own directory when it installs those packages itself, and the workspace root when npm or\n * yarn hoisted them there. Keeping the pair together is what lets the jsx store import the gi store, and\n * anchoring them where the `@gtkx` packages sit is what lets `@gtkx/react`, the CLI, and the project's\n * sources all reach the bindings. A package manager that hoists therefore gives every project sharing\n * that `node_modules` one shared store.\n *\n * Store versions come from the installed `@gtkx/runtime` and `@gtkx/react`, so a dependency upgrade\n * invalidates the stores. Pass explicit `gi` or `jsx` options to `runCodegen` to override any of it.\n *\n * @param projectRoot Directory holding the project's `package.json`, whose `node_modules` chain is walked.\n * @returns The store locations and the React subexports that shape the jsx store.\n * @throws If `@gtkx/runtime` cannot be resolved from the project, or a `@gtkx` package that imports the\n * bindings is installed above the `node_modules` the stores would go in, since it could not reach them.\n */\nconst resolveStore = (projectRoot: string): ResolvedStore => {\n    const runtime = resolveRuntime(projectRoot);\n    const react = resolvePackage(projectRoot, \"@gtkx/react\");\n    const nodeModules = storeNodeModules(runtime, react);\n    checkConsumers(projectRoot, nodeModules);\n\n    return {\n        gi: storeOptions(nodeModules, \"gi\", runtime.version),\n        jsx: jsxOptions(react, nodeModules),\n        reactSubexports: getReactSubexports(react),\n    };\n};\n\nexport { getShadowingStorePaths, resolveStore, sweepProjectStaging, type ResolvedStore };\n"]}

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

@@ -1,3 +1,4 @@
+import { type SourceModule } from "../compile.js";
 /** Where one generated store is written and how it is reached. */
 type StoreOptions = {
     /** Directory the generated package is written to, replaced atomically on each run. */
@@ -7,10 +8,7 @@ type StoreOptions = {
     /** Version stamped on the store's `package.json`, taken from the dependency the store is generated for. */
     version: string;
 };
-type StoreFile = {
-    fileName: string;
-    source: string;
-};
+type StoreLink = Pick<StoreOptions, "storeDir" | "linkDir">;
 type Manifest = {
     name: string;
     type: "module";
@@ -32,7 +30,7 @@ type RawFile = {
 type WriteStoreParams = {
     storeDir: string;
     linkDir: string;
-    files: StoreFile[];
+    files: SourceModule[];
     manifest: Manifest;
     rawFiles?: RawFile[];
     requiresEnvReference?: boolean;
@@ -41,7 +39,12 @@ declare const subpathExport: (stem: string) => {
     types: string;
     default: string;
 };
+declare const namespaceBarrel: (directory: string) => {
+    fileName: string;
+    source: string;
+};
 declare const buildManifest: (input: ManifestInput) => Manifest;
 declare const writeStore: (params: WriteStoreParams) => void;
-export { subpathExport, buildManifest, writeStore, type StoreOptions, type RawFile };
+declare const ensureStoreLink: (link: StoreLink) => void;
+export { subpathExport, buildManifest, ensureStoreLink, namespaceBarrel, writeStore, type StoreOptions, type RawFile, };
 //# sourceMappingURL=store-fs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"store-fs.d.ts","sourceRoot":"","sources":["../../src/store/store-fs.ts"],"names":[],"mappings":"AAIA,kEAAkE;AAClE,KAAK,YAAY,GAAG;IAChB,sFAAsF;IACtF,QAAQ,EAAE,MAAM,CAAC;IACjB,uGAAuG;IACvG,OAAO,EAAE,MAAM,CAAC;IAChB,2GAA2G;IAC3G,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,IAAI,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7C,CAAC;AAEF,KAAK,aAAa,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7C,CAAC;AAEF,KAAK,OAAO,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD,KAAK,gBAAgB,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAIF,QAAA,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAGpE,CAAC;AAEH,QAAA,MAAM,aAAa,GAAI,OAAO,aAAa,KAAG,QAc7C,CAAC;AAEF,QAAA,MAAM,UAAU,GAAI,QAAQ,gBAAgB,KAAG,IA0B9C,CAAC;AAuCF,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,OAAO,EAAE,CAAC"}
+{"version":3,"file":"store-fs.d.ts","sourceRoot":"","sources":["../../src/store/store-fs.ts"],"names":[],"mappings":"AAYA,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAIrE,kEAAkE;AAClE,KAAK,YAAY,GAAG;IAChB,sFAAsF;IACtF,QAAQ,EAAE,MAAM,CAAC;IACjB,uGAAuG;IACvG,OAAO,EAAE,MAAM,CAAC;IAChB,2GAA2G;IAC3G,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC,CAAC;AAE5D,KAAK,QAAQ,GAAG;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,IAAI,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7C,CAAC;AAEF,KAAK,aAAa,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7C,CAAC;AAEF,KAAK,OAAO,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD,KAAK,gBAAgB,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAKF,QAAA,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAGpE,CAAC;AAEH,QAAA,MAAM,eAAe,GAAI,WAAW,MAAM,KAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAG7E,CAAC;AAEH,QAAA,MAAM,aAAa,GAAI,OAAO,aAAa,KAAG,QAc7C,CAAC;AAEF,QAAA,MAAM,UAAU,GAAI,QAAQ,gBAAgB,KAAG,IAa9C,CAAC;AA0DF,QAAA,MAAM,eAAe,GAAI,MAAM,SAAS,KAAG,IAM1C,CAAC;AAkBF,OAAO,EACH,aAAa,EACb,aAAa,EACb,eAAe,EACf,eAAe,EACf,UAAU,EACV,KAAK,YAAY,EACjB,KAAK,OAAO,GACf,CAAC"}

package/dist/store/store-fs.js

@@ -1,11 +1,19 @@
-import { chmodSync, existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
+import { errorMessage } from "@gtkx/utils";
+import { chmodSync, existsSync, mkdirSync, realpathSync, renameSync, rmSync, symlinkSync, writeFileSync, } from "node:fs";
 import { dirname, join, relative } from "node:path";
+import { keepFailedProject } from "../compile.js";
+import { createStagingDir } from "../staging.js";
 import { compileStore } from "./compile-store.js";
 const STORE_DIR_MODE = 0o755;
+const FAILED_STORE_SUFFIX = ".failed";
 const subpathExport = (stem) => ({
     types: `./${stem}.d.ts`,
     default: `./${stem}.js`,
 });
+const namespaceBarrel = (directory) => ({
+    fileName: `${directory}/index.ts`,
+    source: `export * from "./${directory}.js";\n`,
+});
 const buildManifest = (input) => {
     const manifest = {
         name: input.name,
@@ -21,25 +29,31 @@ const buildManifest = (input) => {
 };
 const writeStore = (params) => {
     const tmp = createTempStore(params.storeDir);
+    const keepAt = `${params.storeDir}${FAILED_STORE_SUFFIX}`;
     try {
-        for (const file of params.files) {
-            writeSourceFile(tmp, file.fileName, file.source);
-        }
-        compileStore({
-            storeDir: tmp,
-            files: params.files,
-            packageName: params.manifest.name,
-            ...(params.requiresEnvReference !== undefined && { requiresEnvReference: params.requiresEnvReference }),
-        });
-        writePackageJson(tmp, params.manifest);
-        const rawFiles = params.rawFiles ?? [];
-        for (const raw of rawFiles) {
-            writeFileSync(join(tmp, raw.relativePath), raw.content);
-        }
-        swapStore(tmp, params.storeDir, params.linkDir);
+        buildTempStore(tmp, params);
+        swapStore(tmp, params.storeDir);
+        ensureStoreLink(params);
+    }
+    catch (error) {
+        throw keepFailedProject({ projectDir: tmp, keepAt, error });
+    }
+    rmSync(keepAt, { recursive: true, force: true });
+};
+const buildTempStore = (tmp, params) => {
+    for (const file of params.files) {
+        writeSourceFile(tmp, file.fileName, file.source);
     }
-    finally {
-        rmSync(tmp, { recursive: true, force: true });
+    compileStore({
+        storeDir: tmp,
+        files: params.files,
+        packageName: params.manifest.name,
+        ...(params.requiresEnvReference !== undefined && { requiresEnvReference: params.requiresEnvReference }),
+    });
+    writePackageJson(tmp, params.manifest);
+    const rawFiles = params.rawFiles ?? [];
+    for (const raw of rawFiles) {
+        writeFileSync(join(tmp, raw.relativePath), raw.content);
     }
 };
 const writeSourceFile = (storeDir, fileName, source) => {
@@ -55,7 +69,7 @@ const symlinkRelative = (linkPath, realTarget) => {
 const writePackageJson = (storeDir, manifest) => {
     writeFileSync(join(storeDir, "package.json"), `${JSON.stringify(manifest, null, 2)}\n`);
 };
-const swapStore = (tmp, storeDir, visibleLink) => {
+const swapStore = (tmp, storeDir) => {
     const previous = `${storeDir}.old`;
     rmSync(previous, { recursive: true, force: true });
     if (existsSync(storeDir)) {
@@ -63,13 +77,33 @@ const swapStore = (tmp, storeDir, visibleLink) => {
     }
     renameSync(tmp, storeDir);
     rmSync(previous, { recursive: true, force: true });
-    symlinkRelative(visibleLink, storeDir);
 };
+const isStoreLinked = (link) => {
+    try {
+        return realpathSync(link.linkDir) === realpathSync(link.storeDir);
+    }
+    catch {
+        return false;
+    }
+};
+const ensureStoreLink = (link) => {
+    if (!existsSync(join(link.storeDir, "package.json")) || isStoreLinked(link)) {
+        return;
+    }
+    symlinkRelative(link.linkDir, link.storeDir);
+};
+const storeWriteMessage = (storeDir, error) => `Cannot write the generated store to ${storeDir}: ${errorMessage(error)}. ` +
+    "Codegen writes the store into the node_modules the @gtkx packages resolve from, " +
+    `so ${dirname(storeDir)} has to be writable.`;
 const createTempStore = (storeDir) => {
-    mkdirSync(dirname(storeDir), { recursive: true });
-    const tmp = mkdtempSync(`${storeDir}.tmp-`);
-    chmodSync(tmp, STORE_DIR_MODE);
-    return tmp;
+    try {
+        const tmp = createStagingDir(storeDir);
+        chmodSync(tmp, STORE_DIR_MODE);
+        return tmp;
+    }
+    catch (error) {
+        throw new Error(storeWriteMessage(storeDir, error), { cause: error });
+    }
 };
-export { subpathExport, buildManifest, writeStore };
+export { subpathExport, buildManifest, ensureStoreLink, namespaceBarrel, writeStore, };
 //# sourceMappingURL=store-fs.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"store-fs.js","sourceRoot":"","sources":["../../src/store/store-fs.ts"],"names":[],"mappings":"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","sourcesContent":["import { chmodSync, existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, symlinkSync, writeFileSync } from \"node:fs\";\nimport { dirname, join, relative } from \"node:path\";\nimport { compileStore } from \"./compile-store.js\";\n\n/** Where one generated store is written and how it is reached. */\ntype StoreOptions = {\n    /** Directory the generated package is written to, replaced atomically on each run. */\n    storeDir: string;\n    /** Path the store is symlinked at, which is the specifier's resolution target under `node_modules`. */\n    linkDir: string;\n    /** Version stamped on the store's `package.json`, taken from the dependency the store is generated for. */\n    version: string;\n};\n\ntype StoreFile = {\n    fileName: string;\n    source: string;\n};\n\ntype Manifest = {\n    name: string;\n    type: \"module\";\n    version: string;\n    sideEffects: true;\n    exports: Record<string, unknown>;\n    peerDependencies?: Record<string, string>;\n};\n\ntype ManifestInput = {\n    name: string;\n    version: string;\n    exports: Record<string, unknown>;\n    peerDependencies?: Record<string, string>;\n};\n\ntype RawFile = { relativePath: string; content: string };\n\ntype WriteStoreParams = {\n    storeDir: string;\n    linkDir: string;\n    files: StoreFile[];\n    manifest: Manifest;\n    rawFiles?: RawFile[];\n    requiresEnvReference?: boolean;\n};\n\nconst STORE_DIR_MODE = 0o755;\n\nconst subpathExport = (stem: string): { types: string; default: string } => ({\n    types: `./${stem}.d.ts`,\n    default: `./${stem}.js`,\n});\n\nconst buildManifest = (input: ManifestInput): Manifest => {\n    const manifest: Manifest = {\n        name: input.name,\n        type: \"module\",\n        version: input.version,\n        sideEffects: true,\n        exports: { \"./package.json\": \"./package.json\", ...input.exports },\n    };\n\n    if (input.peerDependencies) {\n        manifest.peerDependencies = input.peerDependencies;\n    }\n\n    return manifest;\n};\n\nconst writeStore = (params: WriteStoreParams): void => {\n    const tmp = createTempStore(params.storeDir);\n\n    try {\n        for (const file of params.files) {\n            writeSourceFile(tmp, file.fileName, file.source);\n        }\n\n        compileStore({\n            storeDir: tmp,\n            files: params.files,\n            packageName: params.manifest.name,\n            ...(params.requiresEnvReference !== undefined && { requiresEnvReference: params.requiresEnvReference }),\n        });\n\n        writePackageJson(tmp, params.manifest);\n        const rawFiles = params.rawFiles ?? [];\n\n        for (const raw of rawFiles) {\n            writeFileSync(join(tmp, raw.relativePath), raw.content);\n        }\n\n        swapStore(tmp, params.storeDir, params.linkDir);\n    } finally {\n        rmSync(tmp, { recursive: true, force: true });\n    }\n};\n\nconst writeSourceFile = (storeDir: string, fileName: string, source: string): void => {\n    const filePath = join(storeDir, fileName);\n    mkdirSync(dirname(filePath), { recursive: true });\n    writeFileSync(filePath, source);\n};\n\nconst symlinkRelative = (linkPath: string, realTarget: string): void => {\n    mkdirSync(dirname(linkPath), { recursive: true });\n    rmSync(linkPath, { recursive: true, force: true });\n    symlinkSync(relative(dirname(linkPath), realTarget), linkPath, \"dir\");\n};\n\nconst writePackageJson = (storeDir: string, manifest: Manifest): void => {\n    writeFileSync(join(storeDir, \"package.json\"), `${JSON.stringify(manifest, null, 2)}\\n`);\n};\n\nconst swapStore = (tmp: string, storeDir: string, visibleLink: string): void => {\n    const previous = `${storeDir}.old`;\n    rmSync(previous, { recursive: true, force: true });\n\n    if (existsSync(storeDir)) {\n        renameSync(storeDir, previous);\n    }\n\n    renameSync(tmp, storeDir);\n    rmSync(previous, { recursive: true, force: true });\n    symlinkRelative(visibleLink, storeDir);\n};\n\nconst createTempStore = (storeDir: string): string => {\n    mkdirSync(dirname(storeDir), { recursive: true });\n    const tmp = mkdtempSync(`${storeDir}.tmp-`);\n    chmodSync(tmp, STORE_DIR_MODE);\n\n    return tmp;\n};\n\nexport { subpathExport, buildManifest, writeStore, type StoreOptions, type RawFile };\n"]}
+{"version":3,"file":"store-fs.js","sourceRoot":"","sources":["../../src/store/store-fs.ts"],"names":[],"mappings":"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","sourcesContent":["import { errorMessage } from \"@gtkx/utils\";\nimport {\n    chmodSync,\n    existsSync,\n    mkdirSync,\n    realpathSync,\n    renameSync,\n    rmSync,\n    symlinkSync,\n    writeFileSync,\n} from \"node:fs\";\nimport { dirname, join, relative } from \"node:path\";\nimport { keepFailedProject, type SourceModule } from \"../compile.js\";\nimport { createStagingDir } from \"../staging.js\";\nimport { compileStore } from \"./compile-store.js\";\n\n/** Where one generated store is written and how it is reached. */\ntype StoreOptions = {\n    /** Directory the generated package is written to, replaced atomically on each run. */\n    storeDir: string;\n    /** Path the store is symlinked at, which is the specifier's resolution target under `node_modules`. */\n    linkDir: string;\n    /** Version stamped on the store's `package.json`, taken from the dependency the store is generated for. */\n    version: string;\n};\n\ntype StoreLink = Pick<StoreOptions, \"storeDir\" | \"linkDir\">;\n\ntype Manifest = {\n    name: string;\n    type: \"module\";\n    version: string;\n    sideEffects: true;\n    exports: Record<string, unknown>;\n    peerDependencies?: Record<string, string>;\n};\n\ntype ManifestInput = {\n    name: string;\n    version: string;\n    exports: Record<string, unknown>;\n    peerDependencies?: Record<string, string>;\n};\n\ntype RawFile = { relativePath: string; content: string };\n\ntype WriteStoreParams = {\n    storeDir: string;\n    linkDir: string;\n    files: SourceModule[];\n    manifest: Manifest;\n    rawFiles?: RawFile[];\n    requiresEnvReference?: boolean;\n};\n\nconst STORE_DIR_MODE = 0o755;\nconst FAILED_STORE_SUFFIX = \".failed\";\n\nconst subpathExport = (stem: string): { types: string; default: string } => ({\n    types: `./${stem}.d.ts`,\n    default: `./${stem}.js`,\n});\n\nconst namespaceBarrel = (directory: string): { fileName: string; source: string } => ({\n    fileName: `${directory}/index.ts`,\n    source: `export * from \"./${directory}.js\";\\n`,\n});\n\nconst buildManifest = (input: ManifestInput): Manifest => {\n    const manifest: Manifest = {\n        name: input.name,\n        type: \"module\",\n        version: input.version,\n        sideEffects: true,\n        exports: { \"./package.json\": \"./package.json\", ...input.exports },\n    };\n\n    if (input.peerDependencies) {\n        manifest.peerDependencies = input.peerDependencies;\n    }\n\n    return manifest;\n};\n\nconst writeStore = (params: WriteStoreParams): void => {\n    const tmp = createTempStore(params.storeDir);\n    const keepAt = `${params.storeDir}${FAILED_STORE_SUFFIX}`;\n\n    try {\n        buildTempStore(tmp, params);\n        swapStore(tmp, params.storeDir);\n        ensureStoreLink(params);\n    } catch (error) {\n        throw keepFailedProject({ projectDir: tmp, keepAt, error });\n    }\n\n    rmSync(keepAt, { recursive: true, force: true });\n};\n\nconst buildTempStore = (tmp: string, params: WriteStoreParams): void => {\n    for (const file of params.files) {\n        writeSourceFile(tmp, file.fileName, file.source);\n    }\n\n    compileStore({\n        storeDir: tmp,\n        files: params.files,\n        packageName: params.manifest.name,\n        ...(params.requiresEnvReference !== undefined && { requiresEnvReference: params.requiresEnvReference }),\n    });\n\n    writePackageJson(tmp, params.manifest);\n    const rawFiles = params.rawFiles ?? [];\n\n    for (const raw of rawFiles) {\n        writeFileSync(join(tmp, raw.relativePath), raw.content);\n    }\n};\n\nconst writeSourceFile = (storeDir: string, fileName: string, source: string): void => {\n    const filePath = join(storeDir, fileName);\n    mkdirSync(dirname(filePath), { recursive: true });\n    writeFileSync(filePath, source);\n};\n\nconst symlinkRelative = (linkPath: string, realTarget: string): void => {\n    mkdirSync(dirname(linkPath), { recursive: true });\n    rmSync(linkPath, { recursive: true, force: true });\n    symlinkSync(relative(dirname(linkPath), realTarget), linkPath, \"dir\");\n};\n\nconst writePackageJson = (storeDir: string, manifest: Manifest): void => {\n    writeFileSync(join(storeDir, \"package.json\"), `${JSON.stringify(manifest, null, 2)}\\n`);\n};\n\nconst swapStore = (tmp: string, storeDir: string): void => {\n    const previous = `${storeDir}.old`;\n    rmSync(previous, { recursive: true, force: true });\n\n    if (existsSync(storeDir)) {\n        renameSync(storeDir, previous);\n    }\n\n    renameSync(tmp, storeDir);\n    rmSync(previous, { recursive: true, force: true });\n};\n\nconst isStoreLinked = (link: StoreLink): boolean => {\n    try {\n        return realpathSync(link.linkDir) === realpathSync(link.storeDir);\n    } catch {\n        return false;\n    }\n};\n\nconst ensureStoreLink = (link: StoreLink): void => {\n    if (!existsSync(join(link.storeDir, \"package.json\")) || isStoreLinked(link)) {\n        return;\n    }\n\n    symlinkRelative(link.linkDir, link.storeDir);\n};\n\nconst storeWriteMessage = (storeDir: string, error: unknown): string =>\n    `Cannot write the generated store to ${storeDir}: ${errorMessage(error)}. ` +\n    \"Codegen writes the store into the node_modules the @gtkx packages resolve from, \" +\n    `so ${dirname(storeDir)} has to be writable.`;\n\nconst createTempStore = (storeDir: string): string => {\n    try {\n        const tmp = createStagingDir(storeDir);\n        chmodSync(tmp, STORE_DIR_MODE);\n\n        return tmp;\n    } catch (error) {\n        throw new Error(storeWriteMessage(storeDir, error), { cause: error });\n    }\n};\n\nexport {\n    subpathExport,\n    buildManifest,\n    ensureStoreLink,\n    namespaceBarrel,\n    writeStore,\n    type StoreOptions,\n    type RawFile,\n};\n"]}

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

@@ -0,0 +1,3 @@
+declare const ensureStoreLinks: (projectRoot: string) => void;
+export { ensureStoreLinks };
+//# sourceMappingURL=store-links.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"store-links.d.ts","sourceRoot":"","sources":["../../src/store/store-links.ts"],"names":[],"mappings":"AAkCA,QAAA,MAAM,gBAAgB,GAAI,aAAa,MAAM,KAAG,IAY/C,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/store/store-links.js

@@ -0,0 +1,39 @@
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { resolveStore } from "./resolve-store.js";
+import { ensureStoreLink } from "./store-fs.js";
+const resolvedStores = new Map();
+const resolveStoreOrNull = (projectRoot) => {
+    try {
+        return resolveStore(projectRoot);
+    }
+    catch {
+        return null;
+    }
+};
+const isStoreDirPresent = (store) => existsSync(join(store.gi.storeDir, "package.json"));
+const storeFor = (projectRoot) => {
+    const cached = resolvedStores.get(projectRoot);
+    if (cached !== undefined && isStoreDirPresent(cached)) {
+        return cached;
+    }
+    const resolved = resolveStoreOrNull(projectRoot);
+    resolvedStores.delete(projectRoot);
+    if (resolved !== null) {
+        resolvedStores.set(projectRoot, resolved);
+    }
+    return resolved;
+};
+const ensureStoreLinks = (projectRoot) => {
+    const store = storeFor(projectRoot);
+    if (store === null) {
+        return;
+    }
+    for (const unit of [store.gi, store.jsx]) {
+        if (unit !== null) {
+            ensureStoreLink(unit);
+        }
+    }
+};
+export { ensureStoreLinks };
+//# sourceMappingURL=store-links.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"store-links.js","sourceRoot":"","sources":["../../src/store/store-links.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAsB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,cAAc,GAA+B,IAAI,GAAG,EAAE,CAAC;AAE7D,MAAM,kBAAkB,GAAG,CAAC,WAAmB,EAAwB,EAAE;IACrE,IAAI,CAAC;QACD,OAAO,YAAY,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,KAAoB,EAAW,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;AAEjH,MAAM,QAAQ,GAAG,CAAC,WAAmB,EAAwB,EAAE;IAC3D,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAE/C,IAAI,MAAM,KAAK,SAAS,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QACpD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACjD,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAEnC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpB,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,WAAmB,EAAQ,EAAE;IACnD,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEpC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO;IACX,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChB,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC","sourcesContent":["import { existsSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { type ResolvedStore, resolveStore } from \"./resolve-store.js\";\nimport { ensureStoreLink } from \"./store-fs.js\";\n\nconst resolvedStores: Map<string, ResolvedStore> = new Map();\n\nconst resolveStoreOrNull = (projectRoot: string): ResolvedStore | null => {\n    try {\n        return resolveStore(projectRoot);\n    } catch {\n        return null;\n    }\n};\n\nconst isStoreDirPresent = (store: ResolvedStore): boolean => existsSync(join(store.gi.storeDir, \"package.json\"));\n\nconst storeFor = (projectRoot: string): ResolvedStore | null => {\n    const cached = resolvedStores.get(projectRoot);\n\n    if (cached !== undefined && isStoreDirPresent(cached)) {\n        return cached;\n    }\n\n    const resolved = resolveStoreOrNull(projectRoot);\n    resolvedStores.delete(projectRoot);\n\n    if (resolved !== null) {\n        resolvedStores.set(projectRoot, resolved);\n    }\n\n    return resolved;\n};\n\nconst ensureStoreLinks = (projectRoot: string): void => {\n    const store = storeFor(projectRoot);\n\n    if (store === null) {\n        return;\n    }\n\n    for (const unit of [store.gi, store.jsx]) {\n        if (unit !== null) {\n            ensureStoreLink(unit);\n        }\n    }\n};\n\nexport { ensureStoreLinks };\n"]}

package/dist/writer/comparison-context.d.ts

@@ -0,0 +1,4 @@
+import { ModuleContext } from "./context.js";
+declare const comparisonContextFor: (context: ModuleContext) => ModuleContext;
+export { comparisonContextFor };
+//# sourceMappingURL=comparison-context.d.ts.map

package/dist/writer/comparison-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"comparison-context.d.ts","sourceRoot":"","sources":["../../src/writer/comparison-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,QAAA,MAAM,oBAAoB,GAAI,SAAS,aAAa,KAAG,aAWtD,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/writer/comparison-context.js

@@ -0,0 +1,13 @@
+import { ModuleContext } from "./context.js";
+const COMPARISON_CONTEXTS = new WeakMap();
+const comparisonContextFor = (context) => {
+    const existing = COMPARISON_CONTEXTS.get(context);
+    if (existing !== undefined) {
+        return existing;
+    }
+    const created = new ModuleContext(context.namespace, context.library);
+    COMPARISON_CONTEXTS.set(context, created);
+    return created;
+};
+export { comparisonContextFor };
+//# sourceMappingURL=comparison-context.js.map

package/dist/writer/comparison-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comparison-context.js","sourceRoot":"","sources":["../../src/writer/comparison-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,mBAAmB,GAA0C,IAAI,OAAO,EAAE,CAAC;AAEjF,MAAM,oBAAoB,GAAG,CAAC,OAAsB,EAAiB,EAAE;IACnE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE1C,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,OAAO,EAAE,oBAAoB,EAAE,CAAC","sourcesContent":["import { ModuleContext } from \"./context.js\";\n\nconst COMPARISON_CONTEXTS: WeakMap<ModuleContext, ModuleContext> = new WeakMap();\n\nconst comparisonContextFor = (context: ModuleContext): ModuleContext => {\n    const existing = COMPARISON_CONTEXTS.get(context);\n\n    if (existing !== undefined) {\n        return existing;\n    }\n\n    const created = new ModuleContext(context.namespace, context.library);\n    COMPARISON_CONTEXTS.set(context, created);\n\n    return created;\n};\n\nexport { comparisonContextFor };\n"]}

package/dist/writer/context.d.ts

@@ -1,6 +1,6 @@
 import type { Library } from "../gir/library.js";
 import type { GirNamespace } from "../gir/namespace.js";
-import { type DeclaredType, ModuleBuilder } from "./module.js";
+import { type Declaration, ModuleBuilder } from "./module.js";
 declare class ModuleContext {
     module: ModuleBuilder;
     namespace: GirNamespace;
@@ -11,8 +11,8 @@ declare class ModuleContext {
     hoistDescriptor(expression: string): string;
     addGObjectBootstrapImports(): void;
     addCrossNamespaceImport(namespaceName: string): string;
-    declaredType(owner: string, name?: string): DeclaredType;
-    qualify(namespaceName: string, typeName: string): string;
+    declare(declaration: Declaration): void;
+    qualify(namespaceName: string, name: string): string;
 }
 export { ModuleContext };
 //# sourceMappingURL=context.d.ts.map

package/dist/writer/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D,cAAM,aAAa;IACR,MAAM,EAAE,aAAa,CAAuB;IAC5C,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;gBAEZ,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAKrD,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAI3C,0BAA0B,IAAI,IAAI;IAalC,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAkBtD,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,MAAc,GAAG,YAAY;IAI/D,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAO3D;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,KAAK,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9D,cAAM,aAAa;IACR,MAAM,EAAE,aAAa,CAAuB;IAC5C,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;gBAEZ,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAKrD,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAI3C,0BAA0B,IAAI,IAAI;IAalC,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAkBtD,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAUvC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;CAOvD;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/writer/context.js

@@ -39,14 +39,19 @@ class ModuleContext {
         this.module.imports.addNamespace(path, namespaceName);
         return namespaceName;
     }
-    declaredType(owner, name = owner) {
-        return { name, owner: `${this.namespace.name}.${owner}` };
-    }
-    qualify(namespaceName, typeName) {
+    declare(declaration) {
+        const { name, code, owner } = declaration;
+        this.module.appendDeclaration({
+            name,
+            code,
+            owner: owner === undefined ? undefined : `${this.namespace.name}.${owner}`,
+        });
+    }
+    qualify(namespaceName, name) {
         if (namespaceName === this.namespace.name) {
-            return typeName;
+            return name;
         }
-        return `${this.addCrossNamespaceImport(namespaceName)}.${typeName}`;
+        return `${this.addCrossNamespaceImport(namespaceName)}.${name}`;
     }
 }
 export { ModuleContext };

package/dist/writer/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D,MAAM,aAAa;IACR,MAAM,GAAkB,IAAI,aAAa,EAAE,CAAC;IAC5C,SAAS,CAAe;IACxB,OAAO,CAAU;IAExB,YAAY,SAAuB,EAAE,OAAgB;QACjD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,oBAAoB,CAAC,IAAY;QAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,eAAe,CAAC,UAAkB;QAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,0BAA0B;QACtB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO;QACX,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACjC,OAAO;QACX,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;IACvE,CAAC;IAED,uBAAuB,CAAC,aAAqB;QACzC,IAAI,aAAa,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACxC,OAAO,aAAa,CAAC;QACzB,CAAC;QAED,MAAM,SAAS,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,cAAc,GAAG,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,MAAM,CAAC;QACvE,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,SAAS,IAAI,SAAS,KAAK,CAAC,CAAC,CAAC,MAAM,SAAS,WAAW,CAAC;QAE7F,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAEtD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,YAAY,CAAC,KAAa,EAAE,OAAe,KAAK;QAC5C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;IAC9D,CAAC;IAED,OAAO,CAAC,aAAqB,EAAE,QAAgB;QAC3C,IAAI,aAAa,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACxC,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,IAAI,QAAQ,EAAE,CAAC;IACxE,CAAC;CACJ;AAED,OAAO,EAAE,aAAa,EAAE,CAAC","sourcesContent":["import type { Library } from \"../gir/library.js\";\nimport type { GirNamespace } from \"../gir/namespace.js\";\nimport { type DeclaredType, ModuleBuilder } from \"./module.js\";\n\nclass ModuleContext {\n    public module: ModuleBuilder = new ModuleBuilder();\n    public namespace: GirNamespace;\n    public library: Library;\n\n    constructor(namespace: GirNamespace, library: Library) {\n        this.namespace = namespace;\n        this.library = library;\n    }\n\n    addRuntimeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name);\n    }\n\n    addRuntimeTypeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name, true);\n    }\n\n    hoistDescriptor(expression: string): string {\n        return this.module.hoistDescriptor(expression);\n    }\n\n    addGObjectBootstrapImports(): void {\n        if (this.namespace.name === \"GObject\") {\n            return;\n        }\n\n        if (this.namespace.name === \"GLib\") {\n            return;\n        }\n\n        this.module.imports.addSideEffect(\"../gobject/overrides/object.js\");\n        this.module.imports.addSideEffect(\"../gobject/overrides/value.js\");\n    }\n\n    addCrossNamespaceImport(namespaceName: string): string {\n        if (namespaceName === this.namespace.name) {\n            return namespaceName;\n        }\n\n        const directory = namespaceName.toLowerCase();\n        const isFoundational = directory === \"gobject\" || directory === \"glib\";\n        const path = isFoundational ? `../${directory}/${directory}.js` : `../${directory}/index.js`;\n\n        if (!isFoundational) {\n            this.module.imports.addSideEffect(path);\n        }\n\n        this.module.imports.addNamespace(path, namespaceName);\n\n        return namespaceName;\n    }\n\n    declaredType(owner: string, name: string = owner): DeclaredType {\n        return { name, owner: `${this.namespace.name}.${owner}` };\n    }\n\n    qualify(namespaceName: string, typeName: string): string {\n        if (namespaceName === this.namespace.name) {\n            return typeName;\n        }\n\n        return `${this.addCrossNamespaceImport(namespaceName)}.${typeName}`;\n    }\n}\n\nexport { ModuleContext };\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/writer/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9D,MAAM,aAAa;IACR,MAAM,GAAkB,IAAI,aAAa,EAAE,CAAC;IAC5C,SAAS,CAAe;IACxB,OAAO,CAAU;IAExB,YAAY,SAAuB,EAAE,OAAgB;QACjD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,gBAAgB,CAAC,IAAY;QACzB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,oBAAoB,CAAC,IAAY;QAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,eAAe,CAAC,UAAkB;QAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,0BAA0B;QACtB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO;QACX,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACjC,OAAO;QACX,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;IACvE,CAAC;IAED,uBAAuB,CAAC,aAAqB;QACzC,IAAI,aAAa,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACxC,OAAO,aAAa,CAAC;QACzB,CAAC;QAED,MAAM,SAAS,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,cAAc,GAAG,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,MAAM,CAAC;QACvE,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,SAAS,IAAI,SAAS,KAAK,CAAC,CAAC,CAAC,MAAM,SAAS,WAAW,CAAC;QAE7F,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAEtD,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,WAAwB;QAC5B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC;QAE1C,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;YAC1B,IAAI;YACJ,IAAI;YACJ,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,KAAK,EAAE;SAC7E,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,aAAqB,EAAE,IAAY;QACvC,IAAI,aAAa,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;IACpE,CAAC;CACJ;AAED,OAAO,EAAE,aAAa,EAAE,CAAC","sourcesContent":["import type { Library } from \"../gir/library.js\";\nimport type { GirNamespace } from \"../gir/namespace.js\";\nimport { type Declaration, ModuleBuilder } from \"./module.js\";\n\nclass ModuleContext {\n    public module: ModuleBuilder = new ModuleBuilder();\n    public namespace: GirNamespace;\n    public library: Library;\n\n    constructor(namespace: GirNamespace, library: Library) {\n        this.namespace = namespace;\n        this.library = library;\n    }\n\n    addRuntimeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name);\n    }\n\n    addRuntimeTypeImport(name: string): void {\n        this.module.imports.addNamed(\"@gtkx/runtime\", name, true);\n    }\n\n    hoistDescriptor(expression: string): string {\n        return this.module.hoistDescriptor(expression);\n    }\n\n    addGObjectBootstrapImports(): void {\n        if (this.namespace.name === \"GObject\") {\n            return;\n        }\n\n        if (this.namespace.name === \"GLib\") {\n            return;\n        }\n\n        this.module.imports.addSideEffect(\"../gobject/overrides/object.js\");\n        this.module.imports.addSideEffect(\"../gobject/overrides/value.js\");\n    }\n\n    addCrossNamespaceImport(namespaceName: string): string {\n        if (namespaceName === this.namespace.name) {\n            return namespaceName;\n        }\n\n        const directory = namespaceName.toLowerCase();\n        const isFoundational = directory === \"gobject\" || directory === \"glib\";\n        const path = isFoundational ? `../${directory}/${directory}.js` : `../${directory}/index.js`;\n\n        if (!isFoundational) {\n            this.module.imports.addSideEffect(path);\n        }\n\n        this.module.imports.addNamespace(path, namespaceName);\n\n        return namespaceName;\n    }\n\n    declare(declaration: Declaration): void {\n        const { name, code, owner } = declaration;\n\n        this.module.appendDeclaration({\n            name,\n            code,\n            owner: owner === undefined ? undefined : `${this.namespace.name}.${owner}`,\n        });\n    }\n\n    qualify(namespaceName: string, name: string): string {\n        if (namespaceName === this.namespace.name) {\n            return name;\n        }\n\n        return `${this.addCrossNamespaceImport(namespaceName)}.${name}`;\n    }\n}\n\nexport { ModuleContext };\n"]}

package/dist/writer/module.d.ts

@@ -1,22 +1,30 @@
 import { ImportsBuilder } from "./imports.js";
-type DeclaredType = {
+type Declaration = {
     name: string;
-    owner: string;
+    code: string;
+    owner?: string | undefined;
 };
 declare class ModuleBuilder {
     private bindings;
     private bindingNames;
     private hoistedDescriptors;
+    private claimedSpaces;
     private declarations;
+    private declaredNames;
     private declaredTypes;
     private registrations;
+    private requiredNames;
     imports: ImportsBuilder;
+    private claimSpace;
+    private claimExportedName;
     private claimTypeName;
+    private verifyRegistrations;
     appendBinding(code: string, name?: string): void;
     hoistDescriptor(expression: string): string;
-    appendDeclaration(code: string, declared?: DeclaredType): void;
-    appendRegistration(code: string): void;
+    appendDeclaration(declaration: Declaration): void;
+    hasExports(): boolean;
+    appendRegistration(code: string, requires?: string[]): void;
     toSource(): string;
 }
-export { type DeclaredType, ModuleBuilder };
+export { type Declaration, ModuleBuilder };
 //# sourceMappingURL=module.d.ts.map