@shapeshift-labs/frontier-lang-compiler 0.2.85 → 0.2.86

package/dist/declarations/semantic-edit-script.d.ts

@@ -66,6 +66,9 @@ export interface SemanticEditScriptOperation {
   readonly reanchor?: {
     readonly fromAnchorKey?: string;
     readonly toAnchorKey?: string;
+    readonly toSourcePath?: string;
+    readonly toSymbolName?: string;
+    readonly toSymbolKind?: string;
     readonly lineageStatus?: string;
     readonly traversedEventIds?: readonly string[];
   };
@@ -138,6 +141,11 @@ export interface SemanticEditProjectionEdit {
   readonly regionId?: string;
   readonly regionKind?: string;
   readonly sourcePath?: string;
+  readonly originalSourcePath?: string;
+  readonly targetAnchorKey?: string;
+  readonly targetSourcePath?: string;
+  readonly targetSymbolName?: string;
+  readonly targetSymbolKind?: string;
   readonly symbolId?: string;
   readonly symbolName?: string;
   readonly symbolKind?: string;
@@ -188,6 +196,7 @@ export interface ProjectSemanticEditScriptToSourceOptions {
   readonly script: SemanticEditScript;
   readonly workerSourceText: string;
   readonly headSourceText: string;
+  readonly headSourcePath?: string;
   readonly metadata?: Record<string, unknown>;
 }
 
@@ -207,6 +216,7 @@ export interface CreateSemanticEditScriptOptions {
   readonly workerSourceText?: string;
   readonly afterSourceText?: string;
   readonly headSourceText?: string;
+  readonly headSourcePath?: string;
   readonly currentSourceText?: string;
   readonly baseSourceHash?: string;
   readonly workerSourceHash?: string;

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

@@ -25,7 +25,7 @@ export function projectSemanticEditScriptToSource(input = {}) {
     id: input.id ?? `semantic_edit_projection_${idFragment(script.id ?? script.hash ?? 'script')}`,
     scriptId: script.id,
     status: blocked ? 'blocked' : 'projected',
-    sourcePath: script.sourcePath,
+    sourcePath: input.headSourcePath ?? projectedSourcePath(script, edits),
     language: script.language,
     baseHash: script.baseHash,
     workerHash: script.workerHash,
@@ -54,8 +54,9 @@ export function projectSemanticEditScriptToSource(input = {}) {
 }
 
 function sourceEditForOperation(operation, workerSourceText, headSourceText) {
+  const identity = projectionIdentity(operation);
   if (operation.status === 'already-applied') {
-    return { ok: true, value: { ...semanticEditIdentity(operation), operationId: operation.id, start: 0, end: 0, replacement: '', current: '', alreadyApplied: true } };
+    return { ok: true, value: { ...identity, operationId: operation.id, start: 0, end: 0, replacement: '', current: '', alreadyApplied: true } };
   }
   if (operation.status !== 'portable') return { ok: false, reasonCodes: [`operation-not-portable:${operation.id}`] };
   const workerOffsets = spanOffsets(workerSourceText, operation.spans?.worker);
@@ -78,7 +79,7 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText) {
     ok: true,
     value: {
       operationId: operation.id,
-      ...semanticEditIdentity(operation),
+      ...identity,
       start: headOffsets.start,
       end: headOffsets.end,
       workerStart: workerOffsets.start,
@@ -89,6 +90,11 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText) {
   };
 }
 
+function projectionIdentity(operation) {
+  const identity = semanticEditIdentity(operation);
+  return { ...identity, sourcePath: operation.reanchor?.toSourcePath ?? identity.sourcePath };
+}
+
 function projectionEditRecord(edit) {
   const deletedTextHash = hashSemanticValue(edit.current);
   const replacementTextHash = hashSemanticValue(edit.replacement);
@@ -103,6 +109,11 @@ function projectionEditRecord(edit) {
     regionId: edit.regionId,
     regionKind: edit.regionKind,
     sourcePath: edit.sourcePath,
+    originalSourcePath: edit.originalSourcePath,
+    targetAnchorKey: edit.targetAnchorKey,
+    targetSourcePath: edit.targetSourcePath,
+    targetSymbolName: edit.targetSymbolName,
+    targetSymbolKind: edit.targetSymbolKind,
     symbolId: edit.symbolId,
     symbolName: edit.symbolName,
     symbolKind: edit.symbolKind,
@@ -136,6 +147,11 @@ function semanticEditIdentity(operation) {
     regionId: anchor.regionId,
     regionKind: anchor.regionKind,
     sourcePath: anchor.sourcePath,
+    originalSourcePath: operation.reanchor?.toSourcePath ? anchor.sourcePath : undefined,
+    targetAnchorKey: operation.reanchor?.toAnchorKey,
+    targetSourcePath: operation.reanchor?.toSourcePath,
+    targetSymbolName: operation.reanchor?.toSymbolName,
+    targetSymbolKind: operation.reanchor?.toSymbolKind,
     symbolId: anchor.symbolId,
     symbolName: anchor.symbolName,
     symbolKind: anchor.symbolKind,
@@ -152,6 +168,10 @@ function applySourceEdits(sourceText, edits) {
     .reduce((text, edit) => text.slice(0, edit.start) + edit.replacement + text.slice(edit.end), sourceText);
 }
 
+function projectedSourcePath(script, edits) {
+  return edits.map((edit) => edit.sourcePath).find(Boolean) ?? script.sourcePath;
+}
+
 function spanOffsets(sourceText, span) {
   if (typeof sourceText !== 'string' || !span) return undefined;
   if (typeof span.start === 'number' && typeof span.end === 'number' && span.end >= span.start) return { start: span.start, end: span.end };

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

@@ -92,12 +92,15 @@ function classifyMissingHeadAnchor(input) {
     ? resolveSemanticLineage(input.context.headLineage.lineageMap, { anchorKey: input.anchorKey })
     : undefined;
   if (resolved?.status === 'resolved' && resolved.currentAnchors.length === 1) {
-    return editStatus('needs-port', 'needs-review', 0.72, ['anchor-moved-or-renamed'], {
-      fromAnchorKey: input.anchorKey,
-      toAnchorKey: resolved.currentAnchors[0].key,
-      lineageStatus: resolved.status,
-      traversedEventIds: resolved.traversedEventIds
-    }, resolved.evidenceIds);
+    const target = resolved.currentAnchors[0];
+    const reanchor = reanchorRecord(input.anchorKey, target, resolved);
+    if (target.bodyHash && input.baseSymbol?.spanHash && target.bodyHash === input.baseSymbol.spanHash) {
+      return editStatus('portable', 'ready', 0.86, ['anchor-reanchored-head-matches-base'], reanchor, resolved.evidenceIds);
+    }
+    if (target.bodyHash && input.workerSymbol?.spanHash && target.bodyHash === input.workerSymbol.spanHash) {
+      return editStatus('already-applied', 'ready', 0.87, ['anchor-reanchored-head-matches-worker'], reanchor, resolved.evidenceIds);
+    }
+    return editStatus('needs-port', 'needs-review', 0.72, ['anchor-moved-or-renamed'], reanchor, resolved.evidenceIds);
   }
   if (resolved?.status === 'ambiguous') {
     return editStatus('blocked', 'blocked', 0.1, ['anchor-lineage-ambiguous'], { fromAnchorKey: input.anchorKey, lineageStatus: resolved.status }, resolved.evidenceIds);
@@ -112,6 +115,18 @@ function editStatus(status, readiness, confidence, reasonCodes, reanchor, eviden
   return { status, readiness, confidence, reasonCodes, reanchor, evidenceIds };
 }
 
+function reanchorRecord(fromAnchorKey, target, resolved) {
+  return {
+    fromAnchorKey,
+    toAnchorKey: target.key,
+    toSourcePath: target.sourcePath,
+    toSymbolName: target.symbolName,
+    toSymbolKind: target.kind,
+    lineageStatus: resolved.status,
+    traversedEventIds: resolved.traversedEventIds
+  };
+}
+
 function admissionStatus(summary) {
   if (summary.operations === 0) return 'evidence-only';
   if (summary.blocked > 0) return 'blocked';

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

@@ -132,8 +132,9 @@ function semanticEditOperation(region, index, context, input) {
   const anchorKey = region.key ?? region.conflictKey ?? region.id;
   const baseSymbol = context.baseSymbols.get(anchorKey);
   const workerSymbol = context.workerSymbols.get(anchorKey);
-  const headSymbol = context.headSymbols.get(anchorKey);
-  const classification = classifySemanticEdit({ region, anchorKey, baseSymbol, workerSymbol, headSymbol, context });
+  const directHeadSymbol = context.headSymbols.get(anchorKey);
+  const classification = classifySemanticEdit({ region, anchorKey, baseSymbol, workerSymbol, headSymbol: directHeadSymbol, context });
+  const headSymbol = directHeadSymbol ?? reanchoredHeadSymbol(context, classification);
   const kind = semanticEditOperationKind(region);
   const baseText = spanText(context.base, baseSymbol?.sourceSpan ?? region.metadata?.changedRegionProjection?.before?.sourceSpan ?? region.sourceSpan);
   const workerText = spanText(context.worker, workerSymbol?.sourceSpan ?? region.metadata?.changedRegionProjection?.after?.sourceSpan ?? region.sourceSpan);
@@ -192,6 +193,11 @@ function semanticEditOperation(region, index, context, input) {
   });
 }
 
+function reanchoredHeadSymbol(context, classification) {
+  const targetKey = classification.reanchor?.toAnchorKey;
+  return targetKey ? context.headSymbols.get(targetKey) : undefined;
+}
+
 function semanticEditIdentityRecord(input) {
   return {
     kind: input.kind,

package/package.json

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