@procore/hammer-test-jest 0.3.0 → 0.4.0

package/dist/transforms/reactSvg.test.mjs

@@ -7863,7 +7863,14 @@ function clone(val, seen, options = defaultCloneOptions) {
       if (!descriptor)
         continue;
       const cloned = clone(val[k22], seen, options);
-      if ("get" in descriptor) {
+      if (options.forceWritable) {
+        Object.defineProperty(out, k22, {
+          enumerable: descriptor.enumerable,
+          configurable: true,
+          writable: true,
+          value: cloned
+        });
+      } else if ("get" in descriptor) {
         Object.defineProperty(out, k22, {
           ...descriptor,
           get() {
@@ -7873,7 +7880,6 @@ function clone(val, seen, options = defaultCloneOptions) {
       } else {
         Object.defineProperty(out, k22, {
           ...descriptor,
-          writable: options.forceWritable ? true : descriptor.writable,
           value: cloned
         });
       }
@@ -8035,7 +8041,7 @@ function objDisplay(obj, options = {}) {
   if (options.truncate && str.length >= options.truncate) {
     if (type2 === "[object Function]") {
       const fn2 = obj;
-      return !fn2.name || fn2.name === "" ? "[Function]" : `[Function: ${fn2.name}]`;
+      return !fn2.name ? "[Function]" : `[Function: ${fn2.name}]`;
     } else if (type2 === "[object Array]") {
       return `[ Array(${obj.length}) ]`;
     } else if (type2 === "[object Object]") {
@@ -8475,6 +8481,7 @@ function joinAlignedDiffsExpand(diffs, options) {
 }
 var noColor = (string3) => string3;
 var DIFF_CONTEXT_DEFAULT = 5;
+var DIFF_TRUNCATE_THRESHOLD_DEFAULT = 0;
 function getDefaultOptions() {
   const c2 = getColors();
   return {
@@ -8495,7 +8502,10 @@ function getDefaultOptions() {
     expand: true,
     includeChangeCounts: false,
     omitAnnotationLines: false,
-    patchColor: c2.yellow
+    patchColor: c2.yellow,
+    truncateThreshold: DIFF_TRUNCATE_THRESHOLD_DEFAULT,
+    truncateAnnotation: "... Diff result is truncated",
+    truncateAnnotationColor: noColor
   };
 }
 function getCompareKeys(compareKeys) {
@@ -8563,16 +8573,21 @@ ${bColor(b2)}
 
 `;
 }
-function printDiffLines(diffs, options) {
-  return printAnnotation(options, countChanges(diffs)) + (options.expand ? joinAlignedDiffsExpand(diffs, options) : joinAlignedDiffsNoExpand(diffs, options));
+function printDiffLines(diffs, truncated, options) {
+  return printAnnotation(options, countChanges(diffs)) + (options.expand ? joinAlignedDiffsExpand(diffs, options) : joinAlignedDiffsNoExpand(diffs, options)) + (truncated ? options.truncateAnnotationColor(`
+${options.truncateAnnotation}`) : "");
 }
 function diffLinesUnified(aLines, bLines, options) {
+  const normalizedOptions = normalizeDiffOptions(options);
+  const [diffs, truncated] = diffLinesRaw(
+    isEmptyString(aLines) ? [] : aLines,
+    isEmptyString(bLines) ? [] : bLines,
+    normalizedOptions
+  );
   return printDiffLines(
-    diffLinesRaw(
-      isEmptyString(aLines) ? [] : aLines,
-      isEmptyString(bLines) ? [] : bLines
-    ),
-    normalizeDiffOptions(options)
+    diffs,
+    truncated,
+    normalizedOptions
   );
 }
 function diffLinesUnified2(aLinesDisplay, bLinesDisplay, aLinesCompare, bLinesCompare, options) {
@@ -8587,7 +8602,7 @@ function diffLinesUnified2(aLinesDisplay, bLinesDisplay, aLinesCompare, bLinesCo
   if (aLinesDisplay.length !== aLinesCompare.length || bLinesDisplay.length !== bLinesCompare.length) {
     return diffLinesUnified(aLinesDisplay, bLinesDisplay, options);
   }
-  const diffs = diffLinesRaw(aLinesCompare, bLinesCompare);
+  const [diffs, truncated] = diffLinesRaw(aLinesCompare, bLinesCompare, options);
   let aIndex = 0;
   let bIndex = 0;
   diffs.forEach((diff2) => {
@@ -8606,11 +8621,14 @@ function diffLinesUnified2(aLinesDisplay, bLinesDisplay, aLinesCompare, bLinesCo
         bIndex += 1;
     }
   });
-  return printDiffLines(diffs, normalizeDiffOptions(options));
-}
-function diffLinesRaw(aLines, bLines) {
-  const aLength = aLines.length;
-  const bLength = bLines.length;
+  return printDiffLines(diffs, truncated, normalizeDiffOptions(options));
+}
+function diffLinesRaw(aLines, bLines, options) {
+  const truncate2 = (options == null ? void 0 : options.truncateThreshold) ?? false;
+  const truncateThreshold = Math.max(Math.floor((options == null ? void 0 : options.truncateThreshold) ?? 0), 0);
+  const aLength = truncate2 ? Math.min(aLines.length, truncateThreshold) : aLines.length;
+  const bLength = truncate2 ? Math.min(bLines.length, truncateThreshold) : bLines.length;
+  const truncated = aLength !== aLines.length || bLength !== bLines.length;
   const isCommon = (aIndex2, bIndex2) => aLines[aIndex2] === bLines[bIndex2];
   const diffs = [];
   let aIndex = 0;
@@ -8629,7 +8647,7 @@ function diffLinesRaw(aLines, bLines) {
     diffs.push(new Diff(DIFF_DELETE, aLines[aIndex]));
   for (; bIndex !== bLength; bIndex += 1)
     diffs.push(new Diff(DIFF_INSERT, bLines[bIndex]));
-  return diffs;
+  return [diffs, truncated];
 }
 function getCommonMessage(message, options) {
   const { commonColor } = normalizeDiffOptions(options);
@@ -9819,10 +9837,10 @@ function createSuiteCollector(name, factory = () => {
     }
     if (runner.config.includeTaskLocation) {
       const limit = Error.stackTraceLimit;
-      Error.stackTraceLimit = 10;
+      Error.stackTraceLimit = 15;
       const error = new Error("stacktrace").stack;
       Error.stackTraceLimit = limit;
-      const stack = findStackTrace(error, task2.each ?? false);
+      const stack = findTestFileStackTrace(error, task2.each ?? false);
       if (stack)
         task2.location = stack;
     }
@@ -9875,18 +9893,12 @@ function createSuiteCollector(name, factory = () => {
     };
     if (runner && includeLocation && runner.config.includeTaskLocation) {
       const limit = Error.stackTraceLimit;
-      Error.stackTraceLimit = 5;
+      Error.stackTraceLimit = 15;
       const error = new Error("stacktrace").stack;
       Error.stackTraceLimit = limit;
-      const stack = parseSingleStack(error.split("\n")[5]);
-      if (stack) {
-        suite2.location = {
-          line: stack.line,
-          // because source map is boundary based, this line leads to ")" in test.each()[(]),
-          // but it should be the next opening bracket - here we assume it's on the same line
-          column: each ? stack.column + 1 : stack.column
-        };
-      }
+      const stack = findTestFileStackTrace(error, suite2.each ?? false);
+      if (stack)
+        suite2.location = stack;
     }
     setHooks(suite2, createSuiteHooks());
   }
@@ -10030,8 +10042,8 @@ function formatTemplateString(cases, args) {
   }
   return res;
 }
-function findStackTrace(error, each) {
-  const lines = error.split("\n").slice(4);
+function findTestFileStackTrace(error, each) {
+  const lines = error.split("\n").slice(1);
   for (const line of lines) {
     const stack = parseSingleStack(line);
     if (stack && stack.file === getTestFilepath()) {
@@ -10170,7 +10182,7 @@ function isFirstRun() {
   return firstRun;
 }
 
-// ../../node_modules/vitest/dist/vendor/vi.JYQecGiw.js
+// ../../node_modules/vitest/dist/vendor/vi.Y_w82WR8.js
 init_esm_shims();
 
 // ../../node_modules/chai/index.mjs
@@ -10698,7 +10710,7 @@ function iterableEquality(a, b2, customTesters = [], aStack = [], bStack = []) {
     return iterableEquality(
       a2,
       b22,
-      [...filteredCustomTesters],
+      [...customTesters],
       [...aStack],
       [...bStack]
     );
@@ -10776,7 +10788,7 @@ function subsetEquality(object2, subset, customTesters = []) {
     if (!isObjectWithKeys(subset2))
       return void 0;
     return Object.keys(subset2).every((key) => {
-      if (isObjectWithKeys(subset2[key])) {
+      if (typeof subset2[key] === "object") {
         if (seenReferences.has(subset2[key]))
           return equals(object22[key], subset2[key], filteredCustomTesters);
         seenReferences.set(subset2[key], true);
@@ -10840,6 +10852,57 @@ Received: serializes to the same string
 function pluralize(word, count) {
   return `${count} ${word}${count === 1 ? "" : "s"}`;
 }
+function getObjectKeys(object2) {
+  return [
+    ...Object.keys(object2),
+    ...Object.getOwnPropertySymbols(object2).filter(
+      (s) => {
+        var _a2;
+        return (_a2 = Object.getOwnPropertyDescriptor(object2, s)) == null ? void 0 : _a2.enumerable;
+      }
+    )
+  ];
+}
+function getObjectSubset(object2, subset, customTesters = []) {
+  let stripped = 0;
+  const getObjectSubsetWithContext = (seenReferences = /* @__PURE__ */ new WeakMap()) => (object22, subset2) => {
+    if (Array.isArray(object22)) {
+      if (Array.isArray(subset2) && subset2.length === object22.length) {
+        return subset2.map(
+          (sub, i2) => getObjectSubsetWithContext(seenReferences)(object22[i2], sub)
+        );
+      }
+    } else if (object22 instanceof Date) {
+      return object22;
+    } else if (isObject(object22) && isObject(subset2)) {
+      if (equals(object22, subset2, [
+        ...customTesters,
+        iterableEquality,
+        subsetEquality
+      ])) {
+        return subset2;
+      }
+      const trimmed = {};
+      seenReferences.set(object22, trimmed);
+      for (const key of getObjectKeys(object22)) {
+        if (hasPropertyInObject(subset2, key)) {
+          trimmed[key] = seenReferences.has(object22[key]) ? seenReferences.get(object22[key]) : getObjectSubsetWithContext(seenReferences)(object22[key], subset2[key]);
+        } else {
+          if (!seenReferences.has(object22[key])) {
+            stripped += 1;
+            if (isObject(object22[key]))
+              stripped += getObjectKeys(object22[key]).length;
+            getObjectSubsetWithContext(seenReferences)(object22[key], subset2[key]);
+          }
+        }
+      }
+      if (getObjectKeys(trimmed).length > 0)
+        return trimmed;
+    }
+    return object22;
+  };
+  return { subset: getObjectSubsetWithContext()(object2, subset), stripped };
+}
 var AsymmetricMatcher3 = class {
   constructor(sample, inverse = false) {
     this.sample = sample;
@@ -11267,16 +11330,30 @@ var JestChaiExpect = (chai3, utils) => {
   });
   def("toMatchObject", function(expected) {
     const actual = this._obj;
-    return this.assert(
-      equals(actual, expected, [...customTesters, iterableEquality, subsetEquality]),
-      "expected #{this} to match object #{exp}",
-      "expected #{this} to not match object #{exp}",
-      expected,
-      actual
-    );
+    const pass = equals(actual, expected, [...customTesters, iterableEquality, subsetEquality]);
+    const isNot = utils.flag(this, "negate");
+    const { subset: actualSubset, stripped } = getObjectSubset(actual, expected);
+    if (pass && isNot || !pass && !isNot) {
+      const msg = utils.getMessage(
+        this,
+        [
+          pass,
+          "expected #{this} to match object #{exp}",
+          "expected #{this} to not match object #{exp}",
+          expected,
+          actualSubset,
+          false
+        ]
+      );
+      const message = stripped === 0 ? msg : `${msg}
+(${stripped} matching ${stripped === 1 ? "property" : "properties"} omitted from actual)`;
+      throw new AssertionError2(message, { showDiff: true, expected, actual: actualSubset });
+    }
   });
   def("toMatch", function(expected) {
     const actual = this._obj;
+    if (typeof actual !== "string")
+      throw new TypeError(`.toMatch() expects to receive a string, but got ${typeof actual}`);
     return this.assert(
       typeof expected === "string" ? actual.includes(expected) : actual.match(expected),
       `expected #{this} to match #{exp}`,
@@ -11618,12 +11695,15 @@ Number of calls: ${c2().bold(spy.mock.calls.length)}
     const spy = getSpy(this);
     const spyName = spy.getMockName();
     const nthCall = spy.mock.calls[times - 1];
+    const callCount = spy.mock.calls.length;
+    const isCalled = times <= callCount;
     this.assert(
       equals(nthCall, args, [...customTesters, iterableEquality]),
-      `expected ${ordinalOf(times)} "${spyName}" call to have been called with #{exp}`,
+      `expected ${ordinalOf(times)} "${spyName}" call to have been called with #{exp}${isCalled ? `` : `, but called only ${callCount} times`}`,
       `expected ${ordinalOf(times)} "${spyName}" call to not have been called with #{exp}`,
       args,
-      nthCall
+      nthCall,
+      isCalled
     );
   });
   def(["toHaveBeenLastCalledWith", "lastCalledWith"], function(...args) {
@@ -13394,7 +13474,7 @@ function resetDate() {
   globalThis.Date = RealDate;
 }
 
-// ../../node_modules/vitest/dist/vendor/vi.JYQecGiw.js
+// ../../node_modules/vitest/dist/vendor/vi.Y_w82WR8.js
 function resetModules(modules, resetMocks = false) {
   const skipPaths = [
     // Vitest
@@ -15519,12 +15599,14 @@ function createVitest() {
   let _mockedDate = null;
   let _config = null;
   const workerState = getWorkerState();
-  const _timers = new FakeTimers({
+  let _timers;
+  const timers = () => _timers || (_timers = new FakeTimers({
     global: globalThis,
     config: workerState.config.fakeTimers
-  });
+  }));
   const _stubsGlobal = /* @__PURE__ */ new Map();
   const _stubsEnv = /* @__PURE__ */ new Map();
+  const _envBooleans = ["PROD", "DEV", "SSR"];
   const getImporter = () => {
     const stackTrace = createSimpleStackTrace({ stackTraceLimit: 4 });
     const importerStack = stackTrace.split("\n")[4];
@@ -15542,73 +15624,73 @@ function createVitest() {
         }
       }
       if (config2)
-        _timers.configure({ ...workerState.config.fakeTimers, ...config2 });
+        timers().configure({ ...workerState.config.fakeTimers, ...config2 });
       else
-        _timers.configure(workerState.config.fakeTimers);
-      _timers.useFakeTimers();
+        timers().configure(workerState.config.fakeTimers);
+      timers().useFakeTimers();
       return utils;
     },
     isFakeTimers() {
-      return _timers.isFakeTimers();
+      return timers().isFakeTimers();
     },
     useRealTimers() {
-      _timers.useRealTimers();
+      timers().useRealTimers();
       _mockedDate = null;
       return utils;
     },
     runOnlyPendingTimers() {
-      _timers.runOnlyPendingTimers();
+      timers().runOnlyPendingTimers();
       return utils;
     },
     async runOnlyPendingTimersAsync() {
-      await _timers.runOnlyPendingTimersAsync();
+      await timers().runOnlyPendingTimersAsync();
       return utils;
     },
     runAllTimers() {
-      _timers.runAllTimers();
+      timers().runAllTimers();
       return utils;
     },
     async runAllTimersAsync() {
-      await _timers.runAllTimersAsync();
+      await timers().runAllTimersAsync();
       return utils;
     },
     runAllTicks() {
-      _timers.runAllTicks();
+      timers().runAllTicks();
       return utils;
     },
     advanceTimersByTime(ms) {
-      _timers.advanceTimersByTime(ms);
+      timers().advanceTimersByTime(ms);
       return utils;
     },
     async advanceTimersByTimeAsync(ms) {
-      await _timers.advanceTimersByTimeAsync(ms);
+      await timers().advanceTimersByTimeAsync(ms);
       return utils;
     },
     advanceTimersToNextTimer() {
-      _timers.advanceTimersToNextTimer();
+      timers().advanceTimersToNextTimer();
       return utils;
     },
     async advanceTimersToNextTimerAsync() {
-      await _timers.advanceTimersToNextTimerAsync();
+      await timers().advanceTimersToNextTimerAsync();
       return utils;
     },
     getTimerCount() {
-      return _timers.getTimerCount();
+      return timers().getTimerCount();
     },
     setSystemTime(time) {
       const date = time instanceof Date ? time : new Date(time);
       _mockedDate = date;
-      _timers.setSystemTime(date);
+      timers().setSystemTime(date);
       return utils;
     },
     getMockedSystemTime() {
       return _mockedDate;
     },
     getRealSystemTime() {
-      return _timers.getRealSystemTime();
+      return timers().getRealSystemTime();
     },
     clearAllTimers() {
-      _timers.clearAllTimers();
+      timers().clearAllTimers();
       return utils;
     },
     // mocks
@@ -15687,7 +15769,10 @@ function createVitest() {
     stubEnv(name, value) {
       if (!_stubsEnv.has(name))
         _stubsEnv.set(name, process.env[name]);
-      process.env[name] = value;
+      if (_envBooleans.includes(name))
+        process.env[name] = value ? "1" : "";
+      else
+        process.env[name] = String(value);
       return utils;
     },
     unstubAllGlobals() {
@@ -15732,7 +15817,7 @@ function createVitest() {
 var vitest = createVitest();
 var vi = vitest;
 
-// ../../node_modules/vitest/dist/vendor/index.BeX1oZht.js
+// ../../node_modules/vitest/dist/vendor/index.0RrMQKD8.js
 init_esm_shims();
 function getRunningMode() {
   return process.env.VITEST_MODE === "WATCH" ? "watch" : "run";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@procore/hammer-test-jest",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Hammer test runner, jest",
   "author": "Procore Technologies, Inc",
   "homepage": "https://github.com/procore/hammer/packages/test-jest",
@@ -35,40 +35,39 @@
     "exec": "exec",
     "format": "prettier --ignore-unknown --write --cache .",
     "format:check": "prettier --ignore-unknown --check --cache .",
-    "lint": "eslint . --cache",
+    "lint:code": "eslint . --cache",
+    "lint:types": "tsc --noEmit",
     "prepack": "tsup",
     "test": "vitest run",
-    "test:ci": "vitest run --coverage"
+    "test:ci": "vitest run --coverage",
+    "test:watch": "vitest"
   },
   "dependencies": {
     "@babel/core": "^7.24.4",
     "@babel/preset-env": "^7.24.4",
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.24.1",
+    "@procore/hammer-types": "^0.3.0",
     "babel-jest": "^29.7.0",
-    "cli-highlight": "^2.1.11",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
-    "jest-watch-typeahead": "^2.2.2",
-    "picocolors": "^1.0.0"
+    "jest-watch-typeahead": "^2.2.2"
   },
   "devDependencies": {
     "@procore/prettier-config": "^1.0.0",
-    "@types/node": "^20.12.4",
-    "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@typescript-eslint/parser": "^7.5.0",
-    "@vitest/coverage-v8": "^1.4.0",
+    "@types/node": "^20.12.7",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
+    "@vitest/coverage-v8": "^1.5.1",
     "eslint": "^8.57.0",
     "eslint-define-config": "^2.1.0",
     "lint-staged": "^15.2.2",
+    "pathe": "^1.1.2",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "strip-ansi": "^7.1.0",
     "tsup": "^8.0.2",
-    "typescript": "^5.4.4",
-    "vitest": "^1.4.0",
-    "vitest-mock-process": "^1.0.4"
+    "typescript": "^5.4.5",
+    "vitest": "^1.5.1"
   }
 }