npm - structured-fw - Versions diffs - 1.0.8 → 1.0.9 - Mend

structured-fw 1.0.8 → 1.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (61) hide show

package/README.md +5 -2
package/build/system/EventEmitter.d.ts +1 -1
package/build/system/RequestHandler.d.ts +1 -0
package/build/system/RequestHandler.js +1 -0
package/build/system/RequestMethod.d.ts +1 -0
package/build/system/RequestMethod.js +1 -0
package/build/system/Types.d.ts +10 -175
package/build/system/Types.js +10 -1
package/build/system/Util.d.ts +2 -1
package/build/system/client/ClientComponent.d.ts +2 -1
package/build/system/client/ClientComponent.js +42 -10
package/build/system/client/DataStore.d.ts +1 -1
package/build/system/client/DataStoreView.d.ts +1 -1
package/build/system/client/Net.d.ts +2 -1
package/build/system/client/NetRequest.d.ts +1 -1
package/build/system/request.d.ts +1 -0
package/build/system/request.js +1 -0
package/build/system/server/Application.d.ts +4 -1
package/build/system/server/Application.js +1 -1
package/build/system/server/Component.d.ts +2 -1
package/build/system/server/Component.js +11 -8
package/build/system/server/Components.d.ts +2 -1
package/build/system/server/Components.js +7 -7
package/build/system/server/Cookies.d.ts +1 -1
package/build/system/server/Document.d.ts +5 -3
package/build/system/server/Document.js +3 -3
package/build/system/server/DocumentHead.d.ts +1 -1
package/build/system/server/FormValidation.d.ts +2 -1
package/build/system/server/Handlebars.d.ts +1 -1
package/build/system/server/Layout.d.ts +4 -2
package/build/system/server/Layout.js +3 -1
package/build/system/server/Request.d.ts +2 -1
package/build/system/server/Request.js +1 -0
package/build/system/server/Session.d.ts +2 -1
package/build/system/server/dom/DOMNode.d.ts +1 -0
package/build/system/server/dom/DOMNode.js +9 -3
package/build/system/server/dom/HTMLParser.d.ts +1 -0
package/build/system/server/dom/HTMLParser.js +31 -8
package/build/system/types/application.types.d.ts +1 -0
package/build/system/types/application.types.js +1 -0
package/build/system/types/component.types.d.ts +59 -0
package/build/system/types/component.types.js +1 -0
package/build/system/types/document.types.d.ts +5 -0
package/build/system/types/document.types.js +1 -0
package/build/system/types/eventEmitter.types.d.ts +1 -0
package/build/system/types/eventEmitter.types.js +1 -0
package/build/system/types/general.types.d.ts +1 -0
package/build/system/types/general.types.js +1 -0
package/build/system/types/request.d.ts +57 -0
package/build/system/types/request.js +1 -0
package/build/system/types/request.types.d.ts +58 -0
package/build/system/types/request.types.js +1 -0
package/build/system/types/session.types.d.ts +6 -0
package/build/system/types/session.types.js +1 -0
package/build/system/types/store.types.d.ts +1 -0
package/build/system/types/store.types.js +1 -0
package/build/system/types/structured.types.d.ts +32 -0
package/build/system/types/structured.types.js +1 -0
package/build/system/types/validation.types.d.ts +18 -0
package/build/system/types/validation.types.js +1 -0
package/package.json +2 -2

package/README.md CHANGED Viewed

@@ -275,6 +275,9 @@ type RequestContext<Body extends LooseObject | undefined = LooseObject> = {
     // true if x-requested-with header is received and it equals 'xmlhttprequest'
     isAjax: boolean,
+    // time when request was received (unix timestamp in milliseconds)
+    timeStart: number,
     // URL GET arguments
     getArgs: PostedDataDecoded,
@@ -766,9 +769,9 @@ Version 0.8.7 introduced the `Layout` class, which allows accomplishing the abov
     <template></template>
     ...
     ```
-2) `/index.ts` (`app` is an instance of `Application`)
+2) `/index.ts` (`app` is an instance of `Application`), 3rd argument is optional BCP 47 language tag
     ```
-    export const layout = new Layout(app, 'layout');
+    export const layout = new Layout(app, 'layout', 'en');
     ```
 3) `/app/routes/Test.ts`
     ```

package/build/system/EventEmitter.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { EventEmitterCallback } from "./Types.js";
+import { EventEmitterCallback } from './types/eventEmitter.types.js';
 export declare class EventEmitter<T extends Record<string, any> = Record<string, any>> {
     protected listeners: Partial<Record<Extract<keyof T, string>, Array<EventEmitterCallback<any>>>>;
     on<K extends Extract<keyof T, string>>(eventName: K, callback: EventEmitterCallback<T[K]>): void;

package/build/system/RequestHandler.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/RequestHandler.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/RequestMethod.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type RequestMethod = 'GET' \| 'POST' \| 'PUT' \| 'PATCH' \| 'DELETE';

package/build/system/RequestMethod.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/Types.d.ts CHANGED Viewed

@@ -1,175 +1,10 @@
-import { IncomingMessage, ServerResponse } from "node:http";
-import { Application } from "./server/Application.js";
-import { symbolArrays } from "./Symbols.js";
-import { Net } from './client/Net.js';
-import { ClientComponent } from './client/ClientComponent.js';
-import { Component } from "./server/Component.js";
-export type StructuredConfig = {
-    readonly envPrefix?: string;
-    readonly autoInit: boolean;
-    url: {
-        removeTrailingSlash: boolean;
-        componentRender: false | string;
-        isAsset: (url: string) => boolean;
-    };
-    routes: {
-        readonly path: string;
-    };
-    components: {
-        readonly path: string;
-        readonly componentNameAttribute: string;
-    };
-    session: {
-        readonly cookieName: string;
-        readonly keyLength: number;
-        readonly durationSeconds: number;
-        readonly garbageCollectIntervalSeconds: number;
-    };
-    http: {
-        host?: string;
-        port: number;
-        linkHeaderRel: 'preload' | 'preconnect';
-    };
-    readonly runtime: 'Node.js' | 'Deno';
-};
-export type StructuredClientConfig = {
-    componentRender: StructuredConfig['url']['componentRender'];
-    componentNameAttribute: string;
-};
-export type RequestMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
-export type RequestCallback<R extends any, Body extends LooseObject | undefined> = (ctx: RequestContext<Body>) => Promise<R>;
-export type RequestHandler = {
-    match: Array<URISegmentPattern> | RegExp;
-    methods: Array<RequestMethod>;
-    callback: RequestCallback<any, LooseObject | undefined>;
-    scope: any;
-    staticAsset: boolean;
-};
-export type RequestContext<Body extends LooseObject | undefined = LooseObject> = {
-    request: IncomingMessage;
-    response: ServerResponse;
-    args: URIArguments;
-    handler: null | RequestHandler;
-    cookies: Record<string, string>;
-    body: Body;
-    bodyRaw?: Buffer;
-    files?: Record<string, RequestBodyRecordValue>;
-    data: RequestContextData;
-    sessionId?: string;
-    isAjax: boolean;
-    getArgs: PostedDataDecoded;
-    respondWith: (data: any) => void;
-    redirect: (to: string, statusCode?: number) => void;
-    show404: () => Promise<void>;
-};
-export type PostedDataDecoded = Record<string, string | boolean | Array<string | boolean | PostedDataDecoded> | Record<string, string | boolean | Array<string | boolean | PostedDataDecoded>> | Record<string, string | boolean | Array<string | boolean>>>;
-export type RequestBodyRecordValue = string | Array<RequestBodyRecordValue> | {
-    [key: string]: RequestBodyRecordValue;
-} | {
-    [key: string]: RequestBodyFile;
-} | Array<RequestBodyFile> | RequestBodyFile;
-export interface RequestBodyArguments {
-    [key: string]: RequestBodyRecordValue;
-    [symbolArrays]?: {
-        [key: string]: Array<string>;
-    };
-}
-export type RequestBodyFiles = {
-    [key: string]: RequestBodyFile;
-};
-export type RequestBodyFile = {
-    fileName: string;
-    data: Buffer;
-    type: string;
-};
-export type URISegmentPattern = {
-    pattern: string | RegExp;
-    name?: string;
-    type?: 'string' | 'number';
-};
-export type URIArguments = {
-    [key: string]: string | number | RegExpExecArray;
-};
-export type DocumentResource = {
-    path: string;
-    attributes: Record<string, string | null>;
-    priority: number;
-};
-export type ComponentEntry = {
-    name: string;
-    path: {
-        absolute: string;
-        relative: string;
-        relativeToViews: string;
-        build: string;
-        html: string;
-        jsServer?: string;
-        jsClient?: string;
-    };
-    hasJS: boolean;
-    html: string;
-    static: boolean;
-    module?: ComponentScaffold;
-    renderTagName?: string;
-    exportData: boolean;
-    exportFields?: Array<string>;
-    attributes?: Record<string, string>;
-    initializer?: InitializerFunction;
-};
-export interface ComponentScaffold {
-    tagName?: string;
-    exportData?: boolean;
-    exportFields?: Array<string>;
-    static?: boolean;
-    deferred?: (data: Record<string, any>, ctx: RequestContext | undefined, app: Application) => boolean;
-    attributes?: Record<string, string>;
-    getData: (this: ComponentScaffold, data: RequestBodyArguments | LooseObject, ctx: undefined | RequestContext, app: Application, component: Component) => Promise<LooseObject | null>;
-    [key: string]: any;
-}
-export type LooseObject = Record<string, any>;
-export type ApplicationEvents = 'serverStarted' | 'beforeRequestHandler' | 'afterRequestHandler' | 'beforeRoutes' | 'afterRoutes' | 'beforeComponentsLoad' | 'afterComponentsLoaded' | 'documentCreated' | 'beforeAssetAccess' | 'afterAssetAccess' | 'pageNotFound';
-export type SessionEntry = {
-    sessionId: string;
-    lastRequest: number;
-    data: LooseObject;
-};
-export type ValidationRuleWithArguments = [string, any];
-export type FormValidationEntry = {
-    field: [string, string];
-    rules: Array<string | ValidationRuleWithArguments | ValidatorFunction>;
-};
-export type ValidatorFunction = (data: PostedDataDecoded, field: string, arg: number, rules: Array<string | ValidationRuleWithArguments | ValidatorFunction>) => Promise<boolean>;
-export type ValidatorErrorDecorator = (fieldHumanReadable: string, data: PostedDataDecoded, field: string, arg: any) => string | Promise<string>;
-export type ValidationErrors = {
-    [field: string]: Array<string>;
-};
-export type ValidationErrorsSingle = {
-    [field: string]: string;
-};
-export type ValidationResult = {
-    valid: boolean;
-    errors: ValidationErrors | ValidationErrorsSingle;
-};
-export type InitializerFunction = (this: ClientComponent, ctx: InitializerFunctionContext) => Promise<void>;
-export type Initializers = {
-    [key: string]: InitializerFunction;
-};
-export type InitializerFunctionContext = {
-    net: Net;
-    isRedraw: boolean;
-};
-export type StoreChangeCallback = (key: string, value: any, oldValue: any, componentId: string) => void;
-export type ClientComponentEventCallback<T> = (e: Event, data: T, element: HTMLElement | Window) => void;
-export type ClientComponentBoundEvent<T extends LooseObject | undefined = undefined> = {
-    element: HTMLElement | Window;
-    event: keyof HTMLElementEventMap;
-    callback: (e: Event) => void;
-    callbackOriginal: ClientComponentEventCallback<T>;
-};
-export type ClientComponentTransition = {
-    fade: false | number;
-    slide: false | number;
-};
-export type ClientComponentTransitionEvent = 'show' | 'hide';
-export type ClientComponentTransitions = Record<ClientComponentTransitionEvent, ClientComponentTransition>;
-export type EventEmitterCallback<T> = (payload: T, eventName: string) => void;
+export * from './types/request.types.js';
+export * from './types/document.types.js';
+export * from './types/component.types.js';
+export * from './types/session.types.js';
+export * from './types/store.types.js';
+export * from './types/validation.types.js';
+export * from './types/application.types.js';
+export * from './types/eventEmitter.types.js';
+export * from './types/general.types.js';
+export * from './types/structured.types.js';

package/build/system/Types.js CHANGED Viewed

@@ -1 +1,10 @@
-import { symbolArrays } from "./Symbols.js";
+export * from './types/request.types.js';
+export * from './types/document.types.js';
+export * from './types/component.types.js';
+export * from './types/session.types.js';
+export * from './types/store.types.js';
+export * from './types/validation.types.js';
+export * from './types/application.types.js';
+export * from './types/eventEmitter.types.js';
+export * from './types/general.types.js';
+export * from './types/structured.types.js';

package/build/system/Util.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { LooseObject, PostedDataDecoded } from "./Types.js";
+import { LooseObject } from './types/general.types.js';
+import { PostedDataDecoded } from "./types/request.types.js";
 export declare function queryStringDecode(queryString: string, initialValue?: PostedDataDecoded, trimValues?: boolean): PostedDataDecoded;
 export declare function queryStringDecodedSetValue(obj: PostedDataDecoded | string, value: any): LooseObject;
 export declare function objectEach<T>(obj: T, callbackEach: (key: keyof T, value: T[keyof T]) => void): void;

package/build/system/client/ClientComponent.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { ClientComponentEventCallback, LooseObject } from '../Types.js';
+import { LooseObject } from '../types/general.types.js';
+import { ClientComponentEventCallback } from '../types/component.types.js';
 import { DataStoreView } from './DataStoreView.js';
 import { DataStore } from './DataStore.js';
 import { Net } from './Net.js';

package/build/system/client/ClientComponent.js CHANGED Viewed

@@ -407,7 +407,7 @@ export class ClientComponent extends EventEmitter {
             return isTrue;
         }
         else {
-            const parts = /^(!)?\s*([a-zA-Z]+[a-zA-Z0-9_]*)\s*((?:==)|(?:===)|(?:!=)|(?:!==)|<|>|(?:<=)|(?:>=))?\s*([^=].+)?$/.exec(condition);
+            const parts = /^(!)?\s*([a-zA-Z0-9_]+)\s*((?:==)|(?:===)|(?:!=)|(?:!==)|<|>|(?:<=)|(?:>=))?\s?([^=]+)?$/.exec(condition);
             if (parts === null) {
                 console.error(`Could not parse condition ${condition}`);
                 return false;
@@ -619,25 +619,41 @@ export class ClientComponent extends EventEmitter {
         const onTransitionEnd = (e) => {
             domNode.style.opacity = '1';
             domNode.style.transition = '';
-            domNode.style.transformOrigin = 'unset';
+            domNode.style.transformOrigin = '';
+            domNode.style.transform = '';
             domNode.removeEventListener('transitionend', onTransitionEnd);
             domNode.removeEventListener('transitioncancel', onTransitionEnd);
         };
         domNode.addEventListener('transitionend', onTransitionEnd);
         domNode.addEventListener('transitioncancel', onTransitionEnd);
         if (transitionsActive.slide) {
+            const axis = this.transitionAxis(domNode, 'show');
+            let slideDirection = axis === 'X' ? 'left' : 'up';
+            const invert = domNode.hasAttribute('data-transition-slide-invert');
+            if (invert) {
+                slideDirection = slideDirection === 'left' ? 'right' : (slideDirection === 'up' ? 'down' : 'up');
+            }
+            const slideLengthMultiplier = slideDirection === 'down' || slideDirection === 'right' ? -1 : 1;
+            const slideLength = (axis === 'X' ? domNode.clientWidth : domNode.clientHeight) * 0.5 * slideLengthMultiplier * -1;
+            domNode.style.transform = `translate${axis === 'X' ? 'X' : 'Y'}(${slideLength}px)`;
+            setTimeout(() => {
+                domNode.style.transition = `transform ${transitionsActive.slide}ms linear`;
+                domNode.style.transform = `translate${axis === 'X' ? 'X' : 'Y'}(0)`;
+            }, 50);
+        }
+        if (transitionsActive.grow) {
             const transformOrigin = domNode.getAttribute('data-transform-origin-show') || '50% 0';
             domNode.style.transformOrigin = transformOrigin;
             const axis = this.transitionAxis(domNode, 'show');
             domNode.style.transform = `scale${axis}(0.01)`;
-            domNode.style.transition = `transform ${transitionsActive.slide / 1000}s`;
+            domNode.style.transition = `transform ${transitionsActive.grow}ms`;
             setTimeout(() => {
                 domNode.style.transform = `scale${axis}(1)`;
             }, 100);
         }
         if (transitionsActive.fade) {
             domNode.style.opacity = '0';
-            domNode.style.transition = `opacity ${transitionsActive.fade / 1000}s`;
+            domNode.style.transition = `opacity ${transitionsActive.fade}ms`;
             setTimeout(() => {
                 domNode.style.opacity = '1';
             }, 100);
@@ -674,20 +690,34 @@ export class ClientComponent extends EventEmitter {
             domNode.addEventListener('transitionend', onTransitionEnd);
             domNode.addEventListener('transitioncancel', onTransitionEnd);
             if (transitionsActive.slide) {
+                domNode.style.transition = `transform ${transitionsActive.slide}ms linear`;
+                const axis = this.transitionAxis(domNode, 'hide');
+                let slideDirection = axis === 'X' ? 'left' : 'up';
+                const invert = domNode.hasAttribute('data-transition-slide-invert');
+                if (invert) {
+                    slideDirection = slideDirection === 'left' ? 'right' : (slideDirection === 'up' ? 'down' : 'up');
+                }
+                setTimeout(() => {
+                    const slideLengthMultiplier = slideDirection === 'down' || slideDirection === 'right' ? -1 : 1;
+                    const slideLength = (axis === 'X' ? domNode.clientWidth : domNode.clientHeight) * 0.5 * slideLengthMultiplier * -1;
+                    domNode.style.transform = `translate${axis === 'X' ? 'X' : 'Y'}(${slideLength}px)`;
+                }, 50);
+            }
+            if (transitionsActive.grow) {
                 const transformOrigin = domNode.getAttribute('data-transform-origin-hide') || '50% 100%';
                 domNode.style.transformOrigin = transformOrigin;
-                domNode.style.transition = `transform ${transitionsActive.slide / 1000}s ease`;
+                domNode.style.transition = `transform ${transitionsActive.grow}ms ease`;
                 setTimeout(() => {
                     const axis = this.transitionAxis(domNode, 'hide');
                     domNode.style.transform = `scale${axis}(0.01)`;
-                }, 100);
+                }, 50);
             }
             if (transitionsActive.fade) {
                 domNode.style.opacity = '1';
-                domNode.style.transition = `opacity ${transitionsActive.fade / 1000}s`;
+                domNode.style.transition = `opacity ${transitionsActive.fade}ms`;
                 setTimeout(() => {
                     domNode.style.opacity = '0';
-                }, 100);
+                }, 50);
             }
         }
     }
@@ -695,11 +725,13 @@ export class ClientComponent extends EventEmitter {
         const transitions = {
             show: {
                 slide: false,
-                fade: false
+                fade: false,
+                grow: false,
             },
             hide: {
                 slide: false,
-                fade: false
+                fade: false,
+                grow: false,
             }
         };
         objectEach(transitions, (transitionEvent, transition) => {

package/build/system/client/DataStore.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { StoreChangeCallback } from '../Types.js';
+import { StoreChangeCallback } from '../types/store.types.js';
 import { ClientComponent } from './ClientComponent.js';
 export declare class DataStore {
     protected data: {

package/build/system/client/DataStoreView.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { StoreChangeCallback } from '../Types.js';
+import { StoreChangeCallback } from '../types/store.types.js';
 import { ClientComponent } from './ClientComponent.js';
 import { DataStore } from './DataStore.js';
 export declare class DataStoreView {

package/build/system/client/Net.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { IncomingHttpHeaders } from 'node:http';
-import { LooseObject, RequestMethod } from '../Types.js';
+import { LooseObject } from '../types/general.types.js';
+import { RequestMethod } from "../types/request.types.js";
 export declare class Net {
     request(method: RequestMethod, url: string, headers?: IncomingHttpHeaders, body?: any, responseType?: XMLHttpRequestResponseType): Promise<string>;
     get(url: string, headers?: IncomingHttpHeaders): Promise<string>;

package/build/system/client/NetRequest.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { IncomingHttpHeaders } from 'node:http';
-import { RequestMethod } from '../Types.js';
+import { RequestMethod } from "../types/request.types.js";
 export declare class NetRequest {
     xhr: XMLHttpRequest;
     method: RequestMethod;

package/build/system/request.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type RequestMethod = 'GET' \| 'POST' \| 'PUT' \| 'PATCH' \| 'DELETE';

package/build/system/request.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/server/Application.d.ts CHANGED Viewed

@@ -1,5 +1,8 @@
 import { Server } from 'node:http';
-import { ApplicationEvents, LooseObject, RequestContext, StructuredConfig } from '../Types.js';
+import { ApplicationEvents } from '../types/application.types.js';
+import { StructuredConfig } from '../types/structured.types.js';
+import { LooseObject } from '../types/general.types.js';
+import { RequestContext } from "../types/request.types.js";
 import { Document } from './Document.js';
 import { Components } from './Components.js';
 import { Session } from './Session.js';

package/build/system/server/Application.js CHANGED Viewed

@@ -154,7 +154,7 @@ export class Application {
             const document = new Document(this, '', ctx);
             const data = attributes;
             await document.loadComponent(component.name, data);
-            const exportedData = component.exportData ? document.data : (component.exportFields ? component.exportFields.reduce((prev, curr) => {
+            const exportedData = component.exportData ? document.children[0].data : (component.exportFields ? component.exportFields.reduce((prev, curr) => {
                 prev[curr] = document.children[0].data[curr];
                 return prev;
             }, {}) : {});

package/build/system/server/Component.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { Document } from './Document.js';
-import { ComponentEntry, LooseObject } from '../Types.js';
+import { LooseObject } from '../types/general.types.js';
+import { ComponentEntry } from "../types/component.types.js";
 import { DOMNode } from './dom/DOMNode.js';
 import { EventEmitter } from '../EventEmitter.js';
 export declare class Component<Events extends Record<string, any> = {

package/build/system/server/Component.js CHANGED Viewed

@@ -81,9 +81,9 @@ export class Component extends EventEmitter {
         });
         this.data = exportedContextData;
         if (this.entry !== null &&
-            typeof this.entry.module !== 'undefined' &&
-            typeof this.entry.module.deferred === 'function' &&
-            this.entry.module.deferred(this.attributes, this.document.ctx, this.document.application) &&
+            typeof this.entry.serverPart !== 'undefined' &&
+            typeof this.entry.serverPart.deferred === 'function' &&
+            this.entry.serverPart.deferred(this.attributes, this.document.ctx, this.document.application) &&
             this.attributes.deferred !== false) {
             this.setAttributes({ deferred: true }, 'data-', true);
             return;
@@ -91,14 +91,14 @@ export class Component extends EventEmitter {
         const importedParentData = this.parent ? this.importedParentData(this.parent.data) : {};
         let dataServerSidePart = {};
         try {
-            dataServerSidePart = (this.entry && this.entry.module ?
-                await this.entry.module.getData(Object.assign(importedParentData, this.attributes, data || {}), this.document.ctx, this.document.application, this) : {}) || {};
+            dataServerSidePart = (this.entry && this.entry.serverPart ?
+                await this.entry.serverPart.getData(Object.assign(importedParentData, this.attributes, data || {}), this.document.ctx, this.document.application, this) : {}) || {};
         }
         catch (e) {
             throw new Error(`Error executing getData in component ${this.name}: ${e.message}`);
         }
         if (data === undefined) {
-            if (this.entry && this.entry.module) {
+            if (this.entry && this.entry.hasServerPart) {
                 this.data = Object.assign(this.data, dataServerSidePart);
             }
             else {
@@ -110,10 +110,10 @@ export class Component extends EventEmitter {
             this.data = Object.assign(this.data, Object.assign(importedParentData, data), this.attributes, dataServerSidePart);
         }
         this.fillData(this.data);
-        if (this.entry === null || this.entry.exportData) {
+        if (!this.entry?.hasServerPart) {
             this.setAttributes(this.data, 'data-');
         }
-        else if (this.entry) {
+        else {
             if (this.entry.exportFields) {
                 this.setAttributes(this.entry.exportFields.reduce((prev, field) => {
                     if (this.data[field] !== undefined) {
@@ -122,6 +122,9 @@ export class Component extends EventEmitter {
                     return prev;
                 }, {}), 'data-');
             }
+            else if (this.entry.exportData) {
+                this.setAttributes(this.data, 'data-');
+            }
             if (this.entry.attributes) {
                 this.setAttributes(this.entry.attributes, '', false);
             }

package/build/system/server/Components.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { ComponentEntry, StructuredConfig } from '../Types.js';
+import { StructuredConfig } from '../types/structured.types.js';
+import { ComponentEntry } from "../types/component.types.js";
 import { Application } from './Application.js';
 export declare class Components {
     config: StructuredConfig;

package/build/system/server/Components.js CHANGED Viewed

@@ -45,7 +45,7 @@ export class Components {
                             jsClient: hasClientJS ? jsClientPath : undefined,
                             jsServer: hasServerJS ? jsServerPath : undefined
                         },
-                        hasJS: existsSync(jsServerPath),
+                        hasServerPart: existsSync(jsServerPath),
                         html: this.loadHTML(absolutePath),
                         exportData: false,
                         static: false
@@ -56,12 +56,12 @@ export class Components {
                     }
                     if (hasServerJS) {
                         const componentConstructor = await import('file:///' + entry.path.jsServer);
-                        entry.module = new componentConstructor.default();
-                        entry.renderTagName = entry.module?.tagName || 'div';
-                        entry.exportData = typeof entry.module?.exportData === 'boolean' ? entry.module.exportData : false;
-                        entry.exportFields = entry.module?.exportFields;
-                        entry.attributes = entry.module?.attributes;
-                        entry.static = typeof entry.module?.static === 'boolean' ? entry.module.static : false;
+                        entry.serverPart = new componentConstructor.default();
+                        entry.renderTagName = entry.serverPart?.tagName || 'div';
+                        entry.exportData = typeof entry.serverPart?.exportData === 'boolean' ? entry.serverPart.exportData : false;
+                        entry.exportFields = entry.serverPart?.exportFields;
+                        entry.attributes = entry.serverPart?.attributes;
+                        entry.static = typeof entry.serverPart?.static === 'boolean' ? entry.serverPart.static : false;
                     }
                     this.components[componentName.toUpperCase()] = entry;
                     this.componentNames.push(entry.name);

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

@@ -1,5 +1,5 @@
 import { IncomingMessage, ServerResponse } from "node:http";
-import { LooseObject } from "../Types.js";
+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;

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

@@ -1,5 +1,7 @@
 import { ServerResponse } from 'node:http';
-import { Initializers, LooseObject, RequestContext } from '../../system/Types.js';
+import { LooseObject } from '../types/general.types.js';
+import { Initializers } from '../types/component.types.js';
+import { RequestContext } from "../types/request.types.js";
 import { Application } from './Application.js';
 import { DocumentHead } from './DocumentHead.js';
 import { Component } from './Component.js';
@@ -21,6 +23,6 @@ export declare class Document extends Component<{
     private initClientConfig;
     toString(): string;
     allocateId(): string;
-    loadView(pathRelative: string, data?: LooseObject): Promise<boolean>;
-    loadComponent(componentName: string, data?: LooseObject): Promise<void>;
+    loadView(pathRelative: string, data?: LooseObject): Promise<Document>;
+    loadComponent(componentName: string, data?: LooseObject): Promise<Document>;
 }

package/build/system/server/Document.js CHANGED Viewed

@@ -69,14 +69,13 @@ export class Document extends Component {
     async loadView(pathRelative, data) {
         const viewPath = path.resolve('../' + this.application.config.components.path + '/' + pathRelative + (pathRelative.endsWith('.html') ? '' : '.html'));
         if (!existsSync(viewPath)) {
-            console.warn(`Couldn't load document ${this.document.head.title}: ${viewPath}`);
-            return false;
+            throw new Error(`Couldn't load document ${this.document.head.title}: ${viewPath}`);
         }
         const html = readFileSync(viewPath, {
             encoding: 'utf-8'
         }).toString();
         await this.init(stripBOM(html).replace(/\r/g, ''), data);
-        return true;
+        return this;
     }
     async loadComponent(componentName, data) {
         const componentEntry = this.document.application.components.getByName(componentName);
@@ -87,5 +86,6 @@ export class Document extends Component {
             }, []).join(' ');
             await this.init(`<${componentName} ${dataString}></${componentName}>`, data);
         }
+        return this;
     }
 }

package/build/system/server/DocumentHead.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { DocumentResource } from '../Types.js';
+import { DocumentResource } from "../types/document.types.js";
 export declare class DocumentHead {
     title: string;
     js: Array<DocumentResource>;

package/build/system/server/FormValidation.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { FormValidationEntry, LooseObject, ValidationResult, ValidationRuleWithArguments, ValidatorErrorDecorator, ValidatorFunction } from '../Types.js';
+import { LooseObject } from '../types/general.types.js';
+import { ValidationResult, ValidatorErrorDecorator, ValidatorFunction, FormValidationEntry, ValidationRuleWithArguments } from '../types/validation.types.js';
 export declare class FormValidation {
     fieldRules: Array<FormValidationEntry>;
     singleError: boolean;

package/build/system/server/Handlebars.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { HelperDelegate } from "handlebars";
 import { default as HandlebarsInstance } from 'handlebars';
-import { LooseObject } from "../Types.js";
+import { LooseObject } from '../types/general.types.js';
 export declare class Handlebars {
     readonly instance: typeof HandlebarsInstance;
     readonly helpers: Record<string, HelperDelegate>;

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

@@ -1,10 +1,12 @@
-import { LooseObject, RequestContext } from "../Types.js";
+import { LooseObject } from '../types/general.types.js';
+import { RequestContext } from "../types/request.types.js";
 import { Application } from "./Application.js";
 import { Document } from "./Document.js";
 export declare class Layout {
     layoutComponent: string;
     app: Application;
-    constructor(app: Application, layoutComponent: string);
+    language: string;
+    constructor(app: Application, layoutComponent: string, language?: string);
     private layoutComponentExists;
     document(ctx: RequestContext, title: string, componentName: string, data?: LooseObject): Promise<Document>;
 }

package/build/system/server/Layout.js CHANGED Viewed

@@ -1,9 +1,10 @@
 import { Component } from "./Component.js";
 import { Document } from "./Document.js";
 export class Layout {
-    constructor(app, layoutComponent) {
+    constructor(app, layoutComponent, language = 'en') {
         this.app = app;
         this.layoutComponent = layoutComponent;
+        this.language = language;
         if (this.app.initialized) {
             this.layoutComponentExists();
         }
@@ -18,6 +19,7 @@ export class Layout {
     }
     async document(ctx, title, componentName, data) {
         const doc = new Document(this.app, title, ctx);
+        doc.language = this.language;
         await doc.loadComponent(this.layoutComponent, data);
         const layoutComponent = doc.dom.queryByTagName('template');
         if (layoutComponent.length === 0) {

package/build/system/server/Request.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { IncomingMessage, ServerResponse } from "node:http";
-import { LooseObject, PostedDataDecoded, RequestBodyFile, RequestCallback, RequestMethod } from "../Types.js";
+import { LooseObject } from '../types/general.types.js';
+import { RequestMethod, PostedDataDecoded, RequestBodyFile, RequestCallback } from "../types/request.types.js";
 import { Application } from "./Application.js";
 export declare class Request {
     private app;

package/build/system/server/Request.js CHANGED Viewed

@@ -105,6 +105,7 @@ export class Request {
             body: undefined,
             getArgs,
             cookies: this.app.cookies.parse(request),
+            timeStart: new Date().getTime(),
             isAjax: request.headers['x-requested-with'] == 'xmlhttprequest',
             respondWith: function (data) {
                 if (typeof data === 'string' || Buffer.isBuffer(data)) {

package/build/system/server/Session.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { LooseObject, SessionEntry } from '../Types.js';
+import { LooseObject } from '../types/general.types.js';
+import { SessionEntry } from '../types/session.types.js';
 import { Application } from './Application.js';
 export declare class Session {
     application: Application;

package/build/system/server/dom/DOMNode.d.ts CHANGED Viewed

@@ -21,6 +21,7 @@ export declare class DOMNode {
     attributeMap: Record<string, DOMNodeAttribute>;
     style: Partial<CSSStyleDeclaration>;
     selfClosing: boolean;
+    explicitSelfClosing: boolean;
     potentialComponentChildren: Array<DOMNode>;
     constructor(root: DOMFragment | null, parentNode: DOMNode | null, tagName: string);
     appendChild(node: DOMNode | string): void;

package/build/system/server/dom/DOMNode.js CHANGED Viewed

@@ -1,6 +1,11 @@
 import { HTMLParser } from "./HTMLParser.js";
-export const selfClosingTags = ['br', 'wbr', 'hr', 'input', 'img', 'link', 'meta', 'source', 'embed', 'path', 'area', 'rect'];
-export const recognizedHTMLTags = ['body', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'b', 'i', 'a', 'em', 'strong', 'br', 'wbr', 'hr', 'abbr', 'bdi', 'bdo', 'blockquote', 'cite', 'code', 'del', 'dfn', 'ins', 'kbd', 'mark', 'pre', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'small', 'span', 'sub', 'sup', 'time', 'u', 'var', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'img', 'area', 'map', 'object', 'param', 'table', 'tr', 'td', 'th', 'caption', 'colgroup', 'col', 'form', 'input', 'label', 'select', 'option', 'textarea', 'button', 'fieldset', 'datalist', 'iframe', 'audio', 'video', 'source', 'track', 'script', 'noscript', 'div', 'nav', 'aside', 'canvas', 'embed', 'template', 'rect'];
+export const selfClosingTags = ['br', 'wbr', 'hr', 'input', 'img', 'link', 'meta', 'source', 'embed',
+    'path', 'area', 'rect', 'ellipse', 'circle', 'line', 'polygon', 'image'
+];
+export const recognizedHTMLTags = [
+    'body', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'b', 'i', 'a', 'em', 'strong', 'br', 'wbr', 'hr', 'abbr', 'bdi', 'bdo', 'blockquote', 'cite', 'code', 'del', 'dfn', 'ins', 'kbd', 'mark', 'pre', 'q', 'rp', 'rt', 'ruby', 's', 'samp', 'small', 'span', 'sub', 'sup', 'time', 'u', 'var', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'img', 'area', 'map', 'object', 'param', 'table', 'tr', 'td', 'th', 'caption', 'colgroup', 'col', 'form', 'input', 'label', 'select', 'option', 'textarea', 'button', 'fieldset', 'datalist', 'iframe', 'audio', 'video', 'source', 'track', 'script', 'noscript', 'div', 'nav', 'aside', 'canvas', 'embed', 'template',
+    'svg', 'g', 'text', 'path', 'circle', 'clipPath', 'defs', 'ellipse', 'rect', 'polygon', 'image', 'style',
+];
 export class DOMNode {
     constructor(root, parentNode, tagName) {
         this.parentNode = null;
@@ -8,6 +13,7 @@ export class DOMNode {
         this.attributes = [];
         this.attributeMap = {};
         this.style = {};
+        this.explicitSelfClosing = false;
         this.potentialComponentChildren = [];
         this.root = root === null ? this : root;
         this.isRoot = root === null;
@@ -116,7 +122,7 @@ export class DOMNode {
             style += ` ${styleName}: ${styleValue};`;
             return style;
         }, '');
-        return `<${this.tagName}${attributes}${style.trim().length > 0 ? ` style="${style}"` : ''}>${this.selfClosing ? '' : `${this.innerHTML}</${this.tagName}>`}`;
+        return `<${this.tagName}${attributes}${style.trim().length > 0 ? ` style="${style}"` : ''}${this.explicitSelfClosing ? '/' : ''}>${this.selfClosing || this.explicitSelfClosing ? '' : `${this.innerHTML}</${this.tagName}>`}`;
     }
     toObject() {
         return {

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

@@ -6,6 +6,7 @@ export declare class HTMLParser {
     private state;
     private tokenCurrent;
     private fragment;
+    explicitSelfClosing: boolean;
     private attributeOpenQuote;
     private attributeNameCurrent;
     private attributeContext;

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

@@ -6,6 +6,7 @@ export class HTMLParser {
         this.state = 'idle';
         this.tokenCurrent = '';
         this.fragment = new DOMFragment();
+        this.explicitSelfClosing = false;
         this.attributeOpenQuote = '"';
         this.attributeNameCurrent = '';
         this.attributeContext = null;
@@ -46,6 +47,7 @@ export class HTMLParser {
             }
             if (this.isLetter(charCode)) {
                 this.state = 'tagOpen';
+                this.explicitSelfClosing = false;
                 this.tokenCurrent = char;
                 return true;
             }
@@ -58,6 +60,7 @@ export class HTMLParser {
                 if (this.tokenCurrent.length === 0) {
                     throw this.error(`Unexpected tag closing sequence "</", expected opening tag`);
                 }
+                this.explicitSelfClosing = true;
                 return true;
             }
             if (char === '>') {
@@ -66,9 +69,10 @@ export class HTMLParser {
                 }
                 const node = new DOMNode(this.fragment, this.context, this.tokenCurrent);
                 this.context.appendChild(node);
-                this.state = 'idle';
+                this.state = 'text';
                 this.tokenCurrent = '';
-                if (!node.selfClosing) {
+                node.explicitSelfClosing = this.explicitSelfClosing;
+                if (!node.selfClosing && !node.explicitSelfClosing) {
                     this.context = node;
                 }
                 this.attributeContext = node;
@@ -82,7 +86,8 @@ export class HTMLParser {
                 const node = new DOMNode(this.fragment, this.context, this.tokenCurrent);
                 this.context.appendChild(node);
                 this.tokenCurrent = '';
-                if (!node.selfClosing) {
+                node.explicitSelfClosing = this.explicitSelfClosing;
+                if (!node.selfClosing && !node.explicitSelfClosing) {
                     this.context = node;
                 }
                 this.attributeContext = node;
@@ -99,7 +104,7 @@ export class HTMLParser {
                 return true;
             }
             if (char === '>') {
-                if (this.tokenCurrent !== this.context.tagName) {
+                if (this.tokenCurrent !== this.context.tagName && !this.attributeContext?.explicitSelfClosing) {
                     throw this.error(`Found closing tag ${this.tokenCurrent}, expected ${this.context.tagName}`);
                 }
                 this.context = this.context.parentNode || this.fragment;
@@ -123,12 +128,25 @@ export class HTMLParser {
         }
         else if (this.state === 'attributeName') {
             const boundsChar = char === ' ' || char === '\n' || char === '\t';
-            if (boundsChar || char === '=' || char === '>') {
+            if (boundsChar || char === '=' || char === '>' || char === '/') {
                 if (char === '=') {
                     this.state = 'attributeValueStart';
                 }
                 else if (char === '>') {
-                    this.state = 'idle';
+                    this.state = 'text';
+                    if (this.tokenCurrent.trim().length === 0) {
+                        return true;
+                    }
+                }
+                else if (char === '/') {
+                    if (this.attributeContext && this.attributeContext.parentNode) {
+                        this.context = this.attributeContext.parentNode;
+                        this.attributeContext.explicitSelfClosing = true;
+                        this.state = 'tagClose';
+                        if (this.tokenCurrent.trim().length === 0) {
+                            return true;
+                        }
+                    }
                 }
                 if (this.tokenCurrent.length > 0) {
                     if (this.attributeContext !== null && this.tokenCurrent.trim().length > 0) {
@@ -164,14 +182,19 @@ export class HTMLParser {
         }
         else if (this.state === 'attributeEnd') {
             if (char === '>') {
-                this.state = 'idle';
+                this.state = 'text';
                 return true;
             }
             if (char === ' ' || char === '\n') {
                 this.state = 'attributeName';
                 return true;
             }
-            else if (char === '/') {
+            if (char === '/') {
+                if (this.attributeContext && this.attributeContext.parentNode) {
+                    this.context = this.attributeContext.parentNode;
+                    this.attributeContext.explicitSelfClosing = true;
+                    this.tokenCurrent = '';
+                }
                 return true;
             }
             else {

package/build/system/types/application.types.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type ApplicationEvents = 'serverStarted' \| 'beforeRequestHandler' \| 'afterRequestHandler' \| 'beforeRoutes' \| 'afterRoutes' \| 'beforeComponentsLoad' \| 'afterComponentsLoaded' \| 'documentCreated' \| 'beforeAssetAccess' \| 'afterAssetAccess' \| 'pageNotFound';

package/build/system/types/application.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/component.types.d.ts ADDED Viewed

@@ -0,0 +1,59 @@
+import { ClientComponent } from "../client/ClientComponent.js";
+import { Net } from "../client/Net.js";
+import { Application } from "../server/Application.js";
+import { Component } from "../server/Component.js";
+import { LooseObject } from './general.types.js';
+import { RequestContext, RequestBodyArguments } from "./request.types.js";
+export type ComponentEntry = {
+    name: string;
+    path: {
+        absolute: string;
+        relative: string;
+        relativeToViews: string;
+        build: string;
+        html: string;
+        jsServer?: string;
+        jsClient?: string;
+    };
+    hasServerPart: boolean;
+    serverPart?: ComponentScaffold;
+    html: string;
+    static: boolean;
+    renderTagName?: string;
+    exportData: boolean;
+    exportFields?: Array<string>;
+    attributes?: Record<string, string>;
+    initializer?: InitializerFunction;
+};
+export interface ComponentScaffold {
+    tagName?: string;
+    exportData?: boolean;
+    exportFields?: Array<string>;
+    static?: boolean;
+    deferred?: (data: Record<string, any>, ctx: RequestContext | undefined, app: Application) => boolean;
+    attributes?: Record<string, string>;
+    getData: (this: ComponentScaffold, data: RequestBodyArguments | LooseObject, ctx: undefined | RequestContext, app: Application, component: Component) => Promise<LooseObject | null>;
+    [key: string]: any;
+}
+export type ClientComponentTransition = {
+    fade: false | number;
+    slide: false | number;
+    grow: false | number;
+};
+export type ClientComponentTransitionEvent = 'show' | 'hide';
+export type ClientComponentTransitions = Record<ClientComponentTransitionEvent, ClientComponentTransition>;
+export type ClientComponentBoundEvent<T extends LooseObject | undefined = undefined> = {
+    element: HTMLElement | Window;
+    event: keyof HTMLElementEventMap;
+    callback: (e: Event) => void;
+    callbackOriginal: ClientComponentEventCallback<T>;
+};
+export type ClientComponentEventCallback<T> = (e: Event, data: T, element: HTMLElement | Window) => void;
+export type InitializerFunction = (this: ClientComponent, ctx: InitializerFunctionContext) => Promise<void>;
+export type Initializers = {
+    [key: string]: InitializerFunction;
+};
+export type InitializerFunctionContext = {
+    net: Net;
+    isRedraw: boolean;
+};

package/build/system/types/component.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/document.types.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+export type DocumentResource = {
+    path: string;
+    attributes: Record<string, string | null>;
+    priority: number;
+};

package/build/system/types/document.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/eventEmitter.types.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type EventEmitterCallback<T> = (payload: T, eventName: string) => void;

package/build/system/types/eventEmitter.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/general.types.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type LooseObject = Record<string, any>;

package/build/system/types/general.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/request.d.ts ADDED Viewed

@@ -0,0 +1,57 @@
+import { IncomingMessage, ServerResponse } from "http";
+import { LooseObject } from "../Types.js";
+import { symbolArrays } from "../Symbols.js";
+export type RequestMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+export type RequestCallback<R extends any, Body extends LooseObject | undefined> = (ctx: RequestContext<Body>) => Promise<R>;
+export type RequestHandler = {
+    match: Array<URISegmentPattern> | RegExp;
+    methods: Array<RequestMethod>;
+    callback: RequestCallback<any, LooseObject | undefined>;
+    scope: any;
+    staticAsset: boolean;
+};
+export type RequestContext<Body extends LooseObject | undefined = LooseObject> = {
+    request: IncomingMessage;
+    response: ServerResponse;
+    args: URIArguments;
+    handler: null | RequestHandler;
+    cookies: Record<string, string>;
+    body: Body;
+    bodyRaw?: Buffer;
+    files?: Record<string, RequestBodyRecordValue>;
+    data: RequestContextData;
+    sessionId?: string;
+    isAjax: boolean;
+    getArgs: PostedDataDecoded;
+    respondWith: (data: any) => void;
+    redirect: (to: string, statusCode?: number) => void;
+    show404: () => Promise<void>;
+};
+export type PostedDataDecoded = Record<string, string | boolean | Array<string | boolean | PostedDataDecoded> | Record<string, string | boolean | Array<string | boolean | PostedDataDecoded>> | Record<string, string | boolean | Array<string | boolean>>>;
+export type RequestBodyRecordValue = string | Array<RequestBodyRecordValue> | {
+    [key: string]: RequestBodyRecordValue;
+} | {
+    [key: string]: RequestBodyFile;
+} | Array<RequestBodyFile> | RequestBodyFile;
+export interface RequestBodyArguments {
+    [key: string]: RequestBodyRecordValue;
+    [symbolArrays]?: {
+        [key: string]: Array<string>;
+    };
+}
+export type RequestBodyFile = {
+    fileName: string;
+    data: Buffer;
+    type: string;
+};
+export type RequestBodyFiles = {
+    [key: string]: RequestBodyFile;
+};
+export type URISegmentPattern = {
+    pattern: string | RegExp;
+    name?: string;
+    type?: 'string' | 'number';
+};
+export type URIArguments = {
+    [key: string]: string | number | RegExpExecArray;
+};

package/build/system/types/request.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ import { symbolArrays } from "../Symbols.js";

package/build/system/types/request.types.d.ts ADDED Viewed

@@ -0,0 +1,58 @@
+import { IncomingMessage, ServerResponse } from "http";
+import { LooseObject } from './general.types.js';
+import { symbolArrays } from "../Symbols.js";
+export type RequestMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+export type RequestCallback<R extends any, Body extends LooseObject | undefined> = (ctx: RequestContext<Body>) => Promise<R>;
+export type RequestHandler = {
+    match: Array<URISegmentPattern> | RegExp;
+    methods: Array<RequestMethod>;
+    callback: RequestCallback<any, LooseObject | undefined>;
+    scope: any;
+    staticAsset: boolean;
+};
+export type RequestContext<Body extends LooseObject | undefined = LooseObject> = {
+    request: IncomingMessage;
+    response: ServerResponse;
+    args: URIArguments;
+    handler: null | RequestHandler;
+    cookies: Record<string, string>;
+    body: Body;
+    bodyRaw?: Buffer;
+    files?: Record<string, RequestBodyRecordValue>;
+    data: RequestContextData;
+    sessionId?: string;
+    isAjax: boolean;
+    getArgs: PostedDataDecoded;
+    timeStart: number;
+    respondWith: (data: any) => void;
+    redirect: (to: string, statusCode?: number) => void;
+    show404: () => Promise<void>;
+};
+export type PostedDataDecoded = Record<string, string | boolean | Array<string | boolean | PostedDataDecoded> | Record<string, string | boolean | Array<string | boolean | PostedDataDecoded>> | Record<string, string | boolean | Array<string | boolean>>>;
+export type RequestBodyRecordValue = string | Array<RequestBodyRecordValue> | {
+    [key: string]: RequestBodyRecordValue;
+} | {
+    [key: string]: RequestBodyFile;
+} | Array<RequestBodyFile> | RequestBodyFile;
+export interface RequestBodyArguments {
+    [key: string]: RequestBodyRecordValue;
+    [symbolArrays]?: {
+        [key: string]: Array<string>;
+    };
+}
+export type RequestBodyFile = {
+    fileName: string;
+    data: Buffer;
+    type: string;
+};
+export type RequestBodyFiles = {
+    [key: string]: RequestBodyFile;
+};
+export type URISegmentPattern = {
+    pattern: string | RegExp;
+    name?: string;
+    type?: 'string' | 'number';
+};
+export type URIArguments = {
+    [key: string]: string | number | RegExpExecArray;
+};

package/build/system/types/request.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ import { symbolArrays } from "../Symbols.js";

package/build/system/types/session.types.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import { LooseObject } from './general.types.js';
+export type SessionEntry = {
+    sessionId: string;
+    lastRequest: number;
+    data: LooseObject;
+};

package/build/system/types/session.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/store.types.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export type StoreChangeCallback = (key: string, value: any, oldValue: any, componentId: string) => void;

package/build/system/types/store.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/structured.types.d.ts ADDED Viewed

@@ -0,0 +1,32 @@
+export type StructuredConfig = {
+    readonly envPrefix?: string;
+    readonly autoInit: boolean;
+    url: {
+        removeTrailingSlash: boolean;
+        componentRender: false | string;
+        isAsset: (url: string) => boolean;
+    };
+    routes: {
+        readonly path: string;
+    };
+    components: {
+        readonly path: string;
+        readonly componentNameAttribute: string;
+    };
+    session: {
+        readonly cookieName: string;
+        readonly keyLength: number;
+        readonly durationSeconds: number;
+        readonly garbageCollectIntervalSeconds: number;
+    };
+    http: {
+        host?: string;
+        port: number;
+        linkHeaderRel: 'preload' | 'preconnect';
+    };
+    readonly runtime: 'Node.js' | 'Deno';
+};
+export type StructuredClientConfig = {
+    componentRender: StructuredConfig['url']['componentRender'];
+    componentNameAttribute: string;
+};

package/build/system/types/structured.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/build/system/types/validation.types.d.ts ADDED Viewed

@@ -0,0 +1,18 @@
+import { PostedDataDecoded } from './request.types.js';
+export type ValidationRuleWithArguments = [string, any];
+export type FormValidationEntry = {
+    field: [string, string];
+    rules: Array<string | ValidationRuleWithArguments | ValidatorFunction>;
+};
+export type ValidatorFunction = (data: PostedDataDecoded, field: string, arg: number, rules: Array<string | ValidationRuleWithArguments | ValidatorFunction>) => Promise<boolean>;
+export type ValidatorErrorDecorator = (fieldHumanReadable: string, data: PostedDataDecoded, field: string, arg: any) => string | Promise<string>;
+export type ValidationErrors = {
+    [field: string]: Array<string>;
+};
+export type ValidationErrorsSingle = {
+    [field: string]: string;
+};
+export type ValidationResult = {
+    valid: boolean;
+    errors: ValidationErrors | ValidationErrorsSingle;
+};

package/build/system/types/validation.types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/package.json CHANGED Viewed

@@ -19,10 +19,10 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "scripts": {
     "develop": "tsc --watch",
-    "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,css index.js",
+    "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,hbs,css index.js",
     "start": "cd build && node index.js",
     "compileAndPack": "tsc && npm pack",
     "compileAndPublish": "tsc && npm publish"