@sanity/pkg-utils 6.13.3-canary.3 → 6.13.3-canary.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "6.13.3-canary.3",
+  "version": "6.13.3-canary.4",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -145,7 +145,7 @@
     "ts-node": "^10.9.2",
     "typescript": "5.7.2",
     "vitest": "^2.1.8",
-    "@sanity/pkg-utils": "6.13.3-canary.3"
+    "@sanity/pkg-utils": "6.13.3-canary.4"
   },
   "peerDependencies": {
     "babel-plugin-react-compiler": "*",

package/src/node/tasks/dts/createApiExtractorConfig.ts

@@ -1,6 +1,7 @@
 import path from 'node:path'
 
 import type {IConfigFile, IExtractorMessagesConfig} from '@microsoft/api-extractor'
+import ts from 'typescript'
 
 export function createApiExtractorConfig(options: {
   bundledPackages?: string[]
@@ -10,6 +11,7 @@ export function createApiExtractorConfig(options: {
   messages: IExtractorMessagesConfig
   projectFolder: string
   mainEntryPointFilePath: string
+  tsconfig: ts.ParsedCommandLine
   tsconfigPath: string
 }): IConfigFile {
   const {
@@ -20,6 +22,7 @@ export function createApiExtractorConfig(options: {
     messages,
     projectFolder,
     mainEntryPointFilePath,
+    tsconfig,
     tsconfigPath,
   } = options
 
@@ -29,7 +32,18 @@ export function createApiExtractorConfig(options: {
       reportFileName: '<unscopedPackageName>.api.md',
     },
     bundledPackages,
-    compiler: {tsconfigFilePath: tsconfigPath},
+    // If `paths` are used for self-referencing imports (e.g. the module is named `sanity`, and the `sanity/structure` export is also importing from `sanity/router`),
+    compiler: tsconfig.options.paths
+      ? {
+          overrideTsconfig: {
+            extends: tsconfigPath,
+            compilerOptions: {
+              // An empty object replaces whatever is in the original tsconfig file
+              paths: {},
+            },
+          },
+        }
+      : {tsconfigFilePath: tsconfigPath},
 
     docModel: {
       enabled: false,

package/src/node/tasks/dts/doExtract.ts

@@ -50,6 +50,7 @@ export async function doExtract(
     const result = await extractTypes({
       bundledPackages: bundledPackages || [],
       customTags: config?.extract?.customTags,
+      cwd,
       distPath: outDir,
       exportPath,
       files,
@@ -57,6 +58,7 @@ export async function doExtract(
       projectPath: cwd,
       rules: config?.extract?.rules,
       sourceTypesPath: sourceTypesPath,
+      tsconfig: ts.config,
       tmpPath,
       tsconfigPath: path.resolve(cwd, ts.configPath || 'tsconfig.json'),
     })

package/src/node/tasks/dts/dtsWatchTask.ts

@@ -102,6 +102,7 @@ export const dtsWatchTask: TaskHandler<DtsWatchTask, DtsResult> = {
             const result = await extractTypes({
               bundledPackages: bundledPackages || [],
               customTags: config?.extract?.customTags,
+              cwd,
               distPath: outDir,
               exportPath,
               files,
@@ -109,6 +110,7 @@ export const dtsWatchTask: TaskHandler<DtsWatchTask, DtsResult> = {
               projectPath: cwd,
               rules: config?.extract?.rules,
               sourceTypesPath: sourceTypesPath,
+              tsconfig: tsContext.config!,
               tmpPath,
               tsconfigPath: path.resolve(cwd, tsContext.configPath || 'tsconfig.json'),
             })

package/src/node/tasks/dts/extractTypes.ts

@@ -9,6 +9,7 @@ import {
 } from '@microsoft/api-extractor'
 import {mkdirp} from 'mkdirp'
 import prettier from 'prettier'
+import type ts from 'typescript'
 
 import type {BuildFile, PkgConfigOptions} from '../../core'
 import {createApiExtractorConfig} from './createApiExtractorConfig'
@@ -19,6 +20,7 @@ import {getExtractMessagesConfig} from './getExtractMessagesConfig'
 export async function extractTypes(options: {
   bundledPackages?: string[]
   customTags: NonNullable<PkgConfigOptions['extract']>['customTags']
+  cwd: string
   distPath: string
   exportPath: string
   filePaths: string[]
@@ -27,6 +29,7 @@ export async function extractTypes(options: {
   rules?: NonNullable<PkgConfigOptions['extract']>['rules']
   sourceTypesPath: string
   tmpPath: string
+  tsconfig: ts.ParsedCommandLine
   tsconfigPath: string
 }): Promise<{extractorResult: ExtractorResult; messages: ExtractorMessage[]}> {
   const {
@@ -40,6 +43,7 @@ export async function extractTypes(options: {
     rules,
     sourceTypesPath,
     tmpPath,
+    tsconfig,
     tsconfigPath,
   } = options
 
@@ -59,6 +63,7 @@ export async function extractTypes(options: {
       messages: getExtractMessagesConfig({rules}),
       projectFolder: projectPath,
       mainEntryPointFilePath: sourceTypesPath,
+      tsconfig,
       tsconfigPath,
     }),
     configObjectFullPath: undefined,