@shapeshift-labs/frontier-lang-compiler 0.2.140 → 0.2.142

package/README.md

@@ -200,11 +200,12 @@ interface, type, class, or object member additions. Existing class/object method
 or property body edits inside the declared member region are preserved for
 semantic replay while added members are neutralized; object member additions are
 re-emitted with safe commas when both sides add final properties.
-If staged whole-declaration replay cannot verify because head changed a sibling
-member inside the same declaration, `safeMergeJsTsSource` retries the direct
-semantic edit projection and admits the merge only when replay still verifies
-cleanly. That direct retry can project onto the staged top-level merge output,
-so safe import/declaration additions are preserved alongside the sibling edit.
+When head changed an existing sibling declaration or sibling member,
+`safeMergeJsTsSource` prefers the direct semantic edit projection over a
+neutralized staged projection, and admits the merge only when replay still
+verifies cleanly. That direct path projects onto a staged top-level output with
+head declaration changes replayed first, so safe import/declaration additions
+are preserved without dropping the head-side sibling edit.
 
 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
@@ -295,6 +296,9 @@ Public contract regions include `apiSurfaceKind`, `signatureHash`, and
 For `export * from './module.js'`, project graphs fan out re-export identities
 for each named export in the resolved target document and omit `default`, which
 matches JavaScript module semantics.
+Output graph admission can use those expanded identities to accept disjoint
+export-star additions while blocking incompatible duplicate exported names as
+`project-output-re-export-identity-conflict`.
 
 When using `createTypeScriptCompilerNativeImporterAdapter`,
 `createEstreeNativeImporterAdapter`, or `createBabelNativeImporterAdapter`,

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

@@ -20,23 +20,14 @@ import { idFragment, uniqueStrings } from './native-import-utils.js';
 function semanticEditFallbackResult(input, topLevelResult) {
   if (!shouldTrySemanticEditFallback(topLevelResult)) return topLevelResult;
   const stagedFallback = createStagedTopLevelSemanticFallback(input, topLevelResult);
-  let selectedFallback = stagedFallback;
-  let artifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, stagedFallback);
-  if (stagedFallback && artifacts.status !== 'verified') {
-    const directFallback = stagedFallback.directProjectionHeadSourceText && stagedFallback.safeTopLevelChanges > 0
-      ? { ...stagedFallback, projectionMode: 'direct' }
-      : undefined;
-    const directArtifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, directFallback);
-    if (directArtifacts.status === 'verified') {
-      artifacts = directArtifacts;
-      selectedFallback = directFallback;
-    } else if (directFallback) {
-      const plainDirectArtifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, undefined);
-      if (plainDirectArtifacts.status === 'verified') {
-        artifacts = plainDirectArtifacts;
-        selectedFallback = undefined;
-      }
-    }
+  const candidates = semanticFallbackCandidates(stagedFallback);
+  let selectedFallback = candidates[0];
+  let artifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, selectedFallback);
+  for (const candidate of candidates.slice(1)) {
+    if (artifacts.status === 'verified') break;
+    const nextArtifacts = createSemanticEditFallbackArtifacts(input, topLevelResult, candidate);
+    if (nextArtifacts.status === 'verified') selectedFallback = candidate;
+    artifacts = nextArtifacts.status === 'verified' ? nextArtifacts : artifacts;
   }
   if (artifacts.status !== 'verified') return semanticEditFallbackBlockedResult(input, topLevelResult, artifacts);
   const resultBase = selectedFallback?.stagedTopLevelResult ?? topLevelResult;
@@ -83,6 +74,16 @@ function semanticEditFallbackResult(input, topLevelResult) {
   };
 }
 
+function semanticFallbackCandidates(stagedFallback) {
+  if (!stagedFallback) return [undefined];
+  const headChanged = (stagedFallback.neutralization?.summary?.headChangedExistingDeclarations ?? 0) > 0;
+  const directFallback = stagedFallback.directProjectionHeadSourceText && (headChanged || stagedFallback.safeTopLevelChanges > 0)
+    ? { ...stagedFallback, projectionMode: 'direct' }
+    : undefined;
+  if (headChanged) return directFallback ? [directFallback, undefined] : [undefined];
+  return directFallback ? [stagedFallback, directFallback, undefined] : [stagedFallback];
+}
+
 function createSemanticEditFallbackArtifacts(input, topLevelResult, stagedFallback) {
   try {
     const id = String(input.id ?? topLevelResult.id ?? 'js_ts_safe_merge');

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

@@ -1,3 +1,4 @@
+import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
 import { compactRecord } from './js-ts-safe-merge-context.js';
 import { projectGraphDeltaConflicts } from './js-ts-safe-project-merge-graph-delta-conflicts.js';
 
@@ -25,7 +26,8 @@ function outputProjectGraphConflicts(projectSymbolGraph) {
   return [
     ...limitConflicts,
     ...[...missingModuleGroups.values()].map(projectGraphMissingImportConflict),
-    ...[...missingSymbolGroups.values()].map(projectGraphMissingTargetConflict)
+    ...[...missingSymbolGroups.values()].map(projectGraphMissingTargetConflict),
+    ...duplicateReExportIdentityConflicts(projectSymbolGraph?.reExportIdentities)
   ];
 }
 
@@ -94,6 +96,83 @@ function projectImportTargetName(edge) {
   return String(name);
 }
 
+function duplicateReExportIdentityConflicts(records = []) {
+  const groups = new Map();
+  for (const record of records) {
+    const key = reExportIdentityKey(record);
+    if (!key) continue;
+    const group = groups.get(key) ?? [];
+    group.push(record);
+    groups.set(key, group);
+  }
+  return [...groups.entries()]
+    .filter(([, group]) => new Set(group.map(reExportIdentityFingerprint)).size > 1)
+    .map(([identityKey, group]) => projectGraphDuplicateReExportIdentityConflict(identityKey, group));
+}
+
+function projectGraphDuplicateReExportIdentityConflict(identityKey, group) {
+  const record = group[0] ?? {};
+  return {
+    code: 'project-output-re-export-identity-conflict',
+    gateId: 'project-symbol-graph',
+    message: `Output project graph exposes incompatible re-export identity ${JSON.stringify(identityKey)}.`,
+    sourcePath: record.sourcePath,
+    details: compactRecord({
+      reasonCode: 'project-output-re-export-identity-conflict',
+      conflictKey: `project-output-re-export-identity#${identityKey}`,
+      identityKey,
+      sourcePath: record.sourcePath,
+      exportedName: record.exportedName,
+      records: group.map(reExportIdentityDetails)
+    })
+  };
+}
+
+function reExportIdentityKey(record) {
+  return stableKey([
+    're-export-identity',
+    record?.sourcePath,
+    record?.exportedName ?? record?.localName ?? record?.namespace ?? (record?.exportStar || record?.isExportStar ? '*' : undefined)
+  ]);
+}
+
+function reExportIdentityFingerprint(record) {
+  return hashSemanticValue({
+    moduleSpecifier: record.moduleSpecifier,
+    exportedName: record.exportedName,
+    importedName: record.importedName,
+    localName: record.localName,
+    namespace: record.namespace,
+    isTypeOnly: record.isTypeOnly,
+    exportStar: record.exportStar,
+    isExportStar: record.isExportStar,
+    originSymbolId: record.originSymbolId,
+    exportedSymbolId: record.exportedSymbolId,
+    localSymbolId: record.localSymbolId
+  });
+}
+
+function reExportIdentityDetails(record) {
+  return compactRecord({
+    moduleSpecifier: record.moduleSpecifier,
+    exportedName: record.exportedName,
+    importedName: record.importedName,
+    localName: record.localName,
+    namespace: record.namespace,
+    isTypeOnly: record.isTypeOnly,
+    exportStar: record.exportStar,
+    isExportStar: record.isExportStar,
+    originSymbolId: record.originSymbolId,
+    exportedSymbolId: record.exportedSymbolId,
+    localSymbolId: record.localSymbolId
+  });
+}
+
+function stableKey(parts) {
+  const values = parts.map((part) => part === undefined || part === null ? '' : String(part));
+  return values.some(Boolean) ? values.join('#') : undefined;
+}
+
 function uniqueStrings(values) {
   return [...new Set(values.filter((value) => typeof value === 'string' && value.length > 0))];
 }

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

@@ -111,7 +111,7 @@ function mergeProjectFile(file, input, projectId) {
   const result = safeMergeJsTsSource({
     ...input,
     ...context,
-    deferReExportIdentityConflictsToProjectGraph: input.includeProjectGraphDelta === true,
+    deferReExportIdentityConflictsToProjectGraph: input.includeProjectGraphDelta === true || input.includeOutputProjectSymbolGraph === 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.140",
+  "version": "0.2.142",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",