@suss/adapter-typescript 0.33.0 → 0.33.1

package/dist/index.cjs

@@ -2681,8 +2681,8 @@ var ResolutionStore = class {
   lastQueryWalked = [];
   /** See `environmentSiteFiles`; null until the first env question. */
   envSiteFiles = null;
-  envNamersAnswer = NO_NAMERS;
-  envNamersExtractedAt = -1;
+  /** See `environmentAnswers`; null until the first env question. */
+  envAnswers = null;
   declarations = /* @__PURE__ */ new Map();
   graph = new ModuleGraph();
   /** See `notePossibleCallers`. */
@@ -2908,10 +2908,8 @@ var ResolutionStore = class {
    * a pack spells it, a name declared as that, or a parameter some
    * caller hands one to, however many calls deep.
    *
-   * A parameter is the only shape whose answer can change once its
-   * callers are in, and reading those means reading every file that
-   * imports this one, so a value that is not one is answered from what
-   * the store already has.
+   * A parameter's answer depends on its callers, so it comes from the
+   * parameters the environment reaches, worked out once per run.
    */
   isEnvironmentValue(value) {
     const target = factKeyOf(value);
@@ -2919,17 +2917,14 @@ var ResolutionStore = class {
       this.derive();
       return {
         environment: this.hasAnswer("wantedEnvironmentValue", target),
-        parameter: this.hasAnswer("wantedRefersToParam", target)
+        parameters: this.answersFor("wantedRefersToParam", nodeId(target))
       };
     });
-    if (first.environment || !first.parameter) {
+    if (first.environment || first.parameters.length === 0) {
       return first.environment;
     }
-    this.readPossibleCallersOf(target.getSourceFile());
-    return this.askAbout(target, "wanted", () => {
-      this.derive();
-      return this.hasAnswer("wantedEnvironmentValue", target);
-    });
+    const { receivers } = this.environmentAnswers(target.getProject());
+    return first.parameters.some((parameter) => receivers.has(parameter));
   }
   hasAnswer(relation, target) {
     return this.answersFor(relation, nodeId(target)).length > 0;
@@ -2939,28 +2934,69 @@ var ResolutionStore = class {
    * from, for a reader standing at a call. One question covers the
    * whole project: a project has a handful of environment reads and
    * thousands of parameters, and with the read bound the rules run from
-   * each callee to its callers.
-   *
-   * `definedIn` is the callee's own file, read into the store before
-   * the question so a helper nothing had extracted yet is among the
-   * facts the rules run over.
+   * each callee to its callers. The facts README says which files that
+   * reads and why it is asked once.
    */
-  envNamers(definedIn) {
-    const siteFiles = this.environmentSiteFiles(definedIn.getProject());
+  envNamers(project) {
+    return this.environmentAnswers(project).namers;
+  }
+  environmentAnswers(project) {
+    if (this.envAnswers !== null) {
+      return this.envAnswers;
+    }
+    const siteFiles = this.environmentSiteFiles(project);
     if (siteFiles.length === 0) {
-      return NO_NAMERS;
+      this.envAnswers = { namers: NO_NAMERS, receivers: /* @__PURE__ */ new Set() };
+      return this.envAnswers;
     }
-    this.extractFile(definedIn);
-    if (this.envNamersExtractedAt === this.fullyExtracted.size) {
-      return this.envNamersAnswer;
+    const helpers = this.followEnvironment(siteFiles).byParameter;
+    for (const helperFile of this.filesOf(helpers)) {
+      this.readPossibleCallersOf(helperFile);
     }
-    const answered = this.askEnvNamers([...siteFiles, definedIn]);
+    const { byParameter, receivers } = this.followEnvironment(siteFiles);
     const siteFilePaths = new Set(siteFiles.map((one) => one.getFilePath()));
-    this.envNamersAnswer = {
-      sitesNaming: (parameter) => this.sitesNamedBy(answered, siteFilePaths, parameter)
+    this.envAnswers = {
+      namers: {
+        sitesNaming: (parameter) => this.sitesNamedBy(byParameter, siteFilePaths, parameter)
+      },
+      receivers
     };
-    this.envNamersExtractedAt = this.fullyExtracted.size;
-    return this.envNamersAnswer;
+    return this.envAnswers;
+  }
+  /**
+   * Ask until every call handing the environment on has had its callee
+   * read, one hop a round, so the answer covers each parameter it lands in.
+   */
+  followEnvironment(seeds) {
+    const followed = /* @__PURE__ */ new Set();
+    for (; ; ) {
+      const asked = this.askEnvironment(seeds);
+      const next = asked.passingCalls.filter((call) => !followed.has(call));
+      if (next.length === 0) {
+        return asked;
+      }
+      for (const callId of next) {
+        followed.add(callId);
+        this.readCalleeOf(callId);
+      }
+    }
+  }
+  readCalleeOf(callId) {
+    const call = this.table.byId.get(callId);
+    if (call !== void 0 && (import_ts_morph8.Node.isCallExpression(call) || import_ts_morph8.Node.isNewExpression(call))) {
+      this.resolveCallableSources(call.getExpression());
+    }
+  }
+  /** The files the parameters an answer is keyed by are declared in. */
+  filesOf(byParameter) {
+    const files = /* @__PURE__ */ new Set();
+    for (const parameterId of byParameter.keys()) {
+      const parameter = this.table.byId.get(parameterId);
+      if (parameter !== void 0) {
+        files.add(parameter.getSourceFile());
+      }
+    }
+    return files;
   }
   sitesNamedBy(answered, siteFilePaths, parameter) {
     const key = nodeId(parameter);
@@ -2975,15 +3011,18 @@ var ResolutionStore = class {
   }
   /**
    * Seed every expression that spells the environment, derive, and take
-   * the sites back per parameter. The question is dropped afterwards, so
-   * a later ask over a larger fact set derives it again.
+   * back the read sites per parameter and the parameters the object is
+   * handed to. The question is dropped afterwards, so a later ask over a
+   * larger fact set derives it again.
    *
    * The reads themselves cannot be the seed: one written through a
    * parameter is off an object a scan of the source has no way to pick
    * out, and the whole point of asking is to find those.
    */
-  askEnvNamers(seeds) {
+  askEnvironment(seeds) {
     const byParameter = /* @__PURE__ */ new Map();
+    const receivers = /* @__PURE__ */ new Set();
+    const passingCalls = [];
     try {
       for (const [object] of this.db.facts("environmentObject")) {
         this.wantKey("wantedEnvObject", String(object));
@@ -2999,10 +3038,16 @@ var ResolutionStore = class {
         sites.push(node);
         byParameter.set(String(parameter), sites);
       }
+      for (const [parameter] of this.db.facts("wantedEnvParameter")) {
+        receivers.add(String(parameter));
+      }
+      for (const [call] of this.db.facts("wantedEnvPassingCall")) {
+        passingCalls.push(String(call));
+      }
     } finally {
       this.forgetQuery();
     }
-    return byParameter;
+    return { byParameter, receivers, passingCalls };
   }
   /**
    * The project's files that hand the environment object somewhere,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { SourceFile, Node, FunctionDeclaration, FunctionExpression, ArrowFunction, MethodDeclaration, Symbol, CallExpression, PropertyAccessExpression, TaggedTemplateExpression, Project, ImportDeclaration, ArrayLiteralExpression, ObjectLiteralExpression, ObjectLiteralElementLike, Expression, NewExpression, Identifier } from 'ts-morph';
+import { SourceFile, Node, Project, FunctionDeclaration, FunctionExpression, ArrowFunction, MethodDeclaration, Symbol, CallExpression, PropertyAccessExpression, TaggedTemplateExpression, ImportDeclaration, ArrayLiteralExpression, ObjectLiteralExpression, ObjectLiteralElementLike, Expression, NewExpression, Identifier } from 'ts-morph';
 import { TransparentWrapper, RawCondition, DiscoveryPattern, TerminalPattern, InputMappingPattern, EffectArg, CallOps, LanguageAdapter, PatternPack, ExtractorOptions, TimingReport, CacheDiagnostic, ExtractionReport, InvocationRecognizer, AccessRecognizer, RawCodeStructure, RawTerminal, RawBranch, configuredCallOption, RawDeclaredContract, ContractPattern, AstCapableOps, ResponsePropertyMapping } from '@suss/extractor';
 export { EmptyStage, ExtractionReport, PackFunnel, Timer, TimingReport, computeContentHash } from '@suss/extractor';
 import { MessageBusSemantics, DeployableUnit, UnfollowedCall, WrapperReference, BehavioralSummary, BoundaryBinding, Predicate, TypeShape, ValueRef } from '@suss/behavioral-ir';
@@ -86,8 +86,8 @@ declare class ResolutionStore {
     private lastQueryWalked;
     /** See `environmentSiteFiles`; null until the first env question. */
     private envSiteFiles;
-    private envNamersAnswer;
-    private envNamersExtractedAt;
+    /** See `environmentAnswers`; null until the first env question. */
+    private envAnswers;
     private readonly declarations;
     private readonly graph;
     /** See `notePossibleCallers`. */
@@ -171,10 +171,8 @@ declare class ResolutionStore {
      * a pack spells it, a name declared as that, or a parameter some
      * caller hands one to, however many calls deep.
      *
-     * A parameter is the only shape whose answer can change once its
-     * callers are in, and reading those means reading every file that
-     * imports this one, so a value that is not one is answered from what
-     * the store already has.
+     * A parameter's answer depends on its callers, so it comes from the
+     * parameters the environment reaches, worked out once per run.
      */
     isEnvironmentValue(value: Node): boolean;
     private hasAnswer;
@@ -183,24 +181,31 @@ declare class ResolutionStore {
      * from, for a reader standing at a call. One question covers the
      * whole project: a project has a handful of environment reads and
      * thousands of parameters, and with the read bound the rules run from
-     * each callee to its callers.
-     *
-     * `definedIn` is the callee's own file, read into the store before
-     * the question so a helper nothing had extracted yet is among the
-     * facts the rules run over.
+     * each callee to its callers. The facts README says which files that
+     * reads and why it is asked once.
+     */
+    envNamers(project: Project): EnvironmentNamers;
+    private environmentAnswers;
+    /**
+     * Ask until every call handing the environment on has had its callee
+     * read, one hop a round, so the answer covers each parameter it lands in.
      */
-    envNamers(definedIn: SourceFile): EnvironmentNamers;
+    private followEnvironment;
+    private readCalleeOf;
+    /** The files the parameters an answer is keyed by are declared in. */
+    private filesOf;
     private sitesNamedBy;
     /**
      * Seed every expression that spells the environment, derive, and take
-     * the sites back per parameter. The question is dropped afterwards, so
-     * a later ask over a larger fact set derives it again.
+     * back the read sites per parameter and the parameters the object is
+     * handed to. The question is dropped afterwards, so a later ask over a
+     * larger fact set derives it again.
      *
      * The reads themselves cannot be the seed: one written through a
      * parameter is off an object a scan of the source has no way to pick
      * out, and the whole point of asking is to find those.
      */
-    private askEnvNamers;
+    private askEnvironment;
     /**
      * The project's files that hand the environment object somewhere,
      * read into the store. Which files those are cannot depend on what a

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SourceFile, Node, FunctionDeclaration, FunctionExpression, ArrowFunction, MethodDeclaration, Symbol, CallExpression, PropertyAccessExpression, TaggedTemplateExpression, Project, ImportDeclaration, ArrayLiteralExpression, ObjectLiteralExpression, ObjectLiteralElementLike, Expression, NewExpression, Identifier } from 'ts-morph';
+import { SourceFile, Node, Project, FunctionDeclaration, FunctionExpression, ArrowFunction, MethodDeclaration, Symbol, CallExpression, PropertyAccessExpression, TaggedTemplateExpression, ImportDeclaration, ArrayLiteralExpression, ObjectLiteralExpression, ObjectLiteralElementLike, Expression, NewExpression, Identifier } from 'ts-morph';
 import { TransparentWrapper, RawCondition, DiscoveryPattern, TerminalPattern, InputMappingPattern, EffectArg, CallOps, LanguageAdapter, PatternPack, ExtractorOptions, TimingReport, CacheDiagnostic, ExtractionReport, InvocationRecognizer, AccessRecognizer, RawCodeStructure, RawTerminal, RawBranch, configuredCallOption, RawDeclaredContract, ContractPattern, AstCapableOps, ResponsePropertyMapping } from '@suss/extractor';
 export { EmptyStage, ExtractionReport, PackFunnel, Timer, TimingReport, computeContentHash } from '@suss/extractor';
 import { MessageBusSemantics, DeployableUnit, UnfollowedCall, WrapperReference, BehavioralSummary, BoundaryBinding, Predicate, TypeShape, ValueRef } from '@suss/behavioral-ir';
@@ -86,8 +86,8 @@ declare class ResolutionStore {
     private lastQueryWalked;
     /** See `environmentSiteFiles`; null until the first env question. */
     private envSiteFiles;
-    private envNamersAnswer;
-    private envNamersExtractedAt;
+    /** See `environmentAnswers`; null until the first env question. */
+    private envAnswers;
     private readonly declarations;
     private readonly graph;
     /** See `notePossibleCallers`. */
@@ -171,10 +171,8 @@ declare class ResolutionStore {
      * a pack spells it, a name declared as that, or a parameter some
      * caller hands one to, however many calls deep.
      *
-     * A parameter is the only shape whose answer can change once its
-     * callers are in, and reading those means reading every file that
-     * imports this one, so a value that is not one is answered from what
-     * the store already has.
+     * A parameter's answer depends on its callers, so it comes from the
+     * parameters the environment reaches, worked out once per run.
      */
     isEnvironmentValue(value: Node): boolean;
     private hasAnswer;
@@ -183,24 +181,31 @@ declare class ResolutionStore {
      * from, for a reader standing at a call. One question covers the
      * whole project: a project has a handful of environment reads and
      * thousands of parameters, and with the read bound the rules run from
-     * each callee to its callers.
-     *
-     * `definedIn` is the callee's own file, read into the store before
-     * the question so a helper nothing had extracted yet is among the
-     * facts the rules run over.
+     * each callee to its callers. The facts README says which files that
+     * reads and why it is asked once.
+     */
+    envNamers(project: Project): EnvironmentNamers;
+    private environmentAnswers;
+    /**
+     * Ask until every call handing the environment on has had its callee
+     * read, one hop a round, so the answer covers each parameter it lands in.
      */
-    envNamers(definedIn: SourceFile): EnvironmentNamers;
+    private followEnvironment;
+    private readCalleeOf;
+    /** The files the parameters an answer is keyed by are declared in. */
+    private filesOf;
     private sitesNamedBy;
     /**
      * Seed every expression that spells the environment, derive, and take
-     * the sites back per parameter. The question is dropped afterwards, so
-     * a later ask over a larger fact set derives it again.
+     * back the read sites per parameter and the parameters the object is
+     * handed to. The question is dropped afterwards, so a later ask over a
+     * larger fact set derives it again.
      *
      * The reads themselves cannot be the seed: one written through a
      * parameter is off an object a scan of the source has no way to pick
      * out, and the whole point of asking is to find those.
      */
-    private askEnvNamers;
+    private askEnvironment;
     /**
      * The project's files that hand the environment object somewhere,
      * read into the store. Which files those are cannot depend on what a

package/dist/index.js

@@ -2635,8 +2635,8 @@ var ResolutionStore = class {
   lastQueryWalked = [];
   /** See `environmentSiteFiles`; null until the first env question. */
   envSiteFiles = null;
-  envNamersAnswer = NO_NAMERS;
-  envNamersExtractedAt = -1;
+  /** See `environmentAnswers`; null until the first env question. */
+  envAnswers = null;
   declarations = /* @__PURE__ */ new Map();
   graph = new ModuleGraph();
   /** See `notePossibleCallers`. */
@@ -2862,10 +2862,8 @@ var ResolutionStore = class {
    * a pack spells it, a name declared as that, or a parameter some
    * caller hands one to, however many calls deep.
    *
-   * A parameter is the only shape whose answer can change once its
-   * callers are in, and reading those means reading every file that
-   * imports this one, so a value that is not one is answered from what
-   * the store already has.
+   * A parameter's answer depends on its callers, so it comes from the
+   * parameters the environment reaches, worked out once per run.
    */
   isEnvironmentValue(value) {
     const target = factKeyOf(value);
@@ -2873,17 +2871,14 @@ var ResolutionStore = class {
       this.derive();
       return {
         environment: this.hasAnswer("wantedEnvironmentValue", target),
-        parameter: this.hasAnswer("wantedRefersToParam", target)
+        parameters: this.answersFor("wantedRefersToParam", nodeId(target))
       };
     });
-    if (first.environment || !first.parameter) {
+    if (first.environment || first.parameters.length === 0) {
       return first.environment;
     }
-    this.readPossibleCallersOf(target.getSourceFile());
-    return this.askAbout(target, "wanted", () => {
-      this.derive();
-      return this.hasAnswer("wantedEnvironmentValue", target);
-    });
+    const { receivers } = this.environmentAnswers(target.getProject());
+    return first.parameters.some((parameter) => receivers.has(parameter));
   }
   hasAnswer(relation, target) {
     return this.answersFor(relation, nodeId(target)).length > 0;
@@ -2893,28 +2888,69 @@ var ResolutionStore = class {
    * from, for a reader standing at a call. One question covers the
    * whole project: a project has a handful of environment reads and
    * thousands of parameters, and with the read bound the rules run from
-   * each callee to its callers.
-   *
-   * `definedIn` is the callee's own file, read into the store before
-   * the question so a helper nothing had extracted yet is among the
-   * facts the rules run over.
+   * each callee to its callers. The facts README says which files that
+   * reads and why it is asked once.
    */
-  envNamers(definedIn) {
-    const siteFiles = this.environmentSiteFiles(definedIn.getProject());
+  envNamers(project) {
+    return this.environmentAnswers(project).namers;
+  }
+  environmentAnswers(project) {
+    if (this.envAnswers !== null) {
+      return this.envAnswers;
+    }
+    const siteFiles = this.environmentSiteFiles(project);
     if (siteFiles.length === 0) {
-      return NO_NAMERS;
+      this.envAnswers = { namers: NO_NAMERS, receivers: /* @__PURE__ */ new Set() };
+      return this.envAnswers;
     }
-    this.extractFile(definedIn);
-    if (this.envNamersExtractedAt === this.fullyExtracted.size) {
-      return this.envNamersAnswer;
+    const helpers = this.followEnvironment(siteFiles).byParameter;
+    for (const helperFile of this.filesOf(helpers)) {
+      this.readPossibleCallersOf(helperFile);
     }
-    const answered = this.askEnvNamers([...siteFiles, definedIn]);
+    const { byParameter, receivers } = this.followEnvironment(siteFiles);
     const siteFilePaths = new Set(siteFiles.map((one) => one.getFilePath()));
-    this.envNamersAnswer = {
-      sitesNaming: (parameter) => this.sitesNamedBy(answered, siteFilePaths, parameter)
+    this.envAnswers = {
+      namers: {
+        sitesNaming: (parameter) => this.sitesNamedBy(byParameter, siteFilePaths, parameter)
+      },
+      receivers
     };
-    this.envNamersExtractedAt = this.fullyExtracted.size;
-    return this.envNamersAnswer;
+    return this.envAnswers;
+  }
+  /**
+   * Ask until every call handing the environment on has had its callee
+   * read, one hop a round, so the answer covers each parameter it lands in.
+   */
+  followEnvironment(seeds) {
+    const followed = /* @__PURE__ */ new Set();
+    for (; ; ) {
+      const asked = this.askEnvironment(seeds);
+      const next = asked.passingCalls.filter((call) => !followed.has(call));
+      if (next.length === 0) {
+        return asked;
+      }
+      for (const callId of next) {
+        followed.add(callId);
+        this.readCalleeOf(callId);
+      }
+    }
+  }
+  readCalleeOf(callId) {
+    const call = this.table.byId.get(callId);
+    if (call !== void 0 && (Node7.isCallExpression(call) || Node7.isNewExpression(call))) {
+      this.resolveCallableSources(call.getExpression());
+    }
+  }
+  /** The files the parameters an answer is keyed by are declared in. */
+  filesOf(byParameter) {
+    const files = /* @__PURE__ */ new Set();
+    for (const parameterId of byParameter.keys()) {
+      const parameter = this.table.byId.get(parameterId);
+      if (parameter !== void 0) {
+        files.add(parameter.getSourceFile());
+      }
+    }
+    return files;
   }
   sitesNamedBy(answered, siteFilePaths, parameter) {
     const key = nodeId(parameter);
@@ -2929,15 +2965,18 @@ var ResolutionStore = class {
   }
   /**
    * Seed every expression that spells the environment, derive, and take
-   * the sites back per parameter. The question is dropped afterwards, so
-   * a later ask over a larger fact set derives it again.
+   * back the read sites per parameter and the parameters the object is
+   * handed to. The question is dropped afterwards, so a later ask over a
+   * larger fact set derives it again.
    *
    * The reads themselves cannot be the seed: one written through a
    * parameter is off an object a scan of the source has no way to pick
    * out, and the whole point of asking is to find those.
    */
-  askEnvNamers(seeds) {
+  askEnvironment(seeds) {
     const byParameter = /* @__PURE__ */ new Map();
+    const receivers = /* @__PURE__ */ new Set();
+    const passingCalls = [];
     try {
       for (const [object] of this.db.facts("environmentObject")) {
         this.wantKey("wantedEnvObject", String(object));
@@ -2953,10 +2992,16 @@ var ResolutionStore = class {
         sites.push(node);
         byParameter.set(String(parameter), sites);
       }
+      for (const [parameter] of this.db.facts("wantedEnvParameter")) {
+        receivers.add(String(parameter));
+      }
+      for (const [call] of this.db.facts("wantedEnvPassingCall")) {
+        passingCalls.push(String(call));
+      }
     } finally {
       this.forgetQuery();
     }
-    return byParameter;
+    return { byParameter, receivers, passingCalls };
   }
   /**
    * The project's files that hand the environment object somewhere,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "type": "module",
   "description": "Read a TypeScript or JavaScript codebase with suss and check what each handler returns against every caller, spec and template it can see.",
   "keywords": [
@@ -48,11 +48,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.33.0",
-    "@suss/datalog": "0.33.0",
-    "@suss/extractor": "0.33.0",
-    "@suss/resolution": "0.33.0",
-    "@suss/values": "0.33.0",
+    "@suss/behavioral-ir": "0.33.1",
+    "@suss/datalog": "0.33.1",
+    "@suss/extractor": "0.33.1",
+    "@suss/resolution": "0.33.1",
+    "@suss/values": "0.33.1",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0",