av6-core 1.3.6 → 1.3.7

package/dist/index.d.mts

@@ -42,6 +42,26 @@ interface FieldRules {
     values?: string[];
     iso?: boolean;
     schema?: Record<string, unknown>;
+    precision?: number;
+    precisionFrom?: "ctx.decimalPrecision";
+    minDate?: "today" | "now";
+    minDateFieldRef?: string;
+    when?: {
+        ref: string;
+        is: string | number | boolean | (string | number | boolean)[];
+        then?: {
+            presence?: "required" | "optional";
+            rules?: FieldRules;
+        };
+        otherwise?: {
+            presence?: "required" | "optional";
+            rules?: FieldRules;
+        };
+    };
+    compare?: {
+        ref: string;
+        op: "gt" | "gte" | "lt" | "lte" | "eq" | "neq";
+    };
 }
 interface FieldConfig {
     name: string;
@@ -407,6 +427,7 @@ type Store = {
     };
     level1Id?: number;
     level2Id?: number;
+    defaultPrecision: number | null;
     [key: string]: any;
 };
 interface Context {

package/dist/index.d.ts

@@ -42,6 +42,26 @@ interface FieldRules {
     values?: string[];
     iso?: boolean;
     schema?: Record<string, unknown>;
+    precision?: number;
+    precisionFrom?: "ctx.decimalPrecision";
+    minDate?: "today" | "now";
+    minDateFieldRef?: string;
+    when?: {
+        ref: string;
+        is: string | number | boolean | (string | number | boolean)[];
+        then?: {
+            presence?: "required" | "optional";
+            rules?: FieldRules;
+        };
+        otherwise?: {
+            presence?: "required" | "optional";
+            rules?: FieldRules;
+        };
+    };
+    compare?: {
+        ref: string;
+        op: "gt" | "gte" | "lt" | "lte" | "eq" | "neq";
+    };
 }
 interface FieldConfig {
     name: string;
@@ -407,6 +427,7 @@ type Store = {
     };
     level1Id?: number;
     level2Id?: number;
+    defaultPrecision: number | null;
     [key: string]: any;
 };
 interface Context {

package/dist/index.js

@@ -1056,7 +1056,41 @@ var commonCreateUpdateRepository = (serviceDeps) => {
 
 // src/utils/dynamicJoiBuilder.utils.ts
 var import_joi = __toESM(require("joi"));
-var buildScalar = (f) => {
+var import_dayjs = __toESM(require("dayjs"));
+function applyNumberCompare(schema, op, ref) {
+  const r = import_joi.default.ref(ref);
+  switch (op) {
+    case "gt":
+      return schema.greater(r);
+    case "gte":
+      return schema.min(r);
+    case "lt":
+      return schema.less(r);
+    case "lte":
+      return schema.max(r);
+    case "eq":
+      return schema.valid(r);
+    // not perfect; better use custom if you need strict equality
+    case "neq":
+      return schema.invalid(r);
+    default:
+      return schema;
+  }
+}
+function resolvePrecision(rule, ctx) {
+  if (typeof rule.precision === "number") return rule.precision;
+  if (rule.precisionFrom === "ctx.decimalPrecision") {
+    return typeof ctx.decimalPrecision === "number" ? ctx.decimalPrecision : void 0;
+  }
+  return void 0;
+}
+function resolveMinDate(rule) {
+  if (!rule.minDate) return void 0;
+  if (rule.minDate === "now") return /* @__PURE__ */ new Date();
+  if (rule.minDate === "today") return (0, import_dayjs.default)().startOf("day").toDate();
+  return void 0;
+}
+var buildScalar = (f, ctx) => {
   const rules = f.rules ?? {};
   let s;
   switch (f.type) {
@@ -1074,6 +1108,11 @@ var buildScalar = (f) => {
       if (rules.integer) j = j.integer();
       if (typeof rules.min === "number") j = j.min(rules.min);
       if (typeof rules.max === "number") j = j.max(rules.max);
+      const p = resolvePrecision(rules, ctx);
+      if (typeof p === "number") s = j.precision(p);
+      if (rules.compare?.ref && rules.compare?.op) {
+        s = applyNumberCompare(j, rules.compare.op, rules.compare.ref);
+      }
       s = j;
       break;
     }
@@ -1082,7 +1121,11 @@ var buildScalar = (f) => {
       break;
     case "date": {
       let j = import_joi.default.date();
-      if (rules.iso) j = j.iso();
+      const minD = resolveMinDate(rules);
+      if (minD) s = j.min(minD);
+      if (rules.minDateFieldRef) {
+        s = j.min(import_joi.default.ref(rules.minDateFieldRef));
+      }
       s = j;
       break;
     }
@@ -1103,32 +1146,46 @@ var buildScalar = (f) => {
   }
   if (f.allowNull) s = s.allow(null);
   if (f.default !== void 0) s = s.default(f.default);
+  if (rules.when?.ref) {
+    const isVal = Array.isArray(rules.when.is) ? rules.when.is : [rules.when.is];
+    const thenPresence = rules.when.then?.presence;
+    const otherwisePresence = rules.when.otherwise?.presence;
+    const thenRules = rules.when.then?.rules;
+    const otherwiseRules = rules.when.otherwise?.rules;
+    const thenSchema = thenRules ? buildScalar({ ...f, rules: { ...rules, ...thenRules } }, ctx) : s;
+    const otherwiseSchema = otherwiseRules ? buildScalar({ ...f, rules: { ...rules, ...otherwiseRules } }, ctx) : s;
+    s = import_joi.default.when(rules.when.ref, {
+      is: import_joi.default.valid(...isVal),
+      then: applyPresence(thenSchema, thenPresence),
+      otherwise: applyPresence(otherwiseSchema, otherwisePresence)
+    });
+  }
   if (f.messages) s = s.messages(f.messages);
   return s;
 };
-var applyPresence = (schema, presence) => {
+function applyPresence(schema, presence) {
   if (presence === "required") return schema.required();
   if (presence === "forbidden") return schema.forbidden();
   return schema.optional();
-};
-var buildRelationSchema = (rel, op) => {
+}
+var buildRelationSchema = (rel, op, ctx) => {
   const itemShape = {};
   for (const f of rel.items.fields) {
-    const scalar = buildScalar(f);
+    const scalar = buildScalar(f, ctx);
     itemShape[f.db] = applyPresence(scalar, f.presence[op]);
   }
   const itemSchema = import_joi.default.object(itemShape);
   const base = rel.kind === "many" ? import_joi.default.array().items(itemSchema) : itemSchema;
   return applyPresence(base, rel.presence[op]);
 };
-var buildJoiSchemaForOp = (cfg, op) => {
+var buildJoiSchemaForOp = (cfg, op, ctx) => {
   const shape = {};
   for (const f of cfg.fields) {
-    const scalar = buildScalar(f);
+    const scalar = buildScalar(f, ctx);
     shape[f.db] = applyPresence(scalar, f.presence[op]);
   }
   for (const rel of cfg.relations ?? []) {
-    shape[rel.db] = buildRelationSchema(rel, op);
+    shape[rel.db] = buildRelationSchema(rel, op, ctx);
   }
   return import_joi.default.object(shape).prefs({
     abortEarly: cfg.validation.abortEarly,
@@ -1519,7 +1576,7 @@ var commonService = (serviceDeps) => {
         throw new ErrorHandler(500, `Configuration not found for short code: ${shortCodeData.shortCode}`);
       }
       const ctx = { userId: currentUser ?? void 0, vars: {} };
-      const schema = buildJoiSchemaForOp(cfg, "create");
+      const schema = buildJoiSchemaForOp(cfg, "create", { decimalPrecision: store?.defaultPrecision ?? 2 });
       const validated = await schema.validateAsync(createParams.body);
       if (validationMapping && validationMapping[shortCodeData.shortCode] && validationMapping[shortCodeData.shortCode].create) {
         await validationMapping[shortCodeData.shortCode].create?.(validated);
@@ -1561,7 +1618,7 @@ var commonService = (serviceDeps) => {
         throw new ErrorHandler(500, `Configuration not found for short code: ${shortCodeData.shortCode}`);
       }
       const ctx = { userId: currentUser ?? void 0, vars: {} };
-      const schema = buildJoiSchemaForOp(cfg, "update");
+      const schema = buildJoiSchemaForOp(cfg, "update", { decimalPrecision: store?.defaultPrecision ?? 2 });
       let validated = await schema.validateAsync(updateParams.body);
       if (validationMapping && validationMapping[shortCodeData.shortCode] && validationMapping[shortCodeData.shortCode].update) {
         validated = { ...validated, id: updateParams.id };
@@ -1805,7 +1862,7 @@ var uinConfigServiceValidation = (uinDeps) => {
 };
 
 // src/services/uinConfig.service.ts
-var import_dayjs = __toESM(require("dayjs"));
+var import_dayjs2 = __toESM(require("dayjs"));
 var import_node_cron = __toESM(require("node-cron"));
 var MS_IN_A_DAY = 24 * 36e5;
 function buildFromSegments(segments, seqValue) {
@@ -1819,7 +1876,7 @@ function buildFromSegments(segments, seqValue) {
         break;
       case "dateFormat":
         try {
-          out += (0, import_dayjs.default)(/* @__PURE__ */ new Date()).format(seg.value);
+          out += (0, import_dayjs2.default)(/* @__PURE__ */ new Date()).format(seg.value);
         } catch {
           console.error("Invalid dateFormat:", seg.value);
         }

package/dist/index.mjs

@@ -1006,7 +1006,41 @@ var commonCreateUpdateRepository = (serviceDeps) => {
 
 // src/utils/dynamicJoiBuilder.utils.ts
 import Joi from "joi";
-var buildScalar = (f) => {
+import dayjs from "dayjs";
+function applyNumberCompare(schema, op, ref) {
+  const r = Joi.ref(ref);
+  switch (op) {
+    case "gt":
+      return schema.greater(r);
+    case "gte":
+      return schema.min(r);
+    case "lt":
+      return schema.less(r);
+    case "lte":
+      return schema.max(r);
+    case "eq":
+      return schema.valid(r);
+    // not perfect; better use custom if you need strict equality
+    case "neq":
+      return schema.invalid(r);
+    default:
+      return schema;
+  }
+}
+function resolvePrecision(rule, ctx) {
+  if (typeof rule.precision === "number") return rule.precision;
+  if (rule.precisionFrom === "ctx.decimalPrecision") {
+    return typeof ctx.decimalPrecision === "number" ? ctx.decimalPrecision : void 0;
+  }
+  return void 0;
+}
+function resolveMinDate(rule) {
+  if (!rule.minDate) return void 0;
+  if (rule.minDate === "now") return /* @__PURE__ */ new Date();
+  if (rule.minDate === "today") return dayjs().startOf("day").toDate();
+  return void 0;
+}
+var buildScalar = (f, ctx) => {
   const rules = f.rules ?? {};
   let s;
   switch (f.type) {
@@ -1024,6 +1058,11 @@ var buildScalar = (f) => {
       if (rules.integer) j = j.integer();
       if (typeof rules.min === "number") j = j.min(rules.min);
       if (typeof rules.max === "number") j = j.max(rules.max);
+      const p = resolvePrecision(rules, ctx);
+      if (typeof p === "number") s = j.precision(p);
+      if (rules.compare?.ref && rules.compare?.op) {
+        s = applyNumberCompare(j, rules.compare.op, rules.compare.ref);
+      }
       s = j;
       break;
     }
@@ -1032,7 +1071,11 @@ var buildScalar = (f) => {
       break;
     case "date": {
       let j = Joi.date();
-      if (rules.iso) j = j.iso();
+      const minD = resolveMinDate(rules);
+      if (minD) s = j.min(minD);
+      if (rules.minDateFieldRef) {
+        s = j.min(Joi.ref(rules.minDateFieldRef));
+      }
       s = j;
       break;
     }
@@ -1053,32 +1096,46 @@ var buildScalar = (f) => {
   }
   if (f.allowNull) s = s.allow(null);
   if (f.default !== void 0) s = s.default(f.default);
+  if (rules.when?.ref) {
+    const isVal = Array.isArray(rules.when.is) ? rules.when.is : [rules.when.is];
+    const thenPresence = rules.when.then?.presence;
+    const otherwisePresence = rules.when.otherwise?.presence;
+    const thenRules = rules.when.then?.rules;
+    const otherwiseRules = rules.when.otherwise?.rules;
+    const thenSchema = thenRules ? buildScalar({ ...f, rules: { ...rules, ...thenRules } }, ctx) : s;
+    const otherwiseSchema = otherwiseRules ? buildScalar({ ...f, rules: { ...rules, ...otherwiseRules } }, ctx) : s;
+    s = Joi.when(rules.when.ref, {
+      is: Joi.valid(...isVal),
+      then: applyPresence(thenSchema, thenPresence),
+      otherwise: applyPresence(otherwiseSchema, otherwisePresence)
+    });
+  }
   if (f.messages) s = s.messages(f.messages);
   return s;
 };
-var applyPresence = (schema, presence) => {
+function applyPresence(schema, presence) {
   if (presence === "required") return schema.required();
   if (presence === "forbidden") return schema.forbidden();
   return schema.optional();
-};
-var buildRelationSchema = (rel, op) => {
+}
+var buildRelationSchema = (rel, op, ctx) => {
   const itemShape = {};
   for (const f of rel.items.fields) {
-    const scalar = buildScalar(f);
+    const scalar = buildScalar(f, ctx);
     itemShape[f.db] = applyPresence(scalar, f.presence[op]);
   }
   const itemSchema = Joi.object(itemShape);
   const base = rel.kind === "many" ? Joi.array().items(itemSchema) : itemSchema;
   return applyPresence(base, rel.presence[op]);
 };
-var buildJoiSchemaForOp = (cfg, op) => {
+var buildJoiSchemaForOp = (cfg, op, ctx) => {
   const shape = {};
   for (const f of cfg.fields) {
-    const scalar = buildScalar(f);
+    const scalar = buildScalar(f, ctx);
     shape[f.db] = applyPresence(scalar, f.presence[op]);
   }
   for (const rel of cfg.relations ?? []) {
-    shape[rel.db] = buildRelationSchema(rel, op);
+    shape[rel.db] = buildRelationSchema(rel, op, ctx);
   }
   return Joi.object(shape).prefs({
     abortEarly: cfg.validation.abortEarly,
@@ -1469,7 +1526,7 @@ var commonService = (serviceDeps) => {
         throw new ErrorHandler(500, `Configuration not found for short code: ${shortCodeData.shortCode}`);
       }
       const ctx = { userId: currentUser ?? void 0, vars: {} };
-      const schema = buildJoiSchemaForOp(cfg, "create");
+      const schema = buildJoiSchemaForOp(cfg, "create", { decimalPrecision: store?.defaultPrecision ?? 2 });
       const validated = await schema.validateAsync(createParams.body);
       if (validationMapping && validationMapping[shortCodeData.shortCode] && validationMapping[shortCodeData.shortCode].create) {
         await validationMapping[shortCodeData.shortCode].create?.(validated);
@@ -1511,7 +1568,7 @@ var commonService = (serviceDeps) => {
         throw new ErrorHandler(500, `Configuration not found for short code: ${shortCodeData.shortCode}`);
       }
       const ctx = { userId: currentUser ?? void 0, vars: {} };
-      const schema = buildJoiSchemaForOp(cfg, "update");
+      const schema = buildJoiSchemaForOp(cfg, "update", { decimalPrecision: store?.defaultPrecision ?? 2 });
       let validated = await schema.validateAsync(updateParams.body);
       if (validationMapping && validationMapping[shortCodeData.shortCode] && validationMapping[shortCodeData.shortCode].update) {
         validated = { ...validated, id: updateParams.id };
@@ -1755,7 +1812,7 @@ var uinConfigServiceValidation = (uinDeps) => {
 };
 
 // src/services/uinConfig.service.ts
-import dayjs from "dayjs";
+import dayjs2 from "dayjs";
 import cron from "node-cron";
 var MS_IN_A_DAY = 24 * 36e5;
 function buildFromSegments(segments, seqValue) {
@@ -1769,7 +1826,7 @@ function buildFromSegments(segments, seqValue) {
         break;
       case "dateFormat":
         try {
-          out += dayjs(/* @__PURE__ */ new Date()).format(seg.value);
+          out += dayjs2(/* @__PURE__ */ new Date()).format(seg.value);
         } catch {
           console.error("Invalid dateFormat:", seg.value);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",