@shapeshift-labs/frontier-lang-compiler 0.2.96 → 0.2.97

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

@@ -1,6 +1,7 @@
 import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
 import { idFragment, uniqueStrings } from '../../native-import-utils.js';
 import { semanticEditIdentityFields } from './semanticEditIdentityRecords.js';
+import { applySourceEdits, dedupeSourceEdits, validateSourceEdits } from './semanticSourceEditDedupe.js';
 
 export function projectSemanticEditScriptToSource(input = {}) {
   const script = input.script;
@@ -207,44 +208,6 @@ function semanticEditIdentity(operation) {
   });
 }
 
-function applySourceEdits(sourceText, edits) {
-  return edits.filter((edit) => !edit.alreadyApplied)
-    .sort(sourceEditSort)
-    .reduce((text, edit) => text.slice(0, edit.start) + edit.replacement + text.slice(edit.end), sourceText);
-}
-
-function dedupeSourceEdits(edits) {
-  const seen = new Map();
-  const result = [];
-  const skippedOperationIds = [];
-  for (const edit of edits) {
-    const key = duplicateEditKey(edit);
-    if (key && seen.has(key)) {
-      skippedOperationIds.push(edit.operationId);
-      continue;
-    }
-    if (key) seen.set(key, edit.operationId);
-    result.push(edit);
-  }
-  return { edits: result, skippedOperationIds };
-}
-
-function duplicateEditKey(edit) {
-  if (edit.editKind !== 'insert') return undefined;
-  return [
-    'insert',
-    edit.start,
-    edit.end,
-    edit.insertion?.mode,
-    edit.insertion?.anchorKey,
-    hashSemanticValue(edit.replacementSpanText ?? edit.replacement)
-  ].join(':');
-}
-
-function sourceEditSort(left, right) {
-  return right.start - left.start || right.end - left.end || (right.order ?? 0) - (left.order ?? 0);
-}
-
 function projectedSourcePath(script, edits) {
   return edits.map((edit) => edit.sourcePath).find(Boolean) ?? script.sourcePath;
 }
@@ -291,23 +254,6 @@ function afterLineOffset(sourceText, offset) {
   return sourceText[offset] === '\n' ? offset + 1 : offset;
 }
 
-function validateSourceEdits(edits) {
-  const reasons = [];
-  const ordered = edits.filter((edit) => !edit.alreadyApplied).sort((left, right) => left.start - right.start || left.end - right.end);
-  for (let index = 1; index < ordered.length; index += 1) {
-    const previous = ordered[index - 1];
-    const current = ordered[index];
-    if (editsOverlap(previous, current)) reasons.push(`source-edit-overlap:${previous.operationId}:${current.operationId}`);
-  }
-  return uniqueStrings(reasons);
-}
-
-function editsOverlap(left, right) {
-  if (left.start === left.end) return right.start < left.start && left.start < right.end;
-  if (right.start === right.end) return left.start < right.start && right.start < left.end;
-  return left.start < right.end && right.start < left.end;
-}
-
 function compactRecord(value) {
   return Object.fromEntries(Object.entries(value ?? {}).filter(([, entry]) => entry !== undefined && (!Array.isArray(entry) || entry.length > 0)));
 }

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

@@ -0,0 +1,99 @@
+import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
+import { uniqueStrings } from '../../native-import-utils.js';
+
+export function applySourceEdits(sourceText, edits) {
+  return edits.filter((edit) => !edit.alreadyApplied)
+    .sort(sourceEditSort)
+    .reduce((text, edit) => text.slice(0, edit.start) + edit.replacement + text.slice(edit.end), sourceText);
+}
+
+export function dedupeSourceEdits(edits) {
+  const exact = dedupeExactInsertions(edits);
+  const covered = removeCoveredContainerReplacements(exact.edits);
+  return {
+    edits: covered.edits,
+    skippedOperationIds: [...exact.skippedOperationIds, ...covered.skippedOperationIds]
+  };
+}
+
+export function validateSourceEdits(edits) {
+  const reasons = [];
+  const ordered = edits.filter((edit) => !edit.alreadyApplied).sort((left, right) => left.start - right.start || left.end - right.end);
+  for (let index = 1; index < ordered.length; index += 1) {
+    const previous = ordered[index - 1];
+    const current = ordered[index];
+    if (editsOverlap(previous, current)) reasons.push(`source-edit-overlap:${previous.operationId}:${current.operationId}`);
+  }
+  return uniqueStrings(reasons);
+}
+
+function dedupeExactInsertions(edits) {
+  const seen = new Map();
+  const result = [];
+  const skippedOperationIds = [];
+  for (const edit of edits) {
+    const key = duplicateEditKey(edit);
+    if (key && seen.has(key)) {
+      skippedOperationIds.push(edit.operationId);
+      continue;
+    }
+    if (key) seen.set(key, edit.operationId);
+    result.push(edit);
+  }
+  return { edits: result, skippedOperationIds };
+}
+
+function removeCoveredContainerReplacements(edits) {
+  const skippedOperationIds = [];
+  const result = [];
+  for (const edit of edits) {
+    if (containerReplacementCoveredByInsertions(edit, edits)) {
+      skippedOperationIds.push(edit.operationId);
+      continue;
+    }
+    result.push(edit);
+  }
+  return { edits: result, skippedOperationIds };
+}
+
+function containerReplacementCoveredByInsertions(edit, edits) {
+  if (edit.editKind !== 'replace' || edit.alreadyApplied) return false;
+  const insertions = containedInsertions(edit, edits);
+  if (!insertions.length) return false;
+  const localEdits = insertions.map((insertion) => ({
+    ...insertion,
+    start: insertion.start - edit.start,
+    end: insertion.end - edit.start
+  }));
+  return applySourceEdits(edit.current, localEdits) === edit.replacement;
+}
+
+function containedInsertions(container, edits) {
+  return edits
+    .filter((edit) => edit.editKind === 'insert' && !edit.alreadyApplied)
+    .filter((edit) => edit.operationId !== container.operationId)
+    .filter((edit) => container.start <= edit.start && edit.end <= container.end)
+    .sort((left, right) => left.start - right.start || (left.order ?? 0) - (right.order ?? 0));
+}
+
+function duplicateEditKey(edit) {
+  if (edit.editKind !== 'insert') return undefined;
+  return [
+    'insert',
+    edit.start,
+    edit.end,
+    edit.insertion?.mode,
+    edit.insertion?.anchorKey,
+    hashSemanticValue(edit.replacementSpanText ?? edit.replacement)
+  ].join(':');
+}
+
+function sourceEditSort(left, right) {
+  return right.start - left.start || right.end - left.end || (right.order ?? 0) - (left.order ?? 0);
+}
+
+function editsOverlap(left, right) {
+  if (left.start === left.end) return right.start < left.start && left.start < right.end;
+  if (right.start === right.end) return left.start < right.start && right.start < left.end;
+  return left.start < right.end && right.start < left.end;
+}

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

@@ -160,11 +160,16 @@ function jsDeclarationWithSourceSpan(input, declaration, lines) {
       startLine,
       endLine,
       startColumn: declaration.span?.startColumn ?? 1,
-      endColumn: declaration.span?.endColumn ?? endLineText.length + 1
+      endColumn: declarationEndColumn(declaration, startLine, endLine, endLineText)
     }
   };
 }
 
+function declarationEndColumn(declaration, startLine, endLine, endLineText) {
+  if (endLine !== startLine) return endLineText.length + 1;
+  return declaration.span?.endColumn ?? endLineText.length + 1;
+}
+
 function jsBalancedDeclarationEndLine(input, lines, startLine) {
   const state = { inBlockComment: false, inTemplateString: false };
   let depth = 0;

package/package.json

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