@gtkx/codegen 1.0.0 → 1.1.0

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,KAAK,YAAY,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,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,CAAkC;IACvD,OAAO,CAAC,aAAa,CAAgB;IAC9B,OAAO,EAAE,cAAc,CAAwB;IAEtD,OAAO,CAAC,aAAa;IAarB,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,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI;IAQ9D,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAItC,QAAQ,IAAI,MAAM;CAsBrB;AAED,OAAO,EAAE,KAAK,YAAY,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,KAAK,WAAW,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AA6BF,cAAM,aAAa;IACf,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,kBAAkB,CAAkC;IAC5D,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,aAAa,CAAkC;IACvD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,aAAa,CAA0B;IACxC,OAAO,EAAE,cAAc,CAAwB;IAEtD,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,mBAAmB;IAa3B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAYhD,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAc3C,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAOjD,UAAU,IAAI,OAAO;IAIrB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,IAAI;IAQ/D,QAAQ,IAAI,MAAM;CAuBrB;AAED,OAAO,EAAE,KAAK,WAAW,EAAE,aAAa,EAAE,CAAC"}

package/dist/writer/module.js

@@ -1,19 +1,69 @@
 import { ImportsBuilder } from "./imports.js";
+const EXPORTED_DECLARATION = /^export (?:abstract )?(class|const|enum|function|interface|type) ([A-Za-z_$][\w$]*)/mu;
+const SPACES_BY_KEYWORD = new Map([
+    ["class", ["value", "type"]],
+    ["const", ["value"]],
+    ["enum", ["value", "type"]],
+    ["function", ["value"]],
+    ["interface", []],
+    ["type", ["type"]],
+]);
+const getExportedDeclaration = (code) => {
+    const match = EXPORTED_DECLARATION.exec(code);
+    const spaces = SPACES_BY_KEYWORD.get(match?.[1] ?? "");
+    const name = match?.[2];
+    return spaces === undefined || name === undefined ? undefined : { name, spaces };
+};
+const exportedNameText = (exported) => exported === undefined ? "no name at all" : `'${exported.name}'`;
 class ModuleBuilder {
     bindings = [];
     bindingNames = new Set();
     hoistedDescriptors = new Map();
+    claimedSpaces = new Set();
     declarations = [];
+    declaredNames = new Set();
     declaredTypes = new Map();
     registrations = [];
+    requiredNames = new Set();
     imports = new ImportsBuilder();
-    claimTypeName(declared) {
-        const owner = this.declaredTypes.get(declared.name);
-        if (owner !== undefined && owner !== declared.owner) {
-            throw new Error(`The generated type '${declared.name}' is declared for both ${owner} and ${declared.owner}. ` +
+    claimSpace(name, space) {
+        const key = `${space} ${name}`;
+        if (this.claimedSpaces.has(key)) {
+            throw new Error(`The generated module declares '${name}' twice in its ${space} space. ` +
+                "A module may declare each exported name once per declaration space.");
+        }
+        this.claimedSpaces.add(key);
+    }
+    claimExportedName(declaration) {
+        const exported = getExportedDeclaration(declaration.code);
+        const spaces = exported?.name === declaration.name ? exported.spaces : undefined;
+        if (spaces === undefined) {
+            throw new Error(`The declaration recorded as '${declaration.name}' exports ${exportedNameText(exported)}. ` +
+                "A declaration may only be recorded under the name its own code exports.");
+        }
+        for (const space of spaces) {
+            this.claimSpace(declaration.name, space);
+        }
+    }
+    claimTypeName(declaration) {
+        const { name, owner } = declaration;
+        if (owner === undefined) {
+            return;
+        }
+        const previous = this.declaredTypes.get(name);
+        if (previous !== undefined && previous !== owner) {
+            throw new Error(`The generated type '${name}' is declared for both ${previous} and ${owner}. ` +
                 "Rename one of them, or drop the namespace from the configuration.");
         }
-        this.declaredTypes.set(declared.name, declared.owner);
+        this.declaredTypes.set(name, owner);
+    }
+    verifyRegistrations() {
+        const missing = [...this.requiredNames].filter((name) => !this.declaredNames.has(name));
+        if (missing.length === 0) {
+            return;
+        }
+        throw new Error(`The generated module registers ${missing.join(", ")}, which it never declares. ` +
+            "A registration may only name a symbol whose declaration the same module emits.");
     }
     appendBinding(code, name) {
         if (name !== undefined) {
@@ -34,16 +84,23 @@ class ModuleBuilder {
         this.appendBinding(`const ${name} = ${expression};`, name);
         return name;
     }
-    appendDeclaration(code, declared) {
-        if (declared !== undefined) {
-            this.claimTypeName(declared);
-        }
-        this.declarations.push(code);
+    appendDeclaration(declaration) {
+        this.claimExportedName(declaration);
+        this.claimTypeName(declaration);
+        this.declaredNames.add(declaration.name);
+        this.declarations.push(declaration.code);
     }
-    appendRegistration(code) {
+    hasExports() {
+        return this.declaredNames.size > 0;
+    }
+    appendRegistration(code, requires = []) {
+        for (const name of requires) {
+            this.requiredNames.add(name);
+        }
         this.registrations.push(code);
     }
     toSource() {
+        this.verifyRegistrations();
         const sections = [];
         const importsBlock = this.imports.toSource();
         if (importsBlock.length > 0) {

package/dist/writer/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImportsBuilder } from \"./imports.js\";\n\ntype DeclaredType = {\n    name: string;\n    owner: string;\n};\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 declaredTypes: Map<string, string> = new Map();\n    private registrations: string[] = [];\n    public imports: ImportsBuilder = new ImportsBuilder();\n\n    private claimTypeName(declared: DeclaredType): void {\n        const owner = this.declaredTypes.get(declared.name);\n\n        if (owner !== undefined && owner !== declared.owner) {\n            throw new Error(\n                `The generated type '${declared.name}' is declared for both ${owner} and ${declared.owner}. ` +\n                \"Rename one of them, or drop the namespace from the configuration.\",\n            );\n        }\n\n        this.declaredTypes.set(declared.name, declared.owner);\n    }\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, declared?: DeclaredType): void {\n        if (declared !== undefined) {\n            this.claimTypeName(declared);\n        }\n\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 { type DeclaredType, ModuleBuilder };\n"]}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/writer/module.ts"],"names":[],"mappings":"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","sourcesContent":["import { ImportsBuilder } from \"./imports.js\";\n\ntype Declaration = {\n    name: string;\n    code: string;\n    owner?: string | undefined;\n};\n\ntype ExportedDeclaration = {\n    name: string;\n    spaces: string[];\n};\n\nconst EXPORTED_DECLARATION = /^export (?:abstract )?(class|const|enum|function|interface|type) ([A-Za-z_$][\\w$]*)/mu;\n\nconst SPACES_BY_KEYWORD: Map<string, string[]> = new Map([\n    [\"class\", [\"value\", \"type\"]],\n    [\"const\", [\"value\"]],\n    [\"enum\", [\"value\", \"type\"]],\n    [\"function\", [\"value\"]],\n    [\"interface\", []],\n    [\"type\", [\"type\"]],\n]);\n\nconst getExportedDeclaration = (code: string): ExportedDeclaration | undefined => {\n    const match = EXPORTED_DECLARATION.exec(code);\n    const spaces = SPACES_BY_KEYWORD.get(match?.[1] ?? \"\");\n    const name = match?.[2];\n\n    return spaces === undefined || name === undefined ? undefined : { name, spaces };\n};\n\nconst exportedNameText = (exported: ExportedDeclaration | undefined): string =>\n    exported === undefined ? \"no name at all\" : `'${exported.name}'`;\n\nclass ModuleBuilder {\n    private bindings: string[] = [];\n    private bindingNames: Set<string> = new Set();\n    private hoistedDescriptors: Map<string, string> = new Map();\n    private claimedSpaces: Set<string> = new Set();\n    private declarations: string[] = [];\n    private declaredNames: Set<string> = new Set();\n    private declaredTypes: Map<string, string> = new Map();\n    private registrations: string[] = [];\n    private requiredNames: Set<string> = new Set();\n    public imports: ImportsBuilder = new ImportsBuilder();\n\n    private claimSpace(name: string, space: string): void {\n        const key = `${space} ${name}`;\n\n        if (this.claimedSpaces.has(key)) {\n            throw new Error(\n                `The generated module declares '${name}' twice in its ${space} space. ` +\n                \"A module may declare each exported name once per declaration space.\",\n            );\n        }\n\n        this.claimedSpaces.add(key);\n    }\n\n    private claimExportedName(declaration: Declaration): void {\n        const exported = getExportedDeclaration(declaration.code);\n        const spaces = exported?.name === declaration.name ? exported.spaces : undefined;\n\n        if (spaces === undefined) {\n            throw new Error(\n                `The declaration recorded as '${declaration.name}' exports ${exportedNameText(exported)}. ` +\n                \"A declaration may only be recorded under the name its own code exports.\",\n            );\n        }\n\n        for (const space of spaces) {\n            this.claimSpace(declaration.name, space);\n        }\n    }\n\n    private claimTypeName(declaration: Declaration): void {\n        const { name, owner } = declaration;\n\n        if (owner === undefined) {\n            return;\n        }\n\n        const previous = this.declaredTypes.get(name);\n\n        if (previous !== undefined && previous !== owner) {\n            throw new Error(\n                `The generated type '${name}' is declared for both ${previous} and ${owner}. ` +\n                \"Rename one of them, or drop the namespace from the configuration.\",\n            );\n        }\n\n        this.declaredTypes.set(name, owner);\n    }\n\n    private verifyRegistrations(): void {\n        const missing = [...this.requiredNames].filter((name) => !this.declaredNames.has(name));\n\n        if (missing.length === 0) {\n            return;\n        }\n\n        throw new Error(\n            `The generated module registers ${missing.join(\", \")}, which it never declares. ` +\n            \"A registration may only name a symbol whose declaration the same module emits.\",\n        );\n    }\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(declaration: Declaration): void {\n        this.claimExportedName(declaration);\n        this.claimTypeName(declaration);\n        this.declaredNames.add(declaration.name);\n        this.declarations.push(declaration.code);\n    }\n\n    hasExports(): boolean {\n        return this.declaredNames.size > 0;\n    }\n\n    appendRegistration(code: string, requires: string[] = []): void {\n        for (const name of requires) {\n            this.requiredNames.add(name);\n        }\n\n        this.registrations.push(code);\n    }\n\n    toSource(): string {\n        this.verifyRegistrations();\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 { type Declaration, ModuleBuilder };\n"]}

package/dist/xml.d.ts

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

package/dist/xml.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["../src/xml.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI7D,KAAK,YAAY,GAAG;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,QAAA,MAAM,eAAe,GAAI,SAAS,OAAO,CAAC,UAAU,CAAC,KAAG,SAOlD,CAAC;AA0CP,QAAA,MAAM,YAAY,GAAI,OAAO,YAAY,KAAG,OAS3C,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC"}

package/dist/xml.js

@@ -1,4 +1,7 @@
+import { errorMessage, isRecord } from "@gtkx/utils";
 import { XMLParser } from "fast-xml-parser";
+import { SyntaxValidator } from "fast-xml-validator";
+import { readFileSync } from "node:fs";
 const createXmlParser = (options) => new XMLParser({
     ignoreAttributes: false,
     attributeNamePrefix: "@_",
@@ -6,5 +9,44 @@ const createXmlParser = (options) => new XMLParser({
     parseTagValue: false,
     ...options,
 });
-export { createXmlParser };
+const xmlFileError = (input, action, error) => new Error(`Cannot ${action} the ${input.label} at ${input.path}: ${errorMessage(error)}`, { cause: error });
+const readXmlFile = (input) => {
+    try {
+        return readFileSync(input.path, "utf8");
+    }
+    catch (error) {
+        throw xmlFileError(input, "read", error);
+    }
+};
+const isLocated = (line, col) => typeof line === "number" && typeof col === "number" && (line > 1 || col > 1);
+const positionSuffix = (error) => {
+    if (!isRecord(error)) {
+        return "";
+    }
+    const { line, col } = error;
+    if (!isLocated(line, col)) {
+        return "";
+    }
+    return ` (line ${String(line)}, column ${String(col)})`;
+};
+const assertWellFormed = (input, xml) => {
+    try {
+        SyntaxValidator.validate(xml);
+    }
+    catch (error) {
+        throw new Error(`The ${input.label} at ${input.path} is not well-formed XML: ` +
+            `${errorMessage(error)}${positionSuffix(error)}`, { cause: error });
+    }
+};
+const parseXmlFile = (input) => {
+    const xml = readXmlFile(input);
+    assertWellFormed(input, xml);
+    try {
+        return input.parser.parse(xml);
+    }
+    catch (error) {
+        throw xmlFileError(input, "parse", error);
+    }
+};
+export { createXmlParser, parseXmlFile };
 //# sourceMappingURL=xml.js.map

package/dist/xml.js.map

@@ -1 +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"]}
+{"version":3,"file":"xml.js","sourceRoot":"","sources":["../src/xml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAmB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAQvC,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,MAAM,YAAY,GAAG,CAAC,KAAmB,EAAE,MAAc,EAAE,KAAc,EAAS,EAAE,CAChF,IAAI,KAAK,CAAC,UAAU,MAAM,QAAQ,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AAEhH,MAAM,WAAW,GAAG,CAAC,KAAmB,EAAU,EAAE;IAChD,IAAI,CAAC;QACD,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,GAAY,EAAW,EAAE,CACvD,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC;AAEjF,MAAM,cAAc,GAAG,CAAC,KAAc,EAAU,EAAE;IAC9C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IAE5B,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO,UAAU,MAAM,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,KAAmB,EAAE,GAAW,EAAQ,EAAE;IAChE,IAAI,CAAC;QACD,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACX,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC,IAAI,2BAA2B;YAC9D,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,EAAE,EAChD,EAAE,KAAK,EAAE,KAAK,EAAE,CACnB,CAAC;IACN,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAmB,EAAW,EAAE;IAClD,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC/B,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE7B,IAAI,CAAC;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC","sourcesContent":["import { errorMessage, isRecord } from \"@gtkx/utils\";\nimport { type X2jOptions, XMLParser } from \"fast-xml-parser\";\nimport { SyntaxValidator } from \"fast-xml-validator\";\nimport { readFileSync } from \"node:fs\";\n\ntype XmlFileInput = {\n    parser: XMLParser;\n    label: string;\n    path: string;\n};\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\nconst xmlFileError = (input: XmlFileInput, action: string, error: unknown): Error =>\n    new Error(`Cannot ${action} the ${input.label} at ${input.path}: ${errorMessage(error)}`, { cause: error });\n\nconst readXmlFile = (input: XmlFileInput): string => {\n    try {\n        return readFileSync(input.path, \"utf8\");\n    } catch (error) {\n        throw xmlFileError(input, \"read\", error);\n    }\n};\n\nconst isLocated = (line: unknown, col: unknown): boolean =>\n    typeof line === \"number\" && typeof col === \"number\" && (line > 1 || col > 1);\n\nconst positionSuffix = (error: unknown): string => {\n    if (!isRecord(error)) {\n        return \"\";\n    }\n\n    const { line, col } = error;\n\n    if (!isLocated(line, col)) {\n        return \"\";\n    }\n\n    return ` (line ${String(line)}, column ${String(col)})`;\n};\n\nconst assertWellFormed = (input: XmlFileInput, xml: string): void => {\n    try {\n        SyntaxValidator.validate(xml);\n    } catch (error) {\n        throw new Error(\n            `The ${input.label} at ${input.path} is not well-formed XML: ` +\n            `${errorMessage(error)}${positionSuffix(error)}`,\n            { cause: error },\n        );\n    }\n};\n\nconst parseXmlFile = (input: XmlFileInput): unknown => {\n    const xml = readXmlFile(input);\n    assertWellFormed(input, xml);\n\n    try {\n        return input.parser.parse(xml);\n    } catch (error) {\n        throw xmlFileError(input, \"parse\", error);\n    }\n};\n\nexport { createXmlParser, parseXmlFile };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gtkx/codegen",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Generates the typed GTKX bindings and API reference from GIR and OpenGL registry data",
   "keywords": [
     "gtkx",
@@ -40,15 +40,26 @@
     "overrides",
     "src"
   ],
+  "nx": {
+    "targets": {
+      "lint": {
+        "options": {
+          "cwd": ".",
+          "command": "eslint {projectRoot}"
+        }
+      }
+    }
+  },
   "engines": {
     "node": ">=24"
   },
   "dependencies": {
     "@types/node": "^26.2.0",
     "fast-xml-parser": "^5.10.1",
+    "fast-xml-validator": "^1.4.1",
     "typescript": "^6.0.3",
-    "@gtkx/utils": "1.0.0",
-    "@gtkx/react": "1.0.0"
+    "@gtkx/react": "1.1.0",
+    "@gtkx/utils": "1.1.0"
   },
   "scripts": {
     "release": "tsx ../../scripts/release-package.ts"

package/src/analysis/descriptor-render.ts

@@ -1,10 +1,11 @@
-import { sourceStringLiteral } from "@gtkx/utils";
+import { sanitizeTypeIdentifier, sourceStringLiteral } from "@gtkx/utils";
 import type { GirCallback } from "../gir/callback.js";
 import type { Library } from "../gir/library.js";
 import type { PrimitiveCategory } from "../gir/primitives.js";
 import type { EntityType, GirType } from "../gir/type.js";
 import type { ModuleContext } from "../writer/context.js";
 import {
+    type GirCursorBounds,
     type GirParameter,
     type GirReturnValue,
     isCallerAllocatedOut,
@@ -20,7 +21,7 @@ import {
     type TypeId,
 } from "../gir/type-id.js";
 import { isRecordInout } from "../store/gi/param-marshal.js";
-import { computeRecordFieldSlots } from "../store/gi/record-layout.js";
+import { computeRecordFieldSlots, recordInlineSize } from "../store/gi/record-layout.js";
 import { isValueMarshalable } from "../store/gi/value-marshalable.js";
 import {
     type ListDescriptorName,
@@ -30,6 +31,7 @@ import {
     tBoxed,
     tByteArray,
     tCallback,
+    tCursorArray,
     tEnum,
     tFixedArray,
     tFlags,
@@ -50,21 +52,23 @@ import {
 } from "./descriptor.js";
 import { carrayFor, isUnboundedArray, primitiveCategoryFor } from "./type-shape.js";
 
-type RenderDescriptorOptions = {
-    argIndexOffset?: number;
-    argIndexMap?: Map<number, number> | undefined;
-    hasOutIndirection?: boolean;
-    isCallerAllocated?: boolean;
-    isInline?: boolean;
-    isNewlyCreated?: boolean;
-};
+type PrimaryReturnKind = "surfaced" | "void" | "skipped";
 
 type ArgIndexOptions = {
     argIndexOffset: number;
     argIndexMap: Map<number, number> | undefined;
+    cursor: GirCursorBounds | undefined;
     hasOutIndirection: boolean;
 };
 
+type CursorArgIndexOptions = ArgIndexOptions & { cursor: GirCursorBounds };
+
+type RenderDescriptorOptions = Partial<ArgIndexOptions> & {
+    isCallerAllocated?: boolean;
+    isInline?: boolean;
+    isNewlyCreated?: boolean;
+};
+
 type RecordPlacement = {
     isCallerAllocated?: boolean;
     isInline?: boolean;
@@ -91,6 +95,7 @@ type ResolvedRecord = Extract<EntityType, { kind: "record" }>["value"];
 
 type FundamentalRecordOptions = {
     resolved: Extract<EntityType, { kind: "record" }>;
+    lib: string;
     refFunc: string;
     unrefFunc: string;
     ownership: Ownership;
@@ -131,12 +136,27 @@ const isVoidRef = (library: Library, ref: TypeId | undefined): boolean =>
 const isInlineCallbackRef = (library: Library, ref: TypeId | undefined): boolean =>
     ref !== undefined && library.typeFor(ref)?.kind === "callback" && library.nameFor(ref) === undefined;
 
+const primaryReturnKind = (library: Library, returnValue: GirReturnValue): PrimaryReturnKind => {
+    if (isVoidRef(library, returnValue.type)) {
+        return "void";
+    }
+
+    return returnValue.skip ? "skipped" : "surfaced";
+};
+
 const shouldOmitPrimaryReturn = (library: Library, returnValue: GirReturnValue): boolean =>
-    isVoidRef(library, returnValue.type) || returnValue.skip;
+    primaryReturnKind(library, returnValue) !== "surfaced";
+
+const isSkippedPrimaryReturn = (library: Library, returnValue: GirReturnValue): boolean =>
+    primaryReturnKind(library, returnValue) === "skipped";
+
+const isVoidPrimaryReturn = (library: Library, returnValue: GirReturnValue): boolean =>
+    primaryReturnKind(library, returnValue) === "void";
 
 const argIndexOptions = (options: RenderDescriptorOptions): ArgIndexOptions => ({
     argIndexOffset: options.argIndexOffset ?? 0,
     argIndexMap: options.argIndexMap,
+    cursor: options.cursor,
     hasOutIndirection: options.hasOutIndirection === true,
 });
 
@@ -276,7 +296,7 @@ const renderParamDescriptor = (
     ref: TypeId | undefined,
     argIndex: Partial<ArgIndexOptions> = {},
 ): string => {
-    const behindRef: RenderDescriptorOptions = { ...argIndex, hasOutIndirection: true };
+    const behindRef: RenderDescriptorOptions = { ...argIndex, cursor: parameter.cursor, hasOutIndirection: true };
 
     if (isCellInout(context.library, parameter)) {
         return tRef(renderDescriptor(context, ref, parameter.transferOwnership, behindRef), true);
@@ -310,7 +330,7 @@ const findUserDataIndex = (parameters: GirParameter[]): number | undefined => {
     return declared?.closureIndex ?? userDataIndexByName(parameters);
 };
 
-const callbackOptionsArg = (owningParameter: GirParameter, userDataIndex: number | undefined): string | undefined => {
+const callbackOptionsArg = (owningParameter: GirParameter, userDataIndex: number | undefined): string[] => {
     const options: string[] = [];
 
     if (owningParameter.destroyIndex !== undefined) {
@@ -329,7 +349,7 @@ const callbackOptionsArg = (owningParameter: GirParameter, userDataIndex: number
         options.push(`scope: ${sourceStringLiteral(owningParameter.scope)}`);
     }
 
-    return options.length > 0 ? `{ ${options.join(", ")} }` : undefined;
+    return options;
 };
 
 const renderCallbackType = (
@@ -348,15 +368,13 @@ const renderCallbackType = (
         (parameter, index) => argOverrides?.get(index) ?? renderParamDescriptor(context, parameter, parameter.type),
     );
 
-    const returnRef = callback.returnValue.type;
+    const { returnValue } = callback;
 
-    const returnType = isVoidRef(context.library, returnRef)
-        ? tVoid
-        : renderDescriptor(context, returnRef, callback.returnValue.transferOwnership);
-
-    const optionsArg = callbackOptionsArg(owningParameter, findUserDataIndex(callback.parameters));
-
-    return tCallback(argTypes, returnType, optionsArg);
+    return tCallback({
+        argTypes,
+        returns: renderDescriptor(context, returnValue.type, returnValue.transferOwnership),
+        options: callbackOptionsArg(owningParameter, findUserDataIndex(callback.parameters)),
+    });
 };
 
 const primitiveExpression = (category: PrimitiveCategory, ownership: Ownership): string => {
@@ -424,13 +442,14 @@ const getFundamental = (
     node: Extract<EntityType, { kind: "class" | "interface" }>,
 ): AncestorFundamental | undefined => {
     const cls = node.value;
+    const lib = node.namespace.sharedLibrary;
 
-    if (!cls.fundamental || cls.glibRefFunc === undefined || cls.glibUnrefFunc === undefined) {
+    if (lib === undefined || !cls.fundamental || cls.glibRefFunc === undefined || cls.glibUnrefFunc === undefined) {
         return undefined;
     }
 
     return {
-        lib: node.namespace.sharedLibrary ?? "",
+        lib,
         refFunc: cls.glibRefFunc,
         unrefFunc: cls.glibUnrefFunc,
         typeName: cls.glibTypeName,
@@ -529,7 +548,7 @@ const structExpression = (
     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 wrapperClass = context.qualify(resolved.namespace.name, sanitizeTypeIdentifier(resolved.value.name));
     const isCopyable = isValueMarshalable(context, resolved.namespace.name, resolved.value);
 
     return tStruct(ownership, {
@@ -541,10 +560,10 @@ const structExpression = (
 };
 
 const fundamentalRecordExpression = (options: FundamentalRecordOptions): string => {
-    const { resolved, refFunc, unrefFunc, ownership, wrapperClass, isInline } = options;
+    const { resolved, lib, refFunc, unrefFunc, ownership, wrapperClass, isInline } = options;
 
     return renderFundamental({
-        lib: resolved.namespace.sharedLibrary ?? "",
+        lib,
         refFunc,
         unrefFunc,
         typeName: resolved.value.glibTypeName,
@@ -605,14 +624,16 @@ const recordExpression = (
 ): string => {
     const record = resolved.value;
     const { refFunc, unrefFunc } = recordRefPair(record);
+    const lib = resolved.namespace.sharedLibrary;
 
-    if (refFunc !== undefined && unrefFunc !== undefined) {
+    if (refFunc !== undefined && unrefFunc !== undefined && lib !== undefined) {
         const wrapperClass = requiresFallbackClass(record)
-            ? context.qualify(resolved.namespace.name, record.name)
+            ? context.qualify(resolved.namespace.name, sanitizeTypeIdentifier(record.name))
             : undefined;
 
         return fundamentalRecordExpression({
             resolved,
+            lib,
             refFunc,
             unrefFunc,
             ownership,
@@ -629,13 +650,12 @@ const rawEnumDescriptor = (isSigned: boolean): string => (isSigned ? tInt32 : tU
 const enumExpression = (resolved: Extract<EntityType, { kind: "enum" }>): string => {
     const getter = resolved.value.glibGetType;
     const isSigned = resolved.value.members.some((member) => member.value.startsWith("-"));
+    const lib = resolved.namespace.sharedLibrary;
 
-    if (getter === undefined || getter === "") {
+    if (getter === undefined || getter === "" || lib === undefined) {
         return rawEnumDescriptor(isSigned);
     }
 
-    const lib = resolved.namespace.sharedLibrary ?? "";
-
     return resolved.value.kind === "bitfield" ? tFlags(lib, getter, isSigned) : tEnum(lib, getter, isSigned);
 };
 
@@ -667,19 +687,52 @@ const expressionForResolved = (
     }
 };
 
+const elementExpression = (
+    context: ModuleContext,
+    ref: CArrayType,
+    transfer: ParameterTransfer,
+    options: ArgIndexOptions,
+): string =>
+    renderDescriptor(context, ref.element, deriveElementTransfer(transfer), {
+        ...options,
+        cursor: undefined,
+        hasOutIndirection: false,
+    });
+
+const cursorArrayExpression = (
+    context: ModuleContext,
+    ref: CArrayType,
+    transfer: ParameterTransfer,
+    options: CursorArgIndexOptions,
+): string =>
+    tCursorArray(
+        elementExpression(context, ref, transfer, options),
+        {
+            baseIndex: mapArgIndex(options, options.cursor.baseIndex),
+            lengthIndex: mapArgIndex(options, options.cursor.lengthIndex),
+        },
+        transferOwnership(transfer),
+        inlineElementSize(context, ref, options.hasOutIndirection),
+    );
+
 const arrayExpression = (
     context: ModuleContext,
     ref: CArrayType,
     transfer: ParameterTransfer,
     options: ArgIndexOptions,
 ): string => {
+    const { cursor } = options;
+
+    if (cursor !== undefined) {
+        return cursorArrayExpression(context, ref, transfer, { ...options, cursor });
+    }
+
     if (hasUnknownArrayLength(ref)) {
         return tUint64;
     }
 
     const ownership = transferOwnership(transfer);
-    const elementOptions: ArgIndexOptions = { ...options, hasOutIndirection: false };
-    const element = renderDescriptor(context, ref.element, deriveElementTransfer(transfer), elementOptions);
+    const element = elementExpression(context, ref, transfer, options);
     const size = inlineElementSize(context, ref, options.hasOutIndirection);
 
     if (ref.lengthParameterIndex !== undefined) {
@@ -693,16 +746,6 @@ const arrayExpression = (
     return tArray(element, ownership, size);
 };
 
-const recordInlineSize = (context: ModuleContext, record: ResolvedRecord): number | undefined => {
-    if (record.opaque || record.disguised || record.fields.length === 0) {
-        return undefined;
-    }
-
-    const { size } = computeRecordFieldSlots(context, record.fields, record.isUnion);
-
-    return size > 0 ? size : undefined;
-};
-
 const elementPointerDepth = (elementCType: string | undefined, hasOutIndirection: boolean): number => {
     const declared = elementCType === undefined ? 0 : elementCType.split("*").length - 1;
 
@@ -738,11 +781,13 @@ const aliasExpression = (
 
 export {
     isInlineCallbackRef,
+    isSkippedPrimaryReturn,
+    isVoidPrimaryReturn,
+    primaryReturnKind,
     shouldOmitPrimaryReturn,
     renderDescriptor,
     isScalarRef,
     isCellInout,
-    recordInlineSize,
     renderParamDescriptor,
     renderCallbackType,
     renderSelfDescriptor,