qumra-engine 2.0.32 → 2.0.34

package/dist/extensions/index.d.ts

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

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

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

package/dist/extensions/logic/include.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = new (class WidgetExtension {
+    constructor() {
+        this.tags = ["include"];
+    }
+    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 }, ...args) {
+        console.log("🚀 ~ WidgetExtension ~ args:", args);
+        return 'this is a test';
+    }
+})();

package/dist/extensions/logic/ui.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;
+    }, file: string, ...data: any): nunjucks.runtime.SafeString;
+};
+export default _default;

package/dist/extensions/logic/ui.js

@@ -0,0 +1,40 @@
+"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 normalizeUiPath_1 = require("../../utils/normalizeUiPath");
+const validateUiData_1 = require("../../utils/validateUiData");
+exports.default = new (class WidgetExtension {
+    constructor() {
+        this.tags = ["ui"];
+    }
+    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 }, 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(`
+            <div style="padding: 12px; background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; border-radius: 4px; margin: 8px 0;">
+                ⚠️ <strong>مسار الويجيت غير صالح:</strong> ${filePath}
+            </div>
+        `);
+        }
+        const validated = (0, validateUiData_1.validateUiData)(data);
+        console.log(validated);
+        const rendered = env.render(filePath, {
+            context: ctx.context,
+            globals: ctx.globals,
+            data: validated
+        });
+        return new nunjucks_1.default.runtime.SafeString(rendered);
+    }
+})();

package/dist/middleware/prepareData.middleware.js

@@ -30,6 +30,7 @@ const prepareDataMiddleware = (req, res, next) => {
         return engineResponse.json();
     })
         .then((data) => {
+        console.log("🚀 ~ .then ~ data:", data);
         // تم تخزين النتيجة داخل res.locals.render
         res.locals.render = data.data;
         next();

package/dist/utils/normalizeIncludesPath.d.ts

@@ -0,0 +1 @@
+export declare function normalizeIncludesPath(input: string): string | null;

package/dist/utils/normalizeIncludesPath.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeIncludesPath = normalizeIncludesPath;
+function normalizeIncludesPath(input) {
+    if (!input || typeof input !== 'string') {
+        return null;
+    }
+    const trimmed = input.trim().replace(/^['"]|['"]$/g, '');
+    // إزالة أي امتداد .njk لو موجود
+    let base = trimmed.replace(/\.njk$/, '');
+    // لو بيبدأ بـ includes/ نشيله مؤقتًا
+    if (base.startsWith('includes/')) {
+        base = base.replace(/^includes\//, '');
+    }
+    // إزالة /widget لو موجودة في الآخر
+    base = base.replace(/\/widget$/, '');
+    // الناتج النهائي
+    return `includes/${base}/widget.njk`;
+}

package/dist/utils/normalizeUiPath.d.ts

@@ -0,0 +1 @@
+export declare function normalizeUiPath(input: string): string | null;

package/dist/utils/normalizeUiPath.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeUiPath = normalizeUiPath;
+function normalizeUiPath(input) {
+    if (!input || typeof input !== 'string') {
+        return null;
+    }
+    const trimmed = input.trim().replace(/^['"]|['"]$/g, '');
+    // إزالة أي امتداد .njk لو موجود
+    let base = trimmed;
+    // لو بيبدأ بـ ui/ نشيله مؤقتًا
+    if (base.startsWith('ui/')) {
+        base = base.replace(/^ui\//, '');
+    }
+    // إزالة /widget لو موجودة في الآخر
+    base = base.replace(/\/widget$/, '');
+    // الناتج النهائي
+    return `ui/${base}`;
+}

package/dist/utils/validateUiData.d.ts

@@ -0,0 +1 @@
+export declare function validateUiData(data: unknown[]): Record<string, any>;

package/dist/utils/validateUiData.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateUiData = validateUiData;
+function validateUiData(data) {
+    if (!Array.isArray(data)) {
+        throw new Error("❌ البيانات يجب أن تكون مصفوفة.");
+    }
+    const result = {};
+    for (const item of data) {
+        if (typeof item === "string") {
+            throw new Error(`❌ عنصر غير صحيح: "${item}" يجب أن يكون كائن يحتوي على key/value.`);
+        }
+        if (typeof item === "object" && item !== null) {
+            for (const [key, value] of Object.entries(item)) {
+                if (value === true)
+                    continue; // استبعاد مثل __keywords: true
+                result[key] = value;
+            }
+        }
+        else {
+            throw new Error(`❌ نوع عنصر غير مدعوم: ${JSON.stringify(item)}`);
+        }
+    }
+    return result;
+}

package/dist/utils/validateWidgetData.d.ts

@@ -0,0 +1 @@
+declare function validateWidgetData(data: unknown[]): Record<string, any>;

package/dist/utils/validateWidgetData.js

@@ -0,0 +1,23 @@
+"use strict";
+function validateWidgetData(data) {
+    if (!Array.isArray(data)) {
+        throw new Error("❌ البيانات يجب أن تكون مصفوفة.");
+    }
+    const result = {};
+    for (const item of data) {
+        if (typeof item === "string") {
+            throw new Error(`❌ عنصر غير صحيح: "${item}" يجب أن يكون كائن يحتوي على key/value.`);
+        }
+        if (typeof item === "object" && item !== null) {
+            for (const [key, value] of Object.entries(item)) {
+                if (value === true)
+                    continue; // استبعاد مثل __keywords: true
+                result[key] = value;
+            }
+        }
+        else {
+            throw new Error(`❌ نوع عنصر غير مدعوم: ${JSON.stringify(item)}`);
+        }
+    }
+    return result;
+}

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.32",
+  "version": "2.0.34",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc -w",
-    "pub": "tsc && npm version patch && npm publish",
-    "start:dev": "ts-node test/test-app.ts",
-    "dev": "nodemon --watch src --watch test --ext ts,njk --exec ts-node test/test-app.ts"
+    "pub": "tsc && npm version patch && npm publish"
   },
   "dependencies": {
     "chalk": "^5.4.1",