qumra-engine 2.0.149 → 2.0.150

package/dist/controllers/localize/currency.controller.d.ts

@@ -1,2 +1,3 @@
 import { Request, Response } from "express";
 export declare const currencyController: (req: Request, res: Response) => Promise<Response<any, Record<string, any>> | undefined>;
+export declare const getAllCurrency: () => Promise<unknown>;

package/dist/controllers/localize/currency.controller.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.currencyController = void 0;
+exports.getAllCurrency = exports.currencyController = void 0;
+const client_1 = require("../../utils/client");
+const graphql_1 = require("../../graphql");
 const currencyController = async (req, res) => {
     const { currency } = req.body;
     if (!currency) {
@@ -15,3 +17,34 @@ const currencyController = async (req, res) => {
     res.redirect(redirectUrl);
 };
 exports.currencyController = currencyController;
+const currencies = [
+    { value: "AED", label: "AED د.إ" },
+    { value: "AFN", label: "AFN ؋" },
+    { value: "AUD", label: "AUD $" },
+    { value: "CAD", label: "CAD $", selected: true },
+    { value: "CHF", label: "CHF CHF" },
+    { value: "CZK", label: "CZK Kč" },
+    { value: "DKK", label: "DKK kr." },
+    { value: "EUR", label: "EUR €" },
+    { value: "GBP", label: "GBP £" },
+    { value: "HKD", label: "HKD $" },
+    { value: "ILS", label: "ILS ₪" },
+    { value: "JPY", label: "JPY ¥" },
+    { value: "KRW", label: "KRW ₩" },
+    { value: "MYR", label: "MYR RM" },
+    { value: "NZD", label: "NZD $" },
+    { value: "PLN", label: "PLN zł" },
+    { value: "SEK", label: "SEK kr" },
+    { value: "SGD", label: "SGD $" },
+    { value: "USD", label: "USD $" },
+];
+const getAllCurrency = () => {
+    // const client = getGqlClient();
+    // const Currency = await client.request(query.findAllCountries)
+    // return Currency.countries
+    return new Promise(resolve => {
+        const client = (0, client_1.getGqlClient)();
+        client.request(graphql_1.query.findAllCountries).then((data) => resolve(data.countries));
+    });
+};
+exports.getAllCurrency = getAllCurrency;

package/dist/controllers/localize/lang.controller.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.langController = void 0;
 const langController = async (req, res) => {
     const { lang } = req.body;
-    console.log("🚀 ~ langController ~ req.body:", req.body);
     if (!lang) {
         return res.status(400).send("Missing redirect_url");
     }

package/dist/extensions/logic/all_products.js

@@ -25,7 +25,6 @@ exports.default = new (class AllProductsExtension {
     }
     async run(_context, args = {}, callback) {
         try {
-            console.log("🚀 ~ run ~ khalidstest:");
             if (typeof args !== "object" || Array.isArray(args))
                 args = {};
             const client = (0, client_js_1.getGqlClient)();
@@ -42,7 +41,6 @@ exports.default = new (class AllProductsExtension {
             const input = { ...args };
             const cleanedInput = cleanInput(input);
             const data = await client.request(index_js_1.query.findAllProducts, { input: cleanedInput });
-            console.log("🚀 ~ run ~ datfindAllProductsa:", data?.findAllProducts?.data, cleanedInput);
             const products = data?.findAllProducts?.data || [];
             const json = JSON.stringify(products, null, 2);
             callback(null, new nunjucks_1.default.runtime.SafeString(json));

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

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

package/dist/extensions/logic/content.js

@@ -5,6 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const nunjucks_1 = __importDefault(require("nunjucks"));
 const normalizeWidgetPath_1 = require("../../utils/normalizeWidgetPath");
+function renderAsync(env, templatePath, data) {
+    return new Promise((resolve, reject) => {
+        env.render(templatePath, data, (err, res) => {
+            if (err)
+                reject(err);
+            else
+                resolve(res);
+        });
+    });
+}
 exports.default = new (class WidgetExtension {
     constructor() {
         this.tags = ["content"];
@@ -12,79 +22,86 @@ exports.default = new (class WidgetExtension {
     parse(parser, nodes) {
         const tok = parser.nextToken();
         const args = parser.parseSignature(true, true);
-        parser.advanceAfterBlockEnd(tok.value);
-        return new nodes.CallExtension(this, "run", args);
+        parser.advanceAfterBlockEnd(" ");
+        return new nodes.CallExtensionAsync(this, "run", args);
     }
-    run({ ctx, env }) {
-        let widgetPreview = null;
-        if (env.getGlobal("widget")) {
-            widgetPreview = env.getGlobal("widget");
-        }
-        let widgets = [];
-        let template = {};
-        if (!widgetPreview) {
-            const templates = env.getGlobal("templates");
-            template = templates.find((t) => t.key === "main");
-            widgets = template?.widgets || [];
-        }
-        else {
-            widgets = [
-                {
-                    ...widgetPreview,
-                    widget: widgetPreview.widgetKey,
-                },
-            ];
-        }
-        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>
-          `);
+    run({ ctx, env }, templateKey, callback) {
+        try {
+            let widgetPreview = env.getGlobal("widget") || null;
+            let widgets = [];
+            let template = {};
+            if (!widgetPreview) {
+                const templates = env.getGlobal("templates");
+                template = templates.find((t) => t.key === "main");
+                widgets = template?.widgets || [];
             }
-            try {
-                const html = env.render(widgetTemplatePath, {
-                    context: ctx.context,
-                    globals: ctx.globals,
-                    lang: ctx.lang,
-                    currency: ctx.currency,
-                    market: ctx.market,
-                    widget: {
-                        id: widget._id,
-                        type: widget.widget,
-                        data: widget.data,
-                        blocks: widget.blocks ?? [],
+            else {
+                widgets = [
+                    {
+                        ...widgetPreview,
+                        widget: widgetPreview.widgetKey,
                     },
-                });
-                let showDevTools = false;
-                if (env.getGlobal("isIframe")) {
-                    showDevTools = env.getGlobal("isIframe");
-                }
-                if (env.getGlobal("showDevTools")) {
-                    showDevTools = env.getGlobal("showDevTools");
-                }
-                if (showDevTools) {
-                    renderedWidgets.push(`
-            <section content-type="widget" widget-id="${widget._id}" id="qumra-widget-id-${widget._id}" template-key="main" template-id="${template._id}">
-              ${html}
-            </section>
-          `);
-                }
-                else {
-                    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>
-        `);
+                ];
             }
+            const showDevTools = env.getGlobal("isIframe") || env.getGlobal("showDevTools") || false;
+            widgets
+                .reduce((chain, widget) => {
+                return chain.then((renderedWidgets) => {
+                    const widgetTemplatePath = (0, normalizeWidgetPath_1.normalizeWidgetPath)(widget.widget);
+                    if (!widgetTemplatePath) {
+                        renderedWidgets.push(`
+                  <div style="padding: 12px; background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; border-radius: 4px; margin: 8px 0;">
+                    ⚠️ <strong>مسار الويجيت غير صالح:</strong> ${widget.widget}
+                  </div>
+                `);
+                        return renderedWidgets;
+                    }
+                    return renderAsync(env, widgetTemplatePath, {
+                        context: ctx.context,
+                        globals: ctx.globals,
+                        lang: ctx.lang,
+                        currency: ctx.currency,
+                        market: ctx.market,
+                        widget: {
+                            id: widget._id,
+                            type: widget.widget,
+                            data: widget.data,
+                            blocks: widget.blocks ?? [],
+                        },
+                    })
+                        .then((html) => {
+                        if (showDevTools) {
+                            renderedWidgets.push(`
+                      <section content-type="widget" widget-id="${widget._id}" id="qumra-widget-id-${widget._id}" template-key="main" template-id="${template._id}">
+                        ${html}
+                      </section>
+                    `);
+                        }
+                        else {
+                            renderedWidgets.push(html);
+                        }
+                        return renderedWidgets;
+                    })
+                        .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 renderedWidgets;
+                    });
+                });
+            }, Promise.resolve([]))
+                .then((renderedWidgets) => {
+                const output = new nunjucks_1.default.runtime.SafeString(renderedWidgets.join("\n"));
+                callback(null, output);
+            })
+                .catch((err) => {
+                callback(err);
+            });
+        }
+        catch (err) {
+            callback(err);
         }
-        return new nunjucks_1.default.runtime.SafeString(renderedWidgets.join("\n"));
     }
 })();

package/dist/extensions/logic/seo.js

@@ -24,12 +24,9 @@ exports.default = new (class SeoExtension {
         const product = page.product || c.product || {};
         // أساسيات
         const siteName = (0, textOnly_1.textOnly)(store?.name || "Store", 70);
-        console.log("🚀 ~ run ~ seo.title:", seo.title);
         const titleRaw = seo.title || page.title || siteName;
-        console.log("🚀 ~ run ~ titleRaw:", titleRaw);
         const descRaw = seo.description || page.description || "";
         const pageTitle = (0, textOnly_1.textOnly)(titleRaw, 70);
-        console.log("🚀 ~ run ~ pageTitle:", pageTitle);
         const pageDesc = (0, textOnly_1.textOnly)(descRaw, 160);
         // روابط وصور
         const canonical = (0, safeUrl_1.safeUrl)(seo.canonical || page.canonical || page.url || "");

package/dist/extensions/logic/template copy.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;
+    }, templateKey: string, callback: any): any;
+};
+export default _default;

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

@@ -0,0 +1,70 @@
+"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 = ["template"];
+    }
+    parse(parser, nodes) {
+        const tok = parser.nextToken();
+        const args = parser.parseSignature(true, true);
+        parser.advanceAfterBlockEnd(tok.value);
+        console.log("CallExtension", nodes);
+        return new nodes.CallExtensionAsync(this, "run", args);
+    }
+    run({ ctx, env }, templateKey, callback) {
+        const widgetPreview = env.getGlobal("widget");
+        if (widgetPreview) {
+            return callback(null, "");
+        }
+        const templates = env.getGlobal("templates");
+        const template = templates.find((t) => t.key === templateKey);
+        const widgets = template?.widgets || [];
+        const renderedWidgets = [];
+        for (const widget of widgets) {
+            const widgetTemplatePath = (0, normalizeWidgetPath_1.normalizeWidgetPath)(widget.widget);
+            if (!widgetTemplatePath) {
+                return callback(null, new nunjucks_1.default.runtime.SafeString(`
+            <div style="padding:12px;background:#f8d7da;color:#721c24;border:1px solid #f5c6cb;border-radius:4px;">
+              ⚠️ <strong>مسار الويجيت غير صالح:</strong> ${widget.widget}
+            </div>
+          `));
+            }
+            try {
+                const html = env.render(widgetTemplatePath, {
+                    ...ctx,
+                    widget: {
+                        id: widget._id,
+                        type: widget.widget,
+                        data: widget.data,
+                        blocks: widget.blocks ?? [],
+                    },
+                });
+                let showDevTools = env.getGlobal("isIframe") || env.getGlobal("showDevTools") || false;
+                if (showDevTools) {
+                    renderedWidgets.push(`
+            <section widget-id="${widget._id}" id="qumra-widget-id-${widget._id}" template-key="${templateKey}" template-id="${template._id}">
+              ${html}
+            </section>
+          `);
+                }
+                else {
+                    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>
+        `);
+            }
+        }
+        const htmlOutput = new nunjucks_1.default.runtime.SafeString(renderedWidgets.join("\n"));
+        return callback(null, htmlOutput);
+    }
+})();

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

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

package/dist/extensions/logic/template.js

@@ -5,6 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const nunjucks_1 = __importDefault(require("nunjucks"));
 const normalizeWidgetPath_1 = require("../../utils/normalizeWidgetPath");
+function renderAsync(env, templatePath, data) {
+    return new Promise((resolve, reject) => {
+        env.render(templatePath, data, (err, res) => {
+            if (err)
+                reject(err);
+            else
+                resolve(res);
+        });
+    });
+}
 exports.default = new (class WidgetExtension {
     constructor() {
         this.tags = ["template"];
@@ -13,36 +23,35 @@ exports.default = new (class WidgetExtension {
         const tok = parser.nextToken();
         const args = parser.parseSignature(true, true);
         parser.advanceAfterBlockEnd(tok.value);
-        return new nodes.CallExtension(this, "run", args);
+        return new nodes.CallExtensionAsync(this, "run", args);
     }
-    run({ ctx, env }, templateKey) {
-        const widgetPreview = env.getGlobal("widget");
-        if (widgetPreview) {
-            return "";
-        }
-        // if (templateKey === "main") {
-        //   return new nunjucks.runtime.SafeString(`
-        //     <div style="padding: 12px; background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; border-radius: 4px; margin: 8px 0;">
-        //         ⚠️ <strong>لا يمكن تضمين قالب "{% template "main" %}" بشكل مباشر:</strong>
-        //           <p>يمكنك استخدام "{% content %}" لعرض المحتوى الرئيسي للصفحة</p>
-        //     </div>
-        // `);
-        // }
-        const templates = env.getGlobal("templates");
-        const template = templates.find((t) => t.key === templateKey);
-        const widgets = template?.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>
-          `);
+    run({ ctx, env }, templateKey, callback) {
+        try {
+            const widgetPreview = env.getGlobal("widget");
+            if (widgetPreview)
+                return callback(null, "");
+            const templates = env.getGlobal("templates") || [];
+            const template = templates.find((t) => t.key === templateKey);
+            if (!template) {
+                return callback(null, new nunjucks_1.default.runtime.SafeString(`<div style="padding:12px;background:#fdecea;color:#b71c1c;">
+              ⚠️ Template not found: ${templateKey}
+            </div>`));
             }
-            try {
-                const html = env.render(widgetTemplatePath, {
+            const widgets = template.widgets || [];
+            const showDevTools = env.getGlobal("isIframe") || env.getGlobal("showDevTools") || false;
+            widgets
+                .reduce((chain, widget) => chain.then((results) => {
+                const widgetTemplatePath = (0, normalizeWidgetPath_1.normalizeWidgetPath)(widget.widget);
+                if (!widgetTemplatePath) {
+                    results.push(`
+                  <div style="padding:12px;background:#f8d7da;color:#721c24;
+                              border:1px solid #f5c6cb;border-radius:4px;">
+                    ⚠️ مسار الويجيت غير صالح: ${widget.widget}
+                  </div>
+                `);
+                    return results;
+                }
+                return renderAsync(env, widgetTemplatePath, {
                     ...ctx,
                     widget: {
                         id: widget._id,
@@ -50,33 +59,31 @@ exports.default = new (class WidgetExtension {
                         data: widget.data,
                         blocks: widget.blocks ?? [],
                     },
+                }).then((html) => {
+                    if (showDevTools) {
+                        results.push(`
+                    <section widget-id="${widget._id}"
+                             id="qumra-widget-id-${widget._id}"
+                             template-key="${templateKey}"
+                             template-id="${template._id}">
+                      ${html}
+                    </section>
+                  `);
+                    }
+                    else {
+                        results.push(html);
+                    }
+                    return results;
                 });
-                let showDevTools = false;
-                if (env.getGlobal("isIframe")) {
-                    showDevTools = env.getGlobal("isIframe");
-                }
-                if (env.getGlobal("showDevTools")) {
-                    showDevTools = env.getGlobal("showDevTools");
-                }
-                if (showDevTools) {
-                    renderedWidgets.push(`
-            <section widget-id="${widget._id}" id="qumra-widget-id-${widget._id}" template-key="${templateKey}" template-id="${template._id}">
-              ${html}
-            </section>
-          `);
-                }
-                else {
-                    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>
-        `);
-            }
+            }), Promise.resolve([]))
+                .then((renderedHtml) => {
+                const output = new nunjucks_1.default.runtime.SafeString(renderedHtml.join("\n"));
+                callback(null, output);
+            })
+                .catch((err) => callback(err));
+        }
+        catch (err) {
+            callback(err);
         }
-        return new nunjucks_1.default.runtime.SafeString(renderedWidgets.join("\n"));
     }
 })();

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

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

package/dist/extensions/logic/ui.js

@@ -6,7 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const nunjucks_1 = __importDefault(require("nunjucks"));
 const normalizeUiPath_1 = require("../../utils/normalizeUiPath");
 const validateUiData_1 = require("../../utils/validateUiData");
-exports.default = new (class WidgetExtension {
+function renderAsync(env, templatePath, data) {
+    return new Promise((resolve, reject) => {
+        env.render(templatePath, data, (err, res) => {
+            if (err)
+                reject(err);
+            else
+                resolve(res);
+        });
+    });
+}
+exports.default = new (class UiExtension {
     constructor() {
         this.tags = ["ui"];
     }
@@ -14,25 +24,40 @@ exports.default = new (class WidgetExtension {
         const tok = parser.nextToken();
         const args = parser.parseSignature(true, true);
         parser.advanceAfterBlockEnd(tok.value);
-        return new nodes.CallExtension(this, "run", args);
+        return new nodes.CallExtensionAsync(this, "run", args);
     }
-    run({ ctx, env }, file, ...data) {
-        if (!file || typeof file !== 'string' || file.trim() === '' || !file.includes('.njk')) {
-            throw new Error("Invalid file path provided to ui extension");
-        }
-        const filePath = (0, normalizeUiPath_1.normalizeUiPath)(file);
-        if (!filePath) {
-            return new nunjucks_1.default.runtime.SafeString(`
+    run({ ctx, env }, file, ...args) {
+        // ⭐ الـ callback دائماً آخر parameter
+        const callback = args[args.length - 1];
+        // ⭐ الـ data هي كل شيء ما عدا الـ callback
+        const data = args.slice(0, -1);
+        try {
+            // التحقق من صحة المسار
+            if (!file || typeof file !== 'string' || file.trim() === '' || !file.includes('.njk')) {
+                return callback(new Error("Invalid file path provided to ui extension"));
+            }
+            const filePath = (0, normalizeUiPath_1.normalizeUiPath)(file);
+            if (!filePath) {
+                return callback(null, 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> ${filePath}
+                ⚠️ <strong>مسار الويجيت غير صالح:</strong> ${file}
             </div>
-        `);
+          `));
+            }
+            const validated = (0, validateUiData_1.validateUiData)(data);
+            // استخدام renderAsync بدلاً من render المباشر
+            renderAsync(env, filePath, {
+                ...ctx,
+                data: validated,
+            })
+                .then((rendered) => {
+                const output = new nunjucks_1.default.runtime.SafeString(rendered);
+                callback(null, output);
+            })
+                .catch((err) => callback(err));
+        }
+        catch (err) {
+            callback(err);
         }
-        const validated = (0, validateUiData_1.validateUiData)(data);
-        const rendered = env.render(filePath, {
-            ...ctx,
-            data: validated,
-        });
-        return new nunjucks_1.default.runtime.SafeString(rendered);
     }
 })();

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

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