@amodx/schemas 0.0.1 → 0.0.21

package/Inputs/registerInput.js

@@ -0,0 +1,32 @@
+import { PropertyInputRegister } from "./PropertyInputRegister";
+import { Property } from "../Properties/Property";
+export function registerInput(data) {
+    PropertyInputRegister.regsiterProperty(data);
+    const Create = (initalProperties = {}) => {
+        return {
+            type: data.id,
+            properties: data.createProperties(initalProperties),
+        };
+    };
+    return Object.assign(Create, {
+        id: data.id,
+        meta: {
+            name: data.name,
+        },
+        createPropertyFC(defaultValue) {
+            const fc = (id, data = {}) => {
+                return Property.Create({
+                    id,
+                    name: data.name,
+                    value: data.value ? data.value : defaultValue,
+                    initialize: data.initialize,
+                    input: Create(data),
+                });
+            };
+            return fc;
+        },
+        createPropertyRenderFC(fn) {
+            return fn;
+        },
+    });
+}

package/Properties/Property.d.ts

@@ -17,7 +17,7 @@ export declare class Property<Value = any, Input extends PropertyInputData | nul
     input?: Input | undefined;
     editable?: boolean | undefined;
     conditions?: PropertyConditionAction[] | undefined;
-    children?: Property<any>[] | undefined;
+    children?: Property<any, any>[] | undefined;
     static Create<Value = any, Input extends PropertyInputData | null = null>(data: Partial<Property<Value, Input>>): Property<Value, Input>;
     private constructor();
 }

package/Properties.d.ts

@@ -1,17 +1,8 @@
-import { PropertyInputBase, PropertyInputData } from "./Inputs/PropertyInput";
-import { ColorPropertyInput, FilePathPropertyInput, FloatPropertyInput, IntPropertyInput, PasswordPropertyInput, RangePropertyInput, SelectPropertyInput, StringPropertyInput, Vec2PropertyInput, Vec3PropertyInput, CheckboxPropertyInput, DatePropertyInput, TextareaPropertyInput, EmailPropertyInput, UrlPropertyInput } from "./Inputs/DefaultInputs";
+import { PropertyFC } from "./Property.types";
 import { ObjectPath } from "./Properties/ObjectPath";
 import { Property } from "./Properties/Property";
 import { PropertyCondition } from "./Properties/PropertyCondition";
 import { PropertyConditionAction } from "./Properties/PropertyConditionAction";
-import { SchemaNode } from "./Schemas/SchemaNode";
-type PropertyCreateData<Value extends any, Input extends PropertyInputData> = {
-    name?: string;
-    value?: Value;
-    validator?: string;
-    initialize?: (node: SchemaNode) => void;
-} & Partial<Input["properties"]>;
-type PropertyFC<Value extends any, Input extends PropertyInputBase> = (id: string, data?: Exclude<PropertyCreateData<Value, Input["data"]>, "id">) => Property<Value, Input["data"]>;
 export declare const PropConditions: ((data: Property<any, any>, ...conditions: PropertyConditionAction[]) => Property<any, any>) & {
     Action: typeof PropertyConditionAction.Create;
     Condition: typeof PropertyCondition.Create;
@@ -19,26 +10,66 @@ export declare const PropConditions: ((data: Property<any, any>, ...conditions:
 };
 export declare const ObjectProp: (id: string, name: string, ...properties: Property<any, any>[]) => Property<any, null>;
 export declare const AnyProp: PropertyFC<any, any>;
-export declare const StringProp: PropertyFC<string, StringPropertyInput>;
-export declare const PasswordProp: PropertyFC<string, PasswordPropertyInput>;
-export declare const FloatProp: PropertyFC<number, FloatPropertyInput>;
-export declare const IntProp: PropertyFC<number, IntPropertyInput>;
-export declare const RangeProp: PropertyFC<number, RangePropertyInput>;
-export declare const ColorProp: PropertyFC<string, ColorPropertyInput>;
-export declare const SelectProp: PropertyFC<string | number, SelectPropertyInput>;
-export declare const FilePathProp: PropertyFC<string, FilePathPropertyInput>;
+export declare const StringProp: PropertyFC<string, import("./Inputs").PropertyInputBase<string, import("./Inputs").PropertyInputBaseProperties & {
+    min: number;
+    max: number;
+}>>;
+export declare const FloatProp: PropertyFC<number, import("./Inputs").PropertyInputBase<number, import("./Inputs").PropertyInputBaseProperties & {
+    min: number;
+    max: number;
+}>>;
+export declare const IntProp: PropertyFC<number, import("./Inputs").PropertyInputBase<number, import("./Inputs").PropertyInputBaseProperties & {
+    min: number;
+    max: number;
+}>>;
+export declare const RangeProp: PropertyFC<number, import("./Inputs").PropertyInputBase<number, import("./Inputs").PropertyInputBaseProperties & {
+    min: number;
+    max: number;
+    step: number;
+}>>;
+export declare const HexColorProp: PropertyFC<string, import("./Inputs").PropertyInputBase<string, import("./Inputs").PropertyInputBaseProperties>>;
+export declare const Color3Prop: PropertyFC<{
+    r: number;
+    g: number;
+    b: number;
+}, import("./Inputs").PropertyInputBase<{
+    r: number;
+    g: number;
+    b: number;
+}, import("./Inputs").PropertyInputBaseProperties>>;
+export declare const Color4Prop: PropertyFC<{
+    r: number;
+    g: number;
+    b: number;
+    a: number;
+}, import("./Inputs").PropertyInputBase<{
+    r: number;
+    g: number;
+    b: number;
+    a: number;
+}, import("./Inputs").PropertyInputBaseProperties>>;
+export declare const SelectProp: PropertyFC<string | number, import("./Inputs").PropertyInputBase<string | number, import("./Inputs").PropertyInputBaseProperties & {
+    options: string[] | [string, string | number][];
+    mode?: string;
+}>>;
 export declare const Vec2Prop: PropertyFC<{
     x: number;
     y: number;
-}, Vec2PropertyInput>;
+}, import("./Inputs").PropertyInputBase<{
+    x: number;
+    y: number;
+}, import("./Inputs").PropertyInputBaseProperties & {
+    valueType: "position" | "dimension";
+}>>;
 export declare const Vec3Prop: PropertyFC<{
     x: number;
     y: number;
     z: number;
-}, Vec3PropertyInput>;
-export declare const CheckboxProp: PropertyFC<boolean, CheckboxPropertyInput>;
-export declare const DateProp: PropertyFC<string, DatePropertyInput>;
-export declare const TextareaProp: PropertyFC<string, TextareaPropertyInput>;
-export declare const EmailProp: PropertyFC<string, EmailPropertyInput>;
-export declare const UrlProp: PropertyFC<string, UrlPropertyInput>;
-export {};
+}, import("./Inputs").PropertyInputBase<{
+    x: number;
+    y: number;
+    z: number;
+}, import("./Inputs").PropertyInputBaseProperties & {
+    valueType: "position" | "dimension";
+}>>;
+export declare const BooleanProp: PropertyFC<boolean, import("./Inputs").PropertyInputBase<boolean, import("./Inputs").PropertyInputBaseProperties>>;

package/Properties.js

@@ -1,4 +1,4 @@
-import { ColorPropertyInput, FilePathPropertyInput, FloatPropertyInput, IntPropertyInput, PasswordPropertyInput, RangePropertyInput, SelectPropertyInput, StringPropertyInput, Vec2PropertyInput, Vec3PropertyInput, CheckboxPropertyInput, DatePropertyInput, TextareaPropertyInput, EmailPropertyInput, UrlPropertyInput, } from "./Inputs/DefaultInputs";
+import { Color3PropertyInput, Color4PropertyInput, HexColorPropertyInput, FloatPropertyInput, IntPropertyInput, RangePropertyInput, SelectPropertyInput, StringPropertyInput, Vec2PropertyInput, Vec3PropertyInput, BooleanPropertyInput, } from "./Inputs/DefaultInputs";
 import { ObjectPath } from "./Properties/ObjectPath";
 import { Property } from "./Properties/Property";
 import { PropertyCondition } from "./Properties/PropertyCondition";
@@ -27,213 +27,27 @@ export const AnyProp = (id, data = {}) => {
         input: null,
     });
 };
-export const StringProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "",
-        initialize: data.initialize,
-        input: StringPropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                min: data.min ? data.min : 0,
-                max: data.max ? data.max : Number.MAX_SAFE_INTEGER,
-            },
-        }),
-    });
-};
-export const PasswordProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "",
-        initialize: data.initialize,
-        input: PasswordPropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                min: data.min ? data.min : 0,
-                max: data.max ? data.max : Number.MAX_SAFE_INTEGER,
-            },
-        }),
-    });
-};
-export const FloatProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : 0,
-        initialize: data.initialize,
-        input: FloatPropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                min: data.min ? data.min : 0,
-                max: data.max ? data.max : Number.MAX_VALUE,
-            },
-        }),
-    });
-};
-export const IntProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : 0,
-        initialize: data.initialize,
-        input: IntPropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                min: data.min ? data.min : 0,
-                max: data.max ? data.max : Number.MAX_SAFE_INTEGER,
-            },
-        }),
-    });
-};
-export const RangeProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : 0,
-        initialize: data.initialize,
-        input: RangePropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                min: data.min ? data.min : 0,
-                max: data.max ? data.max : Number.MAX_VALUE,
-                step: data.step ? data.step : 0.1,
-            },
-        }),
-    });
-};
-export const ColorProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "#ffffff",
-        initialize: data.initialize,
-        input: ColorPropertyInput.Create({
-            validator: data.validator,
-            properties: {},
-        }),
-    });
-};
-export const SelectProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "",
-        initialize: data.initialize,
-        input: SelectPropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                options: data.options ? data.options : [],
-                mode: data.mode,
-            },
-        }),
-    });
-};
-export const FilePathProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "#ffffff",
-        initialize: data.initialize,
-        input: FilePathPropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                acceptedFileExtensions: data.acceptedFileExtensions
-                    ? data.acceptedFileExtensions
-                    : [],
-            },
-        }),
-    });
-};
-export const Vec2Prop = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : { x: 0, y: 0 },
-        initialize: data.initialize,
-        input: Vec2PropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                valueType: data.valueType ? data.valueType : "position",
-            },
-        }),
-    });
-};
-export const Vec3Prop = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : { x: 0, y: 0, z: 0 },
-        initialize: data.initialize,
-        input: Vec3PropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                valueType: data.valueType ? data.valueType : "position",
-            },
-        }),
-    });
-};
-export const CheckboxProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : false,
-        initialize: data.initialize,
-        input: CheckboxPropertyInput.Create({
-            validator: data.validator,
-            properties: {},
-        }),
-    });
-};
-export const DateProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "",
-        initialize: data.initialize,
-        input: DatePropertyInput.Create({
-            validator: data.validator,
-            properties: {},
-        }),
-    });
-};
-export const TextareaProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "",
-        initialize: data.initialize,
-        input: TextareaPropertyInput.Create({
-            validator: data.validator,
-            properties: {
-                rows: data.rows ? data.rows : 4,
-                cols: data.cols ? data.cols : 10,
-            },
-        }),
-    });
-};
-export const EmailProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "",
-        initialize: data.initialize,
-        input: EmailPropertyInput.Create({
-            validator: data.validator,
-            properties: {},
-        }),
-    });
-};
-export const UrlProp = (id, data = {}) => {
-    return Property.Create({
-        id,
-        name: data.name,
-        value: data.value ? data.value : "",
-        initialize: data.initialize,
-        input: UrlPropertyInput.Create({
-            validator: data.validator,
-            properties: {},
-        }),
-    });
-};
+export const StringProp = StringPropertyInput.createPropertyFC("");
+export const FloatProp = FloatPropertyInput.createPropertyFC(0);
+export const IntProp = IntPropertyInput.createPropertyFC(0);
+export const RangeProp = RangePropertyInput.createPropertyFC(0);
+export const HexColorProp = HexColorPropertyInput.createPropertyFC("#ffffff");
+export const Color3Prop = Color3PropertyInput.createPropertyFC({
+    r: 255,
+    g: 255,
+    b: 255,
+});
+export const Color4Prop = Color4PropertyInput.createPropertyFC({
+    r: 255,
+    g: 255,
+    b: 255,
+    a: 255,
+});
+export const SelectProp = SelectPropertyInput.createPropertyFC("");
+export const Vec2Prop = Vec2PropertyInput.createPropertyFC({ x: 0, y: 0 });
+export const Vec3Prop = Vec3PropertyInput.createPropertyFC({
+    x: 0,
+    y: 0,
+    z: 0,
+});
+export const BooleanProp = BooleanPropertyInput.createPropertyFC(false);

package/Property.types.d.ts

@@ -0,0 +1,13 @@
+import { SchemaNode } from "./Schemas/SchemaNode";
+import { PropertyInputBase, PropertyInputData } from "./Inputs/PropertyInput";
+import { Property } from "./Properties/Property";
+export type PropertyCreateData<Value extends any, Input extends PropertyInputData> = {
+    name?: string;
+    value?: Value;
+    initialize?: (node: SchemaNode) => void;
+} & Partial<Input["properties"]>;
+export type PropertyFC<Value extends any, Input extends PropertyInputBase> = (id: string, data?: Exclude<PropertyCreateData<Value, Input["data"]>, "id">) => Property<Value, Input["data"]>;
+export type PropertyRenderFCDefaultProps<Value extends any, Input extends PropertyInputBase> = {
+    node: SchemaNode<Value, Input>;
+};
+export type PropertyRenderFC<RenderedType extends any, Value extends any, Input extends PropertyInputBase, Props extends any = {}> = (props: Props & PropertyRenderFCDefaultProps<Value, Input>) => RenderedType;

package/Property.types.js

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

package/Schema/Node.js

@@ -0,0 +1 @@
+"use strict";

package/Schema/Object.js

@@ -0,0 +1 @@
+"use strict";

package/Schema/Property.js

@@ -0,0 +1 @@
+"use strict";

package/Schema/Schema.d.ts

@@ -0,0 +1,2 @@
+export declare class Schema {
+}

package/Schema/Schema.js

@@ -0,0 +1,2 @@
+export class Schema {
+}

package/Schemas/SchemaNode.d.ts

@@ -13,25 +13,30 @@ export declare class TemplateNode {
 declare class SchemaNodeObservers<Value = any, Input extends PropertyInputBase<any, any> = any> {
     stateUpdated: Observable<SchemaNode<Value, Input>>;
     updated: Observable<SchemaNode<Value, Input>>;
+    set: Observable<SchemaNode<Value, Input>>;
     loadedIn: Observable<SchemaNode<Value, Input>>;
     updatedOrLoadedIn: Observable<SchemaNode<Value, Input>>;
     evaluate: Observable<void>;
     validate: Observable<void>;
 }
+type UpdatedPipelineData<Value = any, Input extends PropertyInputBase<any, any> = any> = {
+    newValue: any;
+    node: SchemaNode<Value, Input>;
+};
+type LoadInPipelineData<Value = any, Input extends PropertyInputBase<any, any> = any> = {
+    value: any;
+    node: SchemaNode<Value, Input>;
+};
 declare class SchemaNodePipelines<Value = any, Input extends PropertyInputBase<any, any> = any> {
     onStore: Pipeline<Property<Value, Input["data"]>>;
-    updated: Pipeline<{
-        newValue: any;
-        node: SchemaNode<Value, Input>;
-    }>;
-    loadedIn: Pipeline<{
-        value: any;
-        node: SchemaNode<Value, Input>;
-    }>;
+    updated: Pipeline<UpdatedPipelineData<any, any>>;
+    loadedIn: Pipeline<LoadInPipelineData<any, any>>;
 }
 export declare class SchemaNode<Value = any, Input extends PropertyInputBase<any, any> = any> {
     property: Property<Value, Input["data"]>;
     root: any;
+    private _updateData;
+    private _loadInData;
     children: SchemaNode[] | null;
     conditions: PropertyConditionAction[];
     input: Input | null;

package/Schemas/SchemaNode.js

@@ -1,4 +1,5 @@
 import { Property } from "../Properties/Property";
+import { PropertyInputBase } from "../Inputs/PropertyInput";
 import { PropertyInputRegister } from "../Inputs/PropertyInputRegister";
 import { Observable } from "@amodx/core/Observers/index";
 import { Pipeline } from "@amodx/core/Pipelines";
@@ -13,6 +14,7 @@ export class TemplateNode {
 class SchemaNodeObservers {
     stateUpdated = new Observable();
     updated = new Observable();
+    set = new Observable();
     loadedIn = new Observable();
     updatedOrLoadedIn = new Observable();
     evaluate = new Observable();
@@ -34,6 +36,8 @@ class SchemaNodeProxy {
 export class SchemaNode {
     property;
     root;
+    _updateData;
+    _loadInData;
     children = null;
     conditions = [];
     input;
@@ -43,9 +47,17 @@ export class SchemaNode {
     constructor(property, root) {
         this.property = property;
         this.root = root;
+        this._updateData = {
+            node: this,
+            newValue: this.getValue(),
+        };
+        this._loadInData = {
+            node: this,
+            value: this.getValue(),
+        };
         if (property.input) {
-            const inputClass = PropertyInputRegister.getProperty(property.input.type);
-            this.input = new inputClass(property.input, this);
+            const abstractInput = PropertyInputRegister.getProperty(property.input.type);
+            this.input = new PropertyInputBase(abstractInput, property.input, this);
         }
     }
     proxy = null;
@@ -81,8 +93,8 @@ export class SchemaNode {
                 this.conditions.push(action);
             }
         }
-        if (property.input?.validator) {
-            const validator = ObjectPropertyValidatorRegister.getValidator(property.input.validator);
+        if (property.input?.properties.validator) {
+            const validator = ObjectPropertyValidatorRegister.getValidator(property.input.properties.validator);
             this.observers.updatedOrLoadedIn.subscribe(this, () => {
                 const response = validator.validate(this.get(), this);
                 this.validatorResponse = response;
@@ -128,10 +140,8 @@ export class SchemaNode {
         return this.pipelines.onStore.pipe(Property.Create(this.property)).value;
     }
     loadIn(value) {
-        this.setValue(this.pipelines.loadedIn.pipe({
-            node: this,
-            value,
-        }).value);
+        this._loadInData.value = value;
+        this.setValue(this.pipelines.loadedIn.pipe(this._loadInData).value);
         this.observers.loadedIn.notify(this);
         this.observers.updatedOrLoadedIn.notify(this);
     }
@@ -140,19 +150,18 @@ export class SchemaNode {
     }
     update(newValue) {
         const oldValue = this.getValue();
-        this.setValue(this.pipelines.updated.pipe({
-            node: this,
-            newValue,
-        }).newValue);
-        const newFinalValue = this.getValue();
+        this._updateData.newValue = newValue;
+        const finalNewValue = this.pipelines.updated.pipe(this._updateData).newValue;
+        this.setValue(finalNewValue);
+        this.observers.set.notify(this);
         if (this.input) {
-            if (!this.input.compare(oldValue, newFinalValue)) {
+            if (!this.input.compare(oldValue, finalNewValue)) {
                 this.observers.updated.notify(this);
                 this.observers.updatedOrLoadedIn.notify(this);
             }
             return;
         }
-        if (oldValue != newFinalValue) {
+        if (oldValue != finalNewValue) {
             this.observers.updated.notify(this);
             this.observers.updatedOrLoadedIn.notify(this);
         }

package/index.d.ts

@@ -6,3 +6,4 @@ export * from "./Schemas/ObjectSchema";
 export * from "./Schemas/BinaryObjectSchema";
 export * from "./Schemas/ObjectSchemaInstance";
 export * from "./Properties/ObjectPath";
+export * from "./Schemas/SchemaNode";

package/index.js

@@ -6,3 +6,4 @@ export * from "./Schemas/ObjectSchema";
 export * from "./Schemas/BinaryObjectSchema";
 export * from "./Schemas/ObjectSchemaInstance";
 export * from "./Properties/ObjectPath";
+export * from "./Schemas/SchemaNode";

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@amodx/schemas",
- "version": "0.0.01",
+ "version": "0.0.21",
  "module": "index.js",
  "types": "index.d.ts",
  "type": "module",