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

package/dist/writer/gtk-doc.js

@@ -1,7 +1,7 @@
-import { toCamelCase } from "@gtkx/utils";
+import { camelCase } from "@gtkx/utils";
 const CONSTANT_MAP = { TRUE: "true", FALSE: "false", NULL: "null" };
 const CALLABLE_LINK_KINDS = new Set(["method", "func", "ctor", "vfunc"]);
-const SENTINEL = String.fromCharCode(0xe000);
+const SENTINEL = String.fromCodePoint(0xE0_00);
 const CODE_BLOCK_OPEN = "|[";
 const CODE_BLOCK_CLOSE = "]|";
 const CODE_LANGUAGE_PATTERN = /^\s*<!--\s*language="([^"]*)"\s*-->/;
@@ -15,17 +15,24 @@ const FUNCTION_REF_PATTERN = /\b([a-z_][a-z0-9_]*)\(\)/g;
 const renderLink = (kind, target) => {
     const segments = target.split(/::|[.:]/);
     const lastIndex = segments.length - 1;
-    if (CALLABLE_LINK_KINDS.has(kind) || kind === "property") {
-        segments[lastIndex] = toCamelCase(segments[lastIndex] ?? "");
+    if (kind === "property" || CALLABLE_LINK_KINDS.has(kind)) {
+        segments[lastIndex] = camelCase(segments[lastIndex] ?? "");
     }
     const symbol = segments.join(".");
     return `\`${symbol}${CALLABLE_LINK_KINDS.has(kind) ? "()" : ""}\``;
 };
+const trimTrailingNewlines = (value) => {
+    let end = value.length;
+    while (end > 0 && value[end - 1] === "\n") {
+        end -= 1;
+    }
+    return value.slice(0, end);
+};
 const renderCodeFence = (body) => {
-    const languageMatch = body.match(CODE_LANGUAGE_PATTERN);
+    const languageMatch = CODE_LANGUAGE_PATTERN.exec(body);
     const fence = (languageMatch?.[1] ?? "").trim().toLowerCase();
     const rest = languageMatch === null ? body : body.slice(languageMatch[0].length);
-    const code = rest.replace(/^\s+/, "").replace(/\n+$/, "");
+    const code = trimTrailingNewlines(rest.trimStart());
     return `\`\`\`${fence}\n${code}\n\`\`\``;
 };
 const protectCodeBlocks = (raw, protect) => {
@@ -33,35 +40,39 @@ const protectCodeBlocks = (raw, protect) => {
     let cursor = 0;
     while (cursor < raw.length) {
         const open = raw.indexOf(CODE_BLOCK_OPEN, cursor);
-        if (open === -1)
+        if (open === -1) {
             break;
+        }
         const close = raw.indexOf(CODE_BLOCK_CLOSE, open + CODE_BLOCK_OPEN.length);
-        if (close === -1)
+        if (close === -1) {
             break;
+        }
         result += raw.slice(cursor, open);
         result += protect(renderCodeFence(raw.slice(open + CODE_BLOCK_OPEN.length, close)));
         cursor = close + CODE_BLOCK_CLOSE.length;
     }
     return result + raw.slice(cursor);
 };
-export const gtkDocToMarkdown = (raw) => {
+const gtkDocToMarkdown = (raw) => {
     const stash = [];
     const protect = (value) => {
-        const token = `${SENTINEL}${stash.length}${SENTINEL}`;
+        const token = `${SENTINEL}${String(stash.length)}${SENTINEL}`;
         stash.push(value);
         return token;
     };
     let text = protectCodeBlocks(raw, protect);
-    text = text.replace(FENCED_BLOCK_PATTERN, (block) => protect(block));
-    text = text.replace(INLINE_CODE_PATTERN, (span) => protect(span));
-    text = text.replace(LINK_PATTERN, (_match, kind, target) => protect(renderLink(kind, target)));
-    text = text.replace(CONSTANT_PATTERN, (_match, name) => protect(`\`${CONSTANT_MAP[name] ?? name}\``));
-    text = text.replace(TYPE_REF_PATTERN, (_match, name) => protect(`\`${name}\``));
-    text = text.replace(PARAM_REF_PATTERN, (_match, name) => protect(`\`${name}\``));
-    text = text.replace(FUNCTION_REF_PATTERN, (_match, name) => protect(`\`${name}()\``));
+    text = text.replaceAll(FENCED_BLOCK_PATTERN, (block) => protect(block));
+    text = text.replaceAll(INLINE_CODE_PATTERN, (span) => protect(span));
+    text = text.replaceAll(LINK_PATTERN, (_match, kind, target) => protect(renderLink(kind, target)));
+    text = text.replaceAll(CONSTANT_PATTERN, (_match, name) => protect(`\`${CONSTANT_MAP[name] ?? name}\``));
+    text = text.replaceAll(TYPE_REF_PATTERN, (_match, name) => protect(`\`${name}\``));
+    text = text.replaceAll(PARAM_REF_PATTERN, (_match, name) => protect(`\`${name}\``));
+    text = text.replaceAll(FUNCTION_REF_PATTERN, (_match, name) => protect(`\`${name}()\``));
     for (let index = stash.length - 1; index >= 0; index -= 1) {
-        text = text.replaceAll(`${SENTINEL}${index}${SENTINEL}`, stash[index] ?? "");
+        const value = stash[index] ?? "";
+        text = text.replaceAll(`${SENTINEL}${String(index)}${SENTINEL}`, () => value);
     }
     return text;
 };
+export { gtkDocToMarkdown };
 //# sourceMappingURL=gtk-doc.js.map

package/dist/writer/gtk-doc.js.map

@@ -1 +1 @@
-{"version":3,"file":"gtk-doc.js","sourceRoot":"","sources":["../../src/writer/gtk-doc.ts"],"names":[],"mappings":"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","sourcesContent":["import { toCamelCase } from \"@gtkx/utils\";\n\nconst CONSTANT_MAP: Record<string, string> = { TRUE: \"true\", FALSE: \"false\", NULL: \"null\" };\n\nconst CALLABLE_LINK_KINDS: Set<string> = new Set([\"method\", \"func\", \"ctor\", \"vfunc\"]);\n\nconst SENTINEL = String.fromCharCode(0xe000);\n\nconst CODE_BLOCK_OPEN = \"|[\";\nconst CODE_BLOCK_CLOSE = \"]|\";\nconst CODE_LANGUAGE_PATTERN = /^\\s*<!--\\s*language=\"([^\"]*)\"\\s*-->/;\nconst FENCED_BLOCK_PATTERN = /```[\\s\\S]*?```/g;\nconst INLINE_CODE_PATTERN = /`[^`\\n]*`/g;\nconst LINK_PATTERN = /\\[(\\w+)@([\\w.:%#-]+)\\]/g;\nconst CONSTANT_PATTERN = /(?<!\\w)%(\\w+)/g;\nconst TYPE_REF_PATTERN = /(?<!\\w)#(\\w+)/g;\nconst PARAM_REF_PATTERN = /(?<!\\w)@(\\w+)/g;\nconst FUNCTION_REF_PATTERN = /\\b([a-z_][a-z0-9_]*)\\(\\)/g;\n\nconst renderLink = (kind: string, target: string): string => {\n    const segments = target.split(/::|[.:]/);\n    const lastIndex = segments.length - 1;\n    if (CALLABLE_LINK_KINDS.has(kind) || kind === \"property\") {\n        segments[lastIndex] = toCamelCase(segments[lastIndex] ?? \"\");\n    }\n    const symbol = segments.join(\".\");\n    return `\\`${symbol}${CALLABLE_LINK_KINDS.has(kind) ? \"()\" : \"\"}\\``;\n};\n\nconst renderCodeFence = (body: string): string => {\n    const languageMatch = body.match(CODE_LANGUAGE_PATTERN);\n    const fence = (languageMatch?.[1] ?? \"\").trim().toLowerCase();\n    const rest = languageMatch === null ? body : body.slice(languageMatch[0].length);\n    const code = rest.replace(/^\\s+/, \"\").replace(/\\n+$/, \"\");\n    return `\\`\\`\\`${fence}\\n${code}\\n\\`\\`\\``;\n};\n\nconst protectCodeBlocks = (raw: string, protect: (value: string) => string): string => {\n    let result = \"\";\n    let cursor = 0;\n    while (cursor < raw.length) {\n        const open = raw.indexOf(CODE_BLOCK_OPEN, cursor);\n        if (open === -1) break;\n        const close = raw.indexOf(CODE_BLOCK_CLOSE, open + CODE_BLOCK_OPEN.length);\n        if (close === -1) break;\n        result += raw.slice(cursor, open);\n        result += protect(renderCodeFence(raw.slice(open + CODE_BLOCK_OPEN.length, close)));\n        cursor = close + CODE_BLOCK_CLOSE.length;\n    }\n    return result + raw.slice(cursor);\n};\n\nexport const gtkDocToMarkdown = (raw: string): string => {\n    const stash: string[] = [];\n    const protect = (value: string): string => {\n        const token = `${SENTINEL}${stash.length}${SENTINEL}`;\n        stash.push(value);\n        return token;\n    };\n\n    let text = protectCodeBlocks(raw, protect);\n    text = text.replace(FENCED_BLOCK_PATTERN, (block) => protect(block));\n    text = text.replace(INLINE_CODE_PATTERN, (span) => protect(span));\n    text = text.replace(LINK_PATTERN, (_match, kind: string, target: string) => protect(renderLink(kind, target)));\n    text = text.replace(CONSTANT_PATTERN, (_match, name: string) => protect(`\\`${CONSTANT_MAP[name] ?? name}\\``));\n    text = text.replace(TYPE_REF_PATTERN, (_match, name: string) => protect(`\\`${name}\\``));\n    text = text.replace(PARAM_REF_PATTERN, (_match, name: string) => protect(`\\`${name}\\``));\n    text = text.replace(FUNCTION_REF_PATTERN, (_match, name: string) => protect(`\\`${name}()\\``));\n\n    for (let index = stash.length - 1; index >= 0; index -= 1) {\n        text = text.replaceAll(`${SENTINEL}${index}${SENTINEL}`, stash[index] ?? \"\");\n    }\n    return text;\n};\n"]}
+{"version":3,"file":"gtk-doc.js","sourceRoot":"","sources":["../../src/writer/gtk-doc.ts"],"names":[],"mappings":"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","sourcesContent":["import { camelCase } from \"@gtkx/utils\";\n\nconst CONSTANT_MAP: Record<string, string> = { TRUE: \"true\", FALSE: \"false\", NULL: \"null\" };\nconst CALLABLE_LINK_KINDS: Set<string> = new Set([\"method\", \"func\", \"ctor\", \"vfunc\"]);\nconst SENTINEL = String.fromCodePoint(0xE0_00);\nconst CODE_BLOCK_OPEN = \"|[\";\nconst CODE_BLOCK_CLOSE = \"]|\";\nconst CODE_LANGUAGE_PATTERN = /^\\s*<!--\\s*language=\"([^\"]*)\"\\s*-->/;\nconst FENCED_BLOCK_PATTERN = /```[\\s\\S]*?```/g;\nconst INLINE_CODE_PATTERN = /`[^`\\n]*`/g;\nconst LINK_PATTERN = /\\[(\\w+)@([\\w.:%#-]+)\\]/g;\nconst CONSTANT_PATTERN = /(?<!\\w)%(\\w+)/g;\nconst TYPE_REF_PATTERN = /(?<!\\w)#(\\w+)/g;\nconst PARAM_REF_PATTERN = /(?<!\\w)@(\\w+)/g;\nconst FUNCTION_REF_PATTERN = /\\b([a-z_][a-z0-9_]*)\\(\\)/g;\n\nconst renderLink = (kind: string, target: string): string => {\n    const segments = target.split(/::|[.:]/);\n    const lastIndex = segments.length - 1;\n\n    if (kind === \"property\" || CALLABLE_LINK_KINDS.has(kind)) {\n        segments[lastIndex] = camelCase(segments[lastIndex] ?? \"\");\n    }\n\n    const symbol = segments.join(\".\");\n\n    return `\\`${symbol}${CALLABLE_LINK_KINDS.has(kind) ? \"()\" : \"\"}\\``;\n};\n\nconst trimTrailingNewlines = (value: string): string => {\n    let end = value.length;\n\n    while (end > 0 && value[end - 1] === \"\\n\") {\n        end -= 1;\n    }\n\n    return value.slice(0, end);\n};\n\nconst renderCodeFence = (body: string): string => {\n    const languageMatch = CODE_LANGUAGE_PATTERN.exec(body);\n    const fence = (languageMatch?.[1] ?? \"\").trim().toLowerCase();\n    const rest = languageMatch === null ? body : body.slice(languageMatch[0].length);\n    const code = trimTrailingNewlines(rest.trimStart());\n\n    return `\\`\\`\\`${fence}\\n${code}\\n\\`\\`\\``;\n};\n\nconst protectCodeBlocks = (raw: string, protect: (value: string) => string): string => {\n    let result = \"\";\n    let cursor = 0;\n\n    while (cursor < raw.length) {\n        const open = raw.indexOf(CODE_BLOCK_OPEN, cursor);\n\n        if (open === -1) {\n            break;\n        }\n\n        const close = raw.indexOf(CODE_BLOCK_CLOSE, open + CODE_BLOCK_OPEN.length);\n\n        if (close === -1) {\n            break;\n        }\n\n        result += raw.slice(cursor, open);\n        result += protect(renderCodeFence(raw.slice(open + CODE_BLOCK_OPEN.length, close)));\n        cursor = close + CODE_BLOCK_CLOSE.length;\n    }\n\n    return result + raw.slice(cursor);\n};\n\nconst gtkDocToMarkdown = (raw: string): string => {\n    const stash: string[] = [];\n\n    const protect = (value: string): string => {\n        const token = `${SENTINEL}${String(stash.length)}${SENTINEL}`;\n        stash.push(value);\n\n        return token;\n    };\n\n    let text = protectCodeBlocks(raw, protect);\n    text = text.replaceAll(FENCED_BLOCK_PATTERN, (block) => protect(block));\n    text = text.replaceAll(INLINE_CODE_PATTERN, (span) => protect(span));\n    text = text.replaceAll(LINK_PATTERN, (_match, kind: string, target: string) => protect(renderLink(kind, target)));\n    text = text.replaceAll(CONSTANT_PATTERN, (_match, name: string) => protect(`\\`${CONSTANT_MAP[name] ?? name}\\``));\n    text = text.replaceAll(TYPE_REF_PATTERN, (_match, name: string) => protect(`\\`${name}\\``));\n    text = text.replaceAll(PARAM_REF_PATTERN, (_match, name: string) => protect(`\\`${name}\\``));\n    text = text.replaceAll(FUNCTION_REF_PATTERN, (_match, name: string) => protect(`\\`${name}()\\``));\n\n    for (let index = stash.length - 1; index >= 0; index -= 1) {\n        const value = stash[index] ?? \"\";\n        text = text.replaceAll(`${SENTINEL}${String(index)}${SENTINEL}`, () => value);\n    }\n\n    return text;\n};\n\nexport { gtkDocToMarkdown };\n"]}

package/dist/writer/imports.d.ts

@@ -1,10 +1,12 @@
-export declare class ImportsBuilder {
+declare class ImportsBuilder {
     private named;
     private namespaces;
     private sideEffects;
-    addNamed(specifier: string, name: string, isType?: boolean): void;
+    private specifierLine;
+    addNamed(specifier: string, name: string, isType?: boolean, alias?: string): void;
     addNamespace(specifier: string, alias: string, isType?: boolean): void;
     addSideEffect(specifier: string): void;
     toSource(): string;
 }
+export { ImportsBuilder };
 //# sourceMappingURL=imports.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"AAOA,qBAAa,cAAc;IACvB,OAAO,CAAC,KAAK,CAA2C;IACxD,OAAO,CAAC,UAAU,CAAsC;IACxD,OAAO,CAAC,WAAW,CAAqB;IAExC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,IAAI,CAO9D;IAED,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,IAAI,CAInE;IAED,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAErC;IAED,QAAQ,IAAI,MAAM,CA0BjB;CACJ"}
+{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"AAoBA,cAAM,cAAc;IAChB,OAAO,CAAC,KAAK,CAAoD;IACjE,OAAO,CAAC,UAAU,CAA2C;IAC7D,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,aAAa;IAyBrB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,UAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAa/E,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,IAAI;IAMpE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAItC,QAAQ,IAAI,MAAM;CAkBrB;AAED,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/writer/imports.js

@@ -1,15 +1,41 @@
 import { sortStrings, sortStringsBy, sourceStringLiteral } from "@gtkx/utils";
-export class ImportsBuilder {
+function formatNamedNames(namedNames) {
+    return sortStringsBy(namedNames.entries(), ([local]) => local).map(([local, entry]) => {
+        const spec = entry.name === local ? entry.name : `${entry.name} as ${local}`;
+        return entry.isType ? `type ${spec}` : spec;
+    });
+}
+class ImportsBuilder {
     named = new Map();
     namespaces = new Map();
     sideEffects = new Set();
-    addNamed(specifier, name, isType = false) {
+    specifierLine(specifier) {
+        const namespaceImport = this.namespaces.get(specifier);
+        const namedNames = this.named.get(specifier);
+        if (namespaceImport?.isType === true) {
+            return `import type * as ${namespaceImport.alias} from ${sourceStringLiteral(specifier)};`;
+        }
+        const parts = [];
+        if (namespaceImport !== undefined) {
+            parts.push(`* as ${namespaceImport.alias}`);
+        }
+        if (namedNames !== undefined && namedNames.size > 0) {
+            parts.push(`{ ${formatNamedNames(namedNames).join(", ")} }`);
+        }
+        if (parts.length === 0) {
+            return undefined;
+        }
+        return `import ${parts.join(", ")} from ${sourceStringLiteral(specifier)};`;
+    }
+    addNamed(specifier, name, isType = false, alias) {
+        const local = alias ?? name;
         let bucket = this.named.get(specifier);
         if (bucket === undefined) {
             bucket = new Map();
             this.named.set(specifier, bucket);
         }
-        bucket.set(name, (bucket.get(name) ?? true) && isType);
+        const existing = bucket.get(local);
+        bucket.set(local, { name, isType: (existing?.isType ?? true) && isType });
     }
     addNamespace(specifier, alias, isType = false) {
         if (!this.namespaces.has(specifier)) {
@@ -20,31 +46,16 @@ export class ImportsBuilder {
         this.sideEffects.add(specifier);
     }
     toSource() {
-        const lines = [];
-        for (const specifier of this.sideEffects) {
-            lines.push(`import ${sourceStringLiteral(specifier)};`);
-        }
+        const lines = Array.from(this.sideEffects, (specifier) => `import ${sourceStringLiteral(specifier)};`);
         const specifiers = new Set([...this.named.keys(), ...this.namespaces.keys()]);
-        const sortedSpecifiers = sortStrings(specifiers);
-        for (const specifier of sortedSpecifiers) {
-            const namespaceImport = this.namespaces.get(specifier);
-            const namedNames = this.named.get(specifier);
-            if (namespaceImport?.isType === true) {
-                lines.push(`import type * as ${namespaceImport.alias} from ${sourceStringLiteral(specifier)};`);
-                continue;
-            }
-            const parts = [];
-            if (namespaceImport !== undefined)
-                parts.push(`* as ${namespaceImport.alias}`);
-            if (namedNames !== undefined && namedNames.size > 0) {
-                const sortedNames = sortStringsBy(namedNames.entries(), ([name]) => name).map(([name, isType]) => isType ? `type ${name}` : name);
-                parts.push(`{ ${sortedNames.join(", ")} }`);
+        for (const specifier of sortStrings(specifiers)) {
+            const line = this.specifierLine(specifier);
+            if (line !== undefined) {
+                lines.push(line);
             }
-            if (parts.length === 0)
-                continue;
-            lines.push(`import ${parts.join(", ")} from ${sourceStringLiteral(specifier)};`);
         }
         return lines.length === 0 ? "" : `${lines.join("\n")}\n`;
     }
 }
+export { ImportsBuilder };
 //# sourceMappingURL=imports.js.map

package/dist/writer/imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"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","sourcesContent":["import { sortStrings, sortStringsBy, sourceStringLiteral } from \"@gtkx/utils\";\n\ntype NamespaceImport = {\n    alias: string;\n    isType: boolean;\n};\n\nexport class ImportsBuilder {\n    private named = new Map<string, Map<string, boolean>>();\n    private namespaces = new Map<string, NamespaceImport>();\n    private sideEffects = new Set<string>();\n\n    addNamed(specifier: string, name: string, isType = false): void {\n        let bucket = this.named.get(specifier);\n        if (bucket === undefined) {\n            bucket = new Map();\n            this.named.set(specifier, bucket);\n        }\n        bucket.set(name, (bucket.get(name) ?? true) && isType);\n    }\n\n    addNamespace(specifier: string, alias: string, isType = false): void {\n        if (!this.namespaces.has(specifier)) {\n            this.namespaces.set(specifier, { alias, isType });\n        }\n    }\n\n    addSideEffect(specifier: string): void {\n        this.sideEffects.add(specifier);\n    }\n\n    toSource(): string {\n        const lines: string[] = [];\n        for (const specifier of this.sideEffects) {\n            lines.push(`import ${sourceStringLiteral(specifier)};`);\n        }\n        const specifiers = new Set<string>([...this.named.keys(), ...this.namespaces.keys()]);\n        const sortedSpecifiers = sortStrings(specifiers);\n        for (const specifier of sortedSpecifiers) {\n            const namespaceImport = this.namespaces.get(specifier);\n            const namedNames = this.named.get(specifier);\n            if (namespaceImport?.isType === true) {\n                lines.push(`import type * as ${namespaceImport.alias} from ${sourceStringLiteral(specifier)};`);\n                continue;\n            }\n            const parts: string[] = [];\n            if (namespaceImport !== undefined) parts.push(`* as ${namespaceImport.alias}`);\n            if (namedNames !== undefined && namedNames.size > 0) {\n                const sortedNames = sortStringsBy(namedNames.entries(), ([name]) => name).map(([name, isType]) =>\n                    isType ? `type ${name}` : name,\n                );\n                parts.push(`{ ${sortedNames.join(\", \")} }`);\n            }\n            if (parts.length === 0) continue;\n            lines.push(`import ${parts.join(\", \")} from ${sourceStringLiteral(specifier)};`);\n        }\n        return lines.length === 0 ? \"\" : `${lines.join(\"\\n\")}\\n`;\n    }\n}\n"]}
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/writer/imports.ts"],"names":[],"mappings":"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","sourcesContent":["import { sortStrings, sortStringsBy, sourceStringLiteral } from \"@gtkx/utils\";\n\ntype NamespaceImport = {\n    alias: string;\n    isType: boolean;\n};\n\ntype NamedImport = {\n    name: string;\n    isType: boolean;\n};\n\nfunction formatNamedNames(namedNames: Map<string, NamedImport>): string[] {\n    return sortStringsBy(namedNames.entries(), ([local]) => local).map(([local, entry]) => {\n        const spec = entry.name === local ? entry.name : `${entry.name} as ${local}`;\n\n        return entry.isType ? `type ${spec}` : spec;\n    });\n}\n\nclass ImportsBuilder {\n    private named: Map<string, Map<string, NamedImport>> = new Map();\n    private namespaces: Map<string, NamespaceImport> = new Map();\n    private sideEffects: Set<string> = new Set();\n\n    private specifierLine(specifier: string): string | undefined {\n        const namespaceImport = this.namespaces.get(specifier);\n        const namedNames = this.named.get(specifier);\n\n        if (namespaceImport?.isType === true) {\n            return `import type * as ${namespaceImport.alias} from ${sourceStringLiteral(specifier)};`;\n        }\n\n        const parts: string[] = [];\n\n        if (namespaceImport !== undefined) {\n            parts.push(`* as ${namespaceImport.alias}`);\n        }\n\n        if (namedNames !== undefined && namedNames.size > 0) {\n            parts.push(`{ ${formatNamedNames(namedNames).join(\", \")} }`);\n        }\n\n        if (parts.length === 0) {\n            return undefined;\n        }\n\n        return `import ${parts.join(\", \")} from ${sourceStringLiteral(specifier)};`;\n    }\n\n    addNamed(specifier: string, name: string, isType = false, alias?: string): void {\n        const local = alias ?? name;\n        let bucket = this.named.get(specifier);\n\n        if (bucket === undefined) {\n            bucket = new Map();\n            this.named.set(specifier, bucket);\n        }\n\n        const existing = bucket.get(local);\n        bucket.set(local, { name, isType: (existing?.isType ?? true) && isType });\n    }\n\n    addNamespace(specifier: string, alias: string, isType = false): void {\n        if (!this.namespaces.has(specifier)) {\n            this.namespaces.set(specifier, { alias, isType });\n        }\n    }\n\n    addSideEffect(specifier: string): void {\n        this.sideEffects.add(specifier);\n    }\n\n    toSource(): string {\n        const lines: string[] = Array.from(\n            this.sideEffects,\n            (specifier) => `import ${sourceStringLiteral(specifier)};`,\n        );\n\n        const specifiers: Set<string> = new Set([...this.named.keys(), ...this.namespaces.keys()]);\n\n        for (const specifier of sortStrings(specifiers)) {\n            const line = this.specifierLine(specifier);\n\n            if (line !== undefined) {\n                lines.push(line);\n            }\n        }\n\n        return lines.length === 0 ? \"\" : `${lines.join(\"\\n\")}\\n`;\n    }\n}\n\nexport { ImportsBuilder };\n"]}

package/dist/writer/module.d.ts

@@ -1,15 +1,16 @@
 import { ImportsBuilder } from "./imports.js";
-export declare class ModuleBuilder {
-    imports: ImportsBuilder;
+declare class ModuleBuilder {
     private bindings;
     private bindingNames;
     private hoistedDescriptors;
     private declarations;
     private registrations;
+    imports: ImportsBuilder;
     appendBinding(code: string, name?: string): void;
     hoistDescriptor(expression: string): string;
     appendDeclaration(code: string): void;
     appendRegistration(code: string): void;
     toSource(): string;
 }
+export { ModuleBuilder };
 //# sourceMappingURL=module.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,qBAAa,aAAa;IACf,OAAO,EAAE,cAAc,CAAwB;IACtD,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAgB;IAErC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAM/C;IAED,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAO1C;IAED,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEpC;IAED,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAErC;IAED,QAAQ,IAAI,MAAM,CAQjB;CACJ"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,cAAM,aAAa;IACf,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,kBAAkB,CAAkC;IAC5D,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAgB;IAC9B,OAAO,EAAE,cAAc,CAAwB;IAEtD,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAYhD,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAc3C,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIrC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAItC,QAAQ,IAAI,MAAM;CAsBrB;AAED,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/writer/module.js

@@ -1,24 +1,26 @@
 import { ImportsBuilder } from "./imports.js";
-export class ModuleBuilder {
-    imports = new ImportsBuilder();
+class ModuleBuilder {
     bindings = [];
     bindingNames = new Set();
     hoistedDescriptors = new Map();
     declarations = [];
     registrations = [];
+    imports = new ImportsBuilder();
     appendBinding(code, name) {
         if (name !== undefined) {
-            if (this.bindingNames.has(name))
+            if (this.bindingNames.has(name)) {
                 return;
+            }
             this.bindingNames.add(name);
         }
         this.bindings.push(code);
     }
     hoistDescriptor(expression) {
         const existing = this.hoistedDescriptors.get(expression);
-        if (existing !== undefined)
+        if (existing !== undefined) {
             return existing;
-        const name = `_desc${this.hoistedDescriptors.size}`;
+        }
+        const name = `_desc${String(this.hoistedDescriptors.size)}`;
         this.hoistedDescriptors.set(expression, name);
         this.appendBinding(`const ${name} = ${expression};`, name);
         return name;
@@ -32,15 +34,20 @@ export class ModuleBuilder {
     toSource() {
         const sections = [];
         const importsBlock = this.imports.toSource();
-        if (importsBlock.length > 0)
+        if (importsBlock.length > 0) {
             sections.push(importsBlock.trimEnd());
-        if (this.declarations.length > 0)
+        }
+        if (this.declarations.length > 0) {
             sections.push(this.declarations.join("\n\n"));
-        if (this.bindings.length > 0)
+        }
+        if (this.bindings.length > 0) {
             sections.push(this.bindings.join("\n\n"));
-        if (this.registrations.length > 0)
+        }
+        if (this.registrations.length > 0) {
             sections.push(this.registrations.join("\n\n"));
+        }
         return `${sections.join("\n\n")}\n`;
     }
 }
+export { ModuleBuilder };
 //# sourceMappingURL=module.js.map

package/dist/writer/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,OAAO,aAAa;IACf,OAAO,GAAmB,IAAI,cAAc,EAAE,CAAC;IAC9C,QAAQ,GAAa,EAAE,CAAC;IACxB,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,YAAY,GAAa,EAAE,CAAC;IAC5B,aAAa,GAAa,EAAE,CAAC;IAErC,aAAa,CAAC,IAAY,EAAE,IAAa;QACrC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO;YACxC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,eAAe,CAAC,UAAkB;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,QAAQ,CAAC;QAC5C,MAAM,IAAI,GAAG,QAAQ,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,MAAM,UAAU,GAAG,EAAE,IAAI,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,IAAY;QAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,kBAAkB,CAAC,IAAY;QAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ;QACJ,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC7C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QACnE,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAClF,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IACxC,CAAC;CACJ","sourcesContent":["import { ImportsBuilder } from \"./imports.js\";\n\nexport class ModuleBuilder {\n    public imports: ImportsBuilder = new ImportsBuilder();\n    private bindings: string[] = [];\n    private bindingNames = new Set<string>();\n    private hoistedDescriptors = new Map<string, string>();\n    private declarations: string[] = [];\n    private registrations: string[] = [];\n\n    appendBinding(code: string, name?: string): void {\n        if (name !== undefined) {\n            if (this.bindingNames.has(name)) return;\n            this.bindingNames.add(name);\n        }\n        this.bindings.push(code);\n    }\n\n    hoistDescriptor(expression: string): string {\n        const existing = this.hoistedDescriptors.get(expression);\n        if (existing !== undefined) return existing;\n        const name = `_desc${this.hoistedDescriptors.size}`;\n        this.hoistedDescriptors.set(expression, name);\n        this.appendBinding(`const ${name} = ${expression};`, name);\n        return name;\n    }\n\n    appendDeclaration(code: string): void {\n        this.declarations.push(code);\n    }\n\n    appendRegistration(code: string): void {\n        this.registrations.push(code);\n    }\n\n    toSource(): string {\n        const sections: string[] = [];\n        const importsBlock = this.imports.toSource();\n        if (importsBlock.length > 0) sections.push(importsBlock.trimEnd());\n        if (this.declarations.length > 0) sections.push(this.declarations.join(\"\\n\\n\"));\n        if (this.bindings.length > 0) sections.push(this.bindings.join(\"\\n\\n\"));\n        if (this.registrations.length > 0) sections.push(this.registrations.join(\"\\n\\n\"));\n        return `${sections.join(\"\\n\\n\")}\\n`;\n    }\n}\n"]}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,aAAa;IACP,QAAQ,GAAa,EAAE,CAAC;IACxB,YAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;IACtC,kBAAkB,GAAwB,IAAI,GAAG,EAAE,CAAC;IACpD,YAAY,GAAa,EAAE,CAAC;IAC5B,aAAa,GAAa,EAAE,CAAC;IAC9B,OAAO,GAAmB,IAAI,cAAc,EAAE,CAAC;IAEtD,aAAa,CAAC,IAAY,EAAE,IAAa;QACrC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,OAAO;YACX,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,eAAe,CAAC,UAAkB;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,MAAM,IAAI,GAAG,QAAQ,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5D,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,MAAM,UAAU,GAAG,EAAE,IAAI,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,IAAY;QAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,kBAAkB,CAAC,IAAY;QAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ;QACJ,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAE7C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IACxC,CAAC;CACJ;AAED,OAAO,EAAE,aAAa,EAAE,CAAC","sourcesContent":["import { ImportsBuilder } from \"./imports.js\";\n\nclass ModuleBuilder {\n    private bindings: string[] = [];\n    private bindingNames: Set<string> = new Set();\n    private hoistedDescriptors: Map<string, string> = new Map();\n    private declarations: string[] = [];\n    private registrations: string[] = [];\n    public imports: ImportsBuilder = new ImportsBuilder();\n\n    appendBinding(code: string, name?: string): void {\n        if (name !== undefined) {\n            if (this.bindingNames.has(name)) {\n                return;\n            }\n\n            this.bindingNames.add(name);\n        }\n\n        this.bindings.push(code);\n    }\n\n    hoistDescriptor(expression: string): string {\n        const existing = this.hoistedDescriptors.get(expression);\n\n        if (existing !== undefined) {\n            return existing;\n        }\n\n        const name = `_desc${String(this.hoistedDescriptors.size)}`;\n        this.hoistedDescriptors.set(expression, name);\n        this.appendBinding(`const ${name} = ${expression};`, name);\n\n        return name;\n    }\n\n    appendDeclaration(code: string): void {\n        this.declarations.push(code);\n    }\n\n    appendRegistration(code: string): void {\n        this.registrations.push(code);\n    }\n\n    toSource(): string {\n        const sections: string[] = [];\n        const importsBlock = this.imports.toSource();\n\n        if (importsBlock.length > 0) {\n            sections.push(importsBlock.trimEnd());\n        }\n\n        if (this.declarations.length > 0) {\n            sections.push(this.declarations.join(\"\\n\\n\"));\n        }\n\n        if (this.bindings.length > 0) {\n            sections.push(this.bindings.join(\"\\n\\n\"));\n        }\n\n        if (this.registrations.length > 0) {\n            sections.push(this.registrations.join(\"\\n\\n\"));\n        }\n\n        return `${sections.join(\"\\n\\n\")}\\n`;\n    }\n}\n\nexport { ModuleBuilder };\n"]}

package/dist/xml.d.ts

@@ -0,0 +1,4 @@
+import { type X2jOptions, XMLParser } from "fast-xml-parser";
+declare const createXmlParser: (options: Partial<X2jOptions>) => XMLParser;
+export { createXmlParser };
+//# sourceMappingURL=xml.d.ts.map

package/dist/xml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["../src/xml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE7D,QAAA,MAAM,eAAe,GAAI,SAAS,OAAO,CAAC,UAAU,CAAC,KAAG,SAOlD,CAAC;AAEP,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/dist/xml.js

@@ -0,0 +1,10 @@
+import { XMLParser } from "fast-xml-parser";
+const createXmlParser = (options) => new XMLParser({
+    ignoreAttributes: false,
+    attributeNamePrefix: "@_",
+    parseAttributeValue: false,
+    parseTagValue: false,
+    ...options,
+});
+export { createXmlParser };
+//# sourceMappingURL=xml.js.map

package/dist/xml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xml.js","sourceRoot":"","sources":["../src/xml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,eAAe,GAAG,CAAC,OAA4B,EAAa,EAAE,CAChE,IAAI,SAAS,CAAC;IACV,gBAAgB,EAAE,KAAK;IACvB,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,KAAK;IACpB,GAAG,OAAO;CACb,CAAC,CAAC;AAEP,OAAO,EAAE,eAAe,EAAE,CAAC","sourcesContent":["import { type X2jOptions, XMLParser } from \"fast-xml-parser\";\n\nconst createXmlParser = (options: Partial<X2jOptions>): XMLParser =>\n    new XMLParser({\n        ignoreAttributes: false,\n        attributeNamePrefix: \"@_\",\n        parseAttributeValue: false,\n        parseTagValue: false,\n        ...options,\n    });\n\nexport { createXmlParser };\n"]}

package/overrides/cairo/context.ts.ejs

@@ -27,7 +27,7 @@ export type CairoGlyph = { index: number; x: number; y: number };
 export type CairoTextCluster = { numBytes: number; numGlyphs: number };
 
 export const allocGlyphBuffer = (glyphs: CairoGlyph[]): ExternalObject<Handle> => {
-    const buf = alloc(glyphs.length * 24, "cairo_glyph_t[]");
+    const buf = alloc(glyphs.length * 24);
     let offset = 0;
     for (const glyph of glyphs) {
         write(buf, t.uint64, offset, glyph.index);
@@ -39,7 +39,7 @@ export const allocGlyphBuffer = (glyphs: CairoGlyph[]): ExternalObject<Handle> =
 };
 
 export const allocClusterBuffer = (clusters: CairoTextCluster[]): ExternalObject<Handle> => {
-    const buf = alloc(clusters.length * 8, "cairo_text_cluster_t[]");
+    const buf = alloc(clusters.length * 8);
     let offset = 0;
     for (const cluster of clusters) {
         write(buf, t.int32, offset, cluster.numBytes);
@@ -471,7 +471,7 @@ const DOUBLE_BUFFER_T = t.boxed("double[]", { ownership: "borrowed", sharedLibra
 
 const cairoSetDash = bind("libcairo.so.2", "cairo_set_dash", [CONTEXT_T, DOUBLE_BUFFER_T, t.int32, t.float64], t.void);
 Context.prototype.setDash = function (dashes: number[], offset: number): void {
-    const dashBuf = alloc(dashes.length * 8, "double[]");
+    const dashBuf = alloc(dashes.length * 8);
     for (let i = 0; i < dashes.length; i++) {
         write(dashBuf, t.float64, i * 8, dashes[i]);
     }
@@ -489,7 +489,7 @@ Context.prototype.getDash = function (): { dashes: number[]; offset: number } {
     if (count === 0) {
         return { dashes: [], offset: 0 };
     }
-    const dashBuf = alloc(count * 8, "double[]");
+    const dashBuf = alloc(count * 8);
     const offsetRef = { value: 0 };
     cairoGetDash(getHandle(this), dashBuf, offsetRef);
     const dashes: number[] = [];
@@ -600,7 +600,7 @@ const cairoTextExtents = bind(
     t.void,
 );
 Context.prototype.textExtents = function (text: string): TextExtents {
-    const extents = alloc(48, "cairo_text_extents_t");
+    const extents = alloc(48);
     cairoTextExtents(getHandle(this), text, extents);
     return readTextExtents(extents);
 };
@@ -612,7 +612,7 @@ const cairoFontExtents = bind(
     t.void,
 );
 Context.prototype.fontExtents = function (): FontExtents {
-    const extents = alloc(40, "cairo_font_extents_t");
+    const extents = alloc(40);
     cairoFontExtents(getHandle(this), extents);
     return readFontExtents(extents);
 };
@@ -1140,7 +1140,7 @@ const cairoGlyphExtents = bind(
 );
 Context.prototype.glyphExtents = function (glyphs: Array<{ index: number; x: number; y: number }>): TextExtents {
     const buf = allocGlyphBuffer(glyphs);
-    const extents = alloc(48, "cairo_text_extents_t");
+    const extents = alloc(48);
     cairoGlyphExtents(getHandle(this), buf, glyphs.length, extents);
     return readTextExtents(extents);
 };

package/overrides/cairo/matrix.ts.ejs

@@ -4,7 +4,7 @@ import type { Status } from "../cairo.js";
 const { bind } = t;
 
 export const allocMatrix = (): { handle: ExternalObject<Handle>; obj: Matrix } => {
-    const handle = alloc(48, "cairo_matrix_t");
+    const handle = alloc(48);
     const obj = wrapHandle(handle, Matrix);
     return { handle, obj };
 };
@@ -104,7 +104,7 @@ const cairoMatrixInit = bind(
 
 export class Matrix {
     constructor(xx: number, yx: number, xy: number, yy: number, x0: number, y0: number) {
-        const handle = alloc(48, "cairo_matrix_t");
+        const handle = alloc(48);
         setHandle(this, handle);
         cairoMatrixInit(handle, xx, yx, xy, yy, x0, y0);
     }

package/overrides/cairo/recording-surface.ts.ejs

@@ -60,7 +60,7 @@ export class RecordingSurface extends Surface {
         super();
         let handle: ExternalObject<Handle>;
         if (extents) {
-            const rect = alloc(32, "cairo_rectangle_t");
+            const rect = alloc(32);
             write(rect, t.float64, 0, extents.x);
             write(rect, t.float64, 8, extents.y);
             write(rect, t.float64, 16, extents.width);
@@ -89,7 +89,7 @@ export class RecordingSurface extends Surface {
     }
 
     getExtents(): { x: number; y: number; width: number; height: number } | null {
-        const rect = alloc(32, "cairo_rectangle_t");
+        const rect = alloc(32);
         const result = cairoRecordingSurfaceGetExtents(getHandle(this), rect) as boolean;
         if (!result) return null;
         return {

package/overrides/cairo/region.ts.ejs

@@ -86,7 +86,7 @@ class RegionImpl extends Region {
         if (rects.length === 0) {
             return RegionImpl.empty();
         }
-        const buf = alloc(rects.length * 16, "cairo_rectangle_int_t[]");
+        const buf = alloc(rects.length * 16);
         let offset = 0;
         for (const rect of rects) {
             write(buf, t.int32, offset, rect.x);

package/overrides/cairo/scaled-font.ts.ejs

@@ -106,7 +106,7 @@ const cairoScaledFontExtents = bind(
     t.void,
 );
 ScaledFont.prototype.extents = function (): FontExtents {
-    const ext = alloc(40, "cairo_font_extents_t");
+    const ext = alloc(40);
     cairoScaledFontExtents(getHandle(this), ext);
     return readFontExtents(ext);
 };
@@ -122,7 +122,7 @@ const cairoScaledFontTextExtents = bind(
     t.void,
 );
 ScaledFont.prototype.textExtents = function (text: string): TextExtents {
-    const ext = alloc(48, "cairo_text_extents_t");
+    const ext = alloc(48);
     cairoScaledFontTextExtents(getHandle(this), text, ext);
     return readTextExtents(ext);
 };
@@ -140,7 +140,7 @@ const cairoScaledFontGlyphExtents = bind(
 );
 ScaledFont.prototype.glyphExtents = function (glyphs: Array<{ index: number; x: number; y: number }>): TextExtents {
     const buf = allocGlyphBuffer(glyphs);
-    const ext = alloc(48, "cairo_text_extents_t");
+    const ext = alloc(48);
     cairoScaledFontGlyphExtents(getHandle(this), buf, glyphs.length, ext);
     return readTextExtents(ext);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/codegen",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.3",
   "description": "Generates the typed GTKX bindings and API reference from GIR and OpenGL registry data",
   "keywords": [
     "gtkx",
@@ -28,6 +28,14 @@
     ".": {
       "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"
     }
   },
   "sideEffects": false,
@@ -40,16 +48,13 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@types/node": "^26.1.1",
-    "@types/react": "^19.2.17",
-    "fast-xml-parser": "^5.10.0",
-    "typescript": "^7.0.2",
-    "@gtkx/config": "1.0.0-rc.1",
-    "@gtkx/utils": "1.0.0-rc.1"
+    "@types/node": "^26.1.2",
+    "fast-xml-parser": "^5.10.1",
+    "typescript": "^6.0.3",
+    "@gtkx/react": "1.0.0-rc.3",
+    "@gtkx/utils": "1.0.0-rc.3"
   },
   "scripts": {
-    "build": "tsc -b tsconfig.lib.json",
-    "typecheck": "tsc -b --emitDeclarationOnly",
     "release": "tsx ../../scripts/release-package.ts"
   }
 }