muya 2.0.4 → 2.0.6

package/cjs/index.js

@@ -1 +1 @@
-"use strict";var g=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var L=Object.getOwnPropertyNames;var z=Object.prototype.hasOwnProperty;var H=(e,t)=>{for(var r in t)g(e,r,{get:t[r],enumerable:!0})},M=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of L(t))!z.call(e,o)&&o!==r&&g(e,o,{get:()=>t[o],enumerable:!(n=R(t,o))||n.enumerable});return e};var j=e=>M(g({},"__esModule",{value:!0}),e);var Y={};H(Y,{EMPTY_SELECTOR:()=>k,create:()=>U,select:()=>h,shallow:()=>q,useValue:()=>x});module.exports=j(Y);var k=e=>e;function d(e){return e instanceof Promise}function C(e){return typeof e=="function"}function V(e){return e instanceof Map}function P(e){return e instanceof Set}function O(e){return Array.isArray(e)}function p(e,t){return e===t?!0:!!Object.is(e,t)}function I(e){return typeof e=="function"}function v(e){return e instanceof T}function A(e){return e instanceof Error}function f(e){return e===void 0}var T=class extends Error{static Error="AbortError"};function N(e,t){t&&t.abort();let r=new AbortController,{signal:n}=r;return{promise:new Promise((i,s)=>{n.addEventListener("abort",()=>{s(new T)}),e.then(i).catch(s)}),controller:r}}function b(e,t=p){if(!f(e.current)){if(!f(e.previous)&&t(e.current,e.previous))return!1;e.previous=e.current}return!0}function m(e,t,r){if(!d(r))return r;e.abortController&&e.abortController.abort();let{promise:n,controller:o}=N(r,e.abortController);return e.abortController=o,n.then(i=>{e.current=i,t()}).catch(i=>{v(i)||(e.current=i,t())})}function G(){let e=new Map,t=new Set,r=performance.now(),n=!1;function o(){let s=performance.now(),a=s-r,{size:u}=t;if(a<.2&&u>0&&u<10){r=s,i();return}n||(n=!0,Promise.resolve().then(()=>{n=!1,r=performance.now(),i()}))}function i(){if(t.size===0)return;let s=new Set;for(let a of t){if(e.has(a.id)){s.add(a.id);let{onResolveItem:u}=e.get(a.id);u&&u(a.value)}t.delete(a)}if(t.size>0){o();return}for(let a of s)e.get(a)?.onFinish()}return{add(s,a){return e.set(s,a),()=>{e.delete(s)}},schedule(s,a){t.add({value:a,id:s}),o()}}}function h(e,t,r){let n={};function o(){let c=e.map(l=>l.get());return t(...c)}function i(){if(f(n.current)){let c=o();n.current=m(n,a.emitter.emit,c)}return n.current}let s=[];for(let c of e){let l=c.emitter.subscribe(()=>{S.schedule(a.id,null)});s.push(l)}let a=y({destroy(){for(let c of s)c();u(),a.emitter.clear(),n.current=void 0},get:i}),u=S.add(a.id,{onFinish(){let c=o();n.current=m(n,a.emitter.emit,c),b(n,r)&&a.emitter.emit()}});return a}var w=require("react");function x(e,t=k){let{emitter:r}=e,n=(0,w.useSyncExternalStore)(e.emitter.subscribe,()=>t(r.getSnapshot()),()=>t(r.getInitialSnapshot?r.getInitialSnapshot():r.getSnapshot()));if((0,w.useDebugValue)(n),d(n)||A(n))throw n;return n}function D(e,t){let r=new Set,n=[];return{clear:()=>{for(let o of n)o();r.clear()},subscribe:o=>(r.add(o),()=>{r.delete(o)}),emit:(...o)=>{for(let i of r)i(...o)},contains:o=>r.has(o),getSnapshot:e,getInitialSnapshot:t,getSize:()=>r.size,subscribeToOtherEmitter(o){let i=o.subscribe(()=>{this.emit()});n.push(i)}}}var _=0;function K(){return _++}function y(e){let{get:t,destroy:r,set:n}=e,o=!!n,i=function(s){return x(i,s)};return i.isSet=o,i.id=K(),i.emitter=D(t),i.destroy=r,i.listen=function(s){return this.emitter.subscribe(()=>{s(t())})},i.withName=function(s){return this.stateName=s,this},i.select=function(s,a=p){return h([i],s,a)},i.get=t,i.set=n,i}var S=G();function U(e,t=p){let r={};function n(){try{if(f(r.current)){let u=C(e)?e():e,c=m(r,s.emitter.emit,u);return r.current=c,r.current}return r.current}catch(u){r.current=u}return r.current}async function o(u,c){await u;let l=c(r.current),E=m(r,s.emitter.emit,l);r.current=E}function i(u){let c=n(),l=I(u);if(l&&d(c)){o(c,u);return}r.abortController&&r.abortController.abort();let E=l?u(c):u,F=m(r,s.emitter.emit,E);r.current=F}let s=y({get:n,destroy(){n(),a(),s.emitter.clear(),r.current=void 0},set(u){S.schedule(s.id,u)}}),a=S.add(s.id,{onFinish(){r.current=n(),b(r,t)&&s.emitter.emit()},onResolveItem:i});return C(e)||n(),s}function q(e,t){if(e==t)return!0;if(typeof e!="object"||e==null||typeof t!="object"||t==null)return!1;if(V(e)&&V(t)){if(e.size!==t.size)return!1;for(let[o,i]of e)if(!Object.is(i,t.get(o)))return!1;return!0}if(P(e)&&P(t)){if(e.size!==t.size)return!1;for(let o of e)if(!t.has(o))return!1;return!0}if(O(e)&&O(t)){if(e.length!==t.length)return!1;for(let[o,i]of e.entries())if(!Object.is(i,t[o]))return!1;return!0}let r=Object.keys(e),n=Object.keys(t);if(r.length!==n.length)return!1;for(let o of r)if(!Object.prototype.hasOwnProperty.call(t,o)||!Object.is(e[o],t[o]))return!1;return!0}
+"use strict";var P=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var L=Object.getOwnPropertyNames;var z=Object.prototype.hasOwnProperty;var H=(e,t)=>{for(var r in t)P(e,r,{get:t[r],enumerable:!0})},M=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of L(t))!z.call(e,o)&&o!==r&&P(e,o,{get:()=>t[o],enumerable:!(n=R(t,o))||n.enumerable});return e};var j=e=>M(P({},"__esModule",{value:!0}),e);var J={};H(J,{EMPTY_SELECTOR:()=>v,create:()=>U,isAbortError:()=>O,isArray:()=>x,isEqualBase:()=>p,isError:()=>A,isFunction:()=>S,isMap:()=>y,isPromise:()=>l,isSet:()=>w,isSetValueFunction:()=>I,isState:()=>_,isUndefined:()=>d,select:()=>E,shallow:()=>q,useValue:()=>C});module.exports=j(J);var T=class extends Error{static Error="AbortError"};function N(e,t){t&&t.abort();let r=new AbortController,{signal:n}=r;return{promise:new Promise((i,s)=>{n.addEventListener("abort",()=>{s(new T)}),e.then(i).catch(s)}),controller:r}}function h(e,t=p){if(!d(e.current)){if(!d(e.previous)&&t(e.current,e.previous))return!1;e.previous=e.current}return!0}function m(e,t,r){if(!l(r))return r;e.abortController&&e.abortController.abort();let{promise:n,controller:o}=N(r,e.abortController);return e.abortController=o,n.then(i=>{e.current=i,t()}).catch(i=>{O(i)||(e.current=i,t())})}function l(e){return e instanceof Promise}function S(e){return typeof e=="function"}function y(e){return e instanceof Map}function w(e){return e instanceof Set}function x(e){return Array.isArray(e)}function p(e,t){return e===t?!0:!!Object.is(e,t)}function I(e){return typeof e=="function"}function O(e){return e instanceof T}function A(e){return e instanceof Error}function d(e){return e===void 0}function _(e){return S(e)&&"get"in e&&"set"in e&&"isSet"in e&&e.isSet===!0}var v=e=>e;function G(){let e=new Map,t=new Set,r=performance.now(),n=!1;function o(){let s=performance.now(),a=s-r,{size:u}=t;if(a<.2&&u>0&&u<10){r=s,i();return}n||(n=!0,Promise.resolve().then(()=>{n=!1,r=performance.now(),i()}))}function i(){if(t.size===0)return;let s=new Set;for(let a of t){if(e.has(a.id)){s.add(a.id);let{onResolveItem:u}=e.get(a.id);u&&u(a.value)}t.delete(a)}if(t.size>0){o();return}for(let a of s)e.get(a)?.onFinish()}return{add(s,a){return e.set(s,a),()=>{e.delete(s)}},schedule(s,a){t.add({value:a,id:s}),o()}}}function E(e,t,r){let n={};function o(){let c=e.map(f=>f.get());return t(...c)}function i(){if(d(n.current)){let c=o();n.current=m(n,a.emitter.emit,c)}return n.current}let s=[];for(let c of e){let f=c.emitter.subscribe(()=>{b.schedule(a.id,null)});s.push(f)}let a=g({destroy(){for(let c of s)c();u(),a.emitter.clear(),n.current=void 0},get:i}),u=b.add(a.id,{onFinish(){let c=o();n.current=m(n,a.emitter.emit,c),h(n,r)&&a.emitter.emit()}});return a}var k=require("react");function C(e,t=v){let{emitter:r}=e,n=(0,k.useSyncExternalStore)(e.emitter.subscribe,()=>t(r.getSnapshot()),()=>t(r.getInitialSnapshot?r.getInitialSnapshot():r.getSnapshot()));if((0,k.useDebugValue)(n),l(n)||A(n))throw n;return n}function D(e,t){let r=new Set,n=[];return{clear:()=>{for(let o of n)o();r.clear()},subscribe:o=>(r.add(o),()=>{r.delete(o)}),emit:(...o)=>{for(let i of r)i(...o)},contains:o=>r.has(o),getSnapshot:e,getInitialSnapshot:t,getSize:()=>r.size,subscribeToOtherEmitter(o){let i=o.subscribe(()=>{this.emit()});n.push(i)}}}var K=0;function Y(){return K++}function g(e){let{get:t,destroy:r,set:n}=e,o=!!n,i=function(s){return C(i,s)};return i.isSet=o,i.id=Y(),i.emitter=D(t),i.destroy=r,i.listen=function(s){return this.emitter.subscribe(()=>{let a=t();l(a)||s(t())})},i.withName=function(s){return this.stateName=s,this},i.select=function(s,a=p){return E([i],s,a)},i.get=t,i.set=n,i}var b=G();function U(e,t=p){let r={};function n(){try{if(d(r.current)){let u=S(e)?e():e,c=m(r,s.emitter.emit,u);return r.current=c,r.current}return r.current}catch(u){r.current=u}return r.current}async function o(u,c){await u;let f=c(r.current),V=m(r,s.emitter.emit,f);r.current=V}function i(u){let c=n(),f=I(u);if(f&&l(c)){o(c,u);return}r.abortController&&r.abortController.abort();let V=f?u(c):u,F=m(r,s.emitter.emit,V);r.current=F}let s=g({get:n,destroy(){n(),a(),s.emitter.clear(),r.current=void 0},set(u){b.schedule(s.id,u)}}),a=b.add(s.id,{onFinish(){r.current=n(),h(r,t)&&s.emitter.emit()},onResolveItem:i});return S(e)||n(),s}function q(e,t){if(e==t)return!0;if(typeof e!="object"||e==null||typeof t!="object"||t==null)return!1;if(y(e)&&y(t)){if(e.size!==t.size)return!1;for(let[o,i]of e)if(!Object.is(i,t.get(o)))return!1;return!0}if(w(e)&&w(t)){if(e.size!==t.size)return!1;for(let o of e)if(!t.has(o))return!1;return!0}if(x(e)&&x(t)){if(e.length!==t.length)return!1;for(let[o,i]of e.entries())if(!Object.is(i,t[o]))return!1;return!0}let r=Object.keys(e),n=Object.keys(t);if(r.length!==n.length)return!1;for(let o of r)if(!Object.prototype.hasOwnProperty.call(t,o)||!Object.is(e[o],t[o]))return!1;return!0}

package/esm/create-state.js

@@ -1 +1 @@
-import{select as u}from"./select";import{useValue as l}from"./use-value";import{createEmitter as S}from"./utils/create-emitter";import{isEqualBase as c}from"./utils/is";let m=0;function d(){return m++}function G(a){const{get:r,destroy:n,set:s}=a,i=!!s,t=function(e){return l(t,e)};return t.isSet=i,t.id=d(),t.emitter=S(r),t.destroy=n,t.listen=function(e){return this.emitter.subscribe(()=>{e(r())})},t.withName=function(e){return this.stateName=e,this},t.select=function(e,o=c){return u([t],e,o)},t.get=r,t.set=s,t}export{G as createState};
+import{select as u}from"./select";import{useValue as l}from"./use-value";import{createEmitter as S}from"./utils/create-emitter";import{isEqualBase as c,isPromise as m}from"./utils/is";let d=0;function f(){return d++}function g(i){const{get:r,destroy:n,set:a}=i,o=!!a,t=function(e){return l(t,e)};return t.isSet=o,t.id=f(),t.emitter=S(r),t.destroy=n,t.listen=function(e){return this.emitter.subscribe(()=>{const s=r();m(s)||e(r())})},t.withName=function(e){return this.stateName=e,this},t.select=function(e,s=c){return u([t],e,s)},t.get=r,t.set=a,t}export{g as createState};

package/esm/index.js

@@ -1 +1 @@
-export*from"./types";import{create as t}from"./create";import{select as m}from"./select";import{useValue as x}from"./use-value";import{shallow as a}from"./utils/shallow";export{t as create,m as select,a as shallow,x as useValue};
+export*from"./utils/is";export*from"./types";import{create as f}from"./create";import{select as p}from"./select";import{useValue as l}from"./use-value";import{shallow as s}from"./utils/shallow";export{f as create,p as select,s as shallow,l as useValue};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muya",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "author": "samuel.gjabel@gmail.com",
   "repository": "https://github.com/samuelgjabel/muya",
   "main": "cjs/index.js",

package/src/__tests__/select.test.tsx

@@ -95,6 +95,33 @@ describe('select', () => {
       expect(listener).toHaveBeenCalledWith(1)
     })
   })
+  it('should handle async updates with nested selects', async () => {
+    const state = create(longPromise(100))
+    const selectedState = select([state], async (value) => {
+      await longPromise(100)
+      return (await value) + 1
+    })
+    const selectedState2 = selectedState.select(async (value) => (await value) + 1)
+    const listener = jest.fn()
+    selectedState2.listen(listener)
+    await waitFor(() => {
+      expect(selectedState2.get()).toBe(2)
+      expect(listener).toHaveBeenCalledWith(2)
+    })
+  })
+  it('should handle async updates with async state', async () => {
+    const state = create(longPromise(100))
+    const selectedState = select([state], async (value) => {
+      // await longPromise(100)
+      return (await value) + 1
+    })
+    const listener = jest.fn()
+    selectedState.listen(listener)
+    await waitFor(() => {
+      expect(selectedState.get()).toBe(1)
+      expect(listener).toHaveBeenCalledWith(1)
+    })
+  })
   it('should handle sync state updates when one of par is changed', async () => {
     const state1Atom = create(0)
     const state2Atom = create(0)
@@ -124,4 +151,22 @@ describe('select', () => {
       expect(listener).toHaveBeenCalledWith(3)
     })
   })
+  it('should select state from async initial state', async () => {
+    const state = create(longPromise(100))
+    const selectedState = state.select(async (value) => {
+      return (await value) + 2
+    })
+    await waitFor(() => {
+      expect(selectedState.get()).toBe(2)
+    })
+  })
+  it('should select state from sync initial state', async () => {
+    const state = create(0)
+    const selectedState = state.select((value) => {
+      return value + 2
+    })
+    await waitFor(() => {
+      expect(selectedState.get()).toBe(2)
+    })
+  })
 })

package/src/__tests__/use-value.test.tsx

@@ -2,6 +2,7 @@ import { renderHook, act } from '@testing-library/react-hooks'
 import { create } from '../create'
 import { useValue } from '../use-value'
 import { waitFor } from '@testing-library/react'
+import { longPromise } from './test-utils'
 
 describe('useValue', () => {
   it('should get the initial state value', () => {
@@ -75,4 +76,26 @@ describe('useValue', () => {
     await waitFor(() => {})
     expect(renders).toHaveBeenCalledTimes(2)
   })
+
+  it('should check how many times the hook re-render when the state is promise', async () => {
+    const state = create(longPromise(100))
+
+    const render = jest.fn()
+    const renderAfter = jest.fn()
+
+    const { result } = renderHook(() => {
+      render()
+      const stateResult = state()
+      renderAfter()
+      return stateResult
+    })
+
+    await waitFor(() => {
+      expect(result.current).toBe(0)
+      // when it render, it will return a promise - hit the suspense, so it should be called twice
+      expect(render).toHaveBeenCalledTimes(2)
+      // after the promise resolved, it will re-render again, this part should be called once
+      expect(renderAfter).toHaveBeenCalledTimes(1)
+    })
+  })
 })

package/src/create-state.ts

@@ -2,7 +2,7 @@ import { select } from './select'
 import type { GetState, SetValue, State } from './types'
 import { useValue } from './use-value'
 import { createEmitter } from './utils/create-emitter'
-import { isEqualBase } from './utils/is'
+import { isEqualBase, isPromise } from './utils/is'
 
 interface GetStateOptions<T> {
   readonly get: () => T
@@ -33,7 +33,11 @@ export function createState<T>(options: GetStateOptions<T>): FullState<T> {
   state.destroy = destroy
   state.listen = function (listener) {
     return this.emitter.subscribe(() => {
-      listener(get())
+      const value = get()
+      if (isPromise(value)) {
+        return
+      }
+      listener(get() as Awaited<T>)
     })
   }
   state.withName = function (name) {

package/src/index.ts

@@ -1,3 +1,4 @@
+export * from './utils/is'
 export * from './types'
 export { create } from './create'
 export { select } from './select'

package/src/types.ts

@@ -30,7 +30,7 @@ export interface GetState<T> {
   /**
    * Listen to changes in the state.
    */
-  listen: Listener<T>
+  listen: Listener<Awaited<T>>
   /**
    * Destroy / cleanup the state.
    * Clean all listeners and make cache value undefined.
@@ -48,7 +48,7 @@ export interface GetState<T> {
    * Select particular slice of the state.
    * It will create "another" state in read-only mode (without set).
    */
-  select: <S>(selector: (state: T) => S, isEqual?: IsEqual<S>) => GetState<S>
+  select: <S>(selector: (state: Awaited<T> | T) => S, isEqual?: IsEqual<S>) => GetState<S>
 }
 
 export interface State<T> extends GetState<T> {

package/types/index.d.ts

@@ -1,3 +1,4 @@
+export * from './utils/is';
 export * from './types';
 export { create } from './create';
 export { select } from './select';

package/types/types.d.ts

@@ -27,7 +27,7 @@ export interface GetState<T> {
     /**
      * Listen to changes in the state.
      */
-    listen: Listener<T>;
+    listen: Listener<Awaited<T>>;
     /**
      * Destroy / cleanup the state.
      * Clean all listeners and make cache value undefined.
@@ -45,7 +45,7 @@ export interface GetState<T> {
      * Select particular slice of the state.
      * It will create "another" state in read-only mode (without set).
      */
-    select: <S>(selector: (state: T) => S, isEqual?: IsEqual<S>) => GetState<S>;
+    select: <S>(selector: (state: Awaited<T> | T) => S, isEqual?: IsEqual<S>) => GetState<S>;
 }
 export interface State<T> extends GetState<T> {
     /**