@legendapp/state 2.2.0-next.91 → 2.2.0-next.93

package/babel.js

@@ -3,20 +3,19 @@
 var types = require('@babel/types');
 
 function babel () {
-    let imported;
+    let hasLegendImport = false;
     return {
         visitor: {
-            Program() {
-                imported = {};
-            },
             ImportDeclaration: {
                 enter(path) {
                     if (path.node.source.value === '@legendapp/state/react') {
                         const specifiers = path.node.specifiers;
                         for (let i = 0; i < specifiers.length; i++) {
                             const s = specifiers[i].imported.name;
-                            if (!imported[s] && (s === 'Computed' || s === 'Memo')) {
-                                imported[s] = specifiers[i].local.name;
+                            if (!hasLegendImport && (s === 'Computed' || s === 'Memo' || s === 'Show')) {
+                                hasLegendImport = true;
+                                path.skip();
+                                break;
                             }
                         }
                     }
@@ -24,16 +23,24 @@ function babel () {
             },
             JSXElement: {
                 enter(path) {
+                    if (!hasLegendImport) {
+                        path.skip();
+                        return;
+                    }
                     const openingElement = path.node.openingElement;
-                    const children_ = path.node.children;
                     const name = openingElement.name.name;
                     if (name === 'Computed' || name === 'Memo' || name === 'Show') {
-                        const children = removEmptyText(children_);
-                        const attrs = openingElement.attributes;
-                        if (children.length > 0 && children[0].type === 'JSXElement') {
-                            path.replaceWith(types.jsxElement(types.jsxOpeningElement(types.jsxIdentifier(name), attrs), types.jsxClosingElement(types.jsxIdentifier(name)), [
-                                types.jsxExpressionContainer(types.arrowFunctionExpression([], types.jsxFragment(types.jsxOpeningFragment(), types.jsxClosingFragment(), children))),
-                            ]));
+                        const children = removeEmptyText(path.node.children);
+                        if (children.length === 0)
+                            return;
+                        if (children[0].type === 'JSXElement' ||
+                            (children[0].type === 'JSXExpressionContainer' &&
+                                children[0].expression.type !== 'ArrowFunctionExpression' &&
+                                children[0].expression.type !== 'FunctionExpression' &&
+                                children[0].expression.type !== 'MemberExpression' &&
+                                children[0].expression.type !== 'Identifier')) {
+                            const attrs = openingElement.attributes;
+                            path.replaceWith(types.jsxElement(types.jsxOpeningElement(types.jsxIdentifier(name), attrs), types.jsxClosingElement(types.jsxIdentifier(name)), [types.jsxExpressionContainer(types.arrowFunctionExpression([], maybeWrapFragment(children)))]));
                         }
                     }
                 },
@@ -41,7 +48,14 @@ function babel () {
         },
     };
 }
-function removEmptyText(nodes) {
+function maybeWrapFragment(children) {
+    if (children.length === 1 && children[0].type == 'JSXElement')
+        return children[0];
+    if (children.length === 1 && children[0].type == 'JSXExpressionContainer')
+        return children[0].expression;
+    return types.jsxFragment(types.jsxOpeningFragment(), types.jsxClosingFragment(), children);
+}
+function removeEmptyText(nodes) {
     return nodes.filter((node) => !(node.type === 'JSXText' && node.value.trim().length === 0));
 }
 

package/babel.js.map

@@ -1 +1 @@
-{"version":3,"file":"babel.js","sources":["./src/babel/index.ts"],"sourcesContent":[null],"names":["jsxElement","jsxOpeningElement","jsxIdentifier","jsxClosingElement","jsxExpressionContainer","arrowFunctionExpression","jsxFragment","jsxOpeningFragment","jsxClosingFragment"],"mappings":";;;;AAYc,cAAA,IAAA;AACV,IAAA,IAAI,QAAgC,CAAC;IACrC,OAAO;AACH,QAAA,OAAO,EAAE;YACL,OAAO,GAAA;gBACH,QAAQ,GAAG,EAAE,CAAC;aACjB;AACD,YAAA,iBAAiB,EAAE;AACf,gBAAA,KAAK,CAAC,IAAqD,EAAA;oBACvD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,wBAAwB,EAAE;AACrD,wBAAA,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;AACxC,wBAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;4BACxC,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AACtC,4BAAA,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,MAAM,CAAC,EAAE;AACpD,gCAAA,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;6BAC1C;yBACJ;qBACJ;iBACJ;AACJ,aAAA;AACD,YAAA,UAAU,EAAE;AACR,gBAAA,KAAK,CAAC,IAAqD,EAAA;AACvD,oBAAA,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;AAEhD,oBAAA,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;AACrC,oBAAA,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;AAEtC,oBAAA,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,MAAM,EAAE;AAC3D,wBAAA,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;AAE3C,wBAAA,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC;AAExC,wBAAA,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE;4BAC1D,IAAI,CAAC,WAAW,CACZA,gBAAU,CACNC,uBAAiB,CAACC,mBAAa,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAC7CC,uBAAiB,CAACD,mBAAa,CAAC,IAAI,CAAC,CAAC,EACtC;AACI,gCAAAE,4BAAsB,CAClBC,6BAAuB,CACnB,EAAE,EACFC,iBAAW,CAACC,wBAAkB,EAAE,EAAEC,wBAAkB,EAAE,EAAE,QAAQ,CAAC,CACpE,CACJ;AACJ,6BAAA,CACJ,CACJ,CAAC;yBACL;qBACJ;iBACJ;AACJ,aAAA;AACJ,SAAA;KACJ,CAAC;AACN,CAAC;AAED,SAAS,cAAc,CAAC,KAAY,EAAA;AAChC,IAAA,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;AAChG;;;;"}
+{"version":3,"file":"babel.js","sources":["./src/babel/index.ts"],"sourcesContent":[null],"names":["jsxElement","jsxOpeningElement","jsxIdentifier","jsxClosingElement","jsxExpressionContainer","arrowFunctionExpression","jsxFragment","jsxOpeningFragment","jsxClosingFragment"],"mappings":"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"}

package/index.d.ts

@@ -13,6 +13,7 @@ export { observe } from './src/observe';
 export { proxy } from './src/proxy';
 export { trackSelector } from './src/trackSelector';
 export { when, whenReady } from './src/when';
+export { isObserved, shouldIgnoreUnobserved } from './src/ObservableObject';
 import { get, getProxy, peek, set } from './src/ObservableObject';
 import { createPreviousHandler } from './src/batching';
 import { clone, ensureNodeValue, findIDKey, getNode, getNodeValue, getPathType, safeParse, safeStringify, setNodeValue } from './src/globals';

package/index.js

@@ -211,6 +211,7 @@ function getChildNode(node, key, asFunction) {
             parent: node,
             key,
             lazy: true,
+            numListenersRecursive: 0,
         };
         // Lookup functions are bound with the child key
         if (((_b = node.lazyFn) === null || _b === void 0 ? void 0 : _b.length) === 1) {
@@ -708,10 +709,13 @@ function getNodeAtPath(obj, path) {
     return o;
 }
 
-function linked(params) {
+function linked(params, options) {
     if (isFunction(params)) {
         params = { get: params };
     }
+    if (options) {
+        params = { ...params, ...options };
+    }
     const ret = function () {
         return { [symbolLinked]: params };
     };
@@ -731,6 +735,7 @@ function createObservable(value, makePrimitive, extractPromise, createObject, cr
     let node = {
         root,
         lazy: true,
+        numListenersRecursive: 0,
     };
     if (valueIsFunction) {
         node = Object.assign(() => { }, node);
@@ -806,6 +811,7 @@ function onChange(node, callback, options = {}, fromLinks) {
     // Add listeners for linked from nodes
     (_a = node.linkedFromNodes) === null || _a === void 0 ? void 0 : _a.forEach((linkedFromNode) => addLinkedNodeListeners(linkedFromNode));
     // Go up through the parents and add listeners for linked from nodes
+    node.numListenersRecursive++;
     let parent = node.parent;
     let pathParent = [node.key];
     while (parent) {
@@ -817,12 +823,18 @@ function onChange(node, callback, options = {}, fromLinks) {
                 }
             }
         }
+        parent.numListenersRecursive++;
         pathParent = [parent.key, ...pathParent];
         parent = parent.parent;
     }
     return () => {
         listeners.delete(listener);
         extraDisposes === null || extraDisposes === void 0 ? void 0 : extraDisposes.forEach((fn) => fn());
+        let parent = node;
+        while (parent) {
+            parent.numListenersRecursive--;
+            parent = parent.parent;
+        }
     };
 }
 function createCb(linkedFromNode, path, callback) {
@@ -1453,7 +1465,7 @@ const proxyHandler = {
                 }
                 else if (ArrayLoopers.has(p)) {
                     // Update that this node was accessed for observers
-                    updateTracking(node);
+                    updateTracking(node, true);
                     return function (cbOrig, thisArg) {
                         const isReduce = p === 'reduce';
                         // Callbacks are given the Proxy rather than the underlying data
@@ -1786,6 +1798,8 @@ function extractPromise(node, value, setter) {
     });
 }
 function extractFunctionOrComputed(node, k, v) {
+    // We want to extract these types of values from the observable's raw value so that
+    // the raw value does not contain Promises, Observables or functions
     if (isPromise(v)) {
         const childNode = getChildNode(node, k);
         extractPromise(childNode, v);
@@ -1816,13 +1830,22 @@ function get(node, options) {
 function peek(node) {
     return peekInternal(node, true);
 }
+let isFlushing = false;
 function peekInternal(node, activateRecursive) {
+    var _a;
+    isFlushing = true;
+    if ((_a = node.dirtyChildren) === null || _a === void 0 ? void 0 : _a.size) {
+        const dirty = Array.from(node.dirtyChildren);
+        node.dirtyChildren.clear();
+        dirty.forEach((node) => node.dirtyFn && peekInternal(node));
+    }
     if (node.dirtyFn) {
         const dirtyFn = node.dirtyFn;
         node.dirtyFn = undefined;
         globalState.dirtyNodes.delete(node);
         dirtyFn();
     }
+    isFlushing = false;
     let value = getNodeValue(node);
     value = checkLazy(node, value, !!activateRecursive);
     return value;
@@ -1857,27 +1880,14 @@ function checkLazy(node, value, activateRecursive) {
         }
     }
     if ((lazy || node.needsExtract) && !isObservable(value) && !isPrimitive(value)) {
+        // If this is a purposeful get, check descendants for observable or auto activated linked
         if (activateRecursive) {
-            traverseObject(value, node);
+            recursivelyAutoActivate(value, node);
         }
+        // If this is an extractable node, extract it from parent before it's accessed
         if (node.parent) {
             extractFunctionOrComputed(node.parent, node.key, origValue);
         }
-        // for (const key in value) {
-        //     if (hasOwnProperty.call(value, key)) {
-        //         const property = Object.getOwnPropertyDescriptor(value, key);
-        //         if (property?.get) {
-        //             delete value[key];
-        //             value[key] = property.set
-        //                 ? linked({
-        //                       get: property.get,
-        //                       set: ({ value }) => property.set!(value),
-        //                   })
-        //                 : property.get;
-        //         }
-        //         extractFunctionOrComputed(node, key, value[key]);
-        //     }
-        // }
     }
     return value;
 }
@@ -1904,6 +1914,37 @@ function reactivateNode(node, lazyFn) {
     node.lazyFn = lazyFn;
     node.lazy = true;
 }
+function isObserved(node) {
+    var _a, _b;
+    let parent = node;
+    let hasListeners = node.numListenersRecursive > 0;
+    while (parent && !hasListeners) {
+        if (!!((_a = parent.listeners) === null || _a === void 0 ? void 0 : _a.size) || !!((_b = parent.listenersImmediate) === null || _b === void 0 ? void 0 : _b.size)) {
+            hasListeners = true;
+        }
+        parent = parent.parent;
+    }
+    return hasListeners;
+}
+function shouldIgnoreUnobserved(node, refreshFn) {
+    if (!isFlushing) {
+        const hasListeners = isObserved(node);
+        if (!hasListeners) {
+            if (refreshFn) {
+                node.dirtyFn = refreshFn;
+            }
+            let parent = node;
+            while (parent) {
+                if (!parent.dirtyChildren) {
+                    parent.dirtyChildren = new Set();
+                }
+                parent.dirtyChildren.add(node);
+                parent = parent.parent;
+            }
+            return true;
+        }
+    }
+}
 function activateNodeFunction(node, lazyFn) {
     // let prevTarget$: Observable<any>;
     // let curTarget$: Observable<any>;
@@ -1927,6 +1968,12 @@ function activateNodeFunction(node, lazyFn) {
             isFirst = false;
             setNodeValue(node, undefined);
         }
+        else if (!isFlushing && refreshFn) {
+            if (shouldIgnoreUnobserved(node, refreshFn)) {
+                ignoreThisUpdate = true;
+                return;
+            }
+        }
         // Run the function at this node
         let value = activateFn();
         let didSetToObs = false;
@@ -1934,8 +1981,6 @@ function activateNodeFunction(node, lazyFn) {
         if (isObservable(value)) {
             didSetToObs = true;
             value = setToObservable(node, value);
-            // } else {
-            //     traverseObject(value, node)
         }
         if (isFunction(value)) {
             value = value();
@@ -1981,9 +2026,9 @@ function activateNodeFunction(node, lazyFn) {
         wasPromise = wasPromise || isPromise(value);
         return value;
     }, (e) => {
+        const { value, nodes, refresh } = e;
+        refreshFn = refresh;
         if (!ignoreThisUpdate) {
-            const { value, nodes, refresh } = e;
-            refreshFn = refresh;
             if (!wasPromise || !globalState.isLoadingRemote) {
                 if (wasPromise) {
                     if (node.activationState) {
@@ -2028,8 +2073,8 @@ function activateNodeFunction(node, lazyFn) {
             }
             disposes.forEach((fn) => fn());
             disposes = [];
-            nodes === null || nodes === void 0 ? void 0 : nodes.forEach(({ node }) => {
-                disposes.push(onChange(node, markDirty, { immediate: true }));
+            nodes === null || nodes === void 0 ? void 0 : nodes.forEach(({ node, track }) => {
+                disposes.push(onChange(node, markDirty, { immediate: true, trackingType: track }));
             });
         }
         e.cancel = true;
@@ -2143,7 +2188,7 @@ function setToObservable(node, value) {
     }
     return value;
 }
-function traverseObject(obj, node) {
+function recursivelyAutoActivate(obj, node) {
     if (isObject(obj) || isArray(obj)) {
         const pathStack = []; // Maintain a stack for path tracking
         const getNodeAtPath = () => {
@@ -2157,10 +2202,10 @@ function traverseObject(obj, node) {
             }
             return childNode;
         };
-        traverseObjectInner(obj, pathStack, getNodeAtPath);
+        recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath);
     }
 }
-function traverseObjectInner(obj, pathStack, getNodeAtPath) {
+function recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath) {
     var _a;
     for (const key in obj) {
         if (hasOwnProperty.call(obj, key)) {
@@ -2182,7 +2227,7 @@ function traverseObjectInner(obj, pathStack, getNodeAtPath) {
             }
             if (typeof value === 'object') {
                 pathStack.push({ key, value });
-                traverseObjectInner(value, pathStack, getNodeAtPath); // Recursively traverse
+                recursivelyAutoActivateInner(value, pathStack, getNodeAtPath); // Recursively traverse
                 pathStack.pop();
             }
         }
@@ -2438,6 +2483,7 @@ exports.isNumber = isNumber;
 exports.isObject = isObject;
 exports.isObservable = isObservable;
 exports.isObservableValueReady = isObservableValueReady;
+exports.isObserved = isObserved;
 exports.isPrimitive = isPrimitive;
 exports.isPromise = isPromise;
 exports.isString = isString;
@@ -2454,6 +2500,7 @@ exports.setAtPath = setAtPath;
 exports.setInObservableAtPath = setInObservableAtPath;
 exports.setSilently = setSilently;
 exports.setupTracking = setupTracking;
+exports.shouldIgnoreUnobserved = shouldIgnoreUnobserved;
 exports.symbolDelete = symbolDelete;
 exports.syncState = syncState;
 exports.trackSelector = trackSelector;