modality-ts 0.0.6 → 0.0.8

package/dist/extraction/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/extraction/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAA6B,KAAK,cAAc,EAA4C,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC9K,OAAO,KAAK,EAAmB,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErG,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAE/B,MAAM,WAAW,yBAAyB;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAClE,SAAS,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IACpC,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IACxC,aAAa,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,YAAY,EAAE,CAAC;IACrB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,wBAAwB;IACtE,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAqND,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,SAAS,EAAE,WAAW,GAAE,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAa,GAAG,cAAc,CAuBhJ;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,yBAA8B,GAAG,wBAAwB,CAEzH;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,yBAA8B,GAAG,sBAAsB,CA2J3H"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/extraction/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAA4C,KAAK,cAAc,EAA4C,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC7L,OAAO,KAAK,EAAmB,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErG,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAE/B,MAAM,WAAW,yBAAyB;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAClE,SAAS,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IACpC,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IACxC,aAAa,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,YAAY,EAAE,CAAC;IACrB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,wBAAwB;IACtE,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AA6OD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,SAAS,EAAE,WAAW,GAAE,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAa,GAAG,cAAc,CAuBhJ;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,yBAA8B,GAAG,wBAAwB,CAEzH;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,yBAA8B,GAAG,sBAAsB,CA4J3H"}

package/dist/extraction/index.js

@@ -1,5 +1,5 @@
 import * as ts from "typescript";
-import { effectReads, effectWrites } from "modality-ts/kernel";
+import { effectReads, effectWrites, validateValue } from "modality-ts/kernel";
 export * from "./pipeline/index.js";
 export * from "./spi/index.js";
 function emptyContextBindings() {
@@ -15,6 +15,29 @@ function setterBindingFromDecl(decl) {
         domain: decl.domain
     };
 }
+function bindSetter(setters, symbolName, setter) {
+    setters.set(scopedSetterKey(setter.component, symbolName), setter);
+    const current = setters.get(symbolName);
+    if (!current || current.varId === setter.varId) {
+        setters.set(symbolName, setter);
+        return;
+    }
+    setters.delete(symbolName);
+}
+function scopedSetterKey(component, symbolName) {
+    return `${component}:${symbolName}`;
+}
+function settersForComponent(setters, component) {
+    if (!component)
+        return new Map(setters);
+    const scoped = new Map(setters);
+    for (const [key, setter] of setters) {
+        if (!key.startsWith(`${component}:`))
+            continue;
+        scoped.set(key.slice(component.length + 1), setter);
+    }
+    return scoped;
+}
 function discoverContextBindings(source, fileName, route, typeAliases) {
     const bindings = emptyContextBindings();
     const providerValues = new Map();
@@ -246,7 +269,7 @@ export function extractUseStateSkeleton(sourceText, options = {}) {
             const decl = options.stateVars.find((candidate) => candidate.id === channel.varId);
             if (!decl)
                 continue;
-            setters.set(channel.symbolName, setterBindingFromDecl(decl));
+            bindSetter(setters, channel.symbolName, setterBindingFromDecl(decl));
         }
     }
     for (const decl of contextBindings.vars) {
@@ -309,7 +332,7 @@ export function extractUseStateSkeleton(sourceText, options = {}) {
                 }
                 if (setterName && ts.isBindingElement(setterName) && ts.isIdentifier(setterName.name)) {
                     if (!options.writeChannels)
-                        setters.set(setterName.name.text, { varId, component, stateName: stateName.name.text, domain });
+                        bindSetter(setters, setterName.name.text, { varId, component, stateName: stateName.name.text, domain });
                 }
             }
             else {
@@ -319,7 +342,8 @@ export function extractUseStateSkeleton(sourceText, options = {}) {
         const link = linkNavigationTransition(source, fileName, node, nextComponent ?? "Anonymous", routePatterns);
         if (link)
             transitions.push(link);
-        const refTaint = refSetterTaint(node, setters);
+        const scopedSetters = settersForComponent(setters, nextComponent);
+        const refTaint = refSetterTaint(node, scopedSetters);
         if (refTaint) {
             const key = `Global taint ${refTaint.varId}`;
             if (!globalTaints.has(key)) {
@@ -327,8 +351,8 @@ export function extractUseStateSkeleton(sourceText, options = {}) {
                 warnings.push({ message: key, ...lineAndColumn(source, refTaint.node) });
             }
         }
-        transitions.push(...transitionsFromTimerCall(source, fileName, node, setters, nextComponent ?? "Anonymous"));
-        for (const timerTaint of timerSetterTaints(node, setters)) {
+        transitions.push(...transitionsFromTimerCall(source, fileName, node, scopedSetters, nextComponent ?? "Anonymous"));
+        for (const timerTaint of timerSetterTaints(node, scopedSetters)) {
             const key = `Global taint ${timerTaint.varId}`;
             if (!globalTaints.has(key)) {
                 globalTaints.add(key);
@@ -336,7 +360,7 @@ export function extractUseStateSkeleton(sourceText, options = {}) {
             }
         }
         if (ts.isJsxAttribute(node) && ts.isIdentifier(node.name) && node.initializer && isForwardablePropName(node.name.text) && !isIntrinsicJsxAttribute(node)) {
-            const extracted = transitionsFromComponentPropAttribute(source, fileName, node, setters, handlers, components, nextComponent ?? "Anonymous", effectApis, options.asyncOutcomes ?? {}, sourcePlugins, routerPlugin, warnings);
+            const extracted = transitionsFromComponentPropAttribute(source, fileName, node, scopedSetters, handlers, components, nextComponent ?? "Anonymous", effectApis, options.asyncOutcomes ?? {}, sourcePlugins, routerPlugin, warnings);
             transitions.push(...extracted);
             if (extracted.length === 0) {
                 warnings.push({ message: `Unextractable handler ${nextComponent ?? "Anonymous"}.${node.name.text}`, ...lineAndColumn(source, node) });
@@ -346,7 +370,7 @@ export function extractUseStateSkeleton(sourceText, options = {}) {
             const listInfo = listRenderedHandlerInfo(node, vars, nextComponent ?? "Anonymous");
             if (listInfo) {
                 if (listInfo.domain.kind === "boundedList") {
-                    const extracted = transitionsFromBoundedListAttribute(source, fileName, node, setters, handlers, nextComponent ?? "Anonymous", {
+                    const extracted = transitionsFromBoundedListAttribute(source, fileName, node, scopedSetters, handlers, nextComponent ?? "Anonymous", {
                         varId: listInfo.varId,
                         domain: listInfo.domain,
                         itemName: listInfo.itemName
@@ -361,21 +385,21 @@ export function extractUseStateSkeleton(sourceText, options = {}) {
                 ts.forEachChild(node, (child) => visit(child, nextComponent));
                 return;
             }
-            const guardLocals = componentGuardLocalsFor(node, setters);
+            const guardLocals = componentGuardLocalsFor(node, scopedSetters);
             const guard = combineParsedGuards([
-                renderGuardFor(node, setters, warnings, source, nextComponent ?? "Anonymous", guardLocals),
-                disabledGuardFor(node, setters, warnings, source, nextComponent ?? "Anonymous", guardLocals)
+                renderGuardFor(node, scopedSetters, warnings, source, nextComponent ?? "Anonymous", guardLocals),
+                disabledGuardFor(node, scopedSetters, warnings, source, nextComponent ?? "Anonymous", guardLocals)
             ]);
-            const extracted = transitionsFromJsxAttribute(source, fileName, node, setters, handlers, nextComponent ?? "Anonymous", effectApis, options.asyncOutcomes ?? {}, sourcePlugins, routerPlugin, guard, routePatterns, contextBindings, warnings);
+            const extracted = transitionsFromJsxAttribute(source, fileName, node, scopedSetters, handlers, nextComponent ?? "Anonymous", effectApis, options.asyncOutcomes ?? {}, sourcePlugins, routerPlugin, guard, routePatterns, contextBindings, warnings);
             transitions.push(...extracted);
-            if (extracted.length === 0 && !forwardsComponentProp(node, handlers, components.get(nextComponent ?? "")) && !handlerSchedulesModeledTimer(node, handlers, setters)) {
+            if (extracted.length === 0 && !forwardsComponentProp(node, handlers, components.get(nextComponent ?? "")) && !handlerSchedulesModeledTimer(node, handlers, scopedSetters)) {
                 warnings.push({ message: `Unextractable handler ${nextComponent ?? "Anonymous"}.${node.name.text}`, ...lineAndColumn(source, node) });
             }
         }
         if (ts.isCallExpression(node) && isUseEffectCall(node)) {
-            const extracted = transitionsFromUseEffect(source, fileName, node, setters, nextComponent ?? "Anonymous");
+            const extracted = transitionsFromUseEffect(source, fileName, node, scopedSetters, nextComponent ?? "Anonymous");
             transitions.push(...extracted);
-            if (extracted.length === 0 && useEffectWritesModeledState(node, setters) && !providerComponents.has(nextComponent ?? "")) {
+            if (extracted.length === 0 && useEffectWritesModeledState(node, scopedSetters) && !providerComponents.has(nextComponent ?? "")) {
                 warnings.push({ message: `Unextractable effect ${nextComponent ?? "Anonymous"}.useEffect`, ...lineAndColumn(source, node) });
             }
         }
@@ -451,23 +475,23 @@ function initialValueForUseState(call, domain) {
     if (parsed !== undefined)
         return parsed;
     if (initial.kind === ts.SyntaxKind.TrueKeyword)
-        return true;
+        return validInitialOrFirst(domain, true);
     if (initial.kind === ts.SyntaxKind.FalseKeyword)
-        return false;
+        return validInitialOrFirst(domain, false);
     if (ts.isStringLiteral(initial))
-        return initial.text;
+        return validInitialOrFirst(domain, initial.text);
     if (ts.isNumericLiteral(initial))
-        return Number(initial.text);
+        return validInitialOrFirst(domain, Number(initial.text));
     if (initial.kind === ts.SyntaxKind.NullKeyword)
-        return null;
+        return validInitialOrFirst(domain, null);
     if (ts.isArrayLiteralExpression(initial))
-        return initial.elements.length === 0 ? "0" : initial.elements.length === 1 ? "1" : "many";
+        return validInitialOrFirst(domain, initial.elements.length === 0 ? "0" : initial.elements.length === 1 ? "1" : "many");
     return firstValue(domain);
 }
 function initialValueFromExpression(expression, domain) {
     const literal = literalValue(expression);
     if (literal !== undefined)
-        return literal;
+        return validateValue(domain, literal) ? literal : undefined;
     if (domain.kind === "option")
         return initialValueFromExpression(expression, domain.inner);
     if (domain.kind === "record" && ts.isObjectLiteralExpression(expression)) {
@@ -480,6 +504,9 @@ function initialValueFromExpression(expression, domain) {
     }
     return undefined;
 }
+function validInitialOrFirst(domain, value) {
+    return validateValue(domain, value) ? value : firstValue(domain);
+}
 function domainFromLiteralType(node) {
     const lit = node.literal;
     if (lit.kind === ts.SyntaxKind.TrueKeyword || lit.kind === ts.SyntaxKind.FalseKeyword)
@@ -2285,7 +2312,9 @@ function transitionsFromUseEffect(source, fileName, node, setters, component) {
     const effectReads = uniqueStrings(summaries.flatMap((summary) => summary.reads));
     const deps = dependencyReads(node.arguments[1], setters, effectReads);
     const effects = summaries.map((summary) => summary.effect);
-    if (effects.length > 0) {
+    const hasExplicitDependencyArray = Boolean(node.arguments[1] && ts.isArrayLiteralExpression(node.arguments[1]));
+    const hasUntriggeredHavocEffect = hasExplicitDependencyArray && deps.length === 0 && effects.some((effect) => effect.kind === "havoc");
+    if (effects.length > 0 && !hasUntriggeredHavocEffect) {
         const assignEffects = effects.filter((effect) => effect.kind === "assign");
         const guards = assignEffects.map((effect) => ({ kind: "neq", args: [{ kind: "read", var: effect.var }, effect.expr] }));
         const guard = guards.length > 0 ? guards.slice(1).reduce((acc, next) => andGuard(acc, next), guards[0]) : { kind: "lit", value: true };