@tsonic/frontend 0.0.73 → 0.0.75

package/dist/ir/type-system/internal/universe/unified-universe.test.js

@@ -16,6 +16,7 @@ const makeRegistry = (entry) => ({
     resolveNominal: (fqName) => fqName === entry.fullyQualifiedName ? entry : undefined,
     resolveBySimpleName: (simpleName) => simpleName === entry.name ? entry : undefined,
     getFQName: (simpleName) => simpleName === entry.name ? entry.fullyQualifiedName : undefined,
+    getFQNames: (simpleName) => simpleName === entry.name ? [entry.fullyQualifiedName] : [],
     getMemberType: (fqNominal, memberName) => {
         if (fqNominal !== entry.fullyQualifiedName)
             return undefined;
@@ -38,6 +39,7 @@ describe("buildUnifiedUniverse", () => {
             kind: "interface",
             name: "Foo",
             fullyQualifiedName: "MyApp.Foo",
+            ownerIdentity: "project",
             isDeclarationFile: false,
             typeParameters: [],
             members: new Map([
@@ -66,6 +68,7 @@ describe("buildUnifiedUniverse", () => {
             kind: "interface",
             name: "Foo",
             fullyQualifiedName: "MyApp.Foo",
+            ownerIdentity: "project",
             isDeclarationFile: false,
             typeParameters: [],
             members: new Map([
@@ -93,17 +96,19 @@ describe("buildUnifiedUniverse", () => {
             expect(undefinedCount).to.equal(1);
         }
     });
-    it("keeps assembly identity for declaration-file globals with matching TS names", () => {
+    it("keeps assembly identity for entries explicitly marked to preserve it", () => {
         const entry = {
             kind: "class",
             name: "Error",
             fullyQualifiedName: "Error",
+            ownerIdentity: "project",
             isDeclarationFile: true,
+            preservesAssemblyIdentity: true,
             typeParameters: [],
             members: new Map(),
             heritage: [],
         };
-        const errorTypeId = makeAssemblyTypeId("Tsonic.JSRuntime:Tsonic.JSRuntime.Error", "Tsonic.JSRuntime.Error", "Tsonic.JSRuntime", "Error");
+        const errorTypeId = makeAssemblyTypeId("js:js.Error", "js.Error", "js", "Error");
         const assemblyEntry = {
             typeId: errorTypeId,
             kind: "class",

package/dist/ir/type-system/internal/universe/unified-universe.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"unified-universe.test.js","sourceRoot":"","sources":["../../../../../src/ir/type-system/internal/universe/unified-universe.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"unified-universe.test.js","sourceRoot":"","sources":["../../../../../src/ir/type-system/internal/universe/unified-universe.test.ts"],"names":[],"mappings":"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"}

package/dist/ir/type-system/iterable-type-shapes.d.ts

@@ -0,0 +1,8 @@
+import type { IrType } from "../types/index.js";
+import type { TypeSystemState } from "./type-system-state.js";
+export type IterableShape = {
+    readonly mode: "sync" | "async";
+    readonly elementType: IrType;
+};
+export declare const getIterableShape: (state: TypeSystemState, type: IrType | undefined, visited?: ReadonlySet<string>) => IterableShape | undefined;
+//# sourceMappingURL=iterable-type-shapes.d.ts.map

package/dist/ir/type-system/iterable-type-shapes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"iterable-type-shapes.d.ts","sourceRoot":"","sources":["../../../src/ir/type-system/iterable-type-shapes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAShD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;AAiOF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,eAAe,EACtB,MAAM,MAAM,GAAG,SAAS,EACxB,UAAS,WAAW,CAAC,MAAM,CAAqB,KAC/C,aAAa,GAAG,SAgGlB,CAAC"}

package/dist/ir/type-system/iterable-type-shapes.js

@@ -0,0 +1,229 @@
+import { substituteIrType as irSubstitute, } from "../types/ir-substitution.js";
+import { createLocalTypeIdentityState, localTypeIdentityKey, } from "../types/type-ops.js";
+import { normalizeToNominal } from "./type-system-state.js";
+const iterableVisitKeyState = createLocalTypeIdentityState();
+const iterableVisitKey = (type) => {
+    return localTypeIdentityKey(type, iterableVisitKeyState);
+};
+const SYNC_ITERABLE_TS_NAMES = new Set([
+    "Array",
+    "ReadonlyArray",
+    "Iterable",
+    "IterableIterator",
+    "Iterator",
+    "Generator",
+    "Set",
+    "ReadonlySet",
+    "Map",
+    "ReadonlyMap",
+    "IEnumerable",
+    "IEnumerable_1",
+]);
+const ASYNC_ITERABLE_TS_NAMES = new Set([
+    "AsyncIterable",
+    "AsyncIterableIterator",
+    "AsyncGenerator",
+    "IAsyncEnumerable",
+    "IAsyncEnumerable_1",
+]);
+const normalizeIterableOperand = (type) => {
+    if (!type) {
+        return undefined;
+    }
+    if (type.kind === "unionType") {
+        const nonNullish = type.types.filter((part) => !(part.kind === "primitiveType" &&
+            (part.name === "null" || part.name === "undefined")));
+        if (nonNullish.length === 1) {
+            return nonNullish[0];
+        }
+    }
+    if (type.kind === "intersectionType") {
+        const preferred = type.types.find((part) => part.kind === "arrayType") ??
+            type.types.find((part) => part.kind === "tupleType") ??
+            type.types.find((part) => {
+                if (part.kind !== "referenceType")
+                    return false;
+                return !part.name.endsWith("$views");
+            });
+        return preferred ?? type;
+    }
+    return type;
+};
+const deriveTupleIterationElementType = (elementTypes) => {
+    if (elementTypes.length === 0) {
+        return undefined;
+    }
+    if (elementTypes.length === 1) {
+        return elementTypes[0];
+    }
+    return {
+        kind: "unionType",
+        types: [...elementTypes],
+    };
+};
+const getReferenceTypeNames = (state, type) => {
+    const normalized = normalizeToNominal(state, type);
+    const entry = normalized
+        ? state.unifiedCatalog.getByTypeId(normalized.typeId)
+        : undefined;
+    return {
+        tsName: entry?.typeId.tsName ?? normalized?.typeId.tsName ?? type.name,
+        clrName: entry?.typeId.clrName ??
+            normalized?.typeId.clrName ??
+            type.typeId?.clrName ??
+            type.resolvedClrType,
+    };
+};
+const normalizeIterableTypeName = (name) => name?.replace(/\$instance$/, "");
+const tryGetKnownReferenceIterableShape = (state, type) => {
+    const { tsName, clrName } = getReferenceTypeNames(state, type);
+    const normalizedTsName = normalizeIterableTypeName(tsName);
+    const clrBaseName = normalizeIterableTypeName(clrName?.split(".").pop()?.replace(/`1$/, ""));
+    const firstTypeArg = type.typeArguments?.[0];
+    const secondTypeArg = type.typeArguments?.[1];
+    if ((SYNC_ITERABLE_TS_NAMES.has(normalizedTsName ?? "") ||
+        clrBaseName === "IEnumerable") &&
+        firstTypeArg) {
+        if (normalizedTsName === "Map" || normalizedTsName === "ReadonlyMap") {
+            return firstTypeArg && secondTypeArg
+                ? {
+                    mode: "sync",
+                    elementType: {
+                        kind: "tupleType",
+                        elementTypes: [firstTypeArg, secondTypeArg],
+                    },
+                }
+                : undefined;
+        }
+        return {
+            mode: "sync",
+            elementType: firstTypeArg,
+        };
+    }
+    if ((ASYNC_ITERABLE_TS_NAMES.has(normalizedTsName ?? "") ||
+        clrBaseName === "IAsyncEnumerable") &&
+        firstTypeArg) {
+        return {
+            mode: "async",
+            elementType: firstTypeArg,
+        };
+    }
+    return undefined;
+};
+const resolveNominalMemberReturnTypes = (state, type, memberName) => {
+    const normalized = normalizeToNominal(state, type);
+    if (!normalized) {
+        return [];
+    }
+    const lookupResult = state.nominalEnv.findMemberDeclaringType(normalized.typeId, normalized.typeArgs, memberName);
+    if (!lookupResult) {
+        return [];
+    }
+    const memberEntry = state.unifiedCatalog.getMember(lookupResult.declaringTypeId, memberName);
+    if (!memberEntry) {
+        return [];
+    }
+    const substituteType = (candidate) => candidate
+        ? irSubstitute(candidate, lookupResult.substitution)
+        : undefined;
+    const result = [];
+    const propertyType = substituteType(memberEntry.type);
+    if (propertyType) {
+        result.push(propertyType);
+    }
+    for (const signature of memberEntry.signatures ?? []) {
+        const returnType = substituteType(signature.returnType);
+        if (returnType) {
+            result.push(returnType);
+        }
+    }
+    return result;
+};
+const resolveStructuralMemberReturnTypes = (type, memberName) => {
+    const result = [];
+    for (const member of type.structuralMembers ?? []) {
+        if (member.kind === "propertySignature" && member.name === memberName) {
+            result.push(member.type);
+            continue;
+        }
+        if (member.kind === "methodSignature" &&
+            member.name === memberName &&
+            member.parameters.length === 0 &&
+            member.returnType) {
+            result.push(member.returnType);
+        }
+    }
+    return result;
+};
+export const getIterableShape = (state, type, visited = new Set()) => {
+    const normalized = normalizeIterableOperand(type);
+    if (!normalized) {
+        return undefined;
+    }
+    const visitKey = iterableVisitKey(normalized);
+    if (visited.has(visitKey)) {
+        return undefined;
+    }
+    const nextVisited = new Set(visited);
+    nextVisited.add(visitKey);
+    if (normalized.kind === "arrayType") {
+        return {
+            mode: "sync",
+            elementType: normalized.elementType,
+        };
+    }
+    if (normalized.kind === "tupleType") {
+        const elementType = deriveTupleIterationElementType(normalized.elementTypes);
+        return elementType
+            ? {
+                mode: "sync",
+                elementType,
+            }
+            : undefined;
+    }
+    if (normalized.kind !== "referenceType") {
+        return undefined;
+    }
+    const knownShape = tryGetKnownReferenceIterableShape(state, normalized);
+    if (knownShape) {
+        return knownShape;
+    }
+    for (const returnType of resolveStructuralMemberReturnTypes(normalized, "[symbol:iterator]")) {
+        const nested = getIterableShape(state, returnType, nextVisited);
+        if (nested) {
+            return {
+                mode: "sync",
+                elementType: nested.elementType,
+            };
+        }
+    }
+    for (const returnType of resolveNominalMemberReturnTypes(state, normalized, "[symbol:iterator]")) {
+        const nested = getIterableShape(state, returnType, nextVisited);
+        if (nested) {
+            return {
+                mode: "sync",
+                elementType: nested.elementType,
+            };
+        }
+    }
+    for (const returnType of resolveStructuralMemberReturnTypes(normalized, "[symbol:asyncIterator]")) {
+        const nested = getIterableShape(state, returnType, nextVisited);
+        if (nested) {
+            return {
+                mode: "async",
+                elementType: nested.elementType,
+            };
+        }
+    }
+    for (const returnType of resolveNominalMemberReturnTypes(state, normalized, "[symbol:asyncIterator]")) {
+        const nested = getIterableShape(state, returnType, nextVisited);
+        if (nested) {
+            return {
+                mode: "async",
+                elementType: nested.elementType,
+            };
+        }
+    }
+    return undefined;
+};
+//# sourceMappingURL=iterable-type-shapes.js.map

package/dist/ir/type-system/iterable-type-shapes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"iterable-type-shapes.js","sourceRoot":"","sources":["../../../src/ir/type-system/iterable-type-shapes.ts"],"names":[],"mappings":"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"}

package/dist/ir/type-system/type-alias-expansion.d.ts

@@ -0,0 +1,4 @@
+import type { IrReferenceType, IrType } from "../types/index.js";
+import type { TypeSystemState } from "./type-system-state.js";
+export declare const expandReferenceAlias: (state: TypeSystemState, type: IrReferenceType) => IrType | undefined;
+//# sourceMappingURL=type-alias-expansion.d.ts.map

package/dist/ir/type-system/type-alias-expansion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-alias-expansion.d.ts","sourceRoot":"","sources":["../../../src/ir/type-system/type-alias-expansion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAKjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,eAAO,MAAM,oBAAoB,GAC/B,OAAO,eAAe,EACtB,MAAM,eAAe,KACpB,MAAM,GAAG,SAmCX,CAAC"}

package/dist/ir/type-system/type-alias-expansion.js

@@ -0,0 +1,27 @@
+import { substituteIrType as irSubstitute, } from "../types/ir-substitution.js";
+import { resolveTypeIdByName } from "./type-system-state.js";
+export const expandReferenceAlias = (state, type) => {
+    const typeId = type.typeId ??
+        resolveTypeIdByName(state, type.resolvedClrType ?? type.name, type.typeArguments?.length ?? 0);
+    if (!typeId) {
+        return undefined;
+    }
+    const entry = state.unifiedCatalog.getByTypeId(typeId);
+    if (!entry?.aliasedType) {
+        return undefined;
+    }
+    const aliasSubstitution = new Map();
+    const aliasTypeParameters = entry.typeParameters;
+    const aliasTypeArguments = type.typeArguments ?? [];
+    for (let index = 0; index < Math.min(aliasTypeParameters.length, aliasTypeArguments.length); index += 1) {
+        const typeParameter = aliasTypeParameters[index];
+        const typeArgument = aliasTypeArguments[index];
+        if (typeParameter && typeArgument) {
+            aliasSubstitution.set(typeParameter.name, typeArgument);
+        }
+    }
+    return aliasSubstitution.size > 0
+        ? irSubstitute(entry.aliasedType, aliasSubstitution)
+        : entry.aliasedType;
+};
+//# sourceMappingURL=type-alias-expansion.js.map

package/dist/ir/type-system/type-alias-expansion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-alias-expansion.js","sourceRoot":"","sources":["../../../src/ir/type-system/type-alias-expansion.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,IAAI,YAAY,GAEjC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAsB,EACtB,IAAqB,EACD,EAAE;IACtB,MAAM,MAAM,GACV,IAAI,CAAC,MAAM;QACX,mBAAmB,CACjB,KAAK,EACL,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,IAAI,EACjC,IAAI,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,CAChC,CAAC;IACJ,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACpD,MAAM,mBAAmB,GAAG,KAAK,CAAC,cAAc,CAAC;IACjD,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;IACpD,KACE,IAAI,KAAK,GAAG,CAAC,EACb,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,EACvE,KAAK,IAAI,CAAC,EACV,CAAC;QACD,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,aAAa,IAAI,YAAY,EAAE,CAAC;YAClC,iBAAiB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,OAAO,iBAAiB,CAAC,IAAI,GAAG,CAAC;QAC/B,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,EAAE,iBAAsC,CAAC;QACzE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;AACxB,CAAC,CAAC"}

package/dist/ir/type-system/type-system-call-resolution.d.ts

@@ -1,70 +1,18 @@
 /**
- * TypeSystem Call Resolution — Signature Extraction, Type ID Attachment, and Call Resolution
- *
- * Handles call resolution, signature extraction, type ID attachment, and structural member lookup.
- *
- * DAG position: depends on type-system-state and type-system-relations
- */
-import type { IrType, IrFunctionType, IrParameter, IrInterfaceMember, IrTypeParameter } from "../types/index.js";
-import type { TypeParameterInfo, SignatureId } from "./types.js";
-import type { MethodSignatureEntry } from "./internal/universe/types.js";
-import type { TypeSystemState, CallQuery, ResolvedCall, RawSignatureInfo, TypeSubstitutionMap, Site } from "./type-system-state.js";
-/**
- * Get or compute raw signature info from SignatureId.
- * Caches the result for subsequent calls.
- */
-export declare const getRawSignature: (state: TypeSystemState, sigId: SignatureId) => RawSignatureInfo | undefined;
-/**
- * Attach canonical TypeIds to IR types where possible.
- *
- * This keeps nominal identity stable throughout the pipeline and enables
- * emit-time resolution without relying on string name matching.
- */
-export declare const attachParameterTypeIds: (state: TypeSystemState, p: IrParameter) => IrParameter;
-export declare const attachTypeParameterTypeIds: (state: TypeSystemState, tp: IrTypeParameter) => IrTypeParameter;
-export declare const attachInterfaceMemberTypeIds: (state: TypeSystemState, m: IrInterfaceMember) => IrInterfaceMember;
-export declare const attachTypeIds: (state: TypeSystemState, type: IrType) => IrType;
-/**
- * Deterministic type syntax conversion with canonical TypeId attachment.
- *
- * The underlying converter is syntax-only; this wrapper re-attaches the
- * nominal identity from the UnifiedUniverse so downstream passes (including
- * the emitter) can resolve CLR types without re-driving a parallel lookup.
- */
-export declare const convertTypeNode: (state: TypeSystemState, node: unknown) => IrType;
-/**
- * Convert a nominal CLR delegate type to an IrFunctionType by reading its Invoke signature.
- *
- * This is used for deterministic lambda typing when the expected type is a delegate
- * (e.g., custom delegates from CLR metadata).
- */
-export declare const delegateToFunctionType: (state: TypeSystemState, type: IrType) => IrFunctionType | undefined;
-/**
- * Look up a member on a structural (object) type.
- */
-export declare const lookupStructuralMember: (state: TypeSystemState, type: IrType, memberName: string, site?: Site) => IrType;
-/**
- * Compute receiver substitution for a method call.
- *
- * Given a receiver type (e.g., Array<string>) and a declaring type's TS name,
- * computes the substitution map for class type parameters.
- *
- * Phase 6: Uses TypeId-based NominalEnv.getInstantiation().
- */
-export declare const computeReceiverSubstitution: (state: TypeSystemState, receiverType: IrType, declaringTypeTsName: string, _declaringMemberName: string, declaringTypeParameterNames?: readonly string[]) => TypeSubstitutionMap | undefined;
-/**
- * Deterministic type argument inference from call-site arguments.
- *
- * Walks parameter and argument shapes without ambiguity.
- */
-export declare const inferMethodTypeArgsFromArguments: (state: TypeSystemState, methodTypeParams: readonly TypeParameterInfo[], parameterTypes: readonly (IrType | undefined)[], argTypes: readonly (IrType | undefined)[]) => Map<string, IrType> | undefined;
-export declare const mapEntriesEqual: (left: ReadonlyMap<string, IrType>, right: ReadonlyMap<string, IrType>) => boolean;
-export declare const collectExpectedReturnCandidates: (state: TypeSystemState, type: IrType) => readonly IrType[];
-export declare const collectNarrowingCandidates: (state: TypeSystemState, type: IrType) => readonly IrType[];
-export declare const containsMethodTypeParameter: (type: IrType, unresolved: ReadonlySet<string>) => boolean;
-export declare const normalizeCatalogTsName: (name: string) => string;
-export declare const isArityCompatible: (signature: MethodSignatureEntry, argumentCount: number) => boolean;
-export declare const scoreSignatureMatch: (state: TypeSystemState, parameterTypes: readonly (IrType | undefined)[], argTypes: readonly (IrType | undefined)[], argumentCount: number) => number;
-export declare const tryResolveCallFromUnifiedCatalog: (state: TypeSystemState, declaringTypeTsName: string, declaringMemberName: string, query: CallQuery) => ResolvedCall | undefined;
-export declare const resolveCall: (state: TypeSystemState, query: CallQuery) => ResolvedCall;
+ * TypeSystem Call Resolution — Facade
+ *
+ * Re-exports all call resolution sub-modules and the main `resolveCall` entry point.
+ *
+ * Sub-modules:
+ * - call-resolution-utilities: Pure type helpers, type ID attachment, parameter expansion
+ * - call-resolution-signatures: Signature extraction, structural lookup, delegate conversion,
+ *   receiver substitution
+ * - call-resolution-inference: Generic type argument inference, overload scoring, parameter refinement
+ * - call-resolution-resolve: Main resolveCall entry point
+ */
+export { substitutePolymorphicThis, attachParameterTypeIds, attachTypeParameterTypeIds, attachInterfaceMemberTypeIds, attachTypeIds, convertTypeNode, delegateToFunctionType, mapEntriesEqual, containsMethodTypeParameter, normalizeCatalogTsName, expandParameterTypesForInference, expandParameterTypesForArguments, buildResolvedRestParameter, collectExpectedReturnCandidates, collectNarrowingCandidates, POLYMORPHIC_THIS_MARKER, } from "./call-resolution-utilities.js";
+export { getRawSignature, lookupStructuralMember, computeReceiverSubstitution, } from "./call-resolution-signatures.js";
+export { inferMethodTypeArgsFromArguments, isArityCompatible, scoreSignatureMatch, refineParameterTypeForConcreteArgument, refineResolvedParameterTypesForArguments, } from "./call-resolution-inference.js";
+export { resolveCall } from "./call-resolution-resolve.js";
+export { resolveCallableType } from "./call-resolution-callable-types.js";
 //# sourceMappingURL=type-system-call-resolution.d.ts.map

package/dist/ir/type-system/type-system-call-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-system-call-resolution.d.ts","sourceRoot":"","sources":["../../../src/ir/type-system/type-system-call-resolution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-system-call-resolution.d.ts","sourceRoot":"","sources":["../../../src/ir/type-system/type-system-call-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,0BAA0B,EAC1B,4BAA4B,EAC5B,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,eAAe,EACf,2BAA2B,EAC3B,sBAAsB,EACtB,gCAAgC,EAChC,gCAAgC,EAChC,0BAA0B,EAC1B,+BAA+B,EAC/B,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,2BAA2B,GAC5B,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACL,gCAAgC,EAChC,iBAAiB,EACjB,mBAAmB,EACnB,sCAAsC,EACtC,wCAAwC,GACzC,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC"}