@tsonic/emitter 0.0.3 → 0.0.5

package/dist/core/type-resolution.js

@@ -0,0 +1,283 @@
+/**
+ * Type resolution helpers for generic null/default handling
+ *
+ * Provides:
+ * - containsTypeParameter: Check if type contains any type parameter
+ * - substituteTypeArgs: Substitute type arguments into a type
+ * - getPropertyType: Look up property type from contextual type
+ */
+/**
+ * Check if a type contains any type parameter.
+ *
+ * Uses both:
+ * 1. New IR kind "typeParameterType" (preferred)
+ * 2. Legacy detection via typeParams set (compatibility during migration)
+ *
+ * @param type - The IR type to check
+ * @param typeParams - Set of type parameter names in current scope
+ * @returns true if the type contains a type parameter
+ */
+export const containsTypeParameter = (type, typeParams) => {
+    switch (type.kind) {
+        case "typeParameterType":
+            // New IR kind - always a type parameter
+            return true;
+        case "referenceType":
+            // Legacy compatibility: check if name is in typeParams set
+            if (typeParams.has(type.name)) {
+                return true;
+            }
+            // Recurse into type arguments
+            if (type.typeArguments) {
+                return type.typeArguments.some((arg) => containsTypeParameter(arg, typeParams));
+            }
+            return false;
+        case "arrayType":
+            return containsTypeParameter(type.elementType, typeParams);
+        case "dictionaryType":
+            return (containsTypeParameter(type.keyType, typeParams) ||
+                containsTypeParameter(type.valueType, typeParams));
+        case "unionType":
+        case "intersectionType":
+            return type.types.some((t) => containsTypeParameter(t, typeParams));
+        case "functionType":
+            if (containsTypeParameter(type.returnType, typeParams)) {
+                return true;
+            }
+            return type.parameters.some((p) => p.type && containsTypeParameter(p.type, typeParams));
+        case "objectType":
+            return type.members.some((m) => {
+                if (m.kind === "propertySignature") {
+                    return containsTypeParameter(m.type, typeParams);
+                }
+                if (m.kind === "methodSignature") {
+                    if (m.returnType && containsTypeParameter(m.returnType, typeParams)) {
+                        return true;
+                    }
+                    return m.parameters.some((p) => p.type && containsTypeParameter(p.type, typeParams));
+                }
+                return false;
+            });
+        case "primitiveType":
+        case "literalType":
+        case "anyType":
+        case "unknownType":
+        case "voidType":
+        case "neverType":
+            return false;
+        default: {
+            // Exhaustive check - this will error if a new IR type kind is added
+            const exhaustive = type;
+            void exhaustive;
+            return false;
+        }
+    }
+};
+/**
+ * Substitute type arguments into a type.
+ *
+ * @param type - The type to substitute into
+ * @param typeParamNames - List of type parameter names (in order)
+ * @param typeArgs - List of type arguments (in order, parallel to typeParamNames)
+ * @returns The type with type parameters substituted
+ */
+export const substituteTypeArgs = (type, typeParamNames, typeArgs) => {
+    // Build mapping from name to type
+    const mapping = new Map();
+    for (let i = 0; i < typeParamNames.length && i < typeArgs.length; i++) {
+        const name = typeParamNames[i];
+        const arg = typeArgs[i];
+        if (name !== undefined && arg !== undefined) {
+            mapping.set(name, arg);
+        }
+    }
+    return substituteType(type, mapping);
+};
+/**
+ * Internal helper for type substitution
+ */
+const substituteType = (type, mapping) => {
+    switch (type.kind) {
+        case "typeParameterType": {
+            const substitution = mapping.get(type.name);
+            return substitution ?? type;
+        }
+        case "referenceType": {
+            // Check if this is a type parameter (legacy representation)
+            const substitution = mapping.get(type.name);
+            if (substitution && !type.typeArguments) {
+                return substitution;
+            }
+            // Recurse into type arguments
+            if (type.typeArguments) {
+                return {
+                    ...type,
+                    typeArguments: type.typeArguments.map((arg) => substituteType(arg, mapping)),
+                };
+            }
+            return type;
+        }
+        case "arrayType":
+            return {
+                ...type,
+                elementType: substituteType(type.elementType, mapping),
+            };
+        case "dictionaryType":
+            return {
+                ...type,
+                keyType: substituteType(type.keyType, mapping),
+                valueType: substituteType(type.valueType, mapping),
+            };
+        case "unionType":
+            return {
+                ...type,
+                types: type.types.map((t) => substituteType(t, mapping)),
+            };
+        case "intersectionType":
+            return {
+                ...type,
+                types: type.types.map((t) => substituteType(t, mapping)),
+            };
+        case "functionType":
+            return {
+                ...type,
+                returnType: substituteType(type.returnType, mapping),
+                parameters: type.parameters.map((p) => p.type ? { ...p, type: substituteType(p.type, mapping) } : p),
+            };
+        case "objectType":
+            return {
+                ...type,
+                members: type.members.map((m) => {
+                    if (m.kind === "propertySignature") {
+                        return { ...m, type: substituteType(m.type, mapping) };
+                    }
+                    if (m.kind === "methodSignature") {
+                        return {
+                            ...m,
+                            returnType: m.returnType
+                                ? substituteType(m.returnType, mapping)
+                                : undefined,
+                            parameters: m.parameters.map((p) => p.type ? { ...p, type: substituteType(p.type, mapping) } : p),
+                        };
+                    }
+                    return m;
+                }),
+            };
+        case "primitiveType":
+        case "literalType":
+        case "anyType":
+        case "unknownType":
+        case "voidType":
+        case "neverType":
+            return type;
+        default: {
+            const exhaustive = type;
+            void exhaustive;
+            return type;
+        }
+    }
+};
+/**
+ * Look up property type from a contextual type.
+ *
+ * This handles:
+ * - Local types (class/interface/typeAlias) via localTypes map
+ * - Type alias chasing (follows alias.type until reaching a concrete type)
+ * - Interface extends resolution (searches base interfaces)
+ * - Generic type argument substitution
+ *
+ * @param contextualType - The contextual type (e.g., Result<T>)
+ * @param propertyName - The property name to look up
+ * @param context - Emitter context with localTypes
+ * @returns The property type after substitution, or undefined if not found
+ */
+export const getPropertyType = (contextualType, propertyName, context) => {
+    if (!contextualType || !context.localTypes) {
+        return undefined;
+    }
+    return resolvePropertyType(contextualType, propertyName, context.localTypes, []);
+};
+/**
+ * Internal helper for property type resolution with cycle detection
+ */
+const resolvePropertyType = (type, propertyName, localTypes, visitedTypes) => {
+    // Handle reference types (most common case)
+    if (type.kind === "referenceType") {
+        const typeInfo = localTypes.get(type.name);
+        if (!typeInfo) {
+            // External type - cannot resolve property type
+            return undefined;
+        }
+        // Prevent cycles
+        if (visitedTypes.includes(type.name)) {
+            return undefined;
+        }
+        const newVisited = [...visitedTypes, type.name];
+        // Chase type alias
+        if (typeInfo.kind === "typeAlias") {
+            const substituted = type.typeArguments
+                ? substituteTypeArgs(typeInfo.type, typeInfo.typeParameters, type.typeArguments)
+                : typeInfo.type;
+            return resolvePropertyType(substituted, propertyName, localTypes, newVisited);
+        }
+        // Look up property in interface
+        if (typeInfo.kind === "interface") {
+            // Search own members first
+            const prop = findPropertyInMembers(typeInfo.members, propertyName);
+            if (prop) {
+                return type.typeArguments
+                    ? substituteTypeArgs(prop, typeInfo.typeParameters, type.typeArguments)
+                    : prop;
+            }
+            // Search extended interfaces
+            for (const base of typeInfo.extends) {
+                const baseProp = resolvePropertyType(base, propertyName, localTypes, newVisited);
+                if (baseProp) {
+                    return type.typeArguments
+                        ? substituteTypeArgs(baseProp, typeInfo.typeParameters, type.typeArguments)
+                        : baseProp;
+                }
+            }
+            return undefined;
+        }
+        // Look up property in class
+        if (typeInfo.kind === "class") {
+            const prop = findPropertyInClassMembers(typeInfo.members, propertyName);
+            if (prop) {
+                return type.typeArguments
+                    ? substituteTypeArgs(prop, typeInfo.typeParameters, type.typeArguments)
+                    : prop;
+            }
+            return undefined;
+        }
+        return undefined;
+    }
+    // Handle object types directly
+    if (type.kind === "objectType") {
+        return findPropertyInMembers(type.members, propertyName);
+    }
+    return undefined;
+};
+/**
+ * Find property type in interface members
+ */
+const findPropertyInMembers = (members, propertyName) => {
+    for (const member of members) {
+        if (member.kind === "propertySignature" && member.name === propertyName) {
+            return member.type;
+        }
+    }
+    return undefined;
+};
+/**
+ * Find property type in class members
+ */
+const findPropertyInClassMembers = (members, propertyName) => {
+    for (const member of members) {
+        if (member.kind === "propertyDeclaration" && member.name === propertyName) {
+            return member.type;
+        }
+    }
+    return undefined;
+};
+//# sourceMappingURL=type-resolution.js.map

package/dist/core/type-resolution.js.map

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

package/dist/core/type-resolution.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Tests for type resolution helpers
+ */
+export {};
+//# sourceMappingURL=type-resolution.test.d.ts.map

package/dist/core/type-resolution.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-resolution.test.d.ts","sourceRoot":"","sources":["../../src/core/type-resolution.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/core/type-resolution.test.js

@@ -0,0 +1,271 @@
+/**
+ * Tests for type resolution helpers
+ */
+import { describe, it } from "mocha";
+import { expect } from "chai";
+import { containsTypeParameter, substituteTypeArgs, getPropertyType, } from "./type-resolution.js";
+describe("type-resolution", () => {
+    describe("containsTypeParameter", () => {
+        it("returns true for typeParameterType IR kind", () => {
+            const type = { kind: "typeParameterType", name: "T" };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns true for referenceType matching typeParams set (legacy)", () => {
+            const type = { kind: "referenceType", name: "T" };
+            const typeParams = new Set(["T"]);
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns false for referenceType not in typeParams set", () => {
+            const type = { kind: "referenceType", name: "string" };
+            const typeParams = new Set(["T"]);
+            expect(containsTypeParameter(type, typeParams)).to.be.false;
+        });
+        it("returns true for Array<T> containing type parameter", () => {
+            const type = {
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "typeParameterType", name: "T" }],
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns false for Array<string> (concrete type)", () => {
+            const type = {
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.false;
+        });
+        it("returns true for arrayType with type parameter element", () => {
+            const type = {
+                kind: "arrayType",
+                elementType: { kind: "typeParameterType", name: "T" },
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns true for union type containing type parameter", () => {
+            const type = {
+                kind: "unionType",
+                types: [
+                    { kind: "primitiveType", name: "string" },
+                    { kind: "typeParameterType", name: "T" },
+                ],
+            };
+            const typeParams = new Set();
+            expect(containsTypeParameter(type, typeParams)).to.be.true;
+        });
+        it("returns false for primitive types", () => {
+            const type = { kind: "primitiveType", name: "number" };
+            const typeParams = new Set(["T"]);
+            expect(containsTypeParameter(type, typeParams)).to.be.false;
+        });
+    });
+    describe("substituteTypeArgs", () => {
+        it("substitutes simple type parameter", () => {
+            const type = { kind: "typeParameterType", name: "T" };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "string" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "string" });
+        });
+        it("substitutes type parameter in referenceType (legacy)", () => {
+            const type = { kind: "referenceType", name: "T" };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "number" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "number" });
+        });
+        it("substitutes type argument in generic reference", () => {
+            const type = {
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "typeParameterType", name: "T" }],
+            };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "string" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({
+                kind: "referenceType",
+                name: "Array",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            });
+        });
+        it("substitutes in array element type", () => {
+            const type = {
+                kind: "arrayType",
+                elementType: { kind: "typeParameterType", name: "T" },
+            };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "boolean" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({
+                kind: "arrayType",
+                elementType: { kind: "primitiveType", name: "boolean" },
+            });
+        });
+        it("returns unchanged type when no matching type param", () => {
+            const type = { kind: "referenceType", name: "SomeType" };
+            const typeParamNames = ["T"];
+            const typeArgs = [{ kind: "primitiveType", name: "string" }];
+            const result = substituteTypeArgs(type, typeParamNames, typeArgs);
+            expect(result).to.deep.equal({ kind: "referenceType", name: "SomeType" });
+        });
+    });
+    describe("getPropertyType", () => {
+        const defaultOptions = {
+            rootNamespace: "Test",
+            indent: 4,
+        };
+        const createContext = (localTypes) => ({
+            indentLevel: 0,
+            options: defaultOptions,
+            isStatic: false,
+            isAsync: false,
+            localTypes,
+        });
+        it("returns property type from interface", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "value",
+                    type: { kind: "typeParameterType", name: "T" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "Result",
+                    {
+                        kind: "interface",
+                        typeParameters: ["T"],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "Result",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "value", context);
+            // After substitution, T becomes string
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "string" });
+        });
+        it("returns undefined for unknown property", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "value",
+                    type: { kind: "typeParameterType", name: "T" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "Result",
+                    {
+                        kind: "interface",
+                        typeParameters: ["T"],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "Result",
+                typeArguments: [{ kind: "primitiveType", name: "string" }],
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "unknown", context);
+            expect(result).to.be.undefined;
+        });
+        it("returns undefined for unknown type", () => {
+            const localTypes = new Map();
+            const contextualType = {
+                kind: "referenceType",
+                name: "ExternalType",
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "value", context);
+            expect(result).to.be.undefined;
+        });
+        it("returns unsubstituted type when no type arguments", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "value",
+                    type: { kind: "typeParameterType", name: "T" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "Result",
+                    {
+                        kind: "interface",
+                        typeParameters: ["T"],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "Result",
+                // No typeArguments - using raw generic type
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "value", context);
+            // Returns unsubstituted T
+            expect(result).to.deep.equal({ kind: "typeParameterType", name: "T" });
+        });
+        it("chases type alias", () => {
+            const members = [
+                {
+                    kind: "propertySignature",
+                    name: "data",
+                    type: { kind: "primitiveType", name: "string" },
+                    isOptional: false,
+                    isReadonly: false,
+                },
+            ];
+            const localTypes = new Map([
+                [
+                    "MyAlias",
+                    {
+                        kind: "typeAlias",
+                        typeParameters: [],
+                        type: { kind: "referenceType", name: "Target" },
+                    },
+                ],
+                [
+                    "Target",
+                    {
+                        kind: "interface",
+                        typeParameters: [],
+                        members,
+                        extends: [],
+                    },
+                ],
+            ]);
+            const contextualType = {
+                kind: "referenceType",
+                name: "MyAlias",
+            };
+            const context = createContext(localTypes);
+            const result = getPropertyType(contextualType, "data", context);
+            expect(result).to.deep.equal({ kind: "primitiveType", name: "string" });
+        });
+    });
+});
+//# sourceMappingURL=type-resolution.test.js.map

package/dist/core/type-resolution.test.js.map

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

package/dist/emitter-types/context.d.ts

@@ -26,4 +26,33 @@ export declare const withAsync: (context: EmitterContext, isAsync: boolean) => E
  * Set current class name in context
  */
 export declare const withClassName: (context: EmitterContext, className: string) => EmitterContext;
+/**
+ * Scoped fields that should be restored after emission.
+ * These fields define lexical scopes and should not leak to parent scopes.
+ */
+type ScopedFields = Pick<EmitterContext, "typeParameters" | "returnType">;
+/**
+ * Execute an emission function with scoped context fields.
+ *
+ * This helper ensures that scoped fields (typeParameters, returnType) are
+ * restored after emission, preventing scope leaks when context is threaded
+ * upward via [result, newContext] tuples.
+ *
+ * Other context mutations (intLoopVars, importBindings, etc.) are preserved
+ * and bubbled up correctly.
+ *
+ * @example
+ * ```typescript
+ * const [result, finalCtx] = withScoped(
+ *   context,
+ *   {
+ *     typeParameters: new Set([...context.typeParameters ?? [], "T"]),
+ *     returnType: stmt.returnType
+ *   },
+ *   (scopedCtx) => emitFunctionBody(stmt.body, scopedCtx)
+ * );
+ * ```
+ */
+export declare const withScoped: <T>(context: EmitterContext, scopedPatch: Partial<ScopedFields>, emit: (ctx: EmitterContext) => [T, EmitterContext]) => [T, EmitterContext];
+export {};
 //# sourceMappingURL=context.d.ts.map

package/dist/emitter-types/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/emitter-types/context.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAM3D;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,cAAc,KAAG,cA4BvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU,GACrB,SAAS,cAAc,EACvB,UAAU,OAAO,KAChB,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,SAAS,cAAc,EACvB,SAAS,OAAO,KACf,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,SAAS,cAAc,EACvB,WAAW,MAAM,KAChB,cAGD,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/emitter-types/context.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAM3D;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,cAAc,KAAG,cA4BvD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,SAAS,cAAc,KAAG,cAG/C,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU,GACrB,SAAS,cAAc,EACvB,UAAU,OAAO,KAChB,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,SAAS,cAAc,EACvB,SAAS,OAAO,KACf,cAGD,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,aAAa,GACxB,SAAS,cAAc,EACvB,WAAW,MAAM,KAChB,cAGD,CAAC;AAEH;;;GAGG;AACH,KAAK,YAAY,GAAG,IAAI,CAAC,cAAc,EAAE,gBAAgB,GAAG,YAAY,CAAC,CAAC;AAE1E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,UAAU,GAAI,CAAC,EAC1B,SAAS,cAAc,EACvB,aAAa,OAAO,CAAC,YAAY,CAAC,EAClC,MAAM,CAAC,GAAG,EAAE,cAAc,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,KACjD,CAAC,CAAC,EAAE,cAAc,CAoBpB,CAAC"}