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

package/dist/analysis/param-structure.js

@@ -1,107 +1,158 @@
 import { toCamelIdentifier } from "@gtkx/utils";
 import { isCallerAllocatedOut, isOutParameter } from "../gir/parameter.js";
-import { isCellInout, omitsPrimaryReturn } from "./descriptor-render.js";
-export const inputParameters = (library, fn) => {
+import { isCellInout, shouldOmitPrimaryReturn } from "./descriptor-render.js";
+const isInputParameter = (options) => {
+    const { parameter, index, lengthIndices, closureIndices } = options;
+    if (parameter.isVarargs) {
+        return false;
+    }
+    if (isOutParameter(parameter)) {
+        return false;
+    }
+    if (isCallerAllocatedOut(parameter)) {
+        return false;
+    }
+    if (lengthIndices.has(index)) {
+        return false;
+    }
+    return !closureIndices.has(index);
+};
+const inputParameters = (library, fn) => {
     const lengthIndices = arrayLengthIndices(library, fn);
     const closureIndices = closureAndDestroyIndices(fn);
     const result = [];
-    fn.parameters.forEach((parameter, index) => {
-        if (parameter.isVarargs)
-            return;
-        if (isOutParameter(parameter))
-            return;
-        if (isCallerAllocatedOut(parameter))
-            return;
-        if (lengthIndices.has(index))
-            return;
-        if (closureIndices.has(index))
-            return;
-        result.push({ parameter, index });
-    });
+    for (const [index, parameter] of fn.parameters.entries()) {
+        if (isInputParameter({ parameter, index, lengthIndices, closureIndices })) {
+            result.push({ parameter, index });
+        }
+    }
     return result;
 };
-export const closureAndDestroyIndices = (fn) => {
+const closureAndDestroyIndices = (fn) => {
     const indices = new Set();
     for (const parameter of fn.parameters) {
-        if (parameter.closureIndex !== undefined)
+        if (parameter.closureIndex !== undefined) {
             indices.add(parameter.closureIndex);
-        if (parameter.destroyIndex !== undefined)
+        }
+        if (parameter.destroyIndex !== undefined) {
             indices.add(parameter.destroyIndex);
+        }
     }
     return indices;
 };
+// The emitted argument list is the instance parameter followed by every parameter `planParameter`
+// keeps, so a GIR index only lines up with an emitted index when nothing before it was dropped.
+const emittedArgIndices = (fn, instanceOffset) => {
+    const closureIndices = closureAndDestroyIndices(fn);
+    const map = new Map();
+    let emitted = instanceOffset;
+    for (const [index, parameter] of fn.parameters.entries()) {
+        if (parameter.isVarargs || closureIndices.has(index)) {
+            continue;
+        }
+        map.set(index, emitted);
+        emitted += 1;
+    }
+    return map;
+};
 const arrayLengthIndices = (library, fn) => {
     const map = arrayLengthSources(library, fn);
     return new Set(map.keys());
 };
-export const arrayLengthSources = (library, fn) => {
+const carrayLengthIndex = (library, ref) => {
+    const type = ref === undefined ? undefined : library.typeFor(ref);
+    if (type?.kind !== "carray") {
+        return undefined;
+    }
+    return type.lengthParameterIndex;
+};
+const arrayLengthSources = (library, fn) => {
     const map = new Map();
-    fn.parameters.forEach((parameter, index) => {
-        const type = parameter.type === undefined ? undefined : library.typeOf(parameter.type);
-        if (type?.kind !== "carray")
-            return;
-        const lengthIndex = type.lengthParameterIndex;
-        if (lengthIndex === undefined)
-            return;
-        map.set(lengthIndex, index);
-    });
+    for (const [index, parameter] of fn.parameters.entries()) {
+        const lengthIndex = carrayLengthIndex(library, parameter.type);
+        if (lengthIndex !== undefined) {
+            map.set(lengthIndex, index);
+        }
+    }
     return map;
 };
-export const hasCallerAllocatedArrayLength = (library, fn) => {
+const hasCallerAllocatedArrayLength = (library, fn) => {
     for (const arrayIndex of arrayLengthSources(library, fn).values()) {
         const array = fn.parameters[arrayIndex];
-        if (array !== undefined && isCallerAllocatedOut(array))
+        if (array !== undefined && isCallerAllocatedOut(array)) {
             return true;
+        }
     }
     return false;
 };
 const returnArrayLengthIndices = (library, fn) => {
-    const returnType = fn.returnValue.type === undefined ? undefined : library.typeOf(fn.returnValue.type);
-    if (returnType?.kind !== "carray")
+    const returnType = fn.returnValue.type === undefined ? undefined : library.typeFor(fn.returnValue.type);
+    if (returnType?.kind !== "carray") {
         return new Set();
+    }
     const lengthIndex = returnType.lengthParameterIndex;
-    if (lengthIndex === undefined)
+    if (lengthIndex === undefined) {
         return new Set();
+    }
     return new Set([lengthIndex]);
 };
-export const foldedLengthIndices = (library, fn) => {
+const foldedLengthIndices = (library, fn) => {
     const indices = new Set(arrayLengthSources(library, fn).keys());
-    for (const index of returnArrayLengthIndices(library, fn))
+    for (const index of returnArrayLengthIndices(library, fn)) {
         indices.add(index);
+    }
     return indices;
 };
-export const parameterIdentifier = (parameter, index) => {
-    if (parameter.name.length === 0)
-        return `arg${index}`;
+const parameterIdentifier = (parameter, index) => {
+    if (parameter.name.length === 0) {
+        return `arg${String(index)}`;
+    }
     return toCamelIdentifier(parameter.name);
 };
-export const renderHandlerParameters = (parameters, renderType, additionalExclude = () => false) => parameters
-    .filter((parameter) => !parameter.isVarargs && !isOutParameter(parameter) && !additionalExclude(parameter))
+const renderHandlerParameters = (parameters, renderType, shouldExclude = () => false) => parameters
+    .filter((parameter) => !parameter.isVarargs && !isOutParameter(parameter) && !shouldExclude(parameter))
     .map((parameter, index) => `${parameterIdentifier(parameter, index)}: ${renderType(parameter.type, parameter.nullable)}`);
-export const foldOutParamShape = (primary, outTypes) => {
-    if (primary !== undefined)
+const foldOutParamShape = (primary, outTypes) => {
+    if (primary !== undefined) {
         return `[${primary}, ${outTypes.join(", ")}]`;
+    }
     const [single, ...rest] = outTypes;
-    if (rest.length === 0 && single !== undefined)
+    if (single !== undefined && rest.length === 0) {
         return single;
+    }
     return `[${outTypes.join(", ")}]`;
 };
-export const renderHandlerResultType = (options) => {
+const isHandlerOutParameter = (options) => {
+    const { library, parameter, includeCallerAllocated } = options;
+    if (parameter.isVarargs) {
+        return false;
+    }
+    if (isOutParameter(parameter)) {
+        return true;
+    }
+    if (isCellInout(library, parameter)) {
+        return true;
+    }
+    return includeCallerAllocated && isCallerAllocatedOut(parameter);
+};
+const scalarResultType = (primary, isOptOut) => {
+    if (primary === undefined) {
+        return "void";
+    }
+    return isOptOut ? `${primary} | undefined` : primary;
+};
+const renderHandlerResultType = (options) => {
     const { library, signal, renderType, includeCallerAllocated, optOut } = options;
-    const primary = omitsPrimaryReturn(library, signal.returnValue)
+    const primary = shouldOmitPrimaryReturn(library, signal.returnValue)
         ? undefined
         : renderType(signal.returnValue.type, signal.returnValue.nullable);
     const outTypes = signal.parameters
-        .filter((parameter) => !parameter.isVarargs &&
-        (isOutParameter(parameter) ||
-            isCellInout(library, parameter) ||
-            (includeCallerAllocated && isCallerAllocatedOut(parameter))))
-        .map((parameter) => renderType(parameter.type, false));
+        .filter((parameter) => isHandlerOutParameter({ library, parameter, includeCallerAllocated }))
+        .map((parameter) => renderType(parameter.type, parameter.nullable));
     if (outTypes.length === 0) {
-        if (primary === undefined)
-            return "void";
-        return optOut ? `${primary} | undefined` : primary;
+        return scalarResultType(primary, optOut);
     }
     return foldOutParamShape(primary, outTypes);
 };
+export { emittedArgIndices, inputParameters, closureAndDestroyIndices, arrayLengthSources, hasCallerAllocatedArrayLength, foldedLengthIndices, parameterIdentifier, renderHandlerParameters, foldOutParamShape, renderHandlerResultType, };
 //# sourceMappingURL=param-structure.js.map

package/dist/analysis/param-structure.js.map

@@ -1 +1 @@
-{"version":3,"file":"param-structure.js","sourceRoot":"","sources":["../../src/analysis/param-structure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,EAAqC,oBAAoB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE9G,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAOzE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAoB,EAAE;IACnF,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAC;IACpD,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;QACvC,IAAI,SAAS,CAAC,SAAS;YAAE,OAAO;QAChC,IAAI,cAAc,CAAC,SAAS,CAAC;YAAE,OAAO;QACtC,IAAI,oBAAoB,CAAC,SAAS,CAAC;YAAE,OAAO;QAC5C,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO;QACrC,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO;QACtC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EAAe,EAAe,EAAE;IACrE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;QACpC,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS;YAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC9E,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS;YAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAe,EAAE;IAC1E,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC5C,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAuB,EAAE;IACzF,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvF,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ;YAAE,OAAO;QACpC,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAC9C,IAAI,WAAW,KAAK,SAAS;YAAE,OAAO;QACtC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAW,EAAE;IACxF,KAAK,MAAM,UAAU,IAAI,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QAChE,MAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,KAAK,KAAK,SAAS,IAAI,oBAAoB,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;IACxE,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAe,EAAE;IAChF,MAAM,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvG,IAAI,UAAU,EAAE,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IACpD,MAAM,WAAW,GAAG,UAAU,CAAC,oBAAoB,CAAC;IACpD,IAAI,WAAW,KAAK,SAAS;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IAChD,OAAO,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAe,EAAE;IAClF,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACxE,KAAK,MAAM,KAAK,IAAI,wBAAwB,CAAC,OAAO,EAAE,EAAE,CAAC;QAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9E,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,SAAuB,EAAE,KAAa,EAAU,EAAE;IAClF,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,KAAK,EAAE,CAAC;IACtD,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACnC,UAA0B,EAC1B,UAAkE,EAClE,iBAAiB,GAAyC,GAAG,EAAE,CAAC,KAAK,EAC7D,EAAE,CACV,UAAU;KACL,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;KAC1G,GAAG,CACA,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CACjB,GAAG,mBAAmB,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,CACpG,CAAC;AAEV,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAA2B,EAAE,QAAkB,EAAU,EAAE;IACzF,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,IAAI,OAAO,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzE,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC;IACnC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IAC7D,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AACtC,CAAC,CAAC;AAUF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,OAA6B,EAAU,EAAE;IAC7E,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAChF,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC;QAC3D,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU;SAC7B,MAAM,CACH,CAAC,SAAS,EAAE,EAAE,CACV,CAAC,SAAS,CAAC,SAAS;QACpB,CAAC,cAAc,CAAC,SAAS,CAAC;YACtB,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC;YAC/B,CAAC,sBAAsB,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,CACvE;SACA,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC;QACzC,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACvD,CAAC;IACD,OAAO,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC,CAAC","sourcesContent":["import { toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirFunction } from \"../gir/function.js\";\nimport type { Library } from \"../gir/library.js\";\nimport { type GirParameter, type GirSignal, isCallerAllocatedOut, isOutParameter } from \"../gir/parameter.js\";\nimport type { TypeId } from \"../gir/type-id.js\";\nimport { isCellInout, omitsPrimaryReturn } from \"./descriptor-render.js\";\n\ntype InputParameter = {\n    parameter: GirParameter;\n    index: number;\n};\n\nexport const inputParameters = (library: Library, fn: GirFunction): InputParameter[] => {\n    const lengthIndices = arrayLengthIndices(library, fn);\n    const closureIndices = closureAndDestroyIndices(fn);\n    const result: InputParameter[] = [];\n    fn.parameters.forEach((parameter, index) => {\n        if (parameter.isVarargs) return;\n        if (isOutParameter(parameter)) return;\n        if (isCallerAllocatedOut(parameter)) return;\n        if (lengthIndices.has(index)) return;\n        if (closureIndices.has(index)) return;\n        result.push({ parameter, index });\n    });\n    return result;\n};\n\nexport const closureAndDestroyIndices = (fn: GirFunction): Set<number> => {\n    const indices = new Set<number>();\n    for (const parameter of fn.parameters) {\n        if (parameter.closureIndex !== undefined) indices.add(parameter.closureIndex);\n        if (parameter.destroyIndex !== undefined) indices.add(parameter.destroyIndex);\n    }\n    return indices;\n};\n\nconst arrayLengthIndices = (library: Library, fn: GirFunction): Set<number> => {\n    const map = arrayLengthSources(library, fn);\n    return new Set(map.keys());\n};\n\nexport const arrayLengthSources = (library: Library, fn: GirFunction): Map<number, number> => {\n    const map = new Map<number, number>();\n    fn.parameters.forEach((parameter, index) => {\n        const type = parameter.type === undefined ? undefined : library.typeOf(parameter.type);\n        if (type?.kind !== \"carray\") return;\n        const lengthIndex = type.lengthParameterIndex;\n        if (lengthIndex === undefined) return;\n        map.set(lengthIndex, index);\n    });\n    return map;\n};\n\nexport const hasCallerAllocatedArrayLength = (library: Library, fn: GirFunction): boolean => {\n    for (const arrayIndex of arrayLengthSources(library, fn).values()) {\n        const array = fn.parameters[arrayIndex];\n        if (array !== undefined && isCallerAllocatedOut(array)) return true;\n    }\n    return false;\n};\n\nconst returnArrayLengthIndices = (library: Library, fn: GirFunction): Set<number> => {\n    const returnType = fn.returnValue.type === undefined ? undefined : library.typeOf(fn.returnValue.type);\n    if (returnType?.kind !== \"carray\") return new Set();\n    const lengthIndex = returnType.lengthParameterIndex;\n    if (lengthIndex === undefined) return new Set();\n    return new Set([lengthIndex]);\n};\n\nexport const foldedLengthIndices = (library: Library, fn: GirFunction): Set<number> => {\n    const indices = new Set<number>(arrayLengthSources(library, fn).keys());\n    for (const index of returnArrayLengthIndices(library, fn)) indices.add(index);\n    return indices;\n};\n\nexport const parameterIdentifier = (parameter: GirParameter, index: number): string => {\n    if (parameter.name.length === 0) return `arg${index}`;\n    return toCamelIdentifier(parameter.name);\n};\n\nexport const renderHandlerParameters = (\n    parameters: GirParameter[],\n    renderType: (ref: TypeId | undefined, nullable: boolean) => string,\n    additionalExclude: (parameter: GirParameter) => boolean = () => false,\n): string[] =>\n    parameters\n        .filter((parameter) => !parameter.isVarargs && !isOutParameter(parameter) && !additionalExclude(parameter))\n        .map(\n            (parameter, index) =>\n                `${parameterIdentifier(parameter, index)}: ${renderType(parameter.type, parameter.nullable)}`,\n        );\n\nexport const foldOutParamShape = (primary: string | undefined, outTypes: string[]): string => {\n    if (primary !== undefined) return `[${primary}, ${outTypes.join(\", \")}]`;\n    const [single, ...rest] = outTypes;\n    if (rest.length === 0 && single !== undefined) return single;\n    return `[${outTypes.join(\", \")}]`;\n};\n\ntype HandlerResultOptions = {\n    library: Library;\n    signal: GirSignal;\n    renderType: (ref: TypeId | undefined, nullable: boolean) => string;\n    includeCallerAllocated: boolean;\n    optOut: boolean;\n};\n\nexport const renderHandlerResultType = (options: HandlerResultOptions): string => {\n    const { library, signal, renderType, includeCallerAllocated, optOut } = options;\n    const primary = omitsPrimaryReturn(library, signal.returnValue)\n        ? undefined\n        : renderType(signal.returnValue.type, signal.returnValue.nullable);\n    const outTypes = signal.parameters\n        .filter(\n            (parameter) =>\n                !parameter.isVarargs &&\n                (isOutParameter(parameter) ||\n                    isCellInout(library, parameter) ||\n                    (includeCallerAllocated && isCallerAllocatedOut(parameter))),\n        )\n        .map((parameter) => renderType(parameter.type, false));\n    if (outTypes.length === 0) {\n        if (primary === undefined) return \"void\";\n        return optOut ? `${primary} | undefined` : primary;\n    }\n    return foldOutParamShape(primary, outTypes);\n};\n"]}
+{"version":3,"file":"param-structure.js","sourceRoot":"","sources":["../../src/analysis/param-structure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,OAAO,EAAuC,oBAAoB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChH,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAe9E,MAAM,gBAAgB,GAAG,CAAC,OAKzB,EAAW,EAAE;IACV,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAEpE,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAoB,EAAE;IAC5E,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAC;IACpD,MAAM,MAAM,GAAqB,EAAE,CAAC;IAEpC,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACvD,IAAI,gBAAgB,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QACtC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,EAAe,EAAe,EAAE;IAC9D,MAAM,OAAO,GAAgB,IAAI,GAAG,EAAE,CAAC;IAEvC,KAAK,MAAM,SAAS,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;QACpC,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACxC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,kGAAkG;AAClG,gGAAgG;AAChG,MAAM,iBAAiB,GAAG,CAAC,EAAe,EAAE,cAAsB,EAAuB,EAAE;IACvF,MAAM,cAAc,GAAG,wBAAwB,CAAC,EAAE,CAAC,CAAC;IACpD,MAAM,GAAG,GAAwB,IAAI,GAAG,EAAE,CAAC;IAC3C,IAAI,OAAO,GAAG,cAAc,CAAC;IAE7B,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACvD,IAAI,SAAS,CAAC,SAAS,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,SAAS;QACb,CAAC;QAED,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,CAAC;IACjB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAe,EAAE;IAC1E,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAE5C,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,GAAuB,EAAsB,EAAE;IACxF,MAAM,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAElE,IAAI,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,CAAC,oBAAoB,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAuB,EAAE;IAClF,MAAM,GAAG,GAAwB,IAAI,GAAG,EAAE,CAAC;IAE3C,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACvD,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAE/D,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAW,EAAE;IACjF,KAAK,MAAM,UAAU,IAAI,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QAChE,MAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAExC,IAAI,KAAK,KAAK,SAAS,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAe,EAAE;IAChF,MAAM,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAExG,IAAI,UAAU,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,IAAI,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,oBAAoB,CAAC;IAEpD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,IAAI,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,EAAe,EAAe,EAAE;IAC3E,MAAM,OAAO,GAAgB,IAAI,GAAG,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAE7E,KAAK,MAAM,KAAK,IAAI,wBAAwB,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,SAAuB,EAAE,KAAa,EAAU,EAAE;IAC3E,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IACjC,CAAC;IAED,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC5B,UAA0B,EAC1B,UAAoE,EACpE,gBAAsD,GAAG,EAAE,CAAC,KAAK,EACzD,EAAE,CACV,UAAU;KACL,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;KACtG,GAAG,CACA,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,CACjB,GAAG,mBAAmB,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,CACpG,CAAC;AAEV,MAAM,iBAAiB,GAAG,CAAC,OAA2B,EAAE,QAAkB,EAAU,EAAE;IAClF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,IAAI,OAAO,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC;IAEnC,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5C,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,OAI9B,EAAW,EAAE;IACV,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC;IAE/D,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,sBAAsB,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAA2B,EAAE,QAAiB,EAAU,EAAE;IAChF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,OAA6B,EAAU,EAAE;IACtE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEhF,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC;QAChE,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAEvE,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU;SAC7B,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,qBAAqB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC,CAAC;SAC5F,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAExE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,OAAO,EACH,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EAClB,6BAA6B,EAC7B,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB,EACjB,uBAAuB,GAC1B,CAAC","sourcesContent":["import { toCamelIdentifier } from \"@gtkx/utils\";\nimport type { GirFunction } from \"../gir/function.js\";\nimport type { Library } from \"../gir/library.js\";\nimport type { TypeId } from \"../gir/type-id.js\";\nimport { type GirCallable, type GirParameter, isCallerAllocatedOut, isOutParameter } from \"../gir/parameter.js\";\nimport { isCellInout, shouldOmitPrimaryReturn } from \"./descriptor-render.js\";\n\ntype InputParameter = {\n    parameter: GirParameter;\n    index: number;\n};\n\ntype HandlerResultOptions = {\n    library: Library;\n    signal: GirCallable;\n    renderType: (ref: TypeId | undefined, isNullable: boolean) => string;\n    includeCallerAllocated: boolean;\n    optOut: boolean;\n};\n\nconst isInputParameter = (options: {\n    parameter: GirParameter;\n    index: number;\n    lengthIndices: Set<number>;\n    closureIndices: Set<number>;\n}): boolean => {\n    const { parameter, index, lengthIndices, closureIndices } = options;\n\n    if (parameter.isVarargs) {\n        return false;\n    }\n\n    if (isOutParameter(parameter)) {\n        return false;\n    }\n\n    if (isCallerAllocatedOut(parameter)) {\n        return false;\n    }\n\n    if (lengthIndices.has(index)) {\n        return false;\n    }\n\n    return !closureIndices.has(index);\n};\n\nconst inputParameters = (library: Library, fn: GirFunction): InputParameter[] => {\n    const lengthIndices = arrayLengthIndices(library, fn);\n    const closureIndices = closureAndDestroyIndices(fn);\n    const result: InputParameter[] = [];\n\n    for (const [index, parameter] of fn.parameters.entries()) {\n        if (isInputParameter({ parameter, index, lengthIndices, closureIndices })) {\n            result.push({ parameter, index });\n        }\n    }\n\n    return result;\n};\n\nconst closureAndDestroyIndices = (fn: GirFunction): Set<number> => {\n    const indices: Set<number> = new Set();\n\n    for (const parameter of fn.parameters) {\n        if (parameter.closureIndex !== undefined) {\n            indices.add(parameter.closureIndex);\n        }\n\n        if (parameter.destroyIndex !== undefined) {\n            indices.add(parameter.destroyIndex);\n        }\n    }\n\n    return indices;\n};\n\n// The emitted argument list is the instance parameter followed by every parameter `planParameter`\n// keeps, so a GIR index only lines up with an emitted index when nothing before it was dropped.\nconst emittedArgIndices = (fn: GirFunction, instanceOffset: number): Map<number, number> => {\n    const closureIndices = closureAndDestroyIndices(fn);\n    const map: Map<number, number> = new Map();\n    let emitted = instanceOffset;\n\n    for (const [index, parameter] of fn.parameters.entries()) {\n        if (parameter.isVarargs || closureIndices.has(index)) {\n            continue;\n        }\n\n        map.set(index, emitted);\n        emitted += 1;\n    }\n\n    return map;\n};\n\nconst arrayLengthIndices = (library: Library, fn: GirFunction): Set<number> => {\n    const map = arrayLengthSources(library, fn);\n\n    return new Set(map.keys());\n};\n\nconst carrayLengthIndex = (library: Library, ref: TypeId | undefined): number | undefined => {\n    const type = ref === undefined ? undefined : library.typeFor(ref);\n\n    if (type?.kind !== \"carray\") {\n        return undefined;\n    }\n\n    return type.lengthParameterIndex;\n};\n\nconst arrayLengthSources = (library: Library, fn: GirFunction): Map<number, number> => {\n    const map: Map<number, number> = new Map();\n\n    for (const [index, parameter] of fn.parameters.entries()) {\n        const lengthIndex = carrayLengthIndex(library, parameter.type);\n\n        if (lengthIndex !== undefined) {\n            map.set(lengthIndex, index);\n        }\n    }\n\n    return map;\n};\n\nconst hasCallerAllocatedArrayLength = (library: Library, fn: GirFunction): boolean => {\n    for (const arrayIndex of arrayLengthSources(library, fn).values()) {\n        const array = fn.parameters[arrayIndex];\n\n        if (array !== undefined && isCallerAllocatedOut(array)) {\n            return true;\n        }\n    }\n\n    return false;\n};\n\nconst returnArrayLengthIndices = (library: Library, fn: GirFunction): Set<number> => {\n    const returnType = fn.returnValue.type === undefined ? undefined : library.typeFor(fn.returnValue.type);\n\n    if (returnType?.kind !== \"carray\") {\n        return new Set();\n    }\n\n    const lengthIndex = returnType.lengthParameterIndex;\n\n    if (lengthIndex === undefined) {\n        return new Set();\n    }\n\n    return new Set([lengthIndex]);\n};\n\nconst foldedLengthIndices = (library: Library, fn: GirFunction): Set<number> => {\n    const indices: Set<number> = new Set(arrayLengthSources(library, fn).keys());\n\n    for (const index of returnArrayLengthIndices(library, fn)) {\n        indices.add(index);\n    }\n\n    return indices;\n};\n\nconst parameterIdentifier = (parameter: GirParameter, index: number): string => {\n    if (parameter.name.length === 0) {\n        return `arg${String(index)}`;\n    }\n\n    return toCamelIdentifier(parameter.name);\n};\n\nconst renderHandlerParameters = (\n    parameters: GirParameter[],\n    renderType: (ref: TypeId | undefined, isNullable: boolean) => string,\n    shouldExclude: (parameter: GirParameter) => boolean = () => false,\n): string[] =>\n    parameters\n        .filter((parameter) => !parameter.isVarargs && !isOutParameter(parameter) && !shouldExclude(parameter))\n        .map(\n            (parameter, index) =>\n                `${parameterIdentifier(parameter, index)}: ${renderType(parameter.type, parameter.nullable)}`,\n        );\n\nconst foldOutParamShape = (primary: string | undefined, outTypes: string[]): string => {\n    if (primary !== undefined) {\n        return `[${primary}, ${outTypes.join(\", \")}]`;\n    }\n\n    const [single, ...rest] = outTypes;\n\n    if (single !== undefined && rest.length === 0) {\n        return single;\n    }\n\n    return `[${outTypes.join(\", \")}]`;\n};\n\nconst isHandlerOutParameter = (options: {\n    library: Library;\n    parameter: GirParameter;\n    includeCallerAllocated: boolean;\n}): boolean => {\n    const { library, parameter, includeCallerAllocated } = options;\n\n    if (parameter.isVarargs) {\n        return false;\n    }\n\n    if (isOutParameter(parameter)) {\n        return true;\n    }\n\n    if (isCellInout(library, parameter)) {\n        return true;\n    }\n\n    return includeCallerAllocated && isCallerAllocatedOut(parameter);\n};\n\nconst scalarResultType = (primary: string | undefined, isOptOut: boolean): string => {\n    if (primary === undefined) {\n        return \"void\";\n    }\n\n    return isOptOut ? `${primary} | undefined` : primary;\n};\n\nconst renderHandlerResultType = (options: HandlerResultOptions): string => {\n    const { library, signal, renderType, includeCallerAllocated, optOut } = options;\n\n    const primary = shouldOmitPrimaryReturn(library, signal.returnValue)\n        ? undefined\n        : renderType(signal.returnValue.type, signal.returnValue.nullable);\n\n    const outTypes = signal.parameters\n        .filter((parameter) => isHandlerOutParameter({ library, parameter, includeCallerAllocated }))\n        .map((parameter) => renderType(parameter.type, parameter.nullable));\n\n    if (outTypes.length === 0) {\n        return scalarResultType(primary, optOut);\n    }\n\n    return foldOutParamShape(primary, outTypes);\n};\n\nexport {\n    emittedArgIndices,\n    inputParameters,\n    closureAndDestroyIndices,\n    arrayLengthSources,\n    hasCallerAllocatedArrayLength,\n    foldedLengthIndices,\n    parameterIdentifier,\n    renderHandlerParameters,\n    foldOutParamShape,\n    renderHandlerResultType,\n};\n"]}

package/dist/analysis/ts-type.d.ts

@@ -1,19 +1,20 @@
 import type { Library } from "../gir/library.js";
 import type { GirType } from "../gir/type.js";
-import type { TypeId } from "../gir/type-id.js";
 import type { ModuleContext } from "../writer/context.js";
+import { type TypeId } from "../gir/type-id.js";
 type ReferenceName = {
     namespaceName: string;
     typeName: string;
 };
-export type TsTypeTarget = {
+type TsTypeTarget = {
     containerStyle: "map" | "record";
     callbackType: string;
     byteArrayAsNumber: boolean;
     renderNamed: (resolved: GirType | undefined, name: ReferenceName) => string;
     renderGtype: () => string;
 };
-export declare const renderBaseTypeFor: (library: Library, target: TsTypeTarget, ref: TypeId | undefined) => string;
-export declare const renderTsType: (context: ModuleContext, ref: TypeId | undefined, isNullable?: boolean) => string;
-export {};
+declare const renderBaseType: (library: Library, target: TsTypeTarget, ref: TypeId | undefined) => string;
+declare const renderTsType: (context: ModuleContext, ref: TypeId | undefined, isNullable?: boolean) => string;
+declare const recordTypeTarget: (library: Library, renderNamedRef: (name: ReferenceName) => string, renderGtype: () => string) => TsTypeTarget;
+export { renderBaseType, renderTsType, recordTypeTarget, type TsTypeTarget };
 //# sourceMappingURL=ts-type.d.ts.map

package/dist/analysis/ts-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-type.d.ts","sourceRoot":"","sources":["../../src/analysis/ts-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,KAAK,aAAa,GAAG;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACvB,cAAc,EAAE,KAAK,GAAG,QAAQ,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,EAAE,IAAI,EAAE,aAAa,KAAK,MAAM,CAAC;IAC5E,WAAW,EAAE,MAAM,MAAM,CAAC;CAC7B,CAAC;AAkBF,eAAO,MAAM,iBAAiB,YAAa,OAAO,UAAU,YAAY,OAAO,MAAM,GAAG,SAAS,KAAG,MA4BnG,CAAC;AAmBF,eAAO,MAAM,YAAY,YAAa,aAAa,OAAO,MAAM,GAAG,SAAS,2BAAuB,MAGlG,CAAC"}
+{"version":3,"file":"ts-type.d.ts","sourceRoot":"","sources":["../../src/analysis/ts-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAKH,KAAK,MAAM,EACd,MAAM,mBAAmB,CAAC;AAI3B,KAAK,aAAa,GAAG;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,cAAc,EAAE,KAAK,GAAG,QAAQ,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,EAAE,IAAI,EAAE,aAAa,KAAK,MAAM,CAAC;IAC5E,WAAW,EAAE,MAAM,MAAM,CAAC;CAC7B,CAAC;AAkCF,QAAA,MAAM,cAAc,GAAI,SAAS,OAAO,EAAE,QAAQ,YAAY,EAAE,KAAK,MAAM,GAAG,SAAS,KAAG,MAiCzF,CAAC;AAmDF,QAAA,MAAM,YAAY,GAAI,SAAS,aAAa,EAAE,KAAK,MAAM,GAAG,SAAS,EAAE,oBAAkB,KAAG,MAI3F,CAAC;AAEF,QAAA,MAAM,gBAAgB,GAClB,SAAS,OAAO,EAChB,gBAAgB,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,EAC/C,aAAa,MAAM,MAAM,KAC1B,YAkBF,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,KAAK,YAAY,EAAE,CAAC"}

package/dist/analysis/ts-type.js

@@ -1,54 +1,82 @@
 import { PRIMITIVE_TS_TYPE } from "../gir/primitives.js";
+import { hasUnknownArrayLength, } from "../gir/type-id.js";
 import { isClassStructRecord } from "../store/gi/class-struct-record.js";
 import { gtypeTsType } from "../store/gi/gtype-binding.js";
 const willEmitEntity = (library, type) => {
     switch (type.kind) {
-        case "callback":
+        case "callback": {
             return type.value.introspectable && type.value.name.length > 0;
-        case "record":
+        }
+        case "record": {
             return (type.value.introspectable &&
                 !type.value.isVtable &&
                 type.value.name.length > 0 &&
                 !isClassStructRecord(library, type.namespace.name, type.value));
-        default:
+        }
+        case "alias":
+        case "class":
+        case "enum":
+        case "interface": {
             return true;
+        }
     }
 };
-export const renderBaseTypeFor = (library, target, ref) => {
-    if (ref === undefined)
+const renderPrimitiveType = (target, type) => type.category === "gtype" ? target.renderGtype() : PRIMITIVE_TS_TYPE[type.category];
+const renderEntityType = (library, target, type, name) => renderNamedType(target, type, willEmitEntity(library, type) ? name : undefined);
+const renderBaseType = (library, target, ref) => {
+    if (ref === undefined) {
         return "void";
-    const type = library.typeOf(ref);
-    const name = library.nameOf(ref);
-    if (type === undefined)
+    }
+    const type = library.typeFor(ref);
+    const name = library.nameFor(ref);
+    if (type === undefined) {
         return renderNamedType(target, undefined, name);
+    }
     switch (type.kind) {
-        case "primitive":
-            return type.category === "gtype" ? target.renderGtype() : PRIMITIVE_TS_TYPE[type.category];
-        case "varargs":
+        case "primitive": {
+            return renderPrimitiveType(target, type);
+        }
+        case "varargs": {
             return "unknown[]";
+        }
         case "callback":
         case "class":
         case "interface":
         case "record":
         case "enum":
-        case "alias":
-            return renderNamedType(target, type, willEmitEntity(library, type) ? name : undefined);
+        case "alias": {
+            return renderEntityType(library, target, type, name);
+        }
         case "carray":
-            return `${renderBaseTypeFor(library, target, type.element)}[]`;
         case "list":
-            if (type.flavor === "gbytearray" && target.byteArrayAsNumber)
-                return "number[]";
-            return `${renderBaseTypeFor(library, target, type.element)}[]`;
         case "hashtable": {
-            const key = renderBaseTypeFor(library, target, type.key);
-            const value = renderBaseTypeFor(library, target, type.value);
-            return target.containerStyle === "record" ? `Record<${key}, ${value}>` : `Map<${key}, ${value}>`;
+            return renderContainerType(library, target, type);
         }
     }
 };
+const renderContainerType = (library, target, type) => {
+    if (type.kind === "hashtable") {
+        const key = renderBaseType(library, target, type.key);
+        const value = renderBaseType(library, target, type.value);
+        return target.containerStyle === "record" ? `Record<${key}, ${value}>` : `Map<${key}, ${value}>`;
+    }
+    return renderSequenceType(library, target, type);
+};
+// An array whose length nothing states decodes as the bare pointer it is, so its TypeScript type has
+// to say so too rather than promising elements nothing can count.
+const renderSequenceType = (library, target, type) => {
+    if (type.kind === "list" && type.flavor === "gbytearray" && target.byteArrayAsNumber) {
+        return "number[]";
+    }
+    if (type.kind === "carray" && hasUnknownArrayLength(type)) {
+        return "number";
+    }
+    return `${renderBaseType(library, target, type.element)}[]`;
+};
 const renderNamedType = (target, resolved, name) => {
-    if (name === undefined)
+    if (name === undefined || name.typeName.length === 0) {
         return resolved?.kind === "callback" ? target.callbackType : "unknown";
+    }
     return target.renderNamed(resolved, name);
 };
 const moduleTarget = (context) => ({
@@ -58,8 +86,26 @@ const moduleTarget = (context) => ({
     renderNamed: (_resolved, name) => context.qualify(name.namespaceName, name.typeName),
     renderGtype: () => gtypeTsType(context),
 });
-export const renderTsType = (context, ref, isNullable = false) => {
-    const base = renderBaseTypeFor(context.library, moduleTarget(context), ref);
+const renderTsType = (context, ref, isNullable = false) => {
+    const base = renderBaseType(context.library, moduleTarget(context), ref);
     return isNullable ? `${base} | null` : base;
 };
+const recordTypeTarget = (library, renderNamedRef, renderGtype) => {
+    const target = {
+        containerStyle: "record",
+        callbackType: "((...args: unknown[]) => unknown)",
+        byteArrayAsNumber: false,
+        renderNamed: (resolved, name) => {
+            if (resolved?.kind === "alias") {
+                return resolved.value.target === undefined
+                    ? "number"
+                    : renderBaseType(library, target, resolved.value.target);
+            }
+            return renderNamedRef(name);
+        },
+        renderGtype,
+    };
+    return target;
+};
+export { renderBaseType, renderTsType, recordTypeTarget };
 //# sourceMappingURL=ts-type.js.map

package/dist/analysis/ts-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-type.js","sourceRoot":"","sources":["../../src/analysis/ts-type.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Library } from \"../gir/library.js\";\nimport { PRIMITIVE_TS_TYPE } from \"../gir/primitives.js\";\nimport type { EntityType, GirType } from \"../gir/type.js\";\nimport type { TypeId } from \"../gir/type-id.js\";\nimport { isClassStructRecord } from \"../store/gi/class-struct-record.js\";\nimport { gtypeTsType } from \"../store/gi/gtype-binding.js\";\nimport type { ModuleContext } from \"../writer/context.js\";\n\ntype ReferenceName = {\n    namespaceName: string;\n    typeName: string;\n};\n\nexport type TsTypeTarget = {\n    containerStyle: \"map\" | \"record\";\n    callbackType: string;\n    byteArrayAsNumber: boolean;\n    renderNamed: (resolved: GirType | undefined, name: ReferenceName) => string;\n    renderGtype: () => string;\n};\n\nconst willEmitEntity = (library: Library, type: EntityType): boolean => {\n    switch (type.kind) {\n        case \"callback\":\n            return type.value.introspectable && type.value.name.length > 0;\n        case \"record\":\n            return (\n                type.value.introspectable &&\n                !type.value.isVtable &&\n                type.value.name.length > 0 &&\n                !isClassStructRecord(library, type.namespace.name, type.value)\n            );\n        default:\n            return true;\n    }\n};\n\nexport const renderBaseTypeFor = (library: Library, target: TsTypeTarget, ref: TypeId | undefined): string => {\n    if (ref === undefined) return \"void\";\n    const type = library.typeOf(ref);\n    const name = library.nameOf(ref);\n    if (type === undefined) return renderNamedType(target, undefined, name);\n    switch (type.kind) {\n        case \"primitive\":\n            return type.category === \"gtype\" ? target.renderGtype() : PRIMITIVE_TS_TYPE[type.category];\n        case \"varargs\":\n            return \"unknown[]\";\n        case \"callback\":\n        case \"class\":\n        case \"interface\":\n        case \"record\":\n        case \"enum\":\n        case \"alias\":\n            return renderNamedType(target, type, willEmitEntity(library, type) ? name : undefined);\n        case \"carray\":\n            return `${renderBaseTypeFor(library, target, type.element)}[]`;\n        case \"list\":\n            if (type.flavor === \"gbytearray\" && target.byteArrayAsNumber) return \"number[]\";\n            return `${renderBaseTypeFor(library, target, type.element)}[]`;\n        case \"hashtable\": {\n            const key = renderBaseTypeFor(library, target, type.key);\n            const value = renderBaseTypeFor(library, target, type.value);\n            return target.containerStyle === \"record\" ? `Record<${key}, ${value}>` : `Map<${key}, ${value}>`;\n        }\n    }\n};\n\nconst renderNamedType = (\n    target: TsTypeTarget,\n    resolved: GirType | undefined,\n    name: ReferenceName | undefined,\n): string => {\n    if (name === undefined) return resolved?.kind === \"callback\" ? target.callbackType : \"unknown\";\n    return target.renderNamed(resolved, name);\n};\n\nconst moduleTarget = (context: ModuleContext): TsTypeTarget => ({\n    containerStyle: \"map\",\n    callbackType: \"((...args: any[]) => any)\",\n    byteArrayAsNumber: true,\n    renderNamed: (_resolved, name) => context.qualify(name.namespaceName, name.typeName),\n    renderGtype: () => gtypeTsType(context),\n});\n\nexport const renderTsType = (context: ModuleContext, ref: TypeId | undefined, isNullable = false): string => {\n    const base = renderBaseTypeFor(context.library, moduleTarget(context), ref);\n    return isNullable ? `${base} | null` : base;\n};\n"]}
+{"version":3,"file":"ts-type.js","sourceRoot":"","sources":["../../src/analysis/ts-type.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Library } from \"../gir/library.js\";\nimport type { EntityType, GirType } from \"../gir/type.js\";\nimport type { ModuleContext } from \"../writer/context.js\";\nimport { PRIMITIVE_TS_TYPE } from \"../gir/primitives.js\";\nimport {\n    type CArrayType,\n    type HashTableType,\n    hasUnknownArrayLength,\n    type ListType,\n    type TypeId,\n} from \"../gir/type-id.js\";\nimport { isClassStructRecord } from \"../store/gi/class-struct-record.js\";\nimport { gtypeTsType } from \"../store/gi/gtype-binding.js\";\n\ntype ReferenceName = {\n    namespaceName: string;\n    typeName: string;\n};\n\ntype TsTypeTarget = {\n    containerStyle: \"map\" | \"record\";\n    callbackType: string;\n    byteArrayAsNumber: boolean;\n    renderNamed: (resolved: GirType | undefined, name: ReferenceName) => string;\n    renderGtype: () => string;\n};\n\nconst willEmitEntity = (library: Library, type: EntityType): boolean => {\n    switch (type.kind) {\n        case \"callback\": {\n            return type.value.introspectable && type.value.name.length > 0;\n        }\n        case \"record\": {\n            return (\n                type.value.introspectable &&\n                !type.value.isVtable &&\n                type.value.name.length > 0 &&\n                !isClassStructRecord(library, type.namespace.name, type.value)\n            );\n        }\n        case \"alias\":\n        case \"class\":\n        case \"enum\":\n        case \"interface\": {\n            return true;\n        }\n    }\n};\n\nconst renderPrimitiveType = (target: TsTypeTarget, type: Extract<GirType, { kind: \"primitive\" }>): string =>\n    type.category === \"gtype\" ? target.renderGtype() : PRIMITIVE_TS_TYPE[type.category];\n\nconst renderEntityType = (\n    library: Library,\n    target: TsTypeTarget,\n    type: EntityType,\n    name: ReferenceName | undefined,\n): string => renderNamedType(target, type, willEmitEntity(library, type) ? name : undefined);\n\nconst renderBaseType = (library: Library, target: TsTypeTarget, ref: TypeId | undefined): string => {\n    if (ref === undefined) {\n        return \"void\";\n    }\n\n    const type = library.typeFor(ref);\n    const name = library.nameFor(ref);\n\n    if (type === undefined) {\n        return renderNamedType(target, undefined, name);\n    }\n\n    switch (type.kind) {\n        case \"primitive\": {\n            return renderPrimitiveType(target, type);\n        }\n        case \"varargs\": {\n            return \"unknown[]\";\n        }\n        case \"callback\":\n        case \"class\":\n        case \"interface\":\n        case \"record\":\n        case \"enum\":\n        case \"alias\": {\n            return renderEntityType(library, target, type, name);\n        }\n        case \"carray\":\n        case \"list\":\n        case \"hashtable\": {\n            return renderContainerType(library, target, type);\n        }\n    }\n};\n\nconst renderContainerType = (\n    library: Library,\n    target: TsTypeTarget,\n    type: CArrayType | ListType | HashTableType,\n): string => {\n    if (type.kind === \"hashtable\") {\n        const key = renderBaseType(library, target, type.key);\n        const value = renderBaseType(library, target, type.value);\n\n        return target.containerStyle === \"record\" ? `Record<${key}, ${value}>` : `Map<${key}, ${value}>`;\n    }\n\n    return renderSequenceType(library, target, type);\n};\n\n// An array whose length nothing states decodes as the bare pointer it is, so its TypeScript type has\n// to say so too rather than promising elements nothing can count.\nconst renderSequenceType = (library: Library, target: TsTypeTarget, type: CArrayType | ListType): string => {\n    if (type.kind === \"list\" && type.flavor === \"gbytearray\" && target.byteArrayAsNumber) {\n        return \"number[]\";\n    }\n\n    if (type.kind === \"carray\" && hasUnknownArrayLength(type)) {\n        return \"number\";\n    }\n\n    return `${renderBaseType(library, target, type.element)}[]`;\n};\n\nconst renderNamedType = (\n    target: TsTypeTarget,\n    resolved: GirType | undefined,\n    name: ReferenceName | undefined,\n): string => {\n    if (name === undefined || name.typeName.length === 0) {\n        return resolved?.kind === \"callback\" ? target.callbackType : \"unknown\";\n    }\n\n    return target.renderNamed(resolved, name);\n};\n\nconst moduleTarget = (context: ModuleContext): TsTypeTarget => ({\n    containerStyle: \"map\",\n    callbackType: \"((...args: any[]) => any)\",\n    byteArrayAsNumber: true,\n    renderNamed: (_resolved, name) => context.qualify(name.namespaceName, name.typeName),\n    renderGtype: () => gtypeTsType(context),\n});\n\nconst renderTsType = (context: ModuleContext, ref: TypeId | undefined, isNullable = false): string => {\n    const base = renderBaseType(context.library, moduleTarget(context), ref);\n\n    return isNullable ? `${base} | null` : base;\n};\n\nconst recordTypeTarget = (\n    library: Library,\n    renderNamedRef: (name: ReferenceName) => string,\n    renderGtype: () => string,\n): TsTypeTarget => {\n    const target: TsTypeTarget = {\n        containerStyle: \"record\",\n        callbackType: \"((...args: unknown[]) => unknown)\",\n        byteArrayAsNumber: false,\n        renderNamed: (resolved, name) => {\n            if (resolved?.kind === \"alias\") {\n                return resolved.value.target === undefined\n                    ? \"number\"\n                    : renderBaseType(library, target, resolved.value.target);\n            }\n\n            return renderNamedRef(name);\n        },\n        renderGtype,\n    };\n\n    return target;\n};\n\nexport { renderBaseType, renderTsType, recordTypeTarget, type TsTypeTarget };\n"]}

package/dist/compile.d.ts

@@ -1,18 +1,18 @@
-export type SourceModule = {
+type SourceModule = {
     fileName: string;
     source: string;
 };
-export type CompileProjectParams = {
+type CompileProjectParams = {
     projectDir: string;
     fileNames: string[];
     compilerOptions: Record<string, unknown>;
     label: string;
-    paths?: Record<string, string[]>;
 };
-export declare const compileProject: (params: CompileProjectParams) => void;
-export declare const checkModules: (params: {
+declare const compileProject: (params: CompileProjectParams) => void;
+declare const checkModules: (params: {
     modules: SourceModule[];
     resolveFrom: string;
     label: string;
 }) => void;
+export { compileProject, checkModules, type SourceModule, type CompileProjectParams };
 //# sourceMappingURL=compile.d.ts.map

package/dist/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../src/compile.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,YAAY,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACpC,CAAC;AA+EF,eAAO,MAAM,cAAc,WAAY,oBAAoB,KAAG,IA2B7D,CAAC;AAQF,eAAO,MAAM,YAAY,WAAY;IAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,KAAG,IAmBtG,CAAC"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../src/compile.ts"],"names":[],"mappings":"AAKA,KAAK,YAAY,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AA8HF,QAAA,MAAM,cAAc,GAAI,QAAQ,oBAAoB,KAAG,IAYtD,CAAC;AAEF,QAAA,MAAM,YAAY,GAAI,QAAQ;IAAE,OAAO,EAAE,YAAY,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,KAAG,IAqB/F,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,KAAK,oBAAoB,EAAE,CAAC"}