fix type acquisition

souporserious · Oct 5, 2023 · d20ac0c · d20ac0c · vercel · Oct 5, 2023
1 parent adc12ff
commit d20ac0c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/mdxts/components/client/Editor.tsx b/mdxts/components/client/Editor.tsx
@@ -39,7 +39,7 @@ if (isClient) {
   fetch('/_next/static/mdxts/types.json').then(async (response) => {
     const typeDeclarations = await response.json()
 
-    typeDeclarations.forEach(({ code, path }) => {
+    typeDeclarations.forEach(({ path, code }) => {
       project.createSourceFile(path, code)
     })
   })

diff --git a/mdxts/utils/get-type-declarations.ts b/mdxts/utils/get-type-declarations.ts
@@ -32,7 +32,7 @@ async function fetchTypes(
           resolve(
             types.map(({ code, path }) => ({
               code,
-              path: `file://${path.replace('@types/', '')}`,
+              path: path.replace('@types/', ''),
             }))
           )
         },
@@ -60,16 +60,16 @@ function getAllDependencies(packageJson) {
 
 async function findTypesPathFromTypeVersions(
   packageJson,
-  parentPackage,
-  submodule
+  packageName,
+  packageExport
 ) {
   if (!packageJson.typesVersions) return null
 
   const typeVersionsField = packageJson.typesVersions['*']
 
   if (!typeVersionsField) return null
 
-  const typesPathsFromTypeVersions = typeVersionsField[submodule]
+  const typesPathsFromTypeVersions = typeVersionsField[packageExport]
 
   if (!typesPathsFromTypeVersions) return null
 
@@ -78,7 +78,7 @@ async function findTypesPathFromTypeVersions(
       const typesPath = path.resolve(
         process.cwd(),
         'node_modules',
-        parentPackage,
+        packageName,
         candidatePath
       )
 
@@ -180,7 +180,7 @@ export async function getTypeDeclarations(packageName) {
       return [
         {
           code: result.output[0].code,
-          path: `file:///node_modules/${packageName}/index.d.ts`,
+          path: `/node_modules/${packageName}/index.d.ts`,
         },
       ]
     } catch (error) {

diff --git a/site/docs/06.test.mdx b/site/docs/06.test.mdx
@@ -1,4 +1,6 @@
 ```tsx live
+import { Navigation } from 'mdxts/components'
+
 /**
  * Say hello.
  *

diff --git a/site/next.config.mjs b/site/next.config.mjs
@@ -3,11 +3,10 @@ import { createMDXTSPlugin } from 'mdxts/next'
 const withMDXTS = createMDXTSPlugin({
   theme: 'theme.json',
   gitSource: 'https://github.com/souporserious/mdxts/tree/main',
-  types: ['react'],
+  types: ['react', 'mdxts/components'],
 })
 
 export default withMDXTS({
-  transpilePackages: ['mdxts'],
   compiler: {
     styledComponents: true,
   },