qumra-engine 2.0.25 → 2.0.27

package/dist/extensions/index.d.ts

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

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

package/dist/extensions/logic/qumra-head copy.d.ts

@@ -0,0 +1,7 @@
+import { runtime } from "nunjucks";
+declare const _default: {
+    tags: string[];
+    parse(parser: any, nodes: any): any;
+    run({ env, ctx }: any): runtime.SafeString;
+};
+export default _default;

package/dist/extensions/logic/qumra-head copy.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const nunjucks_1 = require("nunjucks");
+const globals_1 = require("../../store/globals");
+exports.default = new (class SeoExtension {
+    constructor() {
+        this.tags = ["qumra_head"];
+    }
+    parse(parser, nodes) {
+        const tok = parser.nextToken();
+        parser.advanceAfterBlockEnd(tok.value);
+        return new nodes.CallExtension(this, "run", null);
+    }
+    run({ env, ctx }) {
+        const injectionCode = (0, globals_1.getGlobal)("injectionCode");
+        return new nunjucks_1.runtime.SafeString(`
+      ${injectionCode.head}
+      <script>
+        window.__qumra__ = window.__qumra__ || {};
+        window.__qumra__.context = ${JSON.stringify(ctx.context)};
+        window.__qumra__.globals = ${JSON.stringify(ctx.globals)};
+      </script>
+      <style>
+        :root {
+          --primary-color: #0070f3;
+          --secondary-color: #7928ca;
+          --background-color: #f9f9f9;
+          --text-color: #333333;
+          --border-color: #eaeaea;
+          --success-color: #22c55e;
+          --danger-color: #ef4444;
+          --warning-color: #facc15;
+        }
+      </style>
+    `);
+    }
+})();

package/dist/extensions/logic/qumra-head.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const nunjucks_1 = require("nunjucks");
+const globals_1 = require("../../store/globals");
 exports.default = new (class SeoExtension {
     constructor() {
         this.tags = ["qumra_head"];
@@ -11,11 +12,13 @@ exports.default = new (class SeoExtension {
         return new nodes.CallExtension(this, "run", null);
     }
     run({ env, ctx }) {
-        const contextData = JSON.stringify({ ...ctx.context || {} });
+        const injectionCode = (0, globals_1.getGlobal)("injectionCode");
         return new nunjucks_1.runtime.SafeString(`
+      ${injectionCode.head}
       <script>
         window.__qumra__ = window.__qumra__ || {};
-        window.__qumra__.context = ${contextData};
+        window.__qumra__.context = ${JSON.stringify(ctx.context)};
+        window.__qumra__.globals = ${JSON.stringify(ctx.globals)};
       </script>
       <style>
         :root {

package/dist/extensions/logic/qumra-scripts.d.ts

@@ -0,0 +1,7 @@
+import { runtime } from "nunjucks";
+declare const _default: {
+    tags: string[];
+    parse(parser: any, nodes: any): any;
+    run({ env, ctx }: any): runtime.SafeString;
+};
+export default _default;

package/dist/extensions/logic/qumra-scripts.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const nunjucks_1 = require("nunjucks");
+const globals_1 = require("../../store/globals");
+exports.default = new (class SeoExtension {
+    constructor() {
+        this.tags = ["qumra_scripts"];
+    }
+    parse(parser, nodes) {
+        const tok = parser.nextToken();
+        parser.advanceAfterBlockEnd(tok.value);
+        return new nodes.CallExtension(this, "run", null);
+    }
+    run({ env, ctx }) {
+        const injectionCode = (0, globals_1.getGlobal)("injectionCode");
+        return new nunjucks_1.runtime.SafeString(`
+      ${injectionCode.body}
+    `);
+    }
+})();

package/dist/filters/logic/colors/color_to_hex.js

@@ -1,15 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = color_to_hex;
-const color_1 = __importDefault(require("color"));
+const colord_1 = require("colord");
 function color_to_hex(color) {
-    try {
-        return (0, color_1.default)(color).hex();
-    }
-    catch (err) {
-        return color;
-    }
+    const result = (0, colord_1.colord)(color);
+    return result.isValid() ? result.toHex() : color;
 }

package/dist/middleware/mergeData.middleware.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeDataMiddleware = void 0;
 const mergeDataMiddleware = async (req, res, next) => {
     try {
-        const widgets = res.locals.render.engine.page?.widgets ?? [];
+        const widgets = res.locals.render.engine?.page?.widgets ?? [];
         res.locals.env.addGlobal("engineData", res.locals.render.engine);
         res.locals.env.addGlobal("widgets", widgets);
         res.locals.env.addGlobal("pageData", {
-            layout: res.locals.render.engine.page?.layout,
-            title: res.locals.render.engine.page?.title,
-            handle: res.locals.render.engine.page?.handle,
+            layout: res.locals.render.engine?.page?.layout,
+            title: res.locals.render.engine?.page?.title,
+            handle: res.locals.render.engine?.page?.handle,
         });
-        const settingsData = res.locals.render.engine.settings;
+        const settingsData = res.locals.render.engine?.settings;
         console.log("🚀 ~ settingsData:", settingsData);
         res.locals.env.addGlobal("settings", settingsData);
         next();

package/dist/middleware/render.middleware.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderMiddleware = void 0;
 const resolveTranslations_1 = require("../utils/resolveTranslations");
+const globals_1 = require("../store/globals");
 const renderMiddleware = (req, res, next) => {
     const render = res.locals.render;
-    const { context, globals } = render;
+    const { context, globals, engine } = render;
+    (0, globals_1.setGlobal)("injectionCode", engine?.injectionCode);
     const env = res.locals.env;
     const pageLayout = env.getGlobal("pageData").layout ?? "layout";
     env.render(`layouts/${pageLayout}.njk`, (0, resolveTranslations_1.resolveTranslations)({

package/dist/types/sharedTypes.d.ts

@@ -11,7 +11,23 @@ export type TMode = "production" | "devlopment";
 export interface MainData {
     globals?: Globals;
     context?: RenderContext;
-    engine?: any;
+    engine?: {
+        page: {
+            title: string;
+            handle: string;
+            layout: string;
+            widgets: Array<{
+                type: string;
+                data: Record<string, any>;
+                id: string;
+            }>;
+        };
+        settings: Record<string, any>;
+        injectionCode: {
+            head: string;
+            body: string;
+        };
+    };
     themePath: string;
     assetsPath?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.25",
+  "version": "2.0.27",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "chalk": "^5.4.1",
-    "color": "^5.0.0",
+    "colord": "^2.9.3",
     "express": "^5.1.0",
     "express-session": "^1.18.1",
     "morgan": "^1.10.0",