@shapeshift-labs/frontier-lang-compiler 0.2.137 → 0.2.139

package/README.md

@@ -200,6 +200,10 @@ 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.
 
 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

@@ -14,9 +14,17 @@ import { idFragment, uniqueStrings } from './native-import-utils.js';
 function semanticEditFallbackResult(input, topLevelResult) {
   if (!shouldTrySemanticEditFallback(topLevelResult)) return topLevelResult;
   const stagedFallback = createStagedTopLevelSemanticFallback(input, topLevelResult);
-  const artifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, stagedFallback);
+  let selectedFallback = stagedFallback;
+  let artifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, stagedFallback);
+  if (stagedFallback && artifacts.status !== 'verified') {
+    const directArtifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, undefined);
+    if (directArtifacts.status === 'verified') {
+      artifacts = directArtifacts;
+      selectedFallback = undefined;
+    }
+  }
   if (artifacts.status !== 'verified') return semanticEditFallbackBlockedResult(input, topLevelResult, artifacts);
-  const resultBase = stagedFallback?.stagedTopLevelResult ?? topLevelResult;
+  const resultBase = selectedFallback?.stagedTopLevelResult ?? topLevelResult;
   const mergedSourceText = artifacts.projection.sourceText;
   const gates = semanticEditGates(artifacts);
   return {
@@ -38,7 +46,7 @@ function semanticEditFallbackResult(input, topLevelResult) {
     },
     summary: {
       ...resultBase.summary,
-      changedExistingDeclarations: topLevelResult.summary?.changedExistingDeclarations ?? resultBase.summary?.changedExistingDeclarations ?? 0,
+      changedExistingDeclarations: semanticFallbackChangedExistingDeclarations(topLevelResult, resultBase, selectedFallback),
       conflicts: 0,
       gatesPassed: gates.filter((gate) => gate.status === 'passed').length,
       semanticEditOperations: artifacts.script.summary.operations,
@@ -49,11 +57,11 @@ function semanticEditFallbackResult(input, topLevelResult) {
     metadata: {
       ...resultBase.metadata,
       composed: {
-        phase: stagedFallback ? 'staged-top-level-semantic-edit-fallback' : 'semantic-edit-fallback',
-        phases: stagedFallback ? ['top-level-neutralization', 'top-level-ledger', 'semantic-edit'] : ['top-level-ledger', 'semantic-edit'],
+        phase: selectedFallback ? 'staged-top-level-semantic-edit-fallback' : 'semantic-edit-fallback',
+        phases: selectedFallback ? ['top-level-neutralization', 'top-level-ledger', 'semantic-edit'] : ['top-level-ledger', 'semantic-edit'],
         originalReasonCodes: topLevelResult.admission?.reasonCodes ?? [],
-        stagedTopLevelSummary: stagedFallback?.stagedTopLevelResult?.summary,
-        neutralization: stagedFallback?.neutralization?.summary
+        stagedTopLevelSummary: selectedFallback?.stagedTopLevelResult?.summary,
+        neutralization: selectedFallback?.neutralization?.summary
       }
     },
     semanticArtifacts: artifacts
@@ -62,7 +70,28 @@ function semanticEditFallbackResult(input, topLevelResult) {
 
 function shouldTrySemanticEditFallback(result) {
   const conflicts = result.conflicts ?? [];
-  return conflicts.length > 0 && conflicts.every((conflict) => conflict.code === JsTsSafeMergeConflictCodes.changedExistingDeclaration);
+  return conflicts.length > 0 && conflicts.every((conflict) => semanticFallbackConflictCodes.has(conflict.code));
+}
+
+const semanticFallbackConflictCodes = new Set([
+  JsTsSafeMergeConflictCodes.changedExistingDeclaration,
+  JsTsSafeMergeConflictCodes.typeAliasConflict
+]);
+
+function semanticFallbackConflictCode(result) {
+  return result.conflicts?.find((conflict) => semanticFallbackConflictCodes.has(conflict.code))?.code
+    ?? JsTsSafeMergeConflictCodes.changedExistingDeclaration;
+}
+
+function semanticFallbackChangedExistingDeclarations(topLevelResult, resultBase, stagedFallback) {
+  const conflictCount = (topLevelResult.conflicts ?? [])
+    .filter((conflict) => semanticFallbackConflictCodes.has(conflict.code)).length;
+  return Math.max(
+    topLevelResult.summary?.changedExistingDeclarations ?? 0,
+    resultBase?.summary?.changedExistingDeclarations ?? 0,
+    stagedFallback?.neutralization?.summary?.workerChangedExistingDeclarations ?? 0,
+    conflictCount
+  );
 }
 
 function createSemanticEditFallbackArtifacts(input, topLevelResult, stagedFallback) {
@@ -240,7 +269,7 @@ function semanticEditFallbackBlockedResult(input, topLevelResult, artifacts) {
     : topLevelResult.admission?.reasonCodes ?? [];
   const gates = semanticEditGates(artifacts);
   const conflict = {
-    code: JsTsSafeMergeConflictCodes.changedExistingDeclaration,
+    code: semanticFallbackConflictCode(topLevelResult),
     gateId: 'semantic-edit-replay',
     message: 'JS/TS semantic edit fallback did not verify a clean replay.',
     side: 'worker',
@@ -262,6 +291,7 @@ function semanticEditFallbackBlockedResult(input, topLevelResult, artifacts) {
     },
     summary: {
       ...topLevelResult.summary,
+      changedExistingDeclarations: semanticFallbackChangedExistingDeclarations(topLevelResult, topLevelResult),
       conflicts: 1,
       gatesPassed: gates.filter((gate) => gate.status === 'passed').length,
       semanticEditOperations: artifacts.summary.operations,

package/package.json

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