equipped 4.0.0-alpha.5 → 4.0.0-alpha.7

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.0.0-alpha.7](https://github.com/kevinand11/equipped/compare/v4.0.0-alpha.6...v4.0.0-alpha.7) (2023-02-14)
+
+
+### Bug Fixes
+
+* update valleyed version ([638ea0a](https://github.com/kevinand11/equipped/commit/638ea0a2c91967ae897f83b8ea9da480dcd1a7bf))
+
+## [4.0.0-alpha.6](https://github.com/kevinand11/equipped/compare/v4.0.0-alpha.5...v4.0.0-alpha.6) (2023-02-14)
+
 ## [4.0.0-alpha.5](https://github.com/kevinand11/equipped/compare/v4.0.0-alpha.4...v4.0.0-alpha.5) (2023-02-14)
 
 

package/lib/validations/index.d.ts

@@ -1,8 +1,37 @@
 import * as Validate from 'valleyed';
 import { VCore } from 'valleyed/lib/api/core';
 import { StorageFile } from '../storage';
+type Phone = {
+    code: string;
+    number: string;
+};
+export declare const Schema: {
+    or: <T extends VCore<any, any>[]>(options: T, err?: string | undefined) => import("valleyed/lib/api/junctions").VOr<T>;
+    and: <I, O>(options: VCore<I, O>[], err?: string | undefined) => import("valleyed/lib/api/junctions").VAnd<I, O>;
+    string: (err?: string | undefined) => import("valleyed/lib/api/strings").VString;
+    number: (err?: string | undefined) => import("valleyed/lib/api/numbers").VNumber;
+    boolean: (err?: string | undefined) => import("valleyed/lib/api/booleans").VBoolean;
+    time: <T_1 extends Validate.Timeable = Validate.Timeable>(err?: string | undefined) => import("valleyed/lib/api/times").VTime<T_1>;
+    file: (err?: string | undefined) => import("valleyed/lib/api/files").VFile;
+    array: <I_1, O_1>(comparer: VCore<I_1, O_1>, err?: string | undefined) => import("valleyed/lib/api/arrays").VArray<I_1, O_1>;
+    tuple: <T_2 extends readonly VCore<any, any>[]>(schema: readonly [...T_2], err?: string | undefined) => import("valleyed/lib/api/tuples").VTuple<T_2>;
+    object: <T_3 extends Record<string, VCore<any, any>>>(schema: T_3, trim?: boolean | undefined, err?: string | undefined) => import("valleyed/lib/api/objects").VObject<T_3>;
+    record: <VI, VO>(vCom: VCore<VI, VO>, err?: string | undefined) => import("valleyed/lib/api/records").VRecord<VI, VO>;
+    map: <KI, VI_1, KO, VO_1>(kCom: VCore<KI, KO>, vCom: VCore<VI_1, VO_1>, err?: string | undefined) => import("valleyed/lib/api/records").VMap<KI, VI_1, KO, VO_1>;
+    null: (err?: string | undefined) => VCore<null, null>;
+    undefined: (err?: string | undefined) => VCore<undefined, undefined>;
+    instanceof: <T_4>(classDef: new () => T_4, err?: string | undefined) => VCore<T_4, T_4>;
+    any: <T_5 = any>() => VCore<T_5, T_5>;
+    force: {
+        string: (err?: string | undefined) => import("valleyed/lib/api/strings").VString;
+        number: (err?: string | undefined) => import("valleyed/lib/api/numbers").VNumber;
+        boolean: (err?: string | undefined) => import("valleyed/lib/api/booleans").VBoolean;
+        time: (err?: string | undefined) => import("valleyed/lib/api/times").VTime<Date>;
+    };
+};
 export declare const Validation: {
     isNotTruncated: (error?: string) => Validate.Rule<StorageFile>;
+    isValidPhone: (error?: string) => Validate.Rule<Phone>;
     Validator: typeof Validate.Validator;
     v: {
         or: <T extends VCore<any, any>[]>(options: T, err?: string | undefined) => import("valleyed/lib/api/junctions").VOr<T>;
@@ -20,7 +49,7 @@ export declare const Validation: {
         null: (err?: string | undefined) => VCore<null, null>;
         undefined: (err?: string | undefined) => VCore<undefined, undefined>;
         instanceof: <T_4>(classDef: new () => T_4, err?: string | undefined) => VCore<T_4, T_4>;
-        any: () => VCore<any, any>;
+        any: <T_5 = any>() => VCore<T_5, T_5>;
         force: {
             string: (err?: string | undefined) => import("valleyed/lib/api/strings").VString;
             number: (err?: string | undefined) => import("valleyed/lib/api/numbers").VNumber;
@@ -28,21 +57,21 @@ export declare const Validation: {
             time: (err?: string | undefined) => import("valleyed/lib/api/times").VTime<Date>;
         };
     };
-    isValid: <T_5>(value: T_5) => {
+    isValid: <T>(value: T) => {
         valid: true;
         errors: string[];
-        value: T_5;
+        value: T;
     };
-    isInvalid: <T_6>(errors: string[], value: T_6) => {
+    isInvalid: <T_1>(errors: string[], value: T_1) => {
         valid: false;
         errors: string[];
         value: unknown;
     };
-    makeRule: <T_7>(func: Validate.Rule<T_7>) => Validate.Rule<T_7>;
-    makeSanitizer: <T_8>(func: Validate.Sanitizer<T_8>) => (val: T_8) => T_8;
-    check: <T_9>(value: T_9, rules: Validate.Rule<T_9>[], options?: Partial<Validate.Options> | undefined) => {
+    makeRule: <T_2>(func: Validate.Rule<T_2>) => Validate.Rule<T_2>;
+    makeSanitizer: <T_3>(func: Validate.Sanitizer<T_3>) => (val: T_3) => T_3;
+    check: <T_4>(value: T_4, rules: Validate.Rule<T_4>[], options?: Partial<Validate.Options> | undefined) => {
         errors: string[];
-        value: T_9;
+        value: T_4;
         valid: boolean;
     };
     isShallowEqualTo: <Type>(compare: Type, error?: string | undefined) => Validate.Rule<Type>;
@@ -67,7 +96,7 @@ export declare const Validation: {
     isUndefined: (error?: string | undefined) => Validate.Rule<undefined>;
     isNull: (error?: string | undefined) => Validate.Rule<null>;
     isBoolean: (error?: string | undefined) => Validate.Rule<boolean>;
-    isInstanceOf: <T_10>(classDef: new () => T_10, error?: string | undefined) => Validate.Rule<T_10>;
+    isInstanceOf: <T_5>(classDef: new () => T_5, error?: string | undefined) => Validate.Rule<T_5>;
     fileMimeTypes: string[];
     videoMimeTypes: string[];
     audioMimeTypes: string[];
@@ -76,13 +105,13 @@ export declare const Validation: {
     isAudio: (error?: string | undefined) => Validate.Rule<Validate.File>;
     isVideo: (error?: string | undefined) => Validate.Rule<Validate.File>;
     isFile: (error?: string | undefined) => Validate.Rule<Validate.File>;
-    isTuple: <T_11 extends readonly ((v: any, idx: number) => boolean)[]>(comparer: readonly [...T_11], error?: string | undefined) => Validate.Rule<{ [K in keyof T_11]: T_11[K] extends (v: infer V, idx: number) => boolean ? V : never; }>;
+    isTuple: <T_6 extends readonly ((v: any, idx: number) => boolean)[]>(comparer: readonly [...T_6], error?: string | undefined) => Validate.Rule<{ [K in keyof T_6]: T_6[K] extends (v: infer V, idx: number) => boolean ? V : never; }>;
     isRecord: <V_1>(com: (cur: V_1) => boolean, error?: string | undefined) => Validate.Rule<Record<string, V_1>>;
     isMap: <K_1, V_2>(kCom: (cur: K_1) => boolean, vCom: (cur: V_2) => boolean, error?: string | undefined) => Validate.Rule<Map<K_1, V_2>>;
-    isCustom: <T_12>(validity: (v: T_12) => boolean, error?: string | undefined) => Validate.Rule<T_12>;
-    isTime: <T_13 extends Validate.Timeable>(error?: string | undefined) => Validate.Rule<T_13>;
-    isLaterThan: <T_14 extends Validate.Timeable>(compare: Validate.Timeable, error?: string | undefined) => Validate.Rule<T_14>;
-    isEarlierThan: <T_15 extends Validate.Timeable>(compare: Validate.Timeable, error?: string | undefined) => Validate.Rule<T_15>;
+    isCustom: <T_7>(validity: (v: T_7) => boolean, error?: string | undefined) => Validate.Rule<T_7>;
+    isTime: <T_8 extends Validate.Timeable>(error?: string | undefined) => Validate.Rule<T_8>;
+    isLaterThan: <T_9 extends Validate.Timeable>(compare: Validate.Timeable, error?: string | undefined) => Validate.Rule<T_9>;
+    isEarlierThan: <T_10 extends Validate.Timeable>(compare: Validate.Timeable, error?: string | undefined) => Validate.Rule<T_10>;
     capitalize: (text: string) => string;
     stripHTML: (html: string) => string;
     trimToLength: (body: string, length: number) => string;
@@ -98,7 +127,7 @@ export declare const Validation: {
         values: Type_7[];
     }[];
     getAlphabet: (num: number) => string;
-    addToArray: <T_16>(array: T_16[], item: T_16, getKey: (a: T_16) => any, getComparer: (a: T_16) => string | number, asc?: boolean | undefined) => T_16[];
+    addToArray: <T_11>(array: T_11[], item: T_11, getKey: (a: T_11) => any, getComparer: (a: T_11) => string | number, asc?: boolean | undefined) => T_11[];
     divideByZero: (num: number, den: number) => number;
     getPercentage: (num: number, den: number) => number;
     getRandomSample: <Type_8>(population: Type_8[], n: number) => Type_8[];
@@ -115,4 +144,8 @@ export declare const Hash: {
     hash: (password: string) => Promise<string>;
     compare: (plainPassword: string, hashed: string) => Promise<boolean>;
 };
+declare module 'valleyed/lib/rules/files' {
+    interface File extends StorageFile {
+    }
+}
 export {};

package/lib/validations/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hash = exports.validateReq = exports.validate = exports.Validation = void 0;
+exports.Hash = exports.validateReq = exports.validate = exports.Validation = exports.Schema = void 0;
 const bcrypt = __importStar(require("bcryptjs"));
 const Validate = __importStar(require("valleyed"));
 const errors_1 = require("../errors");
@@ -34,7 +34,21 @@ const isNotTruncated = (error) => Validate.makeRule((file) => {
     const valid = val ? !val.isTruncated : true;
     return valid ? Validate.isValid(val) : Validate.isInvalid([error], val);
 });
-exports.Validation = { ...Validate, isNotTruncated };
+const isValidPhone = (error) => Validate.makeRule((value) => {
+    const phone = value;
+    const { code = '', number = '' } = phone ?? {};
+    const isValidCode = Validate.isString()(code).valid &&
+        code.startsWith('+') &&
+        Validate.isNumber()(parseInt(code.slice(1))).valid;
+    const isValidNumber = Validate.isNumber()(parseInt(number)).valid;
+    if (!isValidCode)
+        return Validate.isInvalid([error ?? 'invalid phone code'], phone);
+    if (!isValidNumber)
+        return Validate.isInvalid([error ?? 'invalid phone number'], phone);
+    return Validate.isValid(phone);
+});
+exports.Schema = Validate.v;
+exports.Validation = { ...Validate, isNotTruncated, isValidPhone };
 const validate = (data, rules) => {
     const errors = Object.entries(data)
         .map(([key, value]) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "4.0.0-alpha.5",
+	"version": "4.0.0-alpha.7",
 	"private": false,
 	"description": "",
 	"main": "lib/index.js",
@@ -57,7 +57,7 @@
 		"pug": "^3.0.2",
 		"redis": "^4.6.4",
 		"socket.io": "4.6.0",
-		"valleyed": "^4.0.3"
+		"valleyed": "^4.0.4-alpha.1"
 	},
 	"repository": {
 		"url": "git://github.com/kevinand11/equipped.git"