@shapeshift-labs/frontier-lang-compiler 0.2.109 → 0.2.111

package/dist/declarations/js-ts-safe-project-merge.d.ts

@@ -7,6 +7,7 @@ import type {
   JsTsSafeMergeSummary
 } from './js-ts-safe-merge.js';
 import type { JsTsSafeMemberMergePolicy, JsTsSafeMemberMergePolicyRegion } from './js-ts-safe-member-merge.js';
+import type { NativeProjectImportResult, NativeProjectSymbolGraphSummary } from './native-project.js';
 
 export type JsTsProjectSafeMergeStatus = 'merged' | 'blocked';
 export type JsTsProjectSafeMergeFileStatus = 'merged' | 'blocked';
@@ -53,6 +54,7 @@ export interface JsTsProjectSafeMergeInput {
   readonly headFiles?: JsTsProjectSafeMergeFileMap;
   readonly allowFileAdditions?: boolean;
   readonly allowFileDeletes?: boolean;
+  readonly includeOutputProjectSymbolGraph?: boolean;
   readonly workerChangeSetId?: string;
   readonly headChangeSetId?: string;
   readonly policy?: JsTsSafeMemberMergePolicy | readonly JsTsSafeMemberMergePolicyRegion[];
@@ -112,6 +114,8 @@ export interface JsTsProjectSafeMergeResult {
   readonly status: JsTsProjectSafeMergeStatus;
   readonly files: readonly JsTsProjectSafeMergeFileResult[];
   readonly outputFiles: readonly JsTsProjectSafeMergeOutputFile[];
+  readonly outputProjectImport?: NativeProjectImportResult;
+  readonly outputProjectSymbolGraph?: NativeProjectSymbolGraphSummary;
   readonly conflicts: readonly JsTsSafeMergeConflict[];
   readonly admission: JsTsProjectSafeMergeAdmission;
   readonly summary: {

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

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

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

@@ -1,6 +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';
+import{createProjectModuleSymbolResolver,resolveRelativeProjectModule}from'./projectSymbolGraphModuleResolution.js';
 export function createNativeProjectImportResult(input, imports) {
   const idPart = idFragment(input.id ?? input.projectRoot ?? 'native_project');
   const nodes = {};
@@ -141,7 +141,6 @@ export function createNativeProjectImportResult(input, imports) {
 }
 
 const PROJECT_SYMBOL_GRAPH_REMAINING_FIELDS = Object.freeze([
-  'moduleEdges[].resolvedTargetSymbolId',
   'moduleEdges[].resolutionKind',
   'moduleEdges[].packageName',
   'moduleEdges[].packageExportCondition',
@@ -158,16 +157,17 @@ function createProjectSymbolGraphSummary(semanticIndex, imports, input) {
   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 resolveTargetSymbolId = createProjectModuleSymbolResolver(semanticIndex?.symbols ?? [], documents);
   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, documentsByPath));
+    .map((relation) => moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById, documentsByPath, resolveTargetSymbolId));
   const exportEdges = relations
     .filter((relation) => relation.predicate === 'exports')
-    .map((relation) => moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById, documentsByPath));
+    .map((relation) => moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById, documentsByPath, resolveTargetSymbolId));
   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, documentsByPath) {
+function moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documentsById, documentsByPath, resolveTargetSymbolId) {
   const fact = moduleEdgeByRelation.get(relation.id);
   const value = objectValue(fact?.value);
   const metadata = objectValue(relation.metadata);
@@ -226,10 +226,13 @@ function moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documents
     value.moduleSpecifier,
     metadata.moduleSpecifier,
     symbolMetadata.moduleSpecifier,
+    symbolMetadata.importPath,
+    symbolMetadata.exportPath,
+    symbolMetadata.source,
     symbol?.kind === 'module' ? symbol.name : undefined
   );
   const resolution = resolveRelativeProjectModule(document?.path, moduleSpecifier, documentsByPath);
-  return compactRecord({
+  const record = {
     id: relation.id,
     sourceDocumentId: relation.sourceId,
     targetSymbolId: relation.targetId,
@@ -241,17 +244,18 @@ function moduleEdgeRecord(relation, moduleEdgeByRelation, symbolsById, documents
     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),
-    exportedName: firstString(moduleEdge.exportedName, value.exportedName),
-    localName: firstString(moduleEdge.localName, value.localName),
-    namespace: firstString(moduleEdge.namespace, value.namespace),
+    importKind: firstString(moduleEdge.importKind, value.importKind, symbolMetadata.importKind),
+    exportKind: firstString(moduleEdge.exportKind, value.exportKind, symbolMetadata.exportKind),
+    importedName: firstString(moduleEdge.importedName, value.importedName, symbolMetadata.importedName),
+    exportedName: firstString(moduleEdge.exportedName, value.exportedName, symbolMetadata.exportedName),
+    localName: firstString(moduleEdge.localName, value.localName, symbolMetadata.localName),
+    namespace: firstString(moduleEdge.namespace, value.namespace, symbolMetadata.namespace),
     isTypeOnly: firstBoolean(moduleEdge.isTypeOnly, value.isTypeOnly),
     isReExport: firstBoolean(moduleEdge.isReExport, value.isReExport) ?? (relation.predicate === 'exports' && Boolean(moduleSpecifier)),
     publicContract: firstBoolean(moduleEdge.publicContract, value.publicContract, metadata.publicContract),
     evidenceIds: uniqueStrings([...(relation.evidenceIds ?? []), ...(fact?.evidenceIds ?? [])])
-  });
+  };
+  return compactRecord({ ...record, resolvedTargetSymbolId: resolveTargetSymbolId(record) });
 }
 
 function fileHashRecord(document) {

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

@@ -10,6 +10,23 @@ export function resolveRelativeProjectModule(sourcePath, moduleSpecifier, docume
   };
 }
 
+export function createProjectModuleSymbolResolver(symbols, documents) {
+  const documentsByPath = new Map(documents.filter((document) => document.path).map((document) => [document.path, document]));
+  const exportedByDocumentAndName = new Map();
+  for (const symbol of symbols ?? []) {
+    if (symbol?.kind !== 'export' || !symbol.name) continue;
+    const document = documentsByPath.get(symbol.definitionSpan?.path);
+    if (!document) continue;
+    exportedByDocumentAndName.set(symbolKey(document.id, symbol.name), symbol);
+  }
+  return function resolveProjectModuleSymbol(edge) {
+    if (!edge?.targetDocumentId) return undefined;
+    const targetName = targetExportName(edge);
+    if (!targetName) return undefined;
+    return exportedByDocumentAndName.get(symbolKey(edge.targetDocumentId, targetName))?.id;
+  };
+}
+
 function moduleTargetDocument(path, documentsByPath) {
   for (const candidate of modulePathCandidates(path)) {
     const document = documentsByPath.get(candidate);
@@ -22,6 +39,16 @@ function modulePathCandidates(path) {
   return [path, `${path}.js`, `${path}.ts`, `${path}.tsx`, `${path}.jsx`, `${path}/index.js`, `${path}/index.ts`];
 }
 
+function targetExportName(edge) {
+  const name = edge.importedName ?? edge.localName ?? edge.exportedName;
+  if (!name || name === '*') return undefined;
+  return String(name);
+}
+
+function symbolKey(documentId, name) {
+  return `${documentId}\u0000${name}`;
+}
+
 function normalizeProjectPath(path) {
   const parts = [];
   for (const part of String(path).split('/')) {

package/dist/js-ts-safe-project-merge-graph.js

@@ -0,0 +1,35 @@
+import { idFragment } from './native-import-utils.js';
+import { createNativeProjectImportResult } from './internal/index-impl/createNativeProjectImportResult.js';
+import { importNativeSource } from './internal/index-impl/importNativeSource.js';
+
+function createJsTsProjectSafeMergeGraphArtifacts(input, outputFiles, mergeId) {
+  const sources = outputFiles.map((file) => ({
+    id: `${mergeId}_output_${idFragment(file.sourcePath)}`,
+    language: file.language ?? input.language ?? languageForPath(file.sourcePath),
+    sourcePath: file.sourcePath,
+    sourceText: file.sourceText,
+    metadata: { semanticImportExpected: true, projectSafeMergeOutput: true }
+  }));
+  const imports = sources.map((source) => importNativeSource(source));
+  const projectImport = createNativeProjectImportResult({
+    id: `${mergeId}_output_project_import`,
+    projectRoot: input.projectRoot,
+    sources,
+    metadata: {
+      projectSafeMergeId: mergeId,
+      outputProjectSymbolGraph: true
+    }
+  }, imports);
+  return {
+    projectImport,
+    projectSymbolGraph: projectImport.projectSymbolGraph
+  };
+}
+
+function languageForPath(sourcePath) {
+  const path = String(sourcePath ?? '').toLowerCase();
+  if (path.endsWith('.js') || path.endsWith('.jsx') || path.endsWith('.mjs') || path.endsWith('.cjs')) return 'javascript';
+  return 'typescript';
+}
+
+export { createJsTsProjectSafeMergeGraphArtifacts };

package/dist/js-ts-safe-project-merge.js

@@ -1,6 +1,7 @@
 import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
 import { safeMergeJsTsSource } from './js-ts-safe-merge-composed.js';
 import { compactRecord } from './js-ts-safe-merge-context.js';
+import { createJsTsProjectSafeMergeGraphArtifacts } from './js-ts-safe-project-merge-graph.js';
 
 function safeMergeJsTsProject(input = {}) {
   const id = String(input.id ?? 'js_ts_project_safe_merge');
@@ -18,6 +19,9 @@ function safeMergeJsTsProject(input = {}) {
       operation: file.operation
     }));
   const reasonCodes = uniqueStrings(blockedFiles.flatMap((file) => file.admission.reasonCodes));
+  const graphArtifacts = status === 'merged' && input.includeOutputProjectSymbolGraph
+    ? createJsTsProjectSafeMergeGraphArtifacts(input, outputFiles, id)
+    : undefined;
   const core = {
     kind: 'frontier.lang.jsTsProjectSafeMerge',
     version: 1,
@@ -26,6 +30,8 @@ function safeMergeJsTsProject(input = {}) {
     status,
     files: fileResults,
     outputFiles,
+    outputProjectImport: graphArtifacts?.projectImport,
+    outputProjectSymbolGraph: graphArtifacts?.projectSymbolGraph,
     conflicts: fileResults.flatMap((file) => file.conflicts),
     admission: {
       status: status === 'merged' ? 'auto-merge-candidate' : 'blocked',
@@ -43,6 +49,7 @@ function safeMergeJsTsProject(input = {}) {
       headChangeSetId: input.headChangeSetId,
       projectRoot: input.projectRoot,
       filesInput: Array.isArray(input.files) ? 'records' : 'maps',
+      outputProjectSymbolGraph: Boolean(graphArtifacts?.projectSymbolGraph),
       autoMergeClaim: false,
       semanticEquivalenceClaim: false
     })

package/dist/native-region-scanner-core.js

@@ -71,6 +71,8 @@ function nativeImportBindingDeclaration(input, lineNumber, importPath, binding,
     },
     metadata: {
       scan: 'lightweight-import-binding',
+      importPath: String(importPath),
+      moduleSpecifier: String(importPath),
       localName,
       importedName,
       importKind,

package/package.json

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