Fixed module structure

default.ts

@@ -0,0 +1,3 @@
+import * as all from "./index";
+
+export default all;

index.ts

@@ -1,9 +1,8 @@
-import validator from "./src/validator";
-
-export const getOptions = validator.getOptions;
-
-export const setLocales = validator.setLocales;
-
-export const setOptions = validator.setOptions;
-
-export const validate = validator.validate;
+export * from "./src/Options";
+export * from "./src/helpers/validate";
+export * from "./src/Locale";
+export * from "./src/rules";
+export * from "./src/converters";
+export * from "./src/Constants";
+export * from "./src/Interface";
+export * from "./src/Types";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "robust-validator",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Rule-based data validation library",
   "exports": {
     ".": {

rollup.config.mjs

@@ -11,7 +11,7 @@ import path from "path";
 const outputFileName = "bundle";
 const name = "bundle";
 const namedInput = "./index.ts";
-const defaultInput = "./src/validator.ts";
+const defaultInput = "./default.ts";
 
 const buildConfig = ({
   es5,

src/Constants.ts

@@ -1,5 +1,5 @@
 import { RuleType, RuleFunction } from "./Types";
-import rules from "./rules";
+import * as rules from "./rules";
 import { IOptions } from "./Interface";
 
 export const RULE_FUNCTION_MAPS: Record<RuleType, RuleFunction> = {

src/Types.ts

@@ -82,3 +82,5 @@ export type LanguageType =
   | "zh";
 
 export type Translation = Record<RuleType, string>;
+
+export type Definition = Record<string, string | string[]>;

src/converters/accepted.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "accepted";
+};

src/converters/after.ts

@@ -0,0 +1,3 @@
+export default (date: string): string => {
+  return `after:${date}`;
+};

src/converters/afterOrEqual.ts

@@ -0,0 +1,3 @@
+export default (date: string): string => {
+  return `after_or_equal:${date}`;
+};

src/converters/alpha.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "alpha";
+};

src/converters/alphaDash.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "alpha_dash";
+};

src/converters/alphaNum.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "alpha_num";
+};

src/converters/array.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "array";
+};

src/converters/before.ts

@@ -0,0 +1,3 @@
+export default (date: string): string => {
+  return `before:${date}`;
+};

src/converters/beforeOrEqual.ts

@@ -0,0 +1,3 @@
+export default (date: string): string => {
+  return `before_or_equal:${date}`;
+};

src/converters/between.ts

@@ -0,0 +1,3 @@
+export default (min: number, max: number): string => {
+  return `between:${min},${max}`;
+};

src/converters/boolean.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "boolean";
+};

src/converters/confirmed.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "confirmed";
+};

src/converters/date.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "date";
+};

src/converters/digits.ts

@@ -0,0 +1,3 @@
+export default (length: number): string => {
+  return `digits:${length}`;
+};

src/converters/digitsBetween.ts

@@ -0,0 +1,3 @@
+export default (min: number, max: number): string => {
+  return `digits_between:${min},${max}`;
+};

src/converters/email.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "email";
+};

src/converters/hex.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "hex";
+};

src/converters/in.ts

@@ -0,0 +1,3 @@
+export default (items: string[]): string => {
+  return `in:${items.join(",")}`;
+};

src/converters/index.ts

@@ -0,0 +1,57 @@
+import accepted from "./accepted";
+import after from "./after";
+import afterOrEqual from "./afterOrEqual";
+import alpha from "./alpha";
+import alphaDash from "./alphaDash";
+import alphaNum from "./alphaNum";
+import array from "./array";
+import before from "./before";
+import beforeOrEqual from "./beforeOrEqual";
+import between from "./between";
+import boolean from "./boolean";
+import confirmed from "./confirmed";
+import date from "./date";
+import digits from "./digits";
+import digitsBetween from "./digitsBetween";
+import email from "./email";
+import hex from "./hex";
+import inConverter from "./in";
+import integer from "./integer";
+import max from "./max";
+import min from "./min";
+import notIn from "./notIn";
+import numeric from "./numeric";
+import required from "./required";
+import size from "./size";
+import string from "./string";
+import url from "./url";
+
+export {
+  accepted,
+  after,
+  afterOrEqual,
+  alpha,
+  alphaDash,
+  alphaNum,
+  array,
+  before,
+  beforeOrEqual,
+  between,
+  boolean,
+  confirmed,
+  date,
+  digits,
+  digitsBetween,
+  email,
+  hex,
+  inConverter,
+  integer,
+  max,
+  min,
+  notIn,
+  numeric,
+  required,
+  size,
+  string,
+  url,
+};

src/converters/integer.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "integer";
+};

src/converters/max.ts

@@ -0,0 +1,3 @@
+export default (value: number): string => {
+  return `max:${value}`;
+};

src/converters/min.ts

@@ -0,0 +1,3 @@
+export default (value: number): string => {
+  return `min:${value}`;
+};

src/converters/notIn.ts

@@ -0,0 +1,3 @@
+export default (items: string[]): string => {
+  return `not_in:${items.join(",")}`;
+};

src/converters/numeric.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "numeric";
+};

src/converters/required.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "required";
+};

src/converters/size.ts

@@ -0,0 +1,3 @@
+export default (value: number): string => {
+  return `size:${value}`;
+};

src/converters/string.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "string";
+};

src/converters/url.ts

@@ -0,0 +1,3 @@
+export default (): string => {
+  return "url";
+};

src/helpers/validate.ts

@@ -1,13 +1,13 @@
 import { IContext, IOptions, IValidationResult } from "../Interface";
 import { getMessage } from "../Locale";
-import { ValidationResult } from "../Types";
+import { Definition, ValidationResult } from "../Types";
 import { toRuleDefinition } from "../Factory";
 import { getValueViaPath } from "./getValueViaPath";
 import { getOptions } from "../Options";
 
 export const validate = async (
   data: any,
-  definition: Record<string, string>,
+  definition: Definition,
   options?: Partial<IOptions>
 ): Promise<IValidationResult> => {
   const currentOptions: IOptions = {
@@ -31,7 +31,7 @@ export const validate = async (
 
 const getResults = async (
   data: any,
-  definition: Record<string, string>,
+  definition: Definition,
   options: IOptions
 ) => {
   let isValid = true;
@@ -42,7 +42,15 @@ const getResults = async (
   for (const key in definition) {
     fields[key] = true;
     // Parsing the rules
-    const rules = toRuleNameArray(definition[key]).map(toRuleDefinition);
+    const params = definition[key];
+    let ruleGroup: string = "";
+    if (Array.isArray(params)) {
+      ruleGroup = params.join("|");
+    } else {
+      ruleGroup = params;
+    }
+
+    const rules = toRuleNameArray(ruleGroup).map(toRuleDefinition);
 
     // Getting the value by the path
     const value = getValueViaPath(data, key);

src/rules/index.ts

@@ -26,7 +26,7 @@ import isSize from "./isSize";
 import isString from "./isString";
 import isUrl from "./isUrl";
 
-export default {
+export {
   isAccepted,
   isAfter,
   isAfterOrEqual,

tests/Locale.test.ts

@@ -1,7 +1,5 @@
 import { describe, test, expect } from "vitest";
-import { LanguageType } from "../src/Types";
-import { setLocales } from "../src/Locale";
-import { ILocale } from "../src/Interface";
+import { LanguageType, setLocales, ILocale } from "../index";
 
 const LANGUAGES: Record<LanguageType, string> = {
   ar: "ar",

tests/consumers/cjs/index.js

@@ -1,4 +1,4 @@
-const { validate, setLocales } = require("robust-validator");
+const { validate, setLocales, isEmail } = require("robust-validator");
 const en = require("robust-validator/dist/i18n/en.json");
 
 const data = {
@@ -22,6 +22,7 @@ const main = async () => {
   }
 
   console.log("CJS module tests are succeed!");
+  console.log("isEmail", isEmail);
 };
 
 main();

tests/consumers/esm/index.js

@@ -1,7 +1,7 @@
 import pkg from "robust-validator";
 import en from "robust-validator/dist/i18n/en.json" assert { type: "json" };
 
-const { validate, setLocales } = pkg;
+const { validate, setLocales, isEmail } = pkg;
 
 const data = {
   email: null,
@@ -24,6 +24,7 @@ const main = async () => {
   }
 
   console.log("ESM module tests are succeed!");
+  console.log("isEmail", isEmail);
 };
 
 main();

tests/consumers/ts/index.ts

@@ -1,4 +1,4 @@
-import { validate, setLocales, setOptions } from "robust-validator";
+import { validate, setLocales, setOptions, isEmail } from "robust-validator";
 import en from "robust-validator/dist/i18n/en.json";
 
 const data = {
@@ -25,6 +25,7 @@ const main = async () => {
   }
 
   console.log("ESM module tests are succeed!");
+  console.log("isEmail", isEmail);
 };
 
 main();