qumra-engine 2.0.75 → 2.0.77

package/dist/extensions/index.d.ts

@@ -8,3 +8,4 @@ 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';
+export { default as template } from './logic/template';

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.preview_widget = exports.include = exports.qumra_scripts = exports.qumra_head = exports.content = exports.footer = exports.header = exports.form = exports.widget = exports.seo = void 0;
+exports.template = 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");
@@ -24,3 +24,5 @@ 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; } });
+var template_1 = require("./logic/template");
+Object.defineProperty(exports, "template", { enumerable: true, get: function () { return __importDefault(template_1).default; } });

package/dist/extensions/logic/content copy.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/template.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): "" | nunjucks.runtime.SafeString;
+};
+export default _default;

package/dist/extensions/logic/template.js

@@ -0,0 +1,66 @@
+"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);
+        return new nodes.CallExtension(this, "run", args);
+    }
+    run({ ctx, env }, templateKey) {
+        const widgetPreview = env.getGlobal("widget");
+        if (widgetPreview) {
+            return '';
+        }
+        if (templateKey === "main") {
+            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>لا يمكن تضمين قالب "{% template "main" %}" بشكل مباشر:</strong> 
+              <p>يمكنك استخدام "{% content %}" لعرض المحتوى الرئيسي للصفحة</p>
+        </div>
+    `);
+        }
+        const templates = env.getGlobal("templates");
+        const widgets = templates.find((t) => t.key === templateKey)?.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/middleware/prepareData.middleware.js

@@ -59,13 +59,11 @@ const prepareDataMiddleware = (req, res, next) => {
             const expectedHost = typeof backendUrl === "string"
                 ? new URL(backendUrl).host
                 : backendUrl?.host;
-            console.log("🚀 ~ prepareDataMiddleware ~ expectedHost:", expectedHost);
-            if (parsedUrl.host !== expectedHost && (expectedHost.includes("localhost"))) {
-                //redirect to expected host
-                // return res.redirect(
-                //   301,
-                //   `${backendUrl}${parsedUrl.pathname}`
-                // );
+            const currentUrl = req.headers.host + req.originalUrl;
+            if (parsedUrl.host !== expectedHost &&
+                !currentUrl.includes("localhost")) {
+                // redirect to expected host
+                return res.redirect(301, `${backendUrl}${parsedUrl.pathname}`);
             }
         }
         res.locals.render = engineResponse.data?.data;

package/dist/middleware/setGlobals.middleware.js

@@ -4,8 +4,6 @@ exports.mergeDataMiddleware = void 0;
 const globals_1 = require("../store/globals");
 const mergeDataMiddleware = async (req, res, next) => {
     try {
-        const templates = res.locals.render.engine?.templates;
-        console.log("🚀 ~ mergeDataMiddleware ~ res.locals.render:", templates);
         if (res.locals.preview && res.locals.themeWidget) {
             res.locals.env.addGlobal("widget", res.locals.render.engine?.widget ?? []);
         }
@@ -14,6 +12,7 @@ const mergeDataMiddleware = async (req, res, next) => {
         }
         const widgets = res.locals.render.engine?.page?.widgets ?? [];
         (0, globals_1.setGlobal)("currency", res.locals.render.globals?.currency);
+        res.locals.env.addGlobal("templates", res.locals.render.engine?.templates);
         res.locals.env.addGlobal("engineData", res.locals.render.engine);
         res.locals.env.addGlobal("widgets", widgets);
         res.locals.env.addGlobal("pageData", {

package/package.json

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