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

package/dist/gir/field.js

@@ -1,13 +1,36 @@
-import { attr, attrBool, childOf, docOf, intAttr, nameAttr } from "./parse.js";
+import { attr, getChild, getChildren, getDoc, intAttr, isAttrTrue, nameAttr } from "./parse.js";
 import { typeRefFromNode } from "./type-ref.js";
-export const fieldFromNode = (node, context) => ({
+const fieldFromNode = (node, context) => ({
     name: nameAttr(node),
-    doc: docOf(node),
+    doc: getDoc(node),
     type: typeRefFromNode(node, context),
-    cType: attr(childOf(node, "type"), "c:type"),
-    readable: attrBool(node, "readable", true),
-    writable: attrBool(node, "writable", false),
-    private: attrBool(node, "private", false),
+    cType: attr(getChild(node, "type"), "c:type"),
+    readable: isAttrTrue(node, "readable", true),
+    writable: isAttrTrue(node, "writable", false),
+    private: isAttrTrue(node, "private", false),
     bits: intAttr(node, "bits"),
+    inlineMembers: undefined,
+    inlineIsUnion: false,
 });
+// A record may embed an anonymous `<union>` or `<record>` instead of naming a type for it. The
+// member occupies a real slot and contributes its own size and alignment, but carries no `<type>`,
+// so it has to be admitted as a field whose layout comes from its own children.
+const anonymousMemberFromNode = (node, isUnion, context) => ({
+    name: nameAttr(node),
+    doc: getDoc(node),
+    type: undefined,
+    cType: undefined,
+    readable: false,
+    writable: false,
+    private: true,
+    bits: undefined,
+    inlineMembers: collectFields(node, context),
+    inlineIsUnion: isUnion,
+});
+const collectFields = (node, context) => [
+    ...getChildren(node, "field").map((field) => fieldFromNode(field, context)),
+    ...getChildren(node, "union").map((member) => anonymousMemberFromNode(member, true, context)),
+    ...getChildren(node, "record").map((member) => anonymousMemberFromNode(member, false, context)),
+];
+export { collectFields, fieldFromNode };
 //# sourceMappingURL=field.js.map

package/dist/gir/field.js.map

@@ -1 +1 @@
-{"version":3,"file":"field.js","sourceRoot":"","sources":["../../src/gir/field.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAahD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,OAAqB,EAAY,EAAE,CAAC,CAAC;IAC9E,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IACpB,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC;IAChB,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC;IACpC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;IAC1C,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC;IAC3C,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC;IACzC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;CAC9B,CAAC,CAAC","sourcesContent":["import { attr, attrBool, childOf, docOf, intAttr, nameAttr, type RawNode } from \"./parse.js\";\nimport type { ParseContext, TypeId } from \"./type-id.js\";\nimport { typeRefFromNode } from \"./type-ref.js\";\n\nexport type GirField = {\n    name: string;\n    doc: string | undefined;\n    type: TypeId | undefined;\n    cType: string | undefined;\n    readable: boolean;\n    writable: boolean;\n    private: boolean;\n    bits: number | undefined;\n};\n\nexport const fieldFromNode = (node: RawNode, context: ParseContext): GirField => ({\n    name: nameAttr(node),\n    doc: docOf(node),\n    type: typeRefFromNode(node, context),\n    cType: attr(childOf(node, \"type\"), \"c:type\"),\n    readable: attrBool(node, \"readable\", true),\n    writable: attrBool(node, \"writable\", false),\n    private: attrBool(node, \"private\", false),\n    bits: intAttr(node, \"bits\"),\n});\n"]}
+{"version":3,"file":"field.js","sourceRoot":"","sources":["../../src/gir/field.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAC9G,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAgBhD,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,OAAqB,EAAY,EAAE,CAAC,CAAC;IACvE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC;IACjB,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC;IACpC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC;IAC7C,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC;IAC5C,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC;IAC7C,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC;IAC3C,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;IAC3B,aAAa,EAAE,SAAS;IACxB,aAAa,EAAE,KAAK;CACvB,CAAC,CAAC;AAEH,+FAA+F;AAC/F,mGAAmG;AACnG,gFAAgF;AAChF,MAAM,uBAAuB,GAAG,CAAC,IAAa,EAAE,OAAgB,EAAE,OAAqB,EAAY,EAAE,CAAC,CAAC;IACnG,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC;IACjB,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,KAAK;IACf,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,SAAS;IACf,aAAa,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC;IAC3C,aAAa,EAAE,OAAO;CACzB,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,OAAqB,EAAc,EAAE,CAAC;IACxE,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3E,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7F,GAAG,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,uBAAuB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;CAClG,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiB,CAAC","sourcesContent":["import type { ParseContext, TypeId } from \"./type-id.js\";\nimport { attr, getChild, getChildren, getDoc, intAttr, isAttrTrue, nameAttr, type RawNode } from \"./parse.js\";\nimport { typeRefFromNode } from \"./type-ref.js\";\n\ntype GirField = {\n    name: string;\n    doc: string | undefined;\n    type: TypeId | undefined;\n    cType: string | undefined;\n    readable: boolean;\n    writable: boolean;\n    private: boolean;\n    bits: number | undefined;\n    /** Members of an anonymous nested `<union>`/`<record>`, which occupies a slot but has no type. */\n    inlineMembers: GirField[] | undefined;\n    inlineIsUnion: boolean;\n};\n\nconst fieldFromNode = (node: RawNode, context: ParseContext): GirField => ({\n    name: nameAttr(node),\n    doc: getDoc(node),\n    type: typeRefFromNode(node, context),\n    cType: attr(getChild(node, \"type\"), \"c:type\"),\n    readable: isAttrTrue(node, \"readable\", true),\n    writable: isAttrTrue(node, \"writable\", false),\n    private: isAttrTrue(node, \"private\", false),\n    bits: intAttr(node, \"bits\"),\n    inlineMembers: undefined,\n    inlineIsUnion: false,\n});\n\n// A record may embed an anonymous `<union>` or `<record>` instead of naming a type for it. The\n// member occupies a real slot and contributes its own size and alignment, but carries no `<type>`,\n// so it has to be admitted as a field whose layout comes from its own children.\nconst anonymousMemberFromNode = (node: RawNode, isUnion: boolean, context: ParseContext): GirField => ({\n    name: nameAttr(node),\n    doc: getDoc(node),\n    type: undefined,\n    cType: undefined,\n    readable: false,\n    writable: false,\n    private: true,\n    bits: undefined,\n    inlineMembers: collectFields(node, context),\n    inlineIsUnion: isUnion,\n});\n\nconst collectFields = (node: RawNode, context: ParseContext): GirField[] => [\n    ...getChildren(node, \"field\").map((field) => fieldFromNode(field, context)),\n    ...getChildren(node, \"union\").map((member) => anonymousMemberFromNode(member, true, context)),\n    ...getChildren(node, \"record\").map((member) => anonymousMemberFromNode(member, false, context)),\n];\n\nexport { collectFields, fieldFromNode, type GirField };\n"]}

package/dist/gir/function.d.ts

@@ -1,16 +1,19 @@
+import type { ParseContext } from "./type-id.js";
 import { type GirParameter, type GirReturnValue } from "./parameter.js";
 import { type RawNode } from "./parse.js";
-import type { ParseContext } from "./type-id.js";
-export type GirFunction = {
+type GirFunction = {
     name: string;
     doc: string | undefined;
     cIdentifier: string | undefined;
     throws: boolean;
     introspectable: boolean;
+    movedTo: string | undefined;
     shadowedBy: string | undefined;
+    finishFunc: string | undefined;
     instance: GirParameter | undefined;
     parameters: GirParameter[];
     returnValue: GirReturnValue;
 };
-export declare const functionFromNode: (node: RawNode, context: ParseContext) => GirFunction;
+declare const functionFromNode: (node: RawNode, context: ParseContext) => GirFunction;
+export { functionFromNode, type GirFunction };
 //# sourceMappingURL=function.d.ts.map

package/dist/gir/function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../src/gir/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAoC,MAAM,gBAAgB,CAAC;AAC1G,OAAO,EAA2B,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,UAAU,EAAE,YAAY,EAAE,CAAC;IAC3B,WAAW,EAAE,cAAc,CAAC;CAC/B,CAAC;AAEF,eAAO,MAAM,gBAAgB,SAAU,OAAO,WAAW,YAAY,KAAG,WAWvE,CAAC"}
+{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../src/gir/function.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAoC,MAAM,gBAAgB,CAAC;AAC1G,OAAO,EAAkB,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1D,KAAK,WAAW,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,UAAU,EAAE,YAAY,EAAE,CAAC;IAC3B,WAAW,EAAE,cAAc,CAAC;CAC/B,CAAC;AAoBF,QAAA,MAAM,gBAAgB,GAAI,MAAM,OAAO,EAAE,SAAS,YAAY,KAAG,WAYhE,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,KAAK,WAAW,EAAE,CAAC"}

package/dist/gir/function.js

@@ -1,15 +1,31 @@
+import { PARAMETERS_MISSING_NULLABLE_ANNOTATION } from "./nullable-overrides.js";
 import { parameterFromNode, parseCallable } from "./parameter.js";
-import { attr, attrBool, childOf } from "./parse.js";
-export const functionFromNode = (node, context) => {
-    const instanceNode = childOf(childOf(node, "parameters"), "instance-parameter");
-    return {
+import { attr, getChild } from "./parse.js";
+const relaxParameters = (parameters, names) => {
+    for (const parameter of parameters) {
+        if (names.includes(parameter.name)) {
+            parameter.nullable = true;
+        }
+    }
+};
+const relaxMissingNullable = (fn) => {
+    const names = fn.cIdentifier === undefined ? undefined : PARAMETERS_MISSING_NULLABLE_ANNOTATION.get(fn.cIdentifier);
+    if (names !== undefined) {
+        relaxParameters(fn.parameters, names);
+    }
+    return fn;
+};
+const functionFromNode = (node, context) => {
+    const instanceNode = getChild(getChild(node, "parameters"), "instance-parameter");
+    return relaxMissingNullable({
         ...parseCallable(node, context),
         name: attr(node, "shadows") ?? attr(node, "name") ?? "",
         cIdentifier: attr(node, "c:identifier"),
-        throws: attrBool(node, "throws"),
-        introspectable: attrBool(node, "introspectable", true),
+        movedTo: attr(node, "moved-to"),
         shadowedBy: attr(node, "shadowed-by"),
+        finishFunc: attr(node, "glib:finish-func"),
         instance: instanceNode === undefined ? undefined : parameterFromNode(instanceNode, context),
-    };
+    });
 };
+export { functionFromNode };
 //# sourceMappingURL=function.js.map

package/dist/gir/function.js.map

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/gir/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,iBAAiB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC1G,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAenE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,OAAqB,EAAe,EAAE;IAClF,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAChF,OAAO;QACH,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC;QAC/B,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;QACvD,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;QACvC,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;QAChC,cAAc,EAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC;QACtD,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;QACrC,QAAQ,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC;KAC9F,CAAC;AACN,CAAC,CAAC","sourcesContent":["import { type GirParameter, type GirReturnValue, parameterFromNode, parseCallable } from \"./parameter.js\";\nimport { attr, attrBool, childOf, type RawNode } from \"./parse.js\";\nimport type { ParseContext } from \"./type-id.js\";\n\nexport type GirFunction = {\n    name: string;\n    doc: string | undefined;\n    cIdentifier: string | undefined;\n    throws: boolean;\n    introspectable: boolean;\n    shadowedBy: string | undefined;\n    instance: GirParameter | undefined;\n    parameters: GirParameter[];\n    returnValue: GirReturnValue;\n};\n\nexport const functionFromNode = (node: RawNode, context: ParseContext): GirFunction => {\n    const instanceNode = childOf(childOf(node, \"parameters\"), \"instance-parameter\");\n    return {\n        ...parseCallable(node, context),\n        name: attr(node, \"shadows\") ?? attr(node, \"name\") ?? \"\",\n        cIdentifier: attr(node, \"c:identifier\"),\n        throws: attrBool(node, \"throws\"),\n        introspectable: attrBool(node, \"introspectable\", true),\n        shadowedBy: attr(node, \"shadowed-by\"),\n        instance: instanceNode === undefined ? undefined : parameterFromNode(instanceNode, context),\n    };\n};\n"]}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/gir/function.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sCAAsC,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAA0C,iBAAiB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC1G,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAgB1D,MAAM,eAAe,GAAG,CAAC,UAA0B,EAAE,KAAe,EAAQ,EAAE;IAC1E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC9B,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,EAAe,EAAe,EAAE;IAC1D,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,sCAAsC,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;IAEpH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,EAAE,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,OAAqB,EAAe,EAAE;IAC3E,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAElF,OAAO,oBAAoB,CAAC;QACxB,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC;QAC/B,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;QACvD,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;QACvC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC;QAC/B,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC;QACrC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC;QAC1C,QAAQ,EAAE,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC;KAC9F,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAoB,CAAC","sourcesContent":["import type { ParseContext } from \"./type-id.js\";\nimport { PARAMETERS_MISSING_NULLABLE_ANNOTATION } from \"./nullable-overrides.js\";\nimport { type GirParameter, type GirReturnValue, parameterFromNode, parseCallable } from \"./parameter.js\";\nimport { attr, getChild, type RawNode } from \"./parse.js\";\n\ntype GirFunction = {\n    name: string;\n    doc: string | undefined;\n    cIdentifier: string | undefined;\n    throws: boolean;\n    introspectable: boolean;\n    movedTo: string | undefined;\n    shadowedBy: string | undefined;\n    finishFunc: string | undefined;\n    instance: GirParameter | undefined;\n    parameters: GirParameter[];\n    returnValue: GirReturnValue;\n};\n\nconst relaxParameters = (parameters: GirParameter[], names: string[]): void => {\n    for (const parameter of parameters) {\n        if (names.includes(parameter.name)) {\n            parameter.nullable = true;\n        }\n    }\n};\n\nconst relaxMissingNullable = (fn: GirFunction): GirFunction => {\n    const names = fn.cIdentifier === undefined ? undefined : PARAMETERS_MISSING_NULLABLE_ANNOTATION.get(fn.cIdentifier);\n\n    if (names !== undefined) {\n        relaxParameters(fn.parameters, names);\n    }\n\n    return fn;\n};\n\nconst functionFromNode = (node: RawNode, context: ParseContext): GirFunction => {\n    const instanceNode = getChild(getChild(node, \"parameters\"), \"instance-parameter\");\n\n    return relaxMissingNullable({\n        ...parseCallable(node, context),\n        name: attr(node, \"shadows\") ?? attr(node, \"name\") ?? \"\",\n        cIdentifier: attr(node, \"c:identifier\"),\n        movedTo: attr(node, \"moved-to\"),\n        shadowedBy: attr(node, \"shadowed-by\"),\n        finishFunc: attr(node, \"glib:finish-func\"),\n        instance: instanceNode === undefined ? undefined : parameterFromNode(instanceNode, context),\n    });\n};\n\nexport { functionFromNode, type GirFunction };\n"]}

package/dist/gir/gir-path.d.ts

@@ -1,2 +1,3 @@
-export declare const resolveGirPath: (configGirPath: string[] | undefined) => string[];
+declare const resolveGirPath: (configGirPath: string[] | undefined) => string[];
+export { resolveGirPath };
 //# sourceMappingURL=gir-path.d.ts.map

package/dist/gir/gir-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gir-path.d.ts","sourceRoot":"","sources":["../../src/gir/gir-path.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,cAAc,kBAAmB,MAAM,EAAE,GAAG,SAAS,KAAG,MAAM,EAsB1E,CAAC"}
+{"version":3,"file":"gir-path.d.ts","sourceRoot":"","sources":["../../src/gir/gir-path.ts"],"names":[],"mappings":"AAMA,QAAA,MAAM,cAAc,GAAI,eAAe,MAAM,EAAE,GAAG,SAAS,KAAG,MAAM,EAwBnE,CAAC;AA0CF,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/gir/gir-path.js

@@ -1,8 +1,8 @@
+import { formatChildProcessError, resolveExecutable } from "@gtkx/utils";
 import { execFileSync } from "node:child_process";
 import { existsSync } from "node:fs";
-import { formatChildProcessError } from "@gtkx/utils";
 const SYSTEM_GIR_PATH = "/usr/share/gir-1.0";
-export const resolveGirPath = (configGirPath) => {
+const resolveGirPath = (configGirPath) => {
     const paths = [];
     if (configGirPath) {
         paths.push(...configGirPath);
@@ -20,22 +20,38 @@ export const resolveGirPath = (configGirPath) => {
     }
     return [...new Set(paths)];
 };
+const pkgConfigGirDirError = (error) => {
+    const details = formatChildProcessError(error);
+    const suffix = details ? `:\n${details}` : "";
+    return new Error(`pkg-config failed querying gobject-introspection-1.0 girdir${suffix}`, { cause: error });
+};
+const resolvePkgConfig = () => {
+    try {
+        return resolveExecutable("pkg-config");
+    }
+    catch {
+        return undefined;
+    }
+};
 const queryPkgConfigGirDir = () => {
+    const pkgConfig = resolvePkgConfig();
+    if (pkgConfig === undefined) {
+        return undefined;
+    }
     try {
-        const output = execFileSync("pkg-config", ["--variable=girdir", "gobject-introspection-1.0"], {
-            encoding: "utf-8",
+        const output = execFileSync(pkgConfig, ["--variable=girdir", "gobject-introspection-1.0"], {
+            encoding: "utf8",
             stdio: ["ignore", "pipe", "pipe"],
         });
         const trimmed = output.trim();
         return trimmed.length > 0 ? trimmed : undefined;
     }
     catch (error) {
-        if (error.code === "ENOENT")
-            return undefined;
-        const details = formatChildProcessError(error);
-        throw new Error(`pkg-config failed querying gobject-introspection-1.0 girdir${details ? `:\n${details}` : ""}`, {
-            cause: error,
-        });
+        if (error.code === "ENOENT") {
+            return;
+        }
+        throw pkgConfigGirDirError(error);
     }
 };
+export { resolveGirPath };
 //# sourceMappingURL=gir-path.js.map

package/dist/gir/gir-path.js.map

@@ -1 +1 @@
-{"version":3,"file":"gir-path.js","sourceRoot":"","sources":["../../src/gir/gir-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAE7C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,aAAmC,EAAY,EAAE;IAC5E,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,aAAa,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAC1C,IAAI,OAAO,EAAE,CAAC;QACV,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,aAAa,GAAG,oBAAoB,EAAE,CAAC;IAC7C,IAAI,aAAa,KAAK,SAAS,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC3D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,GAAuB,EAAE;IAClD,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC,mBAAmB,EAAE,2BAA2B,CAAC,EAAE;YAC1F,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SACpC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QACzE,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,IAAI,KAAK,CACX,8DAA8D,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAC9F;YACI,KAAK,EAAE,KAAK;SACf,CACJ,CAAC;IACN,CAAC;AACL,CAAC,CAAC","sourcesContent":["import { execFileSync } from \"node:child_process\";\nimport { existsSync } from \"node:fs\";\nimport { formatChildProcessError } from \"@gtkx/utils\";\n\nconst SYSTEM_GIR_PATH = \"/usr/share/gir-1.0\";\n\nexport const resolveGirPath = (configGirPath: string[] | undefined): string[] => {\n    const paths: string[] = [];\n\n    if (configGirPath) {\n        paths.push(...configGirPath);\n    }\n\n    const envPath = process.env.GTKX_GIR_PATH;\n    if (envPath) {\n        paths.push(...envPath.split(\":\").filter((path) => path.length > 0));\n    }\n\n    if (existsSync(SYSTEM_GIR_PATH)) {\n        paths.push(SYSTEM_GIR_PATH);\n    }\n\n    const pkgConfigPath = queryPkgConfigGirDir();\n    if (pkgConfigPath !== undefined && existsSync(pkgConfigPath)) {\n        paths.push(pkgConfigPath);\n    }\n\n    return [...new Set(paths)];\n};\n\nconst queryPkgConfigGirDir = (): string | undefined => {\n    try {\n        const output = execFileSync(\"pkg-config\", [\"--variable=girdir\", \"gobject-introspection-1.0\"], {\n            encoding: \"utf-8\",\n            stdio: [\"ignore\", \"pipe\", \"pipe\"],\n        });\n        const trimmed = output.trim();\n        return trimmed.length > 0 ? trimmed : undefined;\n    } catch (error) {\n        if ((error as NodeJS.ErrnoException).code === \"ENOENT\") return undefined;\n        const details = formatChildProcessError(error);\n        throw new Error(\n            `pkg-config failed querying gobject-introspection-1.0 girdir${details ? `:\\n${details}` : \"\"}`,\n            {\n                cause: error,\n            },\n        );\n    }\n};\n"]}
+{"version":3,"file":"gir-path.js","sourceRoot":"","sources":["../../src/gir/gir-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAE7C,MAAM,cAAc,GAAG,CAAC,aAAmC,EAAY,EAAE;IACrE,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,aAAa,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE1C,IAAI,OAAO,EAAE,CAAC;QACV,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,aAAa,GAAG,oBAAoB,EAAE,CAAC;IAE7C,IAAI,aAAa,KAAK,SAAS,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC3D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,KAAc,EAAS,EAAE;IACnD,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9C,OAAO,IAAI,KAAK,CAAC,8DAA8D,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AAC/G,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAuB,EAAE;IAC9C,IAAI,CAAC;QACD,OAAO,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,GAAuB,EAAE;IAClD,MAAM,SAAS,GAAG,gBAAgB,EAAE,CAAC;IAErC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC,mBAAmB,EAAE,2BAA2B,CAAC,EAAE;YACvF,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SACpC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAE9B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrD,OAAO;QACX,CAAC;QAED,MAAM,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,CAAC","sourcesContent":["import { formatChildProcessError, resolveExecutable } from \"@gtkx/utils\";\nimport { execFileSync } from \"node:child_process\";\nimport { existsSync } from \"node:fs\";\n\nconst SYSTEM_GIR_PATH = \"/usr/share/gir-1.0\";\n\nconst resolveGirPath = (configGirPath: string[] | undefined): string[] => {\n    const paths: string[] = [];\n\n    if (configGirPath) {\n        paths.push(...configGirPath);\n    }\n\n    const envPath = process.env.GTKX_GIR_PATH;\n\n    if (envPath) {\n        paths.push(...envPath.split(\":\").filter((path) => path.length > 0));\n    }\n\n    if (existsSync(SYSTEM_GIR_PATH)) {\n        paths.push(SYSTEM_GIR_PATH);\n    }\n\n    const pkgConfigPath = queryPkgConfigGirDir();\n\n    if (pkgConfigPath !== undefined && existsSync(pkgConfigPath)) {\n        paths.push(pkgConfigPath);\n    }\n\n    return [...new Set(paths)];\n};\n\nconst pkgConfigGirDirError = (error: unknown): Error => {\n    const details = formatChildProcessError(error);\n    const suffix = details ? `:\\n${details}` : \"\";\n\n    return new Error(`pkg-config failed querying gobject-introspection-1.0 girdir${suffix}`, { cause: error });\n};\n\nconst resolvePkgConfig = (): string | undefined => {\n    try {\n        return resolveExecutable(\"pkg-config\");\n    } catch {\n        return undefined;\n    }\n};\n\nconst queryPkgConfigGirDir = (): string | undefined => {\n    const pkgConfig = resolvePkgConfig();\n\n    if (pkgConfig === undefined) {\n        return undefined;\n    }\n\n    try {\n        const output = execFileSync(pkgConfig, [\"--variable=girdir\", \"gobject-introspection-1.0\"], {\n            encoding: \"utf8\",\n            stdio: [\"ignore\", \"pipe\", \"pipe\"],\n        });\n\n        const trimmed = output.trim();\n\n        return trimmed.length > 0 ? trimmed : undefined;\n    } catch (error) {\n        if ((error as NodeJS.ErrnoException).code === \"ENOENT\") {\n            return;\n        }\n\n        throw pkgConfigGirDirError(error);\n    }\n};\n\nexport { resolveGirPath };\n"]}

package/dist/gir/libraries.d.ts

@@ -1,4 +1,6 @@
-import type { Config } from "@gtkx/config";
-export declare const resolveLibraries: (libraries: Config["libraries"], girPath: string[]) => string[];
-export declare const discoverGirNamespaces: (girPath: string[]) => string[];
+type LibrarySelection = typeof LIBRARIES_WILDCARD | string[] | undefined;
+declare const LIBRARIES_WILDCARD = "*";
+declare const resolveLibraries: (libraries: LibrarySelection, girPath: string[]) => string[];
+declare const discoverGirNamespaces: (girPath: string[]) => string[];
+export { resolveLibraries, discoverGirNamespaces, type LibrarySelection };
 //# sourceMappingURL=libraries.d.ts.map

package/dist/gir/libraries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libraries.d.ts","sourceRoot":"","sources":["../../src/gir/libraries.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAQ3C,eAAO,MAAM,gBAAgB,cAAe,MAAM,CAAC,WAAW,CAAC,WAAW,MAAM,EAAE,KAAG,MAAM,EAkB1F,CAAC;AAEF,eAAO,MAAM,qBAAqB,YAAa,MAAM,EAAE,KAAG,MAAM,EAgC/D,CAAC"}
+{"version":3,"file":"libraries.d.ts","sourceRoot":"","sources":["../../src/gir/libraries.ts"],"names":[],"mappings":"AAIA,KAAK,gBAAgB,GAAG,OAAO,kBAAkB,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;AAEzE,QAAA,MAAM,kBAAkB,MAAM,CAAC;AAK/B,QAAA,MAAM,gBAAgB,GAAI,WAAW,gBAAgB,EAAE,SAAS,MAAM,EAAE,KAAG,MAAM,EAqBhF,CAAC;AA4CF,QAAA,MAAM,qBAAqB,GAAI,SAAS,MAAM,EAAE,KAAG,MAAM,EAQxD,CAAC;AAkBF,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,KAAK,gBAAgB,EAAE,CAAC"}

package/dist/gir/libraries.js

@@ -1,9 +1,10 @@
-import { readdirSync } from "node:fs";
-import { GIR_LIBRARY_PATTERN, LIBRARIES_WILDCARD } from "@gtkx/config/internal";
 import { sortStrings } from "@gtkx/utils";
+import { readdirSync } from "node:fs";
+const LIBRARIES_WILDCARD = "*";
+const GIR_LIBRARY_PATTERN = /^[A-Za-z][A-Za-z0-9]*-\d+(?:\.\d+)*$/;
 const DEFAULT_LIBRARIES = ["Gtk-4.0"];
 const GIR_FILE_SUFFIX = ".gir";
-export const resolveLibraries = (libraries, girPath) => {
+const resolveLibraries = (libraries, girPath) => {
     if (libraries === undefined) {
         return [...DEFAULT_LIBRARIES];
     }
@@ -18,34 +19,45 @@ export const resolveLibraries = (libraries, girPath) => {
     const hasGtk = libraries.some((library) => library.startsWith("Gtk-"));
     return [...new Set([...(hasGtk ? [] : DEFAULT_LIBRARIES), ...libraries])];
 };
-export const discoverGirNamespaces = (girPath) => {
+const readDirEntries = (dir) => {
+    try {
+        return readdirSync(dir);
+    }
+    catch {
+        return [];
+    }
+};
+const parseGirNamespace = (entry) => {
+    if (!entry.endsWith(GIR_FILE_SUFFIX)) {
+        return undefined;
+    }
+    const identifier = entry.slice(0, -GIR_FILE_SUFFIX.length);
+    if (!GIR_LIBRARY_PATTERN.test(identifier)) {
+        return undefined;
+    }
+    const separator = identifier.indexOf("-");
+    return { name: identifier.slice(0, separator), version: identifier.slice(separator + 1), identifier };
+};
+const recordHighest = (highestByName, parsed) => {
+    const existing = highestByName.get(parsed.name);
+    if (existing === undefined || compareVersions(parsed.version, existing.version) > 0) {
+        highestByName.set(parsed.name, parsed);
+    }
+};
+const collectDirNamespaces = (highestByName, dir) => {
+    for (const entry of readDirEntries(dir)) {
+        const parsed = parseGirNamespace(entry);
+        if (parsed !== undefined) {
+            recordHighest(highestByName, parsed);
+        }
+    }
+};
+const discoverGirNamespaces = (girPath) => {
     const highestByName = new Map();
     for (const dir of girPath) {
-        let entries;
-        try {
-            entries = readdirSync(dir);
-        }
-        catch {
-            continue;
-        }
-        for (const entry of entries) {
-            if (!entry.endsWith(GIR_FILE_SUFFIX)) {
-                continue;
-            }
-            const identifier = entry.slice(0, -GIR_FILE_SUFFIX.length);
-            if (!GIR_LIBRARY_PATTERN.test(identifier)) {
-                continue;
-            }
-            const separator = identifier.indexOf("-");
-            const name = identifier.slice(0, separator);
-            const version = identifier.slice(separator + 1);
-            const existing = highestByName.get(name);
-            if (existing === undefined || compareVersions(version, existing.version) > 0) {
-                highestByName.set(name, { version, identifier });
-            }
-        }
+        collectDirNamespaces(highestByName, dir);
     }
-    return sortStrings([...highestByName.values()].map(({ identifier }) => identifier));
+    return sortStrings(highestByName.values().map(({ identifier }) => identifier));
 };
 const compareVersions = (a, b) => {
     const aParts = a.split(".");
@@ -59,4 +71,5 @@ const compareVersions = (a, b) => {
     }
     return 0;
 };
+export { resolveLibraries, discoverGirNamespaces };
 //# sourceMappingURL=libraries.js.map

package/dist/gir/libraries.js.map

@@ -1 +1 @@
-{"version":3,"file":"libraries.js","sourceRoot":"","sources":["../../src/gir/libraries.ts"],"names":[],"mappings":"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","sourcesContent":["import { readdirSync } from \"node:fs\";\nimport type { Config } from \"@gtkx/config\";\nimport { GIR_LIBRARY_PATTERN, LIBRARIES_WILDCARD } from \"@gtkx/config/internal\";\nimport { sortStrings } from \"@gtkx/utils\";\n\nconst DEFAULT_LIBRARIES: string[] = [\"Gtk-4.0\"];\n\nconst GIR_FILE_SUFFIX = \".gir\";\n\nexport const resolveLibraries = (libraries: Config[\"libraries\"], girPath: string[]): string[] => {\n    if (libraries === undefined) {\n        return [...DEFAULT_LIBRARIES];\n    }\n\n    if (libraries === LIBRARIES_WILDCARD) {\n        const discovered = discoverGirNamespaces(girPath);\n        if (discovered.length === 0) {\n            throw new Error(\n                `gtkx.config.ts: \\`libraries: \"*\"\\` matched no .gir files in [${girPath.join(\", \")}]. ` +\n                    \"Install gobject-introspection data packages, or list the libraries explicitly.\",\n            );\n        }\n        return discovered;\n    }\n\n    const hasGtk = libraries.some((library) => library.startsWith(\"Gtk-\"));\n    return [...new Set([...(hasGtk ? [] : DEFAULT_LIBRARIES), ...libraries])];\n};\n\nexport const discoverGirNamespaces = (girPath: string[]): string[] => {\n    const highestByName = new Map<string, { version: string; identifier: string }>();\n\n    for (const dir of girPath) {\n        let entries: string[];\n        try {\n            entries = readdirSync(dir);\n        } catch {\n            continue;\n        }\n\n        for (const entry of entries) {\n            if (!entry.endsWith(GIR_FILE_SUFFIX)) {\n                continue;\n            }\n\n            const identifier = entry.slice(0, -GIR_FILE_SUFFIX.length);\n            if (!GIR_LIBRARY_PATTERN.test(identifier)) {\n                continue;\n            }\n\n            const separator = identifier.indexOf(\"-\");\n            const name = identifier.slice(0, separator);\n            const version = identifier.slice(separator + 1);\n            const existing = highestByName.get(name);\n            if (existing === undefined || compareVersions(version, existing.version) > 0) {\n                highestByName.set(name, { version, identifier });\n            }\n        }\n    }\n\n    return sortStrings([...highestByName.values()].map(({ identifier }) => identifier));\n};\n\nconst compareVersions = (a: string, b: string): number => {\n    const aParts = a.split(\".\");\n    const bParts = b.split(\".\");\n    const length = Math.max(aParts.length, bParts.length);\n\n    for (let index = 0; index < length; index += 1) {\n        const difference = Number(aParts[index] ?? 0) - Number(bParts[index] ?? 0);\n        if (difference !== 0) {\n            return difference;\n        }\n    }\n\n    return 0;\n};\n"]}
+{"version":3,"file":"libraries.js","sourceRoot":"","sources":["../../src/gir/libraries.ts"],"names":[],"mappings":"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","sourcesContent":["import { sortStrings } from \"@gtkx/utils\";\nimport { readdirSync } from \"node:fs\";\n\ntype GirNamespace = { name: string; version: string; identifier: string };\ntype LibrarySelection = typeof LIBRARIES_WILDCARD | string[] | undefined;\n\nconst LIBRARIES_WILDCARD = \"*\";\nconst GIR_LIBRARY_PATTERN = /^[A-Za-z][A-Za-z0-9]*-\\d+(?:\\.\\d+)*$/;\nconst DEFAULT_LIBRARIES: string[] = [\"Gtk-4.0\"];\nconst GIR_FILE_SUFFIX = \".gir\";\n\nconst resolveLibraries = (libraries: LibrarySelection, girPath: string[]): string[] => {\n    if (libraries === undefined) {\n        return [...DEFAULT_LIBRARIES];\n    }\n\n    if (libraries === LIBRARIES_WILDCARD) {\n        const discovered = discoverGirNamespaces(girPath);\n\n        if (discovered.length === 0) {\n            throw new Error(\n                `gtkx.config.ts: \\`libraries: \"*\"\\` matched no .gir files in [${girPath.join(\", \")}]. ` +\n                \"Install gobject-introspection data packages, or list the libraries explicitly.\",\n            );\n        }\n\n        return discovered;\n    }\n\n    const hasGtk = libraries.some((library) => library.startsWith(\"Gtk-\"));\n\n    return [...new Set([...(hasGtk ? [] : DEFAULT_LIBRARIES), ...libraries])];\n};\n\nconst readDirEntries = (dir: string): string[] => {\n    try {\n        return readdirSync(dir);\n    } catch {\n        return [];\n    }\n};\n\nconst parseGirNamespace = (entry: string): GirNamespace | undefined => {\n    if (!entry.endsWith(GIR_FILE_SUFFIX)) {\n        return undefined;\n    }\n\n    const identifier = entry.slice(0, -GIR_FILE_SUFFIX.length);\n\n    if (!GIR_LIBRARY_PATTERN.test(identifier)) {\n        return undefined;\n    }\n\n    const separator = identifier.indexOf(\"-\");\n\n    return { name: identifier.slice(0, separator), version: identifier.slice(separator + 1), identifier };\n};\n\nconst recordHighest = (highestByName: Map<string, GirNamespace>, parsed: GirNamespace): void => {\n    const existing = highestByName.get(parsed.name);\n\n    if (existing === undefined || compareVersions(parsed.version, existing.version) > 0) {\n        highestByName.set(parsed.name, parsed);\n    }\n};\n\nconst collectDirNamespaces = (highestByName: Map<string, GirNamespace>, dir: string): void => {\n    for (const entry of readDirEntries(dir)) {\n        const parsed = parseGirNamespace(entry);\n\n        if (parsed !== undefined) {\n            recordHighest(highestByName, parsed);\n        }\n    }\n};\n\nconst discoverGirNamespaces = (girPath: string[]): string[] => {\n    const highestByName: Map<string, GirNamespace> = new Map();\n\n    for (const dir of girPath) {\n        collectDirNamespaces(highestByName, dir);\n    }\n\n    return sortStrings(highestByName.values().map(({ identifier }) => identifier));\n};\n\nconst compareVersions = (a: string, b: string): number => {\n    const aParts = a.split(\".\");\n    const bParts = b.split(\".\");\n    const length = Math.max(aParts.length, bParts.length);\n\n    for (let index = 0; index < length; index += 1) {\n        const difference = Number(aParts[index] ?? 0) - Number(bParts[index] ?? 0);\n\n        if (difference !== 0) {\n            return difference;\n        }\n    }\n\n    return 0;\n};\n\nexport { resolveLibraries, discoverGirNamespaces, type LibrarySelection };\n"]}

package/dist/gir/library.d.ts

@@ -1,21 +1,22 @@
-import { type GirNamespace } from "./namespace.js";
-import type { GirType } from "./type.js";
 import type { TypeId } from "./type-id.js";
-export declare class Library {
+import type { GirType } from "./type.js";
+import { type GirNamespace } from "./namespace.js";
+declare class Library {
+    private static drive;
+    static load(libraries: string[], girPath: string[]): Library;
     private namespacesByName;
     private namespaceById;
     private nsNameById;
     private nsIdByName;
     private typeTables;
     private girFilesValue;
-    get namespaces(): Map<string, GirNamespace>;
-    get girFiles(): string[];
     constructor();
     private ensureNsId;
     private registerNamespace;
-    private namespaceOf;
-    private typeTableOf;
+    private namespaceFor;
+    private typeTableFor;
     private insertIntoTypeTable;
+    private resolveTypeId;
     private addType;
     private findType;
     private addAnonymousType;
@@ -25,13 +26,18 @@ export declare class Library {
     private addVarargs;
     private findOrAddContainer;
     private addDeclarations;
-    typeOf(tid: TypeId): GirType | undefined;
-    nameOf(tid: TypeId): {
+    private addClassDeclarations;
+    private addValueDeclarations;
+    private processIdentifier;
+    private discoverNamespaces;
+    get namespaces(): Map<string, GirNamespace>;
+    get girFiles(): string[];
+    typeFor(tid: TypeId): GirType | undefined;
+    nameFor(tid: TypeId): {
         namespaceName: string;
         typeName: string;
     } | undefined;
     resolveType(currentNamespaceName: string, name: string): GirType | undefined;
-    private static drive;
-    static load(libraries: string[], girPath: string[]): Library;
 }
+export { Library };
 //# sourceMappingURL=library.d.ts.map

package/dist/gir/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../src/gir/library.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,KAAK,YAAY,EAIpB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAqD,MAAM,EAAE,MAAM,cAAc,CAAC;AAW9F,qBAAa,OAAO;IAChB,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,aAAa,CAAgB;IAErC,IAAW,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAEjD;IAED,IAAW,QAAQ,IAAI,MAAM,EAAE,CAE9B;IAED,cAIC;IAED,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,OAAO;IAUf,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,YAAY;IAiBpB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,eAAe;IAgBvB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAEvC;IAED,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAK3E;IAED,WAAW,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAS3E;IAED,OAAO,CAAC,MAAM,CAAC,KAAK;IA8BpB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAI3D;CACJ"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../src/gir/library.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAqD,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAEH,KAAK,YAAY,EAIpB,MAAM,gBAAgB,CAAC;AAwCxB,cAAM,OAAO;IACT,OAAO,CAAC,MAAM,CAAC,KAAK;IAcpB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO;IAO5D,OAAO,CAAC,gBAAgB,CAAwC;IAChE,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,UAAU,CAAkC;IACpD,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,aAAa,CAAgB;;IAQrC,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,YAAY;IAkBpB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,iBAAiB;IA2BzB,OAAO,CAAC,kBAAkB;IAoB1B,IAAW,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAEjD;IAED,IAAW,QAAQ,IAAI,MAAM,EAAE,CAE9B;IAED,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIzC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAW7E,WAAW,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;CAsB/E;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}