qumra-engine 2.0.55 → 2.0.57

package/dist/extensions/logic/seo.js

@@ -1,29 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const nunjucks_1 = require("nunjucks");
-const escapeAttr = (str) => String(str ?? "")
-    .replace(/&/g, "&")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#39;");
-const textOnly = (str, limit = 160) => {
-    const s = String(str ?? "")
-        .replace(/<[^>]*>/g, "") // شيل أي HTML
-        .replace(/\s+/g, " ") // سطر واحد
-        .trim();
-    return limit > 0 && s.length > limit ? s.slice(0, limit - 1).trim() + "…" : s;
-};
-const safeUrl = (str) => {
-    const s = String(str ?? "").trim();
-    if (!s)
-        return "";
-    if (/^https?:\/\//i.test(s))
-        return s;
-    if (s.startsWith("/"))
-        return s; // مسار داخلي
-    return ""; // غير مسموح
-};
+const escapeAttr_1 = require("../../utils/escapeAttr");
+const textOnly_1 = require("../../utils/textOnly");
+const safeUrl_1 = require("../../utils/safeUrl");
+const stripEmpty_1 = require("../../utils/stripEmpty");
+const asArray_1 = require("../../utils/asArray");
+// أدوات مساعدة داخلية
 exports.default = new (class SeoExtension {
     constructor() {
         this.tags = ["seo"];
@@ -38,60 +21,164 @@ exports.default = new (class SeoExtension {
         const seo = c.seo || {};
         const page = c.page || {};
         const store = c.store || {};
-        // قيم أساسية
-        const siteName = store?.name || "Store";
+        const product = page.product || c.product || {};
+        // أساسيات
+        const siteName = (0, textOnly_1.textOnly)(store?.name || "Store", 70);
         const titleRaw = seo.title || page.title || siteName;
         const descRaw = seo.description || page.description || "";
-        const pageTitle = textOnly(titleRaw, 70); // يفضّل ≤ 60–70
-        const pageDesc = textOnly(descRaw, 160);
-        const canonical = safeUrl(seo.canonical || page.canonical || "");
-        const ogImage = safeUrl(seo.image || page.image || "");
-        const favicon = safeUrl(seo.logo || "/favicon.ico");
-        const noindex = !!seo.noindex;
+        const pageTitle = (0, textOnly_1.textOnly)(titleRaw, 70);
+        const pageDesc = (0, textOnly_1.textOnly)(descRaw, 160);
+        // روابط وصور
+        const canonical = (0, safeUrl_1.safeUrl)(seo.canonical || page.canonical || page.url || "");
+        const favicon = (0, safeUrl_1.safeUrl)(seo.logo || store?.logo || "/favicon.ico");
+        const ogLocale = String((seo.locale || store.locale || "ar_EG")).replace("-", "_");
+        const updatedAt = seo.updatedAt || page.updatedAt;
+        // اجمع الصور من مصادر متعددة
+        const imageItems = [
+            ...(0, asArray_1.asArray)(seo.images),
+            ...(0, asArray_1.asArray)(page.images),
+            ...(0, asArray_1.asArray)(seo.image),
+            ...(0, asArray_1.asArray)(page.image),
+            ...(0, asArray_1.asArray)(product?.images?.map((i) => ({ url: i.fileUrl }))),
+        ]
+            .map((img) => {
+            if (!img)
+                return null;
+            if (typeof img === "string")
+                return { url: img, alt: pageTitle };
+            return {
+                url: img.url || img.src || img.fileUrl,
+                width: img.width,
+                height: img.height,
+                alt: (0, textOnly_1.textOnly)(img.alt || pageTitle, 100),
+            };
+        })
+            .filter(Boolean)
+            .map((img) => ({ ...img, url: (0, safeUrl_1.safeUrl)(img.url) }))
+            .filter((img) => !!img.url);
+        // نوع الصفحة
+        const typeIn = String(seo.type || page.type || (product?._id ? "product" : "website")).toLowerCase();
+        const isProduct = typeIn === "product";
+        const ogType = isProduct ? "product" : "website";
         // بناء الوسوم
         const parts = [];
-        // Title
-        parts.push(`<title>${escapeAttr(pageTitle)}</title>`);
-        // Canonical
+        // Title + Canonical + Favicon + Description
+        parts.push(`<title>${(0, escapeAttr_1.escapeAttr)(pageTitle)}</title>`);
         if (canonical)
-            parts.push(`<link rel="canonical" href="${escapeAttr(canonical)}">`);
-        // Favicon
+            parts.push(`<link rel="canonical" href="${(0, escapeAttr_1.escapeAttr)(canonical)}">`);
         if (favicon) {
-            parts.push(`<link rel="icon" href="${escapeAttr(favicon)}">`);
-            parts.push(`<link rel="shortcut icon" href="${escapeAttr(favicon)}">`);
+            parts.push(`<link rel="icon" href="${(0, escapeAttr_1.escapeAttr)(favicon)}">`);
+            parts.push(`<link rel="shortcut icon" href="${(0, escapeAttr_1.escapeAttr)(favicon)}">`);
         }
-        // Meta description
         if (pageDesc)
-            parts.push(`<meta name="description" content="${escapeAttr(pageDesc)}">`);
+            parts.push(`<meta name="description" content="${(0, escapeAttr_1.escapeAttr)(pageDesc)}">`);
         // Robots
-        if (noindex) {
+        if (seo.noindex) {
             parts.push(`<meta name="robots" content="noindex, nofollow">`);
             parts.push(`<meta property="og:robots" content="noindex, nofollow">`);
         }
-        // Open Graph
-        parts.push(`<meta property="og:type" content="website">`);
-        parts.push(`<meta property="og:title" content="${escapeAttr(pageTitle)}">`);
+        // Open Graph (شامل)
+        parts.push(`<meta property="og:type" content="${(0, escapeAttr_1.escapeAttr)(ogType)}">`);
+        parts.push(`<meta property="og:title" content="${(0, escapeAttr_1.escapeAttr)(pageTitle)}">`);
         if (pageDesc)
-            parts.push(`<meta property="og:description" content="${escapeAttr(pageDesc)}">`);
+            parts.push(`<meta property="og:description" content="${(0, escapeAttr_1.escapeAttr)(pageDesc)}">`);
         if (canonical)
-            parts.push(`<meta property="og:url" content="${escapeAttr(canonical)}">`);
+            parts.push(`<meta property="og:url" content="${(0, escapeAttr_1.escapeAttr)(canonical)}">`);
         if (siteName)
-            parts.push(`<meta property="og:site_name" content="${escapeAttr(siteName)}">`);
-        if (ogImage)
-            parts.push(`<meta property="og:image" content="${escapeAttr(ogImage)}">`);
+            parts.push(`<meta property="og:site_name" content="${(0, escapeAttr_1.escapeAttr)(siteName)}">`);
+        if (ogLocale)
+            parts.push(`<meta property="og:locale" content="${(0, escapeAttr_1.escapeAttr)(ogLocale)}">`);
+        if (updatedAt)
+            parts.push(`<meta property="og:updated_time" content="${(0, escapeAttr_1.escapeAttr)(new Date(updatedAt).toISOString())}">`);
+        // صور متعددة + alt
+        imageItems.forEach((img) => {
+            parts.push(`<meta property="og:image" content="${(0, escapeAttr_1.escapeAttr)(img.url)}">`);
+            if (img.alt)
+                parts.push(`<meta property="og:image:alt" content="${(0, escapeAttr_1.escapeAttr)(img.alt)}">`);
+            if (img.width)
+                parts.push(`<meta property="og:image:width" content="${(0, escapeAttr_1.escapeAttr)(img.width)}">`);
+            if (img.height)
+                parts.push(`<meta property="og:image:height" content="${(0, escapeAttr_1.escapeAttr)(img.height)}">`);
+        });
         // Twitter
-        parts.push(`<meta name="twitter:card" content="${ogImage ? "summary_large_image" : "summary"}">`);
-        parts.push(`<meta name="twitter:title" content="${escapeAttr(pageTitle)}">`);
+        parts.push(`<meta name="twitter:card" content="${imageItems.length ? "summary_large_image" : "summary"}">`);
+        parts.push(`<meta name="twitter:title" content="${(0, escapeAttr_1.escapeAttr)(pageTitle)}">`);
         if (pageDesc)
-            parts.push(`<meta name="twitter:description" content="${escapeAttr(pageDesc)}">`);
-        if (ogImage)
-            parts.push(`<meta name="twitter:image" content="${escapeAttr(ogImage)}">`);
-        // Itemprop (Google)
-        parts.push(`<meta itemprop="name" content="${escapeAttr(pageTitle)}">`);
+            parts.push(`<meta name="twitter:description" content="${(0, escapeAttr_1.escapeAttr)(pageDesc)}">`);
+        if (imageItems[0]?.url)
+            parts.push(`<meta name="twitter:image" content="${(0, escapeAttr_1.escapeAttr)(imageItems[0].url)}">`);
+        // Itemprop
+        parts.push(`<meta itemprop="name" content="${(0, escapeAttr_1.escapeAttr)(pageTitle)}">`);
         if (pageDesc)
-            parts.push(`<meta itemprop="description" content="${escapeAttr(pageDesc)}">`);
-        if (ogImage)
-            parts.push(`<meta itemprop="image" content="${escapeAttr(ogImage)}">`);
+            parts.push(`<meta itemprop="description" content="${(0, escapeAttr_1.escapeAttr)(pageDesc)}">`);
+        if (imageItems[0]?.url)
+            parts.push(`<meta itemprop="image" content="${(0, escapeAttr_1.escapeAttr)(imageItems[0].url)}">`);
+        // ——— JSON-LD Schemas ———
+        const schemas = [];
+        // Organization (لو فيه اسم المتجر/لوجو)
+        if (store?.name || favicon) {
+            schemas.push((0, stripEmpty_1.stripEmpty)({
+                "@context": "https://schema.org",
+                "@type": "Organization",
+                "name": siteName || undefined,
+                "url": canonical || undefined,
+                "logo": favicon || undefined,
+            }));
+        }
+        // WebSite (+ SearchAction لو عندك مسار بحث في store.searchUrl أو page.searchUrl)
+        const searchUrl = (0, safeUrl_1.safeUrl)(seo.searchUrl || page.searchUrl || store.searchUrl);
+        schemas.push((0, stripEmpty_1.stripEmpty)({
+            "@context": "https://schema.org",
+            "@type": "WebSite",
+            "name": siteName || undefined,
+            "url": canonical || undefined,
+            "potentialAction": searchUrl ? {
+                "@type": "SearchAction",
+                "target": `${searchUrl}?q={search_term_string}`,
+                "query-input": "required name=search_term_string"
+            } : undefined
+        }));
+        // BreadcrumbList لو متاح page.breadcrumbs = [{name,url}]
+        const breadcrumbs = (0, asArray_1.asArray)(page.breadcrumbs).map((b, i) => (0, stripEmpty_1.stripEmpty)({
+            "@type": "ListItem",
+            "position": i + 1,
+            "name": (0, textOnly_1.textOnly)(b?.name, 80),
+            "item": (0, safeUrl_1.safeUrl)(b?.url)
+        })).filter(Boolean);
+        if (breadcrumbs.length) {
+            schemas.push({
+                "@context": "https://schema.org",
+                "@type": "BreadcrumbList",
+                "itemListElement": breadcrumbs
+            });
+        }
+        // Product Schema لو الصفحة منتج
+        if (isProduct) {
+            const price = product?.price ?? product?.pricing?.price;
+            const currency = product?.currency || product?.pricing?.currency || store?.currency || "EGP";
+            const inStock = product?.inStock ?? (typeof product?.quantity === "number" ? product.quantity > 0 : undefined);
+            const availability = inStock == null ? undefined : (inStock ? "https://schema.org/InStock" : "https://schema.org/OutOfStock");
+            const offers = (0, stripEmpty_1.stripEmpty)({
+                "@type": "Offer",
+                "price": price != null ? Number(price) : undefined,
+                "priceCurrency": currency,
+                "availability": availability,
+                "url": canonical || undefined,
+            });
+            schemas.push((0, stripEmpty_1.stripEmpty)({
+                "@context": "https://schema.org",
+                "@type": "Product",
+                "name": (0, textOnly_1.textOnly)(product?.title || pageTitle, 120),
+                "description": pageDesc || undefined,
+                "image": imageItems.map(i => i.url),
+                "sku": product?.sku || product?.id || product?.handle || undefined,
+                "brand": store?.name ? { "@type": "Brand", "name": siteName } : undefined,
+                "offers": offers
+            }));
+        }
+        if (schemas.length) {
+            parts.push(`<script type="application/ld+json">${JSON.stringify((0, stripEmpty_1.stripEmpty)(schemas), null, 0)}</script>`);
+        }
         // إخراج منظّف
         const html = parts.join("\n");
         return new nunjucks_1.runtime.SafeString(html);

package/dist/utils/asArray.d.ts

@@ -0,0 +1 @@
+export declare const asArray: <T = unknown>(x: T | T[] | undefined | null) => T[];

package/dist/utils/asArray.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.asArray = void 0;
+const asArray = (x) => Array.isArray(x) ? x : x != null ? [x] : [];
+exports.asArray = asArray;

package/dist/utils/escapeAttr.d.ts

@@ -0,0 +1 @@
+export declare const escapeAttr: (str: unknown) => string;

package/dist/utils/escapeAttr.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.escapeAttr = void 0;
+const escapeAttr = (str) => String(str ?? "")
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#39;");
+exports.escapeAttr = escapeAttr;

package/dist/utils/safeUrl.d.ts

@@ -0,0 +1 @@
+export declare const safeUrl: (str: unknown) => string;

package/dist/utils/safeUrl.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeUrl = void 0;
+const safeUrl = (str) => {
+    const s = String(str ?? "").trim();
+    if (!s)
+        return "";
+    if (/^https?:\/\//i.test(s))
+        return s;
+    if (s.startsWith("/"))
+        return s; // مسار داخلي
+    return ""; // غير مسموح
+};
+exports.safeUrl = safeUrl;

package/dist/utils/stripEmpty.d.ts

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

package/dist/utils/stripEmpty.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripEmpty = void 0;
+const stripEmpty = (obj) => {
+    if (obj == null)
+        return obj;
+    if (Array.isArray(obj))
+        return obj.map(exports.stripEmpty).filter(v => v != null && (typeof v !== "object" || Object.keys(v).length));
+    if (typeof obj === "object") {
+        const out = {};
+        for (const k of Object.keys(obj)) {
+            const v = (0, exports.stripEmpty)(obj[k]);
+            if (v !== undefined && v !== null && !(typeof v === "string" && v.trim() === ""))
+                out[k] = v;
+        }
+        return out;
+    }
+    return obj;
+};
+exports.stripEmpty = stripEmpty;

package/dist/utils/textOnly.d.ts

@@ -0,0 +1 @@
+export declare const textOnly: (str: unknown, limit?: number) => string;

package/dist/utils/textOnly.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.textOnly = void 0;
+const textOnly = (str, limit = 160) => {
+    const s = String(str ?? "")
+        .replace(/<[^>]*>/g, "") // شيل أي HTML
+        .replace(/\s+/g, " ") // سطر واحد
+        .trim();
+    return limit > 0 && s.length > limit ? s.slice(0, limit - 1).trim() + "…" : s;
+};
+exports.textOnly = textOnly;

package/dist/utils/validateUiData.js

@@ -14,7 +14,17 @@ function validateUiData(data) {
             for (const [key, value] of Object.entries(item)) {
                 if (value === true)
                     continue; // استبعاد مثل __keywords: true
-                result[key] = value;
+                // دعم الأنواع المسموح بها
+                if (typeof value === "string" ||
+                    typeof value === "number" ||
+                    typeof value === "boolean" ||
+                    Array.isArray(value) ||
+                    (typeof value === "object" && value !== null)) {
+                    result[key] = value;
+                }
+                else {
+                    throw new Error(`❌ نوع قيمة غير مدعوم في المفتاح "${key}": ${JSON.stringify(value)}`);
+                }
             }
         }
         else {

package/package.json

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