@fgv/ts-json-base 5.0.1-8 → 5.0.1-9

package/dist/ts-json-base.d.ts

@@ -47,6 +47,13 @@ declare type ArrayValidator<T, TC = unknown> = Validation.Classes.ArrayValidator
  */
 declare const boolean: Converter<boolean, IJsonConverterContext>;
 
+/**
+ * A {@link Validation.Classes.BooleanValidator | BooleanValidator} which validates a boolean in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+declare const boolean_2: Validator<boolean, IJsonValidatorContext>;
+
 /**
  * Identifies whether some `unknown` value is a {@link JsonPrimitive | primitive},
  * {@link JsonObject | object} or {@link JsonArray | array}. Fails for any value
@@ -217,6 +224,22 @@ declare function discriminatedObject<T, TD extends string = string, TC = unknown
  */
 declare function enumeratedValue<T>(values: ReadonlyArray<T>, message?: string): Converter<T, IJsonConverterContext | ReadonlyArray<T>>;
 
+/**
+ * Helper function to create a {@link Validator | Validator} which validates `unknown` to one of a set of
+ * supplied enumerated values. Anything else fails.
+ *
+ * @remarks
+ * This JSON variant accepts an {@link Validators.IJsonValidatorContext | IJsonValidatorContext} OR
+ * a `ReadonlyArray<T>` as its validation context. If the context is an array, it is used to override the
+ * allowed values for that validation; otherwise, the original `values` supplied at creation time are used.
+ *
+ * @param values - Array of allowed values.
+ * @param message - Optional custom failure message.
+ * @returns A new {@link Validator | Validator} returning `<T>`.
+ * @public
+ */
+declare function enumeratedValue_2<T>(values: ReadonlyArray<T>, message?: string): Validator<T, IJsonValidatorContext | ReadonlyArray<T>>;
+
 /**
  * Class representing a file in a file tree.
  * @public
@@ -1184,6 +1207,14 @@ export declare type JsonValueType = 'primitive' | 'object' | 'array';
  */
 declare function literal<T>(value: T): Converter<T, IJsonConverterContext>;
 
+/**
+ * Helper to create a validator for a literal value.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * Mirrors the behavior of `@fgv/ts-utils`.
+ * @public
+ */
+declare function literal_2<T>(value: T): Validator<T, IJsonValidatorContext>;
+
 /**
  * A {@link Converter | Converter} which converts `unknown` to a `number`.
  * Accepts {@link Converters.IJsonConverterContext | IJsonConverterContext} but ignores it.
@@ -1192,6 +1223,13 @@ declare function literal<T>(value: T): Converter<T, IJsonConverterContext>;
  */
 declare const number: Converter<number, IJsonConverterContext>;
 
+/**
+ * A {@link Validation.Classes.NumberValidator | NumberValidator} which validates a number in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+declare const number_2: Validator<number, IJsonValidatorContext>;
+
 /**
  * A helper function to create a {@link JsonCompatible.ObjectConverter | JSON-compatible ObjectConverter<T, TC>} which converts a
  * supplied `unknown` value to a valid {@link JsonCompatibleType | JsonCompatibleType<T>} value.
@@ -1331,6 +1369,13 @@ declare function strictObject<T, TC = unknown>(properties: Conversion.FieldConve
  */
 declare const string: StringConverter<string, IJsonConverterContext>;
 
+/**
+ * A {@link Validation.Classes.StringValidator | StringValidator} which validates a string in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+declare const string_2: Validation.Classes.StringValidator<string, IJsonValidatorContext>;
+
 /**
  * A validator which validates a supplied `unknown` value to a valid {@link JsonCompatibleType | JsonCompatible} value.
  * @public
@@ -1339,11 +1384,16 @@ declare type Validator_2<T, TC = unknown> = Validator<JsonCompatibleType<T>, TC>
 
 declare namespace Validators {
     export {
+        literal_2 as literal,
+        enumeratedValue_2 as enumeratedValue,
         IJsonValidatorContext,
         jsonPrimitive_2 as jsonPrimitive,
         jsonObject_2 as jsonObject,
         jsonArray_2 as jsonArray,
-        jsonValue_2 as jsonValue
+        jsonValue_2 as jsonValue,
+        string_2 as string,
+        number_2 as number,
+        boolean_2 as boolean
     }
 }
 export { Validators }

package/lib/packlets/validators/validators.d.ts

@@ -1,4 +1,4 @@
-import { Validator } from '@fgv/ts-utils';
+import { Validation, Validator } from '@fgv/ts-utils';
 import { JsonArray, JsonObject, JsonPrimitive, JsonValue } from '../json';
 /**
  * Validation context for in-place JSON validators.
@@ -37,4 +37,44 @@ export declare const jsonArray: Validator<JsonArray, IJsonValidatorContext>;
  * @public
  */
 export declare const jsonValue: Validator<JsonValue, IJsonValidatorContext>;
+/**
+ * A {@link Validation.Classes.StringValidator | StringValidator} which validates a string in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+export declare const string: Validation.Classes.StringValidator<string, IJsonValidatorContext>;
+/**
+ * A {@link Validation.Classes.NumberValidator | NumberValidator} which validates a number in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+export declare const number: Validator<number, IJsonValidatorContext>;
+/**
+ * A {@link Validation.Classes.BooleanValidator | BooleanValidator} which validates a boolean in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+export declare const boolean: Validator<boolean, IJsonValidatorContext>;
+/**
+ * Helper to create a validator for a literal value.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * Mirrors the behavior of `@fgv/ts-utils`.
+ * @public
+ */
+export declare function literal<T>(value: T): Validator<T, IJsonValidatorContext>;
+/**
+ * Helper function to create a {@link Validator | Validator} which validates `unknown` to one of a set of
+ * supplied enumerated values. Anything else fails.
+ *
+ * @remarks
+ * This JSON variant accepts an {@link Validators.IJsonValidatorContext | IJsonValidatorContext} OR
+ * a `ReadonlyArray<T>` as its validation context. If the context is an array, it is used to override the
+ * allowed values for that validation; otherwise, the original `values` supplied at creation time are used.
+ *
+ * @param values - Array of allowed values.
+ * @param message - Optional custom failure message.
+ * @returns A new {@link Validator | Validator} returning `<T>`.
+ * @public
+ */
+export declare function enumeratedValue<T>(values: ReadonlyArray<T>, message?: string): Validator<T, IJsonValidatorContext | ReadonlyArray<T>>;
 //# sourceMappingURL=validators.d.ts.map

package/lib/packlets/validators/validators.js

@@ -21,7 +21,9 @@
  * SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsonValue = exports.jsonArray = exports.jsonObject = exports.jsonPrimitive = void 0;
+exports.boolean = exports.number = exports.string = exports.jsonValue = exports.jsonArray = exports.jsonObject = exports.jsonPrimitive = void 0;
+exports.literal = literal;
+exports.enumeratedValue = enumeratedValue;
 const ts_utils_1 = require("@fgv/ts-utils");
 const json_1 = require("../json");
 /**
@@ -122,4 +124,61 @@ exports.jsonValue = new ts_utils_1.Validation.Base.GenericValidator({
         return result.success === true ? true : result;
     }
 });
+/**
+ * A {@link Validation.Classes.StringValidator | StringValidator} which validates a string in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+exports.string = new ts_utils_1.Validation.Classes.StringValidator();
+/**
+ * A {@link Validation.Classes.NumberValidator | NumberValidator} which validates a number in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+exports.number = new ts_utils_1.Validation.Classes.NumberValidator();
+/**
+ * A {@link Validation.Classes.BooleanValidator | BooleanValidator} which validates a boolean in place.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * @public
+ */
+exports.boolean = new ts_utils_1.Validation.Classes.BooleanValidator();
+/**
+ * Helper to create a validator for a literal value.
+ * Accepts {@link Validators.IJsonValidatorContext | IJsonValidatorContext} but ignores it.
+ * Mirrors the behavior of `@fgv/ts-utils`.
+ * @public
+ */
+function literal(value) {
+    return new ts_utils_1.Validation.Base.GenericValidator({
+        validator: (from) => {
+            return from === value ? true : (0, ts_utils_1.fail)(`Expected literal ${String(value)}, found ${JSON.stringify(from)}`);
+        }
+    });
+}
+/**
+ * Helper function to create a {@link Validator | Validator} which validates `unknown` to one of a set of
+ * supplied enumerated values. Anything else fails.
+ *
+ * @remarks
+ * This JSON variant accepts an {@link Validators.IJsonValidatorContext | IJsonValidatorContext} OR
+ * a `ReadonlyArray<T>` as its validation context. If the context is an array, it is used to override the
+ * allowed values for that validation; otherwise, the original `values` supplied at creation time are used.
+ *
+ * @param values - Array of allowed values.
+ * @param message - Optional custom failure message.
+ * @returns A new {@link Validator | Validator} returning `<T>`.
+ * @public
+ */
+function enumeratedValue(values, message) {
+    return new ts_utils_1.Validation.Base.GenericValidator({
+        validator: (from, context) => {
+            const effectiveValues = Array.isArray(context) ? context : values;
+            const index = effectiveValues.indexOf(from);
+            if (index >= 0) {
+                return true;
+            }
+            return (0, ts_utils_1.fail)(message !== null && message !== void 0 ? message : `Invalid enumerated value ${JSON.stringify(from)}`);
+        }
+    });
+}
 //# sourceMappingURL=validators.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-json-base",
-  "version": "5.0.1-8",
+  "version": "5.0.1-9",
   "description": "Typescript types and basic functions for working with json",
   "main": "lib/index.js",
   "types": "dist/ts-json-base.d.ts",
@@ -53,11 +53,11 @@
     "@rushstack/eslint-config": "4.5.3",
     "eslint-plugin-tsdoc": "~0.4.0",
     "@types/luxon": "^3.7.1",
-    "@fgv/ts-utils": "5.0.1-8",
-    "@fgv/ts-utils-jest": "5.0.1-8"
+    "@fgv/ts-utils": "5.0.1-9",
+    "@fgv/ts-utils-jest": "5.0.1-9"
   },
   "peerDependencies": {
-    "@fgv/ts-utils": "5.0.1-8"
+    "@fgv/ts-utils": "5.0.1-9"
   },
   "dependencies": {
     "luxon": "^3.7.2"