@legendapp/state 0.10.0 → 0.11.0-beta.0

package/index.d.ts

@@ -1,11 +1,11 @@
-export { mergeIntoObservable, shallow, isObservable } from './src/helpers';
+export { mergeIntoObservable, isObservable } from './src/helpers';
 export { observable } from './src/observable';
 export { observableBatcher } from './src/observableBatcher';
 export { observableComputed } from './src/observableComputed';
 export { observableEvent } from './src/observableEvent';
 export * from './src/observableInterfaces';
 /** @internal */
-export { getObservableRawValue, symbolGet, symbolShallow, symbolDateModified, symbolIsObservable } from './src/globals';
+export { symbolDateModified, symbolIsObservable } from './src/globals';
 /** @internal */
 export { isArray, isObject, isPrimitive, isFunction } from './src/is';
 /** @internal */

package/index.js

@@ -2,20 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const tracking = {
-    is: false,
-    shallow: false,
-    should: undefined,
-    nodes: [],
-};
-function updateTracking(node, value) {
-    tracking.nodes.push({
-        node,
-        shallow: tracking.shallow,
-        value,
-    });
-}
-
 function isArray(obj) {
     return Array.isArray(obj);
 }
@@ -39,10 +25,54 @@ function isSymbol(obj) {
     return typeof obj === 'symbol';
 }
 
+const tracking = {
+    nodes: undefined,
+};
+function updateTracking(node, parent, shallow, manual) {
+    if (parent) {
+        untrack(parent);
+    }
+    const existing = tracking.nodes.get(node.id);
+    if (existing) {
+        existing.shallow = existing.shallow || shallow;
+        existing.manual = existing.manual || manual;
+    }
+    else {
+        tracking.nodes.set(node.id, { node, shallow, manual });
+    }
+}
+function untrack(node) {
+    const tracked = tracking.nodes.get(node.id);
+    if (tracked && !tracked.manual) {
+        tracking.nodes.delete(node.id);
+    }
+}
+
 const symbolDateModified = Symbol('dateModified');
-const symbolShallow = Symbol('shallow');
-const symbolGet = Symbol('get');
 const symbolIsObservable = Symbol('isObservable');
+const nextNodeID = { current: 0 };
+function getOutputValue(node) {
+    let value = getNodeValue(node);
+    if (node.root.isPrimitive) {
+        value = value.current;
+    }
+    return value;
+}
+function get(node) {
+    if (tracking.nodes)
+        untrack(node);
+    return getOutputValue(node);
+}
+function observe(node, shallow) {
+    const value = getOutputValue(node);
+    if (tracking.nodes) {
+        updateTracking(node, undefined, shallow, /*manual*/ true);
+    }
+    else if (process.env.NODE_ENV === 'development') {
+        console.error('[legend-state]: observe() has no effect outside of an observer component.');
+    }
+    return value;
+}
 function getNodeValue(node) {
     const arr = [];
     let n = node;
@@ -71,6 +101,7 @@ function getChildNode(node, key) {
     // Create the child node if it doesn't already exist
     if (!child) {
         child = {
+            id: nextNodeID.current++,
             root: node.root,
             parent: node,
             key,
@@ -83,27 +114,7 @@ function getChildNode(node, key) {
     }
     return child;
 }
-function getObservableRawValue(obs) {
-    if (!obs || isPrimitive(obs))
-        return obs;
-    if (isFunction(obs))
-        return obs();
-    const shallow = obs === null || obs === void 0 ? void 0 : obs[symbolShallow];
-    if (shallow) {
-        tracking.shallow = true;
-        obs = shallow;
-    }
-    let ret = obs === null || obs === void 0 ? void 0 : obs[symbolGet];
-    tracking.should = undefined;
-    tracking.shallow = false;
-    return ret;
-}
 
-function shallow(obs) {
-    return {
-        [symbolShallow]: obs,
-    };
-}
 function isObservable(obs) {
     return obs && !!obs[symbolIsObservable];
 }
@@ -267,14 +278,16 @@ const ArrayModifiers = new Set([
 ]);
 const ArrayLoopers = new Set(['every', 'some', 'filter', 'forEach', 'map']);
 const objectFns = new Map([
-    ['get', getNodeValue],
+    ['get', get],
     ['set', set],
+    ['observe', observe],
     ['onChange', onChange],
     ['onChangeShallow', onChangeShallow],
     ['onEquals', onEquals],
     ['onHasValue', onHasValue],
     ['onTrue', onTrue],
-    ['prop', getProxy],
+    ['ref', ref],
+    ['prop', prop],
     ['assign', assign],
     ['delete', deleteFn],
 ]);
@@ -380,6 +393,13 @@ function updateNodes(parent, obj, prevValue) {
     }
     return hasADiff;
 }
+function hasProxy(node, p) {
+    // Get the child node if p prop
+    if (p !== undefined)
+        node = getChildNode(node, p);
+    // Create a proxy if not already cached and return it
+    return !!node.proxy;
+}
 function getProxy(node, p) {
     // Get the child node if p prop
     if (p !== undefined)
@@ -391,6 +411,18 @@ function getProxy(node, p) {
     }
     return proxy;
 }
+function ref(node) {
+    if (tracking.nodes)
+        untrack(node);
+    return getProxy(node);
+}
+function prop(node, p) {
+    // Update that this node was accessed for observers
+    if (tracking.nodes) {
+        updateTracking(getChildNode(node, p), node);
+    }
+    return getProxy(node, p);
+}
 const proxyHandler = {
     get(target, p) {
         var _a;
@@ -401,7 +433,7 @@ const proxyHandler = {
         const node = target;
         const fn = objectFns.get(p);
         // If this is an observable function, call it
-        if (p !== 'get' && fn) {
+        if (fn) {
             return function (a, b, c) {
                 const l = arguments.length;
                 return l > 2 ? fn(node, a, b, c) : l > 1 ? fn(node, a, b) : fn(node, a);
@@ -409,18 +441,6 @@ const proxyHandler = {
         }
         let value = getNodeValue(node);
         const vProp = value === null || value === void 0 ? void 0 : value[p];
-        // The get() function as well as the internal obs[symbolGet]
-        if (p === symbolGet || p === 'get') {
-            // Primitives are { current } so return the current value
-            if (node.root.isPrimitive) {
-                value = value.current;
-            }
-            // Update that this node was accessed for useObservables and useComputed
-            if (tracking.is) {
-                updateTracking(node, value);
-            }
-            return p === 'get' ? () => value : value;
-        }
         // Accessing undefined/null/symbols passes straight through if this value has a property for it
         // If it's never been defined assume it's a proxy to a future object
         if (isSymbol(p) || vProp === null || (vProp === undefined && value && ((_a = value.hasOwnProperty) === null || _a === void 0 ? void 0 : _a.call(value, p)))) {
@@ -445,16 +465,16 @@ const proxyHandler = {
             // Return the function bound to the value
             return vProp.bind(value);
         }
-        // Accessing primitives tracks and returns
-        if (vProp !== undefined && isPrimitive(vProp)) {
+        // Update that this node was accessed for observers
+        if (tracking.nodes) {
+            updateTracking(getChildNode(node, p), node);
+        }
+        // Accessing primitive returns the raw value
+        if (vProp === undefined || vProp === null ? !hasProxy(target, p) : isPrimitive(vProp)) {
             // Accessing a primitive saves the last accessed so that the observable functions
             // bound to primitives can know which node was accessed
             lastAccessedNode = node;
             lastAccessedPrimitive = p;
-            // Update that this node was accessed for useObservables and useComputed
-            if (tracking.is) {
-                updateTracking(getChildNode(node, p), value);
-            }
             return vProp;
         }
         return getProxy(target, p);
@@ -467,6 +487,10 @@ const proxyHandler = {
     ownKeys(target) {
         const value = getNodeValue(target);
         const keys = value ? Reflect.ownKeys(value) : [];
+        // Update that this node was accessed for observers
+        if (tracking.nodes) {
+            updateTracking(value);
+        }
         // This is required to fix this error:
         // TypeError: 'getOwnPropertyDescriptor' on proxy: trap reported non-configurability for
         // property 'length' which is either non-existent or configurable in the proxy target
@@ -521,8 +545,7 @@ function set(node, keyOrNewValue, newValue) {
     }
 }
 function setProp(node, key, newValue, level) {
-    newValue =
-        newValue && isObject(newValue) && (newValue === null || newValue === void 0 ? void 0 : newValue[symbolIsObservable]) ? newValue[symbolGet] : newValue;
+    newValue = newValue && isObject(newValue) && (newValue === null || newValue === void 0 ? void 0 : newValue[symbolIsObservable]) ? newValue.get() : newValue;
     const isPrim = isPrimitive(newValue);
     inSetFn = true;
     // Get the child node for updating and notifying
@@ -639,6 +662,7 @@ function observable(obj) {
         isPrimitive: isPrim,
     };
     const node = {
+        id: nextNodeID.current++,
         root: obs,
         parent: undefined,
         key: undefined,
@@ -647,20 +671,17 @@ function observable(obj) {
 }
 
 function observableComputed(compute) {
-    // Create an observable for this computed variable
-    // Initialize it to 0 temporarily to make it a primitive, but it will change immediately
     const update = () => {
         obs.set(compute());
     };
-    tracking.is = true;
-    tracking.nodes = [];
+    tracking.nodes = new Map();
     const computed = compute();
+    // Create an observable for this computed variable set to the initial value
     const obs = observable(computed);
-    tracking.is = false;
-    // Todo shallow
-    for (let { node } of tracking.nodes) {
-        onChange(node, update);
+    for (let tracked of tracking.nodes) {
+        onChange(tracked[1].node, update);
     }
+    tracking.nodes = undefined;
     return obs;
 }
 
@@ -677,7 +698,6 @@ function observableEvent() {
     };
 }
 
-exports.getObservableRawValue = getObservableRawValue;
 exports.isArray = isArray;
 exports.isFunction = isFunction;
 exports.isObject = isObject;
@@ -689,10 +709,7 @@ exports.observableComputed = observableComputed;
 exports.observableEvent = observableEvent;
 exports.onChange = onChange;
 exports.onChangeShallow = onChangeShallow;
-exports.shallow = shallow;
 exports.symbolDateModified = symbolDateModified;
-exports.symbolGet = symbolGet;
 exports.symbolIsObservable = symbolIsObservable;
-exports.symbolShallow = symbolShallow;
 exports.tracking = tracking;
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/state.ts","../../src/is.ts","../../src/globals.ts","../../src/helpers.ts","../../src/observableBatcher.ts","../../src/on.ts","../../src/observable.ts","../../src/observableComputed.ts","../../src/observableEvent.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null],"names":["observableBatcher"],"mappings":";;;;AAEa,MAAA,QAAQ,GAAG;AACpB,IAAA,EAAE,EAAE,KAAK;AACT,IAAA,OAAO,EAAE,KAAK;AACd,IAAA,MAAM,EAAE,SAA4C;AACpD,IAAA,KAAK,EAAE,EAAoB;EAC7B;AACc,SAAA,cAAc,CAAC,IAAe,EAAE,KAAU,EAAA;AACtD,IAAA,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QAChB,IAAI;QACJ,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,KAAK;AACR,KAAA,CAAC,CAAC;AACP;;ACdM,SAAU,OAAO,CAAC,GAAY,EAAA;AAChC,IAAA,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AACK,SAAU,QAAQ,CAAC,GAAY,EAAA;AACjC,IAAA,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC;AACnC,CAAC;AACK,SAAU,QAAQ,CAAC,GAAY,EAAA;AACjC,IAAA,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACpE,CAAC;AACK,SAAU,UAAU,CAAC,GAAY,EAAA;AACnC,IAAA,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC;AACrC,CAAC;AACK,SAAU,WAAW,CAAC,GAAG,EAAA;AAC3B,IAAA,IAAI,IAAI,GAAG,OAAO,GAAG,CAAC;AACtB,IAAA,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,IAAI,QAAQ,IAAI,IAAI,IAAI,UAAU,CAAC,CAAC;AACnE,CAAC;AACK,SAAU,aAAa,CAAC,GAAW,EAAA;AACrC,IAAA,OAAO,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACjE,CAAC;AACK,SAAU,QAAQ,CAAC,GAAY,EAAA;AACjC,IAAA,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC;AACnC;;MCjBa,kBAAkB,GAAG,MAAM,CAAC,cAAc,EAAE;MAC5C,aAAa,GAAG,MAAM,CAAC,SAAS,EAAE;MAClC,SAAS,GAAG,MAAM,CAAC,KAAK,EAAE;MAC1B,kBAAkB,GAAG,MAAM,CAAC,cAAc,EAAE;AAEnD,SAAU,YAAY,CAAC,IAAe,EAAA;IACxC,MAAM,GAAG,GAAwB,EAAE,CAAC;IACpC,IAAI,CAAC,GAAG,IAAI,CAAC;IACb,OAAO,CAAA,CAAC,KAAA,IAAA,IAAD,CAAC,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAD,CAAC,CAAE,GAAG,MAAK,SAAS,EAAE;AACzB,QAAA,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAChB,QAAA,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;AAChB,KAAA;AACD,IAAA,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACxB,IAAA,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,KAAK,EAAE;YAC/B,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACzB,SAAA;AACJ,KAAA;AACD,IAAA,OAAO,KAAK,CAAC;AACjB,CAAC;AAEe,SAAA,YAAY,CAAC,IAAe,EAAE,GAAoB,EAAA;;AAC9D,IAAA,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;AACf,QAAA,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;;AAEf,QAAA,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,GAAG,GAAG,CAAC,CAAC;AAC1B,KAAA;;IAGD,IAAI,KAAK,GAAG,CAAA,EAAA,GAAA,IAAI,CAAC,QAAQ,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAE,GAAG,CAAC,GAAG,CAAC,CAAC;;IAGpC,IAAI,CAAC,KAAK,EAAE;AACR,QAAA,KAAK,GAAG;YACJ,IAAI,EAAE,IAAI,CAAC,IAAI;AACf,YAAA,MAAM,EAAE,IAAI;YACZ,GAAG;;SAEN,CAAC;AACF,QAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;AAChB,YAAA,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;AAC7B,SAAA;QACD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACjC,KAAA;AAED,IAAA,OAAO,KAAK,CAAC;AACjB,CAAC;AAEK,SAAU,qBAAqB,CAAI,GAA4B,EAAA;AACjE,IAAA,IAAI,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC;AAAE,QAAA,OAAO,GAAQ,CAAC;IAC9C,IAAI,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,EAAE,CAAC;IAElC,MAAM,OAAO,GAAG,GAAG,KAAH,IAAA,IAAA,GAAG,uBAAH,GAAG,CAAG,aAAa,CAAC,CAAC;AACrC,IAAA,IAAI,OAAO,EAAE;AACT,QAAA,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;QACxB,GAAG,GAAG,OAAO,CAAC;AACjB,KAAA;IACD,IAAI,GAAG,GAAG,GAAG,KAAH,IAAA,IAAA,GAAG,uBAAH,GAAG,CAAG,SAAS,CAAC,CAAC;AAE3B,IAAA,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;AAC5B,IAAA,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC;AAEzB,IAAA,OAAO,GAAG,CAAC;AACf;;AC/DM,SAAU,OAAO,CAAC,GAAmB,EAAA;IACvC,OAAO;QACH,CAAC,aAAa,GAAG,GAAG;KACvB,CAAC;AACN,CAAC;AACK,SAAU,YAAY,CAAC,GAAQ,EAAA;IACjC,OAAO,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,kBAAyB,CAAC,CAAC;AACnD,CAAC;SAEe,mBAAmB,CAAC,MAA+B,EAAE,GAAG,OAAc,EAAA;;IAClF,IAAI,CAAC,OAAO,CAAC,MAAM;AAAE,QAAA,OAAO,MAAM,CAAC;AAEnC,IAAA,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;AAE/B,IAAA,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAEtC,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE;AACtC,QAAA,IAAI,MAAM,CAAC,kBAAyB,CAAC,EAAE;AACnC,YAAA,IAAI,QAAQ,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,CAAC,kBAAyB,CAAC,CAAC,CAAC;AACrE,aAAA;AAAM,iBAAA;gBACH,MAAM,CAAC,kBAAyB,CAAC,GAAG,MAAM,CAAC,kBAAyB,CAAC,CAAC;AACzE,aAAA;AACJ,SAAA;QACD,MAAM,KAAK,GAAG,CAAA,CAAA,EAAA,GAAA,MAAM,CAAC,GAAG,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,MAAA,CAAI,KAAI,MAAM,CAAC;AACvC,QAAA,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;AACtB,YAAA,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;AACvB,gBAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE;oBACtC,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;AACvD,iBAAA;gBACD,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACjD,aAAA;AAAM,iBAAA;AACH,gBAAA,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACzE,aAAA;AACJ,SAAA;AACJ,KAAA;AACD,IAAA,OAAO,mBAAmB,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC;AACnD;;AC/BA,IAAI,OAAO,CAAC;AACZ,IAAI,UAAU,GAAG,CAAC,CAAC;AACnB,IAAI,MAAM,GAAgB,EAAE,CAAC;AAC7B;AACA,IAAI,SAAS,GAAG,IAAI,OAAO,EAAyB,CAAC;AAErD,SAAS,eAAe,GAAA;AACpB,IAAA,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;AACnB,QAAA,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE;AACxC,YAAA,OAAO,CAAC,KAAK,CACT,uIAAuI,CAC1I,CAAC;AACL,SAAA;AACD,QAAAA,yBAAiB,CAAC,GAAG,WAAW,IAAI,CAAC,CAAC;AACzC,KAAA;AACL,CAAC;AAEK,SAAU,uBAAuB,CAAC,CAAY,EAAA;IAChD,IAAI,UAAU,GAAG,CAAC,EAAE;QAChB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;;AAErC,QAAA,IAAI,QAAQ,EAAE;YACV,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAC1B,SAAA;AAAM,aAAA;AACH,YAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAC1B,SAAA;AACJ,KAAA;AAAM,SAAA;QACH,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;AACrE,KAAA;AACL,CAAC;AAEgBA,mCA2BhB;AA3BD,CAAA,UAAiB,iBAAiB,EAAA;IAC9B,SAAgB,KAAK,CAAC,EAAc,EAAA;AAChC,QAAA,KAAK,EAAE,CAAC;AACR,QAAA,EAAE,EAAE,CAAC;AACL,QAAA,GAAG,EAAE,CAAC;KACT;AAJe,IAAA,iBAAA,CAAA,KAAK,QAIpB,CAAA;AACD,IAAA,SAAgB,KAAK,GAAA;AACjB,QAAA,UAAU,EAAE,CAAC;;AAEb,QAAA,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;KAC5C;AAJe,IAAA,iBAAA,CAAA,KAAK,QAIpB,CAAA;IACD,SAAgB,GAAG,CAAC,KAAe,EAAA;AAC/B,QAAA,UAAU,EAAE,CAAC;AACb,QAAA,IAAI,UAAU,IAAI,CAAC,IAAI,KAAK,EAAE;YAC1B,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,UAAU,GAAG,CAAC,CAAC;;;YAGf,MAAM,KAAK,GAAG,MAAM,CAAC;YACrB,MAAM,GAAG,EAAE,CAAC;AACZ,YAAA,SAAS,GAAG,IAAI,OAAO,EAAE,CAAC;AAC1B,YAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACnC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjF,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;AAClD,aAAA;AACJ,SAAA;KACJ;AAfe,IAAA,iBAAA,CAAA,GAAG,MAelB,CAAA;AACL,CAAC,EA3BgBA,yBAAiB,KAAjBA,yBAAiB,GA2BjC,EAAA,CAAA,CAAA;;AC3DD,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;SAE5B,QAAQ,CAAI,IAAe,EAAE,KAAQ,EAAE,QAA4B,EAAA;AAC/E,IAAA,IAAI,OAAkC,CAAC;IAEvC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAM,CAAC,OAAO,KAAI;QACzC,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,SAAS,KAAK,CAAC,QAAQ,EAAA;AACnB,YAAA,IACI,CAAC,MAAM;iBACN,KAAK,KAAM,cAAsB;AAC9B;wBACE,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;AACzE,sBAAE,QAAQ,KAAK,KAAK,CAAC,EAC3B;gBACE,MAAM,GAAG,IAAI,CAAC;AACb,gBAAA,QAA+B,aAA/B,QAAQ,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAR,QAAQ,CAA0B,QAAQ,CAAC,CAAC;gBAC7C,OAAO,CAAC,QAAQ,CAAC,CAAC;AAElB,gBAAA,OAAO,EAAE,CAAC;AACb,aAAA;AACD,YAAA,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE;YAC5B,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,KAAK,cAAc,IAAI,CAAC,CAAC;AACrD,SAAA;AACL,KAAC,CAAC,CAAC;IAEH,OAAO;QACH,OAAO;QACP,OAAO;KACV,CAAC;AACN,CAAC;AAEe,SAAA,UAAU,CAAI,IAAe,EAAE,QAA4B,EAAA;IACvE,OAAO,QAAQ,CAAC,IAAI,EAAE,cAAqB,EAAE,QAAQ,CAAC,CAAC;AAC3D,CAAC;AAEe,SAAA,MAAM,CAAoB,IAAe,EAAE,QAAqB,EAAA;IAC5E,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAS,EAAE,QAAQ,CAAC,CAAC;AAC/C,CAAC;SAEe,QAAQ,CAAC,IAAe,EAAE,QAAyB,EAAE,OAAiB,EAAA;IAClF,MAAM,CAAC,GAAG,QAA2B,CAAC;AACtC,IAAA,IAAI,OAAO,EAAE;AACT,QAAA,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;AACpB,KAAA;AACD,IAAA,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAC/B,IAAI,CAAC,SAAS,EAAE;AACZ,QAAA,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AACtB,QAAA,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;AAC9B,KAAA;AACD,IAAA,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEjB,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC;AAEe,SAAA,eAAe,CAAC,IAAe,EAAE,QAAyB,EAAA;IACtE,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,cAAc,IAAI,CAAC,CAAC;AACtD;;ACxDA,IAAI,gBAA2B,CAAC;AAChC,IAAI,qBAA6B,CAAC;AAClC,IAAI,OAAO,GAAG,KAAK,CAAC;AAEpB,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC;IAC3B,YAAY;IACZ,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,SAAS;IACT,OAAO;IACP,MAAM;IACN,QAAQ;IACR,SAAS;AACZ,CAAA,CAAC,CAAC;AACH,MAAM,YAAY,GAAG,IAAI,GAAG,CAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;AAE9F,MAAM,SAAS,GAAG,IAAI,GAAG,CAAmB;IACxC,CAAC,KAAK,EAAE,YAAY,CAAC;IACrB,CAAC,KAAK,EAAE,GAAG,CAAC;IACZ,CAAC,UAAU,EAAE,QAAQ,CAAC;IACtB,CAAC,iBAAiB,EAAE,eAAe,CAAC;IACpC,CAAC,UAAU,EAAE,QAAQ,CAAC;IACtB,CAAC,YAAY,EAAE,UAAU,CAAC;IAC1B,CAAC,QAAQ,EAAE,MAAM,CAAC;IAClB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAClB,CAAC,QAAQ,EAAE,MAAM,CAAC;IAClB,CAAC,QAAQ,EAAE,QAAQ,CAAC;AACvB,CAAA,CAAC,CAAC;AAEH;AACA,MAAM,MAAM,GAAG,CAAC,EAAY,KACxB,UAAU,GAAG,IAAS,EAAA;IAClB,IAAI,gBAAgB,IAAI,qBAAqB,EAAE;QAC3C,MAAM,IAAI,GAAc,YAAY,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;AAC9E,QAAA,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;AAC7B,YAAA,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;AAC5B,SAAA;AACJ,KAAA;AACL,CAAC,CAAC;AAEN,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC7C,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,GAAG,KAAI;AAC1B,IAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACxC,QAAA,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;AAC7C,KAAA;AACL,CAAC,CAAC,CAAC;AAEH,SAAS,gBAAgB,CAAC,IAAe,EAAE,MAAW,EAAE,IAAY,EAAE,GAAG,IAAW,EAAA;AAChF,IAAA,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,MAAM,CAAC;AAEhE,IAAA,MAAM,GAAG,GAAI,MAAM,CAAC,IAAI,CAAc,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAE3D,IAAA,IAAI,IAAI,EAAE;AACN,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAC3B,QAAA,IAAI,MAAM,EAAE;AACR,YAAA,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;;AAGzC,YAAA,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;;YAGlC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,SAAA;AACJ,KAAA;;AAGD,IAAA,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,WAAW,CAAC,MAAiB,EAAE,GAAkC,EAAE,SAAe,EAAA;AACvF,IAAA,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;;AAE3B,IAAA,MAAM,IAAI,GAAG,KAAK,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5C,IAAA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAE3B,IAAI,QAAQ,GAAG,CAAC,KAAK,IAAI,CAAA,GAAG,KAAH,IAAA,IAAA,GAAG,KAAH,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,GAAG,CAAE,MAAM,OAAK,SAAS,KAAT,IAAA,IAAA,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAA,CAAC;IAC3D,MAAM,SAAS,GAAG,QAAQ,CAAC;AAE3B,IAAA,IAAI,MAAoC,CAAC;AACzC,IAAA,IAAI,KAA4B,CAAC;IAEjC,IAAI,KAAK,KAAI,SAAS,KAAT,IAAA,IAAA,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAA,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,EAAE;AACnF,QAAA,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACnB,KAAK,GAAG,EAAE,CAAC;AACX,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACvC,YAAA,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAClC,SAAA;AACJ,KAAA;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;AAC7B,QAAA,MAAM,GAAG,GAAG,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAChC,QAAA,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,SAAS,KAAT,IAAA,IAAA,SAAS,uBAAT,SAAS,CAAG,GAAG,CAAC,CAAC;AAE9B,QAAA,IAAI,MAAM,GAAG,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC;AACzC,QAAA,IAAI,MAAM,EAAE;YACR,MAAM,EAAE,GAAG,KAAK,KAAA,IAAA,IAAL,KAAK,KAAL,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,KAAK,CAAE,EAAE,CAAC;YAErB,IAAI,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;;;AAItC,YAAA,IAAI,KAAK,IAAI,EAAE,KAAK,SAAS,EAAE;;gBAE3B,MAAM,QAAQ,GAAG,EAAE,KAAK,SAAS,GAAG,MAAM,KAAN,IAAA,IAAA,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;gBAChE,IAAI,QAAQ,KAAK,SAAS,EAAE;oBACxB,IAAI,QAAQ,KAAK,GAAG,EAAE;;AAElB,wBAAA,IAAI,SAAS,EAAE;AACX,4BAAA,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AACvC,4BAAA,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;4BAChB,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAC5B,yBAAA;;AAGD,wBAAA,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AACvC,wBAAA,MAAM,GAAG,UAAU,KAAK,KAAK,CAAC;AACjC,qBAAA;AACJ,iBAAA;AACJ,aAAA;AAED,YAAA,IAAI,MAAM,EAAE;;gBAER,QAAQ,GAAG,IAAI,CAAC;;AAEhB,gBAAA,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;AACrB,oBAAA,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AACnC,iBAAA;AACJ,aAAA;AACD,YAAA,IAAI,MAAM,IAAI,CAAC,SAAS,EAAE;;;;;AAKtB,gBAAA,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;AACnC,gBAAA,IAAI,QAAQ,EAAE;AACV,oBAAA,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC7C,iBAAA;AACJ,aAAA;AACJ,SAAA;AACJ,KAAA;AAED,IAAA,IAAI,KAAK,EAAE;AACP,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACnC,SAAA;AACJ,KAAA;AAED,IAAA,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,QAAQ,CAAC,IAAe,EAAE,CAAmB,EAAA;;IAElD,IAAI,CAAC,KAAK,SAAS;AAAE,QAAA,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;;AAGlD,IAAA,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,IAAI,CAAC,KAAK,EAAE;AACR,QAAA,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAY,IAAI,EAAE,YAAY,CAAC,CAAC;AACjE,KAAA;AACD,IAAA,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,YAAY,GAAsB;IACpC,GAAG,CAAC,MAAiB,EAAE,CAAM,EAAA;;;QAEzB,IAAI,CAAC,KAAK,kBAAkB,EAAE;AAC1B,YAAA,OAAO,IAAI,CAAC;AACf,SAAA;QAED,MAAM,IAAI,GAAG,MAAM,CAAC;QACpB,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;;AAE5B,QAAA,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,EAAE;AACnB,YAAA,OAAO,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,EAAA;AACpB,gBAAA,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;AAC3B,gBAAA,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5E,aAAC,CAAC;AACL,SAAA;AAED,QAAA,IAAI,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,KAAK,KAAL,IAAA,IAAA,KAAK,uBAAL,KAAK,CAAG,CAAC,CAAC,CAAC;;AAEzB,QAAA,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,KAAK,EAAE;;AAEhC,YAAA,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;AACvB,gBAAA,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;AACzB,aAAA;;YAED,IAAI,QAAQ,CAAC,EAAE,EAAE;AACb,gBAAA,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC/B,aAAA;AACD,YAAA,OAAO,CAAC,KAAK,KAAK,GAAG,MAAM,KAAK,GAAG,KAAK,CAAC;AAC5C,SAAA;;;QAGD,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,IAAI,KAAK,KAAK,KAAK,SAAS,IAAI,KAAK,KAAI,CAAA,EAAA,GAAA,KAAK,CAAC,cAAc,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,KAAA,EAAG,CAAC,CAAC,CAAA,CAAC,EAAE;AAC9F,YAAA,OAAO,KAAK,CAAC;AAChB,SAAA;;AAED,QAAA,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;AACnB,YAAA,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;AAChB,gBAAA,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;;AAEvB,oBAAA,OAAO,CAAC,GAAG,IAAI,KAAK,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;AACjE,iBAAA;AAAM,qBAAA,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBAC5B,OAAO,UAAU,MAAM,EAAE,OAAO,EAAA;AAC5B,wBAAA,SAAS,EAAE,CAAC,CAAC,EAAE,KAAa,EAAE,KAAY,EAAA;AACtC,4BAAA,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;yBACtD;wBACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;AACjC,qBAAC,CAAC;AACL,iBAAA;AACJ,aAAA;;AAED,YAAA,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC5B,SAAA;;QAED,IAAI,KAAK,KAAK,SAAS,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE;;;YAG3C,gBAAgB,GAAG,IAAI,CAAC;YACxB,qBAAqB,GAAG,CAAC,CAAC;;YAE1B,IAAI,QAAQ,CAAC,EAAE,EAAE;gBACb,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;AAChD,aAAA;AACD,YAAA,OAAO,KAAK,CAAC;AAChB,SAAA;AAED,QAAA,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;KAC9B;;AAED,IAAA,cAAc,CAAC,MAAM,EAAA;AACjB,QAAA,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AACnC,QAAA,OAAO,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;KACxC;AACD,IAAA,OAAO,CAAC,MAAM,EAAA;AACV,QAAA,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AACnC,QAAA,MAAM,IAAI,GAAG,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;;;;AAKjD,QAAA,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;YAChB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,QAAQ,EAAE;gBACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AACnC,aAAA;AACJ,SAAA;AACD,QAAA,OAAO,IAAI,CAAC;KACf;IACD,wBAAwB,CAAC,MAAM,EAAE,CAAC,EAAA;AAC9B,QAAA,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;KACrD;AACD,IAAA,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAA;;AAEnB,QAAA,IAAI,OAAO,EAAE;YACT,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AACjC,YAAA,OAAO,IAAI,CAAC;AACf,SAAA;AAAM,aAAA;AACH,YAAA,OAAO,KAAK,CAAC;AAChB,SAAA;KACJ;IACD,cAAc,CAAC,MAAM,EAAE,IAAI,EAAA;;AAEvB,QAAA,IAAI,OAAO,EAAE;AACT,YAAA,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACrC,YAAA,OAAO,IAAI,CAAC;AACf,SAAA;AAAM,aAAA;AACH,YAAA,OAAO,KAAK,CAAC;AAChB,SAAA;KACJ;IACD,GAAG,CAAC,MAAM,EAAE,IAAI,EAAA;AACZ,QAAA,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACnC;CACJ,CAAC;AAEF,SAAS,GAAG,CAAC,IAAe,EAAE,aAAkB,EAAE,QAAc,EAAA;AAC5D,IAAA,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,OAAO,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;AACjD,KAAA;AAAM,SAAA,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QAC9B,OAAO,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAClD,KAAA;AAAM,SAAA,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;AACrB,QAAA,OAAO,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AACtC,KAAA;AAAM,SAAA;AACH,QAAA,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACxD,KAAA;AACL,CAAC;AAED,SAAS,OAAO,CAAC,IAAe,EAAE,GAAoB,EAAE,QAAc,EAAE,KAAc,EAAA;IAClF,QAAQ;QACJ,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAI,QAAQ,KAAR,IAAA,IAAA,QAAQ,KAAR,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,QAAQ,CAAG,kBAAyB,CAAC,CAAA,GAAG,QAAQ,CAAC,SAAgB,CAAC,GAAG,QAAQ,CAAC;AAEpH,IAAA,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IAErC,OAAO,GAAG,IAAI,CAAC;;IAGf,IAAI,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;;AAGxC,IAAA,IAAI,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;;AAGrC,IAAA,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;;AAGnC,IAAA,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;IAE5B,IAAI,QAAQ,GAAG,MAAM,CAAC;;IAEtB,IAAI,CAAC,MAAM,EAAE;QACT,QAAQ,GAAG,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAC1D,KAAA;;AAGD,IAAA,IAAI,CAAC,MAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;QACnC,MAAM,CACF,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,SAAS,EACxC,QAAQ,EACR,SAAS,EACT,CAAA,KAAK,KAAL,IAAA,IAAA,KAAK,cAAL,KAAK,GAAI,SAAS,KAAK,SAAS,IAAG,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,GAAG,CAAC,CAC3D,CAAC;AACL,KAAA;IAED,OAAO,GAAG,KAAK,CAAC;AAEhB,IAAA,OAAO,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAU,EAAE,IAAyB,EAAE,UAAe,EAAA;;IAEjF,OAAO,YAAA;AACH,QAAA,IAAI,KAAK,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACrF,IAAI,CAAC,GAAG,KAAK,CAAC;AACd,QAAA,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;AACjB,YAAA,IAAI,CAAS,CAAC;AACd,YAAA,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBAClC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAClB,aAAA;YACD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;AAC3B,SAAA;AAAM,aAAA;YACH,KAAK,GAAG,UAAU,CAAC;AACtB,SAAA;AACD,QAAA,OAAO,KAAK,CAAC;AACjB,KAAC,CAAC;AACN,CAAC;AAED,SAAS,OAAO,CACZ,IAAe,EACf,KAAU,EACV,IAAyB,EACzB,WAAgB,EAChB,UAAe,EACf,KAAa,EAAA;AAEb,IAAA,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;AACjC,IAAA,IAAI,SAAS,EAAE;AACX,QAAA,IAAI,WAAW,CAAC;AAChB,QAAA,KAAK,IAAI,QAAQ,IAAI,SAAS,EAAE;;YAE5B,IAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,KAAK,IAAI,CAAC,EAAE;;;gBAGjC,IAAI,CAAC,WAAW,EAAE;oBACd,WAAW,GAAG,qBAAqB,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;AAChE,iBAAA;AACD,gBAAA,uBAAuB,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;AAChG,aAAA;AACJ,SAAA;AACJ,KAAA;AACL,CAAC;AAED,SAAS,cAAc,CACnB,IAAe,EACf,KAAU,EACV,IAAyB,EACzB,WAAgB,EAChB,UAAe,EACf,KAAa,EAAA;;AAGb,IAAA,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;;IAE3D,IAAI,IAAI,CAAC,MAAM,EAAE;AACb,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAC3B,QAAA,IAAI,MAAM,EAAE;AACR,YAAA,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;YACzC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;AACpG,SAAA;AACJ,KAAA;AACL,CAAC;AACD,SAAS,MAAM,CAAC,IAAe,EAAE,KAAU,EAAE,IAAS,EAAE,KAAa,EAAA;;AAEjE,IAAA,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,MAAM,CAAC,IAAe,EAAE,KAAU,EAAA;IACvCA,yBAAiB,CAAC,KAAK,EAAE,CAAC;;IAG1B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAChC,IAAA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;AAC7B,QAAA,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,KAAA;AAED,IAAA,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC/BA,yBAAiB,CAAC,GAAG,EAAE,CAAC;AAExB,IAAA,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,QAAQ,CAAC,IAAe,EAAE,GAAqB,EAAA;;IAEpD,IAAI,GAAG,KAAK,SAAS,EAAE;AACnB,QAAA,OAAO,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AACnC,KAAA;SAAM,IAAI,IAAI,CAAC,MAAM,EAAE;QACpB,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,KAAA;AACL,CAAC;AACD,SAAS,aAAa,CAAC,IAAe,EAAE,GAAoB,EAAA;AACxD,IAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;;AAExB,QAAA,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,YAAY,CAAC,CAAC,CAAC,CAAC;AAC/C,KAAA;IAED,OAAO,GAAG,IAAI,CAAC;;AAEf,IAAA,IAAI,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;AAC/B,IAAA,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;IAElB,OAAO,GAAG,KAAK,CAAC;AACpB,CAAC;AAOK,SAAU,UAAU,CAAI,GAAM,EAAA;AAChC,IAAA,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;;AAEhC,IAAA,IAAI,MAAM,EAAE;AACR,QAAA,GAAG,GAAG,EAAE,OAAO,EAAE,GAAG,EAAS,CAAC;AACjC,KAAA;AAED,IAAA,MAAM,GAAG,GAAG;AACR,QAAA,CAAC,EAAE,GAAoB;AACvB,QAAA,WAAW,EAAE,MAAM;KACD,CAAC;AAEvB,IAAA,MAAM,IAAI,GAAc;AACpB,QAAA,IAAI,EAAE,GAAG;AACT,QAAA,MAAM,EAAE,SAAS;AACjB,QAAA,GAAG,EAAE,SAAS;KACjB,CAAC;AAEF,IAAA,OAAO,QAAQ,CAAC,IAAI,CAAmC,CAAC;AAC5D;;ACxdM,SAAU,kBAAkB,CAAI,OAAgB,EAAA;;;IAIlD,MAAM,MAAM,GAAG,MAAK;AAChB,QAAA,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;AACvB,KAAC,CAAC;AAEF,IAAA,QAAQ,CAAC,EAAE,GAAG,IAAI,CAAC;AACnB,IAAA,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC;AAEpB,IAAA,MAAM,QAAQ,GAAG,OAAO,EAAE,CAAC;AAC3B,IAAA,MAAM,GAAG,GAAG,UAAU,CAAC,QAAe,CAAC,CAAC;AAExC,IAAA,QAAQ,CAAC,EAAE,GAAG,KAAK,CAAC;;IAGpB,KAAK,IAAI,EAAE,IAAI,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE;AACjC,QAAA,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC1B,KAAA;AAED,IAAA,OAAO,GAAuC,CAAC;AACnD;;SCxBgB,eAAe,GAAA;;;AAG3B,IAAA,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC1B,OAAO;QACH,QAAQ,EAAE,MAAK;;YAEX,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;SAC5B;QACD,EAAE,EAAE,GAAG,CAAC,QAAe;KAC1B,CAAC;AACN;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":["../../src/is.ts","../../src/state.ts","../../src/globals.ts","../../src/helpers.ts","../../src/observableBatcher.ts","../../src/on.ts","../../src/observable.ts","../../src/observableComputed.ts","../../src/observableEvent.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null],"names":["observableBatcher"],"mappings":"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"}

package/index.mjs

@@ -1,17 +1,3 @@
-const tracking = {
-    is: false,
-    shallow: false,
-    should: undefined,
-    nodes: [],
-};
-function updateTracking(node, value) {
-    tracking.nodes.push({
-        node,
-        shallow: tracking.shallow,
-        value,
-    });
-}
-
 function isArray(obj) {
     return Array.isArray(obj);
 }
@@ -35,10 +21,54 @@ function isSymbol(obj) {
     return typeof obj === 'symbol';
 }
 
+const tracking = {
+    nodes: undefined,
+};
+function updateTracking(node, parent, shallow, manual) {
+    if (parent) {
+        untrack(parent);
+    }
+    const existing = tracking.nodes.get(node.id);
+    if (existing) {
+        existing.shallow = existing.shallow || shallow;
+        existing.manual = existing.manual || manual;
+    }
+    else {
+        tracking.nodes.set(node.id, { node, shallow, manual });
+    }
+}
+function untrack(node) {
+    const tracked = tracking.nodes.get(node.id);
+    if (tracked && !tracked.manual) {
+        tracking.nodes.delete(node.id);
+    }
+}
+
 const symbolDateModified = Symbol('dateModified');
-const symbolShallow = Symbol('shallow');
-const symbolGet = Symbol('get');
 const symbolIsObservable = Symbol('isObservable');
+const nextNodeID = { current: 0 };
+function getOutputValue(node) {
+    let value = getNodeValue(node);
+    if (node.root.isPrimitive) {
+        value = value.current;
+    }
+    return value;
+}
+function get(node) {
+    if (tracking.nodes)
+        untrack(node);
+    return getOutputValue(node);
+}
+function observe(node, shallow) {
+    const value = getOutputValue(node);
+    if (tracking.nodes) {
+        updateTracking(node, undefined, shallow, /*manual*/ true);
+    }
+    else if (process.env.NODE_ENV === 'development') {
+        console.error('[legend-state]: observe() has no effect outside of an observer component.');
+    }
+    return value;
+}
 function getNodeValue(node) {
     const arr = [];
     let n = node;
@@ -67,6 +97,7 @@ function getChildNode(node, key) {
     // Create the child node if it doesn't already exist
     if (!child) {
         child = {
+            id: nextNodeID.current++,
             root: node.root,
             parent: node,
             key,
@@ -79,27 +110,7 @@ function getChildNode(node, key) {
     }
     return child;
 }
-function getObservableRawValue(obs) {
-    if (!obs || isPrimitive(obs))
-        return obs;
-    if (isFunction(obs))
-        return obs();
-    const shallow = obs === null || obs === void 0 ? void 0 : obs[symbolShallow];
-    if (shallow) {
-        tracking.shallow = true;
-        obs = shallow;
-    }
-    let ret = obs === null || obs === void 0 ? void 0 : obs[symbolGet];
-    tracking.should = undefined;
-    tracking.shallow = false;
-    return ret;
-}
 
-function shallow(obs) {
-    return {
-        [symbolShallow]: obs,
-    };
-}
 function isObservable(obs) {
     return obs && !!obs[symbolIsObservable];
 }
@@ -263,14 +274,16 @@ const ArrayModifiers = new Set([
 ]);
 const ArrayLoopers = new Set(['every', 'some', 'filter', 'forEach', 'map']);
 const objectFns = new Map([
-    ['get', getNodeValue],
+    ['get', get],
     ['set', set],
+    ['observe', observe],
     ['onChange', onChange],
     ['onChangeShallow', onChangeShallow],
     ['onEquals', onEquals],
     ['onHasValue', onHasValue],
     ['onTrue', onTrue],
-    ['prop', getProxy],
+    ['ref', ref],
+    ['prop', prop],
     ['assign', assign],
     ['delete', deleteFn],
 ]);
@@ -376,6 +389,13 @@ function updateNodes(parent, obj, prevValue) {
     }
     return hasADiff;
 }
+function hasProxy(node, p) {
+    // Get the child node if p prop
+    if (p !== undefined)
+        node = getChildNode(node, p);
+    // Create a proxy if not already cached and return it
+    return !!node.proxy;
+}
 function getProxy(node, p) {
     // Get the child node if p prop
     if (p !== undefined)
@@ -387,6 +407,18 @@ function getProxy(node, p) {
     }
     return proxy;
 }
+function ref(node) {
+    if (tracking.nodes)
+        untrack(node);
+    return getProxy(node);
+}
+function prop(node, p) {
+    // Update that this node was accessed for observers
+    if (tracking.nodes) {
+        updateTracking(getChildNode(node, p), node);
+    }
+    return getProxy(node, p);
+}
 const proxyHandler = {
     get(target, p) {
         var _a;
@@ -397,7 +429,7 @@ const proxyHandler = {
         const node = target;
         const fn = objectFns.get(p);
         // If this is an observable function, call it
-        if (p !== 'get' && fn) {
+        if (fn) {
             return function (a, b, c) {
                 const l = arguments.length;
                 return l > 2 ? fn(node, a, b, c) : l > 1 ? fn(node, a, b) : fn(node, a);
@@ -405,18 +437,6 @@ const proxyHandler = {
         }
         let value = getNodeValue(node);
         const vProp = value === null || value === void 0 ? void 0 : value[p];
-        // The get() function as well as the internal obs[symbolGet]
-        if (p === symbolGet || p === 'get') {
-            // Primitives are { current } so return the current value
-            if (node.root.isPrimitive) {
-                value = value.current;
-            }
-            // Update that this node was accessed for useObservables and useComputed
-            if (tracking.is) {
-                updateTracking(node, value);
-            }
-            return p === 'get' ? () => value : value;
-        }
         // Accessing undefined/null/symbols passes straight through if this value has a property for it
         // If it's never been defined assume it's a proxy to a future object
         if (isSymbol(p) || vProp === null || (vProp === undefined && value && ((_a = value.hasOwnProperty) === null || _a === void 0 ? void 0 : _a.call(value, p)))) {
@@ -441,16 +461,16 @@ const proxyHandler = {
             // Return the function bound to the value
             return vProp.bind(value);
         }
-        // Accessing primitives tracks and returns
-        if (vProp !== undefined && isPrimitive(vProp)) {
+        // Update that this node was accessed for observers
+        if (tracking.nodes) {
+            updateTracking(getChildNode(node, p), node);
+        }
+        // Accessing primitive returns the raw value
+        if (vProp === undefined || vProp === null ? !hasProxy(target, p) : isPrimitive(vProp)) {
             // Accessing a primitive saves the last accessed so that the observable functions
             // bound to primitives can know which node was accessed
             lastAccessedNode = node;
             lastAccessedPrimitive = p;
-            // Update that this node was accessed for useObservables and useComputed
-            if (tracking.is) {
-                updateTracking(getChildNode(node, p), value);
-            }
             return vProp;
         }
         return getProxy(target, p);
@@ -463,6 +483,10 @@ const proxyHandler = {
     ownKeys(target) {
         const value = getNodeValue(target);
         const keys = value ? Reflect.ownKeys(value) : [];
+        // Update that this node was accessed for observers
+        if (tracking.nodes) {
+            updateTracking(value);
+        }
         // This is required to fix this error:
         // TypeError: 'getOwnPropertyDescriptor' on proxy: trap reported non-configurability for
         // property 'length' which is either non-existent or configurable in the proxy target
@@ -517,8 +541,7 @@ function set(node, keyOrNewValue, newValue) {
     }
 }
 function setProp(node, key, newValue, level) {
-    newValue =
-        newValue && isObject(newValue) && (newValue === null || newValue === void 0 ? void 0 : newValue[symbolIsObservable]) ? newValue[symbolGet] : newValue;
+    newValue = newValue && isObject(newValue) && (newValue === null || newValue === void 0 ? void 0 : newValue[symbolIsObservable]) ? newValue.get() : newValue;
     const isPrim = isPrimitive(newValue);
     inSetFn = true;
     // Get the child node for updating and notifying
@@ -635,6 +658,7 @@ function observable(obj) {
         isPrimitive: isPrim,
     };
     const node = {
+        id: nextNodeID.current++,
         root: obs,
         parent: undefined,
         key: undefined,
@@ -643,20 +667,17 @@ function observable(obj) {
 }
 
 function observableComputed(compute) {
-    // Create an observable for this computed variable
-    // Initialize it to 0 temporarily to make it a primitive, but it will change immediately
     const update = () => {
         obs.set(compute());
     };
-    tracking.is = true;
-    tracking.nodes = [];
+    tracking.nodes = new Map();
     const computed = compute();
+    // Create an observable for this computed variable set to the initial value
     const obs = observable(computed);
-    tracking.is = false;
-    // Todo shallow
-    for (let { node } of tracking.nodes) {
-        onChange(node, update);
+    for (let tracked of tracking.nodes) {
+        onChange(tracked[1].node, update);
     }
+    tracking.nodes = undefined;
     return obs;
 }
 
@@ -673,5 +694,5 @@ function observableEvent() {
     };
 }
 
-export { getObservableRawValue, isArray, isFunction, isObject, isObservable, isPrimitive, mergeIntoObservable, observable, observableBatcher, observableComputed, observableEvent, onChange, onChangeShallow, shallow, symbolDateModified, symbolGet, symbolIsObservable, symbolShallow, tracking };
+export { isArray, isFunction, isObject, isObservable, isPrimitive, mergeIntoObservable, observable, observableBatcher, observableComputed, observableEvent, onChange, onChangeShallow, symbolDateModified, symbolIsObservable, tracking };
 //# sourceMappingURL=index.mjs.map