@shapeshift-labs/frontier-lang-compiler 0.2.126 → 0.2.128

package/dist/internal/index-impl/semanticIndexFromNativeDeclarations.js

@@ -214,7 +214,7 @@ function moduleSpecifierForDeclaration(declaration) {
     declaration.metadata?.importPath,
     declaration.metadata?.exportPath,
     declaration.metadata?.source,
-    declaration.symbolKind === 'module' ? declaration.name : undefined
+    declaration.role === 'import' && declaration.symbolKind === 'module' ? declaration.name : undefined
   );
 }
 
@@ -245,6 +245,7 @@ function publicContractRegionForDeclaration(declaration, ownershipRegion, module
 function reExportIdentityForDeclaration(declaration, input, documentId, relationId, ownershipRegion, moduleEdge) {
   if (!moduleEdge?.isReExport && !declaration.reExport) return undefined;
   const bindingCount = Number(declaration.nativeNode?.metadata?.bindingCount ?? declaration.metadata?.bindingCount ?? 0);
+  if (declaration.symbolKind === 'module' && declaration.metadata?.namespaceReExport) return undefined;
   if (declaration.symbolKind === 'module' && !declaration.exportStar && !declaration.metadata?.exportStar && bindingCount > 1) return undefined;
   const identityId = hashSemanticValue([relationId, declaration.symbolId, declaration.exportedName ?? declaration.metadata?.exportedName, declaration.importedName ?? declaration.metadata?.importedName, declaration.localName ?? declaration.metadata?.localName]);
   const stableId = bindingCount > 1 ? idFragment(identityId) : idFragment(relationId);

package/dist/internal/index-impl/typeScriptModuleDeclarationEntries.js

@@ -39,17 +39,20 @@ function exportDeclarationEntries(node, nativeNodeId, input) {
   const typeOnly = Boolean(node.isTypeOnly);
   const exportStar = moduleSpecifier && !node.exportClause;
   const bindings = exportClauseBindings(node.exportClause, { typeOnly, reExport: Boolean(moduleSpecifier) });
+  const namespaceReExport = Boolean(moduleSpecifier && bindings.some((binding) => binding.exportKind === 'namespace-reexport'));
   return [
     ...(moduleSpecifier ? importModuleEntries(input, nativeNodeId, moduleSpecifier, 'ExportFromDeclaration', reExportImportBindings(bindings, exportStar), {
       typeOnly,
       reexport: true,
       exportStar,
+      namespaceReExport,
       importKind: exportStar ? 'reexport' : 'reexport'
     }) : []),
     ...exportModuleEntries(input, nativeNodeId, moduleSpecifier, bindings, {
       typeOnly,
       exportStar,
       reExport: Boolean(moduleSpecifier),
+      namespaceReExport,
       exportKind: exportStar ? 'export-star' : 'named'
     })
   ];
@@ -269,6 +272,7 @@ function moduleMetadata(scan, bindings, metadata) {
     sideEffectOnly: metadata.sideEffectOnly,
     reexport: metadata.reexport,
     reExport: metadata.reExport,
+    namespaceReExport: metadata.namespaceReExport,
     exportStar: metadata.exportStar,
     publicContract: metadata.reExport || metadata.exportKind
   });

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

@@ -1,5 +1,6 @@
 import { JsTsSafeMergeConflictCodes, JsTsSafeMergeGateIds } from './js-ts-safe-merge-constants.js';
 import { addConflict, arraysEqual, sameStatementText } from './js-ts-safe-merge-context.js';
+import { validateCrossSideExportStarAdditions } from './js-ts-safe-merge-export-star-validation.js';
 
 export function analyzeVariantLedger(base, variant, baseIndex, side, context) {
   const projectedBaseKeys = [];
@@ -159,6 +160,7 @@ export function validateIndependentAdditions(base, workerPlan, headPlan, context
   validateAddedEntryNames(workerPlan, declarationNames, context);
   validateAddedEntryNames(headPlan, declarationNames, context);
   validateCrossSideAddedNames(workerPlan, headPlan, context);
+  validateCrossSideExportStarAdditions(workerPlan, headPlan, context);
   validateCrossSideImportAdditions(workerPlan, headPlan, context);
   validateMergedImportAndDeclarationNames(base, workerPlan, headPlan, context);
 }

package/dist/js-ts-safe-merge-export-star-validation.js

@@ -0,0 +1,46 @@
+import { JsTsSafeMergeConflictCodes, JsTsSafeMergeGateIds } from './js-ts-safe-merge-constants.js';
+import { addConflict } from './js-ts-safe-merge-context.js';
+
+export function validateCrossSideExportStarAdditions(workerPlan, headPlan, context) {
+  if (context.deferReExportIdentityConflictsToProjectGraph === true) return;
+  for (const workerEntry of workerPlan.addedEntries) {
+    for (const headEntry of headPlan.addedEntries) {
+      if (!isSourceOnlyExportStarRisk(workerEntry, headEntry)) continue;
+      addConflict(context, {
+        code: JsTsSafeMergeConflictCodes.duplicateName,
+        gateId: JsTsSafeMergeGateIds.uniqueNames,
+        side: 'worker',
+        message: 'Source-only merge cannot prove export-star additions have disjoint public names.',
+        details: {
+          reasonCode: 'source-only-export-star-requires-project-graph',
+          workerKey: workerEntry.key,
+          headKey: headEntry.key,
+          workerStatement: workerEntry.text.trim(),
+          headStatement: headEntry.text.trim()
+        }
+      });
+      return;
+    }
+  }
+}
+
+function isSourceOnlyExportStarRisk(left, right) {
+  const leftStar = isExportStarReExportEntry(left);
+  const rightStar = isExportStarReExportEntry(right);
+  if (!leftStar && !rightStar) return false;
+  if (leftStar && rightStar && sameExportStarIdentity(left, right)) return false;
+  return isPublicSurfaceAddition(left) && isPublicSurfaceAddition(right);
+}
+
+function isExportStarReExportEntry(entry) {
+  return entry?.kind === 'export' && entry.declarationInfo?.reExport === true && entry.declarationInfo?.exportStar === true;
+}
+
+function sameExportStarIdentity(left, right) {
+  return left?.declarationInfo?.moduleSpecifier === right?.declarationInfo?.moduleSpecifier
+    && Boolean(left?.declarationInfo?.typeOnly) === Boolean(right?.declarationInfo?.typeOnly);
+}
+
+function isPublicSurfaceAddition(entry) {
+  return entry?.kind === 'export' || entry?.declarationInfo?.exported === true;
+}

package/dist/js-ts-safe-project-merge-graph-delta-conflicts.js

@@ -46,7 +46,7 @@ function addProjectGraphDeltaConflictSummary(projectGraphDelta, conflicts) {
       publicContractConflicts: conflicts.filter((conflict) => conflict.code === 'project-public-contract-delta-conflict').length,
       reExportIdentityConflicts: conflicts.filter((conflict) => conflict.code === 'project-re-export-identity-delta-conflict').length,
       importTargetConflicts: conflicts.filter((conflict) => conflict.code === 'project-import-target-delta-conflict').length,
-      limitConflicts: conflicts.filter((conflict) => conflict.code === 'project-graph-limit-exceeded').length
+      limitConflicts: conflicts.filter((conflict) => conflict.gateId === 'project-graph-limit').length
     }
   };
 }

package/package.json

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