skuba 13.0.0-custom-conditions-exports-20250730235248 → 13.0.0-custom-conditions-exports-20250923003120

package/README.md

@@ -12,11 +12,10 @@
 - Write in [TypeScript]
 - Enforce coding standards with [ESLint] and [Prettier]
 - Test with [Jest]
-- Deploy with [Gantry], [Serverless] or the [AWS CDK]
+- Deploy with [Gantry] or the [AWS CDK]
 
 [aws cdk]: https://docs.aws.amazon.com/cdk/latest/guide/work-with-cdk-typescript.html
 [gantry]: https://backstage.myseek.xyz/docs/default/component/gantry/
-[serverless]: https://serverless.com/
 
 It provides you with:
 

package/config/tsconfig.json

@@ -2,8 +2,9 @@
   "compilerOptions": {
     "incremental": true,
     "isolatedModules": true,
-    "module": "node18",
+    "module": "node20",
     "moduleResolution": "node16",
+    "noUncheckedSideEffectImports": true,
     "noUnusedLocals": false,
     "noUnusedParameters": false,
     "resolveJsonModule": true

package/jest/moduleNameMapper.js

@@ -53,6 +53,9 @@ module.exports.createModuleNameMapper = (getConfig) => {
     '^#src/(.*)$': '<rootDir>/src/$1',
   };
 
+  // Always try finding the file with extension before trying without
+  moduleNameMapper['^(\\.{1,2}/.*)\\.js$'] = ['$1.js', '$1'];
+
   // Normalise away any `..`s that may crop up from `baseUrl` usage.
   // For example, a `baseUrl` of `src` and a path of `../cli` will result in
   // `<rootDir>/src/../cli`, which can be normalised to `<rootDir>/cli`.

package/lib/cli/build/assets.js

@@ -89,7 +89,7 @@ const copyAssetsConcurrently = async (configs) => {
   );
   await Promise.all(
     configs.map(
-      ({ outDir, name, prefixColor }) => copyAssets(
+      async ({ outDir, name, prefixColor }) => copyAssets(
         outDir,
         (0, import_logging.createLogger)({
           debug: false,

package/lib/cli/build/assets.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/build/assets.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport chalk, { type Color } from 'chalk';\nimport fs from 'fs-extra';\n\nimport { copyFile } from '../../utils/copy.js';\nimport { buildPatternToFilepathMap, crawlDirectory } from '../../utils/dir.js';\nimport { type Logger, createLogger, log } from '../../utils/logging.js';\nimport {\n  getConsumerManifest,\n  getEntryPointFromManifest,\n  getPropFromConsumerManifest,\n} from '../../utils/manifest.js';\n\nexport const copyAssets = async (\n  destinationDir: string,\n  logger: Logger = log,\n) => {\n  const manifest = await getConsumerManifest();\n  if (!manifest) {\n    return;\n  }\n\n  const assets = await getPropFromConsumerManifest<string, string[]>('assets');\n  if (!assets) {\n    return;\n  }\n\n  const entryPoint = await getEntryPointFromManifest();\n  if (!entryPoint) {\n    return;\n  }\n\n  const pathSegments = entryPoint.split(path.sep);\n  const srcDir = (pathSegments.length > 1 && pathSegments[0]) || '';\n  const resolvedSrcDir = path.resolve(path.dirname(manifest.path), srcDir);\n  const resolvedDestinationDir = path.resolve(\n    path.dirname(manifest.path),\n    destinationDir,\n  );\n\n  const allFiles = await crawlDirectory(resolvedSrcDir);\n  const filesByPattern = buildPatternToFilepathMap(assets, allFiles, {\n    cwd: resolvedSrcDir,\n    dot: true,\n  });\n  const matchedFiles = Array.from(\n    new Set(Object.values(filesByPattern).flat()),\n  );\n\n  await Promise.all(\n    matchedFiles.map(async (filename) => {\n      logger.subtle(`Copying ${filename}`);\n\n      await fs.promises.mkdir(\n        path.dirname(path.join(resolvedDestinationDir, filename)),\n        { recursive: true },\n      );\n      await copyFile(\n        path.join(resolvedSrcDir, filename),\n        path.join(resolvedDestinationDir, filename),\n        { processors: [] },\n      );\n    }),\n  );\n};\n\ninterface CopyAssetsConfig {\n  outDir: string;\n  name: string;\n  prefixColor: typeof Color;\n}\n\nexport const copyAssetsConcurrently = async (configs: CopyAssetsConfig[]) => {\n  const maxNameLength = configs.reduce(\n    (length, command) => Math.max(length, command.name.length),\n    0,\n  );\n\n  await Promise.all(\n    configs.map(({ outDir, name, prefixColor }) =>\n      copyAssets(\n        outDir,\n        createLogger({\n          debug: false,\n          prefixes: [chalk[prefixColor](`${name.padEnd(maxNameLength)} \u2502`)],\n        }),\n      ),\n    ),\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkC;AAClC,sBAAe;AAEf,kBAAyB;AACzB,iBAA0D;AAC1D,qBAA+C;AAC/C,sBAIO;AAEA,MAAM,aAAa,OACxB,gBACA,SAAiB,uBACd;AACH,QAAM,WAAW,UAAM,qCAAoB;AAC3C,MAAI,CAAC,UAAU;AACb;AAAA,EACF;AAEA,QAAM,SAAS,UAAM,6CAA8C,QAAQ;AAC3E,MAAI,CAAC,QAAQ;AACX;AAAA,EACF;AAEA,QAAM,aAAa,UAAM,2CAA0B;AACnD,MAAI,CAAC,YAAY;AACf;AAAA,EACF;AAEA,QAAM,eAAe,WAAW,MAAM,YAAAA,QAAK,GAAG;AAC9C,QAAM,SAAU,aAAa,SAAS,KAAK,aAAa,CAAC,KAAM;AAC/D,QAAM,iBAAiB,YAAAA,QAAK,QAAQ,YAAAA,QAAK,QAAQ,SAAS,IAAI,GAAG,MAAM;AACvE,QAAM,yBAAyB,YAAAA,QAAK;AAAA,IAClC,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAAA,IAC1B;AAAA,EACF;AAEA,QAAM,WAAW,UAAM,2BAAe,cAAc;AACpD,QAAM,qBAAiB,sCAA0B,QAAQ,UAAU;AAAA,IACjE,KAAK;AAAA,IACL,KAAK;AAAA,EACP,CAAC;AACD,QAAM,eAAe,MAAM;AAAA,IACzB,IAAI,IAAI,OAAO,OAAO,cAAc,EAAE,KAAK,CAAC;AAAA,EAC9C;AAEA,QAAM,QAAQ;AAAA,IACZ,aAAa,IAAI,OAAO,aAAa;AACnC,aAAO,OAAO,WAAW,QAAQ,EAAE;AAEnC,YAAM,gBAAAC,QAAG,SAAS;AAAA,QAChB,YAAAD,QAAK,QAAQ,YAAAA,QAAK,KAAK,wBAAwB,QAAQ,CAAC;AAAA,QACxD,EAAE,WAAW,KAAK;AAAA,MACpB;AACA,gBAAM;AAAA,QACJ,YAAAA,QAAK,KAAK,gBAAgB,QAAQ;AAAA,QAClC,YAAAA,QAAK,KAAK,wBAAwB,QAAQ;AAAA,QAC1C,EAAE,YAAY,CAAC,EAAE;AAAA,MACnB;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAQO,MAAM,yBAAyB,OAAO,YAAgC;AAC3E,QAAM,gBAAgB,QAAQ;AAAA,IAC5B,CAAC,QAAQ,YAAY,KAAK,IAAI,QAAQ,QAAQ,KAAK,MAAM;AAAA,IACzD;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,QAAQ;AAAA,MAAI,CAAC,EAAE,QAAQ,MAAM,YAAY,MACvC;AAAA,QACE;AAAA,YACA,6BAAa;AAAA,UACX,OAAO;AAAA,UACP,UAAU,CAAC,aAAAE,QAAM,WAAW,EAAE,GAAG,KAAK,OAAO,aAAa,CAAC,SAAI,CAAC;AAAA,QAClE,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport chalk, { type Color } from 'chalk';\nimport fs from 'fs-extra';\n\nimport { copyFile } from '../../utils/copy.js';\nimport { buildPatternToFilepathMap, crawlDirectory } from '../../utils/dir.js';\nimport { type Logger, createLogger, log } from '../../utils/logging.js';\nimport {\n  getConsumerManifest,\n  getEntryPointFromManifest,\n  getPropFromConsumerManifest,\n} from '../../utils/manifest.js';\n\nexport const copyAssets = async (\n  destinationDir: string,\n  logger: Logger = log,\n) => {\n  const manifest = await getConsumerManifest();\n  if (!manifest) {\n    return;\n  }\n\n  const assets = await getPropFromConsumerManifest<string, string[]>('assets');\n  if (!assets) {\n    return;\n  }\n\n  const entryPoint = await getEntryPointFromManifest();\n  if (!entryPoint) {\n    return;\n  }\n\n  const pathSegments = entryPoint.split(path.sep);\n  const srcDir = (pathSegments.length > 1 && pathSegments[0]) || '';\n  const resolvedSrcDir = path.resolve(path.dirname(manifest.path), srcDir);\n  const resolvedDestinationDir = path.resolve(\n    path.dirname(manifest.path),\n    destinationDir,\n  );\n\n  const allFiles = await crawlDirectory(resolvedSrcDir);\n  const filesByPattern = buildPatternToFilepathMap(assets, allFiles, {\n    cwd: resolvedSrcDir,\n    dot: true,\n  });\n  const matchedFiles = Array.from(\n    new Set(Object.values(filesByPattern).flat()),\n  );\n\n  await Promise.all(\n    matchedFiles.map(async (filename) => {\n      logger.subtle(`Copying ${filename}`);\n\n      await fs.promises.mkdir(\n        path.dirname(path.join(resolvedDestinationDir, filename)),\n        { recursive: true },\n      );\n      await copyFile(\n        path.join(resolvedSrcDir, filename),\n        path.join(resolvedDestinationDir, filename),\n        { processors: [] },\n      );\n    }),\n  );\n};\n\ninterface CopyAssetsConfig {\n  outDir: string;\n  name: string;\n  prefixColor: typeof Color;\n}\n\nexport const copyAssetsConcurrently = async (configs: CopyAssetsConfig[]) => {\n  const maxNameLength = configs.reduce(\n    (length, command) => Math.max(length, command.name.length),\n    0,\n  );\n\n  await Promise.all(\n    configs.map(async ({ outDir, name, prefixColor }) =>\n      copyAssets(\n        outDir,\n        createLogger({\n          debug: false,\n          prefixes: [chalk[prefixColor](`${name.padEnd(maxNameLength)} \u2502`)],\n        }),\n      ),\n    ),\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkC;AAClC,sBAAe;AAEf,kBAAyB;AACzB,iBAA0D;AAC1D,qBAA+C;AAC/C,sBAIO;AAEA,MAAM,aAAa,OACxB,gBACA,SAAiB,uBACd;AACH,QAAM,WAAW,UAAM,qCAAoB;AAC3C,MAAI,CAAC,UAAU;AACb;AAAA,EACF;AAEA,QAAM,SAAS,UAAM,6CAA8C,QAAQ;AAC3E,MAAI,CAAC,QAAQ;AACX;AAAA,EACF;AAEA,QAAM,aAAa,UAAM,2CAA0B;AACnD,MAAI,CAAC,YAAY;AACf;AAAA,EACF;AAEA,QAAM,eAAe,WAAW,MAAM,YAAAA,QAAK,GAAG;AAC9C,QAAM,SAAU,aAAa,SAAS,KAAK,aAAa,CAAC,KAAM;AAC/D,QAAM,iBAAiB,YAAAA,QAAK,QAAQ,YAAAA,QAAK,QAAQ,SAAS,IAAI,GAAG,MAAM;AACvE,QAAM,yBAAyB,YAAAA,QAAK;AAAA,IAClC,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAAA,IAC1B;AAAA,EACF;AAEA,QAAM,WAAW,UAAM,2BAAe,cAAc;AACpD,QAAM,qBAAiB,sCAA0B,QAAQ,UAAU;AAAA,IACjE,KAAK;AAAA,IACL,KAAK;AAAA,EACP,CAAC;AACD,QAAM,eAAe,MAAM;AAAA,IACzB,IAAI,IAAI,OAAO,OAAO,cAAc,EAAE,KAAK,CAAC;AAAA,EAC9C;AAEA,QAAM,QAAQ;AAAA,IACZ,aAAa,IAAI,OAAO,aAAa;AACnC,aAAO,OAAO,WAAW,QAAQ,EAAE;AAEnC,YAAM,gBAAAC,QAAG,SAAS;AAAA,QAChB,YAAAD,QAAK,QAAQ,YAAAA,QAAK,KAAK,wBAAwB,QAAQ,CAAC;AAAA,QACxD,EAAE,WAAW,KAAK;AAAA,MACpB;AACA,gBAAM;AAAA,QACJ,YAAAA,QAAK,KAAK,gBAAgB,QAAQ;AAAA,QAClC,YAAAA,QAAK,KAAK,wBAAwB,QAAQ;AAAA,QAC1C,EAAE,YAAY,CAAC,EAAE;AAAA,MACnB;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAQO,MAAM,yBAAyB,OAAO,YAAgC;AAC3E,QAAM,gBAAgB,QAAQ;AAAA,IAC5B,CAAC,QAAQ,YAAY,KAAK,IAAI,QAAQ,QAAQ,KAAK,MAAM;AAAA,IACzD;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,QAAQ;AAAA,MAAI,OAAO,EAAE,QAAQ,MAAM,YAAY,MAC7C;AAAA,QACE;AAAA,YACA,6BAAa;AAAA,UACX,OAAO;AAAA,UACP,UAAU,CAAC,aAAAE,QAAM,WAAW,EAAE,GAAG,KAAK,OAAO,aAAa,CAAC,SAAI,CAAC;AAAA,QAClE,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["path", "fs", "chalk"]
 }

package/lib/cli/build/esbuild.js

@@ -48,7 +48,7 @@ const esbuild = async ({ debug }, args = process.argv.slice(2)) => {
     process.exitCode = 1;
     return;
   }
-  const parsedCommandLine = (0, import_tsc.readTsconfig)(args, log);
+  const parsedCommandLine = (0, import_tsc.readTsBuildConfig)(args, log);
   if (!parsedCommandLine || process.exitCode) {
     return;
   }

package/lib/cli/build/esbuild.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/build/esbuild.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport tsconfigPaths from '@esbuild-plugins/tsconfig-paths';\nimport { build } from 'esbuild';\nimport { ModuleKind, ModuleResolutionKind, ScriptTarget } from 'typescript';\n\nimport { createLogger } from '../../utils/logging.js';\n\nimport { parseTscArgs } from './args.js';\nimport { readTsconfig, tsc } from './tsc.js';\n\ninterface EsbuildParameters {\n  debug: boolean;\n}\n\nexport const esbuild = async (\n  { debug }: EsbuildParameters,\n  args = process.argv.slice(2),\n) => {\n  const log = createLogger({ debug });\n\n  const tscArgs = parseTscArgs(args);\n\n  if (tscArgs.build) {\n    log.err(\n      'skuba does not currently support the tsc --build flag with esbuild',\n    );\n    process.exitCode = 1;\n    return;\n  }\n\n  const parsedCommandLine = readTsconfig(args, log);\n\n  if (!parsedCommandLine || process.exitCode) {\n    return;\n  }\n\n  const { fileNames: entryPoints, options: compilerOptions } =\n    parsedCommandLine;\n\n  log.debug(log.bold('Files'));\n  entryPoints.forEach((filepath) => log.debug(filepath));\n\n  log.debug(log.bold('Compiler options'));\n  log.debug(inspect(compilerOptions));\n\n  const start = process.hrtime.bigint();\n\n  // TODO: support `bundle`, `minify`, `splitting`, `treeShaking`\n  const bundle = false;\n\n  await build({\n    bundle,\n    entryPoints,\n    format: compilerOptions.module === ModuleKind.CommonJS ? 'cjs' : undefined,\n    outdir: compilerOptions.outDir,\n    logLevel: debug ? 'debug' : 'info',\n    logLimit: 0,\n    platform:\n      compilerOptions.moduleResolution === ModuleResolutionKind.NodeJs\n        ? 'node'\n        : undefined,\n    plugins: bundle\n      ? []\n      : [\n          // evanw/esbuild#394\n          tsconfigPaths({\n            tsconfig: { baseUrl: compilerOptions.baseUrl, compilerOptions },\n          }),\n        ],\n    sourcemap: compilerOptions.sourceMap,\n    // TODO: as of 0.18, the esbuild CLI no longer infers the target property to\n    // avoid ambiguity where multiple `tsconfig.json`s are involved in a build.\n    // This would be unusual for a typical SEEK project but we can still explore\n    // an explicit setting once we implement `skuba.config.ts` (#1167).\n    target: compilerOptions.target\n      ? ScriptTarget[compilerOptions.target].toLocaleLowerCase()\n      : undefined,\n    tsconfig: tscArgs.pathname,\n  });\n\n  const end = process.hrtime.bigint();\n\n  log.plain(`Built in ${log.timing(start, end)}.`);\n\n  if (compilerOptions.declaration) {\n    await tsc([\n      '--declaration',\n      '--emitDeclarationOnly',\n      ...(tscArgs.project ? ['--project', tscArgs.project] : []),\n    ]);\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,4BAA0B;AAC1B,qBAAsB;AACtB,wBAA+D;AAE/D,qBAA6B;AAE7B,kBAA6B;AAC7B,iBAAkC;AAM3B,MAAM,UAAU,OACrB,EAAE,MAAM,GACR,OAAO,QAAQ,KAAK,MAAM,CAAC,MACxB;AACH,QAAM,UAAM,6BAAa,EAAE,MAAM,CAAC;AAElC,QAAM,cAAU,0BAAa,IAAI;AAEjC,MAAI,QAAQ,OAAO;AACjB,QAAI;AAAA,MACF;AAAA,IACF;AACA,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,QAAM,wBAAoB,yBAAa,MAAM,GAAG;AAEhD,MAAI,CAAC,qBAAqB,QAAQ,UAAU;AAC1C;AAAA,EACF;AAEA,QAAM,EAAE,WAAW,aAAa,SAAS,gBAAgB,IACvD;AAEF,MAAI,MAAM,IAAI,KAAK,OAAO,CAAC;AAC3B,cAAY,QAAQ,CAAC,aAAa,IAAI,MAAM,QAAQ,CAAC;AAErD,MAAI,MAAM,IAAI,KAAK,kBAAkB,CAAC;AACtC,MAAI,UAAM,qBAAQ,eAAe,CAAC;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAGpC,QAAM,SAAS;AAEf,YAAM,sBAAM;AAAA,IACV;AAAA,IACA;AAAA,IACA,QAAQ,gBAAgB,WAAW,6BAAW,WAAW,QAAQ;AAAA,IACjE,QAAQ,gBAAgB;AAAA,IACxB,UAAU,QAAQ,UAAU;AAAA,IAC5B,UAAU;AAAA,IACV,UACE,gBAAgB,qBAAqB,uCAAqB,SACtD,SACA;AAAA,IACN,SAAS,SACL,CAAC,IACD;AAAA;AAAA,UAEE,sBAAAA,SAAc;AAAA,QACZ,UAAU,EAAE,SAAS,gBAAgB,SAAS,gBAAgB;AAAA,MAChE,CAAC;AAAA,IACH;AAAA,IACJ,WAAW,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA,IAK3B,QAAQ,gBAAgB,SACpB,+BAAa,gBAAgB,MAAM,EAAE,kBAAkB,IACvD;AAAA,IACJ,UAAU,QAAQ;AAAA,EACpB,CAAC;AAED,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,MAAI,MAAM,YAAY,IAAI,OAAO,OAAO,GAAG,CAAC,GAAG;AAE/C,MAAI,gBAAgB,aAAa;AAC/B,cAAM,gBAAI;AAAA,MACR;AAAA,MACA;AAAA,MACA,GAAI,QAAQ,UAAU,CAAC,aAAa,QAAQ,OAAO,IAAI,CAAC;AAAA,IAC1D,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport tsconfigPaths from '@esbuild-plugins/tsconfig-paths';\nimport { build } from 'esbuild';\nimport { ModuleKind, ModuleResolutionKind, ScriptTarget } from 'typescript';\n\nimport { createLogger } from '../../utils/logging.js';\n\nimport { parseTscArgs } from './args.js';\nimport { readTsBuildConfig, tsc } from './tsc.js';\n\ninterface EsbuildParameters {\n  debug: boolean;\n}\n\nexport const esbuild = async (\n  { debug }: EsbuildParameters,\n  args = process.argv.slice(2),\n) => {\n  const log = createLogger({ debug });\n\n  const tscArgs = parseTscArgs(args);\n\n  if (tscArgs.build) {\n    log.err(\n      'skuba does not currently support the tsc --build flag with esbuild',\n    );\n    process.exitCode = 1;\n    return;\n  }\n\n  const parsedCommandLine = readTsBuildConfig(args, log);\n\n  if (!parsedCommandLine || process.exitCode) {\n    return;\n  }\n\n  const { fileNames: entryPoints, options: compilerOptions } =\n    parsedCommandLine;\n\n  log.debug(log.bold('Files'));\n  entryPoints.forEach((filepath) => log.debug(filepath));\n\n  log.debug(log.bold('Compiler options'));\n  log.debug(inspect(compilerOptions));\n\n  const start = process.hrtime.bigint();\n\n  // TODO: support `bundle`, `minify`, `splitting`, `treeShaking`\n  const bundle = false;\n\n  await build({\n    bundle,\n    entryPoints,\n    format: compilerOptions.module === ModuleKind.CommonJS ? 'cjs' : undefined,\n    outdir: compilerOptions.outDir,\n    logLevel: debug ? 'debug' : 'info',\n    logLimit: 0,\n    platform:\n      compilerOptions.moduleResolution === ModuleResolutionKind.NodeJs\n        ? 'node'\n        : undefined,\n    plugins: bundle\n      ? []\n      : [\n          // evanw/esbuild#394\n          tsconfigPaths({\n            tsconfig: { baseUrl: compilerOptions.baseUrl, compilerOptions },\n          }),\n        ],\n    sourcemap: compilerOptions.sourceMap,\n    // TODO: as of 0.18, the esbuild CLI no longer infers the target property to\n    // avoid ambiguity where multiple `tsconfig.json`s are involved in a build.\n    // This would be unusual for a typical SEEK project but we can still explore\n    // an explicit setting once we implement `skuba.config.ts` (#1167).\n    target: compilerOptions.target\n      ? ScriptTarget[compilerOptions.target].toLocaleLowerCase()\n      : undefined,\n    tsconfig: tscArgs.pathname,\n  });\n\n  const end = process.hrtime.bigint();\n\n  log.plain(`Built in ${log.timing(start, end)}.`);\n\n  if (compilerOptions.declaration) {\n    await tsc([\n      '--declaration',\n      '--emitDeclarationOnly',\n      ...(tscArgs.project ? ['--project', tscArgs.project] : []),\n    ]);\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,4BAA0B;AAC1B,qBAAsB;AACtB,wBAA+D;AAE/D,qBAA6B;AAE7B,kBAA6B;AAC7B,iBAAuC;AAMhC,MAAM,UAAU,OACrB,EAAE,MAAM,GACR,OAAO,QAAQ,KAAK,MAAM,CAAC,MACxB;AACH,QAAM,UAAM,6BAAa,EAAE,MAAM,CAAC;AAElC,QAAM,cAAU,0BAAa,IAAI;AAEjC,MAAI,QAAQ,OAAO;AACjB,QAAI;AAAA,MACF;AAAA,IACF;AACA,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,QAAM,wBAAoB,8BAAkB,MAAM,GAAG;AAErD,MAAI,CAAC,qBAAqB,QAAQ,UAAU;AAC1C;AAAA,EACF;AAEA,QAAM,EAAE,WAAW,aAAa,SAAS,gBAAgB,IACvD;AAEF,MAAI,MAAM,IAAI,KAAK,OAAO,CAAC;AAC3B,cAAY,QAAQ,CAAC,aAAa,IAAI,MAAM,QAAQ,CAAC;AAErD,MAAI,MAAM,IAAI,KAAK,kBAAkB,CAAC;AACtC,MAAI,UAAM,qBAAQ,eAAe,CAAC;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAGpC,QAAM,SAAS;AAEf,YAAM,sBAAM;AAAA,IACV;AAAA,IACA;AAAA,IACA,QAAQ,gBAAgB,WAAW,6BAAW,WAAW,QAAQ;AAAA,IACjE,QAAQ,gBAAgB;AAAA,IACxB,UAAU,QAAQ,UAAU;AAAA,IAC5B,UAAU;AAAA,IACV,UACE,gBAAgB,qBAAqB,uCAAqB,SACtD,SACA;AAAA,IACN,SAAS,SACL,CAAC,IACD;AAAA;AAAA,UAEE,sBAAAA,SAAc;AAAA,QACZ,UAAU,EAAE,SAAS,gBAAgB,SAAS,gBAAgB;AAAA,MAChE,CAAC;AAAA,IACH;AAAA,IACJ,WAAW,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA,IAK3B,QAAQ,gBAAgB,SACpB,+BAAa,gBAAgB,MAAM,EAAE,kBAAkB,IACvD;AAAA,IACJ,UAAU,QAAQ;AAAA,EACpB,CAAC;AAED,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,MAAI,MAAM,YAAY,IAAI,OAAO,OAAO,GAAG,CAAC,GAAG;AAE/C,MAAI,gBAAgB,aAAa;AAC/B,cAAM,gBAAI;AAAA,MACR;AAAA,MACA;AAAA,MACA,GAAI,QAAQ,UAAU,CAAC,aAAa,QAAQ,OAAO,IAAI,CAAC;AAAA,IAC1D,CAAC;AAAA,EACH;AACF;",
   "names": ["tsconfigPaths"]
 }

package/lib/cli/build/index.js

@@ -65,7 +65,7 @@ const build = async (args = process.argv.slice(2)) => {
       return;
     }
   }
-  const parsedCommandLine = (0, import_tsc.readTsconfig)(args, import_logging.log);
+  const parsedCommandLine = (0, import_tsc.readTsBuildConfig)(args, import_logging.log);
   if (!parsedCommandLine || process.exitCode) {
     return;
   }

package/lib/cli/build/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/build/index.ts"],
-  "sourcesContent": ["import chalk from 'chalk';\n\nimport { hasDebugFlag } from '../../utils/args.js';\nimport { log } from '../../utils/logging.js';\nimport { getStringPropFromConsumerManifest } from '../../utils/manifest.js';\n\nimport { copyAssets } from './assets.js';\nimport { esbuild } from './esbuild.js';\nimport { readTsconfig, tsc } from './tsc.js';\n\nexport const build = async (args = process.argv.slice(2)) => {\n  // TODO: define a unified `package.json#/skuba` schema and parser so we don't\n  // need all these messy lookups.\n  const tool = await getStringPropFromConsumerManifest('build');\n\n  switch (tool) {\n    case 'esbuild': {\n      const debug = hasDebugFlag(args);\n\n      log.plain(chalk.yellow('esbuild'));\n      await esbuild({ debug }, args);\n      break;\n    }\n\n    // TODO: flip the default case over to `esbuild` in skuba vNext.\n    case undefined:\n    case 'tsc': {\n      log.plain(chalk.blue('tsc'));\n      await tsc(args);\n      break;\n    }\n\n    default: {\n      log.err(\n        'We don\u2019t support the build tool specified in your',\n        log.bold('package.json'),\n        'yet:',\n      );\n      log.err(log.subtle(JSON.stringify({ skuba: { build: tool } }, null, 2)));\n      process.exitCode = 1;\n      return;\n    }\n  }\n\n  const parsedCommandLine = readTsconfig(args, log);\n\n  if (!parsedCommandLine || process.exitCode) {\n    return;\n  }\n\n  const { options: compilerOptions } = parsedCommandLine;\n\n  if (!compilerOptions.outDir) {\n    return;\n  }\n\n  await copyAssets(compilerOptions.outDir);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,kBAA6B;AAC7B,qBAAoB;AACpB,sBAAkD;AAElD,oBAA2B;AAC3B,qBAAwB;AACxB,iBAAkC;AAE3B,MAAM,QAAQ,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAG3D,QAAM,OAAO,UAAM,mDAAkC,OAAO;AAE5D,UAAQ,MAAM;AAAA,IACZ,KAAK,WAAW;AACd,YAAM,YAAQ,0BAAa,IAAI;AAE/B,yBAAI,MAAM,aAAAA,QAAM,OAAO,SAAS,CAAC;AACjC,gBAAM,wBAAQ,EAAE,MAAM,GAAG,IAAI;AAC7B;AAAA,IACF;AAAA;AAAA,IAGA,KAAK;AAAA,IACL,KAAK,OAAO;AACV,yBAAI,MAAM,aAAAA,QAAM,KAAK,KAAK,CAAC;AAC3B,gBAAM,gBAAI,IAAI;AACd;AAAA,IACF;AAAA,IAEA,SAAS;AACP,yBAAI;AAAA,QACF;AAAA,QACA,mBAAI,KAAK,cAAc;AAAA,QACvB;AAAA,MACF;AACA,yBAAI,IAAI,mBAAI,OAAO,KAAK,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;AACvE,cAAQ,WAAW;AACnB;AAAA,IACF;AAAA,EACF;AAEA,QAAM,wBAAoB,yBAAa,MAAM,kBAAG;AAEhD,MAAI,CAAC,qBAAqB,QAAQ,UAAU;AAC1C;AAAA,EACF;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI;AAErC,MAAI,CAAC,gBAAgB,QAAQ;AAC3B;AAAA,EACF;AAEA,YAAM,0BAAW,gBAAgB,MAAM;AACzC;",
+  "sourcesContent": ["import chalk from 'chalk';\n\nimport { hasDebugFlag } from '../../utils/args.js';\nimport { log } from '../../utils/logging.js';\nimport { getStringPropFromConsumerManifest } from '../../utils/manifest.js';\n\nimport { copyAssets } from './assets.js';\nimport { esbuild } from './esbuild.js';\nimport { readTsBuildConfig, tsc } from './tsc.js';\n\nexport const build = async (args = process.argv.slice(2)) => {\n  // TODO: define a unified `package.json#/skuba` schema and parser so we don't\n  // need all these messy lookups.\n  const tool = await getStringPropFromConsumerManifest('build');\n\n  switch (tool) {\n    case 'esbuild': {\n      const debug = hasDebugFlag(args);\n\n      log.plain(chalk.yellow('esbuild'));\n      await esbuild({ debug }, args);\n      break;\n    }\n\n    // TODO: flip the default case over to `esbuild` in skuba vNext.\n    case undefined:\n    case 'tsc': {\n      log.plain(chalk.blue('tsc'));\n      await tsc(args);\n      break;\n    }\n\n    default: {\n      log.err(\n        'We don\u2019t support the build tool specified in your',\n        log.bold('package.json'),\n        'yet:',\n      );\n      log.err(log.subtle(JSON.stringify({ skuba: { build: tool } }, null, 2)));\n      process.exitCode = 1;\n      return;\n    }\n  }\n\n  const parsedCommandLine = readTsBuildConfig(args, log);\n\n  if (!parsedCommandLine || process.exitCode) {\n    return;\n  }\n\n  const { options: compilerOptions } = parsedCommandLine;\n\n  if (!compilerOptions.outDir) {\n    return;\n  }\n\n  await copyAssets(compilerOptions.outDir);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,kBAA6B;AAC7B,qBAAoB;AACpB,sBAAkD;AAElD,oBAA2B;AAC3B,qBAAwB;AACxB,iBAAuC;AAEhC,MAAM,QAAQ,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAG3D,QAAM,OAAO,UAAM,mDAAkC,OAAO;AAE5D,UAAQ,MAAM;AAAA,IACZ,KAAK,WAAW;AACd,YAAM,YAAQ,0BAAa,IAAI;AAE/B,yBAAI,MAAM,aAAAA,QAAM,OAAO,SAAS,CAAC;AACjC,gBAAM,wBAAQ,EAAE,MAAM,GAAG,IAAI;AAC7B;AAAA,IACF;AAAA;AAAA,IAGA,KAAK;AAAA,IACL,KAAK,OAAO;AACV,yBAAI,MAAM,aAAAA,QAAM,KAAK,KAAK,CAAC;AAC3B,gBAAM,gBAAI,IAAI;AACd;AAAA,IACF;AAAA,IAEA,SAAS;AACP,yBAAI;AAAA,QACF;AAAA,QACA,mBAAI,KAAK,cAAc;AAAA,QACvB;AAAA,MACF;AACA,yBAAI,IAAI,mBAAI,OAAO,KAAK,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;AACvE,cAAQ,WAAW;AACnB;AAAA,IACF;AAAA,EACF;AAEA,QAAM,wBAAoB,8BAAkB,MAAM,kBAAG;AAErD,MAAI,CAAC,qBAAqB,QAAQ,UAAU;AAC1C;AAAA,EACF;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI;AAErC,MAAI,CAAC,gBAAgB,QAAQ;AAC3B;AAAA,EACF;AAEA,YAAM,0BAAW,gBAAgB,MAAM;AACzC;",
   "names": ["chalk"]
 }

package/lib/cli/build/tsc.d.ts

@@ -1,4 +1,11 @@
 import ts from 'typescript';
-import type { Logger } from '../../utils/logging.js';
+import { type Logger } from '../../utils/logging.js';
 export declare const tsc: (args?: string[]) => Promise<import("execa").ExecaReturnValue<string>>;
-export declare const readTsconfig: (args: string[] | undefined, log: Logger) => ts.ParsedCommandLine | undefined;
+export declare const readTsBuildConfig: (args: string[] | undefined, log: Logger) => ts.ParsedCommandLine | undefined;
+export declare const readTsConfig: ({ dir, fileName, log, silentlyFail, }: {
+    dir: string;
+    fileName: string;
+    log: Logger;
+    silentlyFail?: boolean;
+}) => ts.ParsedCommandLine | undefined;
+export declare const getCustomConditions: () => string[];

package/lib/cli/build/tsc.js

@@ -28,12 +28,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var tsc_exports = {};
 __export(tsc_exports, {
-  readTsconfig: () => readTsconfig,
+  getCustomConditions: () => getCustomConditions,
+  readTsBuildConfig: () => readTsBuildConfig,
+  readTsConfig: () => readTsConfig,
   tsc: () => tsc
 });
 module.exports = __toCommonJS(tsc_exports);
+var import_path = __toESM(require("path"));
 var import_typescript = __toESM(require("typescript"));
 var import_exec = require("../../utils/exec.js");
+var import_logging = require("../../utils/logging.js");
 var import_args = require("./args.js");
 const DEFAULT_ARGS = ["--project", "tsconfig.build.json"];
 const formatHost = {
@@ -42,61 +46,93 @@ const formatHost = {
   getNewLine: () => import_typescript.default.sys.newLine
 };
 const tsconfigCache = /* @__PURE__ */ new Map();
-const computeCacheKey = (args) => Array.from(args).sort().toString();
 const tsc = async (args = process.argv.slice(2)) => {
   const tscArgs = (0, import_args.parseTscArgs)(args);
   const defaultArgs = tscArgs.build || tscArgs.project ? [] : DEFAULT_ARGS;
   return (0, import_exec.exec)("tsc", ...defaultArgs, ...args);
 };
-const readTsconfig = (args = process.argv.slice(2), log) => {
+const readTsBuildConfig = (args = process.argv.slice(2), log) => {
   const tscArgs = (0, import_args.parseTscArgs)(args);
-  let parsedCommandLine = tsconfigCache.get(computeCacheKey(args));
-  if (!parsedCommandLine) {
-    log.debug(
-      log.bold(
-        "tsconfig",
-        ...tscArgs.project ? ["--project", tscArgs.project] : []
-      )
-    );
-    log.debug(tscArgs.pathname);
-    const tsconfigFile = import_typescript.default.findConfigFile(
-      tscArgs.dirname,
-      import_typescript.default.sys.fileExists.bind(void 0),
-      tscArgs.basename
-    );
-    if (!tsconfigFile) {
-      log.err(`Could not find ${tscArgs.pathname}.`);
+  log.debug(
+    log.bold(
+      "tsconfig",
+      ...tscArgs.project ? ["--project", tscArgs.project] : []
+    )
+  );
+  log.debug(tscArgs.pathname);
+  const parsedConfig = readTsConfig({
+    dir: tscArgs.dirname,
+    fileName: tscArgs.basename,
+    log
+  });
+  if (parsedConfig?.errors.length) {
+    log.err(`Could not parse ${tscArgs.basename}.`);
+    log.subtle(import_typescript.default.formatDiagnostics(parsedConfig.errors, formatHost));
+    process.exitCode = 1;
+    return;
+  }
+  return parsedConfig;
+};
+const readTsConfig = ({
+  dir,
+  fileName,
+  log,
+  silentlyFail = false
+}) => {
+  const pathName = import_path.default.join(dir, fileName);
+  const cachedConfig = tsconfigCache.get(pathName);
+  if (cachedConfig) {
+    return cachedConfig;
+  }
+  const tsconfigFile = import_typescript.default.findConfigFile(
+    dir,
+    import_typescript.default.sys.fileExists.bind(void 0),
+    fileName
+  );
+  if (!tsconfigFile) {
+    if (!silentlyFail) {
+      log.err(`Could not find ${pathName}.`);
       process.exitCode = 1;
-      return;
     }
-    const readConfigFile = import_typescript.default.readConfigFile(
-      tsconfigFile,
-      import_typescript.default.sys.readFile.bind(void 0)
-    );
-    if (readConfigFile.error) {
-      log.err(`Could not read ${tscArgs.pathname}.`);
+    return;
+  }
+  const readConfigFile = import_typescript.default.readConfigFile(
+    tsconfigFile,
+    import_typescript.default.sys.readFile.bind(void 0)
+  );
+  if (readConfigFile.error) {
+    if (!silentlyFail) {
+      log.err(`Could not read ${pathName}.`);
       log.subtle(import_typescript.default.formatDiagnostic(readConfigFile.error, formatHost));
       process.exitCode = 1;
-      return;
     }
-    parsedCommandLine = import_typescript.default.parseJsonConfigFileContent(
-      readConfigFile.config,
-      import_typescript.default.sys,
-      tscArgs.dirname
-    );
-    tsconfigCache.set(computeCacheKey(args), parsedCommandLine);
-  }
-  if (parsedCommandLine.errors.length) {
-    log.err(`Could not parse ${tscArgs.pathname}.`);
-    log.subtle(import_typescript.default.formatDiagnostics(parsedCommandLine.errors, formatHost));
-    process.exitCode = 1;
     return;
   }
-  return parsedCommandLine;
+  const parsedConfig = import_typescript.default.parseJsonConfigFileContent(
+    readConfigFile.config,
+    import_typescript.default.sys,
+    dir
+  );
+  tsconfigCache.set(pathName, parsedConfig);
+  return parsedConfig;
+};
+const getCustomConditions = () => {
+  const parsedConfig = readTsConfig({
+    dir: process.cwd(),
+    fileName: "tsconfig.json",
+    log: import_logging.log,
+    silentlyFail: true
+  });
+  if (!parsedConfig) {
+    return [];
+  }
+  return parsedConfig.options.customConditions ?? [];
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  readTsconfig,
+  getCustomConditions,
+  readTsBuildConfig,
+  readTsConfig,
   tsc
 });
 //# sourceMappingURL=tsc.js.map

package/lib/cli/build/tsc.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/build/tsc.ts"],
-  "sourcesContent": ["import ts from 'typescript';\n\nimport { exec } from '../../utils/exec.js';\nimport type { Logger } from '../../utils/logging.js';\n\nimport { parseTscArgs } from './args.js';\n\nconst DEFAULT_ARGS = ['--project', 'tsconfig.build.json'] as const;\n\nconst formatHost: ts.FormatDiagnosticsHost = {\n  getCanonicalFileName: (fileName) => fileName,\n  getCurrentDirectory: ts.sys.getCurrentDirectory.bind(undefined),\n  getNewLine: () => ts.sys.newLine,\n};\n\nconst tsconfigCache = new Map<string, ts.ParsedCommandLine>();\nconst computeCacheKey = (args: string[]) => Array.from(args).sort().toString();\n\nexport const tsc = async (args = process.argv.slice(2)) => {\n  const tscArgs = parseTscArgs(args);\n\n  // Build flag is incompatible with project flag.\n  const defaultArgs = tscArgs.build || tscArgs.project ? [] : DEFAULT_ARGS;\n\n  return exec('tsc', ...defaultArgs, ...args);\n};\n\nexport const readTsconfig = (args = process.argv.slice(2), log: Logger) => {\n  const tscArgs = parseTscArgs(args);\n\n  let parsedCommandLine = tsconfigCache.get(computeCacheKey(args));\n\n  if (!parsedCommandLine) {\n    log.debug(\n      log.bold(\n        'tsconfig',\n        ...(tscArgs.project ? ['--project', tscArgs.project] : []),\n      ),\n    );\n    log.debug(tscArgs.pathname);\n\n    const tsconfigFile = ts.findConfigFile(\n      tscArgs.dirname,\n      ts.sys.fileExists.bind(undefined),\n      tscArgs.basename,\n    );\n    if (!tsconfigFile) {\n      log.err(`Could not find ${tscArgs.pathname}.`);\n      process.exitCode = 1;\n      return;\n    }\n\n    const readConfigFile = ts.readConfigFile(\n      tsconfigFile,\n      ts.sys.readFile.bind(undefined),\n    );\n    if (readConfigFile.error) {\n      log.err(`Could not read ${tscArgs.pathname}.`);\n      log.subtle(ts.formatDiagnostic(readConfigFile.error, formatHost));\n      process.exitCode = 1;\n      return;\n    }\n\n    parsedCommandLine = ts.parseJsonConfigFileContent(\n      readConfigFile.config,\n      ts.sys,\n      tscArgs.dirname,\n    );\n    tsconfigCache.set(computeCacheKey(args), parsedCommandLine);\n  }\n\n  if (parsedCommandLine.errors.length) {\n    log.err(`Could not parse ${tscArgs.pathname}.`);\n    log.subtle(ts.formatDiagnostics(parsedCommandLine.errors, formatHost));\n    process.exitCode = 1;\n    return;\n  }\n\n  return parsedCommandLine;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAe;AAEf,kBAAqB;AAGrB,kBAA6B;AAE7B,MAAM,eAAe,CAAC,aAAa,qBAAqB;AAExD,MAAM,aAAuC;AAAA,EAC3C,sBAAsB,CAAC,aAAa;AAAA,EACpC,qBAAqB,kBAAAA,QAAG,IAAI,oBAAoB,KAAK,MAAS;AAAA,EAC9D,YAAY,MAAM,kBAAAA,QAAG,IAAI;AAC3B;AAEA,MAAM,gBAAgB,oBAAI,IAAkC;AAC5D,MAAM,kBAAkB,CAAC,SAAmB,MAAM,KAAK,IAAI,EAAE,KAAK,EAAE,SAAS;AAEtE,MAAM,MAAM,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AACzD,QAAM,cAAU,0BAAa,IAAI;AAGjC,QAAM,cAAc,QAAQ,SAAS,QAAQ,UAAU,CAAC,IAAI;AAE5D,aAAO,kBAAK,OAAO,GAAG,aAAa,GAAG,IAAI;AAC5C;AAEO,MAAM,eAAe,CAAC,OAAO,QAAQ,KAAK,MAAM,CAAC,GAAG,QAAgB;AACzE,QAAM,cAAU,0BAAa,IAAI;AAEjC,MAAI,oBAAoB,cAAc,IAAI,gBAAgB,IAAI,CAAC;AAE/D,MAAI,CAAC,mBAAmB;AACtB,QAAI;AAAA,MACF,IAAI;AAAA,QACF;AAAA,QACA,GAAI,QAAQ,UAAU,CAAC,aAAa,QAAQ,OAAO,IAAI,CAAC;AAAA,MAC1D;AAAA,IACF;AACA,QAAI,MAAM,QAAQ,QAAQ;AAE1B,UAAM,eAAe,kBAAAA,QAAG;AAAA,MACtB,QAAQ;AAAA,MACR,kBAAAA,QAAG,IAAI,WAAW,KAAK,MAAS;AAAA,MAChC,QAAQ;AAAA,IACV;AACA,QAAI,CAAC,cAAc;AACjB,UAAI,IAAI,kBAAkB,QAAQ,QAAQ,GAAG;AAC7C,cAAQ,WAAW;AACnB;AAAA,IACF;AAEA,UAAM,iBAAiB,kBAAAA,QAAG;AAAA,MACxB;AAAA,MACA,kBAAAA,QAAG,IAAI,SAAS,KAAK,MAAS;AAAA,IAChC;AACA,QAAI,eAAe,OAAO;AACxB,UAAI,IAAI,kBAAkB,QAAQ,QAAQ,GAAG;AAC7C,UAAI,OAAO,kBAAAA,QAAG,iBAAiB,eAAe,OAAO,UAAU,CAAC;AAChE,cAAQ,WAAW;AACnB;AAAA,IACF;AAEA,wBAAoB,kBAAAA,QAAG;AAAA,MACrB,eAAe;AAAA,MACf,kBAAAA,QAAG;AAAA,MACH,QAAQ;AAAA,IACV;AACA,kBAAc,IAAI,gBAAgB,IAAI,GAAG,iBAAiB;AAAA,EAC5D;AAEA,MAAI,kBAAkB,OAAO,QAAQ;AACnC,QAAI,IAAI,mBAAmB,QAAQ,QAAQ,GAAG;AAC9C,QAAI,OAAO,kBAAAA,QAAG,kBAAkB,kBAAkB,QAAQ,UAAU,CAAC;AACrE,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,SAAO;AACT;",
-  "names": ["ts"]
+  "sourcesContent": ["import path from 'path';\n\nimport ts from 'typescript';\n\nimport { exec } from '../../utils/exec.js';\nimport { type Logger, log as logger } from '../../utils/logging.js';\n\nimport { parseTscArgs } from './args.js';\n\nconst DEFAULT_ARGS = ['--project', 'tsconfig.build.json'] as const;\n\nconst formatHost: ts.FormatDiagnosticsHost = {\n  getCanonicalFileName: (fileName) => fileName,\n  getCurrentDirectory: ts.sys.getCurrentDirectory.bind(undefined),\n  getNewLine: () => ts.sys.newLine,\n};\n\nconst tsconfigCache = new Map<string, ts.ParsedCommandLine>();\n\nexport const tsc = async (args = process.argv.slice(2)) => {\n  const tscArgs = parseTscArgs(args);\n\n  // Build flag is incompatible with project flag.\n  const defaultArgs = tscArgs.build || tscArgs.project ? [] : DEFAULT_ARGS;\n\n  return exec('tsc', ...defaultArgs, ...args);\n};\n\nexport const readTsBuildConfig = (\n  args = process.argv.slice(2),\n  log: Logger,\n) => {\n  const tscArgs = parseTscArgs(args);\n\n  log.debug(\n    log.bold(\n      'tsconfig',\n      ...(tscArgs.project ? ['--project', tscArgs.project] : []),\n    ),\n  );\n  log.debug(tscArgs.pathname);\n\n  const parsedConfig = readTsConfig({\n    dir: tscArgs.dirname,\n    fileName: tscArgs.basename,\n    log,\n  });\n\n  if (parsedConfig?.errors.length) {\n    log.err(`Could not parse ${tscArgs.basename}.`);\n    log.subtle(ts.formatDiagnostics(parsedConfig.errors, formatHost));\n    process.exitCode = 1;\n    return;\n  }\n\n  return parsedConfig;\n};\n\nexport const readTsConfig = ({\n  dir,\n  fileName,\n  log,\n  silentlyFail = false,\n}: {\n  dir: string;\n  fileName: string;\n  log: Logger;\n  silentlyFail?: boolean;\n}) => {\n  const pathName = path.join(dir, fileName);\n\n  const cachedConfig = tsconfigCache.get(pathName);\n\n  if (cachedConfig) {\n    return cachedConfig;\n  }\n\n  const tsconfigFile = ts.findConfigFile(\n    dir,\n    ts.sys.fileExists.bind(undefined),\n    fileName,\n  );\n  if (!tsconfigFile) {\n    if (!silentlyFail) {\n      log.err(`Could not find ${pathName}.`);\n      process.exitCode = 1;\n    }\n    return;\n  }\n\n  const readConfigFile = ts.readConfigFile(\n    tsconfigFile,\n    ts.sys.readFile.bind(undefined),\n  );\n  if (readConfigFile.error) {\n    if (!silentlyFail) {\n      log.err(`Could not read ${pathName}.`);\n      log.subtle(ts.formatDiagnostic(readConfigFile.error, formatHost));\n      process.exitCode = 1;\n    }\n    return;\n  }\n\n  const parsedConfig = ts.parseJsonConfigFileContent(\n    readConfigFile.config,\n    ts.sys,\n    dir,\n  );\n\n  tsconfigCache.set(pathName, parsedConfig);\n\n  return parsedConfig;\n};\n\nexport const getCustomConditions = () => {\n  const parsedConfig = readTsConfig({\n    dir: process.cwd(),\n    fileName: 'tsconfig.json',\n    log: logger,\n    silentlyFail: true,\n  });\n\n  if (!parsedConfig) {\n    return [];\n  }\n\n  return parsedConfig.options.customConditions ?? [];\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAAe;AAEf,kBAAqB;AACrB,qBAA2C;AAE3C,kBAA6B;AAE7B,MAAM,eAAe,CAAC,aAAa,qBAAqB;AAExD,MAAM,aAAuC;AAAA,EAC3C,sBAAsB,CAAC,aAAa;AAAA,EACpC,qBAAqB,kBAAAA,QAAG,IAAI,oBAAoB,KAAK,MAAS;AAAA,EAC9D,YAAY,MAAM,kBAAAA,QAAG,IAAI;AAC3B;AAEA,MAAM,gBAAgB,oBAAI,IAAkC;AAErD,MAAM,MAAM,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AACzD,QAAM,cAAU,0BAAa,IAAI;AAGjC,QAAM,cAAc,QAAQ,SAAS,QAAQ,UAAU,CAAC,IAAI;AAE5D,aAAO,kBAAK,OAAO,GAAG,aAAa,GAAG,IAAI;AAC5C;AAEO,MAAM,oBAAoB,CAC/B,OAAO,QAAQ,KAAK,MAAM,CAAC,GAC3B,QACG;AACH,QAAM,cAAU,0BAAa,IAAI;AAEjC,MAAI;AAAA,IACF,IAAI;AAAA,MACF;AAAA,MACA,GAAI,QAAQ,UAAU,CAAC,aAAa,QAAQ,OAAO,IAAI,CAAC;AAAA,IAC1D;AAAA,EACF;AACA,MAAI,MAAM,QAAQ,QAAQ;AAE1B,QAAM,eAAe,aAAa;AAAA,IAChC,KAAK,QAAQ;AAAA,IACb,UAAU,QAAQ;AAAA,IAClB;AAAA,EACF,CAAC;AAED,MAAI,cAAc,OAAO,QAAQ;AAC/B,QAAI,IAAI,mBAAmB,QAAQ,QAAQ,GAAG;AAC9C,QAAI,OAAO,kBAAAA,QAAG,kBAAkB,aAAa,QAAQ,UAAU,CAAC;AAChE,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,SAAO;AACT;AAEO,MAAM,eAAe,CAAC;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA,eAAe;AACjB,MAKM;AACJ,QAAM,WAAW,YAAAC,QAAK,KAAK,KAAK,QAAQ;AAExC,QAAM,eAAe,cAAc,IAAI,QAAQ;AAE/C,MAAI,cAAc;AAChB,WAAO;AAAA,EACT;AAEA,QAAM,eAAe,kBAAAD,QAAG;AAAA,IACtB;AAAA,IACA,kBAAAA,QAAG,IAAI,WAAW,KAAK,MAAS;AAAA,IAChC;AAAA,EACF;AACA,MAAI,CAAC,cAAc;AACjB,QAAI,CAAC,cAAc;AACjB,UAAI,IAAI,kBAAkB,QAAQ,GAAG;AACrC,cAAQ,WAAW;AAAA,IACrB;AACA;AAAA,EACF;AAEA,QAAM,iBAAiB,kBAAAA,QAAG;AAAA,IACxB;AAAA,IACA,kBAAAA,QAAG,IAAI,SAAS,KAAK,MAAS;AAAA,EAChC;AACA,MAAI,eAAe,OAAO;AACxB,QAAI,CAAC,cAAc;AACjB,UAAI,IAAI,kBAAkB,QAAQ,GAAG;AACrC,UAAI,OAAO,kBAAAA,QAAG,iBAAiB,eAAe,OAAO,UAAU,CAAC;AAChE,cAAQ,WAAW;AAAA,IACrB;AACA;AAAA,EACF;AAEA,QAAM,eAAe,kBAAAA,QAAG;AAAA,IACtB,eAAe;AAAA,IACf,kBAAAA,QAAG;AAAA,IACH;AAAA,EACF;AAEA,gBAAc,IAAI,UAAU,YAAY;AAExC,SAAO;AACT;AAEO,MAAM,sBAAsB,MAAM;AACvC,QAAM,eAAe,aAAa;AAAA,IAChC,KAAK,QAAQ,IAAI;AAAA,IACjB,UAAU;AAAA,IACV,KAAK,eAAAE;AAAA,IACL,cAAc;AAAA,EAChB,CAAC;AAED,MAAI,CAAC,cAAc;AACjB,WAAO,CAAC;AAAA,EACV;AAEA,SAAO,aAAa,QAAQ,oBAAoB,CAAC;AACnD;",
+  "names": ["ts", "path", "logger"]
 }

package/lib/cli/configure/analyseDependencies.d.ts

@@ -1,9 +1,9 @@
-import type { NormalizedReadResult } from 'read-pkg-up';
+import type { ReadResult } from 'read-pkg-up';
 import type { ProjectType } from '../../utils/manifest.js';
 interface Props {
     destinationRoot: string;
     include: (pathname: string) => boolean;
-    manifest: NormalizedReadResult;
+    manifest: ReadResult;
     type: ProjectType;
 }
 export declare const analyseDependencies: ({ destinationRoot, include, manifest: { packageJson }, type, }: Props) => Promise<undefined | (() => Promise<void>)>;

package/lib/cli/configure/analyseDependencies.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/analyseDependencies.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { type TextProcessor, copyFiles } from '../../utils/copy.js';\nimport { log } from '../../utils/logging.js';\nimport type { ProjectType } from '../../utils/manifest.js';\nimport { getLatestNpmVersion, getSkubaVersion } from '../../utils/version.js';\n\nimport { diffDependencies } from './analysis/package.js';\nimport * as dependencyMutators from './dependencies/index.js';\nimport { formatPackage } from './processing/package.js';\nimport type { DependencyDiff } from './types.js';\n\nconst logDiff = (diff: DependencyDiff): boolean => {\n  const entries = Object.entries(diff);\n\n  if (entries.length === 0) {\n    log.ok('\u2714 No changes');\n\n    return false;\n  }\n\n  Object.entries(diff)\n    .sort(([nameA], [nameB]) => nameA.localeCompare(nameB))\n    .forEach(([name, { operation, version }]) =>\n      log.plain(operation, name, log.formatSubtle(version)),\n    );\n\n  return true;\n};\n\nconst pinUnspecifiedVersions = async (\n  dependencies: Record<string, string>,\n): Promise<void> => {\n  const updates = await Promise.all(\n    Object.entries(dependencies)\n      .filter(([, version]) => version === '*')\n      .map(async ([name]) => {\n        const version = await (name === 'skuba'\n          ? getSkubaVersion()\n          : getLatestNpmVersion(name));\n\n        if (version === null) {\n          throw new Error(`Failed to fetch latest version of ${name}`);\n        }\n\n        return [name, version] as const;\n      }),\n  );\n\n  updates.forEach(([name, version]) => {\n    dependencies[name] = version;\n  });\n};\n\ninterface Props {\n  destinationRoot: string;\n  include: (pathname: string) => boolean;\n  manifest: NormalizedReadResult;\n  type: ProjectType;\n}\n\nexport const analyseDependencies = async ({\n  destinationRoot,\n  include,\n  manifest: { packageJson },\n  type,\n}: Props): Promise<undefined | (() => Promise<void>)> => {\n  const input = {\n    dependencies: packageJson.dependencies ?? {},\n    devDependencies: packageJson.devDependencies ?? {},\n    type,\n  };\n\n  const output = {\n    dependencies: { ...input.dependencies },\n    devDependencies: { ...input.devDependencies },\n    type,\n  };\n\n  const processors = Object.values(dependencyMutators).reduce<TextProcessor[]>(\n    (acc, mutate) => {\n      const newProcessors = mutate(output);\n      acc.push(...newProcessors);\n      return acc;\n    },\n    [],\n  );\n\n  await Promise.all([\n    pinUnspecifiedVersions(output.dependencies),\n    pinUnspecifiedVersions(output.devDependencies),\n  ]);\n\n  const dependencyDiff = diffDependencies({\n    old: input.dependencies,\n    new: output.dependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dependencies:'));\n\n  log.newline();\n  const hasDependencyDiff = logDiff(dependencyDiff);\n\n  const devDependencyDiff = diffDependencies({\n    old: input.devDependencies,\n    new: output.devDependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dev dependencies:'));\n\n  log.newline();\n  const hasDevDependencyDiff = logDiff(devDependencyDiff);\n\n  const packageJsonFilepath = path.join(destinationRoot, 'package.json');\n\n  if (!hasDependencyDiff && !hasDevDependencyDiff) {\n    return;\n  }\n\n  return async () => {\n    const updatedPackageJson = await formatPackage({\n      ...packageJson,\n      dependencies: output.dependencies,\n      devDependencies: output.devDependencies,\n    });\n\n    await fs.promises.writeFile(packageJsonFilepath, updatedPackageJson);\n\n    if (processors.length === 0) {\n      return;\n    }\n\n    await copyFiles({\n      sourceRoot: destinationRoot,\n      destinationRoot,\n      include,\n      processors,\n    });\n  };\n};\n"],
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport type { ReadResult } from 'read-pkg-up';\n\nimport { type TextProcessor, copyFiles } from '../../utils/copy.js';\nimport { log } from '../../utils/logging.js';\nimport type { ProjectType } from '../../utils/manifest.js';\nimport { getLatestNpmVersion, getSkubaVersion } from '../../utils/version.js';\n\nimport { diffDependencies } from './analysis/package.js';\nimport * as dependencyMutators from './dependencies/index.js';\nimport { formatPackage } from './processing/package.js';\nimport type { DependencyDiff } from './types.js';\n\nconst logDiff = (diff: DependencyDiff): boolean => {\n  const entries = Object.entries(diff);\n\n  if (entries.length === 0) {\n    log.ok('\u2714 No changes');\n\n    return false;\n  }\n\n  Object.entries(diff)\n    .sort(([nameA], [nameB]) => nameA.localeCompare(nameB))\n    .forEach(([name, { operation, version }]) =>\n      log.plain(operation, name, log.formatSubtle(version)),\n    );\n\n  return true;\n};\n\nconst pinUnspecifiedVersions = async (\n  dependencies: Record<string, string>,\n): Promise<void> => {\n  const updates = await Promise.all(\n    Object.entries(dependencies)\n      .filter(([, version]) => version === '*')\n      .map(async ([name]) => {\n        const version = await (name === 'skuba'\n          ? getSkubaVersion()\n          : getLatestNpmVersion(name));\n\n        if (version === null) {\n          throw new Error(`Failed to fetch latest version of ${name}`);\n        }\n\n        return [name, version] as const;\n      }),\n  );\n\n  updates.forEach(([name, version]) => {\n    dependencies[name] = version;\n  });\n};\n\ninterface Props {\n  destinationRoot: string;\n  include: (pathname: string) => boolean;\n  manifest: ReadResult;\n  type: ProjectType;\n}\n\nexport const analyseDependencies = async ({\n  destinationRoot,\n  include,\n  manifest: { packageJson },\n  type,\n}: Props): Promise<undefined | (() => Promise<void>)> => {\n  const input = {\n    dependencies: packageJson.dependencies ?? {},\n    devDependencies: packageJson.devDependencies ?? {},\n    type,\n  };\n\n  const output = {\n    dependencies: { ...input.dependencies },\n    devDependencies: { ...input.devDependencies },\n    type,\n  };\n\n  const processors = Object.values(dependencyMutators).reduce<TextProcessor[]>(\n    (acc, mutate) => {\n      const newProcessors = mutate(output);\n      acc.push(...newProcessors);\n      return acc;\n    },\n    [],\n  );\n\n  await Promise.all([\n    pinUnspecifiedVersions(output.dependencies),\n    pinUnspecifiedVersions(output.devDependencies),\n  ]);\n\n  const dependencyDiff = diffDependencies({\n    old: input.dependencies,\n    new: output.dependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dependencies:'));\n\n  log.newline();\n  const hasDependencyDiff = logDiff(dependencyDiff);\n\n  const devDependencyDiff = diffDependencies({\n    old: input.devDependencies,\n    new: output.devDependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dev dependencies:'));\n\n  log.newline();\n  const hasDevDependencyDiff = logDiff(devDependencyDiff);\n\n  const packageJsonFilepath = path.join(destinationRoot, 'package.json');\n\n  if (!hasDependencyDiff && !hasDevDependencyDiff) {\n    return;\n  }\n\n  return async () => {\n    const updatedPackageJson = await formatPackage({\n      ...packageJson,\n      dependencies: output.dependencies,\n      devDependencies: output.devDependencies,\n    });\n\n    await fs.promises.writeFile(packageJsonFilepath, updatedPackageJson);\n\n    if (processors.length === 0) {\n      return;\n    }\n\n    await copyFiles({\n      sourceRoot: destinationRoot,\n      destinationRoot,\n      include,\n      processors,\n    });\n  };\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AAGf,kBAA8C;AAC9C,qBAAoB;AAEpB,qBAAqD;AAErD,qBAAiC;AACjC,yBAAoC;AACpC,IAAAA,kBAA8B;AAG9B,MAAM,UAAU,CAAC,SAAkC;AACjD,QAAM,UAAU,OAAO,QAAQ,IAAI;AAEnC,MAAI,QAAQ,WAAW,GAAG;AACxB,uBAAI,GAAG,mBAAc;AAErB,WAAO;AAAA,EACT;AAEA,SAAO,QAAQ,IAAI,EAChB,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,MAAM,MAAM,cAAc,KAAK,CAAC,EACrD;AAAA,IAAQ,CAAC,CAAC,MAAM,EAAE,WAAW,QAAQ,CAAC,MACrC,mBAAI,MAAM,WAAW,MAAM,mBAAI,aAAa,OAAO,CAAC;AAAA,EACtD;AAEF,SAAO;AACT;AAEA,MAAM,yBAAyB,OAC7B,iBACkB;AAClB,QAAM,UAAU,MAAM,QAAQ;AAAA,IAC5B,OAAO,QAAQ,YAAY,EACxB,OAAO,CAAC,CAAC,EAAE,OAAO,MAAM,YAAY,GAAG,EACvC,IAAI,OAAO,CAAC,IAAI,MAAM;AACrB,YAAM,UAAU,OAAO,SAAS,cAC5B,gCAAgB,QAChB,oCAAoB,IAAI;AAE5B,UAAI,YAAY,MAAM;AACpB,cAAM,IAAI,MAAM,qCAAqC,IAAI,EAAE;AAAA,MAC7D;AAEA,aAAO,CAAC,MAAM,OAAO;AAAA,IACvB,CAAC;AAAA,EACL;AAEA,UAAQ,QAAQ,CAAC,CAAC,MAAM,OAAO,MAAM;AACnC,iBAAa,IAAI,IAAI;AAAA,EACvB,CAAC;AACH;AASO,MAAM,sBAAsB,OAAO;AAAA,EACxC;AAAA,EACA;AAAA,EACA,UAAU,EAAE,YAAY;AAAA,EACxB;AACF,MAAyD;AACvD,QAAM,QAAQ;AAAA,IACZ,cAAc,YAAY,gBAAgB,CAAC;AAAA,IAC3C,iBAAiB,YAAY,mBAAmB,CAAC;AAAA,IACjD;AAAA,EACF;AAEA,QAAM,SAAS;AAAA,IACb,cAAc,EAAE,GAAG,MAAM,aAAa;AAAA,IACtC,iBAAiB,EAAE,GAAG,MAAM,gBAAgB;AAAA,IAC5C;AAAA,EACF;AAEA,QAAM,aAAa,OAAO,OAAO,kBAAkB,EAAE;AAAA,IACnD,CAAC,KAAK,WAAW;AACf,YAAM,gBAAgB,OAAO,MAAM;AACnC,UAAI,KAAK,GAAG,aAAa;AACzB,aAAO;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EACH;AAEA,QAAM,QAAQ,IAAI;AAAA,IAChB,uBAAuB,OAAO,YAAY;AAAA,IAC1C,uBAAuB,OAAO,eAAe;AAAA,EAC/C,CAAC;AAED,QAAM,qBAAiB,iCAAiB;AAAA,IACtC,KAAK,MAAM;AAAA,IACX,KAAK,OAAO;AAAA,EACd,CAAC;AAED,qBAAI,QAAQ;AACZ,qBAAI,MAAM,mBAAI,KAAK,eAAe,CAAC;AAEnC,qBAAI,QAAQ;AACZ,QAAM,oBAAoB,QAAQ,cAAc;AAEhD,QAAM,wBAAoB,iCAAiB;AAAA,IACzC,KAAK,MAAM;AAAA,IACX,KAAK,OAAO;AAAA,EACd,CAAC;AAED,qBAAI,QAAQ;AACZ,qBAAI,MAAM,mBAAI,KAAK,mBAAmB,CAAC;AAEvC,qBAAI,QAAQ;AACZ,QAAM,uBAAuB,QAAQ,iBAAiB;AAEtD,QAAM,sBAAsB,YAAAC,QAAK,KAAK,iBAAiB,cAAc;AAErE,MAAI,CAAC,qBAAqB,CAAC,sBAAsB;AAC/C;AAAA,EACF;AAEA,SAAO,YAAY;AACjB,UAAM,qBAAqB,UAAM,+BAAc;AAAA,MAC7C,GAAG;AAAA,MACH,cAAc,OAAO;AAAA,MACrB,iBAAiB,OAAO;AAAA,IAC1B,CAAC;AAED,UAAM,gBAAAC,QAAG,SAAS,UAAU,qBAAqB,kBAAkB;AAEnE,QAAI,WAAW,WAAW,GAAG;AAC3B;AAAA,IACF;AAEA,cAAM,uBAAU;AAAA,MACd,YAAY;AAAA,MACZ;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
   "names": ["import_package", "path", "fs"]
 }

package/lib/cli/configure/analysis/package.d.ts

@@ -3,7 +3,7 @@ import type { DependencyDiff } from '../types.js';
 interface GetDestinationManifestProps {
     cwd?: string;
 }
-export declare const getDestinationManifest: (props?: GetDestinationManifestProps) => Promise<readPkgUp.NormalizedReadResult>;
+export declare const getDestinationManifest: (props?: GetDestinationManifestProps) => Promise<readPkgUp.ReadResult>;
 interface DiffDependenciesProps {
     old: Record<string, string | undefined>;
     new: Record<string, string | undefined>;

package/lib/cli/configure/analysis/package.js

@@ -36,7 +36,7 @@ var import_read_pkg_up = __toESM(require("read-pkg-up"));
 var import_logging = require("../../../utils/logging.js");
 var import_diff = require("./diff.js");
 const getDestinationManifest = async (props) => {
-  const result = await (0, import_read_pkg_up.default)(props);
+  const result = await (0, import_read_pkg_up.default)({ ...props, normalize: false });
   if (result === void 0) {
     import_logging.log.err(
       "Could not find a",

package/lib/cli/configure/analysis/package.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/analysis/package.ts"],
-  "sourcesContent": ["import readPkgUp from 'read-pkg-up';\n\nimport { log } from '../../../utils/logging.js';\nimport type { DependencyDiff } from '../types.js';\n\nimport { determineOperation } from './diff.js';\n\ninterface GetDestinationManifestProps {\n  cwd?: string;\n}\n\nexport const getDestinationManifest = async (\n  props?: GetDestinationManifestProps,\n) => {\n  const result = await readPkgUp(props);\n\n  if (result === undefined) {\n    log.err(\n      'Could not find a',\n      log.bold('package.json'),\n      'in your working directory.',\n    );\n    process.exit(1);\n  }\n\n  return result;\n};\n\nconst joinVersions = (a: string | undefined, b: string | undefined) =>\n  [a, b].filter((v) => v !== undefined).join(' -> ');\n\ninterface DiffDependenciesProps {\n  old: Record<string, string | undefined>;\n  new: Record<string, string | undefined>;\n}\n\nexport const diffDependencies = (\n  props: DiffDependenciesProps,\n): DependencyDiff => {\n  const deletionsAndModifications = Object.fromEntries(\n    Object.entries(props.old).flatMap(([name, oldVersion]) => {\n      if (oldVersion === props.new[name] || oldVersion === undefined) {\n        return [];\n      }\n\n      const newVersion = props.new[name];\n\n      const operation = determineOperation(oldVersion, newVersion);\n      const version = joinVersions(oldVersion, newVersion);\n\n      return [[name, { operation, version }]] as const;\n    }),\n  );\n\n  const additions = Object.fromEntries(\n    Object.entries(props.new).flatMap(([name, version]) => {\n      if (name in props.old || version === undefined) {\n        return [];\n      }\n\n      const oldVersion = props.old[name];\n\n      const operation = determineOperation(oldVersion, version);\n\n      return [[name, { operation, version }]] as const;\n    }),\n  );\n\n  return {\n    ...deletionsAndModifications,\n    ...additions,\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAsB;AAEtB,qBAAoB;AAGpB,kBAAmC;AAM5B,MAAM,yBAAyB,OACpC,UACG;AACH,QAAM,SAAS,UAAM,mBAAAA,SAAU,KAAK;AAEpC,MAAI,WAAW,QAAW;AACxB,uBAAI;AAAA,MACF;AAAA,MACA,mBAAI,KAAK,cAAc;AAAA,MACvB;AAAA,IACF;AACA,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,SAAO;AACT;AAEA,MAAM,eAAe,CAAC,GAAuB,MAC3C,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,MAAM,MAAM,MAAS,EAAE,KAAK,MAAM;AAO5C,MAAM,mBAAmB,CAC9B,UACmB;AACnB,QAAM,4BAA4B,OAAO;AAAA,IACvC,OAAO,QAAQ,MAAM,GAAG,EAAE,QAAQ,CAAC,CAAC,MAAM,UAAU,MAAM;AACxD,UAAI,eAAe,MAAM,IAAI,IAAI,KAAK,eAAe,QAAW;AAC9D,eAAO,CAAC;AAAA,MACV;AAEA,YAAM,aAAa,MAAM,IAAI,IAAI;AAEjC,YAAM,gBAAY,gCAAmB,YAAY,UAAU;AAC3D,YAAM,UAAU,aAAa,YAAY,UAAU;AAEnD,aAAO,CAAC,CAAC,MAAM,EAAE,WAAW,QAAQ,CAAC,CAAC;AAAA,IACxC,CAAC;AAAA,EACH;AAEA,QAAM,YAAY,OAAO;AAAA,IACvB,OAAO,QAAQ,MAAM,GAAG,EAAE,QAAQ,CAAC,CAAC,MAAM,OAAO,MAAM;AACrD,UAAI,QAAQ,MAAM,OAAO,YAAY,QAAW;AAC9C,eAAO,CAAC;AAAA,MACV;AAEA,YAAM,aAAa,MAAM,IAAI,IAAI;AAEjC,YAAM,gBAAY,gCAAmB,YAAY,OAAO;AAExD,aAAO,CAAC,CAAC,MAAM,EAAE,WAAW,QAAQ,CAAC,CAAC;AAAA,IACxC,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;",
+  "sourcesContent": ["import readPkgUp from 'read-pkg-up';\n\nimport { log } from '../../../utils/logging.js';\nimport type { DependencyDiff } from '../types.js';\n\nimport { determineOperation } from './diff.js';\n\ninterface GetDestinationManifestProps {\n  cwd?: string;\n}\n\nexport const getDestinationManifest = async (\n  props?: GetDestinationManifestProps,\n) => {\n  const result = await readPkgUp({ ...props, normalize: false });\n\n  if (result === undefined) {\n    log.err(\n      'Could not find a',\n      log.bold('package.json'),\n      'in your working directory.',\n    );\n    process.exit(1);\n  }\n\n  return result;\n};\n\nconst joinVersions = (a: string | undefined, b: string | undefined) =>\n  [a, b].filter((v) => v !== undefined).join(' -> ');\n\ninterface DiffDependenciesProps {\n  old: Record<string, string | undefined>;\n  new: Record<string, string | undefined>;\n}\n\nexport const diffDependencies = (\n  props: DiffDependenciesProps,\n): DependencyDiff => {\n  const deletionsAndModifications = Object.fromEntries(\n    Object.entries(props.old).flatMap(([name, oldVersion]) => {\n      if (oldVersion === props.new[name] || oldVersion === undefined) {\n        return [];\n      }\n\n      const newVersion = props.new[name];\n\n      const operation = determineOperation(oldVersion, newVersion);\n      const version = joinVersions(oldVersion, newVersion);\n\n      return [[name, { operation, version }]] as const;\n    }),\n  );\n\n  const additions = Object.fromEntries(\n    Object.entries(props.new).flatMap(([name, version]) => {\n      if (name in props.old || version === undefined) {\n        return [];\n      }\n\n      const oldVersion = props.old[name];\n\n      const operation = determineOperation(oldVersion, version);\n\n      return [[name, { operation, version }]] as const;\n    }),\n  );\n\n  return {\n    ...deletionsAndModifications,\n    ...additions,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAAsB;AAEtB,qBAAoB;AAGpB,kBAAmC;AAM5B,MAAM,yBAAyB,OACpC,UACG;AACH,QAAM,SAAS,UAAM,mBAAAA,SAAU,EAAE,GAAG,OAAO,WAAW,MAAM,CAAC;AAE7D,MAAI,WAAW,QAAW;AACxB,uBAAI;AAAA,MACF;AAAA,MACA,mBAAI,KAAK,cAAc;AAAA,MACvB;AAAA,IACF;AACA,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,SAAO;AACT;AAEA,MAAM,eAAe,CAAC,GAAuB,MAC3C,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,MAAM,MAAM,MAAS,EAAE,KAAK,MAAM;AAO5C,MAAM,mBAAmB,CAC9B,UACmB;AACnB,QAAM,4BAA4B,OAAO;AAAA,IACvC,OAAO,QAAQ,MAAM,GAAG,EAAE,QAAQ,CAAC,CAAC,MAAM,UAAU,MAAM;AACxD,UAAI,eAAe,MAAM,IAAI,IAAI,KAAK,eAAe,QAAW;AAC9D,eAAO,CAAC;AAAA,MACV;AAEA,YAAM,aAAa,MAAM,IAAI,IAAI;AAEjC,YAAM,gBAAY,gCAAmB,YAAY,UAAU;AAC3D,YAAM,UAAU,aAAa,YAAY,UAAU;AAEnD,aAAO,CAAC,CAAC,MAAM,EAAE,WAAW,QAAQ,CAAC,CAAC;AAAA,IACxC,CAAC;AAAA,EACH;AAEA,QAAM,YAAY,OAAO;AAAA,IACvB,OAAO,QAAQ,MAAM,GAAG,EAAE,QAAQ,CAAC,CAAC,MAAM,OAAO,MAAM;AACrD,UAAI,QAAQ,MAAM,OAAO,YAAY,QAAW;AAC9C,eAAO,CAAC;AAAA,MACV;AAEA,YAAM,aAAa,MAAM,IAAI,IAAI;AAEjC,YAAM,gBAAY,gCAAmB,YAAY,OAAO;AAExD,aAAO,CAAC,CAAC,MAAM,EAAE,WAAW,QAAQ,CAAC,CAAC;AAAA,IACxC,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;",
   "names": ["readPkgUp"]
 }

package/lib/cli/configure/ensureTemplateCompletion.d.ts

@@ -1,9 +1,9 @@
-import type { NormalizedReadResult } from 'read-pkg-up';
+import type { ReadResult } from 'read-pkg-up';
 import { type TemplateConfig } from '../../utils/template.js';
 interface Props {
     destinationRoot: string;
     include: (pathname: string) => boolean;
-    manifest: NormalizedReadResult;
+    manifest: ReadResult;
 }
 export declare const ensureTemplateCompletion: ({ destinationRoot, include, manifest, }: Props) => Promise<TemplateConfig>;
 export {};

package/lib/cli/configure/ensureTemplateCompletion.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/ensureTemplateCompletion.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport fs from 'fs-extra';\nimport type { NormalizedReadResult } from 'read-pkg-up';\nimport * as z from 'zod/v4';\n\nimport { copyFiles, createEjsRenderer } from '../../utils/copy.js';\nimport { log } from '../../utils/logging.js';\nimport {\n  type TemplateConfig,\n  ensureTemplateConfigDeletion,\n} from '../../utils/template.js';\nimport { hasStringProp } from '../../utils/validation.js';\nimport {\n  getTemplateConfig,\n  readJSONFromStdIn,\n  runForm,\n} from '../init/getConfig.js';\n\nimport { formatPackage } from './processing/package.js';\n\ninterface Props {\n  destinationRoot: string;\n  include: (pathname: string) => boolean;\n  manifest: NormalizedReadResult;\n}\n\nconst templateDataSchema = z.object({\n  templateData: z.record(z.string(), z.string()),\n});\n\nconst getTemplateDataFromStdIn = async (\n  templateConfig: TemplateConfig,\n): Promise<Record<string, string>> => {\n  const config = await readJSONFromStdIn();\n  const data = templateDataSchema.parse(config);\n\n  templateConfig.fields.forEach((field) => {\n    const value = data.templateData[field.name];\n    if (value === undefined) {\n      throw new Error(`Missing field: ${field.name}`);\n    }\n\n    if (field.validate && !field.validate(value)) {\n      throw new Error(`Invalid value for field: ${field.name}`);\n    }\n  });\n\n  return data.templateData;\n};\n\nexport const ensureTemplateCompletion = async ({\n  destinationRoot,\n  include,\n  manifest,\n}: Props): Promise<TemplateConfig> => {\n  const templateConfig = await getTemplateConfig(destinationRoot);\n\n  if (templateConfig.fields.length === 0) {\n    return templateConfig;\n  }\n\n  const templateName = hasStringProp(manifest.packageJson.skuba, 'template')\n    ? manifest.packageJson.skuba.template\n    : 'template';\n\n  log.newline();\n  const templateData = process.stdin.isTTY\n    ? await runForm({\n        choices: templateConfig.fields,\n        message: chalk.bold(`Complete ${chalk.cyan(templateName)}:`),\n        name: 'customAnswers',\n      })\n    : await getTemplateDataFromStdIn(templateConfig);\n\n  const updatedPackageJson = await formatPackage(manifest.packageJson);\n  const packageJsonFilepath = path.join(destinationRoot, 'package.json');\n  await fs.promises.writeFile(packageJsonFilepath, updatedPackageJson);\n\n  await copyFiles({\n    sourceRoot: destinationRoot,\n    destinationRoot,\n    include,\n    processors: [createEjsRenderer(templateData)],\n  });\n\n  await ensureTemplateConfigDeletion(destinationRoot);\n\n  log.newline();\n  log.ok('Templating complete!');\n\n  return templateConfig;\n};\n"],
+  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport fs from 'fs-extra';\nimport type { ReadResult } from 'read-pkg-up';\nimport * as z from 'zod/v4';\n\nimport { copyFiles, createEjsRenderer } from '../../utils/copy.js';\nimport { log } from '../../utils/logging.js';\nimport {\n  type TemplateConfig,\n  ensureTemplateConfigDeletion,\n} from '../../utils/template.js';\nimport { hasStringProp } from '../../utils/validation.js';\nimport {\n  getTemplateConfig,\n  readJSONFromStdIn,\n  runForm,\n} from '../init/getConfig.js';\n\nimport { formatPackage } from './processing/package.js';\n\ninterface Props {\n  destinationRoot: string;\n  include: (pathname: string) => boolean;\n  manifest: ReadResult;\n}\n\nconst templateDataSchema = z.object({\n  templateData: z.record(z.string(), z.string()),\n});\n\nconst getTemplateDataFromStdIn = async (\n  templateConfig: TemplateConfig,\n): Promise<Record<string, string>> => {\n  const config = await readJSONFromStdIn();\n  const data = templateDataSchema.parse(config);\n\n  templateConfig.fields.forEach((field) => {\n    const value = data.templateData[field.name];\n    if (value === undefined) {\n      throw new Error(`Missing field: ${field.name}`);\n    }\n\n    if (field.validate && !field.validate(value)) {\n      throw new Error(`Invalid value for field: ${field.name}`);\n    }\n  });\n\n  return data.templateData;\n};\n\nexport const ensureTemplateCompletion = async ({\n  destinationRoot,\n  include,\n  manifest,\n}: Props): Promise<TemplateConfig> => {\n  const templateConfig = await getTemplateConfig(destinationRoot);\n\n  if (templateConfig.fields.length === 0) {\n    return templateConfig;\n  }\n\n  const templateName = hasStringProp(manifest.packageJson.skuba, 'template')\n    ? manifest.packageJson.skuba.template\n    : 'template';\n\n  log.newline();\n  const templateData = process.stdin.isTTY\n    ? await runForm({\n        choices: templateConfig.fields,\n        message: chalk.bold(`Complete ${chalk.cyan(templateName)}:`),\n        name: 'customAnswers',\n      })\n    : await getTemplateDataFromStdIn(templateConfig);\n\n  const updatedPackageJson = await formatPackage(manifest.packageJson);\n  const packageJsonFilepath = path.join(destinationRoot, 'package.json');\n  await fs.promises.writeFile(packageJsonFilepath, updatedPackageJson);\n\n  await copyFiles({\n    sourceRoot: destinationRoot,\n    destinationRoot,\n    include,\n    processors: [createEjsRenderer(templateData)],\n  });\n\n  await ensureTemplateConfigDeletion(destinationRoot);\n\n  log.newline();\n  log.ok('Templating complete!');\n\n  return templateConfig;\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAe;AAEf,QAAmB;AAEnB,kBAA6C;AAC7C,qBAAoB;AACpB,sBAGO;AACP,wBAA8B;AAC9B,uBAIO;AAEP,qBAA8B;AAQ9B,MAAM,qBAAqB,EAAE,OAAO;AAAA,EAClC,cAAc,EAAE,OAAO,EAAE,OAAO,GAAG,EAAE,OAAO,CAAC;AAC/C,CAAC;AAED,MAAM,2BAA2B,OAC/B,mBACoC;AACpC,QAAM,SAAS,UAAM,oCAAkB;AACvC,QAAM,OAAO,mBAAmB,MAAM,MAAM;AAE5C,iBAAe,OAAO,QAAQ,CAAC,UAAU;AACvC,UAAM,QAAQ,KAAK,aAAa,MAAM,IAAI;AAC1C,QAAI,UAAU,QAAW;AACvB,YAAM,IAAI,MAAM,kBAAkB,MAAM,IAAI,EAAE;AAAA,IAChD;AAEA,QAAI,MAAM,YAAY,CAAC,MAAM,SAAS,KAAK,GAAG;AAC5C,YAAM,IAAI,MAAM,4BAA4B,MAAM,IAAI,EAAE;AAAA,IAC1D;AAAA,EACF,CAAC;AAED,SAAO,KAAK;AACd;AAEO,MAAM,2BAA2B,OAAO;AAAA,EAC7C;AAAA,EACA;AAAA,EACA;AACF,MAAsC;AACpC,QAAM,iBAAiB,UAAM,oCAAkB,eAAe;AAE9D,MAAI,eAAe,OAAO,WAAW,GAAG;AACtC,WAAO;AAAA,EACT;AAEA,QAAM,mBAAe,iCAAc,SAAS,YAAY,OAAO,UAAU,IACrE,SAAS,YAAY,MAAM,WAC3B;AAEJ,qBAAI,QAAQ;AACZ,QAAM,eAAe,QAAQ,MAAM,QAC/B,UAAM,0BAAQ;AAAA,IACZ,SAAS,eAAe;AAAA,IACxB,SAAS,aAAAA,QAAM,KAAK,YAAY,aAAAA,QAAM,KAAK,YAAY,CAAC,GAAG;AAAA,IAC3D,MAAM;AAAA,EACR,CAAC,IACD,MAAM,yBAAyB,cAAc;AAEjD,QAAM,qBAAqB,UAAM,8BAAc,SAAS,WAAW;AACnE,QAAM,sBAAsB,YAAAC,QAAK,KAAK,iBAAiB,cAAc;AACrE,QAAM,gBAAAC,QAAG,SAAS,UAAU,qBAAqB,kBAAkB;AAEnE,YAAM,uBAAU;AAAA,IACd,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA,YAAY,KAAC,+BAAkB,YAAY,CAAC;AAAA,EAC9C,CAAC;AAED,YAAM,8CAA6B,eAAe;AAElD,qBAAI,QAAQ;AACZ,qBAAI,GAAG,sBAAsB;AAE7B,SAAO;AACT;",
   "names": ["chalk", "path", "fs"]
 }

package/lib/cli/configure/getEntryPoint.d.ts

@@ -1,9 +1,9 @@
-import type { NormalizedReadResult } from 'read-pkg-up';
+import type { ReadResult } from 'read-pkg-up';
 import type { ProjectType } from '../../utils/manifest.js';
 import type { TemplateConfig } from '../../utils/template.js';
 interface Props {
     destinationRoot: string;
-    manifest: NormalizedReadResult;
+    manifest: ReadResult;
     templateConfig: TemplateConfig;
     type: ProjectType;
 }

package/lib/cli/configure/getEntryPoint.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/getEntryPoint.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { Input } from 'enquirer';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging.js';\nimport type { ProjectType } from '../../utils/manifest.js';\nimport type { TemplateConfig } from '../../utils/template.js';\nimport { hasStringProp } from '../../utils/validation.js';\n\nimport { tsFileExists } from './analysis/files.js';\n\ninterface Props {\n  destinationRoot: string;\n  manifest: NormalizedReadResult;\n  templateConfig: TemplateConfig;\n  type: ProjectType;\n}\nexport const getEntryPoint = ({\n  destinationRoot,\n  manifest,\n  templateConfig,\n  type,\n}: Props) => {\n  if (hasStringProp(manifest.packageJson.skuba, 'entryPoint')) {\n    return manifest.packageJson.skuba.entryPoint;\n  }\n\n  if (templateConfig.entryPoint !== undefined) {\n    return templateConfig.entryPoint;\n  }\n\n  log.newline();\n  const entryPointPrompt = new Input({\n    initial: type === 'package' ? 'src/index.ts' : 'src/app.ts',\n    message: 'Entry point:',\n    name: 'entryPoint',\n    result: (value) => (value.endsWith('.ts') ? value : `${value}.ts`),\n    validate: async (value) => {\n      // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n      const [modulePath] = value.split('#', 2);\n\n      if (!modulePath) {\n        return `${chalk.bold(value)} is an invalid module path`;\n      }\n\n      const exists = await tsFileExists(path.join(destinationRoot, modulePath));\n\n      return exists || `${chalk.bold(value)} is not a TypeScript file.`;\n    },\n  });\n\n  return entryPointPrompt.run();\n};\n"],
+  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { Input } from 'enquirer';\nimport type { ReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging.js';\nimport type { ProjectType } from '../../utils/manifest.js';\nimport type { TemplateConfig } from '../../utils/template.js';\nimport { hasStringProp } from '../../utils/validation.js';\n\nimport { tsFileExists } from './analysis/files.js';\n\ninterface Props {\n  destinationRoot: string;\n  manifest: ReadResult;\n  templateConfig: TemplateConfig;\n  type: ProjectType;\n}\nexport const getEntryPoint = ({\n  destinationRoot,\n  manifest,\n  templateConfig,\n  type,\n}: Props) => {\n  if (hasStringProp(manifest.packageJson.skuba, 'entryPoint')) {\n    return manifest.packageJson.skuba.entryPoint;\n  }\n\n  if (templateConfig.entryPoint !== undefined) {\n    return templateConfig.entryPoint;\n  }\n\n  log.newline();\n  const entryPointPrompt = new Input({\n    initial: type === 'package' ? 'src/index.ts' : 'src/app.ts',\n    message: 'Entry point:',\n    name: 'entryPoint',\n    result: (value) => (value.endsWith('.ts') ? value : `${value}.ts`),\n    validate: async (value) => {\n      // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n      const [modulePath] = value.split('#', 2);\n\n      if (!modulePath) {\n        return `${chalk.bold(value)} is an invalid module path`;\n      }\n\n      const exists = await tsFileExists(path.join(destinationRoot, modulePath));\n\n      return exists || `${chalk.bold(value)} is not a TypeScript file.`;\n    },\n  });\n\n  return entryPointPrompt.run();\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAsB;AAGtB,qBAAoB;AAGpB,wBAA8B;AAE9B,mBAA6B;AAQtB,MAAM,gBAAgB,CAAC;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAa;AACX,UAAI,iCAAc,SAAS,YAAY,OAAO,YAAY,GAAG;AAC3D,WAAO,SAAS,YAAY,MAAM;AAAA,EACpC;AAEA,MAAI,eAAe,eAAe,QAAW;AAC3C,WAAO,eAAe;AAAA,EACxB;AAEA,qBAAI,QAAQ;AACZ,QAAM,mBAAmB,IAAI,sBAAM;AAAA,IACjC,SAAS,SAAS,YAAY,iBAAiB;AAAA,IAC/C,SAAS;AAAA,IACT,MAAM;AAAA,IACN,QAAQ,CAAC,UAAW,MAAM,SAAS,KAAK,IAAI,QAAQ,GAAG,KAAK;AAAA,IAC5D,UAAU,OAAO,UAAU;AAEzB,YAAM,CAAC,UAAU,IAAI,MAAM,MAAM,KAAK,CAAC;AAEvC,UAAI,CAAC,YAAY;AACf,eAAO,GAAG,aAAAA,QAAM,KAAK,KAAK,CAAC;AAAA,MAC7B;AAEA,YAAM,SAAS,UAAM,2BAAa,YAAAC,QAAK,KAAK,iBAAiB,UAAU,CAAC;AAExE,aAAO,UAAU,GAAG,aAAAD,QAAM,KAAK,KAAK,CAAC;AAAA,IACvC;AAAA,EACF,CAAC;AAED,SAAO,iBAAiB,IAAI;AAC9B;",
   "names": ["chalk", "path"]
 }

package/lib/cli/configure/getProjectType.d.ts

@@ -1,8 +1,8 @@
-import type { NormalizedReadResult } from 'read-pkg-up';
+import type { ReadResult } from 'read-pkg-up';
 import { type ProjectType } from '../../utils/manifest.js';
 import type { TemplateConfig } from '../../utils/template.js';
 interface Props {
-    manifest: NormalizedReadResult;
+    manifest: ReadResult;
     templateConfig: TemplateConfig;
 }
 export declare const getProjectType: ({ manifest, templateConfig, }: Props) => Promise<ProjectType>;

package/lib/cli/configure/getProjectType.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/getProjectType.ts"],
-  "sourcesContent": ["import { Select } from 'enquirer';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging.js';\nimport {\n  PROJECT_TYPES,\n  type ProjectType,\n  projectTypeSchema,\n} from '../../utils/manifest.js';\nimport type { TemplateConfig } from '../../utils/template.js';\nimport { hasProp } from '../../utils/validation.js';\n\ninterface Props {\n  manifest: NormalizedReadResult;\n  templateConfig: TemplateConfig;\n}\n\nexport const getProjectType = async ({\n  manifest,\n  templateConfig,\n}: Props): Promise<ProjectType> => {\n  const projectType = projectTypeSchema.safeParse(\n    hasProp(manifest.packageJson.skuba, 'type')\n      ? manifest.packageJson.skuba.type\n      : null,\n  );\n\n  if (projectType.success) {\n    return projectType.data;\n  }\n\n  if (templateConfig.type !== undefined) {\n    return templateConfig.type;\n  }\n\n  const initial: ProjectType =\n    manifest.packageJson.devDependencies?.['@seek/seek-module-toolkit'] ||\n    manifest.packageJson.files\n      ? 'package'\n      : 'application';\n\n  log.newline();\n  const projectTypePrompt = new Select({\n    choices: PROJECT_TYPES,\n    message: 'Project type:',\n    name: 'projectType',\n    initial,\n  });\n\n  return projectTypePrompt.run();\n};\n"],
+  "sourcesContent": ["import { Select } from 'enquirer';\nimport type { ReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging.js';\nimport {\n  PROJECT_TYPES,\n  type ProjectType,\n  projectTypeSchema,\n} from '../../utils/manifest.js';\nimport type { TemplateConfig } from '../../utils/template.js';\nimport { hasProp } from '../../utils/validation.js';\n\ninterface Props {\n  manifest: ReadResult;\n  templateConfig: TemplateConfig;\n}\n\nexport const getProjectType = async ({\n  manifest,\n  templateConfig,\n}: Props): Promise<ProjectType> => {\n  const projectType = projectTypeSchema.safeParse(\n    hasProp(manifest.packageJson.skuba, 'type')\n      ? manifest.packageJson.skuba.type\n      : null,\n  );\n\n  if (projectType.success) {\n    return projectType.data;\n  }\n\n  if (templateConfig.type !== undefined) {\n    return templateConfig.type;\n  }\n\n  const initial: ProjectType =\n    manifest.packageJson.devDependencies?.['@seek/seek-module-toolkit'] ||\n    manifest.packageJson.files\n      ? 'package'\n      : 'application';\n\n  log.newline();\n  const projectTypePrompt = new Select({\n    choices: PROJECT_TYPES,\n    message: 'Project type:',\n    name: 'projectType',\n    initial,\n  });\n\n  return projectTypePrompt.run();\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAuB;AAGvB,qBAAoB;AACpB,sBAIO;AAEP,wBAAwB;AAOjB,MAAM,iBAAiB,OAAO;AAAA,EACnC;AAAA,EACA;AACF,MAAmC;AACjC,QAAM,cAAc,kCAAkB;AAAA,QACpC,2BAAQ,SAAS,YAAY,OAAO,MAAM,IACtC,SAAS,YAAY,MAAM,OAC3B;AAAA,EACN;AAEA,MAAI,YAAY,SAAS;AACvB,WAAO,YAAY;AAAA,EACrB;AAEA,MAAI,eAAe,SAAS,QAAW;AACrC,WAAO,eAAe;AAAA,EACxB;AAEA,QAAM,UACJ,SAAS,YAAY,kBAAkB,2BAA2B,KAClE,SAAS,YAAY,QACjB,YACA;AAEN,qBAAI,QAAQ;AACZ,QAAM,oBAAoB,IAAI,uBAAO;AAAA,IACnC,SAAS;AAAA,IACT,SAAS;AAAA,IACT,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AAED,SAAO,kBAAkB,IAAI;AAC/B;",
   "names": []
 }

package/lib/cli/configure/processing/package.js

@@ -37,8 +37,14 @@ module.exports = __toCommonJS(package_exports);
 var import_normalize_package_data = __toESM(require("normalize-package-data"));
 var import_json = require("./json.js");
 var import_prettier = require("./prettier.js");
+const normalizeDataWithoutThrowing = (rawData) => {
+  try {
+    (0, import_normalize_package_data.default)(rawData);
+  } catch {
+  }
+};
 const formatPackage = async (rawData) => {
-  (0, import_normalize_package_data.default)(rawData);
+  normalizeDataWithoutThrowing(rawData);
   delete rawData._id;
   if (rawData.name === "") {
     delete rawData.name;
@@ -58,7 +64,7 @@ const parsePackage = (input) => {
   if (data === void 0) {
     return;
   }
-  (0, import_normalize_package_data.default)(data);
+  normalizeDataWithoutThrowing(data);
   return data;
 };
 const createDependencyFilter = (names, type) => {

package/lib/cli/configure/processing/package.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/processing/package.ts"],
-  "sourcesContent": ["import normalizeData from 'normalize-package-data';\n\nimport type { PackageJson } from '../types.js';\n\nimport { parseObject } from './json.js';\nimport { formatPrettier } from './prettier.js';\n\nexport const formatPackage = async (rawData: PackageJson) => {\n  normalizeData(rawData);\n\n  // normalize-package-data fields that aren't useful for applications\n\n  delete rawData._id;\n\n  if (rawData.name === '') {\n    delete rawData.name;\n  }\n\n  if (rawData.readme === 'ERROR: No README data found!') {\n    delete rawData.readme;\n  }\n\n  if (rawData.version === '') {\n    delete rawData.version;\n  }\n\n  return formatPrettier(JSON.stringify(rawData), {\n    filepath: 'package.json',\n  });\n};\n\nexport const parsePackage = (\n  input: string | undefined,\n): PackageJson | undefined => {\n  const data = parseObject(input);\n\n  if (data === undefined) {\n    return;\n  }\n\n  normalizeData(data);\n\n  return data;\n};\n\nexport const createDependencyFilter = (\n  names: readonly string[],\n  type: 'dependencies' | 'devDependencies',\n) => {\n  const set = new Set(names);\n\n  return (data: PackageJson) => ({\n    ...data,\n    [type]: Object.fromEntries(\n      Object.entries(data[type] ?? {}).filter(([name]) => !set.has(name)),\n    ),\n  });\n};\n\nexport const withPackage =\n  (fn: (data: PackageJson) => PackageJson) => (input: string | undefined) => {\n    const inputObject = parsePackage(input);\n\n    const outputObject = fn(inputObject ?? {});\n\n    return formatPackage(outputObject);\n  };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAA0B;AAI1B,kBAA4B;AAC5B,sBAA+B;AAExB,MAAM,gBAAgB,OAAO,YAAyB;AAC3D,oCAAAA,SAAc,OAAO;AAIrB,SAAO,QAAQ;AAEf,MAAI,QAAQ,SAAS,IAAI;AACvB,WAAO,QAAQ;AAAA,EACjB;AAEA,MAAI,QAAQ,WAAW,gCAAgC;AACrD,WAAO,QAAQ;AAAA,EACjB;AAEA,MAAI,QAAQ,YAAY,IAAI;AAC1B,WAAO,QAAQ;AAAA,EACjB;AAEA,aAAO,gCAAe,KAAK,UAAU,OAAO,GAAG;AAAA,IAC7C,UAAU;AAAA,EACZ,CAAC;AACH;AAEO,MAAM,eAAe,CAC1B,UAC4B;AAC5B,QAAM,WAAO,yBAAY,KAAK;AAE9B,MAAI,SAAS,QAAW;AACtB;AAAA,EACF;AAEA,oCAAAA,SAAc,IAAI;AAElB,SAAO;AACT;AAEO,MAAM,yBAAyB,CACpC,OACA,SACG;AACH,QAAM,MAAM,IAAI,IAAI,KAAK;AAEzB,SAAO,CAAC,UAAuB;AAAA,IAC7B,GAAG;AAAA,IACH,CAAC,IAAI,GAAG,OAAO;AAAA,MACb,OAAO,QAAQ,KAAK,IAAI,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC;AAAA,IACpE;AAAA,EACF;AACF;AAEO,MAAM,cACX,CAAC,OAA2C,CAAC,UAA8B;AACzE,QAAM,cAAc,aAAa,KAAK;AAEtC,QAAM,eAAe,GAAG,eAAe,CAAC,CAAC;AAEzC,SAAO,cAAc,YAAY;AACnC;",
+  "sourcesContent": ["import normalizeData from 'normalize-package-data';\n\nimport type { PackageJson } from '../types.js';\n\nimport { parseObject } from './json.js';\nimport { formatPrettier } from './prettier.js';\n\nconst normalizeDataWithoutThrowing = (rawData: PackageJson) => {\n  try {\n    normalizeData(rawData);\n  } catch {\n    // `normalize-package-data` can be picky about e.g. the `name` being valid.\n    // This creates issues for partially-init-ed projects.\n  }\n};\n\nexport const formatPackage = async (rawData: PackageJson) => {\n  normalizeDataWithoutThrowing(rawData);\n\n  // normalize-package-data fields that aren't useful for applications\n\n  delete rawData._id;\n\n  if (rawData.name === '') {\n    delete rawData.name;\n  }\n\n  if (rawData.readme === 'ERROR: No README data found!') {\n    delete rawData.readme;\n  }\n\n  if (rawData.version === '') {\n    delete rawData.version;\n  }\n\n  return formatPrettier(JSON.stringify(rawData), {\n    filepath: 'package.json',\n  });\n};\n\nexport const parsePackage = (\n  input: string | undefined,\n): PackageJson | undefined => {\n  const data = parseObject(input);\n\n  if (data === undefined) {\n    return;\n  }\n\n  normalizeDataWithoutThrowing(data);\n\n  return data;\n};\n\nexport const createDependencyFilter = (\n  names: readonly string[],\n  type: 'dependencies' | 'devDependencies',\n) => {\n  const set = new Set(names);\n\n  return (data: PackageJson) => ({\n    ...data,\n    [type]: Object.fromEntries(\n      Object.entries(data[type] ?? {}).filter(([name]) => !set.has(name)),\n    ),\n  });\n};\n\nexport const withPackage =\n  (fn: (data: PackageJson) => PackageJson) => (input: string | undefined) => {\n    const inputObject = parsePackage(input);\n\n    const outputObject = fn(inputObject ?? {});\n\n    return formatPackage(outputObject);\n  };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAA0B;AAI1B,kBAA4B;AAC5B,sBAA+B;AAE/B,MAAM,+BAA+B,CAAC,YAAyB;AAC7D,MAAI;AACF,sCAAAA,SAAc,OAAO;AAAA,EACvB,QAAQ;AAAA,EAGR;AACF;AAEO,MAAM,gBAAgB,OAAO,YAAyB;AAC3D,+BAA6B,OAAO;AAIpC,SAAO,QAAQ;AAEf,MAAI,QAAQ,SAAS,IAAI;AACvB,WAAO,QAAQ;AAAA,EACjB;AAEA,MAAI,QAAQ,WAAW,gCAAgC;AACrD,WAAO,QAAQ;AAAA,EACjB;AAEA,MAAI,QAAQ,YAAY,IAAI;AAC1B,WAAO,QAAQ;AAAA,EACjB;AAEA,aAAO,gCAAe,KAAK,UAAU,OAAO,GAAG;AAAA,IAC7C,UAAU;AAAA,EACZ,CAAC;AACH;AAEO,MAAM,eAAe,CAC1B,UAC4B;AAC5B,QAAM,WAAO,yBAAY,KAAK;AAE9B,MAAI,SAAS,QAAW;AACtB;AAAA,EACF;AAEA,+BAA6B,IAAI;AAEjC,SAAO;AACT;AAEO,MAAM,yBAAyB,CACpC,OACA,SACG;AACH,QAAM,MAAM,IAAI,IAAI,KAAK;AAEzB,SAAO,CAAC,UAAuB;AAAA,IAC7B,GAAG;AAAA,IACH,CAAC,IAAI,GAAG,OAAO;AAAA,MACb,OAAO,QAAQ,KAAK,IAAI,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC;AAAA,IACpE;AAAA,EACF;AACF;AAEO,MAAM,cACX,CAAC,OAA2C,CAAC,UAA8B;AACzE,QAAM,cAAc,aAAa,KAAK;AAEtC,QAAM,eAAe,GAAG,eAAe,CAAC,CAAC;AAEzC,SAAO,cAAc,YAAY;AACnC;",
   "names": ["normalizeData"]
 }

package/lib/cli/init/getConfig.js

@@ -66,7 +66,7 @@ const runForm = (props) => {
     name,
     validate: async (values) => {
       const results = await Promise.all(
-        choices.map((choice) => choice.validate(values[choice.name]))
+        choices.map(async (choice) => choice.validate(values[choice.name]))
       );
       return results.find((result) => typeof result === "string") ?? results.every((result) => result === true);
     }