pema 0.5.0 → 0.6.1

package/lib/private/validator/range.js

@@ -1,21 +1,15 @@
-import ParseError from "#ParseError";
+import E from "#errors";
 import is from "@rcompat/is";
-const fail = (input, msg) => new ParseError([{ input, message: msg, path: "" }]);
 export default function range(from, to) {
     if (!is.finite(from) || !is.finite(to)) {
         throw new TypeError("range(): from and to must be finite numbers");
     }
     return (x) => {
-        if (typeof x !== "number" && typeof x !== "bigint") {
-            throw fail(x, "invalid type");
-        }
-        if (x < from || x > to) {
-            throw new ParseError([{
-                    input: x,
-                    message: `${x} is out of range`,
-                    path: "",
-                }]);
+        if (!is.number(x) && !is.bigint(x)) {
+            throw E.invalid_type(x, "number or bigint");
         }
+        if (x < from || x > to)
+            throw E.out_of_range(x, `${x} is out of range`);
     };
 }
 ;

package/lib/private/validator/regex.d.ts

@@ -1,5 +1,5 @@
 import type Validator from "#Validator";
 type ErrorFunction = (x: string) => string;
-export default function validateRegex(regex: RegExp, error?: ErrorFunction): Validator<string>;
+export default function regex(format: RegExp, error?: ErrorFunction): Validator<string>;
 export {};
 //# sourceMappingURL=regex.d.ts.map

package/lib/private/validator/regex.js

@@ -1,13 +1,9 @@
-import ParseError from "#ParseError";
-export default function validateRegex(regex, error) {
+import E from "#errors";
+export default function regex(format, error) {
     return (x) => {
-        if (!regex.test(x)) {
-            const message = (error ?? ((y) => `"${y}" is not a valid ${String(regex)}`))(x);
-            throw new ParseError([{
-                    input: x,
-                    message,
-                    path: "", // root; the calling type should rebase if needed
-                }]);
+        if (!format.test(x)) {
+            const message = (error ?? ((y) => `"${y}" is not a valid ${String(format)}`))(x);
+            throw E.invalid_format(x, message);
         }
     };
 }

package/lib/private/validator/starts-with.d.ts

@@ -1,4 +1,3 @@
 import type Validator from "#Validator";
-declare const _default: (prefix: string) => Validator<string>;
-export default _default;
+export default function starts_with(prefix: string): Validator<string>;
 //# sourceMappingURL=starts-with.d.ts.map

package/lib/private/validator/starts-with.js

@@ -1,11 +1,9 @@
-import ParseError from "#ParseError";
-export default (prefix) => (x) => {
-    if (!x.startsWith(prefix)) {
-        throw new ParseError([{
-                input: x,
-                message: `"${x}" does not start with "${prefix}"`,
-                path: "",
-            }]);
-    }
-};
+import E from "#errors";
+export default function starts_with(prefix) {
+    return (x) => {
+        if (!x.startsWith(prefix)) {
+            throw E.invalid_format(x, `"${x}" does not start with "${prefix}"`);
+        }
+    };
+}
 //# sourceMappingURL=starts-with.js.map

package/lib/private/validator/unique-by.d.ts

@@ -1,2 +1,2 @@
-export default function uniqueBy<T, K extends PropertyKey>(selector: (item: T) => K): (array: Array<T>) => void;
+export default function unique_by<T, K>(select: (value: T) => K): (array: T[]) => void;
 //# sourceMappingURL=unique-by.d.ts.map

package/lib/private/validator/unique-by.js

@@ -1,22 +1,16 @@
-import ParseError from "#ParseError";
+import E from "#errors";
 import join from "#path/join";
-function message(k, i, first) {
-    return `duplicate key "${String(k)}" at index ${i} (first ${first})`;
-}
-export default function uniqueBy(selector) {
+export default function unique_by(select) {
     return (array) => {
         const seen = new Map();
         for (let i = 0; i < array.length; i++) {
-            const k = selector(array[i]);
-            if (seen.has(k)) {
-                const first = seen.get(k);
-                throw new ParseError([{
-                        input: array,
-                        message: message(k, i, first),
-                        path: join("", i),
-                    }]);
+            const value = array[i];
+            const key = select(value);
+            if (seen.has(key)) {
+                const first = seen.get(key);
+                throw E.duplicate(array, `duplicate value at index ${i} (first seen at ${first})`, join("", i));
             }
-            seen.set(k, i);
+            seen.set(key, i);
         }
     };
 }

package/lib/private/validator/unique-with.d.ts

@@ -1,2 +1,2 @@
-export default function uniqueWith<T>(equals: (a: T, b: T) => boolean): (array: Array<T>) => void;
+export default function unique<T>(equals: (a: T, b: T) => boolean): (array: Array<T>) => void;
 //# sourceMappingURL=unique-with.d.ts.map

package/lib/private/validator/unique-with.js

@@ -1,15 +1,11 @@
-import ParseError from "#ParseError";
+import E from "#errors";
 import join from "#path/join";
-export default function uniqueWith(equals) {
+export default function unique(equals) {
     return (array) => {
         for (let i = 0; i < array.length; i++) {
             for (let j = 0; j < i; j++) {
                 if (equals(array[i], array[j])) {
-                    throw new ParseError([{
-                            input: array,
-                            message: `items at ${j} and ${i} considered equal`,
-                            path: join("", i),
-                        }]);
+                    throw E.duplicate(array, `items at ${j} and ${i} considered equal`, join("", i));
                 }
             }
         }

package/lib/private/validator/unique.js

@@ -1,4 +1,4 @@
-import ParseError from "#ParseError";
+import E from "#errors";
 import join from "#path/join";
 export default function unique(array) {
     const seen = new Map();
@@ -7,11 +7,7 @@ export default function unique(array) {
         if (seen.has(v)) {
             const first = seen.get(v);
             // key = current duplicate index
-            throw new ParseError([{
-                    input: array,
-                    message: `duplicate value at index ${i} (first seen at ${first})`,
-                    path: join("", i),
-                }]);
+            throw E.duplicate(array, `duplicate value at index ${i} (first seen at ${first})`, join("", i));
         }
         seen.set(v, i);
     }

package/lib/private/validator/values.js

@@ -1,14 +1,10 @@
-import ParseError from "#ParseError";
+import E from "#errors";
 export default function values(input) {
     const input_values = Object.values(input);
     const allowed = input_values.map(v => String(v)).join(", ");
     return (x) => {
         if (!input_values.includes(x)) {
-            throw new ParseError([{
-                    input: x,
-                    message: `"${x}" not in given list of values (${allowed})`,
-                    path: "",
-                }]);
+            throw E.not_in_set(x, `"${x}" not in given list of values (${allowed})`);
         }
     };
 }

package/lib/public/StoreType.d.ts

@@ -1,3 +1,3 @@
-export { default as Serialized } from "#Serialized";
+export type { default as Serialized } from "#Serialized";
 export { default } from "#StoreType";
 //# sourceMappingURL=StoreType.d.ts.map

package/lib/public/index.d.ts

@@ -1,30 +1,3 @@
-export { default as ArrayType } from "#ArrayType";
-export { default as BooleanType } from "#BooleanType";
-export { default as ConstructorType } from "#ConstructorType";
-export { default as DefaultType } from "#DefaultType";
+export type * from "#index";
 export { default } from "#index";
-export { default as LiteralType } from "#LiteralType";
-export { default as NumberType } from "#NumberType";
-export { default as ObjectType } from "#ObjectType";
-export { default as OptionalType } from "#OptionalType";
-export { default as PureType } from "#PureType";
-export { default as RecordType } from "#RecordType";
-export { default as StringType } from "#StringType";
-export { default as TupleType } from "#TupleType";
-export { default as UintType } from "#UintType";
-export { default as UndefinedType } from "#UndefinedType";
-export { default as UnionType } from "#UnionType";
-export { default as UnknownType } from "#UnknownType";
-export type { default as DataKey } from "#DataKey";
-export type { default as DataType } from "#DataType";
-export type { default as Id } from "#Id";
-export type { default as InferStore } from "#InferStore";
-export type { default as InferStoreOut } from "#InferStoreOut";
-export type { default as Issue } from "#Issue";
-export type { default as JSONPayload } from "#json/JSONPayload";
-export type { default as Schema } from "#Schema";
-export type { default as Serialized } from "#Serialized";
-export type { default as Storable } from "#Storable";
-export type { default as StoreId } from "#StoreId";
-export type { default as StoreSchema } from "#StoreSchema";
 //# sourceMappingURL=index.d.ts.map

package/lib/public/index.js

@@ -1,18 +1,2 @@
-export { default as ArrayType } from "#ArrayType";
-export { default as BooleanType } from "#BooleanType";
-export { default as ConstructorType } from "#ConstructorType";
-export { default as DefaultType } from "#DefaultType";
 export { default } from "#index";
-export { default as LiteralType } from "#LiteralType";
-export { default as NumberType } from "#NumberType";
-export { default as ObjectType } from "#ObjectType";
-export { default as OptionalType } from "#OptionalType";
-export { default as PureType } from "#PureType";
-export { default as RecordType } from "#RecordType";
-export { default as StringType } from "#StringType";
-export { default as TupleType } from "#TupleType";
-export { default as UintType } from "#UintType";
-export { default as UndefinedType } from "#UndefinedType";
-export { default as UnionType } from "#UnionType";
-export { default as UnknownType } from "#UnknownType";
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pema",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Primate schema validation",
   "homepage": "https://primate.run/docs/validation",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -17,26 +17,27 @@
     "!/**/*.spec.*"
   ],
   "dependencies": {
-    "@rcompat/assert": "^0.6.0",
-    "@rcompat/cli": "^0.14.0",
-    "@rcompat/is": "^0.4.2"
+    "@rcompat/assert": "^0.8.1",
+    "@rcompat/cli": "^0.18.1",
+    "@rcompat/error": "^0.3.1",
+    "@rcompat/is": "^0.6.1"
   },
   "devDependencies": {
-    "@rcompat/type": "^0.9.0"
+    "@rcompat/type": "^0.11.1"
   },
   "imports": {
     "#*": {
-      "apekit": "./src/private/*.ts",
+      "@primate/source": "./src/private/*.ts",
       "default": "./lib/private/*.js"
     }
   },
   "exports": {
     ".": {
-      "apekit": "./src/public/index.ts",
+      "@primate/source": "./src/public/index.ts",
       "default": "./lib/public/index.js"
     },
     "./*": {
-      "apekit": "./src/public/*.ts",
+      "@primate/source": "./src/public/*.ts",
       "default": "./lib/public/*.js"
     }
   },
@@ -45,6 +46,6 @@
     "clean": "rm -rf ./lib",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "test": "npm run build && npx proby"
+    "test": "npx proby"
   }
 }

package/lib/private/SchemaError.d.ts

@@ -1,4 +0,0 @@
-export default class SchemaError extends Error {
-    constructor(message: string, ...params: unknown[]);
-}
-//# sourceMappingURL=SchemaError.d.ts.map

package/lib/private/SchemaError.js

@@ -1,8 +0,0 @@
-import mark from "@rcompat/cli/mark";
-export default class SchemaError extends Error {
-    constructor(message, ...params) {
-        super(mark(message, ...params));
-    }
-}
-;
-//# sourceMappingURL=SchemaError.js.map

package/lib/private/error/fail.d.ts

@@ -1,3 +0,0 @@
-import ParseError from "#ParseError";
-export default function fail(input: unknown, msg: string): ParseError;
-//# sourceMappingURL=fail.d.ts.map

package/lib/private/error/fail.js

@@ -1,5 +0,0 @@
-import ParseError from "#ParseError";
-export default function fail(input, msg) {
-    return new ParseError([{ input, message: msg, path: "" }]);
-}
-//# sourceMappingURL=fail.js.map

package/lib/private/error/schemafail.d.ts

@@ -1,3 +0,0 @@
-import SchemaError from "#SchemaError";
-export default function schemafail(message: string, ...args: unknown[]): SchemaError;
-//# sourceMappingURL=schemafail.d.ts.map

package/lib/private/error/schemafail.js

@@ -1,5 +0,0 @@
-import SchemaError from "#SchemaError";
-export default function schemafail(message, ...args) {
-    return new SchemaError(message, ...args);
-}
-//# sourceMappingURL=schemafail.js.map

package/lib/private/error.d.ts

@@ -1,4 +0,0 @@
-import type ParseIssue from "#ParseIssue";
-import type ParseOptions from "#ParseOptions";
-export default function error<T>(name: string, x: unknown, options?: ParseOptions<T>): [ParseIssue];
-//# sourceMappingURL=error.d.ts.map

package/lib/private/error.js

@@ -1,11 +0,0 @@
-import expected from "#expected";
-import ParsedKey from "#ParsedKey";
-export default function error(name, x, options) {
-    return [{
-            input: x,
-            message: expected(name, x),
-            path: options?.[ParsedKey] ?? "",
-        }];
-}
-;
-//# sourceMappingURL=error.js.map

package/lib/private/expect.d.ts

@@ -1,22 +0,0 @@
-declare const types: {
-    a: string;
-    b: string;
-    bb: string;
-    bi: string;
-    co: string;
-    d: string;
-    f: string;
-    i: string;
-    n: string;
-    nl: string;
-    o: string;
-    s: string;
-    sy: string;
-    u: string;
-    ui: string;
-    ur: string;
-};
-type At = number | string;
-export default function expect(type: keyof typeof types, got: unknown, at?: At): string;
-export {};
-//# sourceMappingURL=expect.d.ts.map

package/lib/private/expect.js

@@ -1,32 +0,0 @@
-const types = {
-    a: "array",
-    b: "boolean",
-    bb: "blob",
-    bi: "bigint",
-    co: "constructor",
-    d: "date",
-    f: "file",
-    i: "int",
-    n: "number",
-    nl: "null",
-    o: "object",
-    s: "string",
-    sy: "symbol",
-    u: "undefined",
-    ui: "uint",
-    ur: "url",
-};
-const prefix = (at) => at ? `.${at}: ` : "";
-function print_got(got) {
-    if (got === undefined) {
-        return "undefined";
-    }
-    if (got === null) {
-        return "null";
-    }
-    return `\`${got}\` (${typeof got})`;
-}
-export default function expect(type, got, at = "") {
-    return `${prefix(`${at}`)}expected ${types[type]}, got ${print_got(got)}`;
-}
-//# sourceMappingURL=expect.js.map

package/lib/private/expected.d.ts

@@ -1,3 +0,0 @@
-declare const _default: (type: string, x: unknown) => string;
-export default _default;
-//# sourceMappingURL=expected.d.ts.map

package/lib/private/expected.js

@@ -1,11 +0,0 @@
-function print_got(x) {
-    if (x === undefined) {
-        return "undefined";
-    }
-    if (x === null) {
-        return "null";
-    }
-    return `\`${x?.toString() ?? x}\` (${(typeof x)})`;
-}
-export default (type, x) => `expected ${type}, got ${print_got(x)}`;
-//# sourceMappingURL=expected.js.map

package/lib/private/fail.d.ts

@@ -1,4 +0,0 @@
-import error from "#error";
-import ParseError from "#ParseError";
-export default function fail(...args: Parameters<typeof error>): ParseError;
-//# sourceMappingURL=fail.d.ts.map

package/lib/private/fail.js

@@ -1,6 +0,0 @@
-import error from "#error";
-import ParseError from "#ParseError";
-export default function fail(...args) {
-    return new ParseError(error(...args));
-}
-//# sourceMappingURL=fail.js.map

package/lib/private/test/messages-of.d.ts

@@ -1,3 +0,0 @@
-import type ParseIssue from "#ParseIssue";
-export default function messagesOf(issues: ParseIssue[]): string[];
-//# sourceMappingURL=messages-of.d.ts.map

package/lib/private/test/messages-of.js

@@ -1,4 +0,0 @@
-export default function messagesOf(issues) {
-    return issues.map(i => i.message);
-}
-//# sourceMappingURL=messages-of.js.map

package/lib/private/test/paths-of.d.ts

@@ -1,3 +0,0 @@
-import type ParseIssue from "#ParseIssue";
-export default function pathsOf(issues: ParseIssue[]): import("@rcompat/type").JSONPointer[];
-//# sourceMappingURL=paths-of.d.ts.map

package/lib/private/test/paths-of.js

@@ -1,4 +0,0 @@
-export default function pathsOf(issues) {
-    return issues.map(i => i.path);
-}
-//# sourceMappingURL=paths-of.js.map

package/lib/private/test/throws-issues.d.ts

@@ -1,4 +0,0 @@
-import type ParseIssue from "#ParseIssue";
-import type Asserter from "@rcompat/test/Asserter";
-export default function throwsIssues(assert: Asserter, fn: () => unknown): ParseIssue[];
-//# sourceMappingURL=throws-issues.d.ts.map

package/lib/private/test/throws-issues.js

@@ -1,13 +0,0 @@
-export default function throwsIssues(assert, fn) {
-    try {
-        fn();
-        // fail if nothing was thrown
-        assert().fail();
-        return []; // unreachable
-    }
-    catch (error) {
-        const e = error;
-        return e.issues ?? [];
-    }
-}
-//# sourceMappingURL=throws-issues.js.map

package/lib/private/validator/uuid.d.ts

@@ -1,3 +0,0 @@
-declare const _default: import("../Validator.js").default<string>;
-export default _default;
-//# sourceMappingURL=uuid.d.ts.map

package/lib/private/validator/uuid.js

@@ -1,4 +0,0 @@
-import regex from "#validator/regex";
-const uuid = /^[^\W_]{8}-[^\W_]{4}-[^\W_]{4}-[^\W_]{4}-[^\W_]{12}$/u;
-export default regex(uuid, x => `"${x}" is not a valid UUID`);
-//# sourceMappingURL=uuid.js.map