@kontor/kontor-sdk 1.0.0-alpha.39 → 1.0.0-alpha.40

package/dist/esm/wit/built-ins.js

@@ -0,0 +1,16 @@
+export var WitError;
+(function (WitError) {
+    WitError.param = {
+        name: "error",
+        type: "variant",
+        internalType: "error",
+        components: [
+            { name: "message", type: "string" },
+            { name: "overflow", type: "string" },
+            { name: "div-by-zero", type: "string" },
+            { name: "syntax", type: "string" },
+            { name: "validation", type: "string" },
+        ],
+    };
+})(WitError || (WitError = {}));
+//# sourceMappingURL=built-ins.js.map

package/dist/esm/wit/built-ins.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"built-ins.js","sourceRoot":"","sources":["../../../src/wit/built-ins.ts"],"names":[],"mappings":"AAEA,MAAM,KAAW,QAAQ,CAoBxB;AApBD,WAAiB,QAAQ;IACV,cAAK,GAAiB;QACjC,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,OAAO;QACrB,UAAU,EAAE;YACV,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;YACnC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE;YACpC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;YAClC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;SACvC;KACF,CAAC;AAQJ,CAAC,EApBgB,QAAQ,KAAR,QAAQ,QAoBxB"}

package/dist/esm/wit/regex.js

@@ -2,5 +2,5 @@ export function execTyped(regex, string) {
     const match = regex.exec(string);
     return match?.groups;
 }
-export const isGenericRegex = /^(?<outer>borrow|list|option|result|tuple)\s*<(?<inner>[\s\S]+)>\s*$/;
+export const isGenericRegex = /^(?<outer>borrow|list|option|result)\s*<(?<inner>[\s\S]+)>\s*$/;
 //# sourceMappingURL=regex.js.map

package/dist/esm/wit/regex.js.map

@@ -1 +1 @@
-{"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/wit/regex.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAO,KAAa,EAAE,MAAc;IAC3D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,KAAK,EAAE,MAA0B,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GACzB,sEAAsE,CAAC"}
+{"version":3,"file":"regex.js","sourceRoot":"","sources":["../../../src/wit/regex.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAO,KAAa,EAAE,MAAc;IAC3D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,KAAK,EAAE,MAA0B,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GACzB,gEAAgE,CAAC"}

package/dist/esm/wit/wit-parser/core/errors/signature.js

@@ -35,7 +35,21 @@ export class InvalidRecordSignatureError extends BaseError {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: "InvalidStructSignatureError"
+            value: "InvalidRecordSignatureError"
+        });
+    }
+}
+export class InvalidVariantSignatureError extends BaseError {
+    constructor({ signature }) {
+        super("Invalid variant signature.", {
+            details: signature,
+            metaMessages: ["No variant cases"],
+        });
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "InvalidVariantSignatureError"
         });
     }
 }

package/dist/esm/wit/wit-parser/core/errors/signature.js.map

@@ -1 +1 @@
-{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../../../../src/wit/wit-parser/core/errors/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAG9C,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD,YAAY,EACV,SAAS,EACT,IAAI,GAIL;QACC,KAAK,CAAC,WAAW,IAAI,aAAa,EAAE;YAClC,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QAXI;;;;mBAAO,uBAAuB;WAAC;IAYxC,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD,YAAY,EAAE,SAAS,EAAyB;QAC9C,KAAK,CAAC,oBAAoB,EAAE;YAC1B,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QALI;;;;mBAAO,uBAAuB;WAAC;IAMxC,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,SAAS;IAGxD,YAAY,EAAE,SAAS,EAAyB;QAC9C,KAAK,CAAC,2BAA2B,EAAE;YACjC,OAAO,EAAE,SAAS;YAClB,YAAY,EAAE,CAAC,sBAAsB,CAAC;SACvC,CAAC,CAAC;QANI;;;;mBAAO,6BAA6B;WAAC;IAO9C,CAAC;CACF"}
+{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../../../../src/wit/wit-parser/core/errors/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAG9C,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD,YAAY,EACV,SAAS,EACT,IAAI,GAIL;QACC,KAAK,CAAC,WAAW,IAAI,aAAa,EAAE;YAClC,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QAXI;;;;mBAAO,uBAAuB;WAAC;IAYxC,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,SAAS;IAGlD,YAAY,EAAE,SAAS,EAAyB;QAC9C,KAAK,CAAC,oBAAoB,EAAE;YAC1B,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;QALI;;;;mBAAO,uBAAuB;WAAC;IAMxC,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,SAAS;IAGxD,YAAY,EAAE,SAAS,EAAyB;QAC9C,KAAK,CAAC,2BAA2B,EAAE;YACjC,OAAO,EAAE,SAAS;YAClB,YAAY,EAAE,CAAC,sBAAsB,CAAC;SACvC,CAAC,CAAC;QANI;;;;mBAAO,6BAA6B;WAAC;IAO9C,CAAC;CACF;AAED,MAAM,OAAO,4BAA6B,SAAQ,SAAS;IAGzD,YAAY,EAAE,SAAS,EAAyB;QAC9C,KAAK,CAAC,4BAA4B,EAAE;YAClC,OAAO,EAAE,SAAS;YAClB,YAAY,EAAE,CAAC,kBAAkB,CAAC;SACnC,CAAC,CAAC;QANI;;;;mBAAO,8BAA8B;WAAC;IAO/C,CAAC;CACF"}

package/dist/esm/wit/wit-parser/core/signatures.js

@@ -29,4 +29,18 @@ export function isRecordSignature(signature) {
 export function execRecordSignature(signature) {
     return execTyped(witRecordSignatureRegex, signature);
 }
+const witVariantSignatureRegex = /^variant\s+(?<name>[a-zA-Z$_][a-zA-Z0-9$_-]*)\s*\{(?<cases>[\s\S]*?)\}$/;
+export function isVariantSignature(signature) {
+    return witVariantSignatureRegex.test(signature);
+}
+export function execVariantSignature(signature) {
+    return execTyped(witVariantSignatureRegex, signature);
+}
+const witEnumSignatureRegex = /^enum\s+(?<name>[a-zA-Z$_][a-zA-Z0-9$_-]*)\s*\{(?<cases>[\s\S]*?)\}$/;
+export function isEnumSignature(signature) {
+    return witEnumSignatureRegex.test(signature);
+}
+export function execEnumSignature(signature) {
+    return execTyped(witEnumSignatureRegex, signature);
+}
 //# sourceMappingURL=signatures.js.map

package/dist/esm/wit/wit-parser/core/signatures.js.map

@@ -1 +1 @@
-{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../../../../src/wit/wit-parser/core/signatures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,mBAAmB,GACvB,iEAAiE,CAAC;AACpE,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC7C,CAAC;AACD,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,OAAO,SAAS,CACd,mBAAmB,EACnB,SAAS,CACV,CAAC;AACJ,CAAC;AAED,MAAM,mBAAmB,GACvB,oLAAoL,CAAC;AAEvL,MAAM,UAAU,mBAAmB,CAAC,SAAiB;IACnD,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACrD,MAAM,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,IAAK,CAAC;IAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,GAAuD,CAAC;IAC7E,MAAM,IAAI,GACR,GAAG,KAAK,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAE5E,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,MAAM,UAAU,GACd,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,GAAG,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,eAAe,GAAG,GAAG,CAAC;IAE3E,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;IAE7D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,uBAAuB,GAC3B,6EAA6E,CAAC;AAEhF,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IACjD,OAAO,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,SAAiB;IACnD,OAAO,SAAS,CAGb,uBAAuB,EAAE,SAAS,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../../../../src/wit/wit-parser/core/signatures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,mBAAmB,GACvB,iEAAiE,CAAC;AACpE,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC7C,CAAC;AACD,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,OAAO,SAAS,CACd,mBAAmB,EACnB,SAAS,CACV,CAAC;AACJ,CAAC;AAED,MAAM,mBAAmB,GACvB,oLAAoL,CAAC;AAEvL,MAAM,UAAU,mBAAmB,CAAC,SAAiB;IACnD,OAAO,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACrD,MAAM,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,IAAK,CAAC;IAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,GAAuD,CAAC;IAC7E,MAAM,IAAI,GACR,GAAG,KAAK,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAE5E,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,MAAM,UAAU,GACd,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,GAAG,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,eAAe,GAAG,GAAG,CAAC;IAE3E,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;IAE7D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,uBAAuB,GAC3B,6EAA6E,CAAC;AAEhF,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IACjD,OAAO,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,SAAiB;IACnD,OAAO,SAAS,CAGb,uBAAuB,EAAE,SAAS,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,wBAAwB,GAC5B,yEAAyE,CAAC;AAE5E,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,OAAO,wBAAwB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,OAAO,SAAS,CAGb,wBAAwB,EAAE,SAAS,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,qBAAqB,GACzB,sEAAsE,CAAC;AAEzE,MAAM,UAAU,eAAe,CAAC,SAAiB;IAC/C,OAAO,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IACjD,OAAO,SAAS,CAGb,qBAAqB,EAAE,SAAS,CAAC,CAAC;AACvC,CAAC"}

package/dist/esm/wit/wit-parser/core/types/signatures.js.map

@@ -1 +1 @@
-{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../../../../../src/wit/wit-parser/core/types/signatures.ts"],"names":[],"mappings":";AAmLA,SAAS"}
+{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../../../../../src/wit/wit-parser/core/types/signatures.ts"],"names":[],"mappings":";AAoMA,SAAS"}

package/dist/esm/wit/wit-parser/core/types/user-defined.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=user-defined.js.map

package/dist/esm/wit/wit-parser/core/types/user-defined.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-defined.js","sourceRoot":"","sources":["../../../../../../src/wit/wit-parser/core/types/user-defined.ts"],"names":[],"mappings":""}

package/dist/esm/wit/wit-parser/core/types/utils.js

@@ -1,2 +1,27 @@
 export {};
+// export type ParseSignature<
+//   signature extends string,
+//   records extends RecordLookup | unknown = unknown,
+// > =
+//   IsFunctionSignature<signature> extends true
+//     ? signature extends FunctionSignature<infer name, infer tail>
+//       ? {
+//           readonly name: name;
+//           readonly type: "function";
+//           readonly context: _ParseFunctionParametersAndContext<signature>["Context"];
+//           readonly inputs: ParseWitParameters<
+//             SplitParameters<
+//               _ParseFunctionParametersAndContext<signature>["Inputs"]
+//             >,
+//             { records: records }
+//           >;
+//           readonly outputs: tail extends `${string} -> ${infer returns};`
+//             ? ParseWitParameters<
+//                 SplitParameters<Trim<returns>>,
+//                 { records: records }
+//               >
+//             : readonly [];
+//         }
+//       : never
+//     : never;
 //# sourceMappingURL=utils.js.map

package/dist/esm/wit/wit-parser/core/types/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../src/wit/wit-parser/core/types/utils.ts"],"names":[],"mappings":""}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../src/wit/wit-parser/core/types/utils.ts"],"names":[],"mappings":";AA8RA,8BAA8B;AAC9B,8BAA8B;AAC9B,sDAAsD;AACtD,MAAM;AACN,gDAAgD;AAChD,oEAAoE;AACpE,YAAY;AACZ,iCAAiC;AACjC,uCAAuC;AACvC,wFAAwF;AACxF,iDAAiD;AACjD,+BAA+B;AAC/B,wEAAwE;AACxE,iBAAiB;AACjB,mCAAmC;AACnC,eAAe;AACf,4EAA4E;AAC5E,oCAAoC;AACpC,kDAAkD;AAClD,uCAAuC;AACvC,kBAAkB;AAClB,6BAA6B;AAC7B,YAAY;AACZ,gBAAgB;AAChB,eAAe"}

package/dist/esm/wit/wit-parser/core/user-defined.js

@@ -0,0 +1,280 @@
+import { InvalidRecordSignatureError, InvalidSignatureError, } from "./errors/signature.js";
+import { execRecordSignature, execVariantSignature, execEnumSignature, isRecordSignature, isVariantSignature, isEnumSignature, } from "./signatures.js";
+import { parseWitParameter, splitParameters } from "./utils.js";
+function normalizeVariantCaseToken(caseItem) {
+    const s = caseItem.trim();
+    if (!s)
+        return "";
+    // ok(string)  ->  ok: string
+    // ok ( string ) -> ok: string
+    const m = /^([A-Za-z$_][A-Za-z0-9$_-]*)\s*(?:\(\s*([\s\S]*?)\s*\))?$/.exec(s);
+    if (!m)
+        throw new Error(`Invalid variant case: ${caseItem}`);
+    const name = m[1];
+    const payload = m[2];
+    // No payload means a unit-like case. Use "_"
+    return payload == null || payload.trim() === ""
+        ? `${name}: _`
+        : `${name}: ${payload.trim()}`;
+}
+const typeHandlers = [
+    {
+        kind: "record",
+        isSignature: isRecordSignature,
+        execSignature: execRecordSignature,
+        parseComponents: (match, kind) => {
+            const properties = splitParameters(match.properties);
+            const components = [];
+            for (let k = 0; k < properties.length; k++) {
+                const property = properties[k];
+                const trimmed = property.trim();
+                if (!trimmed)
+                    continue;
+                const witParameter = parseWitParameter(trimmed, { type: kind });
+                components.push(witParameter);
+            }
+            return components;
+        },
+        validateComponents: (components, signature) => {
+            if (!components.length) {
+                throw new InvalidRecordSignatureError({ signature });
+            }
+        },
+    },
+    {
+        kind: "variant",
+        isSignature: isVariantSignature,
+        execSignature: execVariantSignature,
+        parseComponents: (match, kind) => {
+            const cases = match.cases.split(",");
+            const components = [];
+            for (let k = 0; k < cases.length; k++) {
+                const caseItem = cases[k];
+                const trimmed = caseItem.trim();
+                if (!trimmed)
+                    continue;
+                const normalized = normalizeVariantCaseToken(trimmed);
+                const witParameter = parseWitParameter(normalized, { type: kind });
+                components.push(witParameter);
+            }
+            return components;
+        },
+        validateComponents: (components, signature) => {
+            if (!components.length) {
+                throw new InvalidSignatureError({ signature, type: "variant" });
+            }
+        },
+    },
+    {
+        kind: "enum",
+        isSignature: isEnumSignature,
+        execSignature: execEnumSignature,
+        parseComponents: (match) => {
+            const cases = match.cases.split(",");
+            const components = [];
+            for (let k = 0; k < cases.length; k++) {
+                const caseItem = cases[k];
+                const trimmed = caseItem.trim();
+                if (!trimmed)
+                    continue;
+                // Validate it's a simple identifier (no payloads)
+                if (!/^[A-Za-z$_][A-Za-z0-9$_-]*$/.test(trimmed)) {
+                    throw new Error(`Invalid enum case: ${trimmed}. Enums cannot have payloads.`);
+                }
+                components.push(trimmed);
+            }
+            return components;
+        },
+        validateComponents: (components, signature) => {
+            if (!components.length) {
+                throw new InvalidSignatureError({ signature, type: "enum" });
+            }
+        },
+    },
+];
+export function parseTypes(signatures) {
+    const shallowRecords = {};
+    const shallowVariants = {};
+    const shallowEnums = {};
+    const signaturesLength = signatures.length;
+    // First pass: parse all signatures into shallow structures
+    for (let i = 0; i < signaturesLength; i++) {
+        const signature = signatures[i];
+        for (const handler of typeHandlers) {
+            if (!handler.isSignature(signature))
+                continue;
+            const match = handler.execSignature(signature);
+            if (!match) {
+                throw new InvalidSignatureError({ signature, type: handler.kind });
+            }
+            const components = handler.parseComponents(match, handler.kind);
+            handler.validateComponents(components, signature);
+            // Store in appropriate lookup
+            switch (handler.kind) {
+                case "record":
+                    shallowRecords[match.name] = components;
+                    break;
+                case "variant":
+                    shallowVariants[match.name] = components;
+                    break;
+                case "enum":
+                    shallowEnums[match.name] = components;
+                    break;
+            }
+            break; // Found matching handler, no need to check others
+        }
+    }
+    // Check for namespace collisions
+    assertNoCollisions(shallowRecords, shallowVariants, shallowEnums);
+    // Second pass: resolve all references
+    const resolvedRecords = {};
+    const recordEntries = Object.entries(shallowRecords);
+    for (let i = 0; i < recordEntries.length; i++) {
+        const [name, parameters] = recordEntries[i];
+        resolvedRecords[name] = resolveTypes(parameters, shallowRecords, shallowVariants, shallowEnums, new Set());
+    }
+    const resolvedVariants = {};
+    const variantEntries = Object.entries(shallowVariants);
+    for (let i = 0; i < variantEntries.length; i++) {
+        const [name, parameters] = variantEntries[i];
+        resolvedVariants[name] = resolveTypes(parameters, shallowRecords, shallowVariants, shallowEnums, new Set());
+    }
+    // Enums don't need resolution as they have no type references
+    const resolvedEnums = { ...shallowEnums };
+    return {
+        records: resolvedRecords,
+        variants: resolvedVariants,
+        enums: resolvedEnums,
+    };
+}
+function isAngleBalanced(s) {
+    let depth = 0;
+    for (const ch of s) {
+        if (ch === "<")
+            depth++;
+        else if (ch === ">") {
+            depth--;
+            if (depth < 0)
+                return false;
+        }
+    }
+    return depth === 0;
+}
+export const witResultRegex = /^result\s*<\s*(?<ok>[\s\S]+?)\s*,\s*(?<err>error)\s*>$/;
+export const witTypeRegex = /^(?:(?<wrapper>borrow|list|option)\s*<\s*(?<wrapped>[\s\S]+?)\s*>|(?<base>[a-zA-Z$_][a-zA-Z0-9$_-]*))$/;
+export function execWitType(type) {
+    const t = type.trim();
+    if (!t)
+        return null;
+    const rm = t.match(witResultRegex);
+    if (rm?.groups?.ok) {
+        const ok = rm.groups.ok.trim();
+        if (!isAngleBalanced(ok))
+            return null;
+        return { wrapper: "result", base: ok };
+    }
+    const m = t.match(witTypeRegex);
+    if (!m?.groups)
+        return null;
+    const wrapper = m.groups.wrapper;
+    const base = (m.groups.wrapped ?? m.groups.base)?.trim();
+    if (!base)
+        return null;
+    if (wrapper) {
+        if (!isAngleBalanced(base))
+            return null;
+        return { wrapper, base };
+    }
+    return { base };
+}
+function assertNoCollisions(records, variants, enums) {
+    const allTypes = [
+        ...Object.keys(records).map((k) => ({ name: k, kind: "record" })),
+        ...Object.keys(variants).map((k) => ({ name: k, kind: "variant" })),
+        ...Object.keys(enums).map((k) => ({ name: k, kind: "enum" })),
+    ];
+    const seen = new Map();
+    for (const { name, kind } of allTypes) {
+        const existing = seen.get(name);
+        if (existing) {
+            throw new Error(`Namespace collision: "${name}" is both ${existing} and ${kind}.`);
+        }
+        seen.set(name, kind);
+    }
+}
+function resolveTypes(witParameters, records, variants, enums, ancestors = new Set()) {
+    const components = [];
+    for (const witParameter of witParameters) {
+        const m = execWitType(witParameter.type);
+        if (!m?.base)
+            throw new Error(`Invalid WIT type: ${witParameter.type}`);
+        const base = m.base.trim();
+        // Check if it's a named record
+        if (base in records) {
+            if (ancestors.has(base)) {
+                throw new Error(`Circular reference detected at "${base}".`);
+            }
+            components.push({
+                ...witParameter,
+                type: m.wrapper
+                    ? m.wrapper === "result"
+                        ? `result<record, error>`
+                        : `${m.wrapper}<record>`
+                    : "record",
+                components: resolveTypes(records[base] ?? [], records, variants, enums, new Set([...ancestors, base])),
+            });
+            continue;
+        }
+        // Check if it's a named variant
+        if (base in variants) {
+            if (ancestors.has(base)) {
+                throw new Error(`Circular reference detected at "${base}".`);
+            }
+            components.push({
+                ...witParameter,
+                type: m.wrapper
+                    ? m.wrapper === "result"
+                        ? `result<variant, error>`
+                        : `${m.wrapper}<variant>`
+                    : "variant",
+                internalType: m.wrapper
+                    ? m.wrapper === "result"
+                        ? `result<${base}, error>`
+                        : `${m.wrapper}<${base}>`
+                    : base,
+                components: resolveTypes(variants[base] ?? [], records, variants, enums, new Set([...ancestors, base])),
+            });
+            continue;
+        }
+        // Check if it's a named enum
+        if (base in enums) {
+            if (ancestors.has(base)) {
+                throw new Error(`Circular reference detected at "${base}".`);
+            }
+            // Convert enum values to WitParameters for consistency
+            const enumCases = enums[base].map((caseName) => ({
+                name: caseName,
+                type: "_", // Unit type
+            }));
+            components.push({
+                ...witParameter,
+                type: m.wrapper
+                    ? m.wrapper === "result"
+                        ? `result<enum, error>`
+                        : `${m.wrapper}<enum>`
+                    : "enum",
+                internalType: m.wrapper
+                    ? m.wrapper === "result"
+                        ? `result<${base}, error>`
+                        : `${m.wrapper}<${base}>`
+                    : base,
+                components: enumCases,
+            });
+            continue;
+        }
+        // Otherwise, pass through (builtins, generics, etc.)
+        components.push(witParameter);
+    }
+    return components;
+}
+//# sourceMappingURL=user-defined.js.map

package/dist/esm/wit/wit-parser/core/user-defined.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-defined.js","sourceRoot":"","sources":["../../../../../src/wit/wit-parser/core/user-defined.ts"],"names":[],"mappings":"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"}

package/dist/esm/wit/wit-parser/core/utils.js

@@ -3,7 +3,7 @@ import { InvalidWitParameterError, WitProtectedKeywordError, } from "./errors/wi
 import { InvalidSignatureError, UnknownSignatureError, } from "./errors/signature.js";
 import { InvalidGenericDepthError } from "./errors/split-parameters.js";
 import { execFunctionSignature, isFunctionSignature } from "./signatures.js";
-export const witParameterRegex = /^(?:(?<name>[a-z][a-z0-9-]*)\s*:\s*)?(?<type>_|(?:borrow|list|option|result|tuple)\s*<[\s\S]+>|[a-z][a-z0-9-]*|(?:record|variant|flags|enum)\s*\{[\s\S]*\})$/;
+export const witParameterRegex = /^(?:(?<name>[a-z][a-z0-9-]*)\s*:\s*)?(?<type>_|(?:borrow|list|option|result)\s*<[\s\S]+>|[a-z][a-z0-9-]*|(?:record|variant|flags|enum)\s*\{[\s\S]*\})$/;
 export function isGeneric(type) {
     return isGenericRegex.test(type.trim());
 }
@@ -32,12 +32,17 @@ export function parseWitParameter(param, options) {
         throw new WitProtectedKeywordError({ param, name: match.name });
     const name = match.name ? { name: match.name } : {};
     const records = options?.records ?? {};
+    const variants = options?.variants ?? {};
+    const enums = options?.enums ?? {};
+    const ancestors = options?.ancestors ?? new Set();
+    // i think maybe a better approach is to have a merge step here in a separate function so we don't have to do recurssion
+    // except for the generit case
     let type;
     let components = {};
     if (isGenericType) {
         const g = execGeneric(match.type);
         const parts = splitParameters(g.inner);
-        const parsed = parts.map((p) => parseWitParameter(p, { records }));
+        const parsed = parts.map((p) => parseWitParameter(p, { records, variants, enums, ancestors }));
         // normalize inner types for the outer type string
         const innerTypeSig = parsed.map((x) => x.type).join(", ");
         switch (g.outer) {
@@ -61,40 +66,10 @@ export function parseWitParameter(param, options) {
                     });
                 }
                 const left = parsed[0];
-                // @ts-ignore
-                const right = parsed[1];
                 type = `result<${innerTypeSig}>`;
                 components = {
                     ...(left.components && { components: left.components }),
-                    // components: [
-                    //
-                    //   {
-                    //     name: "left",
-                    //     type: left.type,
-                    //     ...(left.components && { components: left.components }),
-                    //   },
-                    //   {
-                    //     name: "right",
-                    //     type: right.type,
-                    //     ...(right.components && { components: right.components }),
-                    //   },
-                    // ],
                 };
-                // the right / error channel is always assumed to be wit built-in `error` primitive
-                // components = {
-                //   components: [
-                //     {
-                //       name: "left",
-                //       type: left.type,
-                //       ...(left.components && { components: left.components }),
-                //     },
-                //     {
-                //       name: "right",
-                //       type: right.type,
-                //       ...(right.components && { components: right.components }),
-                //     },
-                //   ],
-                // };
                 break;
             }
             default: {
@@ -105,14 +80,25 @@ export function parseWitParameter(param, options) {
     }
     else if (match.type in records) {
         // scalar that maps to a record in `records`
-        type = "tuple";
+        type = "record";
         components = { components: records[match.type] };
     }
+    else if (match.type in variants) {
+        // scalar that maps to a record in `records`
+        type = "variant";
+        components = { components: variants[match.type] };
+    }
+    else if (match.type in enums) {
+        // scalar that maps to a record in `records`
+        type = "enum";
+        components = { components: enumToComponents(enums[match.type]) };
+    }
     else {
         type = match.type;
     }
     const witParameter = {
         type: `${type}${match.array ?? ""}`,
+        // TODO: this is smell
         internalType: match.type,
         ...name,
         ...components,
@@ -165,12 +151,12 @@ export function splitParameters(params, result = []) {
         result.push(tail);
     return result;
 }
-export function parseSignature(signature, structs = {}) {
+export function parseSignature(signature, records = {}, variants = {}, enums = {}) {
     if (isFunctionSignature(signature))
-        return parseFunctionSignature(signature, structs);
+        return parseFunctionSignature(signature, records, variants, enums);
     throw new UnknownSignatureError({ signature });
 }
-export function parseFunctionSignature(signature, records = {}) {
+export function parseFunctionSignature(signature, records = {}, variants = {}, enums = {}) {
     const match = execFunctionSignature(signature);
     if (!match)
         throw new InvalidSignatureError({ signature, type: "func" });
@@ -180,6 +166,8 @@ export function parseFunctionSignature(signature, records = {}) {
     for (let i = 0; i < inputLength; i++) {
         inputs.push(parseWitParameter(inputParams[i], {
             records,
+            variants,
+            enums,
         }));
     }
     const outputs = [];
@@ -189,6 +177,8 @@ export function parseFunctionSignature(signature, records = {}) {
         for (let i = 0; i < outputLength; i++) {
             outputs.push(parseWitParameter(outputParams[i], {
                 records,
+                variants,
+                enums,
             }));
         }
     }
@@ -205,4 +195,11 @@ export function parseFunctionSignature(signature, records = {}) {
         outputs,
     };
 }
+export function enumToComponents(cases) {
+    return cases.map((caseName) => ({
+        name: caseName,
+        type: "_",
+        internalType: "_",
+    }));
+}
 //# sourceMappingURL=utils.js.map

package/dist/esm/wit/wit-parser/core/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/wit/wit-parser/core/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/wit/wit-parser/core/utils.ts"],"names":[],"mappings":"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"}

package/dist/esm/wit/wit-parser/parse-wit-parameter.js

@@ -1,20 +1,26 @@
 import { InvalidWitParameterError } from "./core/errors/wit-parameter.js";
-import { parseRecords } from "./core/records.js";
-import { isRecordSignature } from "./core/signatures.js";
+import { isRecordSignature, isVariantSignature, isEnumSignature, } from "./core/signatures.js";
 import { parseWitParameter as parseWitParameter_ } from "./core/utils.js";
+import { parseTypes } from "./core/user-defined.js";
 export function parseWitParameter(param) {
     let witParameter;
     if (typeof param === "string")
         witParameter = parseWitParameter_(param, {});
     else {
-        const records = parseRecords(param);
+        const types = parseTypes(param);
         const length = param.length;
         for (let i = 0; i < length; i++) {
             const signature = param[i];
             if (isRecordSignature(signature))
                 continue;
+            if (isVariantSignature(signature))
+                continue;
+            if (isEnumSignature(signature))
+                continue;
             witParameter = parseWitParameter_(signature, {
-                records: records,
+                enums: types["enums"],
+                variants: types["variants"],
+                records: types["records"],
             });
             break;
         }