structured-fw 1.3.1 → 1.3.3

package/build/system/client/ClientComponent.js

@@ -79,8 +79,11 @@ export class ClientComponent extends EventEmitter {
         }
         this.isReady = true;
         if (this.isRoot || isRedrawRoot) {
-            this.on('initializerExecuted', () => {
+            this.on('initializerExecuted', async () => {
                 this.emit('ready');
+                if (isRedraw) {
+                    await this.emit('afterRedraw');
+                }
             });
             requestAnimationFrame(() => {
                 this.runInitializer(isRedraw);
@@ -243,7 +246,6 @@ export class ClientComponent extends EventEmitter {
                 });
             }
         }
-        await this.emit('afterRedraw');
     }
     initConditionals(node) {
         const isSelf = node === undefined;

package/build/system/server/Cookies.d.ts

@@ -2,5 +2,5 @@ import { IncomingMessage, ServerResponse } from "node:http";
 import { LooseObject } from '../types/general.types.js';
 export declare class Cookies {
     parse(request: IncomingMessage): LooseObject;
-    set(response: ServerResponse, name: string, value: string | number, lifetimeSeconds: number, path?: string, sameSite?: 'Strict' | 'Lax' | 'None', domain?: string): void;
+    set(response: ServerResponse, name: string, value: string | number, lifetimeSeconds: number, path?: string, sameSite?: 'Strict' | 'Lax' | 'None', domain?: string | null, secure?: boolean): void;
 }

package/build/system/server/Cookies.js

@@ -12,8 +12,19 @@ export class Cookies {
         });
         return cookies;
     }
-    set(response, name, value, lifetimeSeconds, path = '/', sameSite = 'Strict', domain) {
+    set(response, name, value, lifetimeSeconds, path = '/', sameSite = 'Strict', domain = null, secure = false) {
         const expiresAt = lifetimeSeconds > 0 ? new Date(new Date().getTime() + lifetimeSeconds * 1000).toUTCString() : 0;
-        response.appendHeader('Set-Cookie', `${name}=${value}; Expires=${expiresAt}; Path=${path}; SameSite=${sameSite}${domain ? `; domain=${domain}` : ''}`);
+        const parts = [];
+        parts.push(`${name}=${value}`);
+        parts.push(`Expires=${expiresAt}`);
+        parts.push(`Path=${path}`);
+        parts.push(`SameSite=${sameSite}`);
+        if (typeof domain === 'string') {
+            parts.push(`domain=${domain}`);
+        }
+        if (secure) {
+            parts.push('Secure=true');
+        }
+        response.appendHeader('Set-Cookie', parts.join('; '));
     }
 }

package/build/system/server/Layout.d.ts

@@ -6,7 +6,8 @@ export declare class Layout {
     layoutComponent: string;
     app: Application;
     language: string;
-    constructor(app: Application, layoutComponent: string, language?: string);
+    attributes: Record<string, string>;
+    constructor(app: Application, layoutComponent: string, language?: string, attributes?: Record<string, string>);
     private layoutComponentExists;
-    document(ctx: RequestContext, title: string, componentName: string, data?: LooseObject): Promise<Document>;
+    document(ctx: RequestContext, title: string, componentName: string, data?: LooseObject, attributes?: Record<string, string>): Promise<Document>;
 }

package/build/system/server/Layout.js

@@ -1,10 +1,11 @@
 import { Component } from "./Component.js";
 import { Document } from "./Document.js";
 export class Layout {
-    constructor(app, layoutComponent, language = 'en') {
+    constructor(app, layoutComponent, language = 'en', attributes) {
         this.app = app;
         this.layoutComponent = layoutComponent;
         this.language = language;
+        this.attributes = attributes || {};
         if (this.app.initialized) {
             this.layoutComponentExists();
         }
@@ -17,7 +18,7 @@ export class Layout {
             throw new Error(`Layout component "${this.layoutComponent}" not found`);
         }
     }
-    async document(ctx, title, componentName, data) {
+    async document(ctx, title, componentName, data, attributes) {
         const doc = new Document(this.app, title, ctx);
         doc.language = this.language;
         await doc.loadComponent(this.layoutComponent, data);
@@ -27,6 +28,13 @@ export class Layout {
         }
         const component = new Component(componentName, layoutComponent[0], doc, false);
         await component.init(`<${componentName}></${componentName}>`, data);
+        if (doc.children.length > 0) {
+            const attributesObject = {
+                ...this.attributes,
+                ...(attributes || {})
+            };
+            doc.children[0].setAttributes(attributesObject, '', false);
+        }
         const conditionals = component.dom.queryByHasAttribute('data-if');
         for (let i = 0; i < conditionals.length; i++) {
             const className = conditionals[i].getAttribute('class');

package/build/system/server/dom/HTMLParser.d.ts

@@ -18,6 +18,7 @@ export declare class HTMLParser {
     private lineChar;
     private isLetter;
     private isNumber;
+    private isWordBreak;
     dom(): DOMFragment;
     private error;
 }

package/build/system/server/dom/HTMLParser.js

@@ -29,7 +29,7 @@ export class HTMLParser {
         const char = this.char();
         const charCode = char.charCodeAt(0);
         if (this.state === 'idle') {
-            if (char === ' ') {
+            if (this.isWordBreak(char)) {
                 return true;
             }
             if (char === '<') {
@@ -78,7 +78,7 @@ export class HTMLParser {
                 this.attributeContext = node;
                 return true;
             }
-            if (char === ' ') {
+            if (this.isWordBreak(char)) {
                 if (this.tokenCurrent.length === 0) {
                     return true;
                 }
@@ -223,6 +223,9 @@ export class HTMLParser {
     isNumber(charCode) {
         return charCode > 47 && charCode < 58;
     }
+    isWordBreak(char) {
+        return char === ' ' || char === '\n' || char === '\t';
+    }
     dom() {
         return this.fragment;
     }

package/package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "scripts": {
     "develop": "tsc --watch",
     "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,hbs,css index.js",
@@ -36,7 +36,7 @@
     "typescript": "^5.7.2"
   },
   "dependencies": {
-    "handlebars": "^4.7.8",
+    "handlebars": "^4.7.9",
     "mime-types": "^3.0.0"
   },
   "files": [