@shapeshift-labs/frontier-lang-compiler 0.2.82 → 0.2.84

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

@@ -123,6 +123,20 @@ export interface SemanticEditScript {
 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 semanticKey?: string;
+  readonly semanticIdentityHash?: string;
+  readonly sourceIdentityHash?: string;
+  readonly editContentHash?: string;
   readonly headStart: number;
   readonly headEnd: number;
   readonly workerStart?: number;

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

@@ -54,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: '', current: '', 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);
@@ -77,6 +77,7 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText) {
     ok: true,
     value: {
       operationId: operation.id,
+      ...semanticEditIdentity(operation),
       start: headOffsets.start,
       end: headOffsets.end,
       workerStart: workerOffsets.start,
@@ -88,21 +89,90 @@ function sourceEditForOperation(operation, workerSourceText, headSourceText) {
 }
 
 function projectionEditRecord(edit) {
+  const deletedTextHash = hashSemanticValue(edit.current);
+  const replacementTextHash = hashSemanticValue(edit.replacement);
+  const semanticKey = semanticEditKey(edit);
+  const semanticIdentityHash = hashSemanticValue(semanticIdentityRecord(edit, semanticKey));
+  const sourceIdentityHash = hashSemanticValue(sourceIdentityRecord(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,
+    semanticKey,
+    semanticIdentityHash,
+    sourceIdentityHash,
+    editContentHash: hashSemanticValue(compactRecord({
+      semanticIdentityHash,
+      deletedTextHash,
+      replacementTextHash,
+      status: edit.alreadyApplied ? 'already-applied' : 'applied'
+    })),
     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),
+    deletedTextHash,
+    replacementTextHash,
     replacementText: edit.replacement
   });
 }
 
+function semanticEditKey(edit) {
+  const scope = edit.symbolName
+    ? `${edit.symbolKind ?? 'symbol'}:${edit.symbolName}`
+    : edit.anchorKey ?? edit.regionId ?? edit.operationId;
+  return ['semantic-edit', edit.kind ?? 'region', edit.changeKind ?? 'change', scope].filter(Boolean).join(':');
+}
+
+function semanticIdentityRecord(edit, semanticKey) {
+  return compactRecord({
+    semanticKey,
+    kind: edit.kind,
+    changeKind: edit.changeKind,
+    regionKind: edit.regionKind,
+    symbolName: edit.symbolName,
+    symbolKind: edit.symbolKind
+  });
+}
+
+function sourceIdentityRecord(edit) {
+  return compactRecord({
+    anchorKey: edit.anchorKey,
+    conflictKey: edit.conflictKey,
+    regionId: edit.regionId,
+    sourcePath: edit.sourcePath,
+    symbolId: edit.symbolId,
+    semanticKey: semanticEditKey(edit)
+  });
+}
+
+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) {
   return edits.filter((edit) => !edit.alreadyApplied)
     .sort((left, right) => right.start - left.start)

package/package.json

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