fallow-type-aware 3.14.0 → 3.16.0

package/fallow-type-aware.mjs

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 
-import { run } from "./src/cli.mjs";
+import { assertTypescriptBackendResolvable } from "./src/backend-preflight.mjs";
 
 try {
+  assertTypescriptBackendResolvable();
+  const { run } = await import("./src/cli.mjs");
   await run({ input: process.stdin, output: process.stdout, args: process.argv.slice(2) });
 } catch (error) {
   const message = error instanceof Error ? error.message : String(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fallow-type-aware",
-  "version": "3.14.0",
+  "version": "3.16.0",
   "description": "Optional TypeScript-Go semantic refinement sidecar for Fallow",
   "license": "MIT",
   "repository": {

package/src/backend-preflight.mjs

@@ -0,0 +1,42 @@
+import { createRequire } from "node:module";
+import path from "node:path";
+
+import { BACKEND_VERSION } from "./generated-protocol.mjs";
+
+const REQUIRED_MAJOR = Number.parseInt(BACKEND_VERSION, 10);
+const INSTALL_HINT =
+  "run `npm ci` in tools/type-aware-sidecar so the sidecar resolves its own typescript install";
+
+/**
+ * Verify that module resolution hands the sidecar a typescript install that
+ * provides the `typescript/unstable/sync` backend entry point.
+ *
+ * The semantic modules import that entry point statically, so an incompatible
+ * resolution (for example a typescript 6 hoisted into an ancestor
+ * `node_modules`) fails at link time with a bare module path instead of the
+ * version conflict that caused it. This preflight runs before those imports
+ * and names the resolved version, its location, and the fix. Exact
+ * backend-version parity stays enforced in `protocol.mjs`.
+ *
+ * @param {string | URL} resolveFrom Module URL or file path to resolve from;
+ *   defaults to this module so the check mirrors the semantic imports.
+ */
+export const assertTypescriptBackendResolvable = (resolveFrom = import.meta.url) => {
+  const sidecarRequire = createRequire(resolveFrom);
+  let manifestPath;
+  try {
+    manifestPath = sidecarRequire.resolve("typescript/package.json");
+  } catch {
+    throw new Error(`typescript is not installed; ${INSTALL_HINT}`);
+  }
+  const { version } = sidecarRequire(manifestPath);
+  const major = Number.parseInt(version, 10);
+  if (Number.isFinite(major) && major >= REQUIRED_MAJOR) {
+    return;
+  }
+  throw new Error(
+    `resolved typescript ${version} from ${path.dirname(manifestPath)}, which lacks the ` +
+      `typescript/unstable/sync backend; fallow-type-aware needs typescript ${BACKEND_VERSION}; ` +
+      INSTALL_HINT,
+  );
+};

package/src/semantic-identity.mjs

@@ -12,9 +12,11 @@ import {
   isMethodDeclaration,
   isMethodSignatureDeclaration,
   isModuleDeclaration,
+  isNamespaceExport,
   isPropertyDeclaration,
   isPropertySignatureDeclaration,
   isSetAccessorDeclaration,
+  isSourceFile,
   isTypeAliasDeclaration,
   isVariableDeclaration,
 } from "typescript/unstable/ast/is";
@@ -45,7 +47,12 @@ const TYPE_ONLY_DECLARATIONS = [
   isTypeAliasDeclaration,
   isPropertySignatureDeclaration,
 ];
-const DUAL_NAMESPACE_DECLARATIONS = [isClassDeclaration, isClassExpression, isEnumDeclaration];
+const DUAL_NAMESPACE_DECLARATIONS = [
+  isClassDeclaration,
+  isClassExpression,
+  isEnumDeclaration,
+  isSourceFile,
+];
 const DECLARATION_OWNER_NODES = [isClassDeclaration, isClassExpression, isInterfaceDeclaration];
 
 const slash = (value) => value.split(path.sep).join("/");
@@ -101,6 +108,8 @@ export const ownerDeclaration = (node) => {
 
 export const isDeclaration = (node) => declarationKind(node) !== undefined;
 
+export const isExportAnchor = (node) => isExportSpecifier(node) || isNamespaceExport(node);
+
 const visit = (node, callback) => {
   callback(node);
   node.forEachChild((child) => {
@@ -151,6 +160,16 @@ const indexExportSpecifier = (index, node) => {
   );
 };
 
+const indexNamespaceExport = (index, node) => {
+  const exportedName = nodeText(node.name);
+  if (!exportedName) return;
+  [node.parent, node]
+    .flatMap((candidate) => positions(candidate))
+    .forEach((position) =>
+      indexExportPosition(index, node, { localName: exportedName, exportedName }, position),
+    );
+};
+
 const defaultModifierFor = (node) =>
   node.modifiers?.find((modifier) => modifier.getText(node.getSourceFile()) === "default");
 
@@ -197,6 +216,10 @@ const declarationIndex = (sourceFile) => {
       indexExportSpecifier(index, node);
       return;
     }
+    if (isNamespaceExport(node)) {
+      indexNamespaceExport(index, node);
+      return;
+    }
     indexDeclarationNode(index, node);
   });
   declarationIndexes.set(sourceFile, index);
@@ -205,7 +228,7 @@ const declarationIndex = (sourceFile) => {
 
 export const findDeclaration = (sourceFile, identity) => {
   const anchor = declarationIndex(sourceFile).get(anchorKey(identity));
-  if (!anchor || isExportSpecifier(anchor)) return anchor;
+  if (!anchor || isExportAnchor(anchor)) return anchor;
   return declarationNamespaces(anchor).has(identity.namespace) ? anchor : undefined;
 };
 

package/src/semantic.mjs

@@ -35,6 +35,7 @@ import {
   declarationsForSymbol,
   findDeclaration,
   isDeclaration,
+  isExportAnchor,
   isProjectSource,
   nodeText,
   ownerDeclaration,
@@ -735,7 +736,7 @@ const selectSymbolContext = (
 
 const resolvedAnchorTarget = (project, anchor, requestedSymbol) => {
   if (!anchor) return undefined;
-  if (!isExportSpecifier(anchor)) {
+  if (!isExportAnchor(anchor)) {
     return declarationNamespaces(anchor).has(requestedSymbol.namespace)
       ? { declaration: anchor, namespace: requestedSymbol.namespace }
       : undefined;