skuba 13.0.0-custom-conditions-exports-20250923055337 → 13.0.0-custom-conditions-exports-20251007055842

package/lib/cli/lint/internalLints/upgrade/patches/13.0.0/configureTsConfigForESM.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/13.0.0/configureTsConfigForESM.ts"],
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\nimport ts from 'typescript';\nimport * as z from 'zod';\n\nimport { Git } from '../../../../../../index.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst packageJsonSchema = z.looseObject({\n  imports: z.record(z.string(), z.record(z.string(), z.string())).optional(),\n});\n\ntype PackageJson = z.infer<typeof packageJsonSchema>;\n\nconst tsConfigSchema = z.looseObject({\n  compilerOptions: z\n    .looseObject({\n      customConditions: z.array(z.string()).optional(),\n      rootDir: z.string().optional(),\n      paths: z\n        .record(z.string(), z.union([z.array(z.string()), z.null()]))\n        .optional(),\n    })\n    .optional(),\n});\n\ntype TsConfig = z.infer<typeof tsConfigSchema>;\n\nconst fetchFiles = async (patterns: string[]) => {\n  const files = await glob(patterns, {\n    ignore: ['**/.git', '**/node_modules'],\n  });\n\n  return Promise.all(\n    files.map(async (file) => {\n      const contents = await fs.promises.readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n};\n\nexport const addJestModuleNameMapper = (\n  contents: string,\n  srcPaths: string[],\n) => {\n  const moduleNameRegex = /moduleNameMapper:\\s*\\{([\\s\\S]*?)\\}/;\n  const match = moduleNameRegex.exec(contents);\n\n  const srcPathArray = srcPaths.map((subfolderPath) =>\n    subfolderPath === '.' || subfolderPath === './'\n      ? '<rootDir>/src/$1'\n      : `<rootDir>/${subfolderPath}/src/$1`,\n  );\n\n  const srcModuleMappers = JSON.stringify({\n    '^#src/(.*)\\\\.js$': srcPathArray,\n    '^#src/(.*)$': srcPathArray,\n  });\n\n  // strip the surrounding { } from the JSON stringify result\n  const newModuleNameMapper = srcModuleMappers\n    .replace(/^{/, '')\n    .replace(/}$/, '');\n\n  if (match?.[1] !== undefined) {\n    // insert srcModuleMappers into existing moduleNameMapper\n    const existingModuleMappers = match[1];\n\n    const optionalComma = !/[,\\s]*$/.test(existingModuleMappers) ? '' : ',';\n    const newContents = `${contents.slice(\n      0,\n      match.index,\n    )}moduleNameMapper: {${existingModuleMappers}${optionalComma}${newModuleNameMapper}}${contents.slice(\n      match.index + match[0].length,\n    )}`;\n\n    return newContents;\n  }\n\n  // match against function calls\n\n  // Match function calls like moduleNameMapper: getMapper()\n  const moduleNameMapperFunctionRegex =\n    /moduleNameMapper:\\s*([a-zA-Z_$][\\w$]*(?:\\([^)]*\\))?)/;\n  const functionMatch = moduleNameMapperFunctionRegex.exec(contents);\n\n  if (functionMatch?.[1] !== undefined) {\n    const functionBody = functionMatch[1];\n    const optionalComma = !/[,\\s]*$/.test(functionBody) ? '' : ',';\n    const newContents = `${contents.slice(\n      0,\n      functionMatch.index,\n    )}moduleNameMapper: {...${functionBody}${optionalComma}${newModuleNameMapper}}${contents.slice(\n      functionMatch.index + functionMatch[0].length,\n    )}}`;\n\n    return newContents;\n  }\n\n  // Add moduleNameMapper if not present\n\n  const insertionPointRegex = /(\\b(jest|export\\s+default)\\b[\\s\\S]*?{)/;\n  const insertionMatch = insertionPointRegex.exec(contents);\n\n  if (insertionMatch?.[1] !== undefined) {\n    const insertionIndex = insertionMatch.index + insertionMatch[0].length;\n    const moduleNameMapperString = `\\n  moduleNameMapper: {${newModuleNameMapper}},`;\n\n    const newContents =\n      contents.slice(0, insertionIndex) +\n      moduleNameMapperString +\n      contents.slice(insertionIndex);\n\n    return newContents;\n  }\n\n  log.warn(\n    'Could not find a suitable place to insert moduleNameMapper in jest config',\n  );\n  return contents;\n};\n\nexport const parsePackageJson = (\n  contents: string,\n): {\n  original: PackageJson;\n  parsed: PackageJson;\n} | null => {\n  try {\n    const parsedJson: unknown = JSON.parse(contents);\n    return {\n      original: parsedJson as PackageJson,\n      parsed: packageJsonSchema.parse(parsedJson),\n    };\n  } catch (error) {\n    log.warn(`Failed to parse package.json as JSON: ${String(error)}`);\n    return null;\n  }\n};\n\nexport const updatePackageJson = ({\n  parsed,\n  customCondition,\n}: {\n  parsed: PackageJson;\n  customCondition: string;\n}) => {\n  parsed.imports ??= {};\n  parsed.imports['#src/*'] ??= {\n    [customCondition]: './src/*',\n    default: './lib/*',\n  };\n\n  return {\n    parsed,\n  };\n};\n\nconst parseTsconfig = (\n  file: string,\n  contents: string,\n): {\n  original: TsConfig;\n  parsed: TsConfig;\n  srcPaths: string[];\n} | null => {\n  try {\n    const parsedJson = ts.parseConfigFileTextToJson(file, contents);\n    const tsconfig = tsConfigSchema.parse(parsedJson.config);\n\n    return {\n      original: parsedJson.config as TsConfig,\n      parsed: tsconfig,\n      srcPaths: tsconfig.compilerOptions?.paths?.['./src/*'] ?? [],\n    };\n  } catch (error) {\n    log.warn(`Failed to parse root tsconfig.json as JSON: ${String(error)}`);\n    return null;\n  }\n};\n\nconst updateTsConfig = ({\n  parsed,\n  customCondition,\n  file,\n}: {\n  parsed: TsConfig;\n  customCondition: string;\n  file: string;\n}) => {\n  if (file === 'tsconfig.json') {\n    parsed.compilerOptions ??= {};\n    parsed.compilerOptions.customConditions ??= [];\n\n    if (!parsed.compilerOptions.customConditions.includes(customCondition)) {\n      parsed.compilerOptions.customConditions.push(customCondition);\n    }\n  }\n\n  let srcPaths: string[] = [];\n  ['./src/*', 'src/*', 'src'].forEach((key) => {\n    if (parsed.compilerOptions?.paths?.[key]) {\n      srcPaths = parsed.compilerOptions.paths[key];\n      delete parsed.compilerOptions.paths[key];\n    }\n  });\n\n  if (\n    parsed.compilerOptions?.paths &&\n    Object.keys(parsed.compilerOptions.paths).length === 0\n  ) {\n    delete parsed.compilerOptions.paths;\n  }\n\n  return {\n    parsed,\n    srcPaths,\n  };\n};\n\nexport const tryConfigureTsConfigForESM: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  let customCondition: string;\n  try {\n    const { repo } = await Git.getOwnerAndRepo({ dir: process.cwd() });\n    customCondition = `@seek/${repo}/source`;\n  } catch {\n    return { result: 'skip', reason: 'no repository name found' };\n  }\n\n  const tsconfigJsonPatterns = ['**/tsconfig.json'];\n  const tsconfigBuildJsonPatterns = ['**/tsconfig.build.json'];\n  const jestConfigPatterns = ['**/jest.config.ts', '**/jest.config.*.ts'];\n\n  const [tsconfigJsonFiles, tsconfigBuildJsonFiles, jestConfigFiles] =\n    await Promise.all([\n      fetchFiles(tsconfigJsonPatterns),\n      fetchFiles(tsconfigBuildJsonPatterns),\n      fetchFiles(jestConfigPatterns),\n    ]);\n\n  const parsedTsconfigFiles = tsconfigJsonFiles.flatMap(\n    ({ file, contents }) => {\n      const parsed = parseTsconfig(file, contents);\n      return parsed ? [{ file, ...parsed }] : [];\n    },\n  );\n\n  const parsedTsconfigBuildFiles = tsconfigBuildJsonFiles.flatMap(\n    ({ file, contents }) => {\n      const parsed = parseTsconfig(file, contents);\n      return parsed ? [{ file, ...parsed }] : [];\n    },\n  );\n\n  if (parsedTsconfigFiles.length === 0) {\n    return { result: 'skip', reason: 'no valid tsconfig.json files found' };\n  }\n\n  const updatedTsconfigFiles = parsedTsconfigFiles.map(\n    ({ file, parsed, original }) => ({\n      file,\n      original,\n      ...updateTsConfig({ parsed, customCondition, file }),\n    }),\n  );\n\n  const allSrcPaths = [\n    ...new Set(\n      updatedTsconfigFiles.flatMap(({ srcPaths, file }) =>\n        srcPaths.flatMap((p) => {\n          const regex = /(.*)src\\/?\\*?$/;\n          const match = regex.exec(p);\n          if (match?.[1] !== undefined) {\n            return [\n              path.join(path.dirname(file), match[1].replace(/\\/?$/, '')),\n            ];\n          }\n\n          log.warn(\n            `Unexpected src path format in ${file}: ${p}. Expected format like \"apps/api/src/*\"`,\n          );\n          return [];\n        }),\n      ),\n    ),\n  ];\n\n  // Fetch all package.json paths which may be in allSrcPaths\n  const packageJsonPatterns = allSrcPaths.map((srcPath) =>\n    path.join(srcPath, 'package.json'),\n  );\n\n  const packageJsonFiles = await fetchFiles(packageJsonPatterns);\n\n  const parsedPackageJsonFiles = packageJsonFiles.flatMap(\n    ({ file, contents }) => {\n      const parsed = parsePackageJson(contents);\n      return parsed ? [{ file, ...parsed }] : [];\n    },\n  );\n\n  parsedPackageJsonFiles.forEach(({ parsed, file }) => {\n    updatePackageJson({ parsed, customCondition });\n\n    const relativeTsconfigPath = path.join(path.dirname(file), 'tsconfig.json');\n\n    const relativeTsconfig = updatedTsconfigFiles.find(\n      (tsconfig) => tsconfig.file === relativeTsconfigPath,\n    );\n\n    if (relativeTsconfig) {\n      relativeTsconfig.parsed.compilerOptions ??= {};\n      relativeTsconfig.parsed.compilerOptions.rootDir ??= '.';\n    } else {\n      log.warn(\n        `No corresponding tsconfig.json found for package.json at ${file}. Expected at ${relativeTsconfigPath}`,\n      );\n    }\n\n    const relativeTsconfigBuildPath = path.join(\n      path.dirname(file),\n      'tsconfig.build.json',\n    );\n\n    const relativeTsconfigBuild = parsedTsconfigBuildFiles.find(\n      (tsconfig) => tsconfig.file === relativeTsconfigBuildPath,\n    );\n\n    if (relativeTsconfigBuild) {\n      relativeTsconfigBuild.parsed.compilerOptions ??= {};\n      relativeTsconfigBuild.parsed.compilerOptions.rootDir ??= 'src';\n    } else {\n      log.warn(\n        `No corresponding tsconfig.build.json found for package.json at ${file}. Expected at ${relativeTsconfigBuildPath}`,\n      );\n    }\n  });\n\n  const updatedJestConfigFiles = jestConfigFiles.map(({ file, contents }) => {\n    const parsed = addJestModuleNameMapper(contents, allSrcPaths);\n    return { file, original: contents, parsed };\n  });\n\n  const hasJestConfigsChanged = updatedJestConfigFiles.some(\n    ({ parsed, original }) => original !== parsed,\n  );\n\n  const hasRelativeTsconfigBuildsChanged = parsedTsconfigBuildFiles.some(\n    ({ original, parsed }) =>\n      JSON.stringify(original) !== JSON.stringify(parsed),\n  );\n\n  const hasPackageJsonsChanged = parsedPackageJsonFiles.some(\n    ({ original, parsed }) =>\n      JSON.stringify(original) !== JSON.stringify(parsed),\n  );\n\n  const hasRootTsconfigChanged = updatedTsconfigFiles.some(\n    ({ original, parsed }) =>\n      JSON.stringify(original) !== JSON.stringify(parsed),\n  );\n\n  if (\n    mode === 'lint' &&\n    (hasRootTsconfigChanged ||\n      hasPackageJsonsChanged ||\n      hasRelativeTsconfigBuildsChanged ||\n      hasJestConfigsChanged)\n  ) {\n    return { result: 'apply' };\n  }\n\n  if (\n    !hasRootTsconfigChanged &&\n    !hasPackageJsonsChanged &&\n    !hasRelativeTsconfigBuildsChanged &&\n    !hasJestConfigsChanged\n  ) {\n    return { result: 'skip', reason: 'no changes required' };\n  }\n\n  const jsonFilePromises = Promise.all(\n    [\n      ...updatedTsconfigFiles,\n      ...parsedTsconfigBuildFiles,\n      ...parsedPackageJsonFiles,\n    ].map(async ({ file, parsed, original }) => {\n      if (JSON.stringify(original) === JSON.stringify(parsed)) {\n        return;\n      }\n      const updatedContents = JSON.stringify(parsed, null, 2);\n      await fs.promises.writeFile(file, updatedContents);\n    }),\n  );\n\n  const otherFilePromises = Promise.all(\n    updatedJestConfigFiles.map(async ({ file, parsed, original }) => {\n      if (original === parsed) {\n        return;\n      }\n      await fs.promises.writeFile(file, parsed);\n    }),\n  );\n\n  await Promise.all([jsonFilePromises, otherFilePromises]);\n\n  return { result: 'apply' };\n};\n\nexport const configureTsConfigForESM: PatchFunction = async (config) => {\n  try {\n    return await tryConfigureTsConfigForESM(config);\n  } catch (err) {\n    log.warn('Failed to write configure `tsconfig.json` and `package.json`');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["fs", "ts", "path"]
+}

package/lib/cli/lint/internalLints/upgrade/patches/13.0.0/index.d.ts

@@ -0,0 +1,2 @@
+import type { Patches } from '../../index.js';
+export declare const patches: Patches;

package/lib/cli/lint/internalLints/upgrade/patches/{12.2.0 → 13.0.0}/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.2.0/index.ts"],
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/13.0.0/index.ts"],
   "sourcesContent": ["import type { Patches } from '../../index.js';\n\nimport { configureTsConfigForESM } from './configureTsConfigForESM.js';\nimport { rewriteSrcImports } from './rewriteSrcImports.js';\n\nexport const patches: Patches = [\n  {\n    apply: rewriteSrcImports,\n    description: \"Rewrite all 'src' imports to be '#src'\",\n  },\n  {\n    apply: configureTsConfigForESM,\n    description:\n      'Configure `tsconfig.json`, `package.json` and `jest.config.ts` for ESM',\n  },\n];\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,qCAAwC;AACxC,+BAAkC;AAE3B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AACF;",
   "names": []

package/lib/cli/lint/internalLints/upgrade/patches/13.0.0/rewriteSrcImports.d.ts

@@ -0,0 +1,13 @@
+import type { PatchFunction } from '../../index.js';
+export declare const hasSkubaDiveRegisterImportRegex: RegExp;
+export declare const hasRelativeRegisterImportRegex: RegExp;
+export declare const hasRelativeImportRegex: RegExp;
+export declare const hasSrcImportRegex: RegExp;
+export declare const hasImportRegex: RegExp;
+export declare const hasJestMockRegex: RegExp;
+export declare const isFileEmpty: (contents: string) => boolean;
+export declare const replaceSrcImport: (contents: string) => string;
+export declare const replaceSrcImportWithConditionalRegisterRemoval: (contents: string, shouldRemoveRelativeRegister: boolean) => string;
+export declare const replaceSrcImportWithSelectiveRegisterRemoval: (contents: string, file: string, deletionSet: Set<string>) => string;
+export declare const tryRewriteSrcImports: PatchFunction;
+export declare const rewriteSrcImports: PatchFunction;

package/lib/cli/lint/internalLints/upgrade/patches/13.0.0/rewriteSrcImports.js

@@ -0,0 +1,225 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rewriteSrcImports_exports = {};
+__export(rewriteSrcImports_exports, {
+  hasImportRegex: () => hasImportRegex,
+  hasJestMockRegex: () => hasJestMockRegex,
+  hasRelativeImportRegex: () => hasRelativeImportRegex,
+  hasRelativeRegisterImportRegex: () => hasRelativeRegisterImportRegex,
+  hasSkubaDiveRegisterImportRegex: () => hasSkubaDiveRegisterImportRegex,
+  hasSrcImportRegex: () => hasSrcImportRegex,
+  isFileEmpty: () => isFileEmpty,
+  replaceSrcImport: () => replaceSrcImport,
+  replaceSrcImportWithConditionalRegisterRemoval: () => replaceSrcImportWithConditionalRegisterRemoval,
+  replaceSrcImportWithSelectiveRegisterRemoval: () => replaceSrcImportWithSelectiveRegisterRemoval,
+  rewriteSrcImports: () => rewriteSrcImports,
+  tryRewriteSrcImports: () => tryRewriteSrcImports
+});
+module.exports = __toCommonJS(rewriteSrcImports_exports);
+var import_path = __toESM(require("path"));
+var import_util = require("util");
+var import_fast_glob = require("fast-glob");
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_logging = require("../../../../../../utils/logging.js");
+const fetchFiles = async (files) => Promise.all(
+  files.map(async (file) => {
+    const contents = await import_fs_extra.default.promises.readFile(file, "utf8");
+    return {
+      file,
+      contents
+    };
+  })
+);
+const hasSkubaDiveRegisterImportRegex = /import\s+['"](?:skuba-dive\/register)(?:\.js)?['"];?\s*/gm;
+const hasRelativeRegisterImportRegex = /import\s+['"](\.\.?\/.*?register)(?:\.js)?['"];?\s*/gm;
+const hasRelativeImportRegex = /import\s+['"](\.\.?\/[^'"]*?)(?:\.js)?['"];?\s*/gm;
+const hasSrcImportRegex = /import\s+(?:type\s+\{[^}]*\}|\{[^}]*\}|\*\s+as\s+\w+|\w+(?:\s*,\s*\{[^}]*\})?)\s+from\s+['"]src\/[^'"]*['"]/gm;
+const hasImportRegex = /import\(\s*["']src\/[^'"]*["']\s*\)/gm;
+const hasJestMockRegex = /jest\.mock\(\s*["']src\/[^'"]*["']/gm;
+const multiLineCommentRegex = /\/\*[\s\S]*?\*\//g;
+const singleLineCommentRegex = /\/\/.*$/gm;
+const whitespaceRegex = /\s/g;
+const removeSkubaDiveRegisterImport = (contents) => contents.replace(hasSkubaDiveRegisterImportRegex, "");
+const removeRelativeRegisterImport = (contents) => contents.replace(hasRelativeRegisterImportRegex, "");
+const removeSelectiveRelativeImports = (contents, file, deletionSet) => contents.replace(hasRelativeImportRegex, (match, relativePath) => {
+  if (!relativePath) {
+    return match;
+  }
+  const fileDir = import_path.default.dirname(file);
+  const resolvedPath = import_path.default.resolve(fileDir, relativePath);
+  if (import_path.default.extname(relativePath)) {
+    return deletionSet.has(resolvedPath) ? "" : match;
+  }
+  const possiblePaths = [`${resolvedPath}.ts`, `${resolvedPath}.js`];
+  const shouldRemove = possiblePaths.some(
+    (possiblePath) => deletionSet.has(possiblePath)
+  );
+  return shouldRemove ? "" : match;
+});
+const isFileEmpty = (contents) => contents.replace(multiLineCommentRegex, "").replace(singleLineCommentRegex, "").replace(whitespaceRegex, "").length === 0;
+const replaceSrcImport = (contents) => {
+  const combinedSrcRegex = new RegExp(
+    [
+      hasSrcImportRegex.source,
+      hasImportRegex.source,
+      hasJestMockRegex.source
+    ].join("|"),
+    "gm"
+  );
+  const withReplacedSrcImports = contents.replace(
+    combinedSrcRegex,
+    (match) => match.replace(/(['"])src\//g, "$1#src/")
+  );
+  return removeSkubaDiveRegisterImport(withReplacedSrcImports);
+};
+const replaceSrcImportWithConditionalRegisterRemoval = (contents, shouldRemoveRelativeRegister) => {
+  const combinedSrcRegex = new RegExp(
+    [
+      hasSrcImportRegex.source,
+      hasImportRegex.source,
+      hasJestMockRegex.source
+    ].join("|"),
+    "gm"
+  );
+  const withReplacedSrcImports = contents.replace(
+    combinedSrcRegex,
+    (match) => match.replace(/(['"])src\//g, "$1#src/")
+  );
+  const withoutSkubaDive = removeSkubaDiveRegisterImport(
+    withReplacedSrcImports
+  );
+  return shouldRemoveRelativeRegister ? removeRelativeRegisterImport(withoutSkubaDive) : withoutSkubaDive;
+};
+const replaceSrcImportWithSelectiveRegisterRemoval = (contents, file, deletionSet) => {
+  const combinedSrcRegex = new RegExp(
+    [
+      hasSrcImportRegex.source,
+      hasImportRegex.source,
+      hasJestMockRegex.source
+    ].join("|"),
+    "gm"
+  );
+  const withReplacedSrcImports = contents.replace(
+    combinedSrcRegex,
+    (match) => match.replace(/(['"])src\//g, "$1#src/")
+  );
+  const withoutSkubaDive = removeSkubaDiveRegisterImport(
+    withReplacedSrcImports
+  );
+  return removeSelectiveRelativeImports(withoutSkubaDive, file, deletionSet);
+};
+const tryRewriteSrcImports = async ({
+  mode
+}) => {
+  const tsFileNames = await (0, import_fast_glob.glob)(["**/*.ts", "**/*.test.ts"], {
+    ignore: [
+      "**/.git",
+      "**/node_modules",
+      "src/cli/lint/internalLints/upgrade/patches/**/*"
+    ]
+  });
+  if (!tsFileNames.length) {
+    return {
+      result: "skip",
+      reason: "no .ts or test.ts files found"
+    };
+  }
+  const tsFiles = await fetchFiles(tsFileNames);
+  const filesWithSkubaDiveRemoved = tsFiles.map(({ file, contents }) => ({
+    file,
+    before: contents,
+    afterSkubaDiveRemoval: removeSkubaDiveRegisterImport(
+      contents.replace(
+        new RegExp(
+          [
+            hasSrcImportRegex.source,
+            hasImportRegex.source,
+            hasJestMockRegex.source
+          ].join("|"),
+          "gm"
+        ),
+        (match) => match.replace(/(['"])src\//g, "$1#src/")
+      )
+    )
+  }));
+  const filesToDelete = new Set(
+    filesWithSkubaDiveRemoved.filter(({ afterSkubaDiveRemoval }) => isFileEmpty(afterSkubaDiveRemoval)).map(({ file }) => import_path.default.resolve(file))
+  );
+  const mapped = tsFiles.map(({ file, contents }) => ({
+    file,
+    before: contents,
+    after: replaceSrcImportWithSelectiveRegisterRemoval(
+      contents,
+      file,
+      filesToDelete
+    )
+  }));
+  if (mode === "lint") {
+    return {
+      result: "apply"
+    };
+  }
+  await Promise.all(
+    mapped.map(async ({ file, before, after }) => {
+      if (isFileEmpty(after)) {
+        await import_fs_extra.default.promises.unlink(file);
+        return;
+      }
+      if (before !== after) {
+        await import_fs_extra.default.promises.writeFile(file, after);
+      }
+    })
+  );
+  return { result: "apply" };
+};
+const rewriteSrcImports = async (config) => {
+  try {
+    return await tryRewriteSrcImports(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to rewrite src imports to #src");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  hasImportRegex,
+  hasJestMockRegex,
+  hasRelativeImportRegex,
+  hasRelativeRegisterImportRegex,
+  hasSkubaDiveRegisterImportRegex,
+  hasSrcImportRegex,
+  isFileEmpty,
+  replaceSrcImport,
+  replaceSrcImportWithConditionalRegisterRemoval,
+  replaceSrcImportWithSelectiveRegisterRemoval,
+  rewriteSrcImports,
+  tryRewriteSrcImports
+});
+//# sourceMappingURL=rewriteSrcImports.js.map

package/lib/cli/lint/internalLints/upgrade/patches/13.0.0/rewriteSrcImports.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/13.0.0/rewriteSrcImports.ts"],
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst fetchFiles = async (files: string[]) =>\n  Promise.all(\n    files.map(async (file) => {\n      const contents = await fs.promises.readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\nexport const hasSkubaDiveRegisterImportRegex =\n  /import\\s+['\"](?:skuba-dive\\/register)(?:\\.js)?['\"];?\\s*/gm;\n\nexport const hasRelativeRegisterImportRegex =\n  /import\\s+['\"](\\.\\.?\\/.*?register)(?:\\.js)?['\"];?\\s*/gm;\n\nexport const hasRelativeImportRegex =\n  /import\\s+['\"](\\.\\.?\\/[^'\"]*?)(?:\\.js)?['\"];?\\s*/gm;\n\nexport const hasSrcImportRegex =\n  /import\\s+(?:type\\s+\\{[^}]*\\}|\\{[^}]*\\}|\\*\\s+as\\s+\\w+|\\w+(?:\\s*,\\s*\\{[^}]*\\})?)\\s+from\\s+['\"]src\\/[^'\"]*['\"]/gm;\n\nexport const hasImportRegex = /import\\(\\s*[\"']src\\/[^'\"]*[\"']\\s*\\)/gm;\n\nexport const hasJestMockRegex = /jest\\.mock\\(\\s*[\"']src\\/[^'\"]*[\"']/gm;\n\nconst multiLineCommentRegex = /\\/\\*[\\s\\S]*?\\*\\//g;\n\nconst singleLineCommentRegex = /\\/\\/.*$/gm;\n\nconst whitespaceRegex = /\\s/g;\n\nconst removeSkubaDiveRegisterImport = (contents: string) =>\n  contents.replace(hasSkubaDiveRegisterImportRegex, '');\n\nconst removeRelativeRegisterImport = (contents: string) =>\n  contents.replace(hasRelativeRegisterImportRegex, '');\n\nconst removeSelectiveRelativeImports = (\n  contents: string,\n  file: string,\n  deletionSet: Set<string>,\n): string =>\n  contents.replace(hasRelativeImportRegex, (match, relativePath: string) => {\n    if (!relativePath) {\n      return match;\n    }\n\n    const fileDir = path.dirname(file);\n    const resolvedPath = path.resolve(fileDir, relativePath);\n\n    if (path.extname(relativePath)) {\n      return deletionSet.has(resolvedPath) ? '' : match;\n    }\n\n    const possiblePaths = [`${resolvedPath}.ts`, `${resolvedPath}.js`];\n    const shouldRemove = possiblePaths.some((possiblePath) =>\n      deletionSet.has(possiblePath),\n    );\n\n    return shouldRemove ? '' : match;\n  });\n\nexport const isFileEmpty = (contents: string): boolean =>\n  contents\n    .replace(multiLineCommentRegex, '')\n    .replace(singleLineCommentRegex, '')\n    .replace(whitespaceRegex, '').length === 0;\n\nexport const replaceSrcImport = (contents: string) => {\n  const combinedSrcRegex = new RegExp(\n    [\n      hasSrcImportRegex.source,\n      hasImportRegex.source,\n      hasJestMockRegex.source,\n    ].join('|'),\n    'gm',\n  );\n\n  const withReplacedSrcImports = contents.replace(combinedSrcRegex, (match) =>\n    match.replace(/(['\"])src\\//g, '$1#src/'),\n  );\n\n  return removeSkubaDiveRegisterImport(withReplacedSrcImports);\n};\n\nexport const replaceSrcImportWithConditionalRegisterRemoval = (\n  contents: string,\n  shouldRemoveRelativeRegister: boolean,\n) => {\n  const combinedSrcRegex = new RegExp(\n    [\n      hasSrcImportRegex.source,\n      hasImportRegex.source,\n      hasJestMockRegex.source,\n    ].join('|'),\n    'gm',\n  );\n\n  const withReplacedSrcImports = contents.replace(combinedSrcRegex, (match) =>\n    match.replace(/(['\"])src\\//g, '$1#src/'),\n  );\n\n  const withoutSkubaDive = removeSkubaDiveRegisterImport(\n    withReplacedSrcImports,\n  );\n\n  return shouldRemoveRelativeRegister\n    ? removeRelativeRegisterImport(withoutSkubaDive)\n    : withoutSkubaDive;\n};\n\nexport const replaceSrcImportWithSelectiveRegisterRemoval = (\n  contents: string,\n  file: string,\n  deletionSet: Set<string>,\n) => {\n  const combinedSrcRegex = new RegExp(\n    [\n      hasSrcImportRegex.source,\n      hasImportRegex.source,\n      hasJestMockRegex.source,\n    ].join('|'),\n    'gm',\n  );\n\n  const withReplacedSrcImports = contents.replace(combinedSrcRegex, (match) =>\n    match.replace(/(['\"])src\\//g, '$1#src/'),\n  );\n\n  const withoutSkubaDive = removeSkubaDiveRegisterImport(\n    withReplacedSrcImports,\n  );\n\n  return removeSelectiveRelativeImports(withoutSkubaDive, file, deletionSet);\n};\n\nexport const tryRewriteSrcImports: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const tsFileNames = await glob(['**/*.ts', '**/*.test.ts'], {\n    ignore: [\n      '**/.git',\n      '**/node_modules',\n      'src/cli/lint/internalLints/upgrade/patches/**/*',\n    ],\n  });\n\n  if (!tsFileNames.length) {\n    return {\n      result: 'skip',\n      reason: 'no .ts or test.ts files found',\n    };\n  }\n\n  const tsFiles = await fetchFiles(tsFileNames);\n\n  const filesWithSkubaDiveRemoved = tsFiles.map(({ file, contents }) => ({\n    file,\n    before: contents,\n    afterSkubaDiveRemoval: removeSkubaDiveRegisterImport(\n      contents.replace(\n        new RegExp(\n          [\n            hasSrcImportRegex.source,\n            hasImportRegex.source,\n            hasJestMockRegex.source,\n          ].join('|'),\n          'gm',\n        ),\n        (match) => match.replace(/(['\"])src\\//g, '$1#src/'),\n      ),\n    ),\n  }));\n\n  const filesToDelete = new Set(\n    filesWithSkubaDiveRemoved\n      .filter(({ afterSkubaDiveRemoval }) => isFileEmpty(afterSkubaDiveRemoval))\n      .map(({ file }) => path.resolve(file)),\n  );\n\n  const mapped = tsFiles.map(({ file, contents }) => ({\n    file,\n    before: contents,\n    after: replaceSrcImportWithSelectiveRegisterRemoval(\n      contents,\n      file,\n      filesToDelete,\n    ),\n  }));\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all(\n    mapped.map(async ({ file, before, after }) => {\n      if (isFileEmpty(after)) {\n        await fs.promises.unlink(file);\n        return;\n      }\n\n      if (before !== after) {\n        await fs.promises.writeFile(file, after);\n      }\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const rewriteSrcImports: PatchFunction = async (config) => {\n  try {\n    return await tryRewriteSrcImports(config);\n  } catch (err) {\n    log.warn('Failed to rewrite src imports to #src');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["fs", "path"]
+}

package/lib/cli/test/reporters/github/annotations.d.ts

@@ -1,5 +1,5 @@
 import type { TestResult } from '@jest/test-result';
-import type * as GitHub from '../../../../api/github/index.js';
+import type * as GitHub from '@skuba-lib/api/github';
 export declare const createAnnotations: (testResults: TestResult[]) => GitHub.Annotation[];
 interface AnnotationEntry {
     annotations: GitHub.Annotation[];

package/lib/cli/test/reporters/github/annotations.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/test/reporters/github/annotations.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { stripVTControlCharacters as stripAnsi } from 'util';\n\nimport type { TestResult } from '@jest/test-result';\nimport dedent from 'ts-dedent';\n\nimport type * as GitHub from '../../../../api/github/index.js';\n\n/**\n * Matches the first stack trace location in a Jest failure message.\n *\n * For example, given the following input message:\n *\n * ```console\n * Error: expect(received).toBe(expected) // Object.is equality\n *\n * Expected: \"a\"\n * Received: \"b\"\n *     at Object.<anonymous> (/workdir/skuba/src/test.test.ts:2:15)\n *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)\n *     ...\n * ```\n *\n * or:\n *\n * ```console\n * Error: expect(received).toBe(expected) // Object.is equality\n *\n * Expected: \"a\"\n * Received: \"b\"\n *     at /workdir/skuba/src/test.test.ts:2:15\n *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)\n *     ...\n * ```\n *\n * This pattern will produce the following matches:\n *\n * 1. /workdir/skuba/src/test.test.ts\n * 2. 2\n * 2. 15\n */\nconst JEST_LOCATION_REGEX = /\\n +at (.+\\()?(.+?):(\\d+):(\\d+)/;\n\nexport const createAnnotations = (\n  testResults: TestResult[],\n): GitHub.Annotation[] => {\n  const cwd = process.cwd();\n\n  return testResults.flatMap((testResult) => {\n    if (testResult.testExecError) {\n      return {\n        annotation_level: 'failure',\n        path: path.relative(cwd, testResult.testFilePath),\n        start_line: 1,\n        end_line: 1,\n        message: stripAnsi(\n          testResult.failureMessage\n            ? dedent(testResult.failureMessage)\n            : testResult.testExecError.message,\n        ),\n        title: 'Jest',\n      };\n    }\n\n    if (testResult.numFailingTests > 0) {\n      return testResult.testResults.flatMap((assertionResult) =>\n        assertionResult.failureMessages.flatMap((failureMessage) => {\n          const match = JEST_LOCATION_REGEX.exec(failureMessage);\n          if (match?.length === 5 && match[2]) {\n            return {\n              annotation_level: 'failure',\n              path: path.relative(cwd, match[2]),\n              start_line: Number(match[3]),\n              end_line: Number(match[3]),\n              start_column: Number(match[4]),\n              end_column: Number(match[4]),\n              message: stripAnsi(failureMessage),\n              title: 'Jest',\n            };\n          }\n\n          return [];\n        }),\n      );\n    }\n\n    return [];\n  });\n};\n\nconst DEFAULT_DISPLAY_NAME = Symbol('DEFAULT_DISPLAY_NAME');\n\ninterface AnnotationEntry {\n  annotations: GitHub.Annotation[];\n  displayName: string | undefined;\n}\n\nexport const generateAnnotationEntries = (\n  testResults: TestResult[],\n): AnnotationEntry[] => {\n  type ResultsByDisplayName = Record<string | symbol, TestResult[]>;\n\n  // Group test results by display name.\n  const resultsByDisplayName = testResults.reduce<ResultsByDisplayName>(\n    (acc, result) => {\n      const displayName = result.displayName?.name ?? DEFAULT_DISPLAY_NAME;\n\n      (acc[displayName] ??= []).push(result);\n\n      return acc;\n    },\n    {},\n  );\n\n  const defaultResults = resultsByDisplayName[DEFAULT_DISPLAY_NAME];\n\n  const entries = [\n    ...(defaultResults?.length ? ([[undefined, defaultResults]] as const) : []),\n    ...Object.entries(resultsByDisplayName),\n  ];\n\n  // Create annotations for each display name.\n  return entries.map<AnnotationEntry>(([displayName, results]) => ({\n    annotations: createAnnotations(results),\n    displayName,\n  }));\n};\n"],
+  "sourcesContent": ["import path from 'path';\nimport { stripVTControlCharacters as stripAnsi } from 'util';\n\nimport type { TestResult } from '@jest/test-result';\nimport dedent from 'ts-dedent';\n\nimport type * as GitHub from '@skuba-lib/api/github';\n\n/**\n * Matches the first stack trace location in a Jest failure message.\n *\n * For example, given the following input message:\n *\n * ```console\n * Error: expect(received).toBe(expected) // Object.is equality\n *\n * Expected: \"a\"\n * Received: \"b\"\n *     at Object.<anonymous> (/workdir/skuba/src/test.test.ts:2:15)\n *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)\n *     ...\n * ```\n *\n * or:\n *\n * ```console\n * Error: expect(received).toBe(expected) // Object.is equality\n *\n * Expected: \"a\"\n * Received: \"b\"\n *     at /workdir/skuba/src/test.test.ts:2:15\n *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)\n *     ...\n * ```\n *\n * This pattern will produce the following matches:\n *\n * 1. /workdir/skuba/src/test.test.ts\n * 2. 2\n * 2. 15\n */\nconst JEST_LOCATION_REGEX = /\\n +at (.+\\()?(.+?):(\\d+):(\\d+)/;\n\nexport const createAnnotations = (\n  testResults: TestResult[],\n): GitHub.Annotation[] => {\n  const cwd = process.cwd();\n\n  return testResults.flatMap((testResult) => {\n    if (testResult.testExecError) {\n      return {\n        annotation_level: 'failure',\n        path: path.relative(cwd, testResult.testFilePath),\n        start_line: 1,\n        end_line: 1,\n        message: stripAnsi(\n          testResult.failureMessage\n            ? dedent(testResult.failureMessage)\n            : testResult.testExecError.message,\n        ),\n        title: 'Jest',\n      };\n    }\n\n    if (testResult.numFailingTests > 0) {\n      return testResult.testResults.flatMap((assertionResult) =>\n        assertionResult.failureMessages.flatMap((failureMessage) => {\n          const match = JEST_LOCATION_REGEX.exec(failureMessage);\n          if (match?.length === 5 && match[2]) {\n            return {\n              annotation_level: 'failure',\n              path: path.relative(cwd, match[2]),\n              start_line: Number(match[3]),\n              end_line: Number(match[3]),\n              start_column: Number(match[4]),\n              end_column: Number(match[4]),\n              message: stripAnsi(failureMessage),\n              title: 'Jest',\n            };\n          }\n\n          return [];\n        }),\n      );\n    }\n\n    return [];\n  });\n};\n\nconst DEFAULT_DISPLAY_NAME = Symbol('DEFAULT_DISPLAY_NAME');\n\ninterface AnnotationEntry {\n  annotations: GitHub.Annotation[];\n  displayName: string | undefined;\n}\n\nexport const generateAnnotationEntries = (\n  testResults: TestResult[],\n): AnnotationEntry[] => {\n  type ResultsByDisplayName = Record<string | symbol, TestResult[]>;\n\n  // Group test results by display name.\n  const resultsByDisplayName = testResults.reduce<ResultsByDisplayName>(\n    (acc, result) => {\n      const displayName = result.displayName?.name ?? DEFAULT_DISPLAY_NAME;\n\n      (acc[displayName] ??= []).push(result);\n\n      return acc;\n    },\n    {},\n  );\n\n  const defaultResults = resultsByDisplayName[DEFAULT_DISPLAY_NAME];\n\n  const entries = [\n    ...(defaultResults?.length ? ([[undefined, defaultResults]] as const) : []),\n    ...Object.entries(resultsByDisplayName),\n  ];\n\n  // Create annotations for each display name.\n  return entries.map<AnnotationEntry>(([displayName, results]) => ({\n    annotations: createAnnotations(results),\n    displayName,\n  }));\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAsD;AAGtD,uBAAmB;AAqCnB,MAAM,sBAAsB;AAErB,MAAM,oBAAoB,CAC/B,gBACwB;AACxB,QAAM,MAAM,QAAQ,IAAI;AAExB,SAAO,YAAY,QAAQ,CAAC,eAAe;AACzC,QAAI,WAAW,eAAe;AAC5B,aAAO;AAAA,QACL,kBAAkB;AAAA,QAClB,MAAM,YAAAA,QAAK,SAAS,KAAK,WAAW,YAAY;AAAA,QAChD,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,aAAS,YAAAC;AAAA,UACP,WAAW,qBACP,iBAAAC,SAAO,WAAW,cAAc,IAChC,WAAW,cAAc;AAAA,QAC/B;AAAA,QACA,OAAO;AAAA,MACT;AAAA,IACF;AAEA,QAAI,WAAW,kBAAkB,GAAG;AAClC,aAAO,WAAW,YAAY;AAAA,QAAQ,CAAC,oBACrC,gBAAgB,gBAAgB,QAAQ,CAAC,mBAAmB;AAC1D,gBAAM,QAAQ,oBAAoB,KAAK,cAAc;AACrD,cAAI,OAAO,WAAW,KAAK,MAAM,CAAC,GAAG;AACnC,mBAAO;AAAA,cACL,kBAAkB;AAAA,cAClB,MAAM,YAAAF,QAAK,SAAS,KAAK,MAAM,CAAC,CAAC;AAAA,cACjC,YAAY,OAAO,MAAM,CAAC,CAAC;AAAA,cAC3B,UAAU,OAAO,MAAM,CAAC,CAAC;AAAA,cACzB,cAAc,OAAO,MAAM,CAAC,CAAC;AAAA,cAC7B,YAAY,OAAO,MAAM,CAAC,CAAC;AAAA,cAC3B,aAAS,YAAAC,0BAAU,cAAc;AAAA,cACjC,OAAO;AAAA,YACT;AAAA,UACF;AAEA,iBAAO,CAAC;AAAA,QACV,CAAC;AAAA,MACH;AAAA,IACF;AAEA,WAAO,CAAC;AAAA,EACV,CAAC;AACH;AAEA,MAAM,uBAAuB,OAAO,sBAAsB;AAOnD,MAAM,4BAA4B,CACvC,gBACsB;AAItB,QAAM,uBAAuB,YAAY;AAAA,IACvC,CAAC,KAAK,WAAW;AACf,YAAM,cAAc,OAAO,aAAa,QAAQ;AAEhD,OAAC,IAAI,WAAW,MAAM,CAAC,GAAG,KAAK,MAAM;AAErC,aAAO;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EACH;AAEA,QAAM,iBAAiB,qBAAqB,oBAAoB;AAEhE,QAAM,UAAU;AAAA,IACd,GAAI,gBAAgB,SAAU,CAAC,CAAC,QAAW,cAAc,CAAC,IAAc,CAAC;AAAA,IACzE,GAAG,OAAO,QAAQ,oBAAoB;AAAA,EACxC;AAGA,SAAO,QAAQ,IAAqB,CAAC,CAAC,aAAa,OAAO,OAAO;AAAA,IAC/D,aAAa,kBAAkB,OAAO;AAAA,IACtC;AAAA,EACF,EAAE;AACJ;",
   "names": ["path", "stripAnsi", "dedent"]
 }

package/lib/cli/test/reporters/github/index.js

@@ -32,20 +32,19 @@ __export(github_exports, {
 });
 module.exports = __toCommonJS(github_exports);
 var import_util = require("util");
-var import_environment = require("../../../../api/github/environment.js");
-var GitHub = __toESM(require("../../../../api/github/index.js"));
 var import_logging = require("../../../../utils/logging.js");
 var import_wait = require("../../../../utils/wait.js");
 var import_annotations = require("./annotations.js");
+var GitHub = __toESM(require("@skuba-lib/api/github"));
 class GitHubReporter {
   async onRunComplete(_contexts, { testResults }) {
-    if (!(0, import_environment.enabledFromEnvironment)()) {
+    if (!GitHub.enabledFromEnvironment()) {
       return;
     }
     let lastCheckRun;
     try {
       const entries = (0, import_annotations.generateAnnotationEntries)(testResults);
-      const build = (0, import_environment.buildNameFromEnvironment)();
+      const build = GitHub.buildNameFromEnvironment();
       for (const { displayName, annotations } of entries) {
         const name = `skuba/test${displayName ? ` (${displayName})` : ""}`;
         const isOk = !annotations.length;

package/lib/cli/test/reporters/github/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/test/reporters/github/index.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport type { Reporter, TestContext } from '@jest/reporters';\nimport type { AggregatedResult } from '@jest/test-result';\n\nimport {\n  buildNameFromEnvironment,\n  enabledFromEnvironment,\n} from '../../../../api/github/environment.js';\nimport * as GitHub from '../../../../api/github/index.js';\nimport { log } from '../../../../utils/logging.js';\nimport { throwOnTimeout } from '../../../../utils/wait.js';\n\nimport { generateAnnotationEntries } from './annotations.js';\n\nexport default class GitHubReporter implements Pick<Reporter, 'onRunComplete'> {\n  async onRunComplete(\n    _contexts: Set<TestContext>,\n    { testResults }: AggregatedResult,\n  ): Promise<void> {\n    if (!enabledFromEnvironment()) {\n      return;\n    }\n\n    type CheckRun = Parameters<typeof GitHub.createCheckRun>[0];\n\n    let lastCheckRun: CheckRun | undefined;\n\n    try {\n      const entries = generateAnnotationEntries(testResults);\n\n      const build = buildNameFromEnvironment();\n\n      // Create a check run per display name.\n      // Run in series to reduce the likelihood of exceeding GitHub rate limits.\n      for (const { displayName, annotations } of entries) {\n        const name = `skuba/test${displayName ? ` (${displayName})` : ''}`;\n\n        const isOk = !annotations.length;\n\n        const summary = isOk\n          ? '`skuba test` passed.'\n          : '`skuba test` found issues that require triage.';\n\n        const checkRun: CheckRun = {\n          name,\n          annotations,\n          conclusion: isOk ? 'success' : 'failure',\n          summary,\n          title: `${build} ${isOk ? 'passed' : 'failed'}`,\n        };\n\n        lastCheckRun = checkRun;\n\n        await throwOnTimeout(GitHub.createCheckRun(checkRun), {\n          s: 30,\n        });\n      }\n    } catch (err) {\n      log.warn('Failed to report test results to GitHub.');\n      log.subtle(inspect(err));\n\n      if (lastCheckRun) {\n        log.subtle('Last request:');\n        log.subtle(JSON.stringify(lastCheckRun));\n      }\n    }\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAKxB,yBAGO;AACP,aAAwB;AACxB,qBAAoB;AACpB,kBAA+B;AAE/B,yBAA0C;AAE1C,MAAO,eAAwE;AAAA,EAC7E,MAAM,cACJ,WACA,EAAE,YAAY,GACC;AACf,QAAI,KAAC,2CAAuB,GAAG;AAC7B;AAAA,IACF;AAIA,QAAI;AAEJ,QAAI;AACF,YAAM,cAAU,8CAA0B,WAAW;AAErD,YAAM,YAAQ,6CAAyB;AAIvC,iBAAW,EAAE,aAAa,YAAY,KAAK,SAAS;AAClD,cAAM,OAAO,aAAa,cAAc,KAAK,WAAW,MAAM,EAAE;AAEhE,cAAM,OAAO,CAAC,YAAY;AAE1B,cAAM,UAAU,OACZ,yBACA;AAEJ,cAAM,WAAqB;AAAA,UACzB;AAAA,UACA;AAAA,UACA,YAAY,OAAO,YAAY;AAAA,UAC/B;AAAA,UACA,OAAO,GAAG,KAAK,IAAI,OAAO,WAAW,QAAQ;AAAA,QAC/C;AAEA,uBAAe;AAEf,kBAAM,4BAAe,OAAO,eAAe,QAAQ,GAAG;AAAA,UACpD,GAAG;AAAA,QACL,CAAC;AAAA,MACH;AAAA,IACF,SAAS,KAAK;AACZ,yBAAI,KAAK,0CAA0C;AACnD,yBAAI,WAAO,qBAAQ,GAAG,CAAC;AAEvB,UAAI,cAAc;AAChB,2BAAI,OAAO,eAAe;AAC1B,2BAAI,OAAO,KAAK,UAAU,YAAY,CAAC;AAAA,MACzC;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport type { Reporter, TestContext } from '@jest/reporters';\nimport type { AggregatedResult } from '@jest/test-result';\n\nimport { log } from '../../../../utils/logging.js';\nimport { throwOnTimeout } from '../../../../utils/wait.js';\n\nimport { generateAnnotationEntries } from './annotations.js';\n\nimport * as GitHub from '@skuba-lib/api/github';\n\nexport default class GitHubReporter implements Pick<Reporter, 'onRunComplete'> {\n  async onRunComplete(\n    _contexts: Set<TestContext>,\n    { testResults }: AggregatedResult,\n  ): Promise<void> {\n    if (!GitHub.enabledFromEnvironment()) {\n      return;\n    }\n\n    type CheckRun = Parameters<typeof GitHub.createCheckRun>[0];\n\n    let lastCheckRun: CheckRun | undefined;\n\n    try {\n      const entries = generateAnnotationEntries(testResults);\n\n      const build = GitHub.buildNameFromEnvironment();\n\n      // Create a check run per display name.\n      // Run in series to reduce the likelihood of exceeding GitHub rate limits.\n      for (const { displayName, annotations } of entries) {\n        const name = `skuba/test${displayName ? ` (${displayName})` : ''}`;\n\n        const isOk = !annotations.length;\n\n        const summary = isOk\n          ? '`skuba test` passed.'\n          : '`skuba test` found issues that require triage.';\n\n        const checkRun: CheckRun = {\n          name,\n          annotations,\n          conclusion: isOk ? 'success' : 'failure',\n          summary,\n          title: `${build} ${isOk ? 'passed' : 'failed'}`,\n        };\n\n        lastCheckRun = checkRun;\n\n        await throwOnTimeout(GitHub.createCheckRun(checkRun), {\n          s: 30,\n        });\n      }\n    } catch (err) {\n      log.warn('Failed to report test results to GitHub.');\n      log.subtle(inspect(err));\n\n      if (lastCheckRun) {\n        log.subtle('Last request:');\n        log.subtle(JSON.stringify(lastCheckRun));\n      }\n    }\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAKxB,qBAAoB;AACpB,kBAA+B;AAE/B,yBAA0C;AAE1C,aAAwB;AAExB,MAAO,eAAwE;AAAA,EAC7E,MAAM,cACJ,WACA,EAAE,YAAY,GACC;AACf,QAAI,CAAC,OAAO,uBAAuB,GAAG;AACpC;AAAA,IACF;AAIA,QAAI;AAEJ,QAAI;AACF,YAAM,cAAU,8CAA0B,WAAW;AAErD,YAAM,QAAQ,OAAO,yBAAyB;AAI9C,iBAAW,EAAE,aAAa,YAAY,KAAK,SAAS;AAClD,cAAM,OAAO,aAAa,cAAc,KAAK,WAAW,MAAM,EAAE;AAEhE,cAAM,OAAO,CAAC,YAAY;AAE1B,cAAM,UAAU,OACZ,yBACA;AAEJ,cAAM,WAAqB;AAAA,UACzB;AAAA,UACA;AAAA,UACA,YAAY,OAAO,YAAY;AAAA,UAC/B;AAAA,UACA,OAAO,GAAG,KAAK,IAAI,OAAO,WAAW,QAAQ;AAAA,QAC/C;AAEA,uBAAe;AAEf,kBAAM,4BAAe,OAAO,eAAe,QAAQ,GAAG;AAAA,UACpD,GAAG;AAAA,QACL,CAAC;AAAA,MACH;AAAA,IACF,SAAS,KAAK;AACZ,yBAAI,KAAK,0CAA0C;AACnD,yBAAI,WAAO,qBAAQ,GAAG,CAAC;AAEvB,UAAI,cAAc;AAChB,2BAAI,OAAO,eAAe;AAC1B,2BAAI,OAAO,KAAK,UAAU,YAAY,CAAC;AAAA,MACzC;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/lib/index.d.ts

@@ -9,11 +9,11 @@
  * const { Net } = require('skuba');
  * ```
  */
-export * as Buildkite from './api/buildkite/index.js';
-export * as Git from './api/git/index.js';
-export * as GitHub from './api/github/index.js';
+export * as Buildkite from '@skuba-lib/api/buildkite';
+export * as Git from '@skuba-lib/api/git';
+export * as GitHub from '@skuba-lib/api/github';
+export * as Net from '@skuba-lib/api/net';
 export * as Jest from './api/jest/index.js';
-export * as Net from './api/net/index.js';
 declare global {
     namespace WebAssembly {
         interface Module {

package/lib/index.js

@@ -35,11 +35,11 @@ __export(index_exports, {
   Net: () => Net
 });
 module.exports = __toCommonJS(index_exports);
-var Buildkite = __toESM(require("./api/buildkite/index.js"));
-var Git = __toESM(require("./api/git/index.js"));
-var GitHub = __toESM(require("./api/github/index.js"));
+var Buildkite = __toESM(require("@skuba-lib/api/buildkite"));
+var Git = __toESM(require("@skuba-lib/api/git"));
+var GitHub = __toESM(require("@skuba-lib/api/github"));
+var Net = __toESM(require("@skuba-lib/api/net"));
 var Jest = __toESM(require("./api/jest/index.js"));
-var Net = __toESM(require("./api/net/index.js"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Buildkite,

package/lib/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts"],
-  "sourcesContent": ["/**\n * Entry point for the Node.js development API.\n *\n * This is where skuba imports point to:\n *\n * ```typescript\n * import { Net } from 'skuba';\n *\n * const { Net } = require('skuba');\n * ```\n */\n\nexport * as Buildkite from './api/buildkite/index.js';\nexport * as Git from './api/git/index.js';\nexport * as GitHub from './api/github/index.js';\nexport * as Jest from './api/jest/index.js';\nexport * as Net from './api/net/index.js';\n\n// evanw/esbuild#2388\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace WebAssembly {\n    // eslint-disable-next-line @typescript-eslint/no-empty-object-type\n    interface Module {}\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAYA,gBAA2B;AAC3B,UAAqB;AACrB,aAAwB;AACxB,WAAsB;AACtB,UAAqB;",
+  "sourcesContent": ["/**\n * Entry point for the Node.js development API.\n *\n * This is where skuba imports point to:\n *\n * ```typescript\n * import { Net } from 'skuba';\n *\n * const { Net } = require('skuba');\n * ```\n */\n\nexport * as Buildkite from '@skuba-lib/api/buildkite';\nexport * as Git from '@skuba-lib/api/git';\nexport * as GitHub from '@skuba-lib/api/github';\nexport * as Net from '@skuba-lib/api/net';\nexport * as Jest from './api/jest/index.js';\n\n// evanw/esbuild#2388\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace WebAssembly {\n    // eslint-disable-next-line @typescript-eslint/no-empty-object-type\n    interface Module {}\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAYA,gBAA2B;AAC3B,UAAqB;AACrB,aAAwB;AACxB,UAAqB;AACrB,WAAsB;",
   "names": []
 }

package/lib/utils/dir.js

@@ -41,8 +41,8 @@ var import_path = __toESM(require("path"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_ignore = __toESM(require("ignore"));
 var import_picomatch = __toESM(require("picomatch"));
-var import_findRoot = require("../api/git/findRoot.js");
 var import_error = require("./error.js");
+var Git = __toESM(require("@skuba-lib/api/git"));
 const buildPatternToFilepathMap = (patterns, allFilepaths, options) => Object.fromEntries(
   patterns.map((pattern) => {
     const isMatch = (0, import_picomatch.default)(pattern, options);
@@ -135,7 +135,7 @@ const findWorkspaceRoot = async (cwd = process.cwd()) => {
       locateNearestFile({ cwd, filename: "pnpm-lock.yaml" }),
       locateNearestFile({ cwd, filename: "yarn.lock" }),
       locateFurthestFile({ cwd, filename: "package.json" }),
-      (0, import_findRoot.findRoot)({ dir: cwd })
+      Git.findRoot({ dir: cwd })
     ]);
     const candidates = [
       pnpmLock ? import_path.default.dirname(pnpmLock) : null,

package/lib/utils/dir.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/dir.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { findRoot as findGitRoot } from '../api/git/findRoot.js';\n\nimport { isErrorWithCode } from './error.js';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n  options?: picomatch.PicomatchOptions,\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern, options);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilenames = ['.gitignore'],\n) => {\n  const ignoreFileFilter = await createInclusionFilter(\n    ignoreFilenames.map((ignoreFilename) => path.join(root, ignoreFilename)),\n  );\n\n  const absoluteFilenames = await crawl(root, {\n    includeDirName: (dirname) => !['.git', 'node_modules'].includes(dirname),\n    includeFilePath: (pathname) =>\n      ignoreFileFilter(path.relative(root, pathname)),\n  });\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n\n/**\n * Recursively crawl a directory and return all file paths that match the\n * filters. `paths` is mutated and returned.\n */\nasync function crawl(\n  directoryPath: string,\n  filters: {\n    includeDirName: (dirName: string) => boolean;\n    includeFilePath: (path: string) => boolean;\n  },\n  paths: string[] = [],\n) {\n  try {\n    const entries = await fs.promises.readdir(directoryPath, {\n      withFileTypes: true,\n    });\n\n    await Promise.all(\n      entries.map(async (entry) => {\n        const fullPath = path.join(directoryPath, entry.name);\n\n        if (\n          (entry.isFile() || entry.isSymbolicLink()) &&\n          filters.includeFilePath(fullPath)\n        ) {\n          paths.push(fullPath);\n        }\n\n        if (entry.isDirectory() && filters.includeDirName(entry.name)) {\n          await crawl(fullPath, filters, paths);\n        }\n      }),\n    );\n  } catch {\n    // Ignore errors, because of e.g. permission issues reading directories\n  }\n\n  return paths;\n}\n\nexport const locateNearestFile = async ({\n  cwd,\n  filename,\n}: {\n  cwd: string;\n  filename: string;\n}) => {\n  let currentDir = cwd;\n  while (currentDir !== path.dirname(currentDir)) {\n    const filePath = path.join(currentDir, filename);\n    if (await fs.pathExists(filePath)) {\n      return filePath;\n    }\n    currentDir = path.dirname(currentDir);\n  }\n\n  return null;\n};\n\nexport const locateFurthestFile = async ({\n  cwd,\n  filename,\n}: {\n  cwd: string;\n  filename: string;\n}) => {\n  let currentDir = cwd;\n  let furthestFilePath: string | null = null;\n\n  while (currentDir !== path.dirname(currentDir)) {\n    const filePath = path.join(currentDir, filename);\n    if (await fs.pathExists(filePath)) {\n      furthestFilePath = filePath;\n    }\n    currentDir = path.dirname(currentDir);\n  }\n\n  return furthestFilePath;\n};\n\nconst workspaceRootCache: Record<string, string | null> = {};\n\nexport const findWorkspaceRoot = async (\n  cwd = process.cwd(),\n): Promise<string | null> => {\n  const find = async (): Promise<string | null> => {\n    const [pnpmLock, yarnLock, packageJson, gitRoot] = await Promise.all([\n      locateNearestFile({ cwd, filename: 'pnpm-lock.yaml' }),\n      locateNearestFile({ cwd, filename: 'yarn.lock' }),\n      locateFurthestFile({ cwd, filename: 'package.json' }),\n      findGitRoot({ dir: cwd }),\n    ]);\n\n    const candidates = [\n      pnpmLock ? path.dirname(pnpmLock) : null,\n      yarnLock ? path.dirname(yarnLock) : null,\n      packageJson ? path.dirname(packageJson) : null,\n      gitRoot,\n    ].filter((dir): dir is string => dir !== null);\n\n    if (candidates[0]) {\n      // Pick the longest path. This will be the most specific, which helps guard against someone\n      // having an accidental lockfile in a parent directory by mistake.\n\n      return candidates.reduce((longest, current) => {\n        if (current.split(path.sep).length > longest.split(path.sep).length) {\n          return current;\n        }\n        return longest;\n      }, candidates[0]);\n    }\n\n    return null;\n  };\n\n  return (workspaceRootCache[cwd] ??= await find());\n};\n\nexport const findCurrentWorkspaceProjectRoot = async (\n  cwd = process.cwd(),\n): Promise<string | null> => {\n  const packageJson = await locateNearestFile({\n    cwd,\n    filename: 'package.json',\n  });\n  return packageJson ? path.dirname(packageJson) : null;\n};\n"],
-  "mappings": "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",
-  "names": ["picomatch", "path", "fs", "ignore", "findGitRoot"]
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport ignore from 'ignore';\nimport picomatch from 'picomatch';\n\nimport { isErrorWithCode } from './error.js';\n\nimport * as Git from '@skuba-lib/api/git';\n\n/**\n * Build a map that associates each glob pattern with its matching filepaths.\n */\nexport const buildPatternToFilepathMap = (\n  patterns: string[],\n  allFilepaths: string[],\n  options?: picomatch.PicomatchOptions,\n) =>\n  Object.fromEntries(\n    patterns.map((pattern) => {\n      const isMatch = picomatch(pattern, options);\n\n      const filepaths = allFilepaths.filter((filepath) => isMatch(filepath));\n\n      return [pattern, filepaths] as const;\n    }),\n  );\n\n/**\n * List relative filepaths contained within a directory root.\n *\n * This excludes:\n *\n * - Patterns in the ignore files specified in `ignoreFilenames`\n * - `.git` subdirectories\n * - `node_modules` subdirectories\n */\nexport const crawlDirectory = async (\n  root: string,\n  ignoreFilenames = ['.gitignore'],\n) => {\n  const ignoreFileFilter = await createInclusionFilter(\n    ignoreFilenames.map((ignoreFilename) => path.join(root, ignoreFilename)),\n  );\n\n  const absoluteFilenames = await crawl(root, {\n    includeDirName: (dirname) => !['.git', 'node_modules'].includes(dirname),\n    includeFilePath: (pathname) =>\n      ignoreFileFilter(path.relative(root, pathname)),\n  });\n\n  const relativeFilepaths = absoluteFilenames.map((filepath) =>\n    path.relative(root, filepath),\n  );\n\n  return relativeFilepaths;\n};\n\n/**\n * Create a filter function that excludes filepaths based on ignore files like\n * `.gitignore` and `.prettierignore`.\n */\nexport const createInclusionFilter = async (ignoreFilepaths: string[]) => {\n  const ignoreFiles = await Promise.all(\n    ignoreFilepaths.map(async (ignoreFilepath) => {\n      try {\n        return await fs.promises.readFile(ignoreFilepath, 'utf8');\n      } catch (err) {\n        if (isErrorWithCode(err, 'ENOENT')) {\n          return;\n        }\n\n        throw err;\n      }\n    }),\n  );\n\n  const managers = ignoreFiles\n    .filter((value): value is string => typeof value === 'string')\n    .map((value) => ignore().add(value));\n\n  return ignore().add('.git').add(managers).createFilter();\n};\n\n/**\n * Recursively crawl a directory and return all file paths that match the\n * filters. `paths` is mutated and returned.\n */\nasync function crawl(\n  directoryPath: string,\n  filters: {\n    includeDirName: (dirName: string) => boolean;\n    includeFilePath: (path: string) => boolean;\n  },\n  paths: string[] = [],\n) {\n  try {\n    const entries = await fs.promises.readdir(directoryPath, {\n      withFileTypes: true,\n    });\n\n    await Promise.all(\n      entries.map(async (entry) => {\n        const fullPath = path.join(directoryPath, entry.name);\n\n        if (\n          (entry.isFile() || entry.isSymbolicLink()) &&\n          filters.includeFilePath(fullPath)\n        ) {\n          paths.push(fullPath);\n        }\n\n        if (entry.isDirectory() && filters.includeDirName(entry.name)) {\n          await crawl(fullPath, filters, paths);\n        }\n      }),\n    );\n  } catch {\n    // Ignore errors, because of e.g. permission issues reading directories\n  }\n\n  return paths;\n}\n\nexport const locateNearestFile = async ({\n  cwd,\n  filename,\n}: {\n  cwd: string;\n  filename: string;\n}) => {\n  let currentDir = cwd;\n  while (currentDir !== path.dirname(currentDir)) {\n    const filePath = path.join(currentDir, filename);\n    if (await fs.pathExists(filePath)) {\n      return filePath;\n    }\n    currentDir = path.dirname(currentDir);\n  }\n\n  return null;\n};\n\nexport const locateFurthestFile = async ({\n  cwd,\n  filename,\n}: {\n  cwd: string;\n  filename: string;\n}) => {\n  let currentDir = cwd;\n  let furthestFilePath: string | null = null;\n\n  while (currentDir !== path.dirname(currentDir)) {\n    const filePath = path.join(currentDir, filename);\n    if (await fs.pathExists(filePath)) {\n      furthestFilePath = filePath;\n    }\n    currentDir = path.dirname(currentDir);\n  }\n\n  return furthestFilePath;\n};\n\nconst workspaceRootCache: Record<string, string | null> = {};\n\nexport const findWorkspaceRoot = async (\n  cwd = process.cwd(),\n): Promise<string | null> => {\n  const find = async (): Promise<string | null> => {\n    const [pnpmLock, yarnLock, packageJson, gitRoot] = await Promise.all([\n      locateNearestFile({ cwd, filename: 'pnpm-lock.yaml' }),\n      locateNearestFile({ cwd, filename: 'yarn.lock' }),\n      locateFurthestFile({ cwd, filename: 'package.json' }),\n      Git.findRoot({ dir: cwd }),\n    ]);\n\n    const candidates = [\n      pnpmLock ? path.dirname(pnpmLock) : null,\n      yarnLock ? path.dirname(yarnLock) : null,\n      packageJson ? path.dirname(packageJson) : null,\n      gitRoot,\n    ].filter((dir): dir is string => dir !== null);\n\n    if (candidates[0]) {\n      // Pick the longest path. This will be the most specific, which helps guard against someone\n      // having an accidental lockfile in a parent directory by mistake.\n\n      return candidates.reduce((longest, current) => {\n        if (current.split(path.sep).length > longest.split(path.sep).length) {\n          return current;\n        }\n        return longest;\n      }, candidates[0]);\n    }\n\n    return null;\n  };\n\n  return (workspaceRootCache[cwd] ??= await find());\n};\n\nexport const findCurrentWorkspaceProjectRoot = async (\n  cwd = process.cwd(),\n): Promise<string | null> => {\n  const packageJson = await locateNearestFile({\n    cwd,\n    filename: 'package.json',\n  });\n  return packageJson ? path.dirname(packageJson) : null;\n};\n"],
+  "mappings": "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",
+  "names": ["picomatch", "path", "fs", "ignore"]
 }

package/lib/utils/manifest.d.ts

@@ -5,6 +5,10 @@ export declare const projectTypeSchema: z.ZodUnion<readonly [z.ZodLiteral<"appli
 export declare const PROJECT_TYPES: readonly ["application", "package"];
 export declare const getSkubaManifest: () => Promise<NormalizedPackageJson>;
 export declare const getConsumerManifest: (cwd?: string) => Promise<readPkgUp.ReadResult | undefined>;
-export declare const getPropFromConsumerManifest: <T extends string, V = unknown>(prop: T) => Promise<V | undefined>;
+export declare const getManifestProperties: <T extends string, V = unknown>(prop: T) => Promise<{
+    value: V | undefined;
+    type: string | undefined;
+    path: string;
+} | undefined>;
 export declare const getStringPropFromConsumerManifest: <T extends string>(prop: T) => Promise<string | undefined>;
 export declare const getEntryPointFromManifest: () => Promise<string>;

package/lib/utils/manifest.js

@@ -31,7 +31,7 @@ __export(manifest_exports, {
   PROJECT_TYPES: () => PROJECT_TYPES,
   getConsumerManifest: () => getConsumerManifest,
   getEntryPointFromManifest: () => getEntryPointFromManifest,
-  getPropFromConsumerManifest: () => getPropFromConsumerManifest,
+  getManifestProperties: () => getManifestProperties,
   getSkubaManifest: () => getSkubaManifest,
   getStringPropFromConsumerManifest: () => getStringPropFromConsumerManifest,
   projectTypeSchema: () => projectTypeSchema
@@ -58,13 +58,22 @@ const getSkubaManifest = async () => {
   return skubaManifest = result.packageJson;
 };
 const getConsumerManifest = (cwd) => (0, import_read_pkg_up.default)({ cwd, normalize: false });
-const getPropFromConsumerManifest = async (prop) => {
-  const result = await getConsumerManifest();
-  return result !== void 0 && (0, import_validation.hasProp)(result.packageJson.skuba, prop) ? result.packageJson.skuba[prop] : void 0;
+const getManifestProperties = async (prop) => {
+  const manifest = await getConsumerManifest();
+  if (!manifest) {
+    return void 0;
+  }
+  const value = (0, import_validation.hasProp)(manifest.packageJson.skuba, prop) ? manifest.packageJson.skuba[prop] : void 0;
+  const type = typeof manifest.packageJson.type === "string" ? manifest.packageJson.type : void 0;
+  return {
+    value,
+    type,
+    path: manifest.path
+  };
 };
 const getStringPropFromConsumerManifest = async (prop) => {
-  const result = await getPropFromConsumerManifest(prop);
-  return typeof result === "string" ? result : void 0;
+  const manifest = await getManifestProperties(prop);
+  return typeof manifest?.value === "string" ? manifest.value : void 0;
 };
 const getEntryPointFromManifest = async () => {
   const entryPoint = await getStringPropFromConsumerManifest("entryPoint");
@@ -75,7 +84,7 @@ const getEntryPointFromManifest = async () => {
   PROJECT_TYPES,
   getConsumerManifest,
   getEntryPointFromManifest,
-  getPropFromConsumerManifest,
+  getManifestProperties,
   getSkubaManifest,
   getStringPropFromConsumerManifest,
   projectTypeSchema