av6-core 1.7.4 → 1.7.6

package/dist/index.d.mts

@@ -533,7 +533,7 @@ declare const getPattern: {
 };
 declare const interpolate: (template: string, vars: Record<string, unknown>) => string;
 declare const fromTimestampToSqlDatetime: (date: string) => string;
-declare function formatDatesDeep(data: any, format?: string): any;
+declare function formatDatesDeep<T>(data: T, format?: string): T;
 
 interface CreateTransaction {
     field: string;

package/dist/index.d.ts

@@ -533,7 +533,7 @@ declare const getPattern: {
 };
 declare const interpolate: (template: string, vars: Record<string, unknown>) => string;
 declare const fromTimestampToSqlDatetime: (date: string) => string;
-declare function formatDatesDeep(data: any, format?: string): any;
+declare function formatDatesDeep<T>(data: T, format?: string): T;
 
 interface CreateTransaction {
     field: string;

package/dist/index.js

@@ -1446,9 +1446,9 @@ function formatDatesDeep(data, format = "YYYY-MM-DD") {
     const result = {};
     for (const key in data) {
       const value = data[key];
-      if (value instanceof Date || (0, import_dayjs.default)(value).isValid()) {
+      if (value instanceof Date || typeof value === "string" && (0, import_dayjs.default)(value, "YYYY-MM-DD", true).isValid()) {
         result[key] = (0, import_dayjs.default)(value).format(format);
-      } else if (Array.isArray(value) || typeof value === "object") {
+      } else if (Array.isArray(value) || typeof value === "object" && value !== null) {
         result[key] = formatDatesDeep(value, format);
       } else {
         result[key] = value;
@@ -3452,9 +3452,31 @@ function renderTemplate(tpl, data) {
 function renderEmailTemplate(tpl, data) {
   return {
     subject: tpl.subject ? import_handlebars.default.compile(tpl.subject)(data) : void 0,
-    body: import_handlebars.default.compile(tpl.body)(data)
+    body: import_handlebars.default.compile(convertArrayPatternToEachBlocksGeneric(tpl.body))(data)
   };
 }
+var convertArrayPatternToEachBlocksGeneric = (html) => {
+  if (!html) return "";
+  const blockTags = ["tr", "div", "li", "section", "tbody"];
+  let output = html;
+  blockTags.forEach((tag) => {
+    const regex = new RegExp(`<${tag}\\b[^>]*>[\\s\\S]*?<\\/${tag}>`, "g");
+    output = output.replace(regex, (blockHtml) => {
+      const matches = [...blockHtml.matchAll(/{{\s*([a-zA-Z0-9_.-]+)\[\]\.([a-zA-Z0-9_.-]+)\s*}}/g)];
+      if (!matches.length) return blockHtml;
+      const uniqueArrays = Array.from(new Set(matches.map((m) => m[1])));
+      if (uniqueArrays.length !== 1) return blockHtml;
+      const arrayName = uniqueArrays[0];
+      const escapedArray = arrayName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const cleanedBlock = blockHtml.replace(
+        new RegExp(`{{\\s*${escapedArray}\\[\\]\\.([a-zA-Z0-9_.-]+)\\s*}}`, "g"),
+        "{{$1}}"
+      );
+      return `{{#each ${arrayName}}}${cleanedBlock}{{/each}}`;
+    });
+  });
+  return output;
+};
 
 // src/services/notification.service.ts
 var import_lodash = __toESM(require("lodash.merge"));

package/dist/index.mjs

@@ -1394,9 +1394,9 @@ function formatDatesDeep(data, format = "YYYY-MM-DD") {
     const result = {};
     for (const key in data) {
       const value = data[key];
-      if (value instanceof Date || dayjs(value).isValid()) {
+      if (value instanceof Date || typeof value === "string" && dayjs(value, "YYYY-MM-DD", true).isValid()) {
         result[key] = dayjs(value).format(format);
-      } else if (Array.isArray(value) || typeof value === "object") {
+      } else if (Array.isArray(value) || typeof value === "object" && value !== null) {
         result[key] = formatDatesDeep(value, format);
       } else {
         result[key] = value;
@@ -3400,9 +3400,31 @@ function renderTemplate(tpl, data) {
 function renderEmailTemplate(tpl, data) {
   return {
     subject: tpl.subject ? Handlebars.compile(tpl.subject)(data) : void 0,
-    body: Handlebars.compile(tpl.body)(data)
+    body: Handlebars.compile(convertArrayPatternToEachBlocksGeneric(tpl.body))(data)
   };
 }
+var convertArrayPatternToEachBlocksGeneric = (html) => {
+  if (!html) return "";
+  const blockTags = ["tr", "div", "li", "section", "tbody"];
+  let output = html;
+  blockTags.forEach((tag) => {
+    const regex = new RegExp(`<${tag}\\b[^>]*>[\\s\\S]*?<\\/${tag}>`, "g");
+    output = output.replace(regex, (blockHtml) => {
+      const matches = [...blockHtml.matchAll(/{{\s*([a-zA-Z0-9_.-]+)\[\]\.([a-zA-Z0-9_.-]+)\s*}}/g)];
+      if (!matches.length) return blockHtml;
+      const uniqueArrays = Array.from(new Set(matches.map((m) => m[1])));
+      if (uniqueArrays.length !== 1) return blockHtml;
+      const arrayName = uniqueArrays[0];
+      const escapedArray = arrayName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const cleanedBlock = blockHtml.replace(
+        new RegExp(`{{\\s*${escapedArray}\\[\\]\\.([a-zA-Z0-9_.-]+)\\s*}}`, "g"),
+        "{{$1}}"
+      );
+      return `{{#each ${arrayName}}}${cleanedBlock}{{/each}}`;
+    });
+  });
+  return output;
+};
 
 // src/services/notification.service.ts
 import merge from "lodash.merge";

package/package.json

@@ -1,39 +1,38 @@
-{
-  "name": "av6-core",
-  "version": "1.7.4",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "description": "All utility function for av6 node js projects.",
-  "author": "Aniket Sarkar",
-  "license": "ISC",
-  "scripts": {
-    "build": "npm run format && tsup",
-    "p:gen": "prisma generate",
-    "format": "prettier --write **/*.ts"
-  },
-  "devDependencies": {
-    "@prisma/client": "^6.19.0",
-    "@types/lodash.merge": "^4.6.9",
-    "@types/nodemailer": "^7.0.3",
-    "tsup": "^8.5.0",
-    "typescript": "^5.9.2"
-  },
-  "peerDependencies": {
-    "@prisma/client": "^6.19.0",
-    "winston": "^3.17.0"
-  },
-  "dependencies": {
-    "av6-utils": "^1.0.4",
-    "axios": "^1.11.0",
-    "dayjs": "^1.11.19",
-    "exceljs": "^4.4.0",
-    "handlebars": "^4.7.8",
-    "joi": "^17.13.3",
-    "lodash.merge": "^4.6.2",
-    "node-cron": "^4.2.1",
-    "nodemailer": "^7.0.10",
-    "prettier": "^3.6.2",
-    "prisma": "^6.19.0"
-  }
-}
+{
+  "name": "av6-core",
+  "version": "1.7.6",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
+  "description": "All utility function for av6 node js projects.",
+  "author": "Aniket Sarkar",
+  "license": "ISC",
+  "scripts": {
+    "build": "npm run format && tsup",
+    "p:gen": "prisma generate",
+    "format": "prettier --write **/*.ts"
+  },
+  "devDependencies": {
+    "@types/lodash.merge": "^4.6.9",
+    "@types/nodemailer": "^7.0.3",
+    "tsup": "^8.5.0",
+    "typescript": "^5.9.2"
+  },
+  "peerDependencies": {
+    "@prisma/client": "^6.19.0",
+    "winston": "^3.17.0"
+  },
+  "dependencies": {
+    "av6-utils": "^1.0.4",
+    "axios": "^1.11.0",
+    "dayjs": "^1.11.19",
+    "exceljs": "^4.4.0",
+    "handlebars": "^4.7.8",
+    "joi": "^17.13.3",
+    "lodash.merge": "^4.6.2",
+    "node-cron": "^4.2.1",
+    "nodemailer": "^7.0.10",
+    "prettier": "^3.6.2",
+    "prisma": "^6.19.0"
+  }
+}

package/prisma-client.d.ts

@@ -0,0 +1,12 @@
+declare module "@prisma/client" {
+  export class PrismaClient {
+    [key: string]: any;
+  }
+
+  export namespace Prisma {
+    export type TransactionClient = any;
+    export type JsonValue = any;
+    export type JsonObject = any;
+    export type JsonArray = any;
+  }
+}

package/.cursor/debug-check-prisma.ts

@@ -1,100 +0,0 @@
-// #region agent log
-fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:1',message:'Starting Prisma client check',data:{timestamp:Date.now()},sessionId:'debug-session',runId:'run1',hypothesisId:'A'})}).catch(()=>{});
-// #endregion
-
-import * as fs from 'fs';
-import * as path from 'path';
-
-const workspaceRoot = path.resolve(__dirname, '..');
-const nodeModulesPath = path.join(workspaceRoot, 'node_modules');
-const prismaClientPath = path.join(nodeModulesPath, '@prisma', 'client');
-const prismaGeneratedPath = path.join(nodeModulesPath, '.prisma', 'client');
-
-// #region agent log
-fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:10',message:'Checking paths',data:{workspaceRoot,prismaClientPath,prismaGeneratedPath,prismaClientExists:fs.existsSync(prismaClientPath),prismaGeneratedExists:fs.existsSync(prismaGeneratedPath)},sessionId:'debug-session',runId:'run1',hypothesisId:'A'})}).catch(()=>{});
-// #endregion
-
-// Check if @prisma/client package exists
-const prismaClientExists = fs.existsSync(prismaClientPath);
-const prismaGeneratedExists = fs.existsSync(prismaGeneratedPath);
-
-// #region agent log
-fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:18',message:'Path check results',data:{prismaClientExists,prismaGeneratedExists},sessionId:'debug-session',runId:'run1',hypothesisId:'A'})}).catch(()=>{});
-// #endregion
-
-// Try to read package.json from @prisma/client
-let prismaClientPackageJson: any = null;
-if (prismaClientExists) {
-  try {
-    const packageJsonPath = path.join(prismaClientPath, 'package.json');
-    // #region agent log
-    fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:26',message:'Reading @prisma/client package.json',data:{packageJsonPath,exists:fs.existsSync(packageJsonPath)},sessionId:'debug-session',runId:'run1',hypothesisId:'B'})}).catch(()=>{});
-    // #endregion
-    if (fs.existsSync(packageJsonPath)) {
-      prismaClientPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-      // #region agent log
-      fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:30',message:'@prisma/client package.json content',data:{name:prismaClientPackageJson?.name,version:prismaClientPackageJson?.version,exports:prismaClientPackageJson?.exports},sessionId:'debug-session',runId:'run1',hypothesisId:'B'})}).catch(()=>{});
-      // #endregion
-    }
-  } catch (e) {
-    // #region agent log
-    fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:34',message:'Error reading package.json',data:{error:String(e)},sessionId:'debug-session',runId:'run1',hypothesisId:'B'})}).catch(()=>{});
-    // #endregion
-  }
-}
-
-// Check index.d.ts in @prisma/client
-let indexDtsContent: string | null = null;
-if (prismaClientExists) {
-  try {
-    const indexDtsPath = path.join(prismaClientPath, 'index.d.ts');
-    // #region agent log
-    fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:43',message:'Reading index.d.ts',data:{indexDtsPath,exists:fs.existsSync(indexDtsPath)},sessionId:'debug-session',runId:'run1',hypothesisId:'C'})}).catch(()=>{});
-    // #endregion
-    if (fs.existsSync(indexDtsPath)) {
-      indexDtsContent = fs.readFileSync(indexDtsPath, 'utf-8');
-      // #region agent log
-      fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:47',message:'index.d.ts content',data:{content:indexDtsContent.substring(0,200)},sessionId:'debug-session',runId:'run1',hypothesisId:'C'})}).catch(()=>{});
-      // #endregion
-    }
-  } catch (e) {
-    // #region agent log
-    fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:51',message:'Error reading index.d.ts',data:{error:String(e)},sessionId:'debug-session',runId:'run1',hypothesisId:'C'})}).catch(()=>{});
-    // #endregion
-  }
-}
-
-// Try to dynamically import PrismaClient
-let prismaClientImportSuccess = false;
-let prismaClientImportError: string | null = null;
-try {
-  // #region agent log
-  fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:60',message:'Attempting dynamic import of PrismaClient',data:{},sessionId:'debug-session',runId:'run1',hypothesisId:'D'})}).catch(()=>{});
-  // #endregion
-  const prismaModule = require('@prisma/client');
-  // #region agent log
-  fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:63',message:'Module loaded',data:{hasPrismaClient:!!prismaModule.PrismaClient,exports:Object.keys(prismaModule)},sessionId:'debug-session',runId:'run1',hypothesisId:'D'})}).catch(()=>{});
-  // #endregion
-  if (prismaModule.PrismaClient) {
-    prismaClientImportSuccess = true;
-  } else {
-    prismaClientImportError = 'PrismaClient not found in exports: ' + Object.keys(prismaModule).join(', ');
-  }
-} catch (e) {
-  prismaClientImportError = String(e);
-  // #region agent log
-  fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:72',message:'Dynamic import failed',data:{error:prismaClientImportError},sessionId:'debug-session',runId:'run1',hypothesisId:'D'})}).catch(()=>{});
-  // #endregion
-}
-
-// #region agent log
-fetch('http://127.0.0.1:7244/ingest/0a9f7972-5d03-4255-b5c9-6164f846fb46',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'debug-check-prisma.ts:76',message:'Final summary',data:{prismaClientExists,prismaGeneratedExists,prismaClientImportSuccess,prismaClientImportError,hasPackageJson:!!prismaClientPackageJson,hasIndexDts:!!indexDtsContent},sessionId:'debug-session',runId:'run1',hypothesisId:'ALL'})}).catch(()=>{});
-// #endregion
-
-console.log('Prisma Client Check Complete');
-console.log('Prisma Client Package Exists:', prismaClientExists);
-console.log('Prisma Generated Client Exists:', prismaGeneratedExists);
-console.log('PrismaClient Import Success:', prismaClientImportSuccess);
-if (prismaClientImportError) {
-  console.log('PrismaClient Import Error:', prismaClientImportError);
-}