muya 2.0.6 → 2.0.7

package/cjs/index.js

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

@@ -1 +1 @@
-import{stateScheduler as u}from"./create";import{createState as p}from"./create-state";import{subscribeToDevelopmentTools as f}from"./debug/development-tools";import{canUpdate as S,handleAsyncUpdate as s}from"./utils/common";import{isUndefined as T}from"./utils/is";function v(o,i,d){const t={};function c(){const e=o.map(r=>r.get());return i(...e)}function m(){if(T(t.current)){const e=c();t.current=s(t,n.emitter.emit,e)}return t.current}const a=[];for(const e of o){const r=e.emitter.subscribe(()=>{u.schedule(n.id,null)});a.push(r)}const n=p({destroy(){for(const e of a)e();l(),n.emitter.clear(),t.current=void 0},get:m}),l=u.add(n.id,{onFinish(){const e=c();t.current=s(t,n.emitter.emit,e),S(t,d)&&n.emitter.emit()}});return f(n),n}export{v as select};
+import{stateScheduler as m}from"./create";import{createState as w}from"./create-state";import{subscribeToDevelopmentTools as b}from"./debug/development-tools";import{AbortError as k,canUpdate as v,handleAsyncUpdate as f}from"./utils/common";import{isPromise as A,isUndefined as d}from"./utils/is";function U(c,u,p){const t={};function a(){const e=[];let r=!1;for(const s of c){const o=s.get();A(o)&&(r=!0),e.push(o)}return r?new Promise((s,o)=>{Promise.all(e).then(l=>{if(l.some(y=>d(y)))return o(new k);const h=u(...l);s(h)})}):u(...e)}function S(){if(d(t.current)){const e=a();t.current=f(t,n.emitter.emit,e)}return t.current}const i=[];for(const e of c){const r=e.emitter.subscribe(()=>{m.schedule(n.id,null)});i.push(r)}const n=w({destroy(){for(const e of i)e();T(),n.emitter.clear(),t.current=void 0},get:S}),T=m.add(n.id,{onFinish(){const e=a();t.current=f(t,n.emitter.emit,e),v(t,p)&&n.emitter.emit()}});return b(n),n}export{U as select};

package/esm/utils/common.js

@@ -1 +1 @@
-import{isAbortError as a,isEqualBase as b,isPromise as u,isUndefined as i}from"./is";class T extends Error{static Error="AbortError"}function p(r,o){o&&o.abort();const t=new AbortController,{signal:n}=t;return{promise:new Promise((e,s)=>{n.addEventListener("abort",()=>{s(new T)}),r.then(e).catch(s)}),controller:t}}function f(r,o=b){if(!i(r.current)){if(!i(r.previous)&&o(r.current,r.previous))return!1;r.previous=r.current}return!0}function m(r,o,t){if(!u(t))return t;r.abortController&&r.abortController.abort();const{promise:n,controller:l}=p(t,r.abortController);return r.abortController=l,n.then(e=>{r.current=e,o()}).catch(e=>{a(e)||(r.current=e,o())})}export{T as AbortError,f as canUpdate,m as handleAsyncUpdate};
+import{isAbortError as a,isEqualBase as b,isPromise as u,isUndefined as i}from"./is";class p extends Error{static Error="AbortError"}function T(r,o){o&&o.abort();const t=new AbortController,{signal:n}=t;return{promise:new Promise((e,s)=>{n.addEventListener("abort",()=>{s(new p)}),r.then(e).catch(s)}),controller:t}}function f(r,o=b){if(!i(r.current)){if(!i(r.previous)&&o(r.current,r.previous))return!1;r.previous=r.current}return!0}function m(r,o,t){if(!u(t))return t;r.abortController&&r.abortController.abort();const{promise:n,controller:l}=T(t,r.abortController);return r.abortController=l,n.then(e=>{r.current=e,o()}).catch(e=>{a(e)||(r.current=e,o())})}export{p as AbortError,f as canUpdate,T as cancelablePromise,m as handleAsyncUpdate};

package/package.json

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

package/src/__tests__/select.test.tsx

@@ -1,7 +1,8 @@
 import { create } from '../create'
 import { select } from '../select'
-import { waitFor } from '@testing-library/react'
+import { renderHook, waitFor } from '@testing-library/react'
 import { longPromise } from './test-utils'
+import { Suspense } from 'react'
 
 describe('select', () => {
   it('should derive state from a single dependency', async () => {
@@ -101,7 +102,7 @@ describe('select', () => {
       await longPromise(100)
       return (await value) + 1
     })
-    const selectedState2 = selectedState.select(async (value) => (await value) + 1)
+    const selectedState2 = selectedState.select(async (value) => value + 1)
     const listener = jest.fn()
     selectedState2.listen(listener)
     await waitFor(() => {
@@ -154,7 +155,7 @@ describe('select', () => {
   it('should select state from async initial state', async () => {
     const state = create(longPromise(100))
     const selectedState = state.select(async (value) => {
-      return (await value) + 2
+      return value + 2
     })
     await waitFor(() => {
       expect(selectedState.get()).toBe(2)
@@ -169,4 +170,39 @@ describe('select', () => {
       expect(selectedState.get()).toBe(2)
     })
   })
+
+  it('should select state from async state and do not change second time as it just boolean value', async () => {
+    const state = create(longPromise(100))
+    const selectedState = state.select((value) => {
+      const result = value > 0
+      expect(value).not.toBeUndefined()
+      return result
+    })
+    const render = jest.fn()
+
+    const { result } = renderHook(
+      () => {
+        render()
+        const value = selectedState()
+        return value
+      },
+      { wrapper: ({ children }) => <Suspense fallback="loading">{children}</Suspense> },
+    )
+
+    await waitFor(() => {
+      expect(result.current).toBe(false)
+      expect(selectedState.get()).toBe(false)
+      // re-render twice, as it hit suspense, because value is not resolved yet
+      expect(render).toHaveBeenCalledTimes(2)
+    })
+
+    state.set(1)
+
+    await waitFor(() => {
+      expect(result.current).toBe(true)
+      expect(selectedState.get()).toBe(true)
+      // next time it re-render only once, as value is already resolved
+      expect(render).toHaveBeenCalledTimes(3)
+    })
+  })
 })

package/src/create-state.ts

@@ -45,7 +45,7 @@ export function createState<T>(options: GetStateOptions<T>): FullState<T> {
     return this
   }
   state.select = function (selector, isSelectorEqual = isEqualBase) {
-    return select([state], selector, isSelectorEqual)
+    return select([state as never], selector, isSelectorEqual)
   }
   state.get = get
   state.set = set as State<T>['set']

package/src/select.ts

@@ -2,8 +2,8 @@ import { stateScheduler } from './create'
 import { createState } from './create-state'
 import { subscribeToDevelopmentTools } from './debug/development-tools'
 import type { Cache, GetState, IsEqual } from './types'
-import { canUpdate, handleAsyncUpdate } from './utils/common'
-import { isUndefined } from './utils/is'
+import { AbortError, canUpdate, handleAsyncUpdate } from './utils/common'
+import { isPromise, isUndefined } from './utils/is'
 
 type StateDependencies<T extends Array<unknown>> = {
   [K in keyof T]: GetState<T[K]>
@@ -21,8 +21,32 @@ export function select<T = unknown, S extends Array<unknown> = []>(
   const cache: Cache<T> = {}
 
   function computedValue(): T {
-    const values = states.map((state) => state.get()) as S
-    return selector(...values)
+    // const values = states.map((state) => state.get()) as S
+
+    const values: unknown[] = []
+    let hasPromise = false
+    for (const state of states) {
+      const value = state.get()
+      if (isPromise(value)) {
+        hasPromise = true
+      }
+      values.push(value)
+    }
+    if (hasPromise) {
+      return new Promise((resolve, reject) => {
+        Promise.all(values).then((resolvedValues) => {
+          // check if some of value is undefined
+          // eslint-disable-next-line sonarjs/no-nested-functions
+          if (resolvedValues.some((element) => isUndefined(element))) {
+            return reject(new AbortError())
+          }
+          const resolved = selector(...(resolvedValues as S))
+          resolve(resolved)
+        })
+      }) as T
+    }
+    const result = selector(...(values as S))
+    return result
   }
 
   function getValue(): T {

package/src/types.ts

@@ -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: Awaited<T> | T) => S, isEqual?: IsEqual<S>) => GetState<S>
+  select: <S>(selector: (state: Awaited<T>) => S, isEqual?: IsEqual<S>) => GetState<S>
 }
 
 export interface State<T> extends GetState<T> {

package/src/utils/common.ts

@@ -12,7 +12,7 @@ export class AbortError extends Error {
 /**
  * Cancelable promise function, return promise and controller
  */
-function cancelablePromise<T>(promise: Promise<T>, previousController?: AbortController): CancelablePromise<T> {
+export function cancelablePromise<T>(promise: Promise<T>, previousController?: AbortController): CancelablePromise<T> {
   if (previousController) {
     previousController.abort()
   }

package/types/types.d.ts

@@ -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: Awaited<T> | T) => S, isEqual?: IsEqual<S>) => GetState<S>;
+    select: <S>(selector: (state: Awaited<T>) => S, isEqual?: IsEqual<S>) => GetState<S>;
 }
 export interface State<T> extends GetState<T> {
     /**

package/types/utils/common.d.ts

@@ -6,6 +6,10 @@ export interface CancelablePromise<T> {
 export declare class AbortError extends Error {
     static readonly Error = "AbortError";
 }
+/**
+ * Cancelable promise function, return promise and controller
+ */
+export declare function cancelablePromise<T>(promise: Promise<T>, previousController?: AbortController): CancelablePromise<T>;
 /**
  * Check if the cache value is different from the previous value.
  */