bupkis 0.18.0 → 0.18.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.18.2](https://github.com/boneskull/bupkis/compare/bupkis-v0.18.1...bupkis-v0.18.2) (2026-06-19)
+
+
+### Bug Fixes
+
+* **bupkis:** fix ArkType support ([79d3f00](https://github.com/boneskull/bupkis/commit/79d3f0058cc96eaff2e649b0b4220db5de830d98))
+
+## [0.18.1](https://github.com/boneskull/bupkis/compare/bupkis-v0.18.0...bupkis-v0.18.1) (2026-01-18)
+
+
+### Bug Fixes
+
+* **bupkis:** support expect.it() in error-satisfying assertions ([#342](https://github.com/boneskull/bupkis/issues/342)) ([11d485f](https://github.com/boneskull/bupkis/commit/11d485f7bdfef7c5c822ff91ae600cc304557607))
+
 ## [0.18.0](https://github.com/boneskull/bupkis/compare/bupkis-v0.17.0...bupkis-v0.18.0) (2026-01-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bupkis",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "type": "module",
   "description": "Uncommonly extensible assertions for the beautiful people",
   "repository": {
@@ -97,9 +97,6 @@
     "bench:value": "modestbench \"bench/value-to-schema.bench.js\"",
     "build": "zshy",
     "debug:assertion-ids": "tsx scripts/dump-assertion-ids.ts",
-    "docs:build": "typedoc --options ../../.config/typedoc.js --cleanOutputDir --treatWarningsAsErrors",
-    "docs:dev": "run-p \"docs:build -- --watch\" docs:serve",
-    "docs:serve": "serve ../../docs",
     "prepare": "zshy",
     "profile:analyze": "tsx scripts/analyze-profiles.ts",
     "profile:benchmarks": "tsx scripts/profile-benchmarks.ts",

package/src/assertion/assertion-types.ts

@@ -472,9 +472,7 @@ export type AssertionImplSync<Parts extends AssertionParts> =
  *
  * @group Assertion Creation
  */
-export type AssertionParseRequest = {
-  subject: unknown;
-} & (
+export type AssertionParseRequest = (
   | {
       asyncSchema: StandardSchemaV1 | z.ZodType;
       schema?: never;
@@ -483,7 +481,9 @@ export type AssertionParseRequest = {
       asyncSchema?: never;
       schema: StandardSchemaV1 | z.ZodType;
     }
-);
+) & {
+  subject: unknown;
+};
 
 /**
  * Union type representing the fundamental building blocks of an assertion.

package/src/assertion/impl/async-parametric.ts

@@ -16,7 +16,6 @@
 import { inspect } from 'node:util';
 import { type z } from 'zod';
 
-import { InvalidObjectSchemaError } from '../../error.js';
 import { isA, isNonNullObject, isString } from '../../guards.js';
 import {
   ConstructibleSchema,
@@ -287,22 +286,14 @@ export const functionRejectWithErrorSatisfyingAssertion = createAsyncAssertion(
       };
     }
 
-    let schema: undefined | z.ZodType;
-    // TODO: can valueToSchema handle the first two conditional branches?
+    let schema: z.ZodType;
     if (isString(param)) {
       schema = createErrorMessageSchema(param);
     } else if (isA(param, RegExp)) {
       schema = createErrorMessageRegexSchema(param);
-    } else if (isNonNullObject(param)) {
+    } else {
       schema = valueToSchema(param, valueToSchemaOptionsForSatisfies);
     }
-    /* c8 ignore next 5 */
-    if (!schema) {
-      throw new InvalidObjectSchemaError(
-        `Invalid parameter schema: ${inspect(param, { depth: 2 })}`,
-        { schema: param },
-      );
-    }
 
     return {
       schema,
@@ -350,22 +341,14 @@ export const promiseRejectWithErrorSatisfyingAssertion = createAsyncAssertion(
         message: `Expected Promise to reject, but it fulfilled with ${inspect(result)}`,
       };
     }
-    let schema: undefined | z.ZodType;
-    // TODO: can valueToSchema handle the first two conditional branches?
+    let schema: z.ZodType;
     if (isString(param)) {
       schema = createErrorMessageSchema(param);
     } else if (isA(param, RegExp)) {
       schema = createErrorMessageRegexSchema(param);
-    } else if (isNonNullObject(param)) {
+    } else {
       schema = valueToSchema(param, valueToSchemaOptionsForSatisfies);
     }
-    /* c8 ignore next 5 */
-    if (!schema) {
-      throw new InvalidObjectSchemaError(
-        `Invalid parameter schema: ${inspect(param, { depth: 2 })}`,
-        { schema: param },
-      );
-    }
 
     return {
       schema,

package/src/assertion/impl/sync-parametric.ts

@@ -16,7 +16,7 @@
 import { inspect } from 'node:util';
 import { z } from 'zod';
 
-import { BupkisError, InvalidObjectSchemaError } from '../../error.js';
+import { BupkisError } from '../../error.js';
 import { isA, isError, isNonNullObject, isString } from '../../guards.js';
 import {
   AnyObjectSchema,
@@ -125,7 +125,7 @@ export const typeOfAssertion = createAssertion(
     ),
   ],
   (_, type) => {
-    type = type.toLowerCase() as Lowercase<typeof type>;
+    type = type.toLowerCase();
     // these first three are names that are _not_ results of the `typeof` operator; i.e. `typeof x` will never return these strings
     switch (type) {
       case 'array':
@@ -752,14 +752,9 @@ export const functionThrowsSatisfyingAssertion = createAssertion(
         schema: createErrorMessageRegexSchema(param),
         subject: error,
       };
-    } else if (isNonNullObject(param)) {
+    } else {
       const schema = valueToSchema(param, valueToSchemaOptionsForSatisfies);
       return { schema, subject: error };
-    } else {
-      throw new InvalidObjectSchemaError(
-        `Invalid parameter schema: ${inspect(param, { depth: 2 })}`,
-        { schema: param },
-      );
     }
   },
 );
@@ -815,21 +810,14 @@ export const functionThrowsTypeSatisfyingAssertion = createAssertion(
           : `Expected function to throw an instance of ${ctor.name}, but it threw a non-object value: ${inspect(error)}`,
       };
     }
-    let schema: undefined | z.ZodType;
-    // TODO: can valueToSchema handle the first two conditional branches?
+    let schema: z.ZodType;
     if (isString(param)) {
       schema = createErrorMessageSchema(param);
     } else if (isA(param, RegExp)) {
       schema = createErrorMessageRegexSchema(param);
-    } else if (isNonNullObject(param)) {
+    } else {
       schema = valueToSchema(param, valueToSchemaOptionsForSatisfies);
     }
-    if (!schema) {
-      throw new InvalidObjectSchemaError(
-        `Invalid parameter schema: ${inspect(param)}`,
-        { schema: param },
-      );
-    }
 
     return {
       schema,

package/src/expect.ts

@@ -78,7 +78,6 @@ export function createExpectAsyncFunction<
   T extends AnyAsyncAssertions,
   U extends ExpectAsync<AnyAsyncAssertions>,
 >(assertions: T, expect: U): ExpectAsyncFunction<T & U['assertions']>;
-
 /**
  * Creates a new asynchronous expect function with the provided assertions.
  *
@@ -109,7 +108,6 @@ export function createExpectAsyncFunction<
 export function createExpectAsyncFunction<T extends AnyAsyncAssertions>(
   assertions: T,
 ): ExpectAsyncFunction<T>;
-
 /**
  * Implementation function that creates an asynchronous expect function with
  * optional parent inheritance.
@@ -356,7 +354,6 @@ export function createExpectSyncFunction<
   assertions: Assertions,
   expect: ParentExpect,
 ): ExpectFunction<Assertions & ParentExpect['assertions']>;
-
 /**
  * Creates a new synchronous expect function with the provided assertions.
  *
@@ -387,7 +384,6 @@ export function createExpectSyncFunction<
 export function createExpectSyncFunction<Assertions extends AnySyncAssertions>(
   assertions: Assertions,
 ): ExpectFunction<Assertions>;
-
 /**
  * Implementation function that creates a synchronous expect function with
  * optional parent inheritance.

package/src/guards.ts

@@ -45,7 +45,6 @@ export function isZodType<T extends keyof ZodTypeMap>(
   value: unknown,
   type: T,
 ): value is ZodTypeMap[T];
-
 /**
  * Returns `true` if the given value looks like a Zod v4 schema, determined by
  * the presence of an internal {@link z.core.$ZodTypeDef} field.
@@ -93,16 +92,22 @@ export function isZodType<T extends keyof ZodTypeMap>(
  * @see {@link https://standardschema.dev | Standard Schema Specification}
  */
 export const isStandardSchema = (value: unknown): value is StandardSchemaV1 => {
+  // Some Standard Schema compliant libraries (e.g. ArkType) implement schemas
+  // as callable objects (functions with properties), so we must accept both
+  // plain objects and functions here.
+  if (!isObject(value) && !isFunction(value)) {
+    return false;
+  }
+  const v = value as Record<string | symbol, unknown>;
+  const std = v['~standard'];
   return (
-    isObject(value) &&
-    '~standard' in value &&
-    isObject(value['~standard']) &&
-    'version' in value['~standard'] &&
-    value['~standard'].version === 1 &&
-    'vendor' in value['~standard'] &&
-    typeof value['~standard'].vendor === 'string' &&
-    'validate' in value['~standard'] &&
-    typeof value['~standard'].validate === 'function'
+    isObject(std) &&
+    'version' in std &&
+    std.version === 1 &&
+    'vendor' in std &&
+    typeof std.vendor === 'string' &&
+    'validate' in std &&
+    typeof std.validate === 'function'
   );
 };
 
@@ -117,16 +122,6 @@ export const isObject = (value: unknown): value is NonNullable<object> => {
   return typeof value === 'object' && value !== null && !isArray(value);
 };
 
-/**
- * Returns `true` if the given value is a {@link z.ZodPromise} schema.
- *
- * @function
- * @param value - Value to test
- * @returns `true` if the value is a `ZodPromise` schema; `false` otherwise
- */
-export const isZodPromise = (value: unknown): value is z.ZodPromise =>
-  isZodType(value, 'promise');
-
 /**
  * Checks if a value is "promise-like", meaning it is a "thenable" object.
  *
@@ -222,9 +217,7 @@ export const isNonNullObject = (value: unknown): value is object =>
  *   symbol), `false` otherwise
  */
 export const isWeakKey = (value: unknown): value is WeakKey =>
-  (typeof value === 'object' && value !== null) ||
-  typeof value === 'function' ||
-  typeof value === 'symbol';
+  isNonNullObject(value) || isFunction(value) || typeof value === 'symbol';
 
 /**
  * Type guard for a {@link PhraseLiteral}, which is just a string that does not
@@ -305,6 +298,8 @@ export const isA = <T extends Constructor>(
  * its subclasses. It's useful for error handling and type narrowing when
  * working with unknown values that might be errors.
  *
+ * Uses `Error.isError` if available.
+ *
  * @example
  *
  * ```typescript
@@ -322,7 +317,12 @@ export const isA = <T extends Constructor>(
  * @param value - Value to test
  * @returns `true` if the value is an Error instance, `false` otherwise
  */
-export const isError = (value: unknown): value is Error => isA(value, Error);
+export const isError =
+  'isError' in Error && isFunction(Error.isError)
+    ? // @ts-expect-error - Error.isError is new
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
+      (value: unknown): value is Error => Error.isError(value)
+    : (value: unknown): value is Error => isA(value, Error);
 
 /**
  * Type guard for {@link ExpectItExecutor} functions.

package/src/internal-schema.ts

@@ -22,42 +22,26 @@ import { isPhrase, isStandardSchema, isZodType } from './guards.js';
 // This schema is only used for validation (safeParse), not for type inference.
 const AssertionFailureSchema = z
   .object({
-    actual: z
-      .unknown()
-      .optional()
-      .meta({
-        description:
-          'The actual value or description of what actually occurred',
-      }),
-    diff: z
-      .string()
-      .optional()
-      .meta({
-        description: 'Pre-computed diff string that bypasses jest-diff',
-      }),
+    actual: z.unknown().optional().meta({
+      description: 'The actual value or description of what actually occurred',
+    }),
+    diff: z.string().optional().meta({
+      description: 'Pre-computed diff string that bypasses jest-diff',
+    }),
     diffOptions: z
       .record(z.string(), z.unknown())
       .optional()
       .meta({ description: 'Override options for jest-diff' }),
-    expected: z
-      .unknown()
-      .optional()
-      .meta({
-        description:
-          'The expected value or description of what was expected to occur',
-      }),
-    formatActual: z
-      .function()
-      .optional()
-      .meta({
-        description: 'Custom formatter for actual value in diff output',
-      }),
-    formatExpected: z
-      .function()
-      .optional()
-      .meta({
-        description: 'Custom formatter for expected value in diff output',
-      }),
+    expected: z.unknown().optional().meta({
+      description:
+        'The expected value or description of what was expected to occur',
+    }),
+    formatActual: z.function().optional().meta({
+      description: 'Custom formatter for actual value in diff output',
+    }),
+    formatExpected: z.function().optional().meta({
+      description: 'Custom formatter for expected value in diff output',
+    }),
     message: z
       .string()
       .optional()

package/src/value-to-schema.ts

@@ -89,7 +89,7 @@ export const valueToSchema = (
         })
       : z.undefined();
   }
-  if (isNaN(value as number)) {
+  if (isNaN(value)) {
     return z.nan();
   }
   if (value === Infinity || value === -Infinity) {

package/dist/assertion/assertion-async.cjs

@@ -1,268 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BupkisAssertionSchemaAsync = exports.BupkisAssertionFunctionAsync = exports.BupkisAssertionAsync = void 0;
-const util_1 = require("util");
-const zod_1 = __importDefault(require("zod"));
-const error_js_1 = require("../error.cjs");
-const guards_js_1 = require("../guards.cjs");
-const internal_schema_js_1 = require("../internal-schema.cjs");
-const assertion_js_1 = require("./assertion.cjs");
-const format_assertion_failure_js_1 = require("./format-assertion-failure.cjs");
-class BupkisAssertionAsync extends assertion_js_1.BupkisAssertion {
-    async parseValuesAsync(args) {
-        const { slots } = this;
-        const parsedValues = [];
-        if (slots.length !== args.length) {
-            return {
-                success: false,
-            };
-        }
-        let exactMatch = true;
-        for (let i = 0; i < slots.length; i++) {
-            const slot = slots[i];
-            const arg = args[i];
-            const parsedLiteralResult = this.parseSlotForLiteral(slot, i, arg);
-            if (parsedLiteralResult === true) {
-                continue;
-            }
-            else if (parsedLiteralResult !== false) {
-                return parsedLiteralResult;
-            }
-            // unknown/any accept anything
-            // IMPORTANT: do not use a type guard here; it will break inference
-            if (slot.def.type === 'unknown' || slot.def.type === 'any') {
-                parsedValues.push(arg);
-                exactMatch = false;
-                continue;
-            }
-            const result = await slot.safeParseAsync(arg);
-            if (!result.success) {
-                return {
-                    success: false,
-                };
-            }
-            parsedValues.push(result.data);
-        }
-        return {
-            exactMatch,
-            parsedValues: parsedValues,
-            success: true,
-        };
-    }
-}
-exports.BupkisAssertionAsync = BupkisAssertionAsync;
-/**
- * An assertion implemented as a Zod schema.
- *
- * Async schemas are supported via {@link expectAsync}.
- */
-/**
- * Optimized schema assertion that performs subject validation during
- * parseValues() to eliminate double parsing for simple schema-based
- * assertions.
- *
- * This class implements Option 2 from the z.function() analysis - it caches the
- * subject validation result during argument parsing and reuses it during
- * execution, eliminating the double parsing overhead.
- */
-class BupkisAssertionFunctionAsync extends BupkisAssertionAsync {
-    async executeAsync(parsedValues, args, stackStartFn, _parseResult) {
-        let result;
-        try {
-            result = await this.impl.call(null, 
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            ...parsedValues);
-        }
-        catch (err) {
-            if (error_js_1.AssertionError.isAssertionError(err)) {
-                throw err;
-            }
-            if ((0, guards_js_1.isError)(err) && err instanceof zod_1.default.ZodError) {
-                throw this.fromZodError(err, stackStartFn, parsedValues);
-            }
-            throw new error_js_1.AssertionImplementationError(`Unexpected error thrown from assertion ${this}: ${err}`, { cause: err });
-        }
-        if ((0, guards_js_1.isZodType)(result)) {
-            try {
-                await result.parseAsync(parsedValues[0]);
-            }
-            catch (error) {
-                if ((0, guards_js_1.isA)(error, zod_1.default.ZodError)) {
-                    throw this.fromZodError(error, stackStartFn, parsedValues);
-                }
-                throw error;
-            }
-        }
-        else if ((0, guards_js_1.isStandardSchema)(result)) {
-            const validationResult = result['~standard'].validate(parsedValues[0]);
-            const finalResult = validationResult instanceof Promise
-                ? await validationResult
-                : validationResult;
-            if (finalResult.issues) {
-                throw this.fromStandardSchemaIssues(finalResult.issues, stackStartFn, parsedValues);
-            }
-        }
-        else if ((0, guards_js_1.isBoolean)(result)) {
-            if (!result) {
-                throw new error_js_1.AssertionError({
-                    id: this.id,
-                    message: `Assertion ${this} failed for arguments: ${(0, util_1.inspect)(args)}`,
-                });
-            }
-        }
-        else if ((0, guards_js_1.isError)(result) && result instanceof zod_1.default.ZodError) {
-            throw this.fromZodError(result, stackStartFn, parsedValues);
-        }
-        else if ((0, internal_schema_js_1.isAssertionParseRequest)(result)) {
-            const { asyncSchema, schema, subject } = result;
-            const schemaToUse = schema ?? asyncSchema;
-            if ((0, guards_js_1.isZodType)(schemaToUse)) {
-                let zodResult;
-                if (schema) {
-                    zodResult = schemaToUse.safeParse(subject);
-                }
-                else {
-                    zodResult = await schemaToUse.safeParseAsync(subject);
-                }
-                if (!zodResult.success) {
-                    throw this.fromZodError(zodResult.error, stackStartFn, subject);
-                }
-            }
-            else if ((0, guards_js_1.isStandardSchema)(schemaToUse)) {
-                const validationResult = schemaToUse['~standard'].validate(subject);
-                const finalResult = validationResult instanceof Promise
-                    ? await validationResult
-                    : validationResult;
-                if (finalResult.issues) {
-                    throw this.fromStandardSchemaIssues(finalResult.issues, stackStartFn, subject);
-                }
-            }
-        }
-        else if ((0, internal_schema_js_1.isAssertionFailure)(result)) {
-            const diffOutput = (0, format_assertion_failure_js_1.formatAssertionFailure)(result);
-            const baseMessage = result.message ??
-                `Assertion ${this} failed for arguments: ${(0, util_1.inspect)(args)}`;
-            const message = diffOutput
-                ? `${baseMessage}\n${diffOutput}`
-                : baseMessage;
-            throw new error_js_1.AssertionError({
-                actual: result.actual,
-                expected: result.expected,
-                id: this.id,
-                message,
-            });
-        }
-        else if (result) {
-            throw new error_js_1.AssertionImplementationError(`Invalid return type from assertion ${this}; expected boolean, ZodType, or AssertionFailure`, { result });
-        }
-    }
-}
-exports.BupkisAssertionFunctionAsync = BupkisAssertionFunctionAsync;
-/**
- * A class representing an assertion implemented as a function.
- *
- * This function may:
- *
- * 1. Return a `boolean` indicating pass/fail.
- * 2. Return a `ZodType` which will be used to validate the subject.
- * 3. Return a `Promise` resolving to either of the above (when called via
- *    {@link expectAsync})
- * 4. Throw a {@link AssertionError}; when called via {@link expectAsync}, reject
- *    with an {@link AssertionError}
- */
-class BupkisAssertionSchemaAsync extends BupkisAssertionAsync {
-    async executeAsync(parsedValues, _args, stackStartFn, parseResult) {
-        // Check if we have cached validation result from parseValuesAsync
-        const cachedValidation = parseResult?.success
-            ? parseResult.subjectValidationResult
-            : undefined;
-        if (cachedValidation && !cachedValidation.success) {
-            // Subject validation failed during parseValuesAsync, throw the cached error
-            if ('error' in cachedValidation) {
-                throw this.fromZodError(cachedValidation.error, stackStartFn, parsedValues);
-            }
-        }
-        // Fall back to standard validation if no cached result
-        const [subject] = parsedValues;
-        try {
-            await this.impl.parseAsync(subject);
-        }
-        catch (error) {
-            if ((0, guards_js_1.isA)(error, zod_1.default.ZodError)) {
-                throw this.fromZodError(error, stackStartFn, parsedValues);
-            }
-            /* c8 ignore next */
-            throw error;
-        }
-    }
-    async parseValuesAsync(args) {
-        const { slots } = this;
-        const parsedValues = [];
-        const mismatch = this.maybeParseValuesArgMismatch(args);
-        if (mismatch) {
-            return mismatch;
-        }
-        let exactMatch = true;
-        let subjectValidationResult;
-        for (let i = 0; i < slots.length; i++) {
-            const slot = slots[i];
-            const arg = args[i];
-            const parsedLiteralResult = this.parseSlotForLiteral(slot, i, arg);
-            if (parsedLiteralResult === true) {
-                continue;
-            }
-            else if (parsedLiteralResult !== false) {
-                return parsedLiteralResult;
-            }
-            // For the subject slot (first slot if it's unknown/any), try optimized validation
-            if (i === 0 &&
-                (slot.def.type === 'unknown' || slot.def.type === 'any') &&
-                this.isSimpleSchemaAssertion()) {
-                try {
-                    const result = await this.impl.parseAsync(arg);
-                    subjectValidationResult = { data: result, success: true };
-                    parsedValues.push(result); // Use validated data
-                }
-                catch (error) {
-                    if ((0, guards_js_1.isA)(error, zod_1.default.ZodError)) {
-                        subjectValidationResult = { error, success: false };
-                        parsedValues.push(arg); // Keep original for error reporting
-                    }
-                    else {
-                        throw error; // Re-throw non-Zod errors
-                    }
-                }
-                exactMatch = false; // Subject was validated, so we know the exact type
-                continue;
-            }
-            // Standard slot processing for non-optimized cases
-            if (slot.def.type === 'unknown' || slot.def.type === 'any') {
-                parsedValues.push(arg);
-                exactMatch = false;
-                continue;
-            }
-            const result = await slot.safeParseAsync(arg);
-            if (!result.success) {
-                return {
-                    success: false,
-                };
-            }
-            parsedValues.push(result.data);
-        }
-        const result = {
-            exactMatch,
-            parsedValues: parsedValues,
-            success: true,
-        };
-        // Add cached validation result if we performed optimization
-        if (subjectValidationResult) {
-            result.subjectValidationResult = subjectValidationResult;
-        }
-        return result;
-    }
-}
-exports.BupkisAssertionSchemaAsync = BupkisAssertionSchemaAsync;
-//# sourceMappingURL=assertion-async.js.map

package/dist/assertion/assertion-async.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"assertion-async.js","sourceRoot":"","sources":["../../src/assertion/assertion-async.ts"],"names":[],"mappings":"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"}