@shapeshift-labs/frontier-lang-compiler 0.2.106 → 0.2.108

package/dist/declarations/import-adapter-options-native.d.ts

@@ -76,6 +76,9 @@ export interface TypeScriptCompilerNativeImporterAdapterOptions {
   readonly diagnostics?: readonly NativeImporterAdapterDiagnostic[];
   readonly typescript?: unknown;
   readonly ts?: unknown;
+  readonly program?: { readonly getTypeChecker?: () => unknown } | unknown;
+  readonly typeChecker?: unknown;
+  readonly checker?: unknown;
   readonly sourceFile?: unknown;
   readonly createSourceFile?: (input: NativeImporterAdapterParseInput, typescript?: unknown) => unknown;
   readonly scriptTarget?: unknown;

package/dist/declarations/native-project.d.ts

@@ -78,8 +78,6 @@ export interface ImportNativeProjectOptions {
 }
 
 export type NativeProjectSymbolGraphRemainingField =
-  | 'moduleEdges[].resolvedModulePath'
-  | 'moduleEdges[].targetDocumentId'
   | 'moduleEdges[].resolvedTargetSymbolId'
   | 'moduleEdges[].resolutionKind'
   | 'moduleEdges[].packageName'
@@ -112,6 +110,9 @@ export interface NativeProjectSymbolGraphModuleEdgeRecord {
   readonly sourcePath?: string;
   readonly sourceHash?: string;
   readonly moduleSpecifier?: string;
+  readonly resolvedModulePath?: string;
+  readonly targetDocumentId?: string;
+  readonly resolutionKind?: 'relative-source' | 'relative-missing' | string;
   readonly importKind?: string;
   readonly exportKind?: string;
   readonly importedName?: string;

package/dist/internal/index-impl/createNativeProjectImportResult.js

@@ -1,5 +1,6 @@
 import{idFragment,uniqueByEvidenceId,uniqueByLossId,uniqueStrings}from'../../native-import-utils.js';import{createDocument,createPatch,createUniversalAstEnvelope}from'@shapeshift-labs/frontier-lang-kernel';
 import{createNativeImportResultContract}from'./createNativeImportResultContract.js';import{createProjectImportAdmissionRecord}from'./createProjectImportAdmissionRecord.js';import{mergeSemanticIndexes}from'./mergeSemanticIndexes.js';import{summarizeNativeImportLosses}from'./summarizeNativeImportLosses.js';import{summarizeProjectSourcePreservation}from'./summarizeProjectSourcePreservation.js';
+import{resolveRelativeProjectModule}from'./projectSymbolGraphModuleResolution.js';
 export function createNativeProjectImportResult(input, imports) {
   const idPart = idFragment(input.id ?? input.projectRoot ?? 'native_project');
   const nodes = {};
@@ -140,8 +141,6 @@ export function createNativeProjectImportResult(input, imports) {
 }
 
 const PROJECT_SYMBOL_GRAPH_REMAINING_FIELDS = Object.freeze([
-  'moduleEdges[].resolvedModulePath',
-  'moduleEdges[].targetDocumentId',
   'moduleEdges[].resolvedTargetSymbolId',
   'moduleEdges[].resolutionKind',
   'moduleEdges[].packageName',
@@ -158,16 +157,17 @@ function createProjectSymbolGraphSummary(semanticIndex, imports, input) {
   const documents = semanticIndex?.documents ?? [];
   const symbolsById = new Map((semanticIndex?.symbols ?? []).map((symbol) => [symbol.id, symbol]));
   const documentsById = new Map(documents.map((document) => [document.id, document]));
+  const documentsByPath = new Map(documents.filter((document) => document.path).map((document) => [document.path, document]));
   const facts = semanticIndex?.facts ?? [];
   const moduleEdgeFacts = facts.filter((fact) => fact.predicate === 'moduleEdge');
   const moduleEdgeByRelation = new Map(moduleEdgeFacts.map((fact) => [fact.subjectId, fact]));
   const relations = semanticIndex?.relations ?? [];
   const importEdges = relations
     .filter((relation) => relation.predicate === 'imports')
-    .map((relation) => moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById));
+    .map((relation) => moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById, documentsByPath));
   const exportEdges = relations
     .filter((relation) => relation.predicate === 'exports')
-    .map((relation) => moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById));
+    .map((relation) => moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById, documentsByPath));
   const reExportIdentities = uniqueRecords([
     ...facts
       .filter((fact) => fact.predicate === 'reExportIdentity' && fact.value)
@@ -213,7 +213,7 @@ function createProjectSymbolGraphSummary(semanticIndex, imports, input) {
   };
 }
 
-function moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById) {
+function moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById, documentsByPath) {
   const fact = moduleEdgeByRelation.get(relation.id);
   const value = objectValue(fact?.value);
   const metadata = objectValue(relation.metadata);
@@ -228,6 +228,7 @@ function moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documents
     symbolMetadata.moduleSpecifier,
     symbol?.kind === 'module' ? symbol.name : undefined
   );
+  const resolution = resolveRelativeProjectModule(document?.path, moduleSpecifier, documentsByPath);
   return compactRecord({
     id: relation.id,
     sourceDocumentId: relation.sourceId,
@@ -237,6 +238,9 @@ function moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documents
     sourcePath: document?.path,
     sourceHash: document?.sourceHash,
     moduleSpecifier,
+    resolvedModulePath: resolution?.path,
+    targetDocumentId: resolution?.documentId,
+    resolutionKind: resolution?.kind,
     importKind: firstString(moduleEdge.importKind, value.importKind),
     exportKind: firstString(moduleEdge.exportKind, value.exportKind),
     importedName: firstString(moduleEdge.importedName, value.importedName),

package/dist/internal/index-impl/createTypeScriptCompilerNativeImporterAdapter.js

@@ -25,6 +25,8 @@ export function createTypeScriptCompilerNativeImporterAdapter(options = {}) {
     diagnostics: options.diagnostics,
     parse(input) {
       const ts = options.typescript ?? options.ts ?? input.options?.typescript ?? input.options?.ts;
+      const program = options.program ?? input.options?.program;
+      const typeChecker = options.typeChecker ?? options.checker ?? input.options?.typeChecker ?? input.options?.checker ?? program?.getTypeChecker?.();
       const sourceFile = input.options?.sourceFile ?? input.options?.ast ?? options.sourceFile ?? createTypeScriptSourceFile(ts, input, options);
       if (!sourceFile) {
         return missingInjectedParserResult(input, {
@@ -37,6 +39,8 @@ export function createTypeScriptCompilerNativeImporterAdapter(options = {}) {
         parser: options.parser ?? 'typescript-compiler-api',
         astFormat: 'typescript-compiler-api',
         ts,
+        program,
+        typeChecker,
         maxNodes: options.maxNodes,
         includeTokens: options.includeTokens
       });

package/dist/internal/index-impl/projectSymbolGraphModuleResolution.js

@@ -0,0 +1,33 @@
+export function resolveRelativeProjectModule(sourcePath, moduleSpecifier, documentsByPath) {
+  if (!sourcePath || !moduleSpecifier || !moduleSpecifier.startsWith('.')) return undefined;
+  const base = sourcePath.includes('/') ? sourcePath.slice(0, sourcePath.lastIndexOf('/')) : '';
+  const unresolvedPath = normalizeProjectPath(`${base}/${moduleSpecifier}`);
+  const target = moduleTargetDocument(unresolvedPath, documentsByPath);
+  return {
+    path: target?.path ?? unresolvedPath,
+    documentId: target?.id,
+    kind: target ? 'relative-source' : 'relative-missing'
+  };
+}
+
+function moduleTargetDocument(path, documentsByPath) {
+  for (const candidate of modulePathCandidates(path)) {
+    const document = documentsByPath.get(candidate);
+    if (document) return document;
+  }
+  return undefined;
+}
+
+function modulePathCandidates(path) {
+  return [path, `${path}.js`, `${path}.ts`, `${path}.tsx`, `${path}.jsx`, `${path}/index.js`, `${path}/index.ts`];
+}
+
+function normalizeProjectPath(path) {
+  const parts = [];
+  for (const part of String(path).split('/')) {
+    if (!part || part === '.') continue;
+    if (part === '..') parts.pop();
+    else parts.push(part);
+  }
+  return parts.join('/');
+}

package/dist/internal/index-impl/semanticIndexFromNativeDeclarations.js

@@ -35,6 +35,7 @@ export function semanticIndexFromNativeDeclarations(declarations, input, options
     };
     declaration.nativeNode.metadata = {
       ...declaration.nativeNode.metadata,
+      ...declaration.metadata,
       ownershipRegionId: ownershipRegion.id,
       ownershipRegionKey: ownershipRegion.key,
       ownershipRegionKind: ownershipRegion.regionKind,
@@ -47,7 +48,7 @@ export function semanticIndexFromNativeDeclarations(declarations, input, options
       kind: declaration.symbolKind,
       language: input.language,
       nativeAstNodeId: declaration.nativeNode.id,
-      signatureHash: hashSemanticValue([input.language, declaration.nativeNode.kind, declaration.name, declaration.nativeNode.fields ?? {}]),
+      signatureHash: declaration.signatureHash ?? hashSemanticValue([input.language, declaration.nativeNode.kind, declaration.name, declaration.nativeNode.fields ?? {}]),
       definitionSpan: declaration.nativeNode.span,
       metadata: {
         ...declaration.nativeNode.metadata,

package/dist/internal/index-impl/typeScriptDeclaration.js

@@ -1,14 +1,67 @@
-import{declarationRecord}from'./declarationRecord.js';import{namedDeclaration}from'./namedDeclaration.js';import{nativeNodeId}from'./nativeNodeId.js';import{stringFromTsExpression}from'./stringFromTsExpression.js';
-export function typeScriptDeclaration(node, kind, nativeNodeId, input) {
+import{hashSemanticValue}from'@shapeshift-labs/frontier-lang-kernel';import{idFragment}from'../../native-import-utils.js';
+import{declarationRecord}from'./declarationRecord.js';import{identifierName}from'./identifierName.js';import{namedDeclaration}from'./namedDeclaration.js';import{stringFromTsExpression}from'./stringFromTsExpression.js';
+export function typeScriptDeclaration(node, kind, nativeNodeId, input, options = {}) {
+  const enrich = (declaration, symbolNode = node.name ?? node) => enrichTypeScriptDeclaration(node, symbolNode, declaration, input, options);
   if (kind === 'ImportDeclaration' || kind === 'ImportEqualsDeclaration') {
     const name = stringFromTsExpression(node.moduleSpecifier) ?? stringFromTsExpression(node.externalModuleReference?.expression);
-    if (name) return declarationRecord(input, nativeNodeId, name, 'module', 'import');
+    if (name) return enrich(declarationRecord(input, nativeNodeId, name, 'module', 'import'), node.moduleSpecifier ?? node.externalModuleReference?.expression ?? node);
   }
-  if (kind === 'FunctionDeclaration') return namedDeclaration(input, nativeNodeId, node.name, 'function');
-  if (kind === 'ClassDeclaration') return namedDeclaration(input, nativeNodeId, node.name, 'class');
-  if (kind === 'InterfaceDeclaration') return namedDeclaration(input, nativeNodeId, node.name, 'interface');
-  if (kind === 'TypeAliasDeclaration' || kind === 'EnumDeclaration') return namedDeclaration(input, nativeNodeId, node.name, 'type');
-  if (kind === 'VariableDeclaration') return namedDeclaration(input, nativeNodeId, node.name, 'variable');
-  if (kind === 'MethodDeclaration' || kind === 'MethodSignature') return namedDeclaration(input, nativeNodeId, node.name, 'method');
+  if (kind === 'FunctionDeclaration') return enrich(namedDeclaration(input, nativeNodeId, node.name, 'function'));
+  if (kind === 'ClassDeclaration') return enrich(namedDeclaration(input, nativeNodeId, node.name, 'class'));
+  if (kind === 'InterfaceDeclaration') return enrich(namedDeclaration(input, nativeNodeId, node.name, 'interface'));
+  if (kind === 'TypeAliasDeclaration' || kind === 'EnumDeclaration') return enrich(namedDeclaration(input, nativeNodeId, node.name, 'type'));
+  if (kind === 'VariableDeclaration') return enrich(namedDeclaration(input, nativeNodeId, node.name, 'variable'));
+  if (kind === 'MethodDeclaration' || kind === 'MethodSignature') return enrich(namedDeclaration(input, nativeNodeId, node.name, 'method'));
   return undefined;
 }
+
+function enrichTypeScriptDeclaration(node, symbolNode, declaration, input, options) {
+  if (!declaration) return declaration;
+  const checker = options.typeChecker ?? options.checker ?? options.program?.getTypeChecker?.();
+  const symbol = safeCall(checker?.getSymbolAtLocation, checker, symbolNode) ?? safeCall(checker?.getSymbolAtLocation, checker, node.name);
+  if (!symbol) return declaration;
+  const aliasedSymbol = safeCall(checker?.getAliasedSymbol, checker, symbol);
+  const targetSymbol = aliasedSymbol && aliasedSymbol !== symbol ? aliasedSymbol : undefined;
+  const identitySymbol = targetSymbol ?? symbol;
+  const fullyQualifiedName = stringValue(safeCall(checker?.getFullyQualifiedName, checker, identitySymbol));
+  const localName = stringValue(symbol.escapedName ?? symbol.name) ?? declaration.name;
+  const targetName = targetSymbol ? stringValue(targetSymbol.escapedName ?? targetSymbol.name) : undefined;
+  const identity = fullyQualifiedName ?? targetName ?? localName;
+  const compilerSymbol = compactRecord({
+    parser: options.parser,
+    localName,
+    targetName,
+    fullyQualifiedName,
+    flags: numberValue(symbol.flags),
+    targetFlags: numberValue(targetSymbol?.flags),
+    declarations: Array.isArray(identitySymbol.declarations) ? identitySymbol.declarations.length : undefined,
+    aliased: Boolean(targetSymbol)
+  });
+  return {
+    ...declaration,
+    symbolId: `symbol:${input.language}:compiler:${declaration.role === 'import' ? 'import:' : ''}${idFragment(identity)}`,
+    signatureHash: hashSemanticValue([input.language, declaration.symbolKind, identity, compilerSymbol]),
+    metadata: {
+      ...declaration.metadata,
+      compilerSymbol,
+      compilerSymbolIdentityHash: hashSemanticValue(compilerSymbol)
+    }
+  };
+}
+
+function safeCall(fn, receiver, ...args) {
+  if (typeof fn !== 'function') return undefined;
+  try { return fn.apply(receiver, args); } catch { return undefined; }
+}
+
+function stringValue(value) {
+  return value === undefined || value === null || value === '' ? undefined : String(value);
+}
+
+function numberValue(value) {
+  return Number.isFinite(value) ? value : undefined;
+}
+
+function compactRecord(record) {
+  return Object.fromEntries(Object.entries(record).filter(([, value]) => value !== undefined));
+}

package/dist/internal/index-impl/visitTypeScriptAstNode.js

@@ -33,6 +33,7 @@ export function visitTypeScriptAstNode(node, sourceFile, context, propertyPath,
     fields: primitiveTypeScriptFields(node, kind),
     children,
     metadata: {
+      ...declaration?.metadata,
       astFormat: context.options.astFormat,
       propertyPath,
       pos: numberOrUndefined(node.pos),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-compiler",
-  "version": "0.2.106",
+  "version": "0.2.108",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",