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

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

@@ -200,6 +200,7 @@ function validateCrossSideAddedNames(workerPlan, headPlan, context) {
       const nameKey = `${entry.kind}:${name}`;
       const headEntry = headEntriesByName.get(nameKey);
       if (headEntry) {
+        if (shouldDeferReExportNameConflict(entry, headEntry, context)) continue;
         const typeAliasConflict = entry.declarationInfo?.declarationKind === 'type'
           || headEntry.declarationInfo?.declarationKind === 'type';
         addConflict(context, {
@@ -216,6 +217,16 @@ function validateCrossSideAddedNames(workerPlan, headPlan, context) {
   }
 }
 
+function shouldDeferReExportNameConflict(left, right, context) {
+  return context.deferReExportIdentityConflictsToProjectGraph === true
+    && isReExportEntry(left)
+    && isReExportEntry(right);
+}
+
+function isReExportEntry(entry) {
+  return entry?.kind === 'export' && entry.declarationInfo?.reExport === true;
+}
+
 function validateCrossSideImportAdditions(workerPlan, headPlan, context) {
   for (const [key, workerAdditions] of workerPlan.importAdditions) {
     const headAdditions = headPlan.importAdditions.get(key) ?? [];

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

@@ -5,6 +5,7 @@ export function createMergeContext(input) {
     id: String(input.id ?? 'js_ts_safe_merge'),
     sourcePath: input.sourcePath,
     language: input.language ?? 'typescript',
+    deferReExportIdentityConflictsToProjectGraph: input.deferReExportIdentityConflictsToProjectGraph === true,
     conflicts: [],
     blockedGateIds: new Set(),
     gateReasonCodes: new Map()

package/dist/js-ts-safe-merge-ledger-validation.js

@@ -24,6 +24,7 @@ export function validateLedgerUniqueness(ledger, context) {
       const nameKey = `${entry.kind}:${name}`;
       const existing = nameOwners.get(nameKey);
       if (existing) {
+        if (shouldDeferMergedReExportNameConflict(ledger, existing, entry, context)) continue;
         addConflict(context, {
           code: JsTsSafeMergeConflictCodes.duplicateName,
           gateId: JsTsSafeMergeGateIds.uniqueNames,
@@ -65,6 +66,17 @@ function validateUniqueImportSpecifiers(entry, side, context) {
   }
 }
 
+function shouldDeferMergedReExportNameConflict(ledger, left, right, context) {
+  return ledger.label === 'merged'
+    && context.deferReExportIdentityConflictsToProjectGraph === true
+    && isReExportEntry(left)
+    && isReExportEntry(right);
+}
+
+function isReExportEntry(entry) {
+  return entry?.kind === 'export' && entry.declarationInfo?.reExport === true;
+}
+
 export function indexBaseLedger(base, context) {
   const entriesByKey = new Map();
   for (const entry of base.entries) entriesByKey.set(entry.key, entry);

package/dist/js-ts-safe-merge-parse-declarations.js

@@ -19,7 +19,7 @@ export function classifyStatement(text, start, end) {
     if (unsupported) return { unsupported, text, start, end };
     return {
       kind: declarationInfo.kind,
-      key: `${declarationInfo.kind}:${declarationInfo.names.join('|')}`,
+      key: declarationLedgerKey(declarationInfo),
       text,
       start,
       end,
@@ -126,6 +126,50 @@ function parseDeclarationInfo(text) {
   const defaultClass = trimmed.match(/^export\s+default\s+(?:abstract\s+)?class(?:\s+([A-Za-z_$][\w$]*))?\b/);
   if (defaultClass) return { kind: 'declaration', names: ['default'], declarationKind: 'class', exported: true, defaultExport: true };
 
+  const namespaceReExport = trimmed.match(/^export\s+(type\s+)?\*\s+as\s+([A-Za-z_$][\w$]*)\s+from\s+(['"])([^'"]+)\3\s*;?$/);
+  if (namespaceReExport) {
+    return {
+      kind: 'export',
+      names: [namespaceReExport[2]],
+      declarationKind: 're-export-namespace',
+      exported: true,
+      typeOnly: Boolean(namespaceReExport[1]),
+      reExport: true,
+      moduleSpecifier: namespaceReExport[4],
+      namespace: namespaceReExport[2]
+    };
+  }
+
+  const starReExport = trimmed.match(/^export\s+(type\s+)?\*\s+from\s+(['"])([^'"]+)\2\s*;?$/);
+  if (starReExport) {
+    return {
+      kind: 'export',
+      names: [],
+      declarationKind: 're-export-star',
+      exported: true,
+      typeOnly: Boolean(starReExport[1]),
+      reExport: true,
+      moduleSpecifier: starReExport[3],
+      exportStar: true
+    };
+  }
+
+  const namedReExport = trimmed.match(/^export\s+(type\s+)?\{([\s\S]+)\}\s+from\s+(['"])([^'"]+)\3\s*;?$/);
+  if (namedReExport) {
+    const names = splitCommaList(namedReExport[2]).map((part) => parseExportSpecifierName(part)).filter(Boolean);
+    const expectedCount = splitCommaList(namedReExport[2]).filter((part) => part.trim()).length;
+    if (names.length !== expectedCount || names.length === 0) return undefined;
+    return {
+      kind: 'export',
+      names,
+      declarationKind: 're-export-list',
+      exported: true,
+      typeOnly: Boolean(namedReExport[1]),
+      reExport: true,
+      moduleSpecifier: namedReExport[4]
+    };
+  }
+
   const namedExport = trimmed.match(/^export\s+(type\s+)?\{([\s\S]+)\}\s*;?$/);
   if (namedExport) {
     const names = splitCommaList(namedExport[2]).map((part) => parseExportSpecifierName(part)).filter(Boolean);
@@ -154,6 +198,19 @@ function parseDeclarationInfo(text) {
   return undefined;
 }
 
+function declarationLedgerKey(declarationInfo) {
+  if (declarationInfo.reExport) {
+    return [
+      declarationInfo.kind,
+      declarationInfo.declarationKind,
+      declarationInfo.moduleSpecifier ?? '',
+      declarationInfo.typeOnly ? 'type' : 'value',
+      declarationInfo.exportStar ? '*' : declarationInfo.names.join('|')
+    ].join(':');
+  }
+  return `${declarationInfo.kind}:${declarationInfo.names.join('|')}`;
+}
+
 function unsupportedDeclarationPolicy(text, declarationInfo) {
   const trimmed = text.trim();
   if (/^\s*@/m.test(text)) {

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

@@ -111,6 +111,7 @@ function mergeProjectFile(file, input, projectId) {
   const result = safeMergeJsTsSource({
     ...input,
     ...context,
+    deferReExportIdentityConflictsToProjectGraph: input.includeProjectGraphDelta === true,
     id: `${projectId}_${safeId(file.sourcePath)}`,
     baseSourceText: base,
     workerSourceText: worker,

package/package.json

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