structured-fw 1.0.4 → 1.0.6

package/build/system/Types.d.ts

@@ -161,7 +161,7 @@ export type InitializerFunctionContext = {
 export type StoreChangeCallback = (key: string, value: any, oldValue: any, componentId: string) => void;
 export type ClientComponentEventCallback<T> = T extends undefined ? (e: Event) => void : (e: Event, data: T) => void;
 export type ClientComponentBoundEvent<T extends LooseObject | undefined = undefined> = {
-    element: HTMLElement;
+    element: HTMLElement | Window;
     event: keyof HTMLElementEventMap;
     callback: (e: Event) => void;
     callbackOriginal: ClientComponentEventCallback<T>;

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

@@ -56,7 +56,7 @@ export declare class ClientComponent extends EventEmitter {
     private transitionAttributes;
     private transitionAxis;
     private destroy;
-    bind<T extends LooseObject | undefined = undefined>(element: HTMLElement, event: keyof HTMLElementEventMap | Array<keyof HTMLElementEventMap>, callback: ClientComponentEventCallback<T>): void;
+    bind<T extends LooseObject | undefined = undefined>(element: HTMLElement | Window, event: keyof HTMLElementEventMap | Array<keyof HTMLElementEventMap>, callback: ClientComponentEventCallback<T>): void;
     unbind<T extends LooseObject | undefined = undefined>(element: HTMLElement, event: keyof HTMLElementEventMap | Array<keyof HTMLElementEventMap>, callback: ClientComponentEventCallback<T>): void;
     private unbindAll;
 }

package/build/system/client/ClientComponent.js

@@ -727,9 +727,10 @@ export class ClientComponent extends EventEmitter {
             });
             return;
         }
-        if (element instanceof HTMLElement) {
+        const isWindow = element instanceof Window;
+        if (element instanceof HTMLElement || isWindow) {
             const callbackWrapper = (e) => {
-                callback.apply(this, [e, this.attributeData(element)]);
+                callback.apply(this, [e, isWindow ? {} : this.attributeData(element)]);
             };
             this.bound.push({
                 element,

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

@@ -1,4 +1,4 @@
-import { FormValidationEntry, PostedDataDecoded, ValidationResult, ValidationRuleWithArguments, ValidatorErrorDecorator, ValidatorFunction } from '../Types.js';
+import { FormValidationEntry, LooseObject, ValidationResult, ValidationRuleWithArguments, ValidatorErrorDecorator, ValidatorFunction } from '../Types.js';
 export declare class FormValidation {
     fieldRules: Array<FormValidationEntry>;
     singleError: boolean;
@@ -12,6 +12,6 @@ export declare class FormValidation {
     addRule(fieldName: string, nameHumanReadable: string, rules: Array<string | ValidationRuleWithArguments | ValidatorFunction>): void;
     registerValidator(name: string, validator: ValidatorFunction, decorator?: ValidatorErrorDecorator): void;
     registerDecorator(name: string, decorator: ValidatorErrorDecorator): void;
-    validate(data: PostedDataDecoded): Promise<ValidationResult>;
+    validate(data: LooseObject): Promise<ValidationResult>;
     private addError;
 }

package/build/system/server/FormValidation.js

@@ -9,13 +9,18 @@ export class FormValidation {
                     return false;
                 }
                 const value = data[field];
-                if (typeof value !== 'string') {
+                if (value === null ||
+                    value === undefined ||
+                    (typeof value === 'string' && value.trim().length === 0)) {
                     return false;
                 }
-                return value.trim().length > 0;
+                return true;
             },
             'number': async (data, field) => {
                 const value = data[field];
+                if (typeof value === 'number') {
+                    return true;
+                }
                 if (typeof value !== 'string') {
                     return false;
                 }
@@ -23,6 +28,9 @@ export class FormValidation {
             },
             'float': async (data, field) => {
                 const value = data[field];
+                if (typeof value === 'number') {
+                    return true;
+                }
                 if (typeof value !== 'string') {
                     return false;
                 }
@@ -33,6 +41,9 @@ export class FormValidation {
             },
             'min': async (data, field, arg, rules) => {
                 const value = data[field];
+                if (typeof value === 'number') {
+                    return value >= arg;
+                }
                 if (typeof value !== 'string') {
                     return false;
                 }
@@ -43,6 +54,9 @@ export class FormValidation {
             },
             'max': async (data, field, arg, rules) => {
                 const value = data[field];
+                if (typeof value === 'number') {
+                    return value <= arg;
+                }
                 if (typeof value !== 'string') {
                     return false;
                 }

package/package.json

@@ -19,12 +19,13 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "scripts": {
     "develop": "tsc --watch",
     "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,css index.js",
     "start": "cd build && node index.js",
-    "prepublish": "tsc"
+    "pack": "tsc && npm pack",
+    "publish": "tsc && npm publish"
   },
   "bin": {
     "structured": "./build/system/bin/structured.js"
@@ -55,6 +56,7 @@
     "./Component": "./build/system/server/Component.js",
     "./Layout": "./build/system/server/Layout.js",
     "./FormValidation": "./build/system/server/FormValidation.js",
-    "./ClientComponent": "./build/system/client/ClientComponent.js"
+    "./ClientComponent": "./build/system/client/ClientComponent.js",
+    "./Net": "./build/system/client/Net.js"
   }
 }