@shapeshift-labs/frontier-lang-compiler 0.2.110 → 0.2.111

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

@@ -7,6 +7,7 @@ import type {
   JsTsSafeMergeSummary
 } from './js-ts-safe-merge.js';
 import type { JsTsSafeMemberMergePolicy, JsTsSafeMemberMergePolicyRegion } from './js-ts-safe-member-merge.js';
+import type { NativeProjectImportResult, NativeProjectSymbolGraphSummary } from './native-project.js';
 
 export type JsTsProjectSafeMergeStatus = 'merged' | 'blocked';
 export type JsTsProjectSafeMergeFileStatus = 'merged' | 'blocked';
@@ -53,6 +54,7 @@ export interface JsTsProjectSafeMergeInput {
   readonly headFiles?: JsTsProjectSafeMergeFileMap;
   readonly allowFileAdditions?: boolean;
   readonly allowFileDeletes?: boolean;
+  readonly includeOutputProjectSymbolGraph?: boolean;
   readonly workerChangeSetId?: string;
   readonly headChangeSetId?: string;
   readonly policy?: JsTsSafeMemberMergePolicy | readonly JsTsSafeMemberMergePolicyRegion[];
@@ -112,6 +114,8 @@ export interface JsTsProjectSafeMergeResult {
   readonly status: JsTsProjectSafeMergeStatus;
   readonly files: readonly JsTsProjectSafeMergeFileResult[];
   readonly outputFiles: readonly JsTsProjectSafeMergeOutputFile[];
+  readonly outputProjectImport?: NativeProjectImportResult;
+  readonly outputProjectSymbolGraph?: NativeProjectSymbolGraphSummary;
   readonly conflicts: readonly JsTsSafeMergeConflict[];
   readonly admission: JsTsProjectSafeMergeAdmission;
   readonly summary: {

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

@@ -0,0 +1,35 @@
+import { idFragment } from './native-import-utils.js';
+import { createNativeProjectImportResult } from './internal/index-impl/createNativeProjectImportResult.js';
+import { importNativeSource } from './internal/index-impl/importNativeSource.js';
+
+function createJsTsProjectSafeMergeGraphArtifacts(input, outputFiles, mergeId) {
+  const sources = outputFiles.map((file) => ({
+    id: `${mergeId}_output_${idFragment(file.sourcePath)}`,
+    language: file.language ?? input.language ?? languageForPath(file.sourcePath),
+    sourcePath: file.sourcePath,
+    sourceText: file.sourceText,
+    metadata: { semanticImportExpected: true, projectSafeMergeOutput: true }
+  }));
+  const imports = sources.map((source) => importNativeSource(source));
+  const projectImport = createNativeProjectImportResult({
+    id: `${mergeId}_output_project_import`,
+    projectRoot: input.projectRoot,
+    sources,
+    metadata: {
+      projectSafeMergeId: mergeId,
+      outputProjectSymbolGraph: true
+    }
+  }, imports);
+  return {
+    projectImport,
+    projectSymbolGraph: projectImport.projectSymbolGraph
+  };
+}
+
+function languageForPath(sourcePath) {
+  const path = String(sourcePath ?? '').toLowerCase();
+  if (path.endsWith('.js') || path.endsWith('.jsx') || path.endsWith('.mjs') || path.endsWith('.cjs')) return 'javascript';
+  return 'typescript';
+}
+
+export { createJsTsProjectSafeMergeGraphArtifacts };

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

@@ -1,6 +1,7 @@
 import { hashSemanticValue } from '@shapeshift-labs/frontier-lang-kernel';
 import { safeMergeJsTsSource } from './js-ts-safe-merge-composed.js';
 import { compactRecord } from './js-ts-safe-merge-context.js';
+import { createJsTsProjectSafeMergeGraphArtifacts } from './js-ts-safe-project-merge-graph.js';
 
 function safeMergeJsTsProject(input = {}) {
   const id = String(input.id ?? 'js_ts_project_safe_merge');
@@ -18,6 +19,9 @@ function safeMergeJsTsProject(input = {}) {
       operation: file.operation
     }));
   const reasonCodes = uniqueStrings(blockedFiles.flatMap((file) => file.admission.reasonCodes));
+  const graphArtifacts = status === 'merged' && input.includeOutputProjectSymbolGraph
+    ? createJsTsProjectSafeMergeGraphArtifacts(input, outputFiles, id)
+    : undefined;
   const core = {
     kind: 'frontier.lang.jsTsProjectSafeMerge',
     version: 1,
@@ -26,6 +30,8 @@ function safeMergeJsTsProject(input = {}) {
     status,
     files: fileResults,
     outputFiles,
+    outputProjectImport: graphArtifacts?.projectImport,
+    outputProjectSymbolGraph: graphArtifacts?.projectSymbolGraph,
     conflicts: fileResults.flatMap((file) => file.conflicts),
     admission: {
       status: status === 'merged' ? 'auto-merge-candidate' : 'blocked',
@@ -43,6 +49,7 @@ function safeMergeJsTsProject(input = {}) {
       headChangeSetId: input.headChangeSetId,
       projectRoot: input.projectRoot,
       filesInput: Array.isArray(input.files) ? 'records' : 'maps',
+      outputProjectSymbolGraph: Boolean(graphArtifacts?.projectSymbolGraph),
       autoMergeClaim: false,
       semanticEquivalenceClaim: false
     })

package/package.json

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