Promote dev with NodeNext and Python toolchain fixes

crates/graph-core/src/extraction/facts.rs

@@ -586,6 +586,8 @@ fn module_parts_for_path(path: &str) -> Vec<String> {
     let without_extension = path
         .strip_suffix(".py")
         .or_else(|| path.strip_suffix(".pyi"))
+        .or_else(|| path.strip_suffix(".mts"))
+        .or_else(|| path.strip_suffix(".cts"))
         .or_else(|| path.strip_suffix(".ts"))
         .or_else(|| path.strip_suffix(".tsx"))
         .or_else(|| path.strip_suffix(".js"))

crates/graph-core/src/extraction/facts/collector.rs

@@ -6,8 +6,9 @@ use crate::protocol::{GraphFactEdge, GraphFactNode};
 use oxc_ast::ast::{
     Argument, BindingPattern, CallExpression, Class, ExportAllDeclaration,
     ExportDefaultDeclaration, ExportDefaultDeclarationKind, ExportNamedDeclaration, Expression,
-    Function, ImportDeclaration, ImportDeclarationSpecifier, ModuleExportName, NewExpression,
-    TSInterfaceDeclaration, TSTypeAliasDeclaration, TSTypeName, VariableDeclaration,
+    Function, ImportDeclaration, ImportDeclarationSpecifier, ImportExpression, ModuleExportName,
+    NewExpression, TSImportType, TSInterfaceDeclaration, TSTypeAliasDeclaration, TSTypeName,
+    VariableDeclaration,
 };
 use oxc_ast_visit::{walk, Visit};
 use oxc_syntax::scope::ScopeFlags;
@@ -317,6 +318,24 @@ impl<'a> Visit<'a> for FileFactCollector {
         });
     }
 
+    fn visit_import_expression(&mut self, import: &ImportExpression<'a>) {
+        if let Expression::StringLiteral(source) = &import.source {
+            self.imports.push(ImportFact {
+                specifier: source.value.to_string(),
+                bindings: Vec::new(),
+            });
+        }
+        walk::walk_import_expression(self, import);
+    }
+
+    fn visit_ts_import_type(&mut self, import: &TSImportType<'a>) {
+        self.imports.push(ImportFact {
+            specifier: import.source.value.to_string(),
+            bindings: Vec::new(),
+        });
+        walk::walk_ts_import_type(self, import);
+    }
+
     fn visit_export_named_declaration(&mut self, export: &ExportNamedDeclaration<'a>) {
         let source = export
             .source
@@ -530,6 +549,7 @@ impl<'a> Visit<'a> for FileFactCollector {
 
     fn visit_ts_type_alias_declaration(&mut self, declaration: &TSTypeAliasDeclaration<'a>) {
         self.add_declaration("type", "Type", declaration.id.name.as_ref());
+        walk::walk_ts_type_alias_declaration(self, declaration);
     }
 
     fn visit_ts_interface_declaration(&mut self, declaration: &TSInterfaceDeclaration<'a>) {
@@ -543,10 +563,14 @@ impl<'a> Visit<'a> for FileFactCollector {
                 });
             }
         }
+        walk::walk_ts_interface_declaration(self, declaration);
     }
 
     fn visit_variable_declaration(&mut self, declaration: &VariableDeclaration<'a>) {
         for declarator in &declaration.declarations {
+            if let Some(type_annotation) = &declarator.type_annotation {
+                self.visit_ts_type_annotation(type_annotation);
+            }
             if let Some(name) = binding_name(&declarator.id) {
                 if self.current_context.is_none() {
                     let Some(init) = declarator.init.as_ref() else {

crates/graph-core/src/extraction/language.rs

@@ -13,7 +13,7 @@ pub enum SourceLanguage {
 impl SourceLanguage {
     pub fn from_path(path: &Path) -> Option<Self> {
         match path.extension().and_then(|extension| extension.to_str()) {
-            Some("ts") => Some(Self::TypeScript),
+            Some("ts") | Some("mts") | Some("cts") => Some(Self::TypeScript),
             Some("tsx") => Some(Self::TypeScriptJsx),
             Some("js") => Some(Self::JavaScript),
             Some("jsx") => Some(Self::JavaScriptJsx),
@@ -38,9 +38,10 @@ impl SourceLanguage {
     pub fn unsupported_source_extension(path: &Path) -> Option<String> {
         let extension = path.extension()?.to_str()?;
         match extension {
-            "mjs" | "cjs" | "mts" | "cts" | "vue" | "svelte" | "go" | "java" | "rb" | "php"
-            | "swift" | "kt" | "kts" | "scala" | "lua" | "cs" | "c" | "cc" | "cpp" | "h"
-            | "hpp" => Some(extension.to_string()),
+            "mjs" | "cjs" | "vue" | "svelte" | "go" | "java" | "rb" | "php" | "swift" | "kt"
+            | "kts" | "scala" | "lua" | "cs" | "c" | "cc" | "cpp" | "h" | "hpp" => {
+                Some(extension.to_string())
+            }
             _ => None,
         }
     }

crates/graph-core/src/extraction/tsconfig.rs

@@ -355,16 +355,51 @@ fn resolve_candidate(
 }
 
 fn resolution_candidates(path: &str) -> Vec<String> {
-    let mut candidates = vec![path.to_string()];
-    if Path::new(path).extension().is_none() {
-        for extension in [".ts", ".tsx", ".js", ".jsx"] {
-            candidates.push(format!("{path}{extension}"));
-        }
-        for extension in ["ts", "tsx", "js", "jsx"] {
-            candidates.push(format!("{path}/index.{extension}"));
+    let extension = Path::new(path).extension().and_then(|value| value.to_str());
+    match extension {
+        Some("js") => vec![
+            replace_extension(path, "ts"),
+            replace_extension(path, "tsx"),
+            replace_extension(path, "d.ts"),
+            path.to_string(),
+            replace_extension(path, "jsx"),
+        ],
+        Some("jsx") => vec![
+            replace_extension(path, "tsx"),
+            replace_extension(path, "ts"),
+            replace_extension(path, "d.ts"),
+            path.to_string(),
+            replace_extension(path, "js"),
+        ],
+        Some("mjs") => vec![
+            replace_extension(path, "mts"),
+            replace_extension(path, "d.mts"),
+            path.to_string(),
+        ],
+        Some("cjs") => vec![
+            replace_extension(path, "cts"),
+            replace_extension(path, "d.cts"),
+            path.to_string(),
+        ],
+        Some(_) => vec![path.to_string()],
+        None => {
+            let mut candidates = vec![path.to_string()];
+            for extension in ["ts", "tsx", "mts", "cts", "js", "jsx", "d.ts"] {
+                candidates.push(format!("{path}.{extension}"));
+            }
+            for extension in ["ts", "tsx", "mts", "cts", "js", "jsx", "d.ts"] {
+                candidates.push(format!("{path}/index.{extension}"));
+            }
+            candidates
         }
     }
-    candidates
+}
+
+fn replace_extension(path: &str, extension: &str) -> String {
+    Path::new(path)
+        .with_extension(extension)
+        .to_string_lossy()
+        .replace('\\', "/")
 }
 
 fn normalize_relative(path: &Path) -> Result<String, ()> {

packages/contracts/schemas/opcore-contracts.schema.json

@@ -3326,6 +3326,18 @@
                         "failureMessage": {
                           "type": "string",
                           "minLength": 1
+                        },
+                        "cwd": {
+                          "type": "string",
+                          "minLength": 1
+                        },
+                        "configFile": {
+                          "type": "string",
+                          "minLength": 1
+                        },
+                        "source": {
+                          "type": "string",
+                          "minLength": 1
                         }
                       }
                     }

packages/contracts/src/index.ts

@@ -1256,6 +1256,9 @@ export interface ValidationAdapterToolchainStatus {
   command?: string;
   version?: string;
   failureMessage?: string;
+  cwd?: string;
+  configFile?: string;
+  source?: string;
 }
 
 export interface ValidationAdapterDegradedCheckStatus {
@@ -6619,6 +6622,11 @@ function validateValidationAdapterToolchainStatus(status: ValidationAdapterToolc
   if (status.failureMessage !== undefined) {
     validateNonEmptyString(status.failureMessage, "Validation adapter toolchain status failureMessage");
   }
+  if (status.cwd !== undefined) validateNonEmptyString(status.cwd, "Validation adapter toolchain status cwd");
+  if (status.configFile !== undefined) {
+    validateNonEmptyString(status.configFile, "Validation adapter toolchain status configFile");
+  }
+  if (status.source !== undefined) validateNonEmptyString(status.source, "Validation adapter toolchain status source");
   return status;
 }
 

packages/fixtures/source-extraction/node-next/node-next.expected.json

@@ -0,0 +1,82 @@
+{
+  "schemaVersion": 1,
+  "fixture": "source-extraction-node-next",
+  "fileNodeIds": [
+    "file:src/alias-consumer.ts",
+    "file:src/alias/value.ts",
+    "file:src/common-dep.cts",
+    "file:src/common.cts",
+    "file:src/dep.ts",
+    "file:src/dynamic-target.ts",
+    "file:src/dynamic.ts",
+    "file:src/import-type.ts",
+    "file:src/main.ts",
+    "file:src/module-dep.mts",
+    "file:src/module.mts",
+    "file:src/nonliteral.ts",
+    "file:src/types.ts"
+  ],
+  "moduleEdgeTriples": [
+    [
+      "DEPENDS_ON",
+      "file:src/alias-consumer.ts",
+      "file:src/alias/value.ts"
+    ],
+    [
+      "DEPENDS_ON",
+      "file:src/common.cts",
+      "file:src/common-dep.cts"
+    ],
+    [
+      "DEPENDS_ON",
+      "file:src/dynamic.ts",
+      "file:src/dynamic-target.ts"
+    ],
+    [
+      "DEPENDS_ON",
+      "file:src/import-type.ts",
+      "file:src/types.ts"
+    ],
+    [
+      "DEPENDS_ON",
+      "file:src/main.ts",
+      "file:src/dep.ts"
+    ],
+    [
+      "DEPENDS_ON",
+      "file:src/module.mts",
+      "file:src/module-dep.mts"
+    ],
+    [
+      "IMPORTS_FROM",
+      "file:src/alias-consumer.ts",
+      "file:src/alias/value.ts"
+    ],
+    [
+      "IMPORTS_FROM",
+      "file:src/common.cts",
+      "file:src/common-dep.cts"
+    ],
+    [
+      "IMPORTS_FROM",
+      "file:src/dynamic.ts",
+      "file:src/dynamic-target.ts"
+    ],
+    [
+      "IMPORTS_FROM",
+      "file:src/import-type.ts",
+      "file:src/types.ts"
+    ],
+    [
+      "IMPORTS_FROM",
+      "file:src/main.ts",
+      "file:src/dep.ts"
+    ],
+    [
+      "IMPORTS_FROM",
+      "file:src/module.mts",
+      "file:src/module-dep.mts"
+    ]
+  ],
+  "diagnostics": []
+}

packages/fixtures/source-extraction/node-next/src/alias-consumer.ts

@@ -0,0 +1,3 @@
+import { aliasValue } from "@fixture/value.js";
+
+export const consumedAlias = aliasValue;

packages/fixtures/source-extraction/node-next/src/alias/value.ts

@@ -0,0 +1 @@
+export const aliasValue = "alias";

packages/fixtures/source-extraction/node-next/src/common-dep.cts

@@ -0,0 +1 @@
+export const commonDependency = "common";

packages/fixtures/source-extraction/node-next/src/common.cts

@@ -0,0 +1,3 @@
+import { commonDependency } from "./common-dep.cjs";
+
+export const commonValue = commonDependency;

packages/fixtures/source-extraction/node-next/src/dep.ts

@@ -0,0 +1 @@
+export const dependency = "typescript";

packages/fixtures/source-extraction/node-next/src/dynamic-target.ts

@@ -0,0 +1 @@
+export const dynamicValue = "dynamic";

packages/fixtures/source-extraction/node-next/src/dynamic.ts

@@ -0,0 +1,3 @@
+export async function loadDynamic() {
+  return import("./dynamic-target.js");
+}

packages/fixtures/source-extraction/node-next/src/import-type.ts

@@ -0,0 +1 @@
+export type ImportedShape = import("./types.js").Shape;

packages/fixtures/source-extraction/node-next/src/main.ts

@@ -0,0 +1,3 @@
+import { dependency } from "./dep.js";
+
+export const mainValue = dependency;

packages/fixtures/source-extraction/node-next/src/module-dep.mts

@@ -0,0 +1 @@
+export const moduleDependency = "module";

packages/fixtures/source-extraction/node-next/src/module.mts

@@ -0,0 +1,3 @@
+import { moduleDependency } from "./module-dep.mjs";
+
+export const moduleValue = moduleDependency;

packages/fixtures/source-extraction/node-next/src/nonliteral.ts

@@ -0,0 +1,3 @@
+export async function loadFrom(specifier: string) {
+  return import(specifier);
+}

packages/fixtures/source-extraction/node-next/src/types.ts

@@ -0,0 +1,3 @@
+export interface Shape {
+  value: string;
+}

packages/fixtures/source-extraction/node-next/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "paths": {
+      "@fixture/*": ["src/alias/*"]
+    },
+    "target": "ES2022"
+  },
+  "include": ["src/**/*"]
+}

packages/opcore-graph-core-linux-x64/metadata.json

@@ -4,6 +4,6 @@
   "targetPlatform": "linux-x64",
   "binaryPath": "opcore-graph-core",
   "checksumPath": "opcore-graph-core.sha256",
-  "checksumSha256": "70cb6d213d74594f337a67522c879b77767872dc4601063686f1abe70886127b",
+  "checksumSha256": "c3a771435a7a8172a9e5f0bb20b0d111453efc70901e95308094664f77e7bdf1",
   "buildProfile": "release"
 }

packages/opcore-graph-core-linux-x64/opcore-graph-core.sha256

@@ -1 +1 @@
-70cb6d213d74594f337a67522c879b77767872dc4601063686f1abe70886127b  opcore-graph-core
+c3a771435a7a8172a9e5f0bb20b0d111453efc70901e95308094664f77e7bdf1  opcore-graph-core

packages/opcore/src/advanced/validation-composition.ts

@@ -76,7 +76,7 @@ export function createDefaultValidationStatusPayload(options: {
   const graphMode = options.graphMode ?? "optional";
   return createValidationStatusPayload({
     checks: validationChecksForRepoPolicy(options.repoRoot),
-    adapters: [createRustValidationAdapterStatus(), createPythonValidationAdapterStatus()],
+    adapters: [createRustValidationAdapterStatus(), createPythonValidationAdapterStatus({ repoRoot: options.repoRoot })],
     graphMode,
     graphStatus: cliGraphStatus({ repoRoot: options.repoRoot }, graphMode)
   });