@sanity/pkg-utils 1.8.2 → 1.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/dist/{_build-be4da439.cjs → _build-3d61d85e.cjs} +2 -2
  2. package/dist/{_build-be4da439.cjs.map → _build-3d61d85e.cjs.map} +1 -1
  3. package/dist/{_buildAction-db8d7aa0.cjs → _buildAction-ba8138ff.cjs} +3 -5
  4. package/dist/{_buildAction-db8d7aa0.cjs.map → _buildAction-ba8138ff.cjs.map} +1 -1
  5. package/dist/{_check-11811a4d.cjs → _check-5f3f5a84.cjs} +30 -6
  6. package/dist/_check-5f3f5a84.cjs.map +1 -0
  7. package/dist/{_checkAction-386fe8d4.cjs → _checkAction-6ae8d321.cjs} +2 -2
  8. package/dist/{_checkAction-386fe8d4.cjs.map → _checkAction-6ae8d321.cjs.map} +1 -1
  9. package/dist/{_index-066890ec.cjs → _index-bc62cfaa.cjs} +31 -38
  10. package/dist/_index-bc62cfaa.cjs.map +1 -0
  11. package/dist/{_watch-feff6936.cjs → _watch-925404b5.cjs} +2 -2
  12. package/dist/_watch-925404b5.cjs.map +1 -0
  13. package/dist/{_watchAction-453b8884.cjs → _watchAction-e8317c50.cjs} +3 -5
  14. package/dist/{_watchAction-453b8884.cjs.map → _watchAction-e8317c50.cjs.map} +1 -1
  15. package/dist/cli.cjs +4 -4
  16. package/dist/index.cjs +6 -8
  17. package/dist/index.cjs.map +1 -1
  18. package/dist/index.js +56 -36
  19. package/dist/index.js.map +1 -1
  20. package/package.json +15 -13
  21. package/src/node/_printPackageTree.ts +31 -6
  22. package/src/node/_tasks/dts/_buildTypes.ts +1 -0
  23. package/src/node/_tasks/dts/_createApiExtractorConfig.ts +13 -5
  24. package/src/node/_tasks/dts/_doExtract.ts +24 -35
  25. package/src/node/_tasks/dts/_extractTypes.ts +4 -4
  26. package/src/node/watch.ts +1 -1
  27. package/dist/_check-11811a4d.cjs.map +0 -1
  28. package/dist/_index-066890ec.cjs.map +0 -1
  29. package/dist/_watch-feff6936.cjs.map +0 -1
@@ -20,7 +20,7 @@ require('typescript');
20
20
 
21
21
  var fs = require('fs');
22
22
 
23
- var index = require('./_index-066890ec.cjs');
23
+ var index = require('./_index-bc62cfaa.cjs');
24
24
 
25
25
  require('esbuild-register/dist/node');
26
26
 
@@ -275,4 +275,4 @@ async function watch(options) {
275
275
  }
276
276
 
277
277
  exports.watch = watch;
278
- //# sourceMappingURL=_watch-feff6936.cjs.map
278
+ //# sourceMappingURL=_watch-925404b5.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"_watch-925404b5.cjs","sources":["../src/node/_resolveWatchTasks.ts","../src/node/_globFiles.ts","../src/node/_watchFiles.ts","../src/node/_watchConfigFiles.ts","../src/node/watch.ts"],"sourcesContent":["import fs from 'fs'\nimport path from 'path'\nimport {PkgExport, PkgFormat, PkgRuntime, _BuildContext, _MODULE_EXT} from './_core'\nimport {_WatchTask, _DtsWatchTask, _RollupWatchTask, _RollupTaskEntry} from './_tasks'\n\n/** @internal */\nexport function _resolveWatchTasks(ctx: _BuildContext): _WatchTask[] {\n const {cwd, pkg, target} = ctx\n const tasks: _WatchTask[] = []\n\n const exports = Object.entries(ctx.exports || {}).map(\n ([_path, exp]) => ({_path, ...exp} as PkgExport & {_path: string})\n )\n\n const dtsTask: _DtsWatchTask = {\n type: 'watch:dts',\n entries: [],\n }\n\n const rollupTasks: Record<string, _RollupWatchTask> = {}\n\n function _addRollupTaskEntry(format: PkgFormat, runtime: PkgRuntime, entry: _RollupTaskEntry) {\n const buildId = `${format}:${runtime}`\n\n if (rollupTasks[buildId]) {\n rollupTasks[buildId].entries.push(entry)\n } else {\n rollupTasks[buildId] = {\n type: 'watch:js',\n buildId,\n entries: [entry],\n runtime,\n format,\n target: target[runtime],\n }\n }\n }\n\n // Parse `dts` tasks\n for (const exp of exports) {\n const importId = path.join(pkg.name, exp._path)\n\n if (exp.types) {\n dtsTask.entries.push({\n importId,\n exportPath: exp._path,\n sourcePath: exp.source,\n targetPath: exp.types,\n })\n }\n }\n\n // Parse rollup:commonjs:* tasks\n for (const exp of exports) {\n const output = exp.require\n\n if (!output) continue\n\n _addRollupTaskEntry('commonjs', ctx.runtime, {\n path: exp._path,\n source: exp.source,\n output,\n })\n }\n\n // Parse rollup:commonjs:browser tasks\n for (const exp of exports) {\n const output = exp.browser?.require\n\n if (!output) continue\n\n _addRollupTaskEntry('commonjs', 'browser', {\n path: exp._path,\n source: exp.browser?.source || exp.source,\n output,\n })\n }\n\n // Parse rollup:esm:* tasks\n for (const exp of exports) {\n const output = exp.import\n\n if (!output) continue\n\n _addRollupTaskEntry('esm', ctx.runtime, {\n path: exp._path,\n source: exp.source,\n output,\n })\n }\n\n // Parse rollup:esm:browser tasks\n for (const exp of exports) {\n const output = exp.browser?.import\n\n if (!output) continue\n\n _addRollupTaskEntry('esm', 'browser', {\n path: exp._path,\n source: exp.browser?.source || exp.source,\n output,\n })\n }\n\n if (dtsTask.entries.length) {\n tasks.push(dtsTask)\n }\n\n tasks.push(...Object.values(rollupTasks))\n\n // Parse rollup:esm:browser tasks\n for (const exp of exports) {\n if (exp._exported && exp._path !== '.') {\n const relativeTargetPath = (exp.browser?.import || exp.import || '').replace(/\\.[^/.]+$/, '')\n const ext = _MODULE_EXT[pkg.type].esm\n\n if (relativeTargetPath) {\n fs.writeFileSync(\n path.resolve(cwd, `${exp._path}.js`),\n [\n `// AUTO-GENERATED – DO NOT EDIT`,\n ``,\n // `export {default} from '${relativeTargetPath}'`,\n `export * from '${relativeTargetPath}${pkg.type === 'commonjs' ? ext : ''}'`,\n ``,\n ].join('\\n')\n )\n }\n }\n }\n\n return tasks\n}\n","import globby from 'globby'\n\nexport function _globFiles(patterns: string[]): Promise<string[]> {\n return globby(patterns)\n}\n","import chokidar from 'chokidar'\nimport {Observable} from 'rxjs'\n\nexport interface _FileEvent {\n type: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir'\n file: string\n}\n\nexport function _watchFiles(patterns: string[]): Observable<_FileEvent> {\n return new Observable((observer) => {\n const watcher = chokidar.watch(patterns, {\n ignoreInitial: true,\n })\n\n function _handleFileEvent(\n type: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir',\n file: string\n ) {\n observer.next({type, file})\n }\n\n watcher.on('all', _handleFileEvent)\n\n return () => {\n watcher.off('all', _handleFileEvent)\n watcher.close()\n }\n })\n}\n","import path from 'path'\nimport chalk from 'chalk'\nimport {Observable} from 'rxjs'\nimport {distinctUntilChanged, scan, startWith} from 'rxjs/operators'\nimport {_globFiles} from './_globFiles'\nimport {_watchFiles} from './_watchFiles'\n\nexport async function _watchConfigFiles(options: {cwd: string}): Promise<Observable<string[]>> {\n const {cwd} = options\n\n const initialFiles = await _globFiles([\n path.resolve(cwd, 'package.json'),\n path.resolve(cwd, 'package.config.cjs'),\n path.resolve(cwd, 'package.config.js'),\n path.resolve(cwd, 'package.config.ts'),\n ])\n\n const fileEvent$ = _watchFiles([\n path.resolve(cwd, 'package.json'),\n path.resolve(cwd, 'package.config.cjs'),\n path.resolve(cwd, 'package.config.js'),\n path.resolve(cwd, 'package.config.ts'),\n ])\n\n return fileEvent$.pipe(\n scan((files, fileEvent) => {\n if (fileEvent.type === 'add') {\n return files.concat(fileEvent.file)\n }\n\n if (fileEvent.type === 'unlink') {\n return files.filter((f) => f !== fileEvent.file)\n }\n\n if (fileEvent.type === 'change') {\n /* eslint-disable no-console */\n console.log(\n '--------------------------------------------------------------------------------'\n )\n console.log(chalk.blue('info '), path.relative(cwd, fileEvent.file), 'changed')\n console.log('')\n /* eslint-enable no-console */\n\n return files.slice(0) // trigger update\n }\n\n return files\n }, initialFiles),\n startWith(initialFiles),\n distinctUntilChanged()\n )\n}\n","import path from 'path'\nimport {switchMap} from 'rxjs'\nimport {_loadConfig, _loadPkgWithReporting} from './_core'\nimport {_resolveBuildContext} from './_resolveBuildContext'\nimport {_resolveWatchTasks} from './_resolveWatchTasks'\nimport {_WatchTask, _TaskHandler, _watchTaskHandlers} from './_tasks'\nimport {_watchConfigFiles} from './_watchConfigFiles'\n\n/** @public */\nexport async function watch(options: {cwd: string; tsconfig?: string}): Promise<void> {\n const {cwd, tsconfig = 'tsconfig.json'} = options\n\n const configFiles$ = await _watchConfigFiles({cwd})\n\n const ctx$ = configFiles$.pipe(\n switchMap(async (configFiles) => {\n const _files = configFiles.map((f) => path.relative(cwd, f))\n\n const packageJsonPath = _files.find((f) => f === 'package.json')\n\n if (!packageJsonPath) {\n throw new Error('missing package.json')\n }\n\n const pkg = await _loadPkgWithReporting({cwd})\n const config = await _loadConfig({cwd})\n\n return _resolveBuildContext({config, cwd, pkg, tsconfig})\n })\n )\n\n ctx$.subscribe(async (ctx) => {\n const watchTasks = _resolveWatchTasks(ctx)\n\n for (const task of watchTasks) {\n const handler = _watchTaskHandlers[task.type] as _TaskHandler<_WatchTask, unknown>\n const result$ = handler.exec(ctx, task)\n\n result$.subscribe({\n error: (err) => {\n ctx.logger.error(err)\n ctx.logger.log()\n\n process.exit(1)\n },\n next: (result) => {\n handler.complete(ctx, task, result)\n },\n complete: () => {\n ctx.logger.success(handler.name(ctx, task))\n ctx.logger.log()\n },\n })\n }\n })\n}\n"],"names":["_resolveWatchTasks","ctx","_a","_b","_c","_d","_e","cwd","pkg","target","tasks","exports","Object","entries","map","_path","exp","dtsTask","type","rollupTasks","_addRollupTaskEntry","format","runtime","entry","buildId","push","importId","path","join","name","types","exportPath","sourcePath","source","targetPath","output","require","browser","import","length","values","_exported","relativeTargetPath","replace","ext","_MODULE_EXT","esm","fs","writeFileSync","resolve","_globFiles","patterns","globby","_watchFiles","Observable","observer","watcher","chokidar","watch","ignoreInitial","_handleFileEvent","file","next","on","off","close","_watchConfigFiles","options","initialFiles","fileEvent$","pipe","scan","files","fileEvent","concat","filter","f","console","log","chalk","blue","relative","slice","startWith","distinctUntilChanged","tsconfig","configFiles$","ctx$","switchMap","configFiles","_files","packageJsonPath","find","Error","_loadPkgWithReporting","config","_loadConfig","_resolveBuildContext","subscribe","watchTasks","task","handler","_watchTaskHandlers","result$","exec","error","err","logger","process","exit","result","complete","success"],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var watch = require('./_watch-feff6936.cjs');
3
+ var watch = require('./_watch-925404b5.cjs');
4
4
 
5
5
  require('path');
6
6
 
@@ -26,12 +26,10 @@ require('browserslist');
26
26
 
27
27
  require('fs');
28
28
 
29
- require('./_index-066890ec.cjs');
29
+ require('./_index-bc62cfaa.cjs');
30
30
 
31
31
  require('util');
32
32
 
33
- require('cpx');
34
-
35
33
  require('assert');
36
34
 
37
35
  require('events');
@@ -78,4 +76,4 @@ async function watchAction(options) {
78
76
  }
79
77
 
80
78
  exports.watchAction = watchAction;
81
- //# sourceMappingURL=_watchAction-453b8884.cjs.map
79
+ //# sourceMappingURL=_watchAction-e8317c50.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"_watchAction-453b8884.cjs","sources":["../src/cli/watchAction.ts"],"sourcesContent":["import {watch} from '../node/watch'\n\nexport async function watchAction(options: {tsconfig?: string}): Promise<void> {\n return await watch({\n cwd: process.cwd(),\n tsconfig: options.tsconfig,\n })\n}\n"],"names":["watchAction","options","watch","cwd","process","tsconfig"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACO,eAAeA,WAAf,CAA2BC,OAA3B,EAAoC;EACzC,OAAO,MAAMC,KAAAA,CAAAA,KAAAA,CAAM;IACjBC,GAAG,EAAEC,OAAO,CAACD,GAAR,EADY;IAEjBE,QAAQ,EAAEJ,OAAO,CAACI;EAFD,CAANH,CAAb;AAIF;;"}
1
+ {"version":3,"file":"_watchAction-e8317c50.cjs","sources":["../src/cli/watchAction.ts"],"sourcesContent":["import {watch} from '../node/watch'\n\nexport async function watchAction(options: {tsconfig?: string}): Promise<void> {\n return await watch({\n cwd: process.cwd(),\n tsconfig: options.tsconfig,\n })\n}\n"],"names":["watchAction","options","watch","cwd","process","tsconfig"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACO,eAAeA,WAAf,CAA2BC,OAA3B,EAAoC;EACzC,OAAO,MAAMC,KAAAA,CAAAA,KAAAA,CAAM;IACjBC,GAAG,EAAEC,OAAO,CAACD,GAAR,EADY;IAEjBE,QAAQ,EAAEJ,OAAO,CAACI;EAFD,CAANH,CAAb;AAIF;;"}
package/dist/cli.cjs CHANGED
@@ -10,13 +10,13 @@ function _interopDefaultLegacy(e) {
10
10
 
11
11
  var cac__default = /*#__PURE__*/_interopDefaultLegacy(cac);
12
12
 
13
- var version = "1.8.2";
13
+ var version = "1.8.3";
14
14
  const cli = cac__default["default"]();
15
15
  cli.command("", "Check").option("--strict", "Strict mode").option("--tsconfig [tsconfig]", "[string] tsconfig.json").action(async options => {
16
16
  const {
17
17
  checkAction: statusAction
18
18
  } = await Promise.resolve().then(function () {
19
- return require('./_checkAction-386fe8d4.cjs');
19
+ return require('./_checkAction-6ae8d321.cjs');
20
20
  });
21
21
  return statusAction(options);
22
22
  });
@@ -24,7 +24,7 @@ cli.command("build", "Build package").option("--tsconfig [tsconfig]", "[string]
24
24
  const {
25
25
  buildAction
26
26
  } = await Promise.resolve().then(function () {
27
- return require('./_buildAction-db8d7aa0.cjs');
27
+ return require('./_buildAction-ba8138ff.cjs');
28
28
  });
29
29
  return buildAction(options);
30
30
  });
@@ -32,7 +32,7 @@ cli.command("watch", "Watch package").option("--tsconfig [tsconfig]", "[string]
32
32
  const {
33
33
  watchAction
34
34
  } = await Promise.resolve().then(function () {
35
- return require('./_watchAction-453b8884.cjs');
35
+ return require('./_watchAction-e8317c50.cjs');
36
36
  });
37
37
  return watchAction(options);
38
38
  });
package/dist/index.cjs CHANGED
@@ -4,15 +4,15 @@ Object.defineProperty(exports, '__esModule', {
4
4
  value: true
5
5
  });
6
6
 
7
- var index = require('./_index-066890ec.cjs');
7
+ var index = require('./_index-bc62cfaa.cjs');
8
8
 
9
9
  var _resolveBuildContext = require('./__resolveBuildContext-17992a0e.cjs');
10
10
 
11
- var build = require('./_build-be4da439.cjs');
11
+ var build = require('./_build-3d61d85e.cjs');
12
12
 
13
- var check = require('./_check-11811a4d.cjs');
13
+ var check = require('./_check-5f3f5a84.cjs');
14
14
 
15
- var watch = require('./_watch-feff6936.cjs');
15
+ var watch = require('./_watch-925404b5.cjs');
16
16
 
17
17
  require('chalk');
18
18
 
@@ -20,12 +20,8 @@ require('rxjs');
20
20
 
21
21
  require('path');
22
22
 
23
- require('fs/promises');
24
-
25
23
  require('util');
26
24
 
27
- require('cpx');
28
-
29
25
  require('assert');
30
26
 
31
27
  require('fs');
@@ -34,6 +30,8 @@ require('events');
34
30
 
35
31
  require('typescript');
36
32
 
33
+ require('fs/promises');
34
+
37
35
  require('@microsoft/api-extractor');
38
36
 
39
37
  require('mkdirp');
@@ -1 +1 @@
1
- {"version":3,"file":"index.cjs","sources":["../src/node/_core/config/defineConfig.ts"],"sourcesContent":["import {PkgConfigOptions} from './types'\n\n/** @public */\nexport function defineConfig(configOptions: PkgConfigOptions): PkgConfigOptions {\n return configOptions\n}\n"],"names":["defineConfig","configOptions"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAO,SAASA,YAAT,CAAsBC,aAAtB,EAAqC;EAC1C,OAAOA,aAAP;AACF;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"index.cjs","sources":["../src/node/_core/config/defineConfig.ts"],"sourcesContent":["import {PkgConfigOptions} from './types'\n\n/** @public */\nexport function defineConfig(configOptions: PkgConfigOptions): PkgConfigOptions {\n return configOptions\n}\n"],"names":["defineConfig","configOptions"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAO,SAASA,YAAT,CAAsBC,aAAtB,EAAqC;EAC1C,OAAOA,aAAP;AACF;;;;;;;;;;;;;;;;;;;;;"}
package/dist/index.js CHANGED
@@ -14,14 +14,13 @@ import path$1 from 'path';
14
14
  import { register } from 'esbuild-register/dist/node';
15
15
  import findConfig from 'find-config';
16
16
  import pkgUp from 'pkg-up';
17
- import fs$1, { readFile, rename } from 'fs/promises';
17
+ import fs$1, { readFile } from 'fs/promises';
18
18
  import { z, ZodError } from 'zod';
19
19
  import chalk from 'chalk';
20
20
  import ts from 'typescript';
21
21
  import fs$2, { statSync } from 'fs';
22
22
  import { Observable, switchMap } from 'rxjs';
23
23
  import { promisify } from 'util';
24
- import cpx from 'cpx';
25
24
  import require$$5 from 'assert';
26
25
  import require$$3 from 'events';
27
26
  import { ExtractorConfig, Extractor } from '@microsoft/api-extractor';
@@ -3983,8 +3982,8 @@ function _createApiExtractorConfig(options) {
3983
3982
  exportPath,
3984
3983
  filePath,
3985
3984
  messages,
3986
- projectPath,
3987
- sourcePath,
3985
+ projectFolder,
3986
+ mainEntryPointFilePath,
3988
3987
  tsconfigPath
3989
3988
  } = options;
3990
3989
  return {
@@ -4007,8 +4006,8 @@ function _createApiExtractorConfig(options) {
4007
4006
  enabled: false
4008
4007
  },
4009
4008
  messages,
4010
- mainEntryPointFilePath: sourcePath,
4011
- projectFolder: projectPath
4009
+ mainEntryPointFilePath,
4010
+ projectFolder
4012
4011
  };
4013
4012
  }
4014
4013
 
@@ -4057,7 +4056,7 @@ async function _extractTypes(options) {
4057
4056
  filePath,
4058
4057
  projectPath,
4059
4058
  rules,
4060
- sourcePath,
4059
+ sourceTypesPath,
4061
4060
  tsconfigPath
4062
4061
  } = options;
4063
4062
  const tsdocConfigFile = await _createTSDocConfig({
@@ -4114,8 +4113,8 @@ async function _extractTypes(options) {
4114
4113
  exportPath,
4115
4114
  filePath,
4116
4115
  messages: messagesConfig,
4117
- projectPath,
4118
- sourcePath,
4116
+ projectFolder: projectPath,
4117
+ mainEntryPointFilePath: sourceTypesPath,
4119
4118
  tsconfigPath
4120
4119
  }),
4121
4120
  configObjectFullPath: void 0,
@@ -4158,7 +4157,6 @@ async function _doExtract(ctx, task) {
4158
4157
  const {
4159
4158
  config,
4160
4159
  cwd,
4161
- dist,
4162
4160
  files,
4163
4161
  ts
4164
4162
  } = ctx;
@@ -4171,14 +4169,19 @@ async function _doExtract(ctx, task) {
4171
4169
  };
4172
4170
  }
4173
4171
 
4174
- const distPath = path$1.resolve(cwd, dist);
4175
4172
  const {
4176
- outDir = distPath,
4173
+ outDir,
4177
4174
  rootDir = cwd
4178
4175
  } = ts.config.options;
4176
+
4177
+ if (!outDir) {
4178
+ throw new Error("tsconfig.json is missing `compilerOptions.outDir`");
4179
+ }
4180
+
4181
+ const tmpPath = path$1.resolve(outDir, "__tmp__");
4179
4182
  await _buildTypes({
4180
4183
  cwd,
4181
- outDir,
4184
+ outDir: tmpPath,
4182
4185
  tsconfig: ts.config
4183
4186
  });
4184
4187
  const messages = [];
@@ -4186,37 +4189,30 @@ async function _doExtract(ctx, task) {
4186
4189
 
4187
4190
  for (const entry of task.entries) {
4188
4191
  const exportPath = entry.exportPath === "." ? "./index" : entry.exportPath;
4189
- const sourcePath = path$1.resolve(outDir, path$1.relative(cwd, rootDir), entry.sourcePath.replace(/\.ts$/, ".d.ts"));
4190
- const filePath = path$1.relative(distPath, path$1.resolve(cwd, entry.targetPath));
4192
+ const sourceTypesPath = path$1.resolve(tmpPath, path$1.relative(rootDir, path$1.resolve(cwd, entry.sourcePath)).replace(/\.ts$/, ".d.ts"));
4193
+ const targetPath = path$1.resolve(cwd, entry.targetPath);
4191
4194
  const result = await _extractTypes({
4192
4195
  cwd,
4193
4196
  exportPath,
4194
4197
  files,
4195
- filePath,
4198
+ filePath: path$1.relative(outDir, targetPath),
4196
4199
  projectPath: cwd,
4197
4200
  rules: (_a = config == null ? void 0 : config.extract) == null ? void 0 : _a.rules,
4198
- sourcePath,
4199
- tsconfigPath: path$1.resolve(cwd, ts.configPath),
4200
- distPath
4201
- });
4202
- results.push({
4203
- sourcePath,
4204
- filePath
4201
+ sourceTypesPath,
4202
+ tsconfigPath: path$1.resolve(cwd, ts.configPath || "tsconfig.json"),
4203
+ distPath: outDir
4205
4204
  });
4206
4205
  messages.push(...result.messages);
4207
4206
 
4208
4207
  if (result.messages.some(msg => msg.logLevel === "error")) {
4208
+ await rimraf(tmpPath);
4209
4209
  throw new _DtsError("encountered errors when extracting types", result.messages);
4210
4210
  }
4211
- }
4212
-
4213
- const tmpPath = path$1.resolve(distPath, "__tmp__");
4214
- await rename(outDir, tmpPath);
4215
4211
 
4216
- for (const result of results) {
4217
- const fromPath = path$1.resolve(tmpPath, path$1.relative(outDir, path$1.resolve(distPath, result.filePath)));
4218
- const toPath = path$1.resolve(distPath, result.filePath);
4219
- cpx.copySync(fromPath, path$1.dirname(toPath));
4212
+ results.push({
4213
+ sourcePath: path$1.resolve(cwd, entry.sourcePath),
4214
+ filePath: targetPath
4215
+ });
4220
4216
  }
4221
4217
 
4222
4218
  await rimraf(tmpPath);
@@ -4869,16 +4865,28 @@ function _printPackageTree(ctx) {
4869
4865
  let [exportPath, entry] = _ref11;
4870
4866
  const exp = {
4871
4867
  source: entry.source,
4868
+ types: void 0,
4869
+ browser: void 0,
4870
+ node: void 0,
4871
+ import: void 0,
4872
+ require: void 0,
4872
4873
  default: entry.default
4873
4874
  };
4874
- if (entry.types) exp.types = _fileInfo(entry.types);
4875
+
4876
+ if (entry.types) {
4877
+ exp.types = _fileInfo(entry.types);
4878
+ } else {
4879
+ delete exp.types;
4880
+ }
4875
4881
 
4876
4882
  if (entry.browser) {
4877
4883
  exp.browser = {
4878
4884
  source: entry.browser.source
4879
4885
  };
4880
4886
  if (entry.browser.import) exp.browser.import = _fileInfo(entry.browser.import);
4881
- if (entry.browser.require) exp.browser.import = _fileInfo(entry.browser.require);
4887
+ if (entry.browser.require) exp.browser.require = _fileInfo(entry.browser.require);
4888
+ } else {
4889
+ delete exp.browser;
4882
4890
  }
4883
4891
 
4884
4892
  if (entry.node) {
@@ -4886,11 +4894,23 @@ function _printPackageTree(ctx) {
4886
4894
  source: entry.node.source
4887
4895
  };
4888
4896
  if (entry.node.import) exp.node.import = _fileInfo(entry.node.import);
4889
- if (entry.node.require) exp.node.import = _fileInfo(entry.node.require);
4897
+ if (entry.node.require) exp.node.require = _fileInfo(entry.node.require);
4898
+ } else {
4899
+ delete exp.node;
4900
+ }
4901
+
4902
+ if (entry.import) {
4903
+ exp.import = _fileInfo(entry.import);
4904
+ } else {
4905
+ delete exp.import;
4906
+ }
4907
+
4908
+ if (entry.require) {
4909
+ exp.require = _fileInfo(entry.require);
4910
+ } else {
4911
+ delete exp.require;
4890
4912
  }
4891
4913
 
4892
- if (entry.import) exp.import = _fileInfo(entry.import);
4893
- if (entry.require) exp.require = _fileInfo(entry.require);
4894
4914
  exp.default = _fileInfo(entry.default);
4895
4915
  return [chalk.green(path$1.join(pkg.name, exportPath)), exp];
4896
4916
  }));