@sanity/pkg-utils 6.10.11 → 6.10.13-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "6.10.11",
+  "version": "6.10.13-canary.0",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -102,7 +102,7 @@
     "prompts": "^2.4.2",
     "recast": "0.23.9",
     "rimraf": "^4.4.1",
-    "rollup": "^4.21.1",
+    "rollup": "^4.21.2",
     "rollup-plugin-esbuild": "^6.1.1",
     "rxjs": "^7.8.1",
     "treeify": "^1.1.0",
@@ -113,7 +113,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.4.1",
     "@commitlint/config-conventional": "^19.4.1",
-    "@sanity/prettier-config": "^1.0.2",
+    "@sanity/prettier-config": "^1.0.3",
     "@types/babel__core": "^7.20.5",
     "@types/cpx": "^1.5.5",
     "@types/find-config": "^1.0.4",
@@ -146,7 +146,7 @@
     "typescript": "5.5.4",
     "vitest": "^2.0.5",
     "vitest-github-actions-reporter": "^0.11.1",
-    "@sanity/pkg-utils": "6.10.11"
+    "@sanity/pkg-utils": "6.10.13-canary.0"
   },
   "peerDependencies": {
     "typescript": "5.4.x || 5.5.x"

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

@@ -1,10 +1,16 @@
+import path from 'node:path'
+
+import type {ExtractorMessage} from '@microsoft/api-extractor'
 import chalk from 'chalk'
+import rimraf from 'rimraf'
 import {Observable} from 'rxjs'
+import ts from 'typescript'
 
 import {printExtractMessages} from '../../printExtractMessages'
 import type {TaskHandler} from '../types'
-import {doExtract} from './doExtract'
+import {buildTypes} from './buildTypes'
 import {DtsError} from './DtsError'
+import {extractTypes} from './extractTypes'
 import type {DtsResult, DtsWatchTask} from './types'
 
 /** @internal */
@@ -22,21 +28,132 @@ export const dtsWatchTask: TaskHandler<DtsWatchTask, DtsResult> = {
       }),
     ].join('\n'),
   exec: (ctx, task) => {
+    const {config, cwd, files, logger, strict, ts: tsContext, bundledPackages} = ctx
+
     return new Observable((observer) => {
-      doExtract(ctx, task)
-        .then((result) => {
-          observer.next(result)
-          observer.complete()
-        })
-        .catch((err) => observer.error(err))
+      if (!tsContext.config || !tsContext.configPath) {
+        observer.next({type: 'dts', messages: [], results: []})
+        observer.complete()
+
+        return
+      }
+
+      const {outDir, rootDir = cwd} = tsContext.config.options
+
+      if (!outDir) {
+        observer.error(new Error('tsconfig.json is missing `compilerOptions.outDir`'))
+
+        return
+      }
+
+      const tmpPath = path.resolve(outDir, '__tmp__')
+
+      // Add this block to build types initially
+      buildTypes({
+        cwd,
+        logger,
+        outDir: tmpPath,
+        tsconfig: tsContext.config,
+        strict,
+      }).catch((err) => {
+        observer.error(err)
+      })
+
+      const host = ts.createWatchCompilerHost(
+        tsContext.configPath,
+        {
+          ...tsContext.config.options,
+          declaration: true,
+          declarationDir: tmpPath,
+          emitDeclarationOnly: true,
+          noEmit: false,
+          noEmitOnError: strict ? true : (tsContext.config.options.noEmitOnError ?? true),
+          outDir: tmpPath,
+        },
+        ts.sys,
+        ts.createEmitAndSemanticDiagnosticsBuilderProgram,
+        (diagnostic) => {
+          logger.error(ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'))
+        },
+        (diagnostic) => {
+          logger.info(ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'))
+        },
+      )
+
+      const origPostProgramCreate = host.afterProgramCreate
+
+      host.afterProgramCreate = async (program) => {
+        origPostProgramCreate?.(program)
+
+        const messages: ExtractorMessage[] = []
+        const results: {sourcePath: string; filePaths: string[]}[] = []
+
+        for (const entry of task.entries) {
+          const exportPath = entry.exportPath === '.' ? './index' : entry.exportPath
+
+          const sourceTypesPath = path.resolve(
+            tmpPath,
+            path.relative(rootDir, path.resolve(cwd, entry.sourcePath)).replace(/\.ts$/, '.d.ts'),
+          )
+
+          const targetPaths = entry.targetPaths.map((targetPath) => path.resolve(cwd, targetPath))
+          const filePaths = targetPaths.map((targetPath) => path.relative(outDir, targetPath))
+
+          try {
+            const result = await extractTypes({
+              bundledPackages: bundledPackages || [],
+              customTags: config?.extract?.customTags,
+              cwd,
+              distPath: outDir,
+              exportPath,
+              files,
+              filePaths,
+              projectPath: cwd,
+              rules: config?.extract?.rules,
+              sourceTypesPath: sourceTypesPath,
+              tsconfig: tsContext.config!,
+              tmpPath,
+              tsconfigPath: path.resolve(cwd, tsContext.configPath || 'tsconfig.json'),
+            })
+
+            messages.push(...result.messages)
+            results.push({sourcePath: path.resolve(cwd, entry.sourcePath), filePaths: targetPaths})
+          } catch (err) {
+            if (err instanceof DtsError) {
+              messages.push(...err.messages)
+            } else {
+              observer.error(err)
+
+              return
+            }
+          }
+        }
+
+        observer.next({type: 'dts', messages, results})
+      }
+
+      const watchProgram = ts.createWatchProgram(host)
+
+      return () => {
+        watchProgram.close()
+        rimraf.sync(tmpPath)
+      }
     })
   },
-  complete: (ctx, _task, result) => {
+  complete: (ctx, task, result) => {
     const {logger} = ctx
 
     printExtractMessages(ctx, result.messages)
 
-    logger.warn('watching typescript definitions is currently not supported')
+    logger.success(
+      `build type definitions\n       ${task.entries
+        .map(
+          (entry) =>
+            `    - ${chalk.cyan(entry.importId)}: ${chalk.yellow(entry.sourcePath)} ${chalk.gray('→')} ${chalk.yellow(entry.targetPaths.join(', '))}`,
+        )
+        .join('\n       ')}`,
+    )
+    logger.log('')
     logger.log()
   },
   error: (ctx, _task, err) => {