modality-ts 0.0.14 → 0.0.15

package/dist/extract/sources/jotai/types.d.ts

@@ -0,0 +1,22 @@
+import type { Value } from "modality-ts/core";
+export type AtomConfigKind = "primitive" | "readOnlyDerived" | "readWriteDerived" | "writeOnlyDerived" | "storage" | "lazy" | "resettable" | "defaultResettable" | "refreshable" | "asyncWrapper" | "family" | "familyInstance";
+export interface JotaiAtomMetadata {
+    atomName: string;
+    configKind: AtomConfigKind;
+    creator?: string;
+    storageKey?: string;
+    storageKind?: string;
+    getOnInit?: boolean;
+    resettableInitial?: Value;
+    readDependencies?: readonly string[];
+    familyFactory?: string;
+    familyParam?: string;
+    loadableState?: boolean;
+    asyncDerived?: boolean;
+    warning?: string;
+}
+export declare function metadataToRecord(metadata: JotaiAtomMetadata): Record<string, Value>;
+export declare function metadataFromRecord(record: Record<string, Value> | undefined): JotaiAtomMetadata | undefined;
+export declare function isResettableKind(kind: AtomConfigKind): boolean;
+export declare function isWritableAtomKind(kind: AtomConfigKind): boolean;
+//# sourceMappingURL=types.d.ts.map

package/dist/extract/sources/jotai/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/extract/sources/jotai/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,MAAM,cAAc,GACtB,WAAW,GACX,iBAAiB,GACjB,kBAAkB,GAClB,kBAAkB,GAClB,SAAS,GACT,MAAM,GACN,YAAY,GACZ,mBAAmB,GACnB,aAAa,GACb,cAAc,GACd,QAAQ,GACR,gBAAgB,CAAC;AAErB,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,iBAAiB,GAC1B,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAqBvB;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS,GACxC,iBAAiB,GAAG,SAAS,CAqC/B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAO9D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAWhE"}

package/dist/extract/sources/jotai/types.js

@@ -0,0 +1,86 @@
+export function metadataToRecord(metadata) {
+    const record = {
+        atomName: metadata.atomName,
+        configKind: metadata.configKind,
+    };
+    if (metadata.creator)
+        record.creator = metadata.creator;
+    if (metadata.storageKey)
+        record.storageKey = metadata.storageKey;
+    if (metadata.storageKind)
+        record.storageKind = metadata.storageKind;
+    if (metadata.getOnInit !== undefined)
+        record.getOnInit = metadata.getOnInit;
+    if (metadata.resettableInitial !== undefined)
+        record.resettableInitial = metadata.resettableInitial;
+    if (metadata.readDependencies)
+        record.readDependencies = metadata.readDependencies.join(",");
+    if (metadata.familyFactory)
+        record.familyFactory = metadata.familyFactory;
+    if (metadata.familyParam)
+        record.familyParam = metadata.familyParam;
+    if (metadata.loadableState !== undefined)
+        record.loadableState = metadata.loadableState;
+    if (metadata.asyncDerived !== undefined)
+        record.asyncDerived = metadata.asyncDerived;
+    if (metadata.warning)
+        record.warning = metadata.warning;
+    return record;
+}
+export function metadataFromRecord(record) {
+    if (!record || typeof record.atomName !== "string")
+        return undefined;
+    const configKind = record.configKind;
+    if (typeof configKind !== "string")
+        return undefined;
+    return {
+        atomName: record.atomName,
+        configKind: configKind,
+        ...(typeof record.creator === "string" ? { creator: record.creator } : {}),
+        ...(typeof record.storageKey === "string"
+            ? { storageKey: record.storageKey }
+            : {}),
+        ...(typeof record.storageKind === "string"
+            ? { storageKind: record.storageKind }
+            : {}),
+        ...(typeof record.getOnInit === "boolean"
+            ? { getOnInit: record.getOnInit }
+            : {}),
+        ...(record.resettableInitial !== undefined
+            ? { resettableInitial: record.resettableInitial }
+            : {}),
+        ...(typeof record.readDependencies === "string"
+            ? { readDependencies: record.readDependencies.split(",") }
+            : {}),
+        ...(typeof record.familyFactory === "string"
+            ? { familyFactory: record.familyFactory }
+            : {}),
+        ...(typeof record.familyParam === "string"
+            ? { familyParam: record.familyParam }
+            : {}),
+        ...(typeof record.loadableState === "boolean"
+            ? { loadableState: record.loadableState }
+            : {}),
+        ...(typeof record.asyncDerived === "boolean"
+            ? { asyncDerived: record.asyncDerived }
+            : {}),
+        ...(typeof record.warning === "string" ? { warning: record.warning } : {}),
+    };
+}
+export function isResettableKind(kind) {
+    return (kind === "resettable" ||
+        kind === "defaultResettable" ||
+        kind === "storage" ||
+        kind === "refreshable");
+}
+export function isWritableAtomKind(kind) {
+    return (kind === "primitive" ||
+        kind === "readWriteDerived" ||
+        kind === "storage" ||
+        kind === "lazy" ||
+        kind === "resettable" ||
+        kind === "defaultResettable" ||
+        kind === "refreshable" ||
+        kind === "familyInstance");
+}
+//# sourceMappingURL=types.js.map

package/dist/extract/sources/jotai/types.js.map

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

package/dist/extract/sources/jotai/writes.d.ts

@@ -1,8 +1,30 @@
+import * as ts from "typescript";
 import type { WriteChannel } from "modality-ts/extract/engine/spi";
-import type { SourceAnchor } from "modality-ts/core";
+import type { EffectIR, SourceAnchor, Value } from "modality-ts/core";
+export interface JotaiWriteDiscovery {
+    channels: WriteChannel[];
+    warnings: {
+        message: string;
+        source?: SourceAnchor;
+    }[];
+    resetSymbol?: string;
+    resettableVarIds: Set<string>;
+    derivedWriteEffects: Map<string, EffectIR>;
+    setterFixedEffects: Map<string, EffectIR>;
+    storeScopedDecls: import("modality-ts/extract/engine/spi").SourceDecl[];
+}
 export declare function discoverJotaiSafetyWarnings(sourceText: string, fileName?: string): {
     message: string;
     source?: SourceAnchor;
 }[];
 export declare function discoverJotaiWriteChannels(sourceText: string, fileName?: string): WriteChannel[];
+export declare function discoverJotaiWritesDetailed(sourceText: string, fileName?: string): JotaiWriteDiscovery;
+export declare function setAtomImportNames(source: ts.SourceFile): {
+    useAtom: Set<string>;
+    useSetAtom: Set<string>;
+};
+export declare function getDefaultStoreImportNames(source: ts.SourceFile): Set<string>;
+export declare function isUseAtomLikeCall(node: ts.Expression, names: Set<string>): node is ts.CallExpression;
+export declare function jotaiResetSymbols(sourceText: string, fileName: string): Set<string>;
+export declare function jotaiInitialByVarId(decls: readonly import("modality-ts/extract/engine/spi").SourceDecl[]): Map<string, Value>;
 //# sourceMappingURL=writes.d.ts.map

package/dist/extract/sources/jotai/writes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writes.d.ts","sourceRoot":"","sources":["../../../../src/extract/sources/jotai/writes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,QAAQ,SAAa,GACpB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,YAAY,CAAA;CAAE,EAAE,CA2B9C;AAED,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,QAAQ,SAAa,GACpB,YAAY,EAAE,CAmHhB"}
+{"version":3,"file":"writes.d.ts","sourceRoot":"","sources":["../../../../src/extract/sources/jotai/writes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAyBtE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,QAAQ,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE,EAAE,CAAC;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3C,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1C,gBAAgB,EAAE,OAAO,gCAAgC,EAAE,UAAU,EAAE,CAAC;CACzE;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,QAAQ,SAAa,GACpB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,YAAY,CAAA;CAAE,EAAE,CA2F9C;AAED,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,QAAQ,SAAa,GACpB,YAAY,EAAE,CAEhB;AAED,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,QAAQ,SAAa,GACpB,mBAAmB,CAqQrB;AAqJD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,GAAG;IACzD,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACzB,CASA;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAO7E;AAED,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,EAAE,CAAC,UAAU,EACnB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GACjB,IAAI,IAAI,EAAE,CAAC,cAAc,CAM3B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,GAAG,CAAC,MAAM,CAAC,CAab;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,SAAS,OAAO,gCAAgC,EAAE,UAAU,EAAE,GACpE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAMpB"}

package/dist/extract/sources/jotai/writes.js

@@ -1,10 +1,24 @@
 import * as ts from "typescript";
+import { propertyName, componentNameFor } from "../../engine/ts/ast.js";
+import { discoverComponentStoreScopes } from "./stores.js";
+import { providerScopeFromJsx } from "./jsx.js";
+import { discoverJotaiAtomsDetailed, duplicateAtomsForStore, } from "./discover.js";
+import { hookImportedName, isHookCall, isJotaiModuleSpecifier, resolveJotaiImports, } from "./imports.js";
+import { atomVarId, familyVarId } from "./ids.js";
+import { discoverHydrationOverrides } from "./hydration.js";
+import { isReadFunction, summarizeDerivedWriteBody } from "./derived-writes.js";
+import { classifyAtomCall, staticFamilyParam, typeAliasDeclarations, } from "./domains.js";
+import { isResettableKind, metadataFromRecord } from "./types.js";
+import { atomCreatorName, isAtomCreatorCall } from "./imports.js";
 export function discoverJotaiSafetyWarnings(sourceText, fileName = "state.ts") {
     const source = ts.createSourceFile(fileName, sourceText, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
+    const imports = resolveJotaiImports(source);
     const warnings = [];
+    const discovery = discoverJotaiAtomsDetailed(sourceText, fileName);
+    warnings.push(...discovery.warnings);
     for (const statement of source.statements) {
         if (!ts.isImportDeclaration(statement) ||
-            !isJotaiModule(statement.moduleSpecifier))
+            !isJotaiModuleSpecifier(statement.moduleSpecifier))
             continue;
         const bindings = statement.importClause?.namedBindings;
         if (!bindings || !ts.isNamedImports(bindings))
@@ -15,159 +29,386 @@ export function discoverJotaiSafetyWarnings(sourceText, fileName = "state.ts") {
                 continue;
             warnings.push({
                 message: "Global taint jotai:getDefaultStore",
-                source: { file: fileName, ...lineAndColumn(source, specifier) },
+                source: anchor(source, fileName, specifier),
+            });
+        }
+    }
+    const hydration = discoverHydrationOverrides(source, fileName, imports);
+    warnings.push(...hydration.warnings);
+    const visit = (node) => {
+        if (ts.isJsxSelfClosingElement(node) || ts.isJsxElement(node)) {
+            const providerScope = providerScopeFromJsx(node, imports, source);
+            if (providerScope === undefined) {
+                const tag = ts.isJsxSelfClosingElement(node)
+                    ? node.tagName.getText()
+                    : node.openingElement.tagName.getText();
+                if (tag === imports.providerTag ||
+                    tag === "Provider" ||
+                    tag.endsWith(".Provider")) {
+                    warnings.push({
+                        message: "Jotai dynamic Provider store unsupported",
+                        source: anchor(source, fileName, node),
+                    });
+                }
+            }
+        }
+        if (ts.isCallExpression(node) &&
+            ts.isPropertyAccessExpression(node.expression) &&
+            node.expression.name.text === "setShouldRemove") {
+            warnings.push({
+                message: "Jotai atomFamily.setShouldRemove cache lifecycle not modeled",
+                source: anchor(source, fileName, node),
+            });
+        }
+        if (ts.isCallExpression(node) &&
+            ts.isPropertyAccessExpression(node.expression) &&
+            node.expression.name.text === "unstable_listen") {
+            warnings.push({
+                message: "Jotai atomFamily.unstable_listen cache lifecycle not modeled",
+                source: anchor(source, fileName, node),
+            });
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(source);
+    for (const decl of discovery.decls) {
+        const metadata = metadataFromRecord(decl.metadata);
+        if (metadata?.storageKind === "localStorage" && !hasWindowGuard(source)) {
+            warnings.push({
+                message: `Jotai SSR-unsafe unguarded ${metadata.storageKind} access for ${metadata.atomName}`,
+                source: decl.origin === "system" || decl.origin === "library-template"
+                    ? undefined
+                    : decl.origin,
             });
         }
     }
     return warnings;
 }
 export function discoverJotaiWriteChannels(sourceText, fileName = "state.ts") {
+    return discoverJotaiWritesDetailed(sourceText, fileName).channels;
+}
+export function discoverJotaiWritesDetailed(sourceText, fileName = "state.ts") {
     const source = ts.createSourceFile(fileName, sourceText, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
-    const setters = setAtomImportNames(source);
-    const defaultStoreGetters = getDefaultStoreImportNames(source);
-    if (setters.useAtom.size === 0 &&
-        setters.useSetAtom.size === 0 &&
-        defaultStoreGetters.size === 0)
-        return [];
+    const imports = resolveJotaiImports(source);
+    const discovery = discoverJotaiAtomsDetailed(sourceText, fileName);
+    const atomNames = new Set(discovery.atomNames);
+    for (const [name] of discovery.atomMetadata)
+        atomNames.add(name);
+    const derivedWriteEffects = new Map();
+    const setterFixedEffects = new Map();
+    const atomClassifications = collectAtomClassifications(source, imports);
+    for (const [atomName, info] of atomClassifications) {
+        if (info.configKind === "writeOnlyDerived" ||
+            info.configKind === "readWriteDerived") {
+            const writeFn = info.writeFn;
+            if (writeFn) {
+                const effect = summarizeDerivedWriteBody(writeFn, { atomNames });
+                if (effect !== "unsupported")
+                    derivedWriteEffects.set(atomName, effect);
+            }
+        }
+    }
+    const resettableVarIds = new Set();
+    for (const decl of discovery.decls) {
+        const metadata = metadataFromRecord(decl.metadata);
+        if (metadata && isResettableKind(metadata.configKind) && decl.var) {
+            resettableVarIds.add(decl.var.id);
+        }
+    }
+    if (imports.hooks.size === 0 &&
+        imports.storeCreators.size === 0 &&
+        discovery.decls.length === 0) {
+        return {
+            channels: [],
+            warnings: [],
+            resetSymbol: imports.resetSymbol,
+            resettableVarIds,
+            derivedWriteEffects,
+            setterFixedEffects,
+            storeScopedDecls: [],
+        };
+    }
     const channels = [];
+    const warnings = [];
+    const storeNames = new Set();
     const defaultStoreNames = new Set();
-    const visit = (node) => {
+    const storeScopedDecls = [];
+    const componentStoreScopes = discoverComponentStoreScopes(source, imports);
+    const visit = (node, storeScope, componentName) => {
+        const nextComponent = componentNameFor(node) ?? componentName;
+        const effectiveScope = (nextComponent ? componentStoreScopes.get(nextComponent) : undefined) ??
+            storeScope;
         if (ts.isVariableDeclaration(node) &&
             ts.isIdentifier(node.name) &&
-            node.initializer &&
-            isGetDefaultStoreCall(node.initializer, defaultStoreGetters)) {
-            defaultStoreNames.add(node.name.text);
+            node.initializer) {
+            if (isStoreCreatorCall(node.initializer, imports.storeCreators)) {
+                storeNames.add(node.name.text);
+                if (isGetDefaultStoreCall(node.initializer, imports.storeCreators)) {
+                    defaultStoreNames.add(node.name.text);
+                }
+            }
+            if (isHookCall(node.initializer, imports.hooks, "useStore")) {
+                storeNames.add(node.name.text);
+            }
         }
         if (ts.isVariableDeclaration(node) &&
             ts.isArrayBindingPattern(node.name) &&
             node.initializer &&
-            isUseAtomLikeCall(node.initializer, setters.useAtom)) {
+            isHookCall(node.initializer, imports.hooks, "useAtom")) {
             const atomArg = node.initializer.arguments[0];
+            const storeScopeForCall = resolveStoreScope(node.initializer, effectiveScope, imports);
+            const varId = resolveAtomVarId(atomArg, storeScopeForCall, source, imports, warnings, fileName, defaultStoreNames);
+            if (!varId) {
+                ts.forEachChild(node, (child) => visit(child, effectiveScope, nextComponent));
+                return;
+            }
             const reader = node.name.elements[0];
             const setter = node.name.elements.at(-1);
-            if (atomArg &&
-                ts.isIdentifier(atomArg) &&
-                reader &&
+            const src = anchor(source, fileName, node);
+            if (reader &&
                 ts.isBindingElement(reader) &&
                 ts.isIdentifier(reader.name)) {
                 channels.push({
-                    id: `atom:${atomArg.text}.read`,
-                    varId: `atom:${atomArg.text}`,
+                    id: `${varId}.read`,
+                    varId,
                     symbolName: reader.name.text,
-                    source: {
-                        file: fileName,
-                        ...lineAndColumn(source, node),
-                    },
+                    source: src,
                 });
             }
-            if (atomArg &&
-                ts.isIdentifier(atomArg) &&
-                setter &&
+            if (setter &&
                 ts.isBindingElement(setter) &&
                 ts.isIdentifier(setter.name)) {
                 channels.push({
-                    id: `atom:${atomArg.text}.setter`,
-                    varId: `atom:${atomArg.text}`,
+                    id: `${varId}.setter`,
+                    varId,
                     symbolName: setter.name.text,
-                    source: {
-                        file: fileName,
-                        ...lineAndColumn(source, node),
-                    },
+                    source: src,
                 });
             }
         }
         if (ts.isVariableDeclaration(node) &&
             ts.isIdentifier(node.name) &&
             node.initializer &&
-            isUseAtomLikeCall(node.initializer, setters.useSetAtom)) {
+            (isHookCall(node.initializer, imports.hooks, "useSetAtom") ||
+                isHookCall(node.initializer, imports.hooks, "useResetAtom"))) {
+            const hookName = hookImportedName(node.initializer, imports.hooks);
             const atomArg = node.initializer.arguments[0];
-            if (atomArg && ts.isIdentifier(atomArg)) {
+            const storeScopeForCall = resolveStoreScope(node.initializer, effectiveScope, imports);
+            const varId = resolveAtomVarId(atomArg, storeScopeForCall, source, imports, warnings, fileName, defaultStoreNames);
+            if (!varId) {
+                ts.forEachChild(node, (child) => visit(child, effectiveScope, nextComponent));
+                return;
+            }
+            const src = anchor(source, fileName, node);
+            if (hookName === "useResetAtom") {
+                channels.push({
+                    id: `${varId}.reset`,
+                    varId,
+                    symbolName: node.name.text,
+                    source: src,
+                });
+            }
+            else {
+                const atomName = atomArg && ts.isIdentifier(atomArg) ? atomArg.text : undefined;
+                const derivedEffect = atomName && derivedWriteEffects.has(atomName)
+                    ? derivedWriteEffects.get(atomName)
+                    : undefined;
+                const derivedVarId = derivedEffect
+                    ? (effectTargetVar(derivedEffect) ?? varId)
+                    : varId;
+                if (derivedEffect) {
+                    setterFixedEffects.set(node.name.text, derivedEffect);
+                }
                 channels.push({
-                    id: `atom:${atomArg.text}.setter`,
-                    varId: `atom:${atomArg.text}`,
+                    id: `${derivedVarId}.setter`,
+                    varId: derivedVarId,
                     symbolName: node.name.text,
-                    source: {
-                        file: fileName,
-                        ...lineAndColumn(source, node),
-                    },
+                    source: src,
                 });
             }
         }
         if (ts.isCallExpression(node) &&
             ts.isPropertyAccessExpression(node.expression) &&
-            node.expression.name.text === "set" &&
+            (node.expression.name.text === "set" ||
+                node.expression.name.text === "get" ||
+                node.expression.name.text === "sub") &&
             ts.isIdentifier(node.expression.expression) &&
-            defaultStoreNames.has(node.expression.expression.text)) {
+            storeNames.has(node.expression.expression.text)) {
             const atomArg = node.arguments[0];
-            if (atomArg && ts.isIdentifier(atomArg)) {
+            const storeScopeForCall = node.expression.expression.text;
+            const varId = resolveAtomVarId(atomArg, defaultStoreNames.has(storeScopeForCall)
+                ? undefined
+                : storeScopeForCall, source, imports, warnings, fileName, defaultStoreNames);
+            if (varId && node.expression.name.text === "set") {
                 channels.push({
-                    id: `atom:${atomArg.text}.store-set`,
-                    varId: `atom:${atomArg.text}`,
-                    symbolName: `${node.expression.expression.text}.set:${atomArg.text}`,
-                    source: {
-                        file: fileName,
-                        ...lineAndColumn(source, node),
-                    },
+                    id: `${varId}.store-set`,
+                    varId,
+                    symbolName: `${node.expression.expression.text}.set:${atomArg && ts.isIdentifier(atomArg) ? atomArg.text : "atom"}`,
+                    source: anchor(source, fileName, node),
                 });
             }
         }
+        if (ts.isJsxElement(node) || ts.isJsxSelfClosingElement(node)) {
+            const providerScope = providerScopeFromJsx(node, imports, source);
+            if (providerScope && providerScope !== effectiveScope) {
+                storeScopedDecls.push(...duplicateAtomsForStore(discovery.decls, providerScope));
+            }
+            const childScope = providerScope ?? effectiveScope;
+            ts.forEachChild(node, (child) => visit(child, childScope, nextComponent));
+            return;
+        }
+        ts.forEachChild(node, (child) => visit(child, effectiveScope, nextComponent));
+    };
+    visit(source, undefined, undefined);
+    return {
+        channels,
+        warnings,
+        resetSymbol: imports.resetSymbol,
+        resettableVarIds,
+        derivedWriteEffects,
+        setterFixedEffects,
+        storeScopedDecls,
+    };
+}
+function collectAtomClassifications(source, imports) {
+    const typeAliases = typeAliasDeclarations(source);
+    const result = new Map();
+    const visit = (node) => {
+        if (ts.isVariableDeclaration(node) &&
+            ts.isIdentifier(node.name) &&
+            node.initializer &&
+            isAtomCreatorCall(node.initializer, imports.atomCreators) &&
+            atomCreatorName(node.initializer, imports.atomCreators) === "atom") {
+            const classification = classifyAtomCall(node.initializer, node.name.text, imports, typeAliases);
+            const second = node.initializer.arguments[1];
+            result.set(node.name.text, {
+                configKind: classification.metadata.configKind,
+                ...(second && isReadFunction(second) ? { writeFn: second } : {}),
+            });
+        }
         ts.forEachChild(node, visit);
     };
     visit(source);
-    return channels;
+    return result;
 }
-function getDefaultStoreImportNames(source) {
-    const names = new Set();
-    for (const statement of source.statements) {
-        if (!ts.isImportDeclaration(statement) ||
-            !isJotaiModule(statement.moduleSpecifier))
-            continue;
-        const bindings = statement.importClause?.namedBindings;
-        if (!bindings || !ts.isNamedImports(bindings))
-            continue;
-        for (const specifier of bindings.elements) {
-            const imported = specifier.propertyName?.text ?? specifier.name.text;
-            if (imported === "getDefaultStore")
-                names.add(specifier.name.text);
+function resolveAtomVarId(atomArg, storeScope, source, imports, warnings, fileName, defaultStoreNames = new Set()) {
+    const effectiveScope = storeScope && !defaultStoreNames.has(storeScope) ? storeScope : undefined;
+    if (!atomArg)
+        return undefined;
+    if (ts.isIdentifier(atomArg)) {
+        return atomVarId(atomArg.text, effectiveScope);
+    }
+    if (ts.isCallExpression(atomArg) && ts.isIdentifier(atomArg.expression)) {
+        const param = atomArg.arguments[0];
+        const staticParam = param ? staticFamilyParam(param) : undefined;
+        if (!staticParam) {
+            warnings.push({
+                message: `Jotai dynamic atom family param unsupported for ${atomArg.expression.text}`,
+                source: anchor(source, fileName, atomArg),
+            });
+            return undefined;
         }
+        return familyVarId(atomArg.expression.text, staticParam);
     }
-    return names;
+    return undefined;
+}
+function resolveStoreScope(call, inheritedScope, imports) {
+    const options = call.arguments[1];
+    if (options && ts.isObjectLiteralExpression(options)) {
+        for (const prop of options.properties) {
+            if (!ts.isPropertyAssignment(prop))
+                continue;
+            const name = propertyName(prop.name);
+            if (name === "store" && ts.isIdentifier(prop.initializer)) {
+                return prop.initializer.text;
+            }
+        }
+    }
+    return inheritedScope;
+}
+function isStoreCreatorCall(node, storeCreators) {
+    return (ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        storeCreators.has(node.expression.text));
+}
+function isGetDefaultStoreCall(node, storeCreators) {
+    if (!isStoreCreatorCall(node, storeCreators))
+        return false;
+    if (!ts.isCallExpression(node) || !ts.isIdentifier(node.expression))
+        return false;
+    return storeCreators.get(node.expression.text) === "getDefaultStore";
+}
+function effectTargetVar(effect) {
+    if (effect.kind === "assign")
+        return effect.var;
+    if (effect.kind === "seq") {
+        for (const child of effect.effects) {
+            const target = effectTargetVar(child);
+            if (target)
+                return target;
+        }
+    }
+    return undefined;
+}
+function hasWindowGuard(source) {
+    let found = false;
+    const visit = (node) => {
+        if (ts.isBinaryExpression(node) &&
+            node.operatorToken.kind === ts.SyntaxKind.InstanceOfKeyword &&
+            ts.isIdentifier(node.right) &&
+            node.right.text === "Window") {
+            found = true;
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(source);
+    return found;
+}
+function anchor(source, fileName, node) {
+    const pos = source.getLineAndCharacterOfPosition(node.getStart(source));
+    return { file: fileName, line: pos.line + 1, column: pos.character + 1 };
 }
-function setAtomImportNames(source) {
+export function setAtomImportNames(source) {
+    const imports = resolveJotaiImports(source);
     const useAtom = new Set();
     const useSetAtom = new Set();
-    for (const statement of source.statements) {
-        if (!ts.isImportDeclaration(statement) ||
-            !isJotaiModule(statement.moduleSpecifier))
-            continue;
-        const bindings = statement.importClause?.namedBindings;
-        if (!bindings || !ts.isNamedImports(bindings))
-            continue;
-        for (const specifier of bindings.elements) {
-            const imported = specifier.propertyName?.text ?? specifier.name.text;
-            if (imported === "useAtom")
-                useAtom.add(specifier.name.text);
-            if (imported === "useSetAtom")
-                useSetAtom.add(specifier.name.text);
-        }
+    for (const [local, imported] of imports.hooks) {
+        if (imported === "useAtom")
+            useAtom.add(local);
+        if (imported === "useSetAtom")
+            useSetAtom.add(local);
     }
     return { useAtom, useSetAtom };
 }
-function isJotaiModule(moduleSpecifier) {
-    return (ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text === "jotai");
+export function getDefaultStoreImportNames(source) {
+    const imports = resolveJotaiImports(source);
+    const names = new Set();
+    for (const [local, imported] of imports.storeCreators) {
+        if (imported === "getDefaultStore")
+            names.add(local);
+    }
+    return names;
 }
-function isUseAtomLikeCall(node, names) {
+export function isUseAtomLikeCall(node, names) {
     return (ts.isCallExpression(node) &&
         ts.isIdentifier(node.expression) &&
         names.has(node.expression.text));
 }
-function isGetDefaultStoreCall(node, names) {
-    return (ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        names.has(node.expression.text));
+export function jotaiResetSymbols(sourceText, fileName) {
+    const source = ts.createSourceFile(fileName, sourceText, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
+    const imports = resolveJotaiImports(source);
+    const symbols = new Set();
+    if (imports.resetSymbol)
+        symbols.add(imports.resetSymbol);
+    symbols.add("RESET");
+    return symbols;
 }
-function lineAndColumn(source, node) {
-    const pos = source.getLineAndCharacterOfPosition(node.getStart(source));
-    return { line: pos.line + 1, column: pos.character + 1 };
+export function jotaiInitialByVarId(decls) {
+    const map = new Map();
+    for (const decl of decls) {
+        if (decl.var)
+            map.set(decl.var.id, decl.var.initial);
+    }
+    return map;
 }
 //# sourceMappingURL=writes.js.map