jcc-express-mvc 1.4.2 → 1.4.4

package/lib/Auth/AuthMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthMiddleware.d.ts","sourceRoot":"","sources":["../../../framework/lib/Auth/AuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhE,cAAM,cAAc;IACL,OAAO,CAClB,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,GAAG,CAAC;IAqCR,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,GAAG;IAWpE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;CAQ9D;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
+{"version":3,"file":"AuthMiddleware.d.ts","sourceRoot":"","sources":["../../../framework/lib/Auth/AuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhE,cAAM,cAAc;IACL,OAAO,CAClB,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,GAAG,CAAC;IAqCR,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,GAAG,GAAG;IAYpE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO;CAO9D;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}

package/lib/Auth/AuthMiddleware.js

@@ -41,6 +41,7 @@ class AuthMiddleware {
     }
     auth(request, response, next) {
         let url = "";
+        response.locals.Auth = request.user || {};
         if (request.url) {
             url = request.url;
             request.session["appRedirect"] = url;
@@ -50,7 +51,6 @@ class AuthMiddleware {
             : response.redirect(url ? `/login?redirect=${url}` : "/login");
     }
     guest(req, res, next) {
-        res.locals.Auth = req.user || {};
         if (req.isAuthenticated()) {
             return res.redirectBack();
         }

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

@@ -49,5 +49,6 @@ export declare class EngineHelpers extends TemplateRegex {
     protected getAssetPath(resolvePath: string, beforeMatch: string, afterMatch: string): string;
     protected addCSSLinkTag(link: string): string;
     protected getResource(resources: Array<string>, select?: number): string;
+    protected injectReactRefefresh(): 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;AAI9C,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;IAgClC,SAAS,CAAC,YAAY,CACpB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,MAAM;IA4BT,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM;IAIpC,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAE,MAAU;CAMnE"}
+{"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;IAgClC,SAAS,CAAC,YAAY,CACpB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GACjB,MAAM;IA2BT,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"}

package/lib/Templating-engine/engineHelper.js

@@ -9,6 +9,7 @@ const AppError_1 = require("../Error/AppError");
 const expressions_1 = require("./expressions");
 const app_root_path_1 = __importDefault(require("app-root-path"));
 const fs_1 = __importDefault(require("fs"));
+const colors_1 = __importDefault(require("colors"));
 class EngineHelpers extends expressions_1.TemplateRegex {
     constructor() {
         super();
@@ -93,7 +94,7 @@ class EngineHelpers extends expressions_1.TemplateRegex {
                 .toString();
         }
         catch (error) {
-            console.log(path + " not found");
+            console.log(colors_1.default.red(path + " not found"));
         }
         return "";
     }
@@ -181,14 +182,14 @@ class EngineHelpers extends expressions_1.TemplateRegex {
   
     */
     getAssetPath(resolvePath, beforeMatch, afterMatch) {
-        console.log({ vite: this.viteHost });
         if (Config_1.config.get("APP_ENV") === "local") {
             const src = `${this.viteHost}/${resolvePath}`;
             return `${beforeMatch}${this.addScriptTag(src)}${afterMatch}`;
         }
         const manifestContent = this.getPublicFile("build/manifest.json");
         if (!manifestContent) {
-            throw new AppError_1.AppError("Run npm run vite in your terminal");
+            console.log(colors_1.default.yellow("Run npm run vite in your terminal"));
+            return "";
         }
         const manifest = JSON.parse(manifestContent);
         const assetData = manifest[resolvePath];
@@ -209,5 +210,14 @@ class EngineHelpers extends expressions_1.TemplateRegex {
         const resource = resources[resources.length > 1 ? select : 0].trim();
         return this.removeQuotes(resource.startsWith("/") ? resource.slice(1) : resource);
     }
+    injectReactRefefresh() {
+        return ` <script type="module">
+            import RefreshRuntime from '${this.viteHost}/@react-refresh';
+            RefreshRuntime.injectIntoGlobalHook(window);
+            window.$RefreshReg$ = () => {};
+            window.$RefreshSig$ = () => (type) => type;
+            window.__vite_plugin_react_preamble_installed__ = true;
+        </script>`;
+    }
 }
 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":"AAGA,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;IAMf,OAAO,CAAC,IAAI;IAgBZ,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":"AAGA,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;IAMf,OAAO,CAAC,IAAI;IAiBZ,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

@@ -5,10 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = exports.jsBladeEngine = void 0;
 const Config_1 = require("../Config/Config");
-const AppError_1 = require("../Error/AppError");
-const error_1 = require("../Error/Constants/error");
+// import { AppError } from "../Error/AppError";
+// import { DEFAULT_ENGINE_ERROR } from "../Error/Constants/error";
 const engineHelper_1 = require("./engineHelper");
 const fs_1 = __importDefault(require("fs"));
+const colors_1 = __importDefault(require("colors"));
 class TemplatingEngine extends engineHelper_1.EngineHelpers {
     constructor() {
         super(...arguments);
@@ -184,6 +185,7 @@ class TemplatingEngine extends engineHelper_1.EngineHelpers {
         const resourcePath = this.removeQuotes(match?.groups.resource || "").split(",");
         if (Config_1.config.get("APP_ENV") === "local" && resourcePath.length > 1) {
             beforMatch += this.addCSSLinkTag(`${this.viteHost}/${this.getResource(resourcePath, 0)}`);
+            beforMatch += this.addScriptTag(this.viteHost + "/@vite/client");
         }
         const resources = this.getResource(resourcePath);
         return this.parser(this.getAssetPath(resources, beforMatch, afterMatch));
@@ -192,7 +194,7 @@ class TemplatingEngine extends engineHelper_1.EngineHelpers {
         const { beforMatch, afterMatch } = this.content(content, match);
         let viteClientRefresh = "";
         if (Config_1.config.get("APP_ENV") == "local") {
-            viteClientRefresh = this.addScriptTag(this.viteHost + "/@vite/client");
+            // viteClientRefresh = this.injectReactRefefresh();
         }
         return this.parser(beforMatch + viteClientRefresh + afterMatch);
     }
@@ -253,8 +255,8 @@ class TemplatingEngine extends engineHelper_1.EngineHelpers {
             return callback(null, renderedContent);
         }
         catch (error) {
-            console.log({ error });
-            throw new AppError_1.AppError(error?.message, error_1.DEFAULT_ENGINE_ERROR);
+            return console.log(colors_1.default.red(error.message));
+            // throw new AppError(error?.message, DEFAULT_ENGINE_ERROR);
         }
     }
     Content(path, option) {

package/package.json

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