qumra-engine 2.0.2 → 2.0.4

package/dist/utils/mergeObjects.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeObjects = void 0;
+const mergeObjects = (base, override, priority = "override") => {
+    const result = {};
+    const keys = new Set([...Object.keys(base), ...Object.keys(override)]);
+    for (const key of keys) {
+        const baseValue = base[key];
+        const overrideValue = override[key];
+        if (typeof baseValue === "object" &&
+            typeof overrideValue === "object" &&
+            baseValue !== null &&
+            overrideValue !== null &&
+            !Array.isArray(baseValue) &&
+            !Array.isArray(overrideValue)) {
+            // merge nested objects recursively
+            result[key] = (0, exports.mergeObjects)(baseValue, overrideValue, priority);
+        }
+        else {
+            result[key] =
+                priority === "override"
+                    ? overrideValue ?? baseValue
+                    : baseValue ?? overrideValue;
+        }
+    }
+    return result;
+};
+exports.mergeObjects = mergeObjects;

package/dist/utils/mergeSchemaWithData.d.ts

@@ -0,0 +1,14 @@
+interface SchemaField {
+    key: string;
+    type: string;
+    label: string;
+    default: any;
+}
+interface Schema {
+    name: string;
+    description: string;
+    data: SchemaField[];
+}
+type InputData = Record<string, any>;
+export declare const mergeSchemaWithData: (schema: Schema, data: InputData) => Record<string, any>;
+export {};

package/dist/utils/mergeSchemaWithData.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeSchemaWithData = void 0;
+const mergeSchemaWithData = (schema, data) => {
+    const result = {};
+    for (const field of schema.data) {
+        result[field.key] = data[field.key] ?? field.default;
+    }
+    return result;
+};
+exports.mergeSchemaWithData = mergeSchemaWithData;

package/dist/utils/mergeWidgetSources.d.ts

@@ -0,0 +1 @@
+export declare const mergeWidgetSources: (fileWidgets: any[], onlineWidgets: any[]) => any[];

package/dist/utils/mergeWidgetSources.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeWidgetSources = void 0;
+const mergeObjects_1 = require("./mergeObjects");
+const mergeWidgetSources = (fileWidgets, onlineWidgets) => {
+    const onlineMap = new Map();
+    onlineWidgets.forEach((w) => onlineMap.set(w.key, w));
+    return fileWidgets.map((fileWidget) => {
+        const matchedOnline = onlineMap.get(fileWidget.key);
+        const mergedData = matchedOnline
+            ? (0, mergeObjects_1.mergeObjects)(fileWidget.data || {}, matchedOnline.data || {}, "override")
+            : fileWidget.data;
+        return {
+            ...fileWidget,
+            data: mergedData,
+            schema: fileWidget.schema, // نستخدم الـ schema من الملفات دائمًا
+            ...(matchedOnline?._id && { _id: matchedOnline._id }), // لو موجود حطه
+        };
+    });
+};
+exports.mergeWidgetSources = mergeWidgetSources;

package/dist/utils/normalizeWidgetPath.d.ts

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

package/dist/utils/normalizeWidgetPath.js

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

package/dist/utils/parseUrl.d.ts

@@ -0,0 +1,2 @@
+import { ParsedUrl } from "../types/sharedTypes";
+export declare const parseUrlString: (urlString: string) => ParsedUrl;

package/dist/utils/parseUrl.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseUrlString = void 0;
+const parseUrlString = (urlString) => {
+    const url = new URL(urlString);
+    // تحويل الكويري لأوبجكت
+    const query = {};
+    url.searchParams.forEach((value, key) => {
+        query[key] = value;
+    });
+    // استخراج أجزاء المسار
+    const pathParts = url.pathname.split('/').filter(Boolean);
+    // قائمة اللغات المسموحة
+    const supportedLanguages = ['ar', 'en', 'fr', 'de'];
+    // اللغة الافتراضية
+    let language = 'ar';
+    let country = undefined;
+    let cleanPathname = url.pathname;
+    if (pathParts.length > 0) {
+        const langParts = pathParts[0].split('-');
+        // لو اللغة موجودة ضمن اللغات المدعومة
+        if (supportedLanguages.includes(langParts[0])) {
+            language = langParts[0];
+            if (langParts.length === 2) {
+                country = langParts[1];
+            }
+            // حذف اللغة من المسار
+            cleanPathname = '/' + pathParts.slice(1).join('/');
+            if (cleanPathname === '')
+                cleanPathname = '/';
+        }
+    }
+    // بناء رابط بدون اللغة
+    const fullUrlWithoutLang = url.protocol + '//' + url.host + cleanPathname + (url.search || '');
+    return {
+        protocol: url.protocol.replace(':', ''),
+        host: url.host,
+        pathname: cleanPathname,
+        language,
+        country,
+        query,
+        fullUrl: url.href,
+        fullUrlWithoutLang,
+    };
+};
+exports.parseUrlString = parseUrlString;

package/dist/utils/render.d.ts

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

package/dist/utils/render.js

@@ -1,23 +1,24 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.render = render;
-const nunjucksEnv_1 = require("../nunjucksEnv");
-const path_1 = __importDefault(require("path"));
-function render(view, context = {}, res) {
-    return new Promise((resolve, reject) => {
-        const viewsPath = path_1.default.join(res.locals.themesPath ?? process.cwd(), "views");
-        const env = (0, nunjucksEnv_1.configureNunjucks)(viewsPath);
-        env.render(view, context, (err, html) => {
-            if (err)
-                return reject(err);
-            if (html !== null) {
-                res.send(html);
-                return resolve();
-            }
-            return reject(new Error('Nunjucks returned null HTML'));
-        });
+exports.renderMiddleware = void 0;
+const renderMiddleware = (req, res, next) => {
+    const fileName = res.locals.render?.context?.page?.fileName;
+    const context = res.locals.render?.context || {};
+    if (!fileName) {
+        return next(new Error("Page fileName not found in res.locals.render"));
+    }
+    const env = res.locals.env;
+    if (!env) {
+        return next(new Error("Nunjucks environment not found in res.locals.env"));
+    }
+    env.render(fileName, context, (err, html) => {
+        if (err)
+            return next(err);
+        if (html !== null) {
+            res.send(html);
+            return;
+        }
+        return next(new Error("Nunjucks rendered null HTML"));
     });
-}
+};
+exports.renderMiddleware = renderMiddleware;

package/dist/utils/resolveTranslations.d.ts

@@ -0,0 +1 @@
+export declare const resolveTranslations: (data: any, t: (key: string) => string) => any;

package/dist/utils/resolveTranslations.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveTranslations = void 0;
+const resolveTranslations = (data, t) => {
+    if (Array.isArray(data)) {
+        return data.map((item) => (0, exports.resolveTranslations)(item, t));
+    }
+    if (data && typeof data === "object") {
+        const result = {};
+        for (const key in data) {
+            result[key] = (0, exports.resolveTranslations)(data[key], t);
+        }
+        return result;
+    }
+    if (typeof data === "string" && data.startsWith("t:")) {
+        const translationKey = data.slice(2); // remove "t:"
+        return t(translationKey); // use as-is
+    }
+    return data;
+};
+exports.resolveTranslations = resolveTranslations;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -10,11 +10,13 @@
   },
   "dependencies": {
     "chalk": "^5.4.1",
-    "express": "^4.18.2",
+    "color": "^5.0.0",
+    "express": "^5.1.0",
     "morgan": "^1.10.0",
     "nunjucks": "^3.2.4",
     "pino": "^9.7.0",
-    "pino-pretty": "^13.0.0"
+    "pino-pretty": "^13.0.0",
+    "qumra-utils": "^1.0.30"
   },
   "devDependencies": {
     "@types/chalk": "^0.4.31",

package/todo.txt

@@ -0,0 +1 @@
+[check if you realy need this function] => resolveTranslations;

package/views/home.njk

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="ar">
-<head>
-  <meta charset="UTF-8">
-  <title>{{ title }}</title>
-</head>
-<body>
-  <h1>{{ title }}</h1>
-  <p>تم عرض هذا القالب باستخدام Nunjucks وExpress Middleware!</p>
-  <p>سعر المنتج: {{ 1234.5 | formatMoney('aaa') }}</p>
-  <p>تاريخ الطلب: {{ '2024-06-01' | formatDate('ar-EG') }}</p>
-  <p>اسم العميل: {{ 'ahmed' | capitalize }}</p>
-  <p>اsdssdلخصم: {{ 20 | discountLabel }}</p>
-</body>
-</html>