@shapeshift-labs/frontier-lang-compiler 0.2.141 → 0.2.142

package/README.md

@@ -200,11 +200,12 @@ interface, type, class, or object member additions. Existing class/object method
 or property body edits inside the declared member region are preserved for
 semantic replay while added members are neutralized; object member additions are
 re-emitted with safe commas when both sides add final properties.
-If staged whole-declaration replay cannot verify because head changed a sibling
-member inside the same declaration, `safeMergeJsTsSource` retries the direct
-semantic edit projection and admits the merge only when replay still verifies
-cleanly. That direct retry can project onto the staged top-level merge output,
-so safe import/declaration additions are preserved alongside the sibling edit.
+When head changed an existing sibling declaration or sibling member,
+`safeMergeJsTsSource` prefers the direct semantic edit projection over a
+neutralized staged projection, and admits the merge only when replay still
+verifies cleanly. That direct path projects onto a staged top-level output with
+head declaration changes replayed first, so safe import/declaration additions
+are preserved without dropping the head-side sibling edit.
 
 Project-level JS/TS safe merges compose the same file-level gates across a
 base/worker/head file set. They preserve head-only files, admit worker-only

package/dist/js-ts-safe-merge-semantic-edit-fallback.js

@@ -20,23 +20,14 @@ import { idFragment, uniqueStrings } from './native-import-utils.js';
 function semanticEditFallbackResult(input, topLevelResult) {
   if (!shouldTrySemanticEditFallback(topLevelResult)) return topLevelResult;
   const stagedFallback = createStagedTopLevelSemanticFallback(input, topLevelResult);
-  let selectedFallback = stagedFallback;
-  let artifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, stagedFallback);
-  if (stagedFallback && artifacts.status !== 'verified') {
-    const directFallback = stagedFallback.directProjectionHeadSourceText && stagedFallback.safeTopLevelChanges > 0
-      ? { ...stagedFallback, projectionMode: 'direct' }
-      : undefined;
-    const directArtifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, directFallback);
-    if (directArtifacts.status === 'verified') {
-      artifacts = directArtifacts;
-      selectedFallback = directFallback;
-    } else if (directFallback) {
-      const plainDirectArtifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, undefined);
-      if (plainDirectArtifacts.status === 'verified') {
-        artifacts = plainDirectArtifacts;
-        selectedFallback = undefined;
-      }
-    }
+  const candidates = semanticFallbackCandidates(stagedFallback);
+  let selectedFallback = candidates[0];
+  let artifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, selectedFallback);
+  for (const candidate of candidates.slice(1)) {
+    if (artifacts.status === 'verified') break;
+    const nextArtifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, candidate);
+    if (nextArtifacts.status === 'verified') selectedFallback = candidate;
+    artifacts = nextArtifacts.status === 'verified' ? nextArtifacts : artifacts;
   }
   if (artifacts.status !== 'verified') return semanticEditFallbackBlockedResult(input, topLevelResult, artifacts);
   const resultBase = selectedFallback?.stagedTopLevelResult ?? topLevelResult;
@@ -83,6 +74,16 @@ function semanticEditFallbackResult(input, topLevelResult) {
   };
 }
 
+function semanticFallbackCandidates(stagedFallback) {
+  if (!stagedFallback) return [undefined];
+  const headChanged = (stagedFallback.neutralization?.summary?.headChangedExistingDeclarations ?? 0) > 0;
+  const directFallback = stagedFallback.directProjectionHeadSourceText && (headChanged || stagedFallback.safeTopLevelChanges > 0)
+    ? { ...stagedFallback, projectionMode: 'direct' }
+    : undefined;
+  if (headChanged) return directFallback ? [directFallback, undefined] : [undefined];
+  return directFallback ? [stagedFallback, directFallback, undefined] : [stagedFallback];
+}
+
 function createSemanticEditFallbackArtifacts(input, topLevelResult, stagedFallback) {
   try {
     const id = String(input.id ?? topLevelResult.id ?? 'js_ts_safe_merge');

package/package.json

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