av6-core 1.6.0 → 1.6.2

package/dist/index.js

@@ -1320,15 +1320,11 @@ function customOmit(obj, keys) {
   return { rest, omitted };
 }
 function getDynamicValue(obj, accessorKey) {
-  if (!accessorKey || obj == null || typeof obj !== "object") {
-    return null;
-  }
+  if (!accessorKey || obj == null || typeof obj !== "object") return null;
   const keys = accessorKey.split(".");
   let result = obj;
   for (const key of keys) {
-    if (result == null || typeof result !== "object" || !(key in result)) {
-      return null;
-    }
+    if (result == null || typeof result !== "object" || !(key in result)) return null;
     result = result[key];
   }
   return result === void 0 ? null : result;
@@ -1592,6 +1588,213 @@ var buildJoiSchemaForOp = (cfg, op, ctx) => {
   });
 };
 
+// src/utils/dynamicOperation.utils.ts
+var OP_PRECEDENCE = {
+  "u-": 3,
+  // unary minus
+  "*": 2,
+  "/": 2,
+  "%": 2,
+  "+": 1,
+  "-": 1
+};
+var OP_ASSOC = {
+  "u-": "R",
+  "*": "L",
+  "/": "L",
+  "%": "L",
+  "+": "L",
+  "-": "L"
+};
+function isDigit(ch) {
+  return ch >= "0" && ch <= "9";
+}
+function isIdentStart(ch) {
+  return /[A-Za-z_$]/.test(ch);
+}
+function isIdentPart(ch) {
+  return /[A-Za-z0-9_$]/.test(ch);
+}
+function tokenize(expr) {
+  const tokens = [];
+  let i = 0;
+  while (i < expr.length) {
+    const ch = expr[i];
+    if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
+      i++;
+      continue;
+    }
+    if (ch === "(" || ch === ")") {
+      tokens.push({ type: "paren", value: ch });
+      i++;
+      continue;
+    }
+    if (ch === "+" || ch === "-" || ch === "*" || ch === "/" || ch === "%") {
+      tokens.push({ type: "op", value: ch });
+      i++;
+      continue;
+    }
+    if (isDigit(ch) || ch === "." && isDigit(expr[i + 1] ?? "")) {
+      let j = i;
+      let seenDot = false;
+      while (j < expr.length) {
+        const c = expr[j];
+        if (c === ".") {
+          if (seenDot) break;
+          seenDot = true;
+          j++;
+          continue;
+        }
+        if (!isDigit(c)) break;
+        j++;
+      }
+      const raw = expr.slice(i, j);
+      const num = Number(raw);
+      tokens.push({ type: "number", value: num });
+      i = j;
+      continue;
+    }
+    if (isIdentStart(ch)) {
+      let j = i;
+      while (j < expr.length) {
+        const c = expr[j];
+        if (c === ".") {
+          j++;
+          continue;
+        }
+        if (!isIdentPart(c)) break;
+        j++;
+      }
+      const ident = expr.slice(i, j);
+      tokens.push({ type: "ident", value: ident });
+      i = j;
+      continue;
+    }
+    throw new Error(`Invalid character in expression: "${ch}" at position ${i}`);
+  }
+  const out = [];
+  for (let k = 0; k < tokens.length; k++) {
+    const t = tokens[k];
+    if (t.type === "op" && t.value === "-") {
+      const prev = out[out.length - 1];
+      const isUnary = !prev || prev.type === "op" || prev.type === "paren" && prev.value === "(";
+      out.push({ type: "op", value: isUnary ? "u-" : "-" });
+    } else {
+      out.push(t);
+    }
+  }
+  return out;
+}
+function toRpn(tokens) {
+  const output = [];
+  const stack = [];
+  for (const t of tokens) {
+    if (t.type === "number" || t.type === "ident") {
+      output.push(t);
+      continue;
+    }
+    if (t.type === "op") {
+      while (stack.length) {
+        const top = stack[stack.length - 1];
+        if (top.type !== "op") break;
+        const pTop = OP_PRECEDENCE[top.value];
+        const pCur = OP_PRECEDENCE[t.value];
+        const shouldPop = OP_ASSOC[t.value] === "L" && pCur <= pTop || OP_ASSOC[t.value] === "R" && pCur < pTop;
+        if (!shouldPop) break;
+        output.push(stack.pop());
+      }
+      stack.push(t);
+      continue;
+    }
+    if (t.type === "paren" && t.value === "(") {
+      stack.push(t);
+      continue;
+    }
+    if (t.type === "paren" && t.value === ")") {
+      let foundLeft = false;
+      while (stack.length) {
+        const top = stack.pop();
+        if (top.type === "paren" && top.value === "(") {
+          foundLeft = true;
+          break;
+        }
+        output.push(top);
+      }
+      if (!foundLeft) throw new Error("Mismatched parentheses");
+      continue;
+    }
+  }
+  while (stack.length) {
+    const top = stack.pop();
+    if (top.type === "paren") throw new Error("Mismatched parentheses");
+    output.push(top);
+  }
+  return output;
+}
+function evalRpn(rpn, rowObj) {
+  const stack = [];
+  const toNumberOrNull2 = (v) => {
+    if (v === null || v === void 0 || v === "") return null;
+    const n = typeof v === "number" ? v : Number(v);
+    return Number.isFinite(n) ? n : null;
+  };
+  for (const t of rpn) {
+    if (t.type === "number") {
+      stack.push(t.value);
+      continue;
+    }
+    if (t.type === "ident") {
+      const v = getDynamicValue(rowObj, t.value);
+      const n = toNumberOrNull2(v);
+      if (n === null) return null;
+      stack.push(n);
+      continue;
+    }
+    if (t.type === "op") {
+      if (t.value === "u-") {
+        if (stack.length < 1) throw new Error("Bad expression (unary -)");
+        const a2 = stack.pop();
+        stack.push(-a2);
+        continue;
+      }
+      if (stack.length < 2) throw new Error("Bad expression (binary op)");
+      const b = stack.pop();
+      const a = stack.pop();
+      switch (t.value) {
+        case "+":
+          stack.push(a + b);
+          break;
+        case "-":
+          stack.push(a - b);
+          break;
+        case "*":
+          stack.push(a * b);
+          break;
+        case "/":
+          stack.push(b === 0 ? NaN : a / b);
+          break;
+        case "%":
+          stack.push(b === 0 ? NaN : a % b);
+          break;
+      }
+      continue;
+    }
+  }
+  if (stack.length !== 1) throw new Error("Bad expression (final stack)");
+  const res = stack[0];
+  return Number.isFinite(res) ? res : null;
+}
+function getDynamicValueOrExpression(obj, accessorOrExpr) {
+  const s = (accessorOrExpr ?? "").trim();
+  if (!s) return null;
+  if (/[+\-*/%()]/.test(s)) {
+    const tokens = tokenize(s);
+    const rpn = toRpn(tokens);
+    return evalRpn(rpn, obj);
+  }
+  return getDynamicValue(obj, s);
+}
+
 // src/services/common.service.ts
 var import_axios = __toESM(require("axios"));
 var import_exceljs = __toESM(require("exceljs"));
@@ -1643,7 +1846,7 @@ var commonService = (serviceDeps) => {
         ws.addRow(headers).font = { bold: true };
         for (const element of commonData.data) {
           const row = searchParams.config.map((config) => {
-            const value = getDynamicValue(element, config.accessorKey);
+            const value = getDynamicValueOrExpression(element, config.accessorKey);
             return value === null || value === void 0 ? "" : value;
           });
           ws.addRow(row);
@@ -1661,7 +1864,7 @@ var commonService = (serviceDeps) => {
           const detail = searchParams.config?.reduce(
             (acc, curr) => ({
               ...acc,
-              [curr.label]: getDynamicValue(element, curr.accessorKey)
+              [curr.label]: getDynamicValueOrExpression(element, curr.accessorKey)
             }),
             {}
           );
@@ -1689,7 +1892,7 @@ var commonService = (serviceDeps) => {
           ws.addRow(headers).font = { bold: true };
           for (const element2 of detailsList) {
             const row = searchParams.detailedConfig.map((config) => {
-              const value = getDynamicValue(element2, config.accessorKey);
+              const value = getDynamicValueOrExpression(element2, config.accessorKey);
               return value === null || value === void 0 ? "" : value;
             });
             ws.addRow(row);
@@ -3431,7 +3634,7 @@ var NotificationService = class {
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
     if (!tpl) return;
     let appUrlTpl = null;
-    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.webNotificationUrlTemplateId) {
+    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.appNotificationUrlTemplateId) {
       appUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationUrlTemplateId } });
     }
     const userIds = (args.recipients ?? []).map((x) => Number(x)).filter((n) => Number.isFinite(n) && n > 0);
@@ -3447,7 +3650,7 @@ var NotificationService = class {
       this.logger,
       cfg.serviceEvent.appNotificationApiUrl ?? void 0
     );
-    const priority = cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "default";
+    const priority = "high";
     const channelId = cfg.channelId ?? "default";
     const messages = [];
     const tokenToUserId = /* @__PURE__ */ new Map();
@@ -3734,9 +3937,11 @@ var NotificationService = class {
       async (recipient) => {
         const res = await args.provider.send({
           recipient,
-          bodyValues: args.bodyValues,
-          provider: args.provider
+          bodyValues: args.bodyValues
+          // provider: args.provider,
           // these extra fields exist in your old types; provider.send will ignore extras if not used
+          // eventConfigId: 0,
+          // evt
         });
         return {
           recipient,

package/dist/index.mjs

@@ -1270,15 +1270,11 @@ function customOmit(obj, keys) {
   return { rest, omitted };
 }
 function getDynamicValue(obj, accessorKey) {
-  if (!accessorKey || obj == null || typeof obj !== "object") {
-    return null;
-  }
+  if (!accessorKey || obj == null || typeof obj !== "object") return null;
   const keys = accessorKey.split(".");
   let result = obj;
   for (const key of keys) {
-    if (result == null || typeof result !== "object" || !(key in result)) {
-      return null;
-    }
+    if (result == null || typeof result !== "object" || !(key in result)) return null;
     result = result[key];
   }
   return result === void 0 ? null : result;
@@ -1542,6 +1538,213 @@ var buildJoiSchemaForOp = (cfg, op, ctx) => {
   });
 };
 
+// src/utils/dynamicOperation.utils.ts
+var OP_PRECEDENCE = {
+  "u-": 3,
+  // unary minus
+  "*": 2,
+  "/": 2,
+  "%": 2,
+  "+": 1,
+  "-": 1
+};
+var OP_ASSOC = {
+  "u-": "R",
+  "*": "L",
+  "/": "L",
+  "%": "L",
+  "+": "L",
+  "-": "L"
+};
+function isDigit(ch) {
+  return ch >= "0" && ch <= "9";
+}
+function isIdentStart(ch) {
+  return /[A-Za-z_$]/.test(ch);
+}
+function isIdentPart(ch) {
+  return /[A-Za-z0-9_$]/.test(ch);
+}
+function tokenize(expr) {
+  const tokens = [];
+  let i = 0;
+  while (i < expr.length) {
+    const ch = expr[i];
+    if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
+      i++;
+      continue;
+    }
+    if (ch === "(" || ch === ")") {
+      tokens.push({ type: "paren", value: ch });
+      i++;
+      continue;
+    }
+    if (ch === "+" || ch === "-" || ch === "*" || ch === "/" || ch === "%") {
+      tokens.push({ type: "op", value: ch });
+      i++;
+      continue;
+    }
+    if (isDigit(ch) || ch === "." && isDigit(expr[i + 1] ?? "")) {
+      let j = i;
+      let seenDot = false;
+      while (j < expr.length) {
+        const c = expr[j];
+        if (c === ".") {
+          if (seenDot) break;
+          seenDot = true;
+          j++;
+          continue;
+        }
+        if (!isDigit(c)) break;
+        j++;
+      }
+      const raw = expr.slice(i, j);
+      const num = Number(raw);
+      tokens.push({ type: "number", value: num });
+      i = j;
+      continue;
+    }
+    if (isIdentStart(ch)) {
+      let j = i;
+      while (j < expr.length) {
+        const c = expr[j];
+        if (c === ".") {
+          j++;
+          continue;
+        }
+        if (!isIdentPart(c)) break;
+        j++;
+      }
+      const ident = expr.slice(i, j);
+      tokens.push({ type: "ident", value: ident });
+      i = j;
+      continue;
+    }
+    throw new Error(`Invalid character in expression: "${ch}" at position ${i}`);
+  }
+  const out = [];
+  for (let k = 0; k < tokens.length; k++) {
+    const t = tokens[k];
+    if (t.type === "op" && t.value === "-") {
+      const prev = out[out.length - 1];
+      const isUnary = !prev || prev.type === "op" || prev.type === "paren" && prev.value === "(";
+      out.push({ type: "op", value: isUnary ? "u-" : "-" });
+    } else {
+      out.push(t);
+    }
+  }
+  return out;
+}
+function toRpn(tokens) {
+  const output = [];
+  const stack = [];
+  for (const t of tokens) {
+    if (t.type === "number" || t.type === "ident") {
+      output.push(t);
+      continue;
+    }
+    if (t.type === "op") {
+      while (stack.length) {
+        const top = stack[stack.length - 1];
+        if (top.type !== "op") break;
+        const pTop = OP_PRECEDENCE[top.value];
+        const pCur = OP_PRECEDENCE[t.value];
+        const shouldPop = OP_ASSOC[t.value] === "L" && pCur <= pTop || OP_ASSOC[t.value] === "R" && pCur < pTop;
+        if (!shouldPop) break;
+        output.push(stack.pop());
+      }
+      stack.push(t);
+      continue;
+    }
+    if (t.type === "paren" && t.value === "(") {
+      stack.push(t);
+      continue;
+    }
+    if (t.type === "paren" && t.value === ")") {
+      let foundLeft = false;
+      while (stack.length) {
+        const top = stack.pop();
+        if (top.type === "paren" && top.value === "(") {
+          foundLeft = true;
+          break;
+        }
+        output.push(top);
+      }
+      if (!foundLeft) throw new Error("Mismatched parentheses");
+      continue;
+    }
+  }
+  while (stack.length) {
+    const top = stack.pop();
+    if (top.type === "paren") throw new Error("Mismatched parentheses");
+    output.push(top);
+  }
+  return output;
+}
+function evalRpn(rpn, rowObj) {
+  const stack = [];
+  const toNumberOrNull2 = (v) => {
+    if (v === null || v === void 0 || v === "") return null;
+    const n = typeof v === "number" ? v : Number(v);
+    return Number.isFinite(n) ? n : null;
+  };
+  for (const t of rpn) {
+    if (t.type === "number") {
+      stack.push(t.value);
+      continue;
+    }
+    if (t.type === "ident") {
+      const v = getDynamicValue(rowObj, t.value);
+      const n = toNumberOrNull2(v);
+      if (n === null) return null;
+      stack.push(n);
+      continue;
+    }
+    if (t.type === "op") {
+      if (t.value === "u-") {
+        if (stack.length < 1) throw new Error("Bad expression (unary -)");
+        const a2 = stack.pop();
+        stack.push(-a2);
+        continue;
+      }
+      if (stack.length < 2) throw new Error("Bad expression (binary op)");
+      const b = stack.pop();
+      const a = stack.pop();
+      switch (t.value) {
+        case "+":
+          stack.push(a + b);
+          break;
+        case "-":
+          stack.push(a - b);
+          break;
+        case "*":
+          stack.push(a * b);
+          break;
+        case "/":
+          stack.push(b === 0 ? NaN : a / b);
+          break;
+        case "%":
+          stack.push(b === 0 ? NaN : a % b);
+          break;
+      }
+      continue;
+    }
+  }
+  if (stack.length !== 1) throw new Error("Bad expression (final stack)");
+  const res = stack[0];
+  return Number.isFinite(res) ? res : null;
+}
+function getDynamicValueOrExpression(obj, accessorOrExpr) {
+  const s = (accessorOrExpr ?? "").trim();
+  if (!s) return null;
+  if (/[+\-*/%()]/.test(s)) {
+    const tokens = tokenize(s);
+    const rpn = toRpn(tokens);
+    return evalRpn(rpn, obj);
+  }
+  return getDynamicValue(obj, s);
+}
+
 // src/services/common.service.ts
 import axios from "axios";
 import ExcelJs from "exceljs";
@@ -1593,7 +1796,7 @@ var commonService = (serviceDeps) => {
         ws.addRow(headers).font = { bold: true };
         for (const element of commonData.data) {
           const row = searchParams.config.map((config) => {
-            const value = getDynamicValue(element, config.accessorKey);
+            const value = getDynamicValueOrExpression(element, config.accessorKey);
             return value === null || value === void 0 ? "" : value;
           });
           ws.addRow(row);
@@ -1611,7 +1814,7 @@ var commonService = (serviceDeps) => {
           const detail = searchParams.config?.reduce(
             (acc, curr) => ({
               ...acc,
-              [curr.label]: getDynamicValue(element, curr.accessorKey)
+              [curr.label]: getDynamicValueOrExpression(element, curr.accessorKey)
             }),
             {}
           );
@@ -1639,7 +1842,7 @@ var commonService = (serviceDeps) => {
           ws.addRow(headers).font = { bold: true };
           for (const element2 of detailsList) {
             const row = searchParams.detailedConfig.map((config) => {
-              const value = getDynamicValue(element2, config.accessorKey);
+              const value = getDynamicValueOrExpression(element2, config.accessorKey);
               return value === null || value === void 0 ? "" : value;
             });
             ws.addRow(row);
@@ -3381,7 +3584,7 @@ var NotificationService = class {
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
     if (!tpl) return;
     let appUrlTpl = null;
-    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.webNotificationUrlTemplateId) {
+    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.appNotificationUrlTemplateId) {
       appUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationUrlTemplateId } });
     }
     const userIds = (args.recipients ?? []).map((x) => Number(x)).filter((n) => Number.isFinite(n) && n > 0);
@@ -3397,7 +3600,7 @@ var NotificationService = class {
       this.logger,
       cfg.serviceEvent.appNotificationApiUrl ?? void 0
     );
-    const priority = cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "default";
+    const priority = "high";
     const channelId = cfg.channelId ?? "default";
     const messages = [];
     const tokenToUserId = /* @__PURE__ */ new Map();
@@ -3684,9 +3887,11 @@ var NotificationService = class {
       async (recipient) => {
         const res = await args.provider.send({
           recipient,
-          bodyValues: args.bodyValues,
-          provider: args.provider
+          bodyValues: args.bodyValues
+          // provider: args.provider,
           // these extra fields exist in your old types; provider.send will ignore extras if not used
+          // eventConfigId: 0,
+          // evt
         });
         return {
           recipient,

package/package.json

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