@gtkx/codegen 1.0.0-rc.2 → 1.0.0-rc.4

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,KAAK,YAAY,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,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,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,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,IA2B9C,CAAC;AAqCF,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":"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"}

package/dist/store/store-fs.js

@@ -1,6 +1,7 @@
-import { existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
 import { dirname, join, relative } from "node:path";
 import { compileStore } from "./compile-store.js";
+const STORE_DIR_MODE = 0o755;
 const subpathExport = (stem) => ({
     types: `./${stem}.d.ts`,
     default: `./${stem}.js`,
@@ -28,14 +29,13 @@ const writeStore = (params) => {
             storeDir: tmp,
             files: params.files,
             packageName: params.manifest.name,
-            ...(params.configEnv !== undefined && { configEnv: params.configEnv }),
+            ...(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);
         }
-        symlinkRelative(join(tmp, "node_modules", ...params.manifest.name.split("/")), tmp);
         swapStore(tmp, params.storeDir, params.linkDir);
     }
     finally {
@@ -67,7 +67,9 @@ const swapStore = (tmp, storeDir, visibleLink) => {
 };
 const createTempStore = (storeDir) => {
     mkdirSync(dirname(storeDir), { recursive: true });
-    return mkdtempSync(`${storeDir}.tmp-`);
+    const tmp = mkdtempSync(`${storeDir}.tmp-`);
+    chmodSync(tmp, STORE_DIR_MODE);
+    return tmp;
 };
 export { subpathExport, buildManifest, 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 { existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, symlinkSync, writeFileSync } from \"node:fs\";\nimport { dirname, join, relative } from \"node:path\";\nimport { compileStore } from \"./compile-store.js\";\n\ntype StoreOptions = {\n    storeDir: string;\n    linkDir: string;\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    configEnv?: boolean;\n};\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.configEnv !== undefined && { configEnv: params.configEnv }),\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        symlinkRelative(join(tmp, \"node_modules\", ...params.manifest.name.split(\"/\")), tmp);\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\n    return mkdtempSync(`${storeDir}.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":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AA4ClD,MAAM,cAAc,GAAG,KAAK,CAAC;AAE7B,MAAM,aAAa,GAAG,CAAC,IAAY,EAAsC,EAAE,CAAC,CAAC;IACzE,KAAK,EAAE,KAAK,IAAI,OAAO;IACvB,OAAO,EAAE,KAAK,IAAI,KAAK;CAC1B,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,KAAoB,EAAY,EAAE;IACrD,MAAM,QAAQ,GAAa;QACvB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE;KACpE,CAAC;IAEF,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,QAAQ,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;IACvD,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,MAAwB,EAAQ,EAAE;IAClD,MAAM,GAAG,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE7C,IAAI,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9B,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;QAED,YAAY,CAAC;YACT,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YACjC,GAAG,CAAC,MAAM,CAAC,oBAAoB,KAAK,SAAS,IAAI,EAAE,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,CAAC;SAC1G,CAAC,CAAC;QAEH,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;QAEvC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YACzB,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;QAED,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;YAAS,CAAC;QACP,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAE,MAAc,EAAQ,EAAE;IACjF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1C,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAE,UAAkB,EAAQ,EAAE;IACnE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,QAAkB,EAAQ,EAAE;IACpE,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AAC5F,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,QAAgB,EAAE,WAAmB,EAAQ,EAAE;IAC3E,MAAM,QAAQ,GAAG,GAAG,QAAQ,MAAM,CAAC;IACnC,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnD,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1B,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAU,EAAE;IACjD,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,QAAQ,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAE/B,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAmC,CAAC","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"]}

package/overrides/gobject/object.ts.ejs

@@ -9,34 +9,34 @@ declare module "../gobject.js" {
 
         disconnect(handlerId: number): void;
 
-        on(sigName: string, callback: (...args: unknown[]) => unknown, after?: boolean): Object;
+        on(sigName: string, callback: (...args: unknown[]) => unknown, isAfter?: boolean): Object;
 
-        once(sigName: string, callback: (...args: unknown[]) => unknown, after?: boolean): Object;
+        once(sigName: string, callback: (...args: unknown[]) => unknown, isAfter?: boolean): Object;
 
         off(sigName: string, callback: (...args: unknown[]) => unknown): Object;
 
-        addEventListener(sigName: string, callback: (...args: unknown[]) => unknown, after?: boolean): Object;
+        addEventListener(sigName: string, callback: (...args: unknown[]) => unknown, isAfter?: boolean): Object;
 
         removeEventListener(sigName: string, callback: (...args: unknown[]) => unknown): Object;
     }
 }
 
 type GObjectWithConnect = GObject & {
-    connect(sigName: string, callback: Listener, after?: boolean): number;
+    connect(sigName: string, callback: Listener, isAfter?: boolean): number;
 };
 
 GObject.prototype.disconnect = function disconnect(handlerId: number): void {
     signalHandlerDisconnect(this, BigInt(handlerId));
 };
 
-function onImpl(this: GObjectWithConnect, sigName: string, callback: Listener, after?: boolean): GObject {
-    onSignal(this, sigName, callback, after);
+function onImpl(this: GObjectWithConnect, sigName: string, callback: Listener, isAfter?: boolean): GObject {
+    onSignal(this, sigName, callback, isAfter);
     return this;
 }
 GObject.prototype.on = onImpl;
 
-function onceImpl(this: GObjectWithConnect, sigName: string, callback: Listener, after?: boolean): GObject {
-    onceSignal(this, sigName, callback, after);
+function onceImpl(this: GObjectWithConnect, sigName: string, callback: Listener, isAfter?: boolean): GObject {
+    onceSignal(this, sigName, callback, isAfter);
     return this;
 }
 GObject.prototype.once = onceImpl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/codegen",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.4",
   "description": "Generates the typed GTKX bindings and API reference from GIR and OpenGL registry data",
   "keywords": [
     "gtkx",
@@ -29,13 +29,9 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./gi": {
-      "types": "./dist/gi.d.ts",
-      "default": "./dist/gi.js"
-    },
-    "./jsx": {
-      "types": "./dist/jsx.d.ts",
-      "default": "./dist/jsx.js"
+    "./internal": {
+      "types": "./dist/internal.d.ts",
+      "default": "./dist/internal.js"
     }
   },
   "sideEffects": false,
@@ -51,9 +47,8 @@
     "@types/node": "^26.1.2",
     "fast-xml-parser": "^5.10.1",
     "typescript": "^6.0.3",
-    "@gtkx/config": "1.0.0-rc.2",
-    "@gtkx/react": "1.0.0-rc.2",
-    "@gtkx/utils": "1.0.0-rc.2"
+    "@gtkx/react": "1.0.0-rc.4",
+    "@gtkx/utils": "1.0.0-rc.4"
   },
   "scripts": {
     "release": "tsx ../../scripts/release-package.ts"

package/src/analysis/descriptor-render.ts

@@ -21,6 +21,7 @@ import {
 } from "../gir/type-id.js";
 import { isRecordInout } from "../store/gi/param-marshal.js";
 import { computeRecordFieldSlots } from "../store/gi/record-layout.js";
+import { isValueMarshalable } from "../store/gi/value-marshalable.js";
 import {
     type ListDescriptorName,
     type Ownership,
@@ -50,10 +51,10 @@ import {
 
 type RenderDescriptorOptions = {
     argIndexOffset?: number;
-    /** GIR parameter index to emitted argument index, for callables that drop parameters. */
     argIndexMap?: Map<number, number> | undefined;
-    callerAllocated?: boolean;
+    isCallerAllocated?: boolean;
     isInline?: boolean;
+    isNewlyCreated?: boolean;
 };
 
 type ArgIndexOptions = {
@@ -73,7 +74,7 @@ type FundamentalDescriptor = {
     typeName: string | undefined;
     ownership: Ownership;
     wrapperClass?: string | undefined;
-    inline?: boolean | undefined;
+    isInline?: boolean | undefined;
 };
 
 type AncestorFundamental = {
@@ -91,7 +92,7 @@ type FundamentalRecordOptions = {
     unrefFunc: string;
     ownership: Ownership;
     wrapperClass: string | undefined;
-    inline: boolean;
+    isInline: boolean;
 };
 
 const LIST_HELPERS: Record<Exclude<ListFlavor, "gbytearray">, ListDescriptorName> = {
@@ -101,9 +102,8 @@ const LIST_HELPERS: Record<Exclude<ListFlavor, "gbytearray">, ListDescriptorName
     garray: "gArray",
 };
 
-// A callable that drops parameters (varargs, and the closure/destroy slots folded into a callback)
-// shifts every later parameter left, so a GIR length index has to be looked up in the emitted list
-// rather than shifted by the instance offset alone.
+const FLOATING_FUNDAMENTALS: Set<string> = new Set(["GParam"]);
+
 const mapArgIndex = (options: ArgIndexOptions, girIndex: number): number =>
     options.argIndexMap?.get(girIndex) ?? girIndex + options.argIndexOffset;
 
@@ -164,9 +164,6 @@ const renderDescriptor = (
         case "varargs": {
             return tVoid;
         }
-        // A callback in a slot no `renderCallbackType` covers (a vtable entry, a signal argument, a
-        // record field) is still a function pointer occupying a pointer-sized slot. `t.void` would
-        // hand the implementation `undefined` where the pointer belongs.
         case "callback": {
             return tUint64;
         }
@@ -277,13 +274,10 @@ const renderParamDescriptor = (
 
     return renderDescriptor(context, ref, parameter.transferOwnership, {
         ...argIndex,
-        callerAllocated: isCallerAllocatedOut(parameter) || isRecordInout(context, parameter),
+        isCallerAllocated: isCallerAllocatedOut(parameter) || isRecordInout(context, parameter),
     });
 };
 
-// `closure=` on a callback's own parameter states which slot carries the user data, and it is what
-// the TypeScript signature already goes by. The name scan stays as a fallback: 88 callbacks across
-// the installed GIRs carry no `closure=` at all.
 const userDataIndexByName = (parameters: GirParameter[]): number | undefined => {
     let userDataIndex: number | undefined;
 
@@ -368,26 +362,41 @@ const primitiveExpression = (category: PrimitiveCategory, ownership: Ownership):
 };
 
 const renderFundamental = (descriptor: FundamentalDescriptor): string => {
-    const { lib, refFunc, unrefFunc, typeName, ownership, wrapperClass, inline } = descriptor;
+    const { lib, refFunc, unrefFunc, typeName, ownership, wrapperClass, isInline } = descriptor;
 
     return tFundamental(lib, refFunc, unrefFunc, {
         ownership,
         typeName,
         wrapperClass,
-        inline,
+        isInline,
     });
 };
 
-// GIR marks only the root of a fundamental hierarchy with `glib:fundamental` and its ref/unref pair,
-// so a derived type such as GtkPropertyExpression carries neither and has to inherit both.
+const sunkOwnership = (
+    ancestor: AncestorFundamental,
+    ownership: Ownership,
+    isNewlyCreated: boolean,
+): Ownership => {
+    if (!isNewlyCreated || ownership !== "full" || ancestor.typeName === undefined) {
+        return ownership;
+    }
+
+    return FLOATING_FUNDAMENTALS.has(ancestor.typeName) ? "borrowed" : ownership;
+};
+
 const classOrInterfaceExpression = (
     context: ModuleContext,
     resolved: Extract<EntityType, { kind: "class" | "interface" }>,
     ownership: Ownership,
+    isNewlyCreated: boolean,
 ): string => {
     const ancestor = fundamentalAncestor(context, resolved);
 
-    return ancestor === undefined ? tObject(ownership) : renderFundamental({ ...ancestor, ownership });
+    if (ancestor === undefined) {
+        return tObject(ownership);
+    }
+
+    return renderFundamental({ ...ancestor, ownership: sunkOwnership(ancestor, ownership, isNewlyCreated) });
 };
 
 const isClassOrInterface = (type: GirType | undefined): type is Extract<EntityType, { kind: "class" | "interface" }> =>
@@ -479,9 +488,6 @@ const renderSelfDescriptor = (context: ModuleContext, instance: GirParameter): s
     return tObject("borrowed");
 };
 
-// A record expresses its acquire/release pair as `copy-function`/`free-function`: no `<record>` in
-// any installed GIR carries `glib:ref-func`, and GVariant's copy function really is
-// `g_variant_ref_sink`.
 const recordRefPair = (record: ResolvedRecord): { refFunc: string | undefined; unrefFunc: string | undefined } => ({
     refFunc: record.glibRefFunc ?? record.copyFunc,
     unrefFunc: record.glibUnrefFunc ?? record.freeFunc,
@@ -501,21 +507,22 @@ const structExpression = (
     context: ModuleContext,
     resolved: Extract<EntityType, { kind: "record" }>,
     ownership: Ownership,
-    options: { callerAllocated: boolean; inline: boolean },
+    options: { isCallerAllocated: boolean; isInline: boolean },
 ): string => {
     const { size } = computeRecordFieldSlots(context, resolved.value.fields, resolved.value.isUnion);
     const wrapperClass = context.qualify(resolved.namespace.name, resolved.value.name);
+    const isCopyable = isValueMarshalable(context, resolved.namespace.name, resolved.value);
 
     return tStruct(ownership, {
-        size: size > 0 ? size : undefined,
+        size: isCopyable && size > 0 ? size : undefined,
         wrapperClass,
-        callerAllocated: options.callerAllocated,
-        inline: options.inline,
+        isCallerAllocated: options.isCallerAllocated,
+        isInline: options.isInline,
     });
 };
 
 const fundamentalRecordExpression = (options: FundamentalRecordOptions): string => {
-    const { resolved, refFunc, unrefFunc, ownership, wrapperClass, inline } = options;
+    const { resolved, refFunc, unrefFunc, ownership, wrapperClass, isInline } = options;
 
     return renderFundamental({
         lib: resolved.namespace.sharedLibrary ?? "",
@@ -524,7 +531,7 @@ const fundamentalRecordExpression = (options: FundamentalRecordOptions): string
         typeName: resolved.value.glibTypeName,
         ownership,
         wrapperClass,
-        inline,
+        isInline,
     });
 };
 
@@ -532,11 +539,11 @@ const boxedRecordExpression = (options: {
     context: ModuleContext;
     resolved: Extract<EntityType, { kind: "record" }>;
     ownership: Ownership;
-    callerAllocated: boolean;
-    inline: boolean;
+    isCallerAllocated: boolean;
+    isInline: boolean;
     typeFnName: string;
 }): string => {
-    const { context, resolved, ownership, callerAllocated, inline, typeFnName } = options;
+    const { context, resolved, ownership, isCallerAllocated, isInline, typeFnName } = options;
     const record = resolved.value;
     const glibName = record.glibTypeName ?? record.cType ?? record.name;
     const { size } = computeRecordFieldSlots(context, record.fields, record.isUnion);
@@ -545,8 +552,8 @@ const boxedRecordExpression = (options: {
         ownership,
         sharedLibrary: resolved.namespace.sharedLibrary,
         getTypeFnName: typeFnName,
-        callerAllocated,
-        inline,
+        isCallerAllocated,
+        isInline,
         size: size > 0 ? size : undefined,
     });
 };
@@ -560,8 +567,8 @@ const plainRecordExpression = (
     const record = resolved.value;
 
     const layout = {
-        callerAllocated: placement.isCallerAllocated ?? false,
-        inline: placement.isInline ?? false,
+        isCallerAllocated: placement.isCallerAllocated ?? false,
+        isInline: placement.isInline ?? false,
     };
 
     if (record.glibGetType === undefined) {
@@ -591,7 +598,7 @@ const recordExpression = (
             unrefFunc,
             ownership,
             wrapperClass,
-            inline: placement.isInline ?? false,
+            isInline: placement.isInline ?? false,
         });
     }
 
@@ -624,11 +631,11 @@ const expressionForResolved = (
     switch (resolved.kind) {
         case "class":
         case "interface": {
-            return classOrInterfaceExpression(context, resolved, ownership);
+            return classOrInterfaceExpression(context, resolved, ownership, options.isNewlyCreated ?? false);
         }
         case "record": {
             return recordExpression(context, resolved, ownership, {
-                isCallerAllocated: options.callerAllocated ?? false,
+                isCallerAllocated: options.isCallerAllocated ?? false,
                 isInline: options.isInline ?? false,
             });
         }

package/src/analysis/descriptor.ts

@@ -64,23 +64,23 @@ type BoxedOptions = {
     ownership: Ownership;
     sharedLibrary: string | undefined;
     getTypeFnName: string;
-    callerAllocated: boolean;
-    inline?: boolean;
+    isCallerAllocated: boolean;
+    isInline?: boolean;
     size: number | undefined;
 };
 
 type StructOptions = {
     size: number | string | undefined;
     wrapperClass: string | undefined;
-    callerAllocated: boolean;
-    inline?: boolean;
+    isCallerAllocated: boolean;
+    isInline?: boolean;
 };
 
 type FundamentalOptions = {
     ownership: Ownership;
     typeName: string | undefined;
     wrapperClass: string | undefined;
-    inline?: boolean | undefined;
+    isInline?: boolean | undefined;
 };
 
 type ListDescriptorName = "list" | "slist" | "ptrArray" | "gArray";
@@ -165,8 +165,8 @@ const tBoxed = (glibName: string, options: BoxedOptions): string =>
                 ? undefined
                 : `sharedLibrary: ${sourceStringLiteral(options.sharedLibrary)}`,
             `getTypeFnName: ${sourceStringLiteral(options.getTypeFnName)}`,
-            options.callerAllocated ? "callerAllocated: true" : undefined,
-            options.inline === true ? "inline: true" : undefined,
+            options.isCallerAllocated ? "isCallerAllocated: true" : undefined,
+            options.isInline === true ? "isInline: true" : undefined,
             options.size === undefined ? undefined : `size: ${String(options.size)}`,
         ]),
     ]);
@@ -177,13 +177,13 @@ const tStruct = (ownership: Ownership, options: StructOptions): string =>
         optionsObject([
             options.size === undefined ? undefined : `size: ${String(options.size)}`,
             options.wrapperClass === undefined ? undefined : `wrapperClass: ${options.wrapperClass}`,
-            options.callerAllocated ? "callerAllocated: true" : undefined,
-            options.inline === true ? "inline: true" : undefined,
+            options.isCallerAllocated ? "isCallerAllocated: true" : undefined,
+            options.isInline === true ? "isInline: true" : undefined,
         ]),
     ]);
 
 const tInlineStruct = (): string =>
-    tStruct("borrowed", { size: undefined, wrapperClass: undefined, callerAllocated: false });
+    tStruct("borrowed", { size: undefined, wrapperClass: undefined, isCallerAllocated: false });
 
 const tFundamental = (lib: string, refFunc: string, unrefFunc: string, options: FundamentalOptions): string =>
     call("fundamental", [
@@ -194,7 +194,7 @@ const tFundamental = (lib: string, refFunc: string, unrefFunc: string, options:
             `ownership: ${sourceStringLiteral(options.ownership)}`,
             options.typeName === undefined ? undefined : `typeName: ${sourceStringLiteral(options.typeName)}`,
             options.wrapperClass === undefined ? undefined : `wrapperClass: ${options.wrapperClass}`,
-            options.inline === true ? "inline: true" : undefined,
+            options.isInline === true ? "isInline: true" : undefined,
         ]),
     ]);
 
@@ -252,9 +252,9 @@ const tBind = (args: BindArgs): string =>
 const tFn = (
     lib: string,
     cIdentifier: string,
-    spec: { args: string; returns: string; throws: boolean },
+    spec: { args: string; returns: string; canThrow: boolean },
 ): string => {
-    const throwsEntry = spec.throws ? ", throws: true" : "";
+    const throwsEntry = spec.canThrow ? ", canThrow: true" : "";
 
     return call("fn", [
         sourceStringLiteral(lib),

package/src/analysis/param-structure.ts

@@ -14,8 +14,8 @@ type HandlerResultOptions = {
     library: Library;
     signal: GirCallable;
     renderType: (ref: TypeId | undefined, isNullable: boolean) => string;
-    includeCallerAllocated: boolean;
-    optOut: boolean;
+    shouldIncludeCallerAllocated: boolean;
+    isOptOut: boolean;
 };
 
 const isInputParameter = (options: {
@@ -75,8 +75,6 @@ const closureAndDestroyIndices = (fn: GirFunction): Set<number> => {
     return indices;
 };
 
-// The emitted argument list is the instance parameter followed by every parameter `planParameter`
-// keeps, so a GIR index only lines up with an emitted index when nothing before it was dropped.
 const emittedArgIndices = (fn: GirFunction, instanceOffset: number): Map<number, number> => {
     const closureIndices = closureAndDestroyIndices(fn);
     const map: Map<number, number> = new Map();
@@ -199,9 +197,9 @@ const foldOutParamShape = (primary: string | undefined, outTypes: string[]): str
 const isHandlerOutParameter = (options: {
     library: Library;
     parameter: GirParameter;
-    includeCallerAllocated: boolean;
+    shouldIncludeCallerAllocated: boolean;
 }): boolean => {
-    const { library, parameter, includeCallerAllocated } = options;
+    const { library, parameter, shouldIncludeCallerAllocated } = options;
 
     if (parameter.isVarargs) {
         return false;
@@ -215,7 +213,7 @@ const isHandlerOutParameter = (options: {
         return true;
     }
 
-    return includeCallerAllocated && isCallerAllocatedOut(parameter);
+    return shouldIncludeCallerAllocated && isCallerAllocatedOut(parameter);
 };
 
 const scalarResultType = (primary: string | undefined, isOptOut: boolean): string => {
@@ -227,18 +225,18 @@ const scalarResultType = (primary: string | undefined, isOptOut: boolean): strin
 };
 
 const renderHandlerResultType = (options: HandlerResultOptions): string => {
-    const { library, signal, renderType, includeCallerAllocated, optOut } = options;
+    const { library, signal, renderType, shouldIncludeCallerAllocated, isOptOut } = options;
 
     const primary = shouldOmitPrimaryReturn(library, signal.returnValue)
         ? undefined
         : renderType(signal.returnValue.type, signal.returnValue.nullable);
 
     const outTypes = signal.parameters
-        .filter((parameter) => isHandlerOutParameter({ library, parameter, includeCallerAllocated }))
+        .filter((parameter) => isHandlerOutParameter({ library, parameter, shouldIncludeCallerAllocated }))
         .map((parameter) => renderType(parameter.type, parameter.nullable));
 
     if (outTypes.length === 0) {
-        return scalarResultType(primary, optOut);
+        return scalarResultType(primary, isOptOut);
     }
 
     return foldOutParamShape(primary, outTypes);

package/src/analysis/ts-type.ts

@@ -9,7 +9,6 @@ import {
     type ListType,
     type TypeId,
 } from "../gir/type-id.js";
-import { isClassStructRecord } from "../store/gi/class-struct-record.js";
 import { gtypeTsType } from "../store/gi/gtype-binding.js";
 
 type ReferenceName = {
@@ -20,23 +19,18 @@ type ReferenceName = {
 type TsTypeTarget = {
     containerStyle: "map" | "record";
     callbackType: string;
-    byteArrayAsNumber: boolean;
+    shouldRenderByteArrayAsNumber: boolean;
     renderNamed: (resolved: GirType | undefined, name: ReferenceName) => string;
     renderGtype: () => string;
 };
 
-const willEmitEntity = (library: Library, type: EntityType): boolean => {
+const willEmitEntity = (type: EntityType): boolean => {
     switch (type.kind) {
         case "callback": {
             return type.value.introspectable && type.value.name.length > 0;
         }
         case "record": {
-            return (
-                type.value.introspectable &&
-                !type.value.isVtable &&
-                type.value.name.length > 0 &&
-                !isClassStructRecord(library, type.namespace.name, type.value)
-            );
+            return type.value.introspectable && type.value.name.length > 0;
         }
         case "alias":
         case "class":
@@ -51,11 +45,10 @@ const renderPrimitiveType = (target: TsTypeTarget, type: Extract<GirType, { kind
     type.category === "gtype" ? target.renderGtype() : PRIMITIVE_TS_TYPE[type.category];
 
 const renderEntityType = (
-    library: Library,
     target: TsTypeTarget,
     type: EntityType,
     name: ReferenceName | undefined,
-): string => renderNamedType(target, type, willEmitEntity(library, type) ? name : undefined);
+): string => renderNamedType(target, type, willEmitEntity(type) ? name : undefined);
 
 const renderBaseType = (library: Library, target: TsTypeTarget, ref: TypeId | undefined): string => {
     if (ref === undefined) {
@@ -82,7 +75,7 @@ const renderBaseType = (library: Library, target: TsTypeTarget, ref: TypeId | un
         case "record":
         case "enum":
         case "alias": {
-            return renderEntityType(library, target, type, name);
+            return renderEntityType(target, type, name);
         }
         case "carray":
         case "list":
@@ -107,10 +100,8 @@ const renderContainerType = (
     return renderSequenceType(library, target, type);
 };
 
-// An array whose length nothing states decodes as the bare pointer it is, so its TypeScript type has
-// to say so too rather than promising elements nothing can count.
 const renderSequenceType = (library: Library, target: TsTypeTarget, type: CArrayType | ListType): string => {
-    if (type.kind === "list" && type.flavor === "gbytearray" && target.byteArrayAsNumber) {
+    if (type.kind === "list" && type.flavor === "gbytearray" && target.shouldRenderByteArrayAsNumber) {
         return "number[]";
     }
 
@@ -136,7 +127,7 @@ const renderNamedType = (
 const moduleTarget = (context: ModuleContext): TsTypeTarget => ({
     containerStyle: "map",
     callbackType: "((...args: any[]) => any)",
-    byteArrayAsNumber: true,
+    shouldRenderByteArrayAsNumber: true,
     renderNamed: (_resolved, name) => context.qualify(name.namespaceName, name.typeName),
     renderGtype: () => gtypeTsType(context),
 });
@@ -155,7 +146,7 @@ const recordTypeTarget = (
     const target: TsTypeTarget = {
         containerStyle: "record",
         callbackType: "((...args: unknown[]) => unknown)",
-        byteArrayAsNumber: false,
+        shouldRenderByteArrayAsNumber: false,
         renderNamed: (resolved, name) => {
             if (resolved?.kind === "alias") {
                 return resolved.value.target === undefined

package/src/compile.ts

@@ -29,8 +29,10 @@ const BASE_COMPILER_OPTIONS = {
     noImplicitReturns: true,
     noFallthroughCasesInSwitch: true,
     allowUnreachableCode: false,
+    allowImportingTsExtensions: true,
     forceConsistentCasingInFileNames: true,
     resolveJsonModule: true,
+    rewriteRelativeImportExtensions: true,
     skipLibCheck: true,
     types: ["node"],
 };
@@ -47,7 +49,6 @@ const FORMAT_HOST: ts.FormatDiagnosticsHost = {
     getNewLine: () => "\n",
 };
 
-/** `@gtkx/codegen`'s own `node_modules`, which has `@types/node` plus the `@gtkx/*` deps the store typecheck needs. */
 const codegenModules = (): string => {
     const sourceDir = dirname(fileURLToPath(import.meta.url));