qumra-engine 2.0.50 → 2.0.52

package/dist/extensions/index.d.ts

@@ -7,3 +7,4 @@ export { default as content } from './logic/content';
 export { default as qumra_head } from './logic/qumra-head';
 export { default as qumra_scripts } from './logic/qumra-scripts';
 export { default as include } from './logic/ui';
+export { default as preview_widget } from './logic/preview-widget';

package/dist/extensions/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.include = exports.qumra_scripts = exports.qumra_head = exports.content = exports.footer = exports.header = exports.form = exports.widget = exports.seo = void 0;
+exports.preview_widget = exports.include = exports.qumra_scripts = exports.qumra_head = exports.content = exports.footer = exports.header = exports.form = exports.widget = exports.seo = void 0;
 var seo_1 = require("./logic/seo");
 Object.defineProperty(exports, "seo", { enumerable: true, get: function () { return __importDefault(seo_1).default; } });
 var widget_1 = require("./logic/widget");
@@ -22,3 +22,5 @@ var qumra_scripts_1 = require("./logic/qumra-scripts");
 Object.defineProperty(exports, "qumra_scripts", { enumerable: true, get: function () { return __importDefault(qumra_scripts_1).default; } });
 var ui_1 = require("./logic/ui");
 Object.defineProperty(exports, "include", { enumerable: true, get: function () { return __importDefault(ui_1).default; } });
+var preview_widget_1 = require("./logic/preview-widget");
+Object.defineProperty(exports, "preview_widget", { enumerable: true, get: function () { return __importDefault(preview_widget_1).default; } });

package/dist/extensions/logic/content copy.d.ts

@@ -2,6 +2,9 @@ import nunjucks from "nunjucks";
 declare const _default: {
     tags: string[];
     parse(parser: any, nodes: any): any;
-    run({ ctx, env }: any, widgetPath: string): nunjucks.runtime.SafeString;
+    run({ ctx, env }: {
+        ctx: any;
+        env: nunjucks.Environment;
+    }): nunjucks.runtime.SafeString;
 };
 export default _default;

package/dist/extensions/logic/content copy.js

@@ -7,7 +7,7 @@ const nunjucks_1 = __importDefault(require("nunjucks"));
 const normalizeWidgetPath_1 = require("../../utils/normalizeWidgetPath");
 exports.default = new (class WidgetExtension {
     constructor() {
-        this.tags = ["widget"];
+        this.tags = ["content"];
     }
     parse(parser, nodes) {
         const tok = parser.nextToken();
@@ -15,18 +15,39 @@ exports.default = new (class WidgetExtension {
         parser.advanceAfterBlockEnd(tok.value);
         return new nodes.CallExtension(this, "run", args);
     }
-    run({ ctx, env }, widgetPath) {
-        const widget = (0, normalizeWidgetPath_1.normalizeWidgetPath)(widgetPath);
-        try {
-            const rendered = env.render(widget, ctx);
-            return new nunjucks_1.default.runtime.SafeString(rendered);
-        }
-        catch (err) {
-            return new nunjucks_1.default.runtime.SafeString(`
-  <div style="padding: 12px; background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; border-radius: 4px; margin: 8px 0;">
-    ⚠️ <strong>تعذر تضمين الويجيت:</strong> ${widget}
-  </div>
-`);
+    run({ ctx, env }) {
+        const widgets = env.getGlobal("widgets");
+        const renderedWidgets = [];
+        for (const widget of widgets) {
+            const widgetTemplatePath = (0, normalizeWidgetPath_1.normalizeWidgetPath)(widget.widget);
+            if (!widgetTemplatePath) {
+                return new nunjucks_1.default.runtime.SafeString(`
+              <div style="padding: 12px; background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; border-radius: 4px; margin: 8px 0;">
+                  ⚠️ <strong>مسار الويجيت غير صالح:</strong> ${widget.widget}
+              </div>
+          `);
+            }
+            try {
+                const html = env.render(widgetTemplatePath, {
+                    context: ctx.context,
+                    globals: ctx.globals,
+                    widget: {
+                        id: widget.id,
+                        type: widget.widget,
+                        data: widget.data,
+                        blocks: widget.blocks ?? [],
+                    },
+                });
+                renderedWidgets.push(html);
+            }
+            catch (err) {
+                renderedWidgets.push(`
+          <div style="padding:10px;background:#ffe;border:1px solid #fc0;color:#aa0">
+            ⚠️ Error rendering widget '${widget.widget}': ${err.message}
+          </div>
+        `);
+            }
         }
+        return new nunjucks_1.default.runtime.SafeString(renderedWidgets.join("\n"));
     }
 })();

package/dist/extensions/logic/content.js

@@ -16,7 +16,20 @@ exports.default = new (class WidgetExtension {
         return new nodes.CallExtension(this, "run", args);
     }
     run({ ctx, env }) {
-        const widgets = env.getGlobal("widgets");
+        let widgetPreview = null;
+        if (env.getGlobal("widget")) {
+            widgetPreview = env.getGlobal("widget");
+        }
+        let widgets = [];
+        if (!widgetPreview) {
+            widgets = env.getGlobal("widgets");
+        }
+        else {
+            widgets = [{
+                    ...widgetPreview,
+                    widget: widgetPreview.widgetKey,
+                }];
+        }
         const renderedWidgets = [];
         for (const widget of widgets) {
             const widgetTemplatePath = (0, normalizeWidgetPath_1.normalizeWidgetPath)(widget.widget);

package/dist/extensions/logic/footer.d.ts

@@ -5,6 +5,6 @@ declare const _default: {
     run({ ctx, env }: {
         ctx: any;
         env: nunjucks.Environment;
-    }): nunjucks.runtime.SafeString;
+    }): "" | nunjucks.runtime.SafeString;
 };
 export default _default;

package/dist/extensions/logic/footer.js

@@ -16,6 +16,10 @@ exports.default = new (class WidgetExtension {
         return new nodes.CallExtension(this, "run", args);
     }
     run({ ctx, env }) {
+        const widgetPreview = env.getGlobal("widget");
+        if (widgetPreview) {
+            return '';
+        }
         try {
             const setting = env.getGlobal("settings");
             const footer = setting?.footer;

package/dist/extensions/logic/header.d.ts

@@ -5,6 +5,6 @@ declare const _default: {
     run({ ctx, env }: {
         ctx: any;
         env: nunjucks.Environment;
-    }): nunjucks.runtime.SafeString;
+    }): "" | nunjucks.runtime.SafeString;
 };
 export default _default;

package/dist/extensions/logic/header.js

@@ -16,6 +16,10 @@ exports.default = new (class HeaderExtension {
         return new nodes.CallExtension(this, "run", args);
     }
     run({ ctx, env }) {
+        const widgetPreview = env.getGlobal("widget");
+        if (widgetPreview) {
+            return '';
+        }
         try {
             const setting = env.getGlobal("settings");
             const header = setting?.header;

package/dist/extensions/logic/preview-widget.d.ts

@@ -0,0 +1,10 @@
+import nunjucks from "nunjucks";
+declare const _default: {
+    tags: string[];
+    parse(parser: any, nodes: any): any;
+    run({ ctx, env }: {
+        ctx: any;
+        env: nunjucks.Environment;
+    }): nunjucks.runtime.SafeString;
+};
+export default _default;

package/dist/extensions/logic/preview-widget.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const nunjucks_1 = __importDefault(require("nunjucks"));
+const normalizeWidgetPath_1 = require("../../utils/normalizeWidgetPath");
+exports.default = new (class WidgetExtension {
+    constructor() {
+        this.tags = ["preview_widget"];
+    }
+    parse(parser, nodes) {
+        const tok = parser.nextToken();
+        const args = parser.parseSignature(true, true);
+        parser.advanceAfterBlockEnd(tok.value);
+        return new nodes.CallExtension(this, "run", args);
+    }
+    run({ ctx, env }) {
+        const widget = env.getGlobal("widget");
+        console.log("🚀 ~ run ~ widget:", widget);
+        const renderedWidgets = [];
+        const widgetTemplatePath = (0, normalizeWidgetPath_1.normalizeWidgetPath)(widget.widgetKey);
+        if (!widgetTemplatePath) {
+            return new nunjucks_1.default.runtime.SafeString(`
+              <div style="padding: 12px; background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; border-radius: 4px; margin: 8px 0;">
+                  ⚠️ <strong>مسار الويجيت غير صالح:</strong> ${widget.widgetKey}
+              </div>
+          `);
+        }
+        try {
+            const html = env.render(widgetTemplatePath, {
+                context: ctx.context,
+                globals: ctx.globals,
+                widget: {
+                    id: widget.id,
+                    type: widget.widgetKey,
+                    data: widget.data,
+                    blocks: widget.blocks ?? [],
+                },
+            });
+            renderedWidgets.push(html);
+        }
+        catch (err) {
+            renderedWidgets.push(`
+          <div style="padding:10px;background:#ffe;border:1px solid #fc0;color:#aa0">
+            ⚠️ Error rendering widget '${widget.widget}': ${err.message}
+          </div>
+        `);
+        }
+        return new nunjucks_1.default.runtime.SafeString(renderedWidgets.join("\n"));
+    }
+})();

package/dist/filters/logic/money/money_with_currency.d.ts

@@ -1 +1 @@
-export default function money_with_currency(amount: number, currency?: string): string;
+export default function money_with_currency(amount: number): string;

package/dist/filters/logic/money/money_with_currency.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = money_with_currency;
-function money_with_currency(amount, currency = 'EGP') {
+const globals_1 = require("../../../store/globals");
+function money_with_currency(amount) {
+    const currency = (0, globals_1.getGlobal)('currency');
     if (typeof amount !== 'number')
         return '';
-    return `${amount.toFixed(2)} ${currency}`;
+    return `${amount.toFixed(2)}${currency.currencySymbol}`;
 }

package/dist/middleware/init.middleware.js

@@ -11,6 +11,10 @@ const initMiddleware = ({ mode, getRender, setRender, app, }) => {
             : app?.url + req.originalUrl;
         const parsedUrl = (0, qumra_utils_1.parseUrlString)(fullUrl);
         res.locals.parsedUrl = parsedUrl;
+        if (req.query?.themeWidget) {
+            res.locals.themeWidget = req.query?.themeWidget;
+            res.locals.preview = Boolean(req.query?.preview) ?? false;
+        }
         if (typeof getRender === "function") {
             res.locals.cache.getRender = getRender;
         }

package/dist/middleware/mergeData.middleware.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeDataMiddleware = void 0;
 const mergeDataMiddleware = async (req, res, next) => {
     try {
+        if (res.locals.preview && res.locals.themeWidget) {
+            res.locals.env.addGlobal("widget", res.locals.render.engine?.widget ?? []);
+        }
+        else {
+            res.locals.env.addGlobal("widget", null);
+        }
         const widgets = res.locals.render.engine?.page?.widgets ?? [];
         res.locals.env.addGlobal("engineData", res.locals.render.engine);
         res.locals.env.addGlobal("widgets", widgets);

package/dist/middleware/prepareData.middleware.js

@@ -7,6 +7,7 @@ exports.prepareDataMiddleware = void 0;
 const axios_1 = __importDefault(require("axios"));
 const prepareDataMiddleware = (req, res, next) => {
     const parsedUrl = res.locals.parsedUrl;
+    console.log("🚀 ~ prepareDataMiddleware ~ parsedUrl:", parsedUrl);
     // ✅ تخطي الرندر في production لبعض المسارات
     // if (res.locals.mode === "production") {
     //   if (isPathAllowedToRender(parsedUrl.pathname)) {
@@ -23,15 +24,23 @@ const prepareDataMiddleware = (req, res, next) => {
     if (req.query?.appTheme) {
         params.set("appTheme", String(req.query.appTheme));
     }
+    if (res.locals.themeWidget) {
+        params.set("themeWidget", String(res.locals.themeWidget));
+    }
     themePath = params.toString() ? `?${params.toString()}` : "";
-    const api = true
-        ? `https://store-gate.qumra.cloud/render${themePath}`
-        : `http://192.168.1.8:4019/v1/render${themePath}`;
+    let api = "";
+    if (res.locals.preview && res.locals.themeWidget) {
+        api = `https://store-gate.qumra.cloud/render/preview-widget${themePath}`;
+    }
+    else {
+        api = true
+            ? `https://store-gate.qumra.cloud/render${themePath}`
+            : `http://192.168.1.8:4019/v1/render${themePath}`;
+    }
     const qdid = req.cookies.qdid || "";
     const Authorization = req.cookies.authorization || "";
     axios_1.default
-        .post(api, { url: parsedUrl.fullUrl }, // ← body مباشرة هنا
-    {
+        .post(api, { url: parsedUrl.fullUrl }, {
         headers: {
             "Content-Type": "application/json",
             Authorization,
@@ -45,6 +54,7 @@ const prepareDataMiddleware = (req, res, next) => {
         next();
     })
         .catch((err) => {
+        console.log("🚀 ~ prepareDataMiddleware ~ err:", err);
         console.log("❌ prepareDataMiddleware error:", err.message);
         // next(err);
     });

package/dist/middleware/setGlobals.middleware.d.ts

@@ -0,0 +1,2 @@
+import { Request, Response, NextFunction } from "express";
+export declare const mergeDataMiddleware: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middleware/setGlobals.middleware.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeDataMiddleware = void 0;
+const globals_1 = require("../store/globals");
+const mergeDataMiddleware = async (req, res, next) => {
+    try {
+        if (res.locals.preview && res.locals.themeWidget) {
+            res.locals.env.addGlobal("widget", res.locals.render.engine?.widget ?? []);
+        }
+        else {
+            res.locals.env.addGlobal("widget", null);
+        }
+        const widgets = res.locals.render.engine?.page?.widgets ?? [];
+        (0, globals_1.setGlobal)("currency", res.locals.render.globals?.currency);
+        res.locals.env.addGlobal("engineData", res.locals.render.engine);
+        res.locals.env.addGlobal("widgets", widgets);
+        res.locals.env.addGlobal("pageData", {
+            layout: res.locals.render.engine?.page?.layout,
+            title: res.locals.render.engine?.page?.title,
+            handle: res.locals.render.engine?.page?.handle,
+        });
+        const settingsData = res.locals.render.engine?.settings;
+        res.locals.env.addGlobal("settings", settingsData);
+        next();
+    }
+    catch (err) {
+        console.error("❌ mergeDataMiddleware error:", err);
+        return next(err);
+    }
+};
+exports.mergeDataMiddleware = mergeDataMiddleware;

package/dist/middleware.js

@@ -16,7 +16,7 @@ const locals_middleware_1 = require("./middleware/locals.middleware");
 const globals_middleware_1 = require("./middleware/globals.middleware");
 const extensions_middleware_1 = require("./middleware/extensions.middleware");
 const isPathAllowedToRender_1 = require("./utils/isPathAllowedToRender");
-const mergeData_middleware_1 = require("./middleware/mergeData.middleware");
+const setGlobals_middleware_1 = require("./middleware/setGlobals.middleware");
 const express_session_1 = __importDefault(require("express-session"));
 const printServerLog_1 = require("./utils/printServerLog");
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
@@ -76,7 +76,7 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo
         });
         app.use(prepareData_middleware_1.prepareDataMiddleware);
         app.use(nunjucks_middleware_1.nunjucksMiddleWare);
-        app.use(mergeData_middleware_1.mergeDataMiddleware);
+        app.use(setGlobals_middleware_1.mergeDataMiddleware);
         app.use(locals_middleware_1.localesMiddleware);
         app.use(filters_middleware_1.nunjucksFiltersMiddleWare);
         app.use(globals_middleware_1.nunjucksGlobalsMiddleWare);

package/dist/types/sharedTypes.d.ts

@@ -1,7 +1,13 @@
+export interface Currency {
+    title: string;
+    currencySymbol: string;
+    currencyCode: string;
+}
 export interface Globals {
     app: any;
     Setting: any;
     assets: string;
+    currency: Currency;
 }
 export interface RenderContext {
     page: Page;
@@ -12,6 +18,11 @@ export interface MainData {
     globals?: Globals;
     context?: RenderContext;
     engine?: {
+        widget: Array<{
+            type: string;
+            data: Record<string, any>;
+            id: string;
+        }>;
         page: {
             title: string;
             handle: string;

package/dist/types/sharedTypes.js

@@ -1,3 +1,3 @@
 "use strict";
-// types/sharedTypes.ts
 Object.defineProperty(exports, "__esModule", { value: true });
+;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.50",
+  "version": "2.0.52",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {