@amodx/schemas 0.0.1 → 0.0.2

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.02",
  "module": "index.js",
  "types": "index.d.ts",
  "type": "module",