qumra-engine 2.0.3 → 2.0.4

package/dist/nunjucksEnv.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureNunjucks = configureNunjucks;
 const nunjucks_1 = __importDefault(require("nunjucks"));
-const registerAllFilters_1 = __importDefault(require("./filters/registerAllFilters"));
 /**
  * إعداد Nunjucks مع مسار مخصص للقوالب
  * @param viewsPath المسار الكامل لملفات القوالب
@@ -16,6 +15,5 @@ function configureNunjucks(viewsPath) {
         noCache: true,
         watch: false,
     });
-    (0, registerAllFilters_1.default)(env);
     return env;
 }

package/dist/services/prepareData.d.ts

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

package/dist/services/prepareData.js

@@ -1,32 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareData = void 0;
-const prepareData = async (res, url) => {
+exports.prepareDataMiddleware = void 0;
+const prepareDataMiddleware = async (req, res, next) => {
+    const parsedUrl = res.locals.parsedUrl;
     try {
-        if (res.locals.cache.getRender) {
-            // أول حاجة نحاول نجيب البيانات من الكاش
-            const dataFromCache = await res.locals.cache.getRender(url, "");
+        const { getRender, setRender } = res.locals.cache;
+        // حاول تجيب البيانات من الكاش الأول
+        if (typeof getRender === "function") {
+            const dataFromCache = await getRender(res.locals.mode, parsedUrl.fullUrl);
             if (dataFromCache) {
                 res.locals.render = dataFromCache;
-                return; // طالما موجودة في الكاش مش محتاج أكمل
+                return next(); // البيانات موجودة، نكمل
             }
-            // لو مش موجودة في الكاش، أجيبها من السيرفر
-            const engineResponse = await fetch("https://store-gate.qumra-dev.site/render", {
-                method: "POST",
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ url }),
-            });
-            if (engineResponse.ok) {
-                const data = await engineResponse.json();
-                res.locals.cache.setRender(url, "", data);
-                res.locals.render = data;
+        }
+        const api = false
+            ? "https://store-gate.qumra-dev.site/render"
+            : "http://192.168.1.5:4019/v1/render";
+        console.log("🚀 ~ prepareDataMiddleware ~ api:", api);
+        // لو مش موجودة في الكاش، أجيبها من السيرفر
+        const engineResponse = await fetch(api, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                url: parsedUrl.fullUrl,
+            }),
+        });
+        if (engineResponse.ok) {
+            const data = await engineResponse.json();
+            // خزّن البيانات في الكاش لو دالة setRender موجودة
+            if (typeof setRender === "function") {
+                await setRender(res.locals.mode, parsedUrl.fullUrl, data);
             }
+            res.locals.render = data;
+            return next();
+        }
+        else {
+            throw new Error("Engine response not OK");
         }
     }
     catch (err) {
-        console.error("🚀 ~ prepareData error:", err);
+        console.error("❌ prepareDataMiddleware error:", err);
+        return next(err);
     }
 };
-exports.prepareData = prepareData;
+exports.prepareDataMiddleware = prepareDataMiddleware;

package/dist/services/renderHandler.js

@@ -1,31 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderHandler = void 0;
-const render_1 = require("../utils/render");
+// import { render } from "../middleware/render";
 const renderHandler = async (res) => {
-    try {
-        const page = res.locals.render.context?.page;
-        if (page) {
-            await (0, render_1.render)(page.fileName, {}, res);
-        }
-        else {
-            await safeRender("404.njk", res, 404, "Page not found");
-        }
-    }
-    catch (error) {
-        // console.error("🚀 ~ renderHandler ~ error:", error);
-        await safeRender("404.njk", res, 404, "Page not found");
-    }
+    //   try {
+    //     const page = res.locals.render.context?.page;
+    //     if (page) {
+    //       await render(page.fileName, {}, res);
+    //     } else {
+    //       await safeRender("404.njk", res, 404, "Page not found");
+    //     }
+    //   } catch (error) {
+    //     // console.error("🚀 ~ renderHandler ~ error:", error);
+    //     await safeRender("404.njk", res, 404, "Page not found");
+    //   }
+    // };
+    // const safeRender = async (
+    //   fileName: string,
+    //   res: Response,
+    //   statusCode: number,
+    //   fallbackMessage: string
+    // ) => {
+    //   try {
+    //     await render(fileName, {}, res);
+    //   } catch (error) {
+    //     // console.error(`🚀 ~ safeRender ~ error rendering ${fileName}:`, error);
+    //     if (!res.headersSent) {
+    //       res.status(statusCode).send(fallbackMessage);
+    //     }
+    //   }
 };
 exports.renderHandler = renderHandler;
-const safeRender = async (fileName, res, statusCode, fallbackMessage) => {
-    try {
-        await (0, render_1.render)(fileName, {}, res);
-    }
-    catch (error) {
-        // console.error(`🚀 ~ safeRender ~ error rendering ${fileName}:`, error);
-        if (!res.headersSent) {
-            res.status(statusCode).send(fallbackMessage);
-        }
-    }
-};

package/dist/store/globals.d.ts

@@ -0,0 +1,2 @@
+export declare const getGlobal: <T = any>(key: string, defaultValue?: T) => T;
+export declare const setGlobal: (key: string, value: any) => void;

package/dist/store/globals.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setGlobal = exports.getGlobal = void 0;
+const globalVars = {};
+const getGlobal = (key, defaultValue) => {
+    return globalVars[key] ?? defaultValue;
+};
+exports.getGlobal = getGlobal;
+const setGlobal = (key, value) => {
+    globalVars[key] = value;
+};
+exports.setGlobal = setGlobal;

package/dist/store/locals.d.ts

@@ -0,0 +1,2 @@
+export declare const getLocales: <T = any>(key: string) => T | undefined;
+export declare const setLocales: (key: string, value: any) => void;

package/dist/store/locals.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setLocales = exports.getLocales = void 0;
+const locales = {};
+const getLocales = (key) => {
+    return locales[key];
+};
+exports.getLocales = getLocales;
+const setLocales = (key, value) => {
+    locales[key] = value;
+};
+exports.setLocales = setLocales;

package/dist/types/sharedTypes.d.ts

@@ -6,9 +6,11 @@ export interface RenderContext {
     page: Page;
     [key: string]: any;
 }
+export type TMode = "production" | "devlopment";
 export interface MainData {
     globals?: Globals;
     context?: RenderContext;
+    engine?: any;
     themePath?: string;
     assetsPath?: string;
 }
@@ -17,4 +19,8 @@ export interface Page {
     description: string;
     fileName: string;
     path: string;
+    handle: string;
+    layout: string;
 }
+export type CacheGetter = <T = any>(app: string, path: string) => Promise<T | null>;
+export type CacheSetter = (app: string, path: string, value: any, ttlInSec?: number) => Promise<void> | undefined;

package/dist/utils/asyncHandler.js

@@ -0,0 +1 @@
+"use strict";

package/dist/utils/findAvailablePort.d.ts

@@ -0,0 +1 @@
+export declare const findAvailablePort: (startPort: number) => Promise<number>;

package/dist/utils/findAvailablePort.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findAvailablePort = void 0;
+const net_1 = __importDefault(require("net"));
+const findAvailablePort = async (startPort) => {
+    let port = startPort;
+    while (await isPortInUse(port)) {
+        port++;
+    }
+    return port;
+};
+exports.findAvailablePort = findAvailablePort;
+const isPortInUse = (port) => {
+    return new Promise((resolve) => {
+        const server = net_1.default.createServer();
+        server.once('error', () => {
+            resolve(true); // البورت مستخدم
+        });
+        server.once('listening', () => {
+            server.close();
+            resolve(false); // البورت فاضي
+        });
+        server.listen(port);
+    });
+};

package/dist/utils/getLocalData.d.ts

@@ -0,0 +1,4 @@
+export declare const getLocalWidgetData: ({ widget, widgetPath }: {
+    widget: string;
+    widgetPath: string;
+}) => any;

package/dist/utils/getLocalData.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalWidgetData = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const getLocalWidgetData = ({ widget, widgetPath }) => {
+    const filePath = path_1.default.join("widgets", widgetPath, "schema.njk");
+    try {
+        const fileContent = fs_1.default.readFileSync(filePath, "utf-8");
+        const jsonData = JSON.parse(fileContent);
+        return jsonData;
+    }
+    catch (error) {
+        console.error(`❌ Failed to read or parse schema.njk for widget ${widget}:`, error);
+        return null;
+    }
+};
+exports.getLocalWidgetData = getLocalWidgetData;

package/dist/utils/getLocalFooterData copy.d.ts

@@ -0,0 +1,4 @@
+export declare const getLocalWidgetData: ({ widget, widgetPath, }: {
+    widget: string;
+    widgetPath: string;
+}) => Record<string, any> | null;

package/dist/utils/getLocalFooterData copy.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalWidgetData = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const mergeSchemaWithData_1 = require("./mergeSchemaWithData");
+const getLocalWidgetData = ({ widget, widgetPath, }) => {
+    try {
+        const filePath = path_1.default.join(widgetPath, widget, "schema.json");
+        const fileContent = fs_1.default.readFileSync(filePath, "utf-8");
+        const jsonData = JSON.parse(fileContent);
+        return (0, mergeSchemaWithData_1.mergeSchemaWithData)(jsonData, {});
+    }
+    catch (error) {
+        console.error(`❌ Failed to read or parse schema.njk for widget ${widget}:`, error);
+        return null;
+    }
+};
+exports.getLocalWidgetData = getLocalWidgetData;

package/dist/utils/getLocalFooterData.d.ts

@@ -0,0 +1,4 @@
+export declare const getLocalWidgetData: ({ widget, widgetPath, }: {
+    widget: string;
+    widgetPath: string;
+}) => Record<string, any> | null;

package/dist/utils/getLocalFooterData.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalWidgetData = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const mergeSchemaWithData_1 = require("./mergeSchemaWithData");
+const getLocalWidgetData = ({ widget, widgetPath, }) => {
+    try {
+        const filePath = path_1.default.join(widgetPath, widget, "schema.json");
+        const fileContent = fs_1.default.readFileSync(filePath, "utf-8");
+        const jsonData = JSON.parse(fileContent);
+        return (0, mergeSchemaWithData_1.mergeSchemaWithData)(jsonData, {});
+    }
+    catch (error) {
+        console.error(`❌ Failed to read or parse schema.njk for widget ${widget}:`, error);
+        return null;
+    }
+};
+exports.getLocalWidgetData = getLocalWidgetData;

package/dist/utils/getLocalHeaderData.d.ts

@@ -0,0 +1,4 @@
+export declare const getLocalSettingsData: ({ widget, widgetPath, }: {
+    widget: string;
+    widgetPath: string;
+}) => Record<string, any> | null;

package/dist/utils/getLocalHeaderData.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalSettingsData = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const mergeSchemaWithData_1 = require("./mergeSchemaWithData");
+const getLocalSettingsData = ({ widget, widgetPath, }) => {
+    try {
+        const filePath = path_1.default.join(widgetPath, widget, "schema.json");
+        const fileContent = fs_1.default.readFileSync(filePath, "utf-8");
+        const jsonData = JSON.parse(fileContent);
+        return (0, mergeSchemaWithData_1.mergeSchemaWithData)(jsonData, {});
+    }
+    catch (error) {
+        console.error(`❌ Failed to read or parse schema.njk for widget ${widget}:`, error);
+        return null;
+    }
+};
+exports.getLocalSettingsData = getLocalSettingsData;

package/dist/utils/getLocalWidgetData copy.d.ts

@@ -0,0 +1,4 @@
+export declare const getLocalWidgetData: ({ widget, widgetPath, }: {
+    widget: string;
+    widgetPath: string;
+}) => Record<string, any> | null;

package/dist/utils/getLocalWidgetData copy.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalWidgetData = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const mergeSchemaWithData_1 = require("./mergeSchemaWithData");
+const getLocalWidgetData = ({ widget, widgetPath, }) => {
+    try {
+        const filePath = path_1.default.join(widgetPath, widget, "schema.json");
+        const fileContent = fs_1.default.readFileSync(filePath, "utf-8");
+        const jsonData = JSON.parse(fileContent);
+        return (0, mergeSchemaWithData_1.mergeSchemaWithData)(jsonData, {});
+    }
+    catch (error) {
+        console.error(`❌ Failed to read or parse schema.njk for widget ${widget}:`, error);
+        return null;
+    }
+};
+exports.getLocalWidgetData = getLocalWidgetData;

package/dist/utils/getLocalWidgetData.d.ts

@@ -0,0 +1,4 @@
+export declare const getLocalWidgetData: ({ widget, widgetPath, }: {
+    widget: string;
+    widgetPath: string;
+}) => Record<string, any> | null;

package/dist/utils/getLocalWidgetData.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLocalWidgetData = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const mergeSchemaWithData_1 = require("./mergeSchemaWithData");
+const getLocalWidgetData = ({ widget, widgetPath, }) => {
+    try {
+        const filePath = path_1.default.join(widgetPath, widget, "schema.json");
+        const fileContent = fs_1.default.readFileSync(filePath, "utf-8");
+        const jsonData = JSON.parse(fileContent);
+        return (0, mergeSchemaWithData_1.mergeSchemaWithData)(jsonData, {});
+    }
+    catch (error) {
+        console.error(`❌ Failed to read or parse schema.njk for widget ${widget}:`, error);
+        return null;
+    }
+};
+exports.getLocalWidgetData = getLocalWidgetData;

package/dist/utils/getNestedValue.d.ts

@@ -0,0 +1 @@
+export declare const getNestedValue: (obj: any, path: string) => any;

package/dist/utils/getNestedValue.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNestedValue = void 0;
+const getNestedValue = (obj, path) => {
+    return path.split(".").reduce((acc, key) => acc?.[key], obj);
+};
+exports.getNestedValue = getNestedValue;

package/dist/utils/isPathAllowedToRender.d.ts

@@ -0,0 +1 @@
+export declare const isPathAllowedToRender: (filePath: string) => boolean;

package/dist/utils/isPathAllowedToRender.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPathAllowedToRender = void 0;
+const isPathAllowedToRender = (filePath) => {
+    // نتاكد إنه مفيهوش امتداد
+    return !/\.[a-z0-9]+$/i.test(filePath);
+};
+exports.isPathAllowedToRender = isPathAllowedToRender;

package/dist/utils/mergeNestedSchemaWithData.d.ts

@@ -0,0 +1,16 @@
+type SchemaObject = {
+    [section: string]: {
+        [field: string]: {
+            type: string;
+            label: string;
+            default: any;
+        };
+    };
+};
+type DataObject = {
+    [section: string]: {
+        [field: string]: any;
+    };
+};
+export declare const mergeNestedSchemaWithData: (schema: SchemaObject, data: DataObject) => Record<string, any>;
+export {};

package/dist/utils/mergeNestedSchemaWithData.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeNestedSchemaWithData = void 0;
+const mergeNestedSchemaWithData = (schema, data) => {
+    const result = {};
+    for (const sectionKey in schema) {
+        const sectionSchema = schema[sectionKey];
+        const sectionData = data[sectionKey];
+        // لو الحقل النهائي مباشرة وليس كائن داخلي (مثلاً max)
+        const isLeafField = sectionSchema &&
+            typeof sectionSchema === "object" &&
+            "type" in sectionSchema &&
+            "default" in sectionSchema;
+        if (isLeafField) {
+            result[sectionKey] =
+                data?.[sectionKey] !== undefined
+                    ? data[sectionKey]
+                    : sectionSchema.default;
+            continue;
+        }
+        // لو كائن داخلي مثل header, footer
+        result[sectionKey] = {};
+        const nestedSchema = sectionSchema || {};
+        const nestedData = sectionData || {};
+        for (const fieldKey in nestedSchema) {
+            result[sectionKey][fieldKey] =
+                nestedData[fieldKey] !== undefined
+                    ? nestedData[fieldKey]
+                    : nestedSchema[fieldKey].default;
+        }
+    }
+    return result;
+};
+exports.mergeNestedSchemaWithData = mergeNestedSchemaWithData;

package/dist/utils/mergeObjects.d.ts

@@ -0,0 +1 @@
+export declare const mergeObjects: (base: Record<string, any>, override: Record<string, any>, priority?: "base" | "override") => Record<string, any>;

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;