@shapeshift-labs/frontier-lang-compiler 0.2.129 → 0.2.130

package/README.md

@@ -170,7 +170,7 @@ small and dependency-free. They cover accepted projection/replay cases, exact
 source preservation, generated/source-map boundaries, safe import/declaration
 merges, safe unordered member merges, composed top-level/member safe merges,
 and rejected unsafe cases such as stale
-ledger spans, import specifier reordering, computed keys, duplicate exported
+ledger spans, import specifier removals, computed keys, duplicate exported
 names, duplicate object members, decorators, overload anchors, and same-anchor
 edit conflicts. Fixture failures include the fixture id and the actual
 reason-code or gate values so distributed swarm evidence can point at a stable

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

@@ -103,34 +103,27 @@ function analyzeImportStatementChange(baseEntry, variantEntry, side, context) {
 
   const baseSpecifiers = baseImport.specifiers;
   const variantSpecifiers = variantImport.specifiers;
-  if (variantSpecifiers.length < baseSpecifiers.length) {
+  const baseSpecifiersByCanonical = new Set(baseSpecifiers.map((specifier) => specifier.canonical));
+  const variantSpecifiersByCanonical = new Set(variantSpecifiers.map((specifier) => specifier.canonical));
+  const missingBaseSpecifiers = baseSpecifiers.filter((specifier) => !variantSpecifiersByCanonical.has(specifier.canonical));
+  if (missingBaseSpecifiers.length) {
     addConflict(context, {
       code: JsTsSafeMergeConflictCodes.importSpecifierRemoved,
       gateId: JsTsSafeMergeGateIds.independentImportSpecifiers,
       side,
       message: `${side} source removes import specifiers.`,
-      details: { key: baseEntry.key }
+      details: {
+        key: baseEntry.key,
+        missing: missingBaseSpecifiers.map((specifier) => specifier.canonical)
+      }
     });
     return [];
   }
-  for (let index = 0; index < baseSpecifiers.length; index += 1) {
-    if (variantSpecifiers[index]?.canonical !== baseSpecifiers[index].canonical) {
-      addConflict(context, {
-        code: JsTsSafeMergeConflictCodes.importSpecifierReordered,
-        gateId: JsTsSafeMergeGateIds.independentImportSpecifiers,
-        side,
-        message: `${side} source reorders or changes existing import specifiers.`,
-        details: {
-          key: baseEntry.key,
-          expected: baseSpecifiers.map((specifier) => specifier.canonical),
-          actual: variantSpecifiers.map((specifier) => specifier.canonical)
-        }
-      });
-      return [];
-    }
-  }
-  const additions = variantSpecifiers.slice(baseSpecifiers.length);
+  const additions = variantSpecifiers.filter((specifier) => !baseSpecifiersByCanonical.has(specifier.canonical));
   if (additions.length === 0 && !sameStatementText(baseEntry.text, variantEntry.text)) {
+    const baseCanonicalOrder = baseSpecifiers.map((specifier) => specifier.canonical);
+    const variantCanonicalOrder = variantSpecifiers.map((specifier) => specifier.canonical);
+    if (!arraysEqual(baseCanonicalOrder, variantCanonicalOrder)) return [];
     addConflict(context, {
       code: JsTsSafeMergeConflictCodes.importFormattingChanged,
       gateId: JsTsSafeMergeGateIds.independentImportSpecifiers,

package/package.json

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