jcc-express-mvc 1.7.10 → 1.7.12

package/global.d.ts

@@ -10,12 +10,14 @@ import { Str } from "./lib/util/Str";
 import { Event } from "./lib/Event/Event";
 import { Queue } from "./lib/Queue";
 import { Container } from "./lib/Container";
+import { Carbon } from "./lib/Date";
 
 declare global {
   var app: Container;
   var bcrypt: bcrypt;
   var emit: OmitThisParameter<Event["dispatch"]>;
   var env: (key: string, defaultValue?: string | null) => string | null;
+  var now: (date?: string | Date) => Carbon;
   var dispatch: OmitThisParameter<Queue["push"]>;
   var jwtVerify: jwtVerify;
   var jwtSign: jwtSign;

package/lib/Global/helpers.js

@@ -5,32 +5,38 @@ const Config_1 = require("../Config/Config");
 const Event_1 = require("../Event/Event");
 const Str_1 = require("../util/Str");
 const util_1 = require("../util");
+const Carbon_1 = require("../Date/index");
 const globalHelpers = (app) => {
-    globalThis.app = app;
-    //
-    globalThis.env = (key, defaultValue) => {
-        return Config_1.config.get(key, defaultValue);
-    };
-    globalThis.emit = (arg) => {
-        const event = app.resolve(Event_1.Event.name);
-        return event.dispatch(arg);
-    };
-    globalThis.dispatch = (job) => {
-        const queue = app.resolve("Queue");
-        if (job.delay > 0) {
-            return queue.later(job, job.delay);
-        }
-        return queue.push(job);
-    };
-    globalThis.str = () => {
-        return Str_1.Str;
-    };
-    //
-    globalThis.bcrypt = util_1.bcrypt;
-    globalThis.verifyHash = util_1.verifyHash;
-    globalThis.jwtSign = util_1.jwtSign;
-    globalThis.jwtVerify = util_1.jwtVerify;
-    globalThis.rootPath = util_1.rootPath;
-    //rootPath
+  globalThis.app = app;
+  //
+  globalThis.env = (key, defaultValue) => {
+    return Config_1.config.get(key, defaultValue);
+  };
+
+  globalThis.now = (date = new Date()) => {
+    return new Carbon_1.Carbon(date);
+  };
+
+  globalThis.emit = (arg) => {
+    const event = app.resolve(Event_1.Event.name);
+    return event.dispatch(arg);
+  };
+  globalThis.dispatch = (job) => {
+    const queue = app.resolve("Queue");
+    if (job.delay > 0) {
+      return queue.later(job, job.delay);
+    }
+    return queue.push(job);
+  };
+  globalThis.str = () => {
+    return Str_1.Str;
+  };
+  //
+  globalThis.bcrypt = util_1.bcrypt;
+  globalThis.verifyHash = util_1.verifyHash;
+  globalThis.jwtSign = util_1.jwtSign;
+  globalThis.jwtVerify = util_1.jwtVerify;
+  globalThis.rootPath = util_1.rootPath;
+  //rootPath
 };
 exports.globalHelpers = globalHelpers;

package/lib/Inertia/index.js

@@ -77,7 +77,7 @@ class InertiaMiddleware {
                 }
                 // Render the view with or without SSR content
                 return res.render(options.rootView, {
-                    inertia: JSON.stringify(inertiaData),
+                    inertia: inertiaData,
                     ssrHead: ssrResult?.head?.join("\n") || "",
                     ssrBody: ssrResult?.body || "",
                     ...option,

package/lib/Templating-engine/engineHelper.d.ts

@@ -50,5 +50,6 @@ export declare class EngineHelpers extends TemplateRegex {
     protected addCSSLinkTag(link: string): string;
     protected getResource(resources: Array<string>, select?: number): string;
     protected injectReactRefefresh(): string;
+    protected escapeJsonForHtml(json: string): string;
 }
 //# sourceMappingURL=engineHelper.d.ts.map

package/lib/Templating-engine/engineHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engineHelper.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Templating-engine/engineHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAK9C,qBAAa,aAAc,SAAQ,aAAa;IAE9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;;IAK3B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,WAAW;IAM3D;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM;IA2BhE;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM;IAKxE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAYxC;;;;OAIG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI3C,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IAgC1D,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM;IAWnC,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;IAOpC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM;IAOlC,SAAS,CAAC,YAAY,CACpB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM;IA8BT,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;IAIpC,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAE,MAAU;IAOlE,SAAS,CAAC,oBAAoB;CAS/B"}
+{"version":3,"file":"engineHelper.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Templating-engine/engineHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAK9C,qBAAa,aAAc,SAAQ,aAAa;IAE9C,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;;IAK3B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,WAAW;IAM3D;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM;IA2BhE;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM;IAKxE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAYxC;;;;OAIG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI3C,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IAgC1D,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM;IAWnC,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;IAOpC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM;IAOlC,SAAS,CAAC,YAAY,CACpB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM;IA8BT,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;IAIpC,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAE,MAAU;IAOlE,SAAS,CAAC,oBAAoB;IAU9B,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAUlD"}

package/lib/Templating-engine/engineHelper.js

@@ -196,5 +196,15 @@ class EngineHelpers extends expressions_1.TemplateRegex {
             window.__vite_plugin_react_preamble_installed__ = true;
         </script>`;
     }
+    escapeJsonForHtml(json) {
+        return json
+            .replace(/&/g, "&amp;")
+            .replace(/</g, "&lt;")
+            .replace(/>/g, "&gt;")
+            .replace(/"/g, "&quot;")
+            .replace(/'/g, "&apos;")
+            .replace(/\u2028/g, "\\u2028") // Line separator
+            .replace(/\u2029/g, "\\u2029"); // Paragraph separator
+    }
 }
 exports.EngineHelpers = EngineHelpers;

package/lib/Templating-engine/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Templating-engine/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,cAAM,gBAAiB,SAAQ,aAAa;IAC1C,OAAO,CAAC,MAAM,CAAM;IAEpB;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAYtB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAuBlB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAevB;;;;;;OAMG;IACH,OAAO,CAAC,OAAO;IAYf;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB/C;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ;IAYhB;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAmBZ;;;;;;OAMG;IACH,OAAO,CAAC,KAAK;IASb,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,IAAI;IAqBZ,OAAO,CAAC,gBAAgB;IAUxB;;;;;OAKG;IACH,OAAO,CAAC,MAAM;IAyCd;;;;OAIG;cACa,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQpD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG;IAazD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM;CAG3C;AAGD,QAAA,MAAM,OAAO,SANG,MAAM,UAAU,GAAG,KAAG,MAMK,CAAC;AAC5C,QAAA,MAAM,aAAa,kBAAS,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Framework/lib/Templating-engine/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,cAAM,gBAAiB,SAAQ,aAAa;IAC1C,OAAO,CAAC,MAAM,CAAM;IAEpB;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAYtB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAuBlB;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAevB;;;;;;OAMG;IACH,OAAO,CAAC,OAAO;IAYf;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB/C;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ;IAYhB;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAmBZ;;;;;;OAMG;IACH,OAAO,CAAC,KAAK;IASb,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,IAAI;IAqBZ,OAAO,CAAC,gBAAgB;IAUxB;;;;;OAKG;IACH,OAAO,CAAC,MAAM;IAyCd;;;;OAIG;cACa,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQpD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG;IAazD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM;CAG3C;AAGD,QAAA,MAAM,OAAO,SANG,MAAM,UAAU,GAAG,KAAG,MAMK,CAAC;AAC5C,QAAA,MAAM,aAAa,kBAAS,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC"}

package/lib/Templating-engine/index.js

@@ -174,7 +174,8 @@ class TemplatingEngine extends engineHelper_1.EngineHelpers {
         return this.parser(beforMatch + result + afterMatch, param);
     }
     inertia(content, match, param = this.option) {
-        const interiaContent = param?.ssrBody || `<div id="app" data-page='${param.inertia}'></div>`;
+        const props = this.escapeJsonForHtml(JSON.stringify(param.inertia));
+        const interiaContent = param?.ssrBody || `<div id="app" data-page='${props}'></div>`;
         const { beforMatch, afterMatch } = this.content(content, match);
         return this.parser(beforMatch + interiaContent + afterMatch, param);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jcc-express-mvc",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "description": "express mvc structure",
   "main": "index.js",
   "types": "index.d.ts",