@shapeshift-labs/frontier-lang-compiler 0.2.136 → 0.2.138

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

@@ -47,7 +47,9 @@ export function createSourceMergePlan(base, worker, head, workerPlan, headPlan,
     label: 'import'
   });
   const headImportGroupsByAnchor = new Map(headImportInsertionGroups.map((group) => [insertionGroupKey(group), group]));
+  const countedImportInsertionGroups = new Set();
   for (const group of importInsertionGroups) {
+    countedImportInsertionGroups.add(insertionGroupKey(group));
     const anchor = headEntriesByBaseKey.get(group.anchorKey);
     if (!anchor) {
       addConflict(context, {
@@ -68,7 +70,10 @@ export function createSourceMergePlan(base, worker, head, workerPlan, headPlan,
       end: insertionSpan.end,
       text: importInsertionText(entries, detectLineEnding(head.sourceText))
     });
-    importDeclarationAdditions += group.entries.length;
+    importDeclarationAdditions += entries.length;
+  }
+  for (const group of headImportInsertionGroups) {
+    if (!countedImportInsertionGroups.has(insertionGroupKey(group))) importDeclarationAdditions += group.entries.length;
   }
 
   const insertionGroups = variantInsertionGroups(worker, workerPlan.matchedVariantKeys, 'worker', context, {
@@ -83,7 +88,9 @@ export function createSourceMergePlan(base, worker, head, workerPlan, headPlan,
   });
   const headDeclarationGroupsByAnchor = new Map(headInsertionGroups.map((group) => [insertionGroupKey(group), group]));
   let topLevelDeclarationAdditions = 0;
+  const countedDeclarationInsertionGroups = new Set();
   for (const group of insertionGroups) {
+    countedDeclarationInsertionGroups.add(insertionGroupKey(group));
     const anchor = headEntriesByBaseKey.get(group.anchorKey);
     if (!anchor) {
       addConflict(context, {
@@ -104,7 +111,10 @@ export function createSourceMergePlan(base, worker, head, workerPlan, headPlan,
       end: insertionSpan.end,
       text: declarationInsertionText(entries, detectLineEnding(head.sourceText))
     });
-    topLevelDeclarationAdditions += group.entries.length;
+    topLevelDeclarationAdditions += entries.length;
+  }
+  for (const group of headInsertionGroups) {
+    if (!countedDeclarationInsertionGroups.has(insertionGroupKey(group))) topLevelDeclarationAdditions += group.entries.length;
   }
 
   return {

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

@@ -38,7 +38,7 @@ function semanticEditFallbackResult(input, topLevelResult) {
     },
     summary: {
       ...resultBase.summary,
-      changedExistingDeclarations: topLevelResult.summary?.changedExistingDeclarations ?? resultBase.summary?.changedExistingDeclarations ?? 0,
+      changedExistingDeclarations: semanticFallbackChangedExistingDeclarations(topLevelResult, resultBase, stagedFallback),
       conflicts: 0,
       gatesPassed: gates.filter((gate) => gate.status === 'passed').length,
       semanticEditOperations: artifacts.script.summary.operations,
@@ -62,7 +62,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 +261,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 +283,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.136",
+  "version": "0.2.138",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",