@sanity/pkg-utils 6.6.4-canary.0 → 6.6.4-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "6.6.4-canary.0",
+  "version": "6.6.4-canary.1",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -136,7 +136,7 @@
     "typescript": "5.4.5",
     "vitest": "^1.5.0",
     "vitest-github-actions-reporter": "^0.11.1",
-    "@sanity/pkg-utils": "6.6.4-canary.0"
+    "@sanity/pkg-utils": "6.6.4-canary.1"
   },
   "peerDependencies": {
     "typescript": "5.4.x"

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

@@ -19,6 +19,7 @@ export async function buildTypes(options: {
     declarationDir: outDir,
     emitDeclarationOnly: true,
     noEmit: false,
+    noEmitOnError: strict ? true : tsconfig.options.noEmitOnError ?? true,
     outDir,
   }
 

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

@@ -26,6 +26,34 @@ export function createApiExtractorConfig(options: {
     tsconfigPath,
   } = options
 
+  // When the module is 'preserve' it's necessary to override the tsconfig file as api-extractor doesn't handle it out of the box
+  const workaroundModulePreserve = tsconfig.options.module === ts.ModuleKind.Preserve
+  // 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`),
+  const workaroundPaths = !!tsconfig.options.paths
+
+  const overrideTsconfig = {
+    extends: tsconfigPath,
+    compilerOptions: {},
+  }
+
+  if (workaroundModulePreserve) {
+    Object.assign(overrideTsconfig.compilerOptions, {
+      // Set the equivalent options to `module: 'Preserve'`
+      // https://github.com/microsoft/TypeScript/pull/56785/files?file-filters%5B%5D=.js&file-filters%5B%5D=.json&file-filters%5B%5D=.symbols&file-filters%5B%5D=.ts&file-filters%5B%5D=.types&show-viewed-files=true#diff-31d3c12bafea26bc9e8c8a77920c41af0c593206442add70c45a06c063767445
+      module: 'ESNext',
+      moduleResolution: 'Bundler',
+      esModuleInterop: true,
+      resolveJsonModule: true,
+    })
+  }
+
+  if (workaroundPaths) {
+    Object.assign(overrideTsconfig.compilerOptions, {
+      // An empty object replaces whatever is in the original tsconfig file
+      paths: {},
+    })
+  }
+
   return {
     apiReport: {
       enabled: false,
@@ -33,25 +61,10 @@ export function createApiExtractorConfig(options: {
     },
     bundledPackages,
     compiler:
-      tsconfig.options.module === ts.ModuleKind.Preserve
-        ? {
-            // When the module is 'preserve' it's necessary to override the tsconfig file as api-extractor doesn't handle it out of the box
-            overrideTsconfig: {
-              extends: tsconfigPath,
-              compilerOptions: {
-                // Set the equivalent options to `module: 'Preserve'`
-                // https://github.com/microsoft/TypeScript/pull/56785/files?file-filters%5B%5D=.js&file-filters%5B%5D=.json&file-filters%5B%5D=.symbols&file-filters%5B%5D=.ts&file-filters%5B%5D=.types&show-viewed-files=true#diff-31d3c12bafea26bc9e8c8a77920c41af0c593206442add70c45a06c063767445
-                module: 'ESNext',
-                moduleResolution: 'Bundler',
-                esModuleInterop: true,
-                resolveJsonModule: true,
-              },
-            },
-          }
-        : {
-            // If the module is not 'preserve', use the tsconfig file directly
-            tsconfigFilePath: tsconfigPath,
-          },
+      workaroundModulePreserve || workaroundPaths
+        ? {overrideTsconfig}
+        : {tsconfigFilePath: tsconfigPath},
+
     docModel: {
       enabled: false,
       apiJsonFilePath: path.resolve(distPath, `${exportPath}.api.json`),