qumra-engine 2.0.146 → 2.0.149

package/dist/extensions/logic/preview-widget.js

@@ -28,8 +28,7 @@ exports.default = new (class WidgetExtension {
         }
         try {
             const html = env.render(widgetTemplatePath, {
-                context: ctx.context,
-                globals: ctx.globals,
+                ...ctx,
                 widget: {
                     id: widget.id,
                     type: widget.widgetKey,

package/dist/extensions/logic/template.js

@@ -43,11 +43,7 @@ exports.default = new (class WidgetExtension {
             }
             try {
                 const html = env.render(widgetTemplatePath, {
-                    context: ctx.context,
-                    globals: ctx.globals,
-                    lang: ctx.lang,
-                    currency: ctx.currency,
-                    market: ctx.market,
+                    ...ctx,
                     widget: {
                         id: widget._id,
                         type: widget.widget,

package/dist/extensions/logic/ui.js

@@ -30,11 +30,7 @@ exports.default = new (class WidgetExtension {
         }
         const validated = (0, validateUiData_1.validateUiData)(data);
         const rendered = env.render(filePath, {
-            context: ctx.context,
-            globals: ctx.globals,
-            lang: ctx.lang,
-            currency: ctx.currency,
-            market: ctx.market,
+            ...ctx,
             data: validated,
         });
         return new nunjucks_1.default.runtime.SafeString(rendered);

package/dist/filters/logic/array/first.d.ts

@@ -1 +1 @@
-export default function first<T>(arr: T[]): T | undefined;
+export default function first<T extends object, K extends keyof T>(arr: T[], key?: K): T[K] | undefined | object;

package/dist/filters/logic/array/first.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = first;
-function first(arr) {
-    return Array.isArray(arr) ? arr[0] : undefined;
+function first(arr, key) {
+    if (!Array.isArray(arr) || arr.length === 0)
+        return undefined;
+    const firstItem = arr[0];
+    if (key !== undefined) {
+        return firstItem[key];
+    }
+    return firstItem;
 }

package/dist/filters/logic/array/last.d.ts

@@ -1 +1 @@
-export default function last(value: any[]): any;
+export default function last(value: any[], key?: string): any;

package/dist/filters/logic/array/last.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = last;
-function last(value) {
-    if (!Array.isArray(value))
-        return null;
-    return value[value.length - 1];
+function last(value, key) {
+    if (!Array.isArray(value) || value.length === 0)
+        return undefined;
+    const lastItem = value[value.length - 1];
+    if (key) {
+        return lastItem[key];
+    }
+    return lastItem;
 }

package/dist/filters/logic/array/sort_natural.js

@@ -10,7 +10,7 @@ function sort_natural(array) {
         return [];
     }
     try {
-        const naturalSortCompare = (0, natural_sort_1.default)({ caseSensitive: true });
+        const naturalSortCompare = (0, natural_sort_1.default)({ caseSensitive: false });
         return [...array].sort(naturalSortCompare);
     }
     catch (error) {

package/dist/filters/logic/html/highlight.d.ts

@@ -1 +1,2 @@
-export default function highlight(text: string, terms: string | string[]): string;
+import nunjucks from "nunjucks";
+export default function highlight(text: string, terms: string | string[]): nunjucks.runtime.SafeString | string;

package/dist/filters/logic/html/highlight.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = highlight;
+const nunjucks_1 = __importDefault(require("nunjucks"));
 function highlight(text, terms) {
     if (!text || !terms)
         return text || '';
@@ -18,5 +22,5 @@ function highlight(text, terms) {
     termArr.sort((a, b) => b.length - a.length);
     const escapedTerms = termArr.map(t => t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
     const regex = new RegExp(`(${escapedTerms.join('|')})`, 'gi');
-    return text.replace(regex, '<strong class="highlight">$1</strong>');
+    return new nunjucks_1.default.runtime.SafeString(text.replace(regex, '<strong class="highlight">$1</strong>'));
 }

package/dist/functions/render-handler.d.ts

@@ -0,0 +1,4 @@
+import { Locals } from "express";
+type RenderInput = Partial<Locals>;
+export default function renderHandler(locals: RenderInput): any;
+export {};

package/dist/functions/render-handler.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 });
+exports.default = renderHandler;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function renderHandler(locals) {
+    const render = locals?.render;
+    const settings = locals?.env?.getGlobal("settings");
+    const currency = locals?.currency;
+    const lang = locals?.lang;
+    const market = locals?.market;
+    const localesPath = locals?.localsPath;
+    let languages = [];
+    if (localesPath && fs_1.default.existsSync(localesPath)) {
+        languages = fs_1.default.readdirSync(localesPath).map(lang => path_1.default.basename(lang, '.json'));
+    }
+    const objectsData = {};
+    if (render?.globals?.customer)
+        objectsData.customer = render.globals?.customer;
+    if (lang)
+        objectsData.local = lang;
+    if (currency)
+        objectsData.currency = currency;
+    if (market)
+        objectsData.market = market;
+    if (render?.globals?.app)
+        objectsData.store = render.globals?.app;
+    if (render?.context?.seo)
+        objectsData.seo = render.context?.seo;
+    if (render?.globals?.app?.generalSettings)
+        objectsData.settings = render?.globals?.app?.generalSettings;
+    if (render?.context?.query?.q)
+        objectsData.search = render?.context?.query?.q;
+    if (render?.context?.pagination)
+        objectsData.pagination = render?.context?.pagination;
+    if (render?.context?.products)
+        objectsData.products = render?.context?.products;
+    if (render?.context?.products?.collections || render?.context?.collections)
+        objectsData.collections = render?.context?.products?.collections || render?.context?.collections;
+    if (render?.context?.products?.collection)
+        objectsData.collections = render?.context?.products?.collection;
+    if (render?.context?.product)
+        objectsData.product = render?.context?.product;
+    if (render?.context?.product)
+        objectsData.product = render?.context?.product;
+    if (render?.context?.product_options_value)
+        objectsData.product_options_value = render?.context?.product.options.map((item) => item);
+    if (render?.context?.related_products)
+        objectsData.recommendations = render?.context?.related_products;
+    if (render?.context?.page)
+        objectsData.page = render?.context?.page;
+    if (render?.context?.page?.title)
+        objectsData.page_title = render?.context?.page.title;
+    if (render?.context?.page?.path)
+        objectsData.page_path = render?.context?.page.path;
+    if (render?.context?.page?.description)
+        objectsData.page_description = render?.context?.page?.description;
+    if (settings)
+        objectsData.settings = settings;
+    if (market || lang || currency)
+        objectsData.Localization = { market, lang, currency, languages };
+    return objectsData;
+}

package/dist/middleware/render.middleware.js

@@ -1,11 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderMiddleware = void 0;
 const resolveTranslations_1 = require("../utils/resolveTranslations");
 const globals_1 = require("../store/globals");
+const render_handler_1 = __importDefault(require("../functions/render-handler"));
 const renderMiddleware = (req, res, next) => {
     const render = res.locals.render;
     const { context, globals, engine } = render;
+    const renderData = (0, render_handler_1.default)(res.locals);
     const jsonPreview = req.query?.jsonPreview ?? null;
     const widgetId = req.query?.widgetId ?? null;
     (0, globals_1.setGlobal)("injectionCode", engine?.injectionCode);
@@ -16,10 +21,7 @@ const renderMiddleware = (req, res, next) => {
         env.renderString(overrideLayout, (0, resolveTranslations_1.resolveTranslations)({
             context,
             globals,
-            settings: env.getGlobal("settings"),
-            market: res.locals.market || "",
-            lang: res.locals.lang || "",
-            currency: res.locals.currency || "",
+            ...renderData
         }, env.getGlobal("t")), (err, html) => {
             if (err) {
                 return next(new Error(`❌ Nunjucks render error: ${err.message}`));
@@ -38,10 +40,7 @@ const renderMiddleware = (req, res, next) => {
     env.render(`layouts/${pageLayout}.njk`, (0, resolveTranslations_1.resolveTranslations)({
         context,
         globals,
-        settings: env.getGlobal("settings"),
-        market: res.locals.market || "",
-        lang: res.locals.lang || "",
-        currency: res.locals.currency || "",
+        ...renderData
     }, env.getGlobal("t")), (err, html) => {
         if (err) {
             return next(new Error(`❌ Nunjucks render error: ${err.message}`));

package/dist/types/sharedTypes.d.ts

@@ -7,6 +7,7 @@ export interface Globals {
     app: any;
     Setting: any;
     assets: string;
+    customer: any;
     currency: Currency;
     cart?: any;
     themeDevMode?: boolean;
@@ -14,6 +15,9 @@ export interface Globals {
 }
 export interface RenderContext {
     page: Page;
+    query: {
+        q: string;
+    };
     [key: string]: any;
 }
 export type TMode = "production" | "devlopment";

package/package.json

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