@sanity/pkg-utils 7.2.8-canary.0 → 7.2.8-canary.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/pkg-utils",
-  "version": "7.2.8-canary.0",
+  "version": "7.2.8-canary.2",
   "description": "Simple utilities for modern npm packages.",
   "keywords": [
     "sanity-io",
@@ -139,7 +139,7 @@
     "ts-node": "^10.9.2",
     "typescript": "5.8.3",
     "vitest": "^3.2.4",
-    "@sanity/pkg-utils": "7.2.8-canary.0"
+    "@sanity/pkg-utils": "7.2.8-canary.2"
   },
   "peerDependencies": {
     "babel-plugin-react-compiler": "*",

package/src/node/build.ts

@@ -1,11 +1,13 @@
 import path from 'node:path'
 import {rimraf} from 'rimraf'
-import {loadConfig, loadPkgWithReporting} from './core'
+import {loadConfig} from './core/config/loadConfig'
+import {loadPkgWithReporting} from './core/pkg/loadPkgWithReporting'
 import {createLogger} from './logger'
 import {resolveBuildContext} from './resolveBuildContext'
 import {resolveBuildTasks} from './resolveBuildTasks'
 import {createSpinner} from './spinner'
-import {buildTaskHandlers, type BuildTask, type TaskHandler} from './tasks'
+import {buildTaskHandlers} from './tasks'
+import {type BuildTask, type TaskHandler} from './tasks/types'
 
 /**
  * Build the distribution files of a npm package.

package/src/node/check.ts

@@ -1,9 +1,8 @@
 import path from 'node:path'
-
 import esbuild, {type BuildFailure, type Message} from 'esbuild'
-
 import {createConsoleSpy} from './consoleSpy'
-import {loadConfig, loadPkgWithReporting} from './core'
+import {loadConfig} from './core/config/loadConfig'
+import {loadPkgWithReporting} from './core/pkg/loadPkgWithReporting'
 import {fileExists} from './fileExists'
 import {createLogger, type Logger} from './logger'
 import {printPackageTree} from './printPackageTree'

package/src/node/core/config/findConfigFile.ts

@@ -1,7 +1,5 @@
 import path from 'node:path'
-
 import findConfig from 'find-config'
-
 import {fileExists} from '../../fileExists'
 
 const CONFIG_FILE_NAMES = [

package/src/node/core/config/loadConfig.ts

@@ -1,8 +1,6 @@
 import path from 'node:path'
-
 import {register} from 'esbuild-register/dist/node'
 import pkgUp from 'pkg-up'
-
 import {findConfigFile} from './findConfigFile'
 import type {PkgConfigOptions} from './types'
 

package/src/node/core/config/types.ts

@@ -1,12 +1,8 @@
 import type {PluginItem as BabelPluginItem} from '@babel/core'
 import type {OptimizeLodashOptions} from '@optimize-lodash/rollup-plugin'
 import type {NormalizedOutputOptions, Plugin as RollupPlugin, TreeshakingOptions} from 'rollup'
-
 import type {StrictOptions} from '../../strict'
 
-// re-export
-export type {RollupPlugin, StrictOptions}
-
 /** @public */
 export type PkgFormat = 'commonjs' | 'esm'
 

package/src/node/core/contexts/buildContext.ts

@@ -1,8 +1,7 @@
 import type ts from 'typescript'
-
 import type {Logger} from '../../logger'
-import type {PkgConfigOptions, PkgExports, PkgRuntime} from '../config'
-import type {PackageJSON} from '../pkg'
+import type {PkgConfigOptions, PkgExports, PkgRuntime} from '../config/types'
+import type {PackageJSON} from '../pkg/types'
 
 /** @internal */
 export interface BuildFile {

package/src/node/core/pkg/loadPkg.ts

@@ -1,7 +1,5 @@
 import fs from 'node:fs/promises'
-
 import pkgUp from 'pkg-up'
-
 import type {PackageJSON} from './types'
 import {validatePkg} from './validatePkg'
 

package/src/node/core/pkg/loadPkgWithReporting.ts

@@ -1,6 +1,5 @@
 import chalk from 'chalk'
 import {ZodError} from 'zod'
-
 import type {Logger} from '../../logger'
 import {assertLast, assertOrder} from './helpers'
 import {loadPkg} from './loadPkg'

package/src/node/core/pkg/parseExports.ts

@@ -1,10 +1,9 @@
 import {existsSync} from 'node:fs'
 import {resolve as resolvePath} from 'node:path'
-
 import type {Logger} from '../../logger'
 import type {InferredStrictOptions} from '../../strict'
 import {defaultEnding, fileEnding} from '../../tasks/dts/getTargetPaths'
-import type {PkgExport} from '../config'
+import type {PkgExport} from '../config/types'
 import {isRecord} from '../isRecord'
 import {pkgExtMap} from './pkgExt'
 import type {PackageJSON} from './types'

package/src/node/core/pkg/validateExports.ts

@@ -1,4 +1,4 @@
-import type {PkgExport} from '../config'
+import type {PkgExport} from '../config/types'
 import {pkgExtMap as extMap} from './pkgExt'
 import type {PackageJSON} from './types'
 

package/src/node/core/pkg/validatePkg.ts

@@ -1,5 +1,4 @@
 import {z} from 'zod'
-
 import type {PackageJSON} from './types'
 
 const pkgSchema = z.object({

package/src/node/core/template/createFromTemplate.ts

@@ -1,9 +1,7 @@
 import {writeFile} from 'node:fs/promises'
 import {dirname, relative, resolve} from 'node:path'
-
 import {mkdirp} from 'mkdirp'
 import prompts from 'prompts'
-
 import type {Logger} from '../../logger'
 import type {PkgTemplate} from './types'
 

package/src/node/getFilesize.ts

@@ -1,5 +1,4 @@
 import {statSync} from 'node:fs'
-
 import prettyBytes from 'pretty-bytes'
 
 export function getFilesize(file: string): string {

package/src/node/globFiles.ts

@@ -1,5 +1,4 @@
 import path from 'node:path'
-
 import globby from 'globby'
 
 export function globFiles(patterns: string[]): Promise<string[]> {

package/src/node/index.ts

@@ -1,15 +1,71 @@
-export * from './build'
-export * from './check'
-export * from './core'
-export * from './init'
-export * from './logger'
-export * from './resolveBuildTasks'
+export {build} from './build'
+export {check} from './check'
+export {defineConfig} from './core/config/defineConfig'
+export {loadConfig} from './core/config/loadConfig'
+export {resolveConfigProperty} from './core/config/resolveConfigProperty'
+export type {
+  PkgFormat,
+  PkgRuntime,
+  PkgExport,
+  PkgConfigPropertyResolver,
+  PkgConfigProperty,
+  PkgBundle,
+  PkgExports,
+  PkgRuleLevel,
+  TSDocCustomTag,
+  ReactCompilerOptions,
+  ReactCompilerLoggerEvent,
+  ReactCompilerLogger,
+  PkgConfigOptions,
+} from './core/config/types'
+export type {BuildFile, BuildContext} from './core/contexts/buildContext'
+export {DEFAULT_BROWSERSLIST_QUERY} from './core/defaults'
+export * from './core/isRecord'
+export {loadPkg} from './core/pkg/loadPkg'
+export {loadPkgWithReporting} from './core/pkg/loadPkgWithReporting'
+export {parseExports} from './core/pkg/parseExports'
+export {type PkgExtMap, pkgExtMap} from './core/pkg/pkgExt'
+export * from './core/pkg/types'
+export {createFromTemplate} from './core/template/createFromTemplate'
+export {defineTemplateOption} from './core/template/define'
 export {
+  type PkgTemplateFile,
+  type PkgTemplateStringOption,
+  type PkgTemplateOption,
+  type PkgTemplateDefinition,
+  type PkgTemplateResolver,
+  type PkgTemplate,
+} from './core/template/types'
+export {loadTSConfig} from './core/ts/loadTSConfig'
+
+export {init} from './init'
+export {type Logger, createLogger} from './logger'
+export {resolveBuildTasks} from './resolveBuildTasks'
+export {
+  type StrictOptions,
   type InferredStrictOptions,
   parseStrictOptions,
   strictOptions,
   toggle,
   type ToggleType,
 } from './strict'
-export * from './tasks'
-export * from './watch'
+export {buildTaskHandlers, watchTaskHandlers} from './tasks'
+export {dtsTask} from './tasks/dts/dtsTask'
+export {dtsWatchTask} from './tasks/dts/dtsWatchTask'
+export {getExtractMessagesConfig} from './tasks/dts/getExtractMessagesConfig'
+export type {DtsWatchTask, DtsTask, DtsResult} from './tasks/dts/types'
+export {rollupTask} from './tasks/rollup/rollupTask'
+export {rollupWatchTask} from './tasks/rollup/rollupWatchTask'
+export type {
+  RollupTaskEntry,
+  RollupTask,
+  RollupWatchTask,
+  BuildTask,
+  WatchTask,
+  TaskHandler,
+  BuildTaskHandlers,
+  WatchTaskHandlers,
+} from './tasks/types'
+export {watch} from './watch'
+
+export type {Plugin as RollupPlugin} from 'rollup'

package/src/node/init.ts

@@ -1,13 +1,11 @@
 import {lstat} from 'node:fs/promises'
 import {resolve} from 'node:path'
-
 import {mkdirp} from 'mkdirp'
-
-import {createFromTemplate} from './core/template'
+import { createFromTemplate } from './core/template'
 import {fileExists} from './fileExists'
 import {isEmptyDirectory} from './isEmptyDirectory'
 import {createLogger} from './logger'
-import {defaultTemplate} from './templates'
+import {defaultTemplate} from './templates/default/template'
 
 /** @public */
 export async function init(options: {cwd: string; path: string}): Promise<void> {

package/src/node/printExtractMessages.ts

@@ -1,9 +1,7 @@
 import path from 'node:path'
-
 import type {ExtractorMessage} from '@microsoft/api-extractor'
 import chalk from 'chalk'
-
-import type {BuildContext} from './core'
+import type {BuildContext} from './core/contexts/buildContext'
 
 export function printExtractMessages(ctx: BuildContext, messages: ExtractorMessage[]): void {
   const {cwd, logger} = ctx

package/src/node/printPackageTree.ts

@@ -1,9 +1,8 @@
 import path from 'node:path'
-
 import chalk from 'chalk'
 import treeify from 'treeify'
-
-import type {BuildContext, PkgExport} from './core'
+import type {PkgExport} from './core/config/types'
+import type {BuildContext} from './core/contexts/buildContext'
 import {fileExists} from './fileExists'
 import {getFilesize} from './getFilesize'
 

package/src/node/resolveBuildContext.ts

@@ -1,17 +1,13 @@
 import path from 'node:path'
 import browserslistToEsbuild from 'browserslist-to-esbuild'
-import {
-  DEFAULT_BROWSERSLIST_QUERY,
-  loadTSConfig,
-  parseExports,
-  resolveConfigProperty,
-  type BuildContext,
-  type PackageJSON,
-  type PkgConfigOptions,
-  type PkgExports,
-  type PkgRuntime,
-} from './core'
+import {resolveConfigProperty} from './core/config/resolveConfigProperty'
+import {type PkgConfigOptions, type PkgExports, type PkgRuntime} from './core/config/types'
+import type {BuildContext} from './core/contexts/buildContext'
+import {DEFAULT_BROWSERSLIST_QUERY} from './core/defaults'
 import {findCommonDirPath, pathContains} from './core/findCommonPath'
+import {parseExports} from './core/pkg/parseExports'
+import type {PackageJSON} from './core/pkg/types'
+import {loadTSConfig} from './core/ts/loadTSConfig'
 import type {Logger} from './logger'
 import {resolveBrowserTarget} from './resolveBrowserTarget'
 import {resolveNodeTarget} from './resolveNodeTarget'
@@ -94,9 +90,10 @@ export async function resolveBuildContext(options: {
     strict,
     strictOptions,
     logger,
-  }).reduce<PkgExports>((acc, {_path: exportPath, ...exportEntry}) => {
-    return Object.assign(acc, {[exportPath]: exportEntry})
-  }, {})
+  }).reduce<PkgExports>(
+    (acc, {_path: exportPath, ...exportEntry}) => Object.assign(acc, {[exportPath]: exportEntry}),
+    {},
+  )
 
   const exports = resolveConfigProperty(config?.exports, parsedExports)
 

package/src/node/resolveBuildTasks.ts

@@ -1,8 +1,9 @@
 import path from 'node:path'
-
-import type {BuildContext, PkgExport, PkgFormat, PkgRuntime} from './core'
-import type {BuildTask, DtsTask, RollupTask, RollupTaskEntry} from './tasks'
+import type {PkgExport, PkgFormat, PkgRuntime} from './core/config/types'
+import type {BuildContext} from './core/contexts/buildContext'
 import {getTargetPaths} from './tasks/dts/getTargetPaths'
+import type {DtsTask} from './tasks/dts/types'
+import type {BuildTask, RollupTask, RollupTaskEntry} from './tasks/types'
 
 /** @internal */
 export function resolveBuildTasks(ctx: BuildContext): BuildTask[] {

package/src/node/resolveWatchTasks.ts

@@ -1,8 +1,9 @@
 import path from 'node:path'
-
-import type {BuildContext, PkgExport, PkgFormat, PkgRuntime} from './core'
-import type {DtsWatchTask, RollupTaskEntry, RollupWatchTask, WatchTask} from './tasks'
+import type {PkgExport, PkgFormat, PkgRuntime} from './core/config/types'
+import type {BuildContext} from './core/contexts/buildContext'
 import {getTargetPaths} from './tasks/dts/getTargetPaths'
+import type {DtsWatchTask} from './tasks/dts/types'
+import type {RollupTaskEntry, RollupWatchTask, WatchTask} from './tasks/types'
 
 /** @internal */
 export function resolveWatchTasks(ctx: BuildContext): WatchTask[] {

package/src/node/strict.test-d.ts

@@ -1,5 +1,4 @@
 import {expectTypeOf, test} from 'vitest'
-
 import type {InferredStrictOptions, StrictOptions} from './strict'
 
 test('the zod schema types matches the manual types', () => {

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

@@ -1,5 +1,4 @@
 import ts from 'typescript'
-
 import type {Logger} from '../../logger'
 import {printDiagnostic} from './printDiagnostic'
 

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

@@ -1,5 +1,4 @@
 import path from 'node:path'
-
 import type {IConfigFile, IExtractorMessagesConfig} from '@microsoft/api-extractor'
 import ts from 'typescript'
 

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

@@ -1,5 +1,4 @@
 import {readFile} from 'node:fs/promises'
-
 import {TSDocConfigFile} from '@microsoft/tsdoc-config'
 import {parse} from 'jsonc-parser'
 

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

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import type {ExtractorMessage} from '@microsoft/api-extractor'
 import {rimraf} from 'rimraf'
-import type {BuildContext} from '../../core'
+import type {BuildContext} from '../../core/contexts/buildContext'
 import {buildTypes} from './buildTypes'
 import {DtsError} from './DtsError'
 import {extractTypes} from './extractTypes'

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

@@ -1,6 +1,5 @@
 import chalk from 'chalk'
 import {Observable} from 'rxjs'
-
 import {printExtractMessages} from '../../printExtractMessages'
 import type {TaskHandler} from '../types'
 import {doExtract} from './doExtract'

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

@@ -9,7 +9,8 @@ import {
 import {mkdirp} from 'mkdirp'
 import * as prettier from 'prettier'
 import type ts from 'typescript'
-import type {BuildFile, PkgConfigOptions} from '../../core'
+import type {PkgConfigOptions} from '../../core/config/types'
+import type {BuildFile} from '../../core/contexts/buildContext'
 import {createApiExtractorConfig} from './createApiExtractorConfig'
 import {createTSDocConfig} from './createTSDocConfig'
 import {extractModuleBlocksFromTypes} from './extractModuleBlocks'

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

@@ -1,6 +1,5 @@
 import type {ExtractorLogLevel, IExtractorMessagesConfig} from '@microsoft/api-extractor'
-
-import type {PkgConfigOptions, PkgRuleLevel} from '../../core'
+import type {PkgConfigOptions, PkgRuleLevel} from '../../core/config/types'
 
 const LOG_LEVELS: Record<PkgRuleLevel, ExtractorLogLevel> = {
   error: 'error' as ExtractorLogLevel.Error,

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

@@ -1,4 +1,5 @@
-import type {PackageJSON, PkgBundle, PkgExport} from '../../core'
+import type {PkgBundle, PkgExport} from '../../core/config/types'
+import type {PackageJSON} from '../../core/pkg/types'
 
 /** @internal */
 export const fileEnding = /\.[mc]?js$/

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

@@ -1,8 +1,6 @@
 import path from 'node:path'
-
 import chalk from 'chalk'
 import ts from 'typescript'
-
 import type {Logger} from '../../logger'
 
 export function printDiagnostic(options: {

package/src/node/tasks/index.ts

@@ -1,11 +1,9 @@
-import {dtsTask, dtsWatchTask} from './dts'
-import {rollupTask, rollupWatchTask} from './rollup'
+import {dtsTask} from './dts/dtsTask'
+import {dtsWatchTask} from './dts/dtsWatchTask'
+import {rollupTask} from './rollup/rollupTask'
+import {rollupWatchTask} from './rollup/rollupWatchTask'
 import type {BuildTaskHandlers, WatchTaskHandlers} from './types'
 
-export * from './dts'
-export * from './rollup'
-export * from './types'
-
 /** @internal */
 export const buildTaskHandlers: BuildTaskHandlers = {
   'build:dts': dtsTask,

package/src/node/tasks/rollup/resolveRollupConfig.ts

@@ -11,7 +11,9 @@ import terser from '@rollup/plugin-terser'
 import type {InputOptions, OutputOptions, Plugin} from 'rollup'
 import esbuild from 'rollup-plugin-esbuild'
 import {pkgExtMap as extMap} from '../../../node/core/pkg/pkgExt'
-import {resolveConfigProperty, type BuildContext, type PackageJSON} from '../../core'
+import {resolveConfigProperty} from '../../core/config/resolveConfigProperty'
+import type {BuildContext} from '../../core/contexts/buildContext'
+import type {PackageJSON} from '../../core/pkg/types'
 import type {RollupTask, RollupWatchTask} from '../types'
 
 export interface RollupConfig {

package/src/node/tasks/rollup/rollupTask.ts

@@ -1,11 +1,9 @@
 import path from 'node:path'
-
 import chalk from 'chalk'
 import {rollup} from 'rollup'
 import {Observable} from 'rxjs'
-
 import {createConsoleSpy} from '../../consoleSpy'
-import type {BuildContext} from '../../core'
+import type {BuildContext} from '../../core/contexts/buildContext'
 import type {RollupTask, TaskHandler} from '../types'
 import {resolveRollupConfig} from './resolveRollupConfig'
 

package/src/node/tasks/rollup/rollupWatchTask.ts

@@ -1,9 +1,7 @@
 import path from 'node:path'
-
 import chalk from 'chalk'
-import {type RollupWatcherEvent, type RollupWatchOptions, watch as rollupWatch} from 'rollup'
+import {watch as rollupWatch, type RollupWatcherEvent, type RollupWatchOptions} from 'rollup'
 import {Observable} from 'rxjs'
-
 import type {RollupWatchTask, TaskHandler} from '../types'
 import {resolveRollupConfig} from './resolveRollupConfig'
 

package/src/node/tasks/types.ts

@@ -1,8 +1,8 @@
-import type {RollupWatcherEvent} from 'rollup'
+import type { RollupWatcherEvent } from 'rollup'
 import type {Observable} from 'rxjs'
-
-import type {BuildContext, PkgRuntime} from '../core'
-import type {DtsResult, DtsTask, DtsWatchTask} from './dts'
+import type {PkgRuntime} from '../core/config/types'
+import type {BuildContext} from '../core/contexts/buildContext'
+import type {DtsResult, DtsTask, DtsWatchTask} from './dts/types'
 
 /** @internal */
 export interface RollupTaskEntry {

package/src/node/templates/default/template.ts

@@ -5,13 +5,10 @@ import getLatestVersion from 'get-latest-version'
 import gitUrlParse from 'git-url-parse'
 import {outdent} from 'outdent'
 import {format, type Config as PrettierConfig} from 'prettier'
-import {
-  defineTemplateOption,
-  isRecord,
-  type PackageJSON,
-  type PkgTemplate,
-  type PkgTemplateFile,
-} from '../../core'
+import {isRecord} from '../../core/isRecord'
+import type {PackageJSON} from '../../core/pkg/types'
+import {defineTemplateOption} from '../../core/template/define'
+import {type PkgTemplate, type PkgTemplateFile} from '../../core/template/types'
 
 const RE_NAME = /^(?:@(?:[a-z0-9-*~][a-z0-9-*._~]*)\/)?[a-z0-9-~][a-z0-9-._~]*$/i
 

package/src/node/watch.ts

@@ -1,12 +1,12 @@
 import path from 'node:path'
-
 import {switchMap} from 'rxjs'
-
-import {loadConfig, loadPkgWithReporting} from './core'
+import {loadConfig} from './core/config/loadConfig'
+import {loadPkgWithReporting} from './core/pkg/loadPkgWithReporting'
 import {createLogger} from './logger'
 import {resolveBuildContext} from './resolveBuildContext'
 import {resolveWatchTasks} from './resolveWatchTasks'
-import {type TaskHandler, type WatchTask, watchTaskHandlers} from './tasks'
+import {watchTaskHandlers} from './tasks'
+import {type TaskHandler, type WatchTask} from './tasks/types'
 import {watchConfigFiles} from './watchConfigFiles'
 
 /** @public */

package/src/node/watchConfigFiles.ts

@@ -1,8 +1,6 @@
 import path from 'node:path'
-
 import type {Observable} from 'rxjs'
 import {distinctUntilChanged, scan, startWith} from 'rxjs/operators'
-
 import {globFiles} from './globFiles'
 import type {Logger} from './logger'
 import {watchFiles} from './watchFiles'