structured-fw 0.9.8 → 0.9.9

package/build/system/Util.d.ts

@@ -18,3 +18,4 @@ export declare function attributeValueEscape(str: string): string;
 export declare function isObject(item: any): boolean;
 export declare function equalDeep(a: LooseObject, b: LooseObject): boolean;
 export declare function mergeDeep(target: any, ...sources: Array<any>): LooseObject;
+export declare function stripBOM(str: string): string;

package/build/system/Util.js

@@ -335,3 +335,7 @@ export function mergeDeep(target, ...sources) {
     }
     return mergeDeep(target, ...sources);
 }
+export function stripBOM(str) {
+    const includesBOM = str.charCodeAt(0) === 0xFEFF;
+    return includesBOM ? str.slice(1) : str;
+}

package/build/system/server/Component.js

@@ -59,7 +59,7 @@ export class Component extends EventEmitter {
         }
         this.dom.setAttribute(`data-${this.document.application.config.components.componentNameAttribute}`, this.name);
         if (typeof this.attributes.componentId !== 'string') {
-            this.id = this.document.allocateId(this);
+            this.id = this.document.allocateId();
             this.dom.setAttribute('data-component-id', this.id);
         }
         else {

package/build/system/server/Components.js

@@ -1,5 +1,6 @@
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import * as path from 'node:path';
+import { stripBOM } from '../Util.js';
 export class Components {
     constructor(app) {
         this.components = {};
@@ -72,7 +73,10 @@ export class Components {
         return this.components[name.toUpperCase()] || null;
     }
     loadHTML(path) {
-        return this.stripComments(readFileSync(path).toString());
+        const html = readFileSync(path, {
+            encoding: 'utf-8'
+        }).toString();
+        return this.stripComments(stripBOM(html).replace(/\r/g, ''));
     }
     stripComments(html) {
         return html.replaceAll(/<!--(?!-?>)(?!.*--!>)(?!.*<!--(?!>)).*?(?<!<!-)-->/g, '');

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

@@ -20,7 +20,7 @@ export declare class Document extends Component<{
     initInitializers(): Record<string, string>;
     private initClientConfig;
     toString(): string;
-    allocateId(component: Component): string;
+    allocateId(): string;
     loadView(pathRelative: string, data?: LooseObject): Promise<boolean>;
     loadComponent(componentName: string, data?: LooseObject): Promise<void>;
 }

package/build/system/server/Document.js

@@ -1,9 +1,9 @@
-import { Md5 } from 'ts-md5';
 import { DocumentHead } from './DocumentHead.js';
 import { Component } from './Component.js';
-import { attributeValueToString, randomString } from '../Util.js';
+import { attributeValueToString, stripBOM } from '../Util.js';
 import path from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
 export class Document extends Component {
     constructor(app, title, ctx) {
         super('root');
@@ -63,26 +63,8 @@ export class Document extends Component {
         </body>
         </html>`;
     }
-    allocateId(component) {
-        if (!this.componentIds) {
-            this.componentIds = [];
-        }
-        let id = Md5.hashStr(`${component.name}:${'id' in component.attributes ? component.attributes.id : `${component.path.join('/')}:${JSON.stringify(component.attributesRaw)}`}`);
-        if (this.componentIds.includes(id)) {
-            let current = component.parent;
-            do {
-                if (current === null || current.isRoot) {
-                    console.error(`Could not define an unique ID for component ${component.name}, path: ${component.path}`);
-                    id = randomString(16);
-                }
-                else {
-                    id += '-' + Md5.hashStr(current.dom.outerHTML);
-                }
-                current = current?.parent || null;
-            } while (this.componentIds.includes(id));
-        }
-        this.componentIds.push(id);
-        return id;
+    allocateId() {
+        return randomUUID();
     }
     async loadView(pathRelative, data) {
         const viewPath = path.resolve('../' + this.application.config.components.path + '/' + pathRelative + (pathRelative.endsWith('.html') ? '' : '.html'));
@@ -90,8 +72,10 @@ export class Document extends Component {
             console.warn(`Couldn't load document ${this.document.head.title}: ${viewPath}`);
             return false;
         }
-        const html = readFileSync(viewPath).toString();
-        await this.init(html, data);
+        const html = readFileSync(viewPath, {
+            encoding: 'utf-8'
+        }).toString();
+        await this.init(stripBOM(html).replace(/\r/g, ''), data);
         return true;
     }
     async loadComponent(componentName, data) {

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

@@ -14,6 +14,7 @@ export declare class HTMLParser {
     private lastChar;
     parse(): boolean;
     private line;
+    private lineChar;
     private isLetter;
     private isNumber;
     dom(): DOMFragment;

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

@@ -181,6 +181,9 @@ export class HTMLParser {
     line() {
         return this.html.substring(0, this.offset).split('\n').length;
     }
+    lineChar() {
+        return this.offset % this.html.split('\n').slice(0, this.line()).length;
+    }
     isLetter(charCode) {
         const isLowerCase = charCode > 96 && charCode < 123;
         if (isLowerCase) {
@@ -199,6 +202,11 @@ export class HTMLParser {
         return this.fragment;
     }
     error(message) {
-        return new Error(`HTMLParser: ${message}\nLine ${this.line()}\nHTML:\n${this.html}\n`);
+        return new Error(`
+        HTMLParser: ${message}
+        Line ${this.line()}, col ${this.lineChar()}
+        Char ${this.char()}, code ${this.char().charCodeAt(0)}
+        HTML:
+        ${this.html}`);
     }
 }

package/package.json

@@ -2,7 +2,12 @@
   "name": "structured-fw",
   "displayName": "Structured framework",
   "description": "Production-tested Node.js framework for creating performant server-side rendered web apps and APIs, with a sane amount of client side abstraction.",
-  "keywords": ["typescript", "framework", "ssr", "component"],
+  "keywords": [
+    "typescript",
+    "framework",
+    "ssr",
+    "component"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/julijan/structured"
@@ -14,7 +19,7 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "scripts": {
     "develop": "tsc --watch",
     "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,css index.js",
@@ -42,7 +47,7 @@
     "README.md",
     "LICENSE"
   ],
-  "exports" : {
+  "exports": {
     "./Types": "./build/system/Types.js",
     "./Symbols": "./build/system/Symbols.js",
     "./Util": "./build/system/Util.js",