skuba 3.17.0-beta.0 → 3.17.0-beta.5

package/jest/moduleNameMapper.js

@@ -0,0 +1,74 @@
+const path = require('path');
+
+const { pathsToModuleNameMapper } = require('ts-jest/utils');
+const {
+  sys,
+  findConfigFile,
+  readConfigFile,
+  parseJsonConfigFileContent,
+} = require('typescript');
+
+/**
+ * Set a default `src` module alias for backward compatibility.
+ *
+ * TODO: drop this default in skuba v4.
+ */
+const DEFAULT_PATHS = { src: ['src'], 'src/*': ['src/*'] };
+
+/**
+ * @returns {unknown}
+ */
+const getConfigFromDisk = () => {
+  const filename =
+    findConfigFile('.', sys.fileExists.bind(this)) || 'tsconfig.json';
+
+  return readConfigFile(filename, sys.readFile.bind(this)).config;
+};
+
+module.exports.createModuleNameMapper = (getConfig = getConfigFromDisk) => {
+  try {
+    const json = getConfig();
+
+    const parsedConfig = parseJsonConfigFileContent(json, sys, '.');
+
+    const paths = Object.fromEntries(
+      Object.entries(parsedConfig.options.paths ?? DEFAULT_PATHS).flatMap(
+        ([key, values]) => [
+          [
+            key.replace(/\/$/, ''),
+            values.map((value) => value.replace(/\/$/, '')),
+          ],
+          ...(key.endsWith('/*')
+            ? [
+                [
+                  key.replace(/\/\*$/, ''),
+                  values.map((value) => value.replace(/\/\*$/, '')),
+                ],
+              ]
+            : [
+                [
+                  path.join(key, '*'),
+                  values.map((value) => path.join(value, '*')),
+                ],
+              ]),
+        ],
+      ),
+    );
+
+    const prefix = path.join('<rootDir>', parsedConfig.options.baseUrl || '.');
+
+    const moduleNameMapper = pathsToModuleNameMapper(paths, { prefix });
+
+    return Object.fromEntries(
+      Object.entries(moduleNameMapper).map(([key, values]) => [
+        key,
+        Array.isArray(values)
+          ? values.map((value) => path.normalize(value))
+          : path.normalize(values),
+      ]),
+    );
+  } catch {
+    // Bail out here to support zero-config mode.
+    return pathsToModuleNameMapper(DEFAULT_PATHS, { prefix: '<rootDir>' });
+  }
+};

package/jest/moduleNameMapper.test.ts

@@ -0,0 +1,75 @@
+import { createModuleNameMapper } from './moduleNameMapper';
+
+describe('moduleNameMapper', () => {
+  const act = (paths?: unknown, baseUrl?: string) =>
+    createModuleNameMapper(() => ({
+      compilerOptions: {
+        baseUrl,
+        paths,
+      },
+    }));
+
+  it('expands wildcard paths', () =>
+    expect(act({ 'src/*': ['src/*'], 'lib/wip/*': ['lib/wip/*'] }))
+      .toMatchInlineSnapshot(`
+      Object {
+        "^lib/wip$": "<rootDir>/lib/wip",
+        "^lib/wip/(.*)$": "<rootDir>/lib/wip/$1",
+        "^src$": "<rootDir>/src",
+        "^src/(.*)$": "<rootDir>/src/$1",
+      }
+    `));
+
+  it('expands non-wildcard paths', () =>
+    expect(act({ cli: ['cli'], 'src/': ['src/'] })).toMatchInlineSnapshot(`
+      Object {
+        "^cli$": "<rootDir>/cli",
+        "^cli/(.*)$": "<rootDir>/cli/$1",
+        "^src$": "<rootDir>/src",
+        "^src/(.*)$": "<rootDir>/src/$1",
+      }
+    `));
+
+  it('expands duplicate asymmetric paths', () =>
+    expect(
+      act({
+        jquery: ['node_modules/jquery/dist/jquery'],
+        'jquery/*': ['node_modules/jquery/dist/jquery/*'],
+      }),
+    ).toMatchInlineSnapshot(`
+      Object {
+        "^jquery$": "<rootDir>/node_modules/jquery/dist/jquery",
+        "^jquery/(.*)$": "<rootDir>/node_modules/jquery/dist/jquery/$1",
+      }
+    `));
+
+  it('respects a base URL', () =>
+    expect(act({ cli: ['../cli'], 'app/*': ['app/*'] }, 'src'))
+      .toMatchInlineSnapshot(`
+      Object {
+        "^app$": "<rootDir>/src/app",
+        "^app/(.*)$": "<rootDir>/src/app/$1",
+        "^cli$": "<rootDir>/cli",
+        "^cli/(.*)$": "<rootDir>/cli/$1",
+      }
+    `));
+
+  it('respects no paths', () =>
+    expect(act({})).toMatchInlineSnapshot(`Object {}`));
+
+  it('falls back on undefined paths', () =>
+    expect(act(undefined)).toMatchInlineSnapshot(`
+      Object {
+        "^src$": "<rootDir>/src",
+        "^src/(.*)$": "<rootDir>/src/$1",
+      }
+    `));
+
+  it('falls back on invalid config', () =>
+    expect(act('INVALID')).toMatchInlineSnapshot(`
+      Object {
+        "^src$": "<rootDir>/src",
+        "^src/(.*)$": "<rootDir>/src/$1",
+      }
+    `));
+});

package/jest/transform.js

@@ -0,0 +1,19 @@
+const { defaults } = require('ts-jest/presets');
+
+const TS_JEST_NAME = 'ts-jest';
+
+/**
+ * Resolved path of the `ts-jest` preset.
+ *
+ * This allows Jest to resolve the preset even if it is installed to a nested
+ * `./node_modules/skuba/node_modules/ts-jest` directory.
+ */
+const TS_JEST_PATH = require.resolve(TS_JEST_NAME);
+
+// Rewrite `ts-jest` transformations using our resolved `TS_JEST_PATH`.
+module.exports.transform = Object.fromEntries(
+  Object.entries(defaults.transform).map(([key, value]) => [
+    key,
+    value === TS_JEST_NAME ? TS_JEST_PATH : value,
+  ]),
+);

package/jest-preset.js

@@ -1,28 +1,14 @@
-const { defaults: tsJestDefaults } = require('ts-jest/presets');
+const { defaults } = require('ts-jest/presets');
 
-const TS_JEST_NAME = 'ts-jest';
-
-/**
- * Resolved path of the `ts-jest` preset.
- *
- * This allows Jest to resolve the preset even if it is installed to a nested
- * `./node_modules/skuba/node_modules/ts-jest` directory.
- */
-const TS_JEST_PATH = require.resolve(TS_JEST_NAME);
-
-// Rewrite `ts-jest` transformations using our resolved `TS_JEST_PATH`.
-const tsJestTransform = Object.fromEntries(
-  Object.entries(tsJestDefaults.transform).map(([key, value]) => [
-    key,
-    value === TS_JEST_NAME ? TS_JEST_PATH : value,
-  ]),
-);
+const { createModuleNameMapper } = require('./jest/moduleNameMapper');
+const { transform } = require('./jest/transform');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  ...tsJestDefaults,
+  ...defaults,
 
-  transform: tsJestTransform,
+  moduleNameMapper: createModuleNameMapper(),
+  transform,
 
   collectCoverageFrom: [
     '**/*.ts',
@@ -35,10 +21,6 @@ module.exports = {
     '!<rootDir>/jest.*.ts',
   ],
   coverageDirectory: 'coverage',
-  moduleNameMapper: {
-    '^src$': '<rootDir>/src',
-    '^src/(.+)$': '<rootDir>/src/$1',
-  },
   testEnvironment: 'node',
   testPathIgnorePatterns: [
     '/node_modules.*/',

package/lib/api/github/index.d.ts

@@ -1,3 +1,6 @@
 export type { Annotation } from './checkRun';
+export { buildNameFromEnvironment } from './environment';
 export { createCheckRun } from './checkRun';
-export { buildNameFromEnvironment, enabledFromEnvironment, } from './environment';
+export { enabledFromEnvironment } from './environment';
+export { getPullRequestNumber } from './pullRequest';
+export { putIssueComment } from './issueComment';

package/lib/api/github/index.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enabledFromEnvironment = exports.buildNameFromEnvironment = exports.createCheckRun = void 0;
-var checkRun_1 = require("./checkRun");
-Object.defineProperty(exports, "createCheckRun", { enumerable: true, get: function () { return checkRun_1.createCheckRun; } });
+exports.putIssueComment = exports.getPullRequestNumber = exports.enabledFromEnvironment = exports.createCheckRun = exports.buildNameFromEnvironment = void 0;
 var environment_1 = require("./environment");
 Object.defineProperty(exports, "buildNameFromEnvironment", { enumerable: true, get: function () { return environment_1.buildNameFromEnvironment; } });
-Object.defineProperty(exports, "enabledFromEnvironment", { enumerable: true, get: function () { return environment_1.enabledFromEnvironment; } });
+var checkRun_1 = require("./checkRun");
+Object.defineProperty(exports, "createCheckRun", { enumerable: true, get: function () { return checkRun_1.createCheckRun; } });
+var environment_2 = require("./environment");
+Object.defineProperty(exports, "enabledFromEnvironment", { enumerable: true, get: function () { return environment_2.enabledFromEnvironment; } });
+var pullRequest_1 = require("./pullRequest");
+Object.defineProperty(exports, "getPullRequestNumber", { enumerable: true, get: function () { return pullRequest_1.getPullRequestNumber; } });
+var issueComment_1 = require("./issueComment");
+Object.defineProperty(exports, "putIssueComment", { enumerable: true, get: function () { return issueComment_1.putIssueComment; } });
 //# sourceMappingURL=index.js.map

package/lib/api/github/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/github/index.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AACvB,6CAGuB;AAFrB,uHAAA,wBAAwB,OAAA;AACxB,qHAAA,sBAAsB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/github/index.ts"],"names":[],"mappings":";;;AACA,6CAAyD;AAAhD,uHAAA,wBAAwB,OAAA;AACjC,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AACvB,6CAAuD;AAA9C,qHAAA,sBAAsB,OAAA;AAC/B,6CAAqD;AAA5C,mHAAA,oBAAoB,OAAA;AAC7B,+CAAiD;AAAxC,+GAAA,eAAe,OAAA"}

package/package.json

@@ -7,11 +7,12 @@
   "engines": {
     "node": ">=12"
   },
-  "version": "3.17.0-beta.0",
+  "version": "3.17.0-beta.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
     "config/**/*",
+    "jest/**/*",
     "lib*/**/*.d.ts",
     "lib*/**/*.js",
     "lib*/**/*.js.map",