@shapeshift-labs/frontier-lang-compiler 0.2.147 → 0.2.148

package/dist/js-ts-safe-merge-independent-deletion-plan.js

@@ -50,6 +50,9 @@ function createIndependentTopLevelDeletionPlan(input, topLevelResult) {
   if (deletedEntry.kind !== 'declaration' || deletedEntry.declarationInfo?.exported === true) {
     return { ok: false, reasonCodes: ['exported-or-unsupported-top-level-deletion'] };
   }
+  if (isUnsupportedTopLevelDeletion(deletedEntry)) {
+    return { ok: false, reasonCodes: ['unsupported-top-level-deletion-declaration'] };
+  }
 
   const expectedWorkerKeys = base.entries
     .filter((entry) => entry.key !== deletedEntry.key)
@@ -127,6 +130,11 @@ function entriesByKey(entries) {
   return new Map(entries.map((entry) => [entry.key, entry]));
 }
 
+function isUnsupportedTopLevelDeletion(entry) {
+  if (entry.declarationInfo?.declarationKind === 'module') return true;
+  return /^\s*(?:export\s+)?declare\b/.test(entry.text ?? '');
+}
+
 function sameStringList(left, right) {
   return left.length === right.length && left.every((value, index) => value === right[index]);
 }

package/dist/js-ts-safe-merge-semantic-edit-already-applied.js

@@ -58,6 +58,7 @@ function isProjectedDeleteAlreadyAppliedReplay(input) {
     .filter((edit) => edit.editKind === 'delete')
     .map((edit) => edit.operationId));
   const staleDeletes = edits.filter(isProjectedDeleteMissingAnchor);
+  if (hasUnsafeProjectedDeleteCompanions(input, staleDeletes)) return false;
   return staleDeletes.length > 0
     && edits.every((edit) => edit.status === 'already-applied' || isProjectedDeleteMissingAnchor(edit))
     && staleDeletes.every((edit) => appliedDeleteIds.has(edit.operationId) && projectionDeleteIds.has(edit.operationId));
@@ -79,4 +80,48 @@ function alreadyAppliedDeleteEdit(edit) {
   };
 }
 
+function hasUnsafeProjectedDeleteCompanions(input, staleDeletes) {
+  const projectionEdits = input.projection?.edits ?? [];
+  if (!projectionEdits.length || !staleDeletes.length) return false;
+  const projectionDeleteById = new Map(projectionEdits
+    .filter((edit) => edit.editKind === 'delete')
+    .map((edit) => [edit.operationId, edit]));
+  for (const staleDelete of staleDeletes) {
+    const projectedDelete = projectionDeleteById.get(staleDelete.operationId);
+    const scope = memberBodyDeleteScope(projectedDelete ?? staleDelete);
+    if (!scope) continue;
+    const companions = projectionEdits.filter((edit) => (
+      edit.operationId !== staleDelete.operationId
+        && edit.editKind !== 'delete'
+        && symbolContainerName(edit.symbolName) === scope.container
+    ));
+    if (!companions.length) return true;
+    const bodyInserts = companions.filter((edit) => (
+      edit.editKind === 'insert'
+        && edit.regionKind === scope.regionKind
+        && edit.symbolKind === scope.symbolKind
+    ));
+    if (bodyInserts.length === 0) return true;
+    if (companions.some((edit) => !bodyInserts.includes(edit))) return true;
+  }
+  return false;
+}
+
+function memberBodyDeleteScope(edit) {
+  if (edit?.editKind !== 'delete' || edit?.regionKind !== 'body') return undefined;
+  const container = symbolContainerName(edit.symbolName);
+  if (!container) return undefined;
+  return {
+    container,
+    regionKind: edit.regionKind,
+    symbolKind: edit.symbolKind
+  };
+}
+
+function symbolContainerName(symbolName) {
+  const normalized = String(symbolName ?? '').split(':controlFlow:')[0];
+  const separator = normalized.lastIndexOf('.');
+  return separator === -1 ? undefined : normalized.slice(0, separator);
+}
+
 export { normalizeAlreadyAppliedDeleteReplay };

package/package.json

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