@shapeshift-labs/frontier-lang-compiler 0.2.81 → 0.2.83

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

@@ -120,6 +120,30 @@ export interface SemanticEditScript {
   readonly metadata?: Record<string, unknown>;
 }
 
+export interface SemanticEditProjectionEdit {
+  readonly operationId?: string;
+  readonly status: 'applied' | 'already-applied';
+  readonly kind?: string;
+  readonly changeKind?: string;
+  readonly anchorKey?: string;
+  readonly conflictKey?: string;
+  readonly regionId?: string;
+  readonly regionKind?: string;
+  readonly sourcePath?: string;
+  readonly symbolId?: string;
+  readonly symbolName?: string;
+  readonly symbolKind?: string;
+  readonly headStart: number;
+  readonly headEnd: number;
+  readonly workerStart?: number;
+  readonly workerEnd?: number;
+  readonly deletedBytes: number;
+  readonly replacementBytes: number;
+  readonly deletedTextHash?: string;
+  readonly replacementTextHash?: string;
+  readonly replacementText?: string;
+}
+
 export interface SemanticEditProjection {
   readonly kind: 'frontier.lang.semanticEditProjection';
   readonly version: 1;
@@ -135,6 +159,7 @@ export interface SemanticEditProjection {
   readonly projectedHash?: string;
   readonly appliedOperations: readonly string[];
   readonly skippedOperations: readonly string[];
+  readonly edits: readonly SemanticEditProjectionEdit[];
   readonly sourceText?: string;
   readonly admission: {
     readonly status: 'auto-merge-candidate' | 'blocked';

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

@@ -32,6 +32,7 @@ export function projectSemanticEditScriptToSource(input = {}) {
     projectedHash: sourceText === undefined ? undefined : hashSemanticValue(sourceText),
     appliedOperations: blocked ? [] : edits.map((edit) => edit.operationId),
     skippedOperations: blocked ? (script.operations ?? []).map((operation) => operation.id) : [],
+    edits: blocked ? [] : edits.map(projectionEditRecord),
     sourceText,
     admission: {
       status: blocked ? 'blocked' : 'auto-merge-candidate',
@@ -43,6 +44,8 @@ export function projectSemanticEditScriptToSource(input = {}) {
       autoMergeClaim: false,
       semanticEquivalenceClaim: false,
       editCount: edits.length,
+      appliedEditCount: edits.filter((edit) => !edit.alreadyApplied).length,
+      alreadyAppliedEditCount: edits.filter((edit) => edit.alreadyApplied).length,
       ...input.metadata
     })
   };
@@ -51,7 +54,7 @@ export function projectSemanticEditScriptToSource(input = {}) {
 
 function sourceEditForOperation(operation, workerSourceText, headSourceText) {
   if (operation.status === 'already-applied') {
-    return { ok: true, value: { operationId: operation.id, start: 0, end: 0, replacement: '', alreadyApplied: true } };
+    return { ok: true, value: { ...semanticEditIdentity(operation), 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);
@@ -70,7 +73,61 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText) {
     reasons.push(`head-span-hash-mismatch:${operation.id}`);
   }
   if (reasons.length) return { ok: false, reasonCodes: reasons };
-  return { ok: true, value: { operationId: operation.id, start: headOffsets.start, end: headOffsets.end, replacement } };
+  return {
+    ok: true,
+    value: {
+      operationId: operation.id,
+      ...semanticEditIdentity(operation),
+      start: headOffsets.start,
+      end: headOffsets.end,
+      workerStart: workerOffsets.start,
+      workerEnd: workerOffsets.end,
+      replacement,
+      current
+    }
+  };
+}
+
+function projectionEditRecord(edit) {
+  return compactRecord({
+    operationId: edit.operationId,
+    status: edit.alreadyApplied ? 'already-applied' : 'applied',
+    kind: edit.kind,
+    changeKind: edit.changeKind,
+    anchorKey: edit.anchorKey,
+    conflictKey: edit.conflictKey,
+    regionId: edit.regionId,
+    regionKind: edit.regionKind,
+    sourcePath: edit.sourcePath,
+    symbolId: edit.symbolId,
+    symbolName: edit.symbolName,
+    symbolKind: edit.symbolKind,
+    headStart: edit.start,
+    headEnd: edit.end,
+    workerStart: edit.workerStart,
+    workerEnd: edit.workerEnd,
+    deletedBytes: edit.current.length,
+    replacementBytes: edit.replacement.length,
+    deletedTextHash: hashSemanticValue(edit.current),
+    replacementTextHash: hashSemanticValue(edit.replacement),
+    replacementText: edit.replacement
+  });
+}
+
+function semanticEditIdentity(operation) {
+  const anchor = operation.anchor ?? {};
+  return compactRecord({
+    kind: operation.kind,
+    changeKind: operation.changeKind,
+    anchorKey: anchor.key,
+    conflictKey: anchor.conflictKey,
+    regionId: anchor.regionId,
+    regionKind: anchor.regionKind,
+    sourcePath: anchor.sourcePath,
+    symbolId: anchor.symbolId,
+    symbolName: anchor.symbolName,
+    symbolKind: anchor.symbolKind
+  });
 }
 
 function applySourceEdits(sourceText, edits) {

package/package.json

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