@tsonic/emitter 0.0.74 → 0.0.75

package/dist/expressions/identifiers.js

@@ -4,16 +4,32 @@
 import { emitTypeAst } from "../type-emitter.js";
 import { escapeCSharpIdentifier } from "../emitter-types/index.js";
 import { identifierExpression } from "../core/format/backend-ast/builders.js";
-import { stableIdentifierSuffixFromTypeAst } from "../core/format/backend-ast/utils.js";
+import { normalizeClrQualifiedName, stableIdentifierSuffixFromTypeAst, } from "../core/format/backend-ast/utils.js";
+import { emitTypedDefaultAst } from "../core/semantic/defaults.js";
+import { buildRuntimeSubsetExpressionAst, tryEmitExactStorageCompatibleNarrowedIdentifier, isBroadStorageTarget, tryEmitCollapsedStorageIdentifier, tryEmitImplicitNarrowedStorageIdentifier, tryEmitImplicitRuntimeSubsetStorageIdentifier, tryEmitMaterializedNarrowedIdentifier, matchesEmittedStorageSurface, tryEmitReifiedStorageIdentifier, tryEmitStorageCompatibleIdentifier, tryEmitStorageCompatibleNarrowedIdentifier, } from "./identifier-storage.js";
+import { matchesExpectedEmissionType } from "../core/semantic/expected-type-matching.js";
+import { stripNullish } from "../core/semantic/type-resolution.js";
+import { willCarryAsRuntimeUnion } from "../core/semantic/union-semantics.js";
+import { isExpectedIntegralIrType, maybeCastNumericToExpectedIntegralAst, } from "./post-emission-adaptation.js";
 /**
  * Emit an identifier as CSharpExpressionAst
  */
 export const emitIdentifier = (expr, context, expectedType) => {
+    const maybeWrapLocalIntegralCast = (identifierAst, currentContext) => {
+        if (!expectedType ||
+            !isExpectedIntegralIrType(expectedType, currentContext)) {
+            return [identifierAst, currentContext];
+        }
+        const storageType = currentContext.localValueTypes?.get(expr.name);
+        if (!storageType) {
+            return [identifierAst, currentContext];
+        }
+        return maybeCastNumericToExpectedIntegralAst(identifierAst, storageType, currentContext, expectedType);
+    };
     // Special case for undefined -> default
     if (expr.name === "undefined") {
-        if (expectedType?.kind === "typeParameterType" ||
-            (expectedType?.kind === "primitiveType" &&
-                expectedType.name === "undefined")) {
+        if (expectedType?.kind === "primitiveType" &&
+            expectedType.name === "undefined") {
             return [
                 {
                     kind: "defaultExpression",
@@ -22,6 +38,10 @@ export const emitIdentifier = (expr, context, expectedType) => {
                 context,
             ];
         }
+        if (expectedType) {
+            const [typeAst, nextContext] = emitTypedDefaultAst(expectedType, context);
+            return [{ kind: "defaultExpression", type: typeAst }, nextContext];
+        }
         return [{ kind: "defaultExpression" }, context];
     }
     // TypeScript `super` maps to C# `base` for member access/calls.
@@ -42,16 +62,107 @@ export const emitIdentifier = (expr, context, expectedType) => {
                 ];
             }
             else if (narrowed.kind === "expr") {
-                // kind === "expr" - emit pre-built AST (e.g., parenthesized AsN() call)
+                const exactStorageCompatible = tryEmitExactStorageCompatibleNarrowedIdentifier(expr, narrowed, context, expectedType);
+                if (exactStorageCompatible) {
+                    return exactStorageCompatible;
+                }
+                const storageCompatible = tryEmitStorageCompatibleNarrowedIdentifier(expr, narrowed, context, expectedType);
+                if (storageCompatible &&
+                    expectedType &&
+                    isBroadStorageTarget(expectedType, context)) {
+                    return storageCompatible;
+                }
+                const materializedNarrowed = tryEmitMaterializedNarrowedIdentifier(narrowed, context, expectedType);
+                if (materializedNarrowed) {
+                    return materializedNarrowed;
+                }
+                if (storageCompatible) {
+                    return storageCompatible;
+                }
+                const implicitStorage = tryEmitImplicitNarrowedStorageIdentifier(expr, narrowed, context);
+                if (implicitStorage) {
+                    return implicitStorage;
+                }
                 return [narrowed.exprAst, context];
             }
+            else if (narrowed.kind === "runtimeSubset") {
+                const storageCompatibleExpected = expectedType
+                    ? tryEmitStorageCompatibleIdentifier(expr, context, expectedType)
+                    : undefined;
+                if (storageCompatibleExpected && expectedType) {
+                    return [storageCompatibleExpected, context];
+                }
+                const [sameSourceCarrierSurface, sourceCarrierContext] = expectedType && narrowed.sourceType
+                    ? matchesEmittedStorageSurface(stripNullish(narrowed.sourceType), expectedType, context)
+                    : [false, context];
+                const canReuseOriginalCarrierForExpectedTarget = !!expectedType &&
+                    !!narrowed.sourceType &&
+                    (sameSourceCarrierSurface ||
+                        (isBroadStorageTarget(expectedType, context) &&
+                            matchesExpectedEmissionType(stripNullish(narrowed.sourceType), expectedType, context)));
+                if (canReuseOriginalCarrierForExpectedTarget) {
+                    const originalCarrier = narrowed.storageExprAst ??
+                        identifierExpression(context.localNameMap?.get(expr.name) ??
+                            escapeCSharpIdentifier(expr.name));
+                    return [originalCarrier, sourceCarrierContext];
+                }
+                const shouldPreferNarrowedSubsetTarget = !!narrowed.type &&
+                    !!expectedType &&
+                    (isBroadStorageTarget(expectedType, context) ||
+                        (willCarryAsRuntimeUnion(expectedType, context) &&
+                            !willCarryAsRuntimeUnion(narrowed.type, context) &&
+                            matchesExpectedEmissionType(narrowed.type, expectedType, context)));
+                const preferredSubsetTargetType = shouldPreferNarrowedSubsetTarget
+                    ? narrowed.type
+                    : expectedType;
+                const expectedSubset = expectedType
+                    ? buildRuntimeSubsetExpressionAst(expr, narrowed, context, preferredSubsetTargetType)
+                    : undefined;
+                if (expectedSubset) {
+                    return expectedSubset;
+                }
+                const implicitStorage = tryEmitImplicitRuntimeSubsetStorageIdentifier(expr, narrowed, context);
+                if (implicitStorage) {
+                    return implicitStorage;
+                }
+                // Storage-compatible shortcut is intentionally skipped here.
+                // When a runtimeSubset binding is active, the variable has been
+                // narrowed to a semantic subset (e.g., PathSpec slots within a
+                // 5-member carrier). The raw storage identifier carries the full
+                // carrier, not the subset. Using it would lose the narrowing and
+                // cause incorrect carrier-shape adaptation downstream.
+                const subsetAst = buildRuntimeSubsetExpressionAst(expr, narrowed, context);
+                if (subsetAst) {
+                    return subsetAst;
+                }
+            }
             return [identifierExpression(escapeCSharpIdentifier(expr.name)), context];
         }
     }
+    const contextualReturnStorageFallback = expectedType === undefined && context.returnType
+        ? tryEmitStorageCompatibleIdentifier(expr, context, context.returnType)
+        : undefined;
+    if (contextualReturnStorageFallback) {
+        return [contextualReturnStorageFallback, context];
+    }
+    const storageFallback = tryEmitStorageCompatibleIdentifier(expr, context, expectedType);
+    if (storageFallback) {
+        return [storageFallback, context];
+    }
     // Lexical remap for locals/parameters (prevents C# CS0136 shadowing errors).
+    const reifiedStorage = tryEmitReifiedStorageIdentifier(expr, context, expectedType);
+    if (reifiedStorage) {
+        return reifiedStorage;
+    }
+    const collapsedStorage = expectedType === undefined
+        ? tryEmitCollapsedStorageIdentifier(expr, context)
+        : undefined;
+    if (collapsedStorage) {
+        return collapsedStorage;
+    }
     const remappedLocal = context.localNameMap?.get(expr.name);
     if (remappedLocal) {
-        return [identifierExpression(remappedLocal), context];
+        return maybeWrapLocalIntegralCast(identifierExpression(remappedLocal), context);
     }
     // Check if this identifier is from an import
     if (context.importBindings) {
@@ -85,8 +196,12 @@ export const emitIdentifier = (expr, context, expectedType) => {
         const memberName = escapeCSharpIdentifier(valueSymbol.csharpName);
         if (context.moduleStaticClassName &&
             context.className !== context.moduleStaticClassName) {
+            const moduleNamespace = context.moduleNamespace ?? context.options.rootNamespace;
+            const containerPrefix = moduleNamespace.startsWith("global::")
+                ? moduleNamespace
+                : `global::${moduleNamespace}`;
             return [
-                identifierExpression(`${context.moduleStaticClassName}.${memberName}`),
+                identifierExpression(`${containerPrefix}.${context.moduleStaticClassName}.${memberName}`),
                 context,
             ];
         }
@@ -97,14 +212,14 @@ export const emitIdentifier = (expr, context, expectedType) => {
         const fqn = `global::${expr.resolvedAssembly}.${expr.csharpName}`;
         return [identifierExpression(fqn), context];
     }
-    // Use resolved binding if available (from binding manifest) with global:: prefix
-    // resolvedClrType is already the full CLR type name, just add global::
+    // Use resolved binding if available (from binding manifest) with global:: prefix.
+    // Normalize nested CLR type syntax (Outer+Inner`1) before emitting.
     if (expr.resolvedClrType) {
-        const fqn = `global::${expr.resolvedClrType}`;
+        const fqn = normalizeClrQualifiedName(expr.resolvedClrType, true);
         return [identifierExpression(fqn), context];
     }
     // Fallback: use identifier as-is (escape C# keywords)
-    return [identifierExpression(escapeCSharpIdentifier(expr.name)), context];
+    return maybeWrapLocalIntegralCast(identifierExpression(escapeCSharpIdentifier(expr.name)), context);
 };
 /**
  * Emit type arguments as CSharpTypeAst[]

package/dist/expressions/identifiers.js.map

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

package/dist/expressions/index-cases/alias-carrier-widening.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=alias-carrier-widening.test.d.ts.map

package/dist/expressions/index-cases/alias-carrier-widening.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"alias-carrier-widening.test.d.ts","sourceRoot":"","sources":["../../../src/expressions/index-cases/alias-carrier-widening.test.ts"],"names":[],"mappings":""}

package/dist/expressions/index-cases/alias-carrier-widening.test.js

@@ -0,0 +1,347 @@
+import { describe, it, expect, emitExpressionAst, printExpression, } from "./helpers.js";
+import { normalizeRuntimeUnionCarrierNames } from "../../runtime-union-cases/helpers.js";
+const jsValueType = {
+    kind: "referenceType",
+    name: "JsValue",
+    resolvedClrType: "Tsonic.Runtime.JsValue",
+};
+describe("Expression Emission", () => {
+    it("widens alias-subset carrier to broader carrier with correct Match slot mapping", () => {
+        // Simulates the overload forwarding case:
+        // - first has actual type PathSpec (3-member carrier: object?[], string, RegExp)
+        // - expected type is PathSpec | MiddlewareLike (5-member carrier)
+        // The Match() projection must map actual members to the correct expected slots
+        // without type mismatches like object→string or string→RegExp.
+        const pathSpecType = {
+            kind: "unionType",
+            types: [
+                {
+                    kind: "arrayType",
+                    elementType: jsValueType,
+                    origin: "explicit",
+                },
+                { kind: "primitiveType", name: "string" },
+                {
+                    kind: "referenceType",
+                    name: "RegExp",
+                    resolvedClrType: "global::js.RegExp",
+                },
+            ],
+        };
+        const requestHandlerType = {
+            kind: "functionType",
+            parameters: [
+                {
+                    kind: "parameter",
+                    pattern: { kind: "identifierPattern", name: "req" },
+                    type: {
+                        kind: "referenceType",
+                        name: "Request",
+                        resolvedClrType: "Test.Request",
+                    },
+                    initializer: undefined,
+                    isOptional: false,
+                    isRest: false,
+                    passing: "value",
+                },
+            ],
+            returnType: jsValueType,
+        };
+        const routerType = {
+            kind: "referenceType",
+            name: "Router",
+            resolvedClrType: "Test.Router",
+        };
+        const broadType = {
+            kind: "unionType",
+            types: [...pathSpecType.types, requestHandlerType, routerType],
+        };
+        const [result] = emitExpressionAst({
+            kind: "identifier",
+            name: "first",
+            inferredType: pathSpecType,
+        }, {
+            indentLevel: 0,
+            options: {
+                rootNamespace: "Test",
+                surface: "@tsonic/js",
+                indent: 4,
+            },
+            isStatic: false,
+            isAsync: false,
+            usings: new Set(),
+        }, broadType);
+        const rendered = normalizeRuntimeUnionCarrierNames(printExpression(result));
+        // The projection must not produce type mismatches.
+        // Each From() call must receive the correct type from the corresponding
+        // Match lambda parameter.
+        if (rendered.includes(".Match")) {
+            // If Match is used, verify no object→string or string→RegExp misrouting.
+            // The actual carrier members (object?[], string, RegExp) should map
+            // to the matching expected carrier slots.
+            expect(rendered).to.not.include("(object)__tsonic_union_member");
+        }
+    });
+    it("widens alias reference to broader union carrier correctly under module-aware context", () => {
+        // The real failing case: PathSpec is a reference type that resolves to a
+        // union alias via moduleMap. When adapting first:PathSpec to the broader
+        // first:PathSpec|MiddlewareLike carrier, the adaptation must produce
+        // correct Match() slot mapping even when the alias expansion happens
+        // through moduleMap rather than inline union structure.
+        //
+        // This exercises the code path in maybeWidenRuntimeUnionExpressionAst
+        // where actual and expected layouts are built from types whose expansion
+        // depends on module-aware alias resolution.
+        const requestHandlerType = {
+            kind: "functionType",
+            parameters: [
+                {
+                    kind: "parameter",
+                    pattern: { kind: "identifierPattern", name: "req" },
+                    type: {
+                        kind: "referenceType",
+                        name: "Request",
+                        resolvedClrType: "Test.Request",
+                    },
+                    initializer: undefined,
+                    isOptional: false,
+                    isRest: false,
+                    passing: "value",
+                },
+            ],
+            returnType: jsValueType,
+        };
+        const routerType = {
+            kind: "referenceType",
+            name: "Router",
+            resolvedClrType: "Test.Router",
+        };
+        // PathSpec underlying: string | RegExp | readonly PathSpec[]
+        const pathSpecUnderlying = {
+            kind: "unionType",
+            types: [
+                { kind: "primitiveType", name: "string" },
+                {
+                    kind: "referenceType",
+                    name: "RegExp",
+                    resolvedClrType: "global::js.RegExp",
+                },
+                {
+                    kind: "arrayType",
+                    elementType: { kind: "referenceType", name: "PathSpec" },
+                    origin: "explicit",
+                },
+            ],
+        };
+        // MiddlewareLike underlying: RequestHandler | Router | readonly MiddlewareLike[]
+        const middlewareLikeUnderlying = {
+            kind: "unionType",
+            types: [
+                requestHandlerType,
+                routerType,
+                {
+                    kind: "arrayType",
+                    elementType: { kind: "referenceType", name: "MiddlewareLike" },
+                    origin: "explicit",
+                },
+            ],
+        };
+        // Module that defines PathSpec and MiddlewareLike
+        const typesModuleLocalTypes = new Map([
+            [
+                "PathSpec",
+                { kind: "typeAlias", typeParameters: [], type: pathSpecUnderlying },
+            ],
+            [
+                "MiddlewareLike",
+                {
+                    kind: "typeAlias",
+                    typeParameters: [],
+                    type: middlewareLikeUnderlying,
+                },
+            ],
+        ]);
+        const moduleMap = new Map([
+            [
+                "src/types.ts",
+                {
+                    namespace: "Test",
+                    className: "types",
+                    filePath: "src/types.ts",
+                    hasRuntimeContainer: false,
+                    hasTypeCollision: false,
+                    exportedValueKinds: undefined,
+                    localTypes: typesModuleLocalTypes,
+                },
+            ],
+        ]);
+        // PathSpec and MiddlewareLike as reference types (as they appear in
+        // cross-module usage, NOT as inline unions)
+        const pathSpecRef = {
+            kind: "referenceType",
+            name: "PathSpec",
+        };
+        const middlewareLikeRef = {
+            kind: "referenceType",
+            name: "MiddlewareLike",
+        };
+        // Actual type: PathSpec (a reference to the alias)
+        // Expected type: PathSpec | MiddlewareLike (explicit union of references)
+        const expectedType = {
+            kind: "unionType",
+            types: [pathSpecRef, middlewareLikeRef],
+        };
+        const [result] = emitExpressionAst({
+            kind: "identifier",
+            name: "first",
+            inferredType: pathSpecRef,
+        }, {
+            indentLevel: 0,
+            options: {
+                rootNamespace: "Test",
+                surface: "@tsonic/js",
+                indent: 4,
+                moduleMap: moduleMap,
+            },
+            isStatic: false,
+            isAsync: false,
+            usings: new Set(),
+        }, expectedType);
+        const rendered = printExpression(result);
+        // The adaptation must not produce type mismatches.
+        // Incorrect behavior: object→string or string→RegExp in Match() lambdas.
+        // Correct behavior: each actual carrier member maps to the matching
+        // expected carrier slot without type coercion errors.
+        if (rendered.includes(".Match")) {
+            // Verify no wrong-slot routing that would cause C# compile errors
+            expect(rendered).to.not.include("new global::System.InvalidCastException");
+        }
+        // The result must not contain nested Union<Union<...>> shapes.
+        // (Match Union<A>.From(Union<B>) is NOT nested — it's sibling factory calls.)
+        expect(rendered).to.not.include("Union<global::Tsonic.Internal.Union<");
+    });
+    it("does not re-wrap alias narrowing assertions that already materialize the target carrier", () => {
+        const requestHandlerType = {
+            kind: "functionType",
+            parameters: [
+                {
+                    kind: "parameter",
+                    pattern: { kind: "identifierPattern", name: "req" },
+                    type: {
+                        kind: "referenceType",
+                        name: "Request",
+                        resolvedClrType: "Test.Request",
+                    },
+                    initializer: undefined,
+                    isOptional: false,
+                    isRest: false,
+                    passing: "value",
+                },
+            ],
+            returnType: jsValueType,
+        };
+        const routerType = {
+            kind: "referenceType",
+            name: "Router",
+            resolvedClrType: "Test.Router",
+        };
+        const pathSpecUnderlying = {
+            kind: "unionType",
+            types: [
+                { kind: "primitiveType", name: "string" },
+                {
+                    kind: "referenceType",
+                    name: "RegExp",
+                    resolvedClrType: "global::js.RegExp",
+                },
+                {
+                    kind: "arrayType",
+                    elementType: { kind: "referenceType", name: "PathSpec" },
+                    origin: "explicit",
+                },
+            ],
+        };
+        const middlewareLikeUnderlying = {
+            kind: "unionType",
+            types: [
+                requestHandlerType,
+                routerType,
+                {
+                    kind: "arrayType",
+                    elementType: { kind: "referenceType", name: "MiddlewareLike" },
+                    origin: "explicit",
+                },
+            ],
+        };
+        const typesModuleLocalTypes = new Map([
+            [
+                "PathSpec",
+                {
+                    kind: "typeAlias",
+                    typeParameters: [],
+                    type: pathSpecUnderlying,
+                },
+            ],
+            [
+                "MiddlewareLike",
+                {
+                    kind: "typeAlias",
+                    typeParameters: [],
+                    type: middlewareLikeUnderlying,
+                },
+            ],
+        ]);
+        const moduleMap = new Map([
+            [
+                "src/types.ts",
+                {
+                    namespace: "Test",
+                    className: "types",
+                    filePath: "src/types.ts",
+                    hasRuntimeContainer: false,
+                    hasTypeCollision: false,
+                    exportedValueKinds: undefined,
+                    localTypes: typesModuleLocalTypes,
+                },
+            ],
+        ]);
+        const pathSpecRef = {
+            kind: "referenceType",
+            name: "PathSpec",
+        };
+        const middlewareLikeRef = {
+            kind: "referenceType",
+            name: "MiddlewareLike",
+        };
+        const broadType = {
+            kind: "unionType",
+            types: [pathSpecRef, middlewareLikeRef],
+        };
+        const [result] = emitExpressionAst({
+            kind: "typeAssertion",
+            expression: {
+                kind: "identifier",
+                name: "first",
+                inferredType: broadType,
+            },
+            targetType: middlewareLikeRef,
+            inferredType: middlewareLikeRef,
+        }, {
+            indentLevel: 0,
+            options: {
+                rootNamespace: "Test",
+                surface: "@tsonic/js",
+                indent: 4,
+                moduleMap: moduleMap,
+            },
+            isStatic: false,
+            isAsync: false,
+            usings: new Set(),
+        }, middlewareLikeRef);
+        const rendered = printExpression(result);
+        const matchCount = rendered.match(/\.Match(?:<|\()/g)?.length ?? 0;
+        expect(matchCount).to.equal(1);
+        expect(rendered).to.not.include(")).Match");
+    });
+});
+//# sourceMappingURL=alias-carrier-widening.test.js.map

package/dist/expressions/index-cases/alias-carrier-widening.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"alias-carrier-widening.test.js","sourceRoot":"","sources":["../../../src/expressions/index-cases/alias-carrier-widening.test.ts"],"names":[],"mappings":"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"}

package/dist/expressions/index-cases/array-wrapper-recursion-b.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=array-wrapper-recursion-b.test.d.ts.map

package/dist/expressions/index-cases/array-wrapper-recursion-b.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"array-wrapper-recursion-b.test.d.ts","sourceRoot":"","sources":["../../../src/expressions/index-cases/array-wrapper-recursion-b.test.ts"],"names":[],"mappings":""}