@shapeshift-labs/frontier-lang-compiler 0.2.133 → 0.2.134

package/README.md

@@ -194,7 +194,9 @@ generic semantic edit script path. The fallback admits the merge only after the
 script is an auto-merge candidate, the source projection succeeds, replay on
 current head is `accepted-clean`, and replay on the projected source is
 `already-applied`. Same-anchor head edits, stale anchors, and non-body conflicts
-remain blocked for review.
+remain blocked for review. The same fallback composes with declared unordered
+member-addition regions, so a verified body edit can still merge alongside safe
+interface, type, class, or object member additions.
 
 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-composed.js

@@ -25,12 +25,16 @@ function safeMergeJsTsSource(input = {}) {
     return composedBlockedResult(input, 'member-analysis', memberNeutralization.result, memberNeutralization.analysis);
   }
 
-  const topLevelResult = safeMergeJsTsImportsAndDeclarations({
+  const topLevelInput = {
     ...input,
     baseSourceText: memberNeutralization.baseSourceText,
     workerSourceText: memberNeutralization.workerSourceText,
     headSourceText: memberNeutralization.headSourceText
-  });
+  };
+  const topLevelLedgerResult = safeMergeJsTsImportsAndDeclarations(topLevelInput);
+  const topLevelResult = topLevelLedgerResult.status === JsTsSafeMergeStatuses.merged
+    ? topLevelLedgerResult
+    : semanticEditFallbackResult(topLevelInput, topLevelLedgerResult);
   if (topLevelResult.status !== JsTsSafeMergeStatuses.merged) {
     return composedBlockedResult(input, 'top-level', topLevelResult, memberNeutralization.analysis);
   }
@@ -61,7 +65,7 @@ function safeMergeJsTsSource(input = {}) {
     metadata: {
       ...topLevelResult.metadata,
       composed: {
-        phases: ['top-level', 'member'],
+        phases: composedPhaseList(topLevelResult),
         memberRegions: memberNeutralization.analysis.preparedRegions.map((region) => ({
           kind: region.kind,
           name: region.name,
@@ -78,6 +82,13 @@ function safeMergeJsTsSource(input = {}) {
   };
 }
 
+function composedPhaseList(topLevelResult) {
+  const topLevelPhases = topLevelResult.metadata?.composed?.phases;
+  if (Array.isArray(topLevelPhases) && topLevelPhases.length) return [...topLevelPhases, 'member'];
+  const topLevelPhase = topLevelResult.metadata?.composed?.phase;
+  return topLevelPhase ? [topLevelPhase, 'member'] : ['top-level', 'member'];
+}
+
 function hasMemberMergePolicy(input) {
   const policy = input.policy ?? input.mergePolicy ?? input;
   const regions = Array.isArray(policy)
@@ -119,14 +130,20 @@ function composedBlockedResult(input, phase, result, memberAnalysis) {
       gatesPassed: result.gates?.filter((gate) => gate.status === 'passed').length ?? 0,
       memberRegions: memberAnalysis?.preparedRegions?.length ?? 0,
       memberAdditions: 0,
+      semanticEditOperations: result.summary?.semanticEditOperations,
+      semanticEditAppliedOperations: result.summary?.semanticEditAppliedOperations,
+      semanticEditReplayStatus: result.summary?.semanticEditReplayStatus,
       composedPhases: phase === 'top-level' ? 2 : 1
     },
     metadata: {
       composed: {
         phase,
-        sourceKind: result.kind
+        sourceKind: result.kind,
+        topLevelPhase: result.metadata?.composed?.phase,
+        topLevelPhases: result.metadata?.composed?.phases
       }
-    }
+    },
+    semanticArtifacts: result.semanticArtifacts
   };
 }
 

package/package.json

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