@zcomponent/core 0.0.12 → 0.0.14

package/lib/zcomponent.js

@@ -4,6 +4,7 @@ import { Context } from './context';
 import { isDesignTime } from './contexts/environmentcontext';
 import { TagContext } from './contexts/tagcontext';
 import { computeBehaviorHierarchy, computeNodeHierarchy } from './data';
+import { EntityPropOverrideType } from './interfaces';
 import { Observable } from './observable';
 import { setCurrentZComponentConstruction } from './zcomponentconstruction';
 export class ZComponentContext extends Context {
@@ -26,8 +27,10 @@ export class ZComponent extends Component {
         this.isConstructed = false;
         this._nodesById = new Map();
         this._behaviorsToInitialize = [];
+        this._constructorPropOverridesByEntityID = new Map();
         const contextManagerForChildren = contextManager.forkMultiple([ZComponentContext, { zcomponent: this }], [TagContext, {}])[0];
         this.id = this._opts.data.id;
+        this._initializeConstructorPropOverrides();
         const rootConstructor = this._constructorForNode(this._opts.data.root);
         if (rootConstructor) {
             this.constructChildren([
@@ -36,6 +39,7 @@ export class ZComponent extends Component {
         }
         this._inflateBehaviors();
         this._initializeComponentProps();
+        this._initializeOverrides();
         this.isConstructed = true;
         this._constructedResolve();
     }
@@ -65,6 +69,7 @@ export class ZComponent extends Component {
                     ...constructorProps,
                     ...(that._opts.data.entityConstructorProps?.[nodeId] ?? {}),
                     ...(that._opts.constructorPropReplacement?.[nodeId] ?? {}),
+                    ...(that._constructorPropOverridesByEntityID.get(nodeId) ?? {}),
                     children
                 };
                 setCurrentZComponentConstruction(that);
@@ -145,6 +150,7 @@ export class ZComponent extends Component {
                     ...constructorProps,
                     ...(that._opts.data.entityConstructorProps?.[behaviorId] ?? {}),
                     ...(that._opts.constructorPropReplacement?.[behaviorId] ?? {}),
+                    ...(that._constructorPropOverridesByEntityID.get(behaviorId) ?? {}),
                 };
                 setCurrentZComponentConstruction(that);
                 super(contextManager, instance, constructorProps);
@@ -205,26 +211,84 @@ export class ZComponent extends Component {
             }
         }
     }
-    _initializeComponentProps() {
-        const componentProps = this._opts.data.propEntityOverrides ?? {};
-        for (const [prop, entry] of Object.entries(componentProps)) {
-            const propInfo = this._opts.data.props[prop];
-            const entries = Object.entries(entry).map(e => [e[0], Object.keys(e[1])]);
-            this[prop] = new Observable(propInfo?.default, v => {
-                for (const e of entries) {
-                    const entity = this.entityByID.get(e[0]);
-                    if (!entity)
-                        continue;
-                    for (const overriddenProp of e[1]) {
-                        try {
-                            this._setEntityProp(entity, overriddenProp, v);
-                        }
-                        catch (err) {
-                            console.log('Warning - unable to set prop', overriddenProp, v);
+    _initializeOverrides() {
+        const overrides = this._opts.data.entityPropOverrides ?? {};
+        for (const override of Object.values(overrides)) {
+            const entity = this.entityByID.get(override.entityID);
+            if (!entity)
+                continue;
+            try {
+                switch (override.type) {
+                    case EntityPropOverrideType.Import: {
+                        const v = this._opts.importMapping[override.imp]?.();
+                        if (!v)
+                            continue;
+                        if (v instanceof Observable)
+                            v.withValue(val => this._setEntityPropPath(entity, override.entityPropPath, val));
+                        else
+                            this._setEntityPropPath(entity, override.entityPropPath, v);
+                        break;
+                    }
+                    case EntityPropOverrideType.ContextValue: {
+                        const ctx = this._opts.importMapping[override.imp]?.();
+                        const ctxInstance = entity.contextManager.getOrThrow(ctx);
+                        const v = ctxInstance[override.val];
+                        if (!v)
+                            continue;
+                        if (v instanceof Observable)
+                            v.withValue(val => this._setEntityPropPath(entity, override.entityPropPath, val));
+                        else
+                            this._setEntityPropPath(entity, override.entityPropPath, v);
+                        break;
+                    }
+                    case EntityPropOverrideType.ComponentProp: {
+                        if (override.isConstructorProp) {
+                            const prop = this._opts.data.constructorProps?.[override.propName];
+                            if (!prop)
+                                break;
+                            const val = this.constructorProps[override.propName] ?? prop.default;
+                            if (val !== undefined)
+                                this._setEntityPropPath(entity, override.entityPropPath, val);
+                            break;
                         }
+                        const v = this[override.propName];
+                        if (!v)
+                            continue;
+                        if (v instanceof Observable)
+                            v.withValue(val => this._setEntityPropPath(entity, override.entityPropPath, val));
+                        else
+                            this._setEntityPropPath(entity, override.entityPropPath, v);
+                        break;
                     }
                 }
-            });
+            }
+            catch (err) {
+                console.log('Unable to set entity prop override', err);
+            }
+        }
+    }
+    _initializeConstructorPropOverrides() {
+        for (const entry of Object.values(this._opts.data.entityPropOverrides ?? {})) {
+            if (entry.type !== EntityPropOverrideType.ComponentProp)
+                continue;
+            if (!entry.isConstructorProp)
+                continue;
+            if (entry.entityPropPath.length !== 1)
+                continue;
+            const obj = this._constructorPropOverridesByEntityID.get(entry.entityID) ?? Object.create(null);
+            this._constructorPropOverridesByEntityID.set(entry.entityID, obj);
+            const prop = this._opts.data.constructorProps?.[entry.propName];
+            if (!prop)
+                continue;
+            const val = this.constructorProps[entry.propName] ?? prop.default;
+            if (val !== undefined)
+                obj[entry.entityPropPath[0]] = val;
+        }
+    }
+    _initializeComponentProps() {
+        const componentProps = this._opts.data.props ?? {};
+        for (const prop of Object.values(componentProps)) {
+            this[prop.name] = new Observable(prop.default);
         }
     }
     _setEntityProp(entity, prop, v) {
@@ -233,6 +297,22 @@ export class ZComponent extends Component {
         else
             entity[prop] = v;
     }
+    _setEntityPropPath(entity, propPath, v) {
+        if (propPath.length < 1)
+            return;
+        const prop = propPath[0];
+        let parent = entity;
+        let currentKey = prop;
+        if (entity[prop] instanceof Observable) {
+            parent = entity[prop];
+            currentKey = 'value';
+        }
+        for (let i = 1; i < propPath.length; i++) {
+            parent = parent[currentKey];
+            currentKey = propPath[i];
+        }
+        parent[currentKey] = v;
+    }
     _getNodeById(id) {
         return this._nodesById.get(id);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zcomponent/core",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -30,10 +30,11 @@
     "@types/ua-parser-js": "^0.7.36",
     "parcel": "^2.8.2",
     "typescript": "^4.9.4",
-    "ua-parser-js": "^1.0.2"
+    "ua-parser-js": "^1.0.33"
   },
   "zexports": [
     "./lib/components/**/*",
-    "./lib/behaviors/**/*"
+    "./lib/behaviors/**/*",
+    "./lib/contexts/**/*"
   ]
 }