@wix/zero-config-implementation 1.13.0 → 1.14.0

package/dist/information-extractors/ts/components.d.ts

@@ -5,5 +5,10 @@ export declare function extractAllComponentInfo(program: ts.Program, filePath: s
  * Extracts component info for only the default-exported component in a file.
  * Returns `undefined` if the file has no default export or if the default export
  * is not a recognized React component.
+ *
+ * Handles the re-export case where the entry file only re-exports the component
+ * from another file (e.g. `export { Foo as default } from './Foo'`). In that
+ * situation react-docgen-typescript finds no component in the entry file, so we
+ * follow the re-export to the defining file and extract from there instead.
  */
 export declare function extractDefaultComponentInfo(program: ts.Program, filePath: string): ComponentInfo | undefined;

package/package.json

@@ -4,7 +4,7 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Core library for extracting component manifests from JS and CSS files",
   "type": "module",
   "main": "dist/index.js",
@@ -74,5 +74,5 @@
       ]
     }
   },
-  "falconPackageHash": "415f1144395df7902b157f7d63d64cd53a60a5f69c460b61c217594b"
+  "falconPackageHash": "1365e0b6dc9053e4dd5346884137f7cc61e12eed845e32e0e86a6122"
 }

package/src/information-extractors/ts/components.ts

@@ -60,13 +60,25 @@ export function extractAllComponentInfo(program: ts.Program, filePath: string):
  * Extracts component info for only the default-exported component in a file.
  * Returns `undefined` if the file has no default export or if the default export
  * is not a recognized React component.
+ *
+ * Handles the re-export case where the entry file only re-exports the component
+ * from another file (e.g. `export { Foo as default } from './Foo'`). In that
+ * situation react-docgen-typescript finds no component in the entry file, so we
+ * follow the re-export to the defining file and extract from there instead.
  */
 export function extractDefaultComponentInfo(program: ts.Program, filePath: string): ComponentInfo | undefined {
   const defaultName = findDefaultExportName(program, filePath)
   if (!defaultName) return undefined
 
-  const all = extractAllComponentInfo(program, filePath)
-  return all.find((c) => c.componentName === defaultName)
+  const found = extractAllComponentInfo(program, filePath).find((c) => c.componentName === defaultName)
+  if (found) return found
+
+  const definingFilePath = resolveDefaultReExportFilePath(program, filePath)
+  if (definingFilePath) {
+    return extractAllComponentInfo(program, definingFilePath).find((c) => c.componentName === defaultName)
+  }
+
+  return undefined
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -75,7 +87,7 @@ export function extractDefaultComponentInfo(program: ts.Program, filePath: strin
 
 /**
  * Resolves the name of the default-exported symbol in a file using the
- * TypeScript type checker.
+ * TypeScript type checker, with an AST fallback for cross-module re-exports.
  *
  * Returns `undefined` for anonymous default exports (e.g. `export default () => ...`)
  * where no stable name can be determined.
@@ -91,17 +103,83 @@ function findDefaultExportName(program: ts.Program, filePath: string): string |
   const defaultSymbol = checker.getExportsOfModule(moduleSymbol).find((symbol) => symbol.getName() === 'default')
   if (!defaultSymbol) return undefined
 
-  // For `export default Foo` the symbol is an alias — resolve it to get 'Foo'
   if (defaultSymbol.getFlags() & ts.SymbolFlags.Alias) {
-    const aliased = checker.getAliasedSymbol(defaultSymbol)
-    const name = aliased.getName()
-    // 'default' means the alias resolved back to an anonymous default export
-    return name !== 'default' ? name : undefined
+    const aliasedSymbol = checker.getAliasedSymbol(defaultSymbol)
+    const name = aliasedSymbol.getName()
+    // Cross-module re-exports (e.g. `export { Foo as default } from './Foo'`) produce a
+    // transient alias with no declarations. Fall back to reading the name from the AST.
+    const hasDeclarations = (aliasedSymbol.getDeclarations()?.length ?? 0) > 0
+    if (name !== 'default' && hasDeclarations) return name
+  }
+
+  return findDefaultReExportNameFromAST(sourceFile)
+}
+
+/**
+ * Scans the AST for a named re-export that aliases a symbol to `default`
+ * (i.e. `export { Foo as default } from './other'`) and returns the original
+ * symbol name (`Foo`).
+ */
+function findDefaultReExportNameFromAST(sourceFile: ts.SourceFile): string | undefined {
+  const specifier = findDefaultReExportSpecifier(sourceFile)
+  // propertyName is the original name before aliasing; when absent, the specifier
+  // name is both the local and exported name (which here would be 'default').
+  return specifier?.propertyName?.text
+}
+
+/**
+ * Resolves the absolute file path of the module targeted by a default re-export.
+ *
+ * For `export { Foo as default } from './other'`, returns the resolved path of
+ * `'./other'`. Uses `ts.resolveModuleName` because the type checker's alias chain
+ * ends at a transient symbol with no declarations for cross-module re-exports.
+ *
+ * Returns `undefined` when the file has no default re-export or the module
+ * specifier cannot be resolved.
+ */
+function resolveDefaultReExportFilePath(program: ts.Program, filePath: string): string | undefined {
+  const sourceFile = program.getSourceFile(filePath)
+  if (!sourceFile) return undefined
+
+  const exportDeclaration = findDefaultReExportSpecifier(sourceFile)?.parent?.parent
+  if (!exportDeclaration || !ts.isExportDeclaration(exportDeclaration)) return undefined
+  if (!exportDeclaration.moduleSpecifier || !ts.isStringLiteral(exportDeclaration.moduleSpecifier)) return undefined
+
+  const resolveResult = ts.resolveModuleName(
+    exportDeclaration.moduleSpecifier.text,
+    filePath,
+    program.getCompilerOptions(),
+    ts.sys,
+  )
+
+  const resolvedPath = resolveResult.resolvedModule?.resolvedFileName
+  if (resolvedPath && resolvedPath !== filePath) {
+    return resolvedPath
   }
 
   return undefined
 }
 
+/**
+ * Finds the `ExportSpecifier` node for the specifier that aliases something
+ * to `default` in a re-export declaration (e.g. the `Foo as default` part of
+ * `export { Foo as default } from './other'`).
+ */
+function findDefaultReExportSpecifier(sourceFile: ts.SourceFile): ts.ExportSpecifier | undefined {
+  for (const statement of sourceFile.statements) {
+    if (!ts.isExportDeclaration(statement)) continue
+    if (!statement.moduleSpecifier) continue
+    if (!statement.exportClause || !ts.isNamedExports(statement.exportClause)) continue
+
+    for (const specifier of statement.exportClause.elements) {
+      if (specifier.name.text === 'default') {
+        return specifier
+      }
+    }
+  }
+  return undefined
+}
+
 // ─────────────────────────────────────────────────────────────────────────────
 // ComponentDoc → ComponentInfo conversion
 // ─────────────────────────────────────────────────────────────────────────────

package/src/ts-compiler.ts

@@ -30,12 +30,5 @@ export function compileTsFile(
         cause: error as Error,
         props: { phase: 'compile' },
       }),
-  ).map(({ tsconfig, tsconfigFile }) => {
-    // Parse the JSON config through TypeScript's API to handle inheritance,
-    // convert string values (like "ES2020") to enum values, and process extends
-    const configDir = path.dirname(tsconfigFile)
-    const parsedConfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, configDir)
-
-    return ts.createProgram([filePath], parsedConfig.options)
-  })
+  ).map(({ result }) => ts.createProgram([filePath], result.options))
 }