@cplieger/deadset-ts 8.0.0-dev.2 → 8.0.0-dev.21

package/dist/src/dependencies.js

@@ -7,20 +7,28 @@
  * itself is that dependency's need, not the target's.
  */
 import { isArrayLiteralExpression, isCallExpression, isExportDeclaration, isExpressionStatement, isExternalModuleReference, isIdentifier, isImportDeclaration, isImportEqualsDeclaration, isMetaProperty, isNamespaceExport, isObjectLiteralExpression, isPropertyAccessExpression, isPropertyAssignment, isShorthandPropertyAssignment, isStringLiteral, isNoSubstitutionTemplateLiteral, SyntaxKind, } from "@typescript/native/ast";
+import { amdLoadOf, amdPlatform } from "./amd.js";
 import { automaticTypes } from "./automatic-types.js";
-import { configurationFiles, declaredIn as declaredBeside, dependenciesNamed, moduleStrings, outsideChain, } from "./configuration-files.js";
-import { nodeKey, packageScope } from "./inventory.js";
-import { scriptTokens } from "./manifest.js";
-import { dirnamePath, isAbsolutePath, joinPath, relativePath, resolvePath } from "./paths.js";
+import { declaredIn as declaredBeside, dependenciesNamed, moduleStrings, outsideChain, } from "./entries/configuration-files.js";
+import { declarationBindings } from "./import-bindings.js";
+import { nodeKey } from "./inventory.js";
+import { packageScope } from "./load/package-scope.js";
+import { ancestors, cannotStartPackageName, dirnamePath, joinPath, relativePath, resolvePath, } from "./paths.js";
 import { UNANSWERED } from "./query.js";
 import { sourceFilesOf } from "./source-files.js";
-import { workflowTokens } from "./workflow-steps.js";
-const MANIFEST = "package.json";
-const MODULES_DIR = "node_modules";
-const MODULES_SEGMENT = `/${MODULES_DIR}/`;
+import { manifestCommands, nodemonTexts } from "./roots/manifest.js";
+import { writtenName } from "./platform-calls.js";
+import { callsPlatform } from "./platform-symbols.js";
+import { parenthesesRemoved } from "./unwrap.js";
+import { pathsNamed, preloadedPackages, readCommands, } from "./commands/read.js";
+import { heldNames } from "./text/named-files.js";
+import { bytewise } from "./text/compare.js";
+import { isRecord } from "./json-document.js";
+import { inInstalledPackages, INSTALLED_PACKAGES, MANIFEST, readDocument } from "./fs/manifest.js";
+const MODULES_SEGMENT = `/${INSTALLED_PACKAGES}/`;
 const TYPES_SCOPE = "@types/";
-/** A script token naming a JavaScript file by a path no expansion changes. */
-const SCRIPT_FILE = /^[^$`{*?[~]+\.(?:js|mjs|cjs)$/u;
+/** A path a command names that is a JavaScript file's. */
+const SCRIPT_FILE = /\.(?:js|mjs|cjs)$/u;
 /** The manifest sections a dependency is declared in, each by the selector its reference spells. */
 const SECTIONS = [
     ["dependencies", "dependency"],
@@ -39,25 +47,6 @@ export function configurationNeeds(packages) {
 }
 /** The key of {@link ProjectNeeds.at} for a use no file of the target governs. */
 const ANYWHERE = "";
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-/** One JSON document's decoded value, or undefined where it cannot be read or parsed. */
-function readJSON(host, path) {
-    let text;
-    try {
-        text = host.readFile(path);
-    }
-    catch {
-        return undefined;
-    }
-    try {
-        return { text, value: JSON.parse(text) };
-    }
-    catch {
-        return undefined;
-    }
-}
 /**
  * The package a bare module specifier names: its first segment, or its first two
  * where it starts with a scope. A relative, absolute or scheme-prefixed specifier and
@@ -78,7 +67,7 @@ export function packageOfSpecifier(specifier) {
     return second === undefined || second === "" || first === "@" ? undefined : `${first}/${second}`;
 }
 /** The package an installed file belongs to, read below the last dependency directory of its path. */
-function packageOfPath(path) {
+export function packageOfPath(path) {
     const at = path.lastIndexOf(MODULES_SEGMENT);
     return at < 0 ? undefined : packageOfSpecifier(path.slice(at + MODULES_SEGMENT.length));
 }
@@ -166,7 +155,7 @@ function configurationPackages(host, configFile, options, programPackages, parse
         }
         seen.add(file);
         for (const entry of extendsOf(host, file, parse)) {
-            if (entry.startsWith(".") || isAbsolutePath(entry)) {
+            if (cannotStartPackageName(entry)) {
                 const local = resolvePath(dirnamePath(file), entry);
                 pending.push(local.endsWith(".json") ? local : `${local}.json`);
             }
@@ -191,36 +180,19 @@ function importOf(specifier) {
 }
 /** The local names one import declaration binds. */
 function bindingsOf(node) {
-    if (node === undefined) {
-        return [];
-    }
-    if (isImportEqualsDeclaration(node)) {
-        return [node.name];
-    }
-    if (!isImportDeclaration(node) || node.importClause === undefined) {
-        return [];
-    }
-    const clause = node.importClause;
-    const names = clause.name === undefined ? [] : [clause.name];
-    const bindings = clause.namedBindings;
-    if (bindings !== undefined) {
-        if (bindings.kind === SyntaxKind.NamespaceImport) {
-            names.push(bindings.name);
-        }
-        else {
-            names.push(...bindings.elements.map((element) => element.name));
-        }
-    }
-    return names;
+    return node !== undefined && (isImportDeclaration(node) || isImportEqualsDeclaration(node))
+        ? declarationBindings(node).map((binding) => binding.name)
+        : [];
 }
 /**
  * Every package one project needs, and which declaration each use is written in.
  * One local walk and one batched resolution per file: a use of an import binding is
  * an identifier resolving to the binding's own symbol, so a local declaration that
- * shadows the name is not one. A string of a configuration file uses each dependency
- * the manifest beside the file declares that it spells.
+ * shadows the name is not one. A string of a configuration file, as the entry sources
+ * read them in `configuration`, uses each dependency the manifest beside the file
+ * declares that it spells.
  */
-export function projectNeeds(project, held, host, targetRoot, parse) {
+export function projectNeeds(project, held, host, targetRoot, parse, configuration, workflows) {
     const programPackages = new Set();
     for (const name of project.program.getSourceFileNames()) {
         const named = packageOfPath(name);
@@ -271,7 +243,6 @@ export function projectNeeds(project, held, host, targetRoot, parse) {
         return names;
     };
     const files = sourceFilesOf(project, targetRoot);
-    const configuration = configurationFiles(host, targetRoot, files, parse);
     for (const { file, manifestDir } of configuration.modules) {
         const names = declaredAt(joinPath(manifestDir, MANIFEST));
         for (const { node, text } of moduleStrings(file)) {
@@ -280,16 +251,16 @@ export function projectNeeds(project, held, host, targetRoot, parse) {
     }
     for (const { strings, manifestDirs } of configuration.documents) {
         for (const manifestDir of manifestDirs) {
-            const names = declaredAt(joinPath(manifestDir, "package.json"));
+            const names = declaredAt(joinPath(manifestDir, MANIFEST));
             for (const text of strings) {
                 use([PROJECT_OWNER], dependenciesNamed(text, names), joinPath(manifestDir, MANIFEST));
             }
         }
     }
-    const ranFiles = outsideChain(host, targetRoot, files, parse, scriptRunFiles(host, targetRoot, files));
+    const ranFiles = outsideChain(host, targetRoot, files, parse, scriptRunFiles(host, targetRoot, files, workflows));
     for (const { file, manifestDirs } of [...configuration.outside, ...ranFiles]) {
         for (const manifestDir of manifestDirs) {
-            const names = declaredAt(joinPath(manifestDir, "package.json"));
+            const names = declaredAt(joinPath(manifestDir, MANIFEST));
             for (const { text } of moduleStrings(file)) {
                 use([PROJECT_OWNER], dependenciesNamed(text, names), joinPath(manifestDir, MANIFEST));
             }
@@ -298,39 +269,40 @@ export function projectNeeds(project, held, host, targetRoot, parse) {
     return { uses, at, unanswered };
 }
 /**
- * The JavaScript files no program holds that a script of a manifest at or above one of the
- * project's files runs, each with the directory of that manifest, and those a workflow
- * step or git hook runs, with the target root's: a token naming such a file below the
- * target root and in no `node_modules`, read against the manifest's directory.
+ * The JavaScript files no program holds that a command string of a manifest at or above one of
+ * the project's files runs or names, each with the directory of that manifest, and those a
+ * workflow step or git hook names, with the target root's: a path `pathsNamed` reads, below the
+ * target root and in no `node_modules`.
  */
-function scriptRunFiles(host, targetRoot, files) {
+function scriptRunFiles(host, targetRoot, files, workflows) {
     const root = resolvePath(host.workingDirectory(), targetRoot);
     const dirs = new Set([root]);
     for (const name of files.byName.keys()) {
-        for (let dir = dirnamePath(name); !dirs.has(dir); dir = dirnamePath(dir)) {
-            if (relativePath(root, dir) === undefined) {
+        for (const dir of ancestors(dirnamePath(name), root)) {
+            if (dirs.has(dir)) {
                 break;
             }
             dirs.add(dir);
         }
     }
-    const tokens = new Map([
-        [root, new Set(workflowTokens(host, root))],
+    const named = new Map([
+        [root, workflows.readings.flatMap(pathsNamed).map((one) => one.path)],
     ]);
     for (const dir of dirs) {
-        const read = readJSON(host, joinPath(dir, MANIFEST));
+        const read = readDocument(host, joinPath(dir, MANIFEST));
         if (read !== undefined && isRecord(read.value)) {
-            const own = scriptTokensOf(read.value);
-            tokens.set(dir, dir === root ? new Set([...own, ...(tokens.get(root) ?? [])]) : own);
+            const own = manifestReadings(host, dir, read.value)
+                .flatMap(pathsNamed)
+                .map((one) => one.path);
+            named.set(dir, [...own, ...(named.get(dir) ?? [])]);
         }
     }
     const found = [];
-    for (const [manifestDir, held] of tokens) {
-        for (const token of held) {
-            const path = SCRIPT_FILE.test(token) ? resolvePath(manifestDir, token) : undefined;
-            const below = path === undefined ? undefined : relativePath(root, path);
-            if (path !== undefined &&
-                below?.split("/").includes(MODULES_DIR) === false &&
+    for (const [manifestDir, paths] of named) {
+        for (const path of new Set(paths)) {
+            const below = SCRIPT_FILE.test(path) ? relativePath(root, path) : undefined;
+            if (below !== undefined &&
+                !inInstalledPackages(below) &&
                 !files.byName.has(path) &&
                 host.kindOf(path) === "file") {
                 found.push({ path, manifestDir });
@@ -339,6 +311,30 @@ function scriptRunFiles(host, targetRoot, files) {
     }
     return found;
 }
+/** What the command strings of one manifest, its scripts and nodemon's command, run. */
+function manifestReadings(host, dir, manifest) {
+    return manifestCommands(host, dir, manifest).map(({ command }) => readCommands(command, dir));
+}
+/** What one manifest's command strings use, held with the whole text of nodemon's configuration. */
+function manifestUses(host, dir, manifest) {
+    const uses = usesOf(manifestReadings(host, dir, manifest));
+    const texts = nodemonTexts(host, dir, manifest).map(({ text }) => text);
+    return { ...uses, held: [uses.held, ...texts].join("\n") };
+}
+/** What the target root's workflow steps, git hooks and recipes use, held with their files' whole text. */
+function workflowUses(workflows) {
+    const uses = usesOf(workflows.readings);
+    return { ...uses, held: [uses.held, ...workflows.texts].join("\n") };
+}
+function usesOf(readings) {
+    return {
+        words: new Set(readings.flatMap((one) => one.commands.flatMap((command) => command.words.flatMap((word) => word ?? [])))),
+        preloads: new Set(readings
+            .flatMap((one) => one.runs.flatMap(preloadedPackages))
+            .flatMap((specifier) => packageOfSpecifier(specifier) ?? [])),
+        held: readings.map((one) => one.held).join("\n"),
+    };
+}
 /** The declarations of the inventory a use written at one node belongs to. */
 function ownersOf(file, held, node) {
     const parent = node.parent;
@@ -414,7 +410,16 @@ function fileNeeds(project, held, file, { programPackages, automatic }, use) {
     if (names.size > 0 || automatic.globals.size > 0) {
         visit(file);
     }
-    const asked = [...specifiers, ...bindings.map(({ node }) => node), ...candidates, ...globals];
+    const loads = runtimeLoads(file);
+    const callees = loads.flatMap((load) => load.callees);
+    const amdCallees = new Set(loads.flatMap((load) => (load.amd ? load.callees : [])));
+    const asked = [
+        ...specifiers,
+        ...bindings.map(({ node }) => node),
+        ...candidates,
+        ...globals,
+        ...callees,
+    ];
     const handles = asked.map((node) => project.handle(node));
     const resolved = project.symbolsAt(handles);
     const packagesOf = new Map();
@@ -485,33 +490,80 @@ function fileNeeds(project, held, file, { programPackages, automatic }, use) {
     for (const reference of file.typeReferenceDirectives) {
         use(ownersOf(file, held, file), typePackages(reference.fileName, programPackages));
     }
-    for (const specifier of resolvedSpecifiers(file)) {
-        const named = packageOfSpecifier(specifier.text);
-        if (named !== undefined) {
+    // A callee the checker leaves unanswered may be a require, so its call holds the
+    // dependency it names by live code, as program.33 holds one.
+    const calleesAt = unresolvedAt + globals.length;
+    const decided = new Map();
+    const requires = new Set();
+    const unansweredCallees = new Set();
+    callees.forEach((callee, index) => {
+        const symbol = resolved[calleesAt + index];
+        if (symbol === UNANSWERED) {
+            unansweredCallees.add(callee);
+            return;
+        }
+        // The decision reads the callee's symbol, its written name and its platform name, and nothing else.
+        const platform = amdCallees.has(callee) ? amdPlatform(callee) : "require";
+        const key = symbol === undefined ? undefined : `${symbol.id}\u0000${platform}\u0000${callee.text}`;
+        const answer = (key === undefined ? undefined : decided.get(key)) ??
+            callsPlatform(project, platform, callee, symbol);
+        if (key !== undefined) {
+            decided.set(key, answer);
+        }
+        if (answer) {
+            requires.add(callee);
+        }
+    });
+    for (const { specifier, named, callees: through } of loads) {
+        if (through.length === 0 || through.some((one) => requires.has(one))) {
             use(ownersOf(file, held, specifier), [named]);
         }
+        else if (through.some((one) => unansweredCallees.has(one))) {
+            use([PROJECT_OWNER], [named]);
+        }
     }
     return resolved.slice(0, specifiers.length).includes(UNANSWERED);
 }
 /**
- * The literal specifiers one file asks the runtime to resolve, through `import.meta.resolve`
- * or `require.resolve`, each of which needs the package it names installed.
+ * The calls one file may load or resolve a package with at run time, each of whose first
+ * argument is literal text naming a package: a `require()` call, which the compiler lists among
+ * a file's imports only in a JavaScript file and only through the bare name; a `.resolve` of
+ * another name, which needs it where that name is a `require`; and `import.meta.resolve` or
+ * a `.resolve` of the name `require`, whatever it names, a use where it stands; and each id of
+ * an AMD dependency list (references-ts.37), which needs it where the call is AMD's.
  */
-function resolvedSpecifiers(file) {
+function runtimeLoads(file) {
     const found = [];
-    if (!file.text.includes(".resolve(")) {
-        return found;
-    }
     const visit = (node) => {
-        if (isCallExpression(node) && isPropertyAccessExpression(node.expression)) {
-            const callee = node.expression;
+        const amd = amdLoadOf(node);
+        if (amd !== undefined) {
+            for (const { id } of amd.ids) {
+                const named = packageOfSpecifier(id.text);
+                if (named !== undefined) {
+                    found.push({ specifier: id, named, callees: [amd.callee], amd: true });
+                }
+            }
+        }
+        else if (isCallExpression(node)) {
             const [argument] = node.arguments;
-            const receiver = callee.expression;
-            const resolving = callee.name.text === "resolve" &&
-                ((isMetaProperty(receiver) && receiver.name.text === "meta") ||
-                    (isIdentifier(receiver) && receiver.text === "require"));
-            if (resolving && argument !== undefined && isLiteralText(argument)) {
-                found.push(argument);
+            if (argument !== undefined && isLiteralText(argument)) {
+                const named = packageOfSpecifier(argument.text);
+                const callee = parenthesesRemoved(node.expression);
+                const receiver = isPropertyAccessExpression(callee) && callee.name.text === "resolve"
+                    ? parenthesesRemoved(callee.expression)
+                    : undefined;
+                const stands = receiver !== undefined &&
+                    ((isMetaProperty(receiver) && receiver.name.text === "meta") ||
+                        (isIdentifier(receiver) && receiver.text === "require"));
+                const callees = stands
+                    ? []
+                    : [
+                        writtenName(callee),
+                        receiver === undefined ? undefined : writtenName(receiver),
+                    ].filter((one) => one !== undefined);
+                if (named !== undefined && (stands || callees.length > 0)) {
+                    found.push({ specifier: argument, named, callees, amd: false });
+                }
             }
         }
         node.forEachChild(visit);
@@ -600,8 +652,8 @@ function lineAndColumn(text, offset) {
 }
 /** The installed copy of one dependency, read where the package manager puts it for the target. */
 function installedOf(host, root, name) {
-    for (let dir = root;; dir = dirnamePath(dir)) {
-        const read = readJSON(host, joinPath(dir, MODULES_DIR, name, MANIFEST));
+    for (const dir of ancestors(root)) {
+        const read = readDocument(host, joinPath(dir, INSTALLED_PACKAGES, name, MANIFEST));
         if (read !== undefined && isRecord(read.value)) {
             const bin = read.value["bin"];
             const peers = read.value["peerDependencies"];
@@ -617,10 +669,8 @@ function installedOf(host, root, name) {
                         : [],
             };
         }
-        if (dirnamePath(dir) === dir) {
-            return undefined;
-        }
     }
+    return undefined;
 }
 /** Every dependency the manifest text at `path` declares, in the order the text writes them. */
 function declaredIn(text, manifest, path, scope) {
@@ -651,19 +701,6 @@ function declaredIn(text, manifest, path, scope) {
 export function declarationKey(dependency) {
     return `${dependency.position.path}\u0000${dependency.name}`;
 }
-/** Every token of every value of one manifest's `scripts` member. */
-function scriptTokensOf(manifest) {
-    const scripts = manifest["scripts"];
-    const found = new Set();
-    if (isRecord(scripts)) {
-        for (const command of Object.values(scripts)) {
-            if (typeof command === "string") {
-                scriptTokens(command).forEach((token) => found.add(token));
-            }
-        }
-    }
-    return found;
-}
 /** Whether a path below the target root lies in the directory `dir` below it, `""` being the root. */
 function isInside(path, dir) {
     return dir === "" || path.startsWith(`${dir}/`);
@@ -717,7 +754,7 @@ function addNeededPeers(declared, peers, needed, ran) {
  * manifest declares nothing, nor does a nested package's uninstalled dependency, because
  * no run requires a nested package to be installed.
  */
-export function dependenciesOf(host, targetRoot, perProject, candidates, members = [], unbuiltMembers = [], nested = []) {
+export function dependenciesOf(host, targetRoot, workflows, perProject, candidates, members = [], unbuiltMembers = [], nested = []) {
     const root = resolvePath(host.workingDirectory(), targetRoot);
     const scopeOf = packageScope(host, targetRoot);
     const manifests = new Map([[root, MANIFEST]]);
@@ -734,29 +771,35 @@ export function dependenciesOf(host, targetRoot, perProject, candidates, members
             unbuilt.add(path);
         }
     }
-    const workflow = new Set(workflowTokens(host, targetRoot));
+    const workflow = workflowUses(workflows);
     const declared = [];
     const ran = new Set();
     const peers = new Map();
     const uninstalledHere = new Set(nested);
     for (const [dir, path] of manifests) {
-        const read = readJSON(host, joinPath(dir, MANIFEST));
+        const read = readDocument(host, joinPath(dir, MANIFEST));
         if (read === undefined || !isRecord(read.value)) {
             continue;
         }
-        const tokens = scriptTokensOf(read.value);
+        const own = manifestUses(host, dir, read.value);
+        const held = `${own.held}\n${workflow.held}`;
         for (const dependency of declaredIn(read.text, read.value, path, scopeOf(path))) {
             const found = installedOf(host, dir, dependency.name);
             if (found === undefined && uninstalledHere.has(dir)) {
                 continue;
             }
             declared.push(dependency);
+            if (own.preloads.has(dependency.name) ||
+                workflow.preloads.has(dependency.name) ||
+                heldNames(held, [dependency.name]).size > 0) {
+                ran.add(declarationKey(dependency));
+            }
             if (found === undefined) {
                 continue;
             }
             peers.set(declarationKey(dependency), found.peers);
-            const runs = (command) => tokens.has(command) || workflow.has(command);
-            if (found.commands.some(runs)) {
+            const runs = (command) => own.words.has(command) || workflow.words.has(command);
+            if (found.commands.some(runs) || heldNames(held, found.commands).size > 0) {
                 ran.add(declarationKey(dependency));
             }
         }
@@ -812,7 +855,7 @@ export function dependenciesOf(host, targetRoot, perProject, candidates, members
     const heldBy = new Map();
     for (const [key, held] of holders) {
         if (!live.has(key) && !ran.has(key)) {
-            heldBy.set(key, [...held].sort((a, b) => (a < b ? -1 : 1)));
+            heldBy.set(key, [...held].sort(bytewise));
         }
     }
     const users = new Map();
@@ -824,7 +867,7 @@ export function dependenciesOf(host, targetRoot, perProject, candidates, members
     for (const id of candidates) {
         const sole = [...(uses.get(id) ?? [])].filter((one) => users.get(one) === 1 && names.has(one));
         if (sole.length > 0) {
-            lastUses.set(id, sole.sort((a, b) => (a < b ? -1 : 1)));
+            lastUses.set(id, sole.sort(bytewise));
         }
     }
     const owners = new Map();
@@ -836,7 +879,7 @@ export function dependenciesOf(host, targetRoot, perProject, candidates, members
         }
     }
     const fileLastUses = new Map();
-    for (const [one, held] of [...owners].sort(([a], [b]) => (a < b ? -1 : 1))) {
+    for (const [one, held] of [...owners].sort(([a], [b]) => bytewise(a, b))) {
         const paths = new Set([...held].map((owner) => owner.replace(/:\d+:\d+$/u, "")));
         const [path] = paths;
         if (paths.size === 1 && path !== undefined && path !== PROJECT_OWNER) {

package/dist/src/destructuring.js

@@ -156,8 +156,6 @@ function sourceOf(target) {
 export function destructuring(project, cap, properties = propertyTables(project.queries)) {
     const queries = project.queries;
     const tables = new Map();
-    let patternBatches = 0;
-    let patternLookups = 0;
     const tableOf = (type) => {
         const known = tables.get(type.id);
         if (known !== undefined) {
@@ -166,7 +164,6 @@ export function destructuring(project, cap, properties = propertyTables(project.
         let table = new Map();
         if ((type.flags & TypeFlags.AnyOrUnknown) === 0) {
             const read = properties.of(type);
-            patternLookups += read.asked ? 1 : 0;
             table = isAnswered(read.properties)
                 ? new Map(read.properties.map((property) => [property.name, property]))
                 : UNANSWERED;
@@ -178,7 +175,6 @@ export function destructuring(project, cap, properties = propertyTables(project.
         if ((type.flags & TypeFlags.Union) === 0) {
             return type;
         }
-        patternLookups += 1;
         return queries.nonNullable(type);
     };
     /**
@@ -193,11 +189,9 @@ export function destructuring(project, cap, properties = propertyTables(project.
             if (index === undefined) {
                 return undefined;
             }
-            patternLookups += 1;
             const elements = queries.typeArguments(type);
             return isAnswered(elements) ? elements[index] : UNANSWERED;
         }
-        patternLookups += 1;
         const array = queries.isArray(type);
         if (!isAnswered(array)) {
             return UNANSWERED;
@@ -205,7 +199,6 @@ export function destructuring(project, cap, properties = propertyTables(project.
         if (!array) {
             return undefined;
         }
-        patternLookups += 1;
         const elements = queries.typeArguments(type);
         return isAnswered(elements) ? elements[0] : UNANSWERED;
     };
@@ -222,14 +215,12 @@ export function destructuring(project, cap, properties = propertyTables(project.
         if (more.length > 0) {
             return UNANSWERED;
         }
-        patternLookups += 1;
         return queries.typeOfSymbol(property);
     };
     const resultOf = (callee) => {
         if (callee === undefined || callee === UNANSWERED) {
             return callee;
         }
-        patternLookups += 1;
         const signatures = queries.signaturesOf(callee, SignatureKind.Call);
         if (!isAnswered(signatures)) {
             return UNANSWERED;
@@ -238,7 +229,6 @@ export function destructuring(project, cap, properties = propertyTables(project.
         if (signature === undefined) {
             return undefined;
         }
-        patternLookups += 1;
         return queries.returnTypeOf(signature);
     };
     const iterations = new Map();
@@ -266,7 +256,6 @@ export function destructuring(project, cap, properties = propertyTables(project.
         if (result !== undefined && result !== UNANSWERED) {
             let parts = [result];
             if (result.isUnionType()) {
-                patternLookups += 1;
                 parts = queries.constituents(result);
             }
             const values = isAnswered(parts)
@@ -296,7 +285,6 @@ export function destructuring(project, cap, properties = propertyTables(project.
             if (property === undefined) {
                 return undefined;
             }
-            patternLookups += 1;
             return queries.typeOfSymbol(property);
         }
         return elementOf(defined, next.index);
@@ -317,7 +305,6 @@ export function destructuring(project, cap, properties = propertyTables(project.
             }
         }
         const asked = [...asking];
-        patternBatches += Math.ceil(asked.length / cap);
         const answered = new Map();
         queries.typesAt(asked, cap).forEach((type, index) => {
             const node = asked[index];
@@ -347,10 +334,5 @@ export function destructuring(project, cap, properties = propertyTables(project.
             return isAnswered(table) ? table.get(read.name) : UNANSWERED;
         });
     };
-    return {
-        resolve,
-        get cost() {
-            return { patternBatches, patternLookups };
-        },
-    };
+    return { resolve };
 }