@suss/adapter-typescript 0.13.0 → 0.13.2

package/dist/index.cjs

@@ -2688,13 +2688,22 @@ var ORIGIN = {
   declaredBy: (origin, receiver) => receiver.callee !== null && origin.importedFrom.some(
     (module2) => methodDeclaredIn(receiver.callee, module2, receiver.resolve)
   ),
-  constructed: (origin, receiver) => origin.importedFrom.some(
+  constructed: (origin, receiver) => madeFromNamed(origin, madeBy(receiver)) && origin.importedFrom.some(
     (module2) => isImportedFrom(madeBy(receiver), module2)
   )
 };
+function madeFromNamed(origin, made) {
+  if (origin.origin !== "constructed" || origin.named === void 0) {
+    return true;
+  }
+  return origin.named.includes(made.getText());
+}
 var CALL_ORIGIN = {
   declaredBy: ORIGIN.declaredBy,
-  constructed: (origin, receiver) => origin.importedFrom.some(
+  constructed: (origin, receiver) => madeFromNamed(
+    origin,
+    rootIdentifier(receiver.expression) ?? receiver.expression
+  ) && origin.importedFrom.some(
     (module2) => isImportedFrom(
       rootIdentifier(receiver.expression) ?? receiver.expression,
       module2
@@ -2746,6 +2755,7 @@ function valueOpsFor(value, resolve2) {
   };
   return {
     text: () => literalText(written()),
+    name: (unsettled) => readName(written(), { resolve: resolve2, unsettled }),
     flag: () => literalFlag(written()),
     entries: (unsettled) => entriesOf(written(), unsettled, resolve2),
     items: () => itemsOf(written(), resolve2),

package/dist/index.d.cts

@@ -1,10 +1,8 @@
 import { SourceFile, Node, FunctionDeclaration, FunctionExpression, ArrowFunction, MethodDeclaration, CallExpression, Project, Symbol, Expression, NewExpression, TaggedTemplateExpression, PropertyAccessExpression } from 'ts-morph';
-import { PackDeclarations, TransparentWrapper, RawCondition, DiscoveryPattern, TerminalPattern, InputMappingPattern, LanguageAdapter, PatternPack, ExtractorOptions, InvocationRecognizer, AccessRecognizer, RawCodeStructure, RawTerminal, RawBranch, EffectArg, RawDeclaredContract, ContractPattern, ResponsePropertyMapping } from '@suss/extractor';
+import { PackDeclarations, TransparentWrapper, RawCondition, DiscoveryPattern, TerminalPattern, InputMappingPattern, LanguageAdapter, PatternPack, ExtractorOptions, InvocationRecognizer, AccessRecognizer, RawCodeStructure, RawTerminal, RawBranch, EffectArg, RawDeclaredContract, ContractPattern, AstCapableOps, CallOps, ResponsePropertyMapping } from '@suss/extractor';
 import { BehavioralSummary, MessageBusSemantics, DeployableUnit, BoundaryBinding, Predicate, TypeShape, ValueRef } from '@suss/behavioral-ir';
 import { Proof, Atom } from '@suss/datalog';
 import { ResolutionExplanation } from '@suss/resolution';
-import { AstCapableOps } from '@suss/recognize/ast';
-import { CallOps } from '@suss/recognize';
 
 /**
  * cache.ts: the on-disk extraction cache.
@@ -1014,7 +1012,7 @@ declare function parseConditionExpression(expr: Expression, depth?: number): Pre
  *
  * Every question here was already worked out somewhere in this adapter,
  * once per pack that needed it. Collecting them behind the one
- * interface `@suss/recognize` declares is what lets a pack stop being a
+ * interface `@suss/extractor` declares is what lets a pack stop being a
  * walk over ts-morph and start being data.
  *
  * Two of the receiver origins are implemented. The migration plan for
@@ -1106,7 +1104,7 @@ interface TsInvocationRecognizerContext {
     resolveWrittenValue(value: Node): Node | null;
     /**
      * What a declared pack asks about this call, in the vocabulary
-     * `@suss/recognize` defines. A pack written as a chain of data links
+     * `@suss/extractor` defines. A pack written as a chain of data links
      * reads only this; the members above are what a pack written as code
      * reaches for.
      */

package/dist/index.d.ts

@@ -1,10 +1,8 @@
 import { SourceFile, Node, FunctionDeclaration, FunctionExpression, ArrowFunction, MethodDeclaration, CallExpression, Project, Symbol, Expression, NewExpression, TaggedTemplateExpression, PropertyAccessExpression } from 'ts-morph';
-import { PackDeclarations, TransparentWrapper, RawCondition, DiscoveryPattern, TerminalPattern, InputMappingPattern, LanguageAdapter, PatternPack, ExtractorOptions, InvocationRecognizer, AccessRecognizer, RawCodeStructure, RawTerminal, RawBranch, EffectArg, RawDeclaredContract, ContractPattern, ResponsePropertyMapping } from '@suss/extractor';
+import { PackDeclarations, TransparentWrapper, RawCondition, DiscoveryPattern, TerminalPattern, InputMappingPattern, LanguageAdapter, PatternPack, ExtractorOptions, InvocationRecognizer, AccessRecognizer, RawCodeStructure, RawTerminal, RawBranch, EffectArg, RawDeclaredContract, ContractPattern, AstCapableOps, CallOps, ResponsePropertyMapping } from '@suss/extractor';
 import { BehavioralSummary, MessageBusSemantics, DeployableUnit, BoundaryBinding, Predicate, TypeShape, ValueRef } from '@suss/behavioral-ir';
 import { Proof, Atom } from '@suss/datalog';
 import { ResolutionExplanation } from '@suss/resolution';
-import { AstCapableOps } from '@suss/recognize/ast';
-import { CallOps } from '@suss/recognize';
 
 /**
  * cache.ts: the on-disk extraction cache.
@@ -1014,7 +1012,7 @@ declare function parseConditionExpression(expr: Expression, depth?: number): Pre
  *
  * Every question here was already worked out somewhere in this adapter,
  * once per pack that needed it. Collecting them behind the one
- * interface `@suss/recognize` declares is what lets a pack stop being a
+ * interface `@suss/extractor` declares is what lets a pack stop being a
  * walk over ts-morph and start being data.
  *
  * Two of the receiver origins are implemented. The migration plan for
@@ -1106,7 +1104,7 @@ interface TsInvocationRecognizerContext {
     resolveWrittenValue(value: Node): Node | null;
     /**
      * What a declared pack asks about this call, in the vocabulary
-     * `@suss/recognize` defines. A pack written as a chain of data links
+     * `@suss/extractor` defines. A pack written as a chain of data links
      * reads only this; the members above are what a pack written as code
      * reaches for.
      */

package/dist/index.js

@@ -2651,13 +2651,22 @@ var ORIGIN = {
   declaredBy: (origin, receiver) => receiver.callee !== null && origin.importedFrom.some(
     (module) => methodDeclaredIn(receiver.callee, module, receiver.resolve)
   ),
-  constructed: (origin, receiver) => origin.importedFrom.some(
+  constructed: (origin, receiver) => madeFromNamed(origin, madeBy(receiver)) && origin.importedFrom.some(
     (module) => isImportedFrom(madeBy(receiver), module)
   )
 };
+function madeFromNamed(origin, made) {
+  if (origin.origin !== "constructed" || origin.named === void 0) {
+    return true;
+  }
+  return origin.named.includes(made.getText());
+}
 var CALL_ORIGIN = {
   declaredBy: ORIGIN.declaredBy,
-  constructed: (origin, receiver) => origin.importedFrom.some(
+  constructed: (origin, receiver) => madeFromNamed(
+    origin,
+    rootIdentifier(receiver.expression) ?? receiver.expression
+  ) && origin.importedFrom.some(
     (module) => isImportedFrom(
       rootIdentifier(receiver.expression) ?? receiver.expression,
       module
@@ -2709,6 +2718,7 @@ function valueOpsFor(value, resolve2) {
   };
   return {
     text: () => literalText(written()),
+    name: (unsettled) => readName(written(), { resolve: resolve2, unsettled }),
     flag: () => literalFlag(written()),
     entries: (unsettled) => entriesOf(written(), unsettled, resolve2),
     items: () => itemsOf(written(), resolve2),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "type": "module",
   "description": "TypeScript adapter for suss — walks source files with ts-morph and emits raw extractions for the suss pipeline.",
   "keywords": [
@@ -46,11 +46,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.13.0",
-    "@suss/datalog": "0.13.0",
-    "@suss/extractor": "0.13.0",
-    "@suss/recognize": "0.13.0",
-    "@suss/resolution": "0.13.0",
+    "@suss/behavioral-ir": "0.13.2",
+    "@suss/datalog": "0.13.2",
+    "@suss/extractor": "0.13.2",
+    "@suss/resolution": "0.13.2",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0"