fix(typegen): fixes a bug where we imported the wrong relative path

sanity-io · Apr 23, 2024 · 5b85331 · 5b85331
1 parent d7f1067
commit 5b85331
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/@sanity/codegen/src/typescript/__tests__/findQueriesInSource.test.ts b/packages/@sanity/codegen/src/typescript/__tests__/findQueriesInSource.test.ts
@@ -83,10 +83,11 @@ describe('findQueries', () => {
     `
 
     const resolver: NodeJS.RequireResolve = (id) => {
-      if (id === 'foo') {
-        return path.resolve(__dirname, 'fixtures', 'exportVar')
+      if (id.endsWith('fixtures/exportVar')) {
+        return path.resolve(__dirname, 'fixtures', 'exportVar.ts')
       }
-      return require.resolve(id)
+
+      throw new Error(`Cannot resolve module ${id} - all module imports should be mocked`)
     }
     resolver.paths = (request: string): string[] | null => {
       return require.resolve.paths(request)

diff --git a/packages/@sanity/codegen/src/typescript/expressionResolvers.ts b/packages/@sanity/codegen/src/typescript/expressionResolvers.ts
@@ -326,7 +326,7 @@ function resolveImportSpecifier({
   const importName = node.local.name
   const importFileName = importDeclaration.source.value
   // const importPath = path.resolve(path.dirname(filename), importFileName);
-  const importPath = importName.startsWith('./')
+  const importPath = importFileName.startsWith('./')
     ? path.resolve(path.dirname(filename), importFileName)
     : importFileName
   const resolvedFile = resolver(importPath)