@tsonic/emitter 0.0.77 → 0.0.78

package/dist/expressions/architecture-invariants.test.js

@@ -87,5 +87,99 @@ describe("expression architecture invariants", () => {
         }
         expect(hits).to.deep.equal([]);
     });
+    it("keeps JS surface member behavior metadata-backed", () => {
+        const hits = [];
+        for (const file of walkTsFiles(emitterRoot)) {
+            if (file.endsWith(".test.ts"))
+                continue;
+            const relativeFile = relative(emitterRoot, file);
+            const text = readFileSync(file, "utf8");
+            if (text.includes("js-array-surface-members") ||
+                text.includes("JS_ARRAY_MUTATING_METHODS") ||
+                text.includes("JS_ARRAY_RETURNING_METHODS") ||
+                text.includes("isLengthPropertyName")) {
+                hits.push(relativeFile);
+            }
+        }
+        expect(hits).to.deep.equal([]);
+    });
+    it("does not synthesize string length access from receiver type names", () => {
+        const hits = [];
+        for (const file of walkTsFiles(emitterRoot)) {
+            if (file.endsWith(".test.ts"))
+                continue;
+            const relativeFile = relative(emitterRoot, file);
+            const text = readFileSync(file, "utf8");
+            if (text.includes("isStringReceiverType")) {
+                hits.push(`${relativeFile}:isStringReceiverType`);
+            }
+        }
+        expect(hits).to.deep.equal([]);
+    });
+    it("centralizes typeof comparison extraction", () => {
+        const allowedFiles = new Set([
+            "core/semantic/typeof-comparison.ts",
+            "expressions/operators/unary-emitter.ts",
+        ]);
+        const hits = [];
+        for (const file of walkTsFiles(emitterRoot)) {
+            if (file.endsWith(".test.ts"))
+                continue;
+            const relativeFile = relative(emitterRoot, file).replace(/\\/g, "/");
+            if (allowedFiles.has(relativeFile))
+                continue;
+            const text = readFileSync(file, "utf8");
+            if (text.includes('operator !== "typeof"') ||
+                text.includes('operator === "typeof"')) {
+                hits.push(relativeFile);
+            }
+        }
+        expect(hits).to.deep.equal([]);
+    });
+    it("keeps runtime-storage normalization behind semantic storage helpers", () => {
+        const allowedFiles = new Set([
+            "core/format/local-names.ts",
+            "core/semantic/broad-array-storage.ts",
+            "core/semantic/direct-storage-ir-types.ts",
+            "core/semantic/storage-types.ts",
+            "core/semantic/symbol-types.ts",
+            "core/semantic/variable-type-resolution.ts",
+        ]);
+        const hits = [];
+        for (const file of walkTsFiles(emitterRoot)) {
+            if (file.endsWith(".test.ts"))
+                continue;
+            const relativeFile = relative(emitterRoot, file).replace(/\\/g, "/");
+            if (allowedFiles.has(relativeFile))
+                continue;
+            const text = readFileSync(file, "utf8");
+            if (text.includes("normalizeRuntimeStorageType(")) {
+                hits.push(relativeFile);
+            }
+        }
+        expect(hits).to.deep.equal([]);
+    });
+    it("keeps identifier storage orchestration as a facade over named strategies", () => {
+        const facade = readFileSync(join(expressionsRoot, "identifier-storage.ts"), "utf8");
+        const strategyRoot = join(expressionsRoot, "identifier-storage");
+        const strategyFiles = walkTsFiles(strategyRoot)
+            .map((file) => relative(strategyRoot, file).replace(/\\/g, "/"))
+            .filter((file) => file !== "storage-surface.ts")
+            .sort();
+        expect(strategyFiles).to.include.members([
+            "broad-storage-target.ts",
+            "implicit-storage.ts",
+            "materialized-narrowed.ts",
+            "narrowed-storage-compatible.ts",
+            "reified-storage.ts",
+            "runtime-subset.ts",
+            "storage-compatible.ts",
+            "storage-surface-match.ts",
+        ]);
+        expect(facade).to.include('from "./identifier-storage/storage-surface.js"');
+        expect(facade).to.not.include("normalizeRuntimeStorageType(");
+        const oversizedStrategies = strategyFiles.filter((file) => readFileSync(join(strategyRoot, file), "utf8").split("\n").length > 360);
+        expect(oversizedStrategies).to.deep.equal([]);
+    });
 });
 //# sourceMappingURL=architecture-invariants.test.js.map

package/dist/expressions/architecture-invariants.test.js.map

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

package/dist/expressions/awaitable-adaptation.d.ts

@@ -0,0 +1,15 @@
+import { type IrType } from "@tsonic/frontend";
+import type { EmitterContext } from "../types.js";
+import type { CSharpExpressionAst, CSharpTypeAst } from "../core/format/backend-ast/types.js";
+type AwaitedValueAdapter = (ast: CSharpExpressionAst, actualType: IrType | undefined, context: EmitterContext, expectedType: IrType | undefined, visited?: ReadonlySet<string>) => [CSharpExpressionAst, EmitterContext] | undefined;
+export declare const tryAdaptAwaitableValueAst: (opts: {
+    readonly ast: CSharpExpressionAst;
+    readonly actualType: IrType;
+    readonly expectedType: IrType;
+    readonly context: EmitterContext;
+    readonly expectedTypeAst?: CSharpTypeAst;
+    readonly visited?: ReadonlySet<string>;
+    readonly adaptAwaitedValueAst?: AwaitedValueAdapter;
+}) => [CSharpExpressionAst, EmitterContext] | undefined;
+export {};
+//# sourceMappingURL=awaitable-adaptation.d.ts.map

package/dist/expressions/awaitable-adaptation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"awaitable-adaptation.d.ts","sourceRoot":"","sources":["../../src/expressions/awaitable-adaptation.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EACV,mBAAmB,EAEnB,aAAa,EACd,MAAM,qCAAqC,CAAC;AAsB7C,KAAK,mBAAmB,GAAG,CACzB,GAAG,EAAE,mBAAmB,EACxB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,KAC1B,CAAC,mBAAmB,EAAE,cAAc,CAAC,GAAG,SAAS,CAAC;AAsDvD,eAAO,MAAM,yBAAyB,GAAI,MAAM;IAC9C,QAAQ,CAAC,GAAG,EAAE,mBAAmB,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,CAAC;IACzC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,mBAAmB,CAAC;CACrD,KAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,GAAG,SA2L3C,CAAC"}

package/dist/expressions/awaitable-adaptation.js

@@ -0,0 +1,174 @@
+import { getAwaitedIrType, isAwaitableIrType, } from "@tsonic/frontend";
+import { emitTypeAst } from "../type-emitter.js";
+import { identifierExpression, nullLiteral, } from "../core/format/backend-ast/builders.js";
+import { sameTypeAstSurface, stripNullableTypeAst, } from "../core/format/backend-ast/utils.js";
+import { allocateLocalName } from "../core/format/local-names.js";
+import { resolveTypeAlias, splitRuntimeNullishUnionMembers, stripNullish, } from "../core/semantic/type-resolution.js";
+import { matchesExpectedEmissionType } from "../core/semantic/expected-type-matching.js";
+import { buildTaskRunInvocation, buildTaskTypeAst, isTaskTypeAst, } from "./calls/call-promise-task-types.js";
+const isVoidType = (type) => stripNullish(type).kind === "voidType";
+const getSingleAwaitableRuntimeType = (type, context) => {
+    const resolvedType = resolveTypeAlias(type, context);
+    const nullish = splitRuntimeNullishUnionMembers(resolvedType);
+    const nonNullishMembers = nullish
+        ? nullish.nonNullishMembers
+        : [stripNullish(resolvedType)];
+    if (nonNullishMembers.length !== 1) {
+        return undefined;
+    }
+    const [candidate] = nonNullishMembers;
+    if (!candidate) {
+        return undefined;
+    }
+    const awaitableType = resolveTypeAlias(stripNullish(candidate), context);
+    if (!isAwaitableIrType(awaitableType)) {
+        return undefined;
+    }
+    return {
+        awaitableType,
+        hasRuntimeNullish: nullish?.hasRuntimeNullish ?? false,
+    };
+};
+const buildNullSourceReturnStatement = (expectedAwaitedTypeAst) => expectedAwaitedTypeAst
+    ? {
+        kind: "returnStatement",
+        expression: {
+            kind: "defaultExpression",
+            type: expectedAwaitedTypeAst,
+        },
+    }
+    : {
+        kind: "returnStatement",
+    };
+export const tryAdaptAwaitableValueAst = (opts) => {
+    const { ast, actualType, expectedType, expectedTypeAst, context, visited, adaptAwaitedValueAst, } = opts;
+    let currentContext = context;
+    let emittedExpectedType = expectedTypeAst;
+    if (!emittedExpectedType) {
+        [emittedExpectedType, currentContext] = emitTypeAst(expectedType, currentContext);
+    }
+    if (!isTaskTypeAst(stripNullableTypeAst(emittedExpectedType))) {
+        return undefined;
+    }
+    const expectedAwaitableSource = getSingleAwaitableRuntimeType(expectedType, currentContext);
+    const actualAwaitableSource = getSingleAwaitableRuntimeType(actualType, currentContext);
+    if (!expectedAwaitableSource || !actualAwaitableSource) {
+        return undefined;
+    }
+    const emittedActualType = (() => {
+        try {
+            return emitTypeAst(actualType, currentContext)[0];
+        }
+        catch {
+            return undefined;
+        }
+    })();
+    if (emittedActualType &&
+        sameTypeAstSurface(stripNullableTypeAst(emittedActualType), stripNullableTypeAst(emittedExpectedType))) {
+        return undefined;
+    }
+    const actualAwaitedType = getAwaitedIrType(actualAwaitableSource.awaitableType) ?? { kind: "voidType" };
+    const expectedAwaitedType = getAwaitedIrType(expectedAwaitableSource.awaitableType) ?? { kind: "voidType" };
+    const actualAwaitedIsVoid = isVoidType(actualAwaitedType);
+    const expectedAwaitedIsVoid = isVoidType(expectedAwaitedType);
+    let expectedAwaitedTypeAst;
+    if (!expectedAwaitedIsVoid) {
+        [expectedAwaitedTypeAst, currentContext] = emitTypeAst(expectedAwaitedType, currentContext);
+    }
+    const statements = [];
+    let awaitedSourceAst = ast;
+    if (actualAwaitableSource.hasRuntimeNullish) {
+        const sourceTemp = allocateLocalName("__tsonic_await_task", currentContext);
+        currentContext = sourceTemp.context;
+        awaitedSourceAst = identifierExpression(sourceTemp.emittedName);
+        statements.push({
+            kind: "localDeclarationStatement",
+            modifiers: [],
+            type: { kind: "varType" },
+            declarators: [
+                {
+                    name: sourceTemp.emittedName,
+                    initializer: ast,
+                },
+            ],
+        }, {
+            kind: "ifStatement",
+            condition: {
+                kind: "binaryExpression",
+                operatorToken: "==",
+                left: awaitedSourceAst,
+                right: nullLiteral(),
+            },
+            thenStatement: {
+                kind: "blockStatement",
+                statements: [buildNullSourceReturnStatement(expectedAwaitedTypeAst)],
+            },
+        });
+    }
+    if (expectedAwaitedIsVoid) {
+        statements.push({
+            kind: "expressionStatement",
+            expression: {
+                kind: "awaitExpression",
+                expression: awaitedSourceAst,
+            },
+        });
+    }
+    else if (actualAwaitedIsVoid) {
+        if (!expectedAwaitedTypeAst) {
+            return undefined;
+        }
+        statements.push({
+            kind: "expressionStatement",
+            expression: {
+                kind: "awaitExpression",
+                expression: awaitedSourceAst,
+            },
+        }, {
+            kind: "returnStatement",
+            expression: {
+                kind: "defaultExpression",
+                type: expectedAwaitedTypeAst,
+            },
+        });
+    }
+    else {
+        const valueTemp = allocateLocalName("__tsonic_await_value", currentContext);
+        currentContext = valueTemp.context;
+        const valueAst = identifierExpression(valueTemp.emittedName);
+        statements.push({
+            kind: "localDeclarationStatement",
+            modifiers: [],
+            type: { kind: "varType" },
+            declarators: [
+                {
+                    name: valueTemp.emittedName,
+                    initializer: {
+                        kind: "awaitExpression",
+                        expression: awaitedSourceAst,
+                    },
+                },
+            ],
+        });
+        const adaptedAwaitedValue = adaptAwaitedValueAst?.(valueAst, actualAwaitedType, currentContext, expectedAwaitedType, visited) ??
+            (matchesExpectedEmissionType(actualAwaitedType, expectedAwaitedType, currentContext)
+                ? [valueAst, currentContext]
+                : undefined);
+        if (!adaptedAwaitedValue) {
+            return undefined;
+        }
+        currentContext = adaptedAwaitedValue[1];
+        statements.push({
+            kind: "returnStatement",
+            expression: adaptedAwaitedValue[0],
+        });
+    }
+    return [
+        buildTaskRunInvocation(buildTaskTypeAst(expectedAwaitedTypeAst), {
+            kind: "blockStatement",
+            statements,
+        }, true),
+        currentContext,
+    ];
+};
+//# sourceMappingURL=awaitable-adaptation.js.map

package/dist/expressions/awaitable-adaptation.js.map

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

package/dist/expressions/calls/call-arguments-emit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call-arguments-emit.d.ts","sourceRoot":"","sources":["../../../src/expressions/calls/call-arguments-emit.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAe,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhD,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,wCAAwC,CAAC;AA82FhD;;;GAGG;AACH,QAAA,MAAM,iBAAiB,GACrB,MAAM,SAAS,YAAY,EAAE,EAC7B,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC7C,SAAS,cAAc,EACvB,yBAAyB,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KACvD,CAAC,SAAS,mBAAmB,EAAE,EAAE,cAAc,CA6iBjD,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"call-arguments-emit.d.ts","sourceRoot":"","sources":["../../../src/expressions/calls/call-arguments-emit.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,EAAe,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhD,OAAO,KAAK,EACV,mBAAmB,EAGpB,MAAM,wCAAwC,CAAC;AAi3FhD;;;GAGG;AACH,QAAA,MAAM,iBAAiB,GACrB,MAAM,SAAS,YAAY,EAAE,EAC7B,MAAM,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC7C,SAAS,cAAc,EACvB,yBAAyB,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KACvD,CAAC,SAAS,mBAAmB,EAAE,EAAE,cAAc,CA8jBjD,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/expressions/calls/call-arguments-emit.js

@@ -28,6 +28,8 @@ import { tryBuildRuntimeMaterializationAst } from "../../core/semantic/runtime-r
 import { runtimeUnionAliasReferencesMatch } from "../../core/semantic/runtime-union-alias-identity.js";
 import { getPassingModifierFromCast, isLValue } from "./call-analysis.js";
 import { adaptValueToExpectedTypeAst, resolveDirectStorageCompatibleExpressionType, resolveDirectStorageCompatibleIrType, resolveCarrierPreservingRawExpectedType, resolveCarrierPreservingSourceType, resolveRuntimeCarrierCompatibleExpressionAst, resolveRuntimeCarrierCompatibleIrType, tryEmitCarrierPreservingExpressionAst, hasMismatchedCollectionElementCarrier, } from "../expected-type-adaptation.js";
+import { tryAdaptAwaitableValueAst } from "../awaitable-adaptation.js";
+import { maybeAdaptRuntimeUnionExpressionAst } from "../runtime-union-adaptation.js";
 import { isExactArrayCreationToType, isExactExpressionToType, tryEmitExactComparisonTargetAst, } from "../exact-comparison.js";
 import { getDirectIterableElementType } from "../structural-type-shapes.js";
 import { normalizeCallArgumentExpectedType, expandTupleLikeSpreadArguments, getTransparentRestSpreadPassthroughExpression, wrapArgModifier, emitFlattenedRestArguments, } from "./call-arguments-helpers.js";
@@ -1279,7 +1281,8 @@ const emitFunctionValueCallArguments = (args, signature, expr, context) => {
                             context: currentContext,
                         }));
             const contextualRawEmitExpectedTypeCandidate = arg.kind === "arrowFunction" || arg.kind === "functionExpression"
-                ? (selectedParameterType ??
+                ? (surfaceParameterType ??
+                    selectedParameterType ??
                     rawEmitExpectedTypeCandidate ??
                     contextualExpectedType ??
                     adaptationExpectedType ??
@@ -1816,7 +1819,8 @@ const emitCallArguments = (args, expr, context, parameterTypeOverrides) => {
                         context: currentContext,
                     }));
         const contextualRawEmitExpectedTypeCandidate = arg.kind === "arrowFunction" || arg.kind === "functionExpression"
-            ? (selectedParameterTypes[i] ??
+            ? (surfaceParameterType ??
+                selectedParameterTypes[i] ??
                 rawEmitExpectedTypeCandidate ??
                 contextualExpectedType ??
                 adaptationExpectedType ??
@@ -1951,7 +1955,21 @@ const emitCallArguments = (args, expr, context, parameterTypeOverrides) => {
                     !forcedRuntimeUnionArgument) {
                     throw new Error("Internal Compiler Error: source-backed structural call argument could not be materialized to its runtime surface.");
                 }
+                const awaitableArgumentSourceType = preEmitStorageAwareArgumentType ??
+                    preEmitEffectiveArgumentType ??
+                    effectiveArgumentType ??
+                    arg.inferredType;
+                const awaitableArgument = adaptationExpectedType && awaitableArgumentSourceType
+                    ? tryAdaptAwaitableValueAst({
+                        ast: rawArgAst,
+                        actualType: awaitableArgumentSourceType,
+                        expectedType: adaptationExpectedType,
+                        context: emittedContext,
+                        adaptAwaitedValueAst: maybeAdaptRuntimeUnionExpressionAst,
+                    })
+                    : undefined;
                 const [materializedArgAst, materializedContext] = forcedRuntimeUnionArgument ??
+                    awaitableArgument ??
                     (skipRuntimeUnionArgumentMaterialization
                         ? [rawArgAst, emittedContext]
                         : (adaptValueToExpectedTypeAst({