@skastr0/quartz-engine 0.2.0 → 0.2.1

package/dist/index.js

@@ -740,8 +740,7 @@ var isDefault = (node) => {
   const modifiers = node.modifierFlags;
   return modifiers !== undefined && (modifiers & ModifierFlags.Default) !== 0;
 };
-var exportMatchesFor = async (project, source) => {
-  const moduleSymbol = await project.checker.getSymbolAtLocation(source);
+var exportMatchesFor = async (project, moduleSymbol) => {
   if (moduleSymbol === undefined)
     return [];
   const exported = await project.checker.getExportsOfModule(moduleSymbol);
@@ -776,7 +775,8 @@ var exportMatchesFor = async (project, source) => {
   return matches;
 };
 var exportedMatches = async (project, sourceFiles) => {
-  const all = await Promise.all(sourceFiles.map((source) => exportMatchesFor(project, source)));
+  const moduleSymbols = await project.checker.getSymbolOfSourceFile(sourceFiles.map((sourceFile) => sourceFile.fileName));
+  const all = await Promise.all(moduleSymbols.map((moduleSymbol) => exportMatchesFor(project, moduleSymbol)));
   return all.flat();
 };
 var exportedMatchesFor = (context, project, packageInfo, revision, sourceFiles) => context.cacheForRevision(`exported-matches:${packageInfo.tsconfigPath}`, revision, () => exportedMatches(project, sourceFiles));
@@ -900,7 +900,8 @@ var makeTypeInfo = async (match, project, packageInfo, root) => {
   return properties.length > 0 ? { ...result, properties } : result;
 };
 var metadataFor = async (project, source) => {
-  const matches = await exportMatchesFor(project, source);
+  const moduleSymbol = await project.checker.getSymbolOfSourceFile(source.fileName);
+  const matches = await exportMatchesFor(project, moduleSymbol);
   const direct = declarationsIn(source).flatMap((node) => {
     const name = declarationName(node);
     if (name === undefined)
@@ -1221,7 +1222,7 @@ var createLeafOperations = (context) => {
 // src/reference-operations.ts
 import { relative as relative4, resolve as resolve6 } from "path";
 import { SyntaxKind as SyntaxKind2 } from "typescript/unstable/ast";
-import { isTypeReferenceNode as isTypeReferenceNode2 } from "typescript/unstable/ast/is";
+import { isIdentifier as isIdentifier2, isTypeReferenceNode as isTypeReferenceNode2 } from "typescript/unstable/ast/is";
 var PRIMITIVE_NAMES = {
   string: true,
   number: true,
@@ -1271,12 +1272,12 @@ var createReferenceOperations = (context) => ({
     if (rootTarget === null)
       return null;
     const nodes = [symbolName];
-    const nodeIds = new Set([String(rootTarget.symbol.id)]);
+    const nodeIds = new Set([await symbolIdentity(project, rootTarget.symbol)]);
     const edges = [];
     const edgeKeys = new Set;
     const visited = new Set;
     const visit = async (target, displayName, currentDepth) => {
-      const targetId = String(target.symbol.id);
+      const targetId = await symbolIdentity(project, target.symbol);
       if (visited.has(targetId) || currentDepth > depth)
         return;
       visited.add(targetId);
@@ -1287,9 +1288,10 @@ var createReferenceOperations = (context) => ({
         const child = await targets.lookup(reference.symbol);
         if (child === null)
           continue;
-        const childId = String(child.symbol.id);
+        const childId = await symbolIdentity(project, child.symbol);
         const childName = child.symbol.name;
         if (!nodeIds.has(childId)) {
+          nodeIds.add(childId);
           nodes.push(childName);
         }
         const edgeKey = `${targetId}:${childId}:${reference.context}`;
@@ -1430,8 +1432,10 @@ var buildDeclarationTargetIndex = async (project, packagePath, rootPath) => {
     }
   }
   if (!byName.has("default")) {
-    for (const sourceFile of sourceFiles) {
-      const moduleSymbol = await project.checker.getSymbolAtLocation(sourceFile);
+    const moduleSymbols = await project.checker.getSymbolOfSourceFile(sourceFiles.map((sourceFile) => sourceFile.fileName));
+    for (let index = 0;index < sourceFiles.length; index += 1) {
+      const sourceFile = sourceFiles[index];
+      const moduleSymbol = moduleSymbols[index];
       if (moduleSymbol === undefined)
         continue;
       const exports = await project.checker.getExportsOfModule(moduleSymbol);
@@ -1494,8 +1498,10 @@ var findTargetByScan = async (project, packagePath, rootPath, requestedName) =>
       return { symbol: canonical, declaration, packagePath, rootPath };
   }
   if (requestedName === "default") {
-    for (const sourceFile of sourceFiles) {
-      const moduleSymbol = await project.checker.getSymbolAtLocation(sourceFile);
+    const moduleSymbols = await project.checker.getSymbolOfSourceFile(sourceFiles.map((sourceFile) => sourceFile.fileName));
+    for (let index = 0;index < sourceFiles.length; index += 1) {
+      const sourceFile = sourceFiles[index];
+      const moduleSymbol = moduleSymbols[index];
       if (moduleSymbol === undefined)
         continue;
       const exports = await project.checker.getExportsOfModule(moduleSymbol);
@@ -1557,11 +1563,11 @@ var findIncomingReferences = async (project, target) => {
   const declarationName2 = declarationNameNode(target.declaration) ?? target.declaration;
   const declarationPosition = declarationName2.getStart(declarationName2.getSourceFile());
   try {
-    const referenced = await project.checker.getReferencedSymbolsForNode(declarationName2, declarationPosition);
+    const referenced = await project.languageService.getReferencedSymbolsForNode(declarationName2, declarationPosition);
     for (const entry of referenced) {
       const handles = [entry.definition, ...entry.references];
       for (const handle of handles) {
-        const node = await handle.resolve(project);
+        const node = await resolveIdentifierHandle(project, handle);
         if (node !== undefined)
           await add(node, entry.symbol ?? target.symbol);
       }
@@ -1600,7 +1606,7 @@ var findOutgoingReferences = async (project, target) => {
     const resolved = await resolveSymbol(project, symbol);
     if (resolved.id === target.symbol.id || PRIMITIVE_NAMES[resolved.name] === true)
       return;
-    const key = `${resolved.id}:${context}`;
+    const key = `${await symbolIdentity(project, resolved)}:${context}`;
     if (seen.has(key))
       return;
     seen.add(key);
@@ -1633,12 +1639,12 @@ var findRenameSites = async (project, target) => {
   const declarationName2 = declarationNameNode(target.declaration) ?? target.declaration;
   const position = declarationName2.getStart(declarationName2.getSourceFile());
   try {
-    const referenced = await project.checker.getReferencedSymbolsForNode(declarationName2, position);
+    const referenced = await project.languageService.getReferencedSymbolsForNode(declarationName2, position);
     for (const entry of referenced) {
       const handles = [entry.definition, ...entry.references];
       for (const handle of handles) {
-        const node = await handle.resolve(project);
-        if (node === undefined || node.kind !== SyntaxKind2.Identifier)
+        const node = await resolveIdentifierHandle(project, handle);
+        if (node === undefined)
           continue;
         const sourceFile = node.getSourceFile();
         if (!isProjectSourceFile(sourceFile.fileName, target.packagePath))
@@ -1692,17 +1698,24 @@ var findContainingSymbol = async (project, start, target) => {
     current = current.parent;
   }
   const sourceFile = start.getSourceFile();
-  const moduleSymbol = await project.checker.getSymbolAtLocation(sourceFile);
+  const moduleSymbol = await project.checker.getSymbolOfSourceFile(sourceFile.fileName);
   return moduleSymbol?.name ?? "anonymous";
 };
 var resolveSymbol = async (project, symbol) => {
+  let resolved = symbol;
   try {
-    return await project.checker.getAliasedSymbol(symbol);
-  } catch {
-    return symbol;
-  }
+    resolved = await project.checker.getAliasedSymbol(resolved);
+  } catch {}
+  return project.checker.getTargetSymbol(resolved);
 };
 var matchesCanonicalSymbol = async (project, candidate, target) => (await resolveSymbol(project, candidate)).id === target.id;
+var symbolIdentity = async (project, symbol) => project.checker.getFullyQualifiedName(await resolveSymbol(project, symbol));
+var resolveIdentifierHandle = async (project, handle) => {
+  if (handle.kind !== SyntaxKind2.Identifier)
+    return;
+  const node = await handle.resolve(project);
+  return node !== undefined && isIdentifier2(node) ? node : undefined;
+};
 var projectSourceFiles = async (project, packagePath) => {
   const names = await project.program.getSourceFileNames();
   const files = [];
@@ -1776,6 +1789,12 @@ var isTypeReferencePosition = (node) => {
   return parent !== undefined && (parent.kind === SyntaxKind2.TypeReference || parent.kind === SyntaxKind2.ExpressionWithTypeArguments || isTypeReferenceNode2(parent));
 };
 var classifyReferenceContext = (parent) => {
+  let ancestor = parent;
+  while (ancestor !== undefined && ancestor.kind !== SyntaxKind2.SourceFile) {
+    if (ancestor.kind === SyntaxKind2.HeritageClause)
+      return "extends";
+    ancestor = ancestor.parent;
+  }
   switch (parent.kind) {
     case SyntaxKind2.HeritageClause:
       return "extends";
@@ -2030,9 +2049,18 @@ var symbolsForSeeds = async (project, seeds) => {
     nodes.push(node);
   }
   const symbols = nodes.length === 0 ? [] : await project.checker.getSymbolAtLocation(nodes);
+  const canonical = await Promise.all(symbols.map(async (symbol) => {
+    if (symbol === undefined)
+      return;
+    const target = await project.checker.getTargetSymbol(symbol);
+    return {
+      symbol: target,
+      identity: await project.checker.getFullyQualifiedName(target)
+    };
+  }));
   const bySeed = new Map;
   for (let index = 0;index < symbols.length; index += 1) {
-    const symbol = symbols[index];
+    const symbol = canonical[index];
     if (symbol !== undefined)
       bySeed.set(indexes[index], symbol);
   }
@@ -2042,8 +2070,10 @@ var groupCandidateSeeds = (seeds, symbols) => {
   const groups = new Map;
   for (let index = 0;index < seeds.length; index += 1) {
     const seed = seeds[index];
-    const symbol = symbols.get(index) ?? null;
-    const callableId = symbol === null ? seed.callableId : `${symbol.id}:${seed.kind}`;
+    const symbolInfo = symbols.get(index);
+    const symbol = symbolInfo?.symbol ?? null;
+    const symbolIdentity2 = symbolInfo?.identity ?? null;
+    const callableId = symbolIdentity2 === null ? seed.callableId : `${symbolIdentity2}:${seed.kind}`;
     const existing = groups.get(callableId);
     groups.set(callableId, existing === undefined ? { seed, symbol, seedCount: 1 } : { ...existing, seedCount: existing.seedCount + 1 });
   }
@@ -2308,7 +2338,16 @@ var loadTransformIndex = async (project) => {
   const sourceFiles = [];
   for (let start = 0;start < sourceNames.length; start += SOURCE_FILE_BATCH_SIZE) {
     const batch = await Promise.all(sourceNames.slice(start, start + SOURCE_FILE_BATCH_SIZE).map((name) => project.program.getSourceFile(name)));
-    sourceFiles.push(...batch.filter((sourceFile) => sourceFile !== undefined && !sourceFile.isDeclarationFile && !sourceFile.fileName.includes("node_modules")));
+    const eligible = await Promise.all(batch.map(async (sourceFile) => {
+      if (sourceFile === undefined || sourceFile.isDeclarationFile)
+        return;
+      const [external, defaultLibrary] = await Promise.all([
+        project.program.isSourceFileFromExternalLibrary(sourceFile),
+        project.program.isSourceFileDefaultLibrary(sourceFile)
+      ]);
+      return external || defaultLibrary ? undefined : sourceFile;
+    }));
+    sourceFiles.push(...eligible.filter((sourceFile) => sourceFile !== undefined));
   }
   const allCandidates = await compilerCandidates(project, enumerate(sourceFiles));
   const availableNodes = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skastr0/quartz-engine",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,7 +20,7 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "typescript": "7.1.0-dev.20260723.1"
+    "typescript": "7.1.0-dev.20260905.1"
   },
   "license": "MIT",
   "description": "Persistent TypeScript 7 native workspace engine for Quartz.",