fusee-framework 1.7.0 → 1.9.0

package/framework/core/signal.js

@@ -1,3 +1,6 @@
+import { getInFlightStore } from './async-context.js'
+import { _registerResourceCache, getHydratedEntries } from './hydration.js'
+
 let currentEffect = null
 let currentOwner = null
 let onEffectCreated = null
@@ -28,6 +31,34 @@ export function batch(fn) {
     }
 }
 
+const asyncJobQueueHigh = []
+const asyncJobQueueLow = []
+let asyncJobFlushScheduled = false
+
+function flushAsyncJobs() {
+    asyncJobFlushScheduled = false
+
+    while (asyncJobQueueHigh.length || asyncJobQueueLow.length) {
+        const job = asyncJobQueueHigh.shift() || asyncJobQueueLow.shift()
+        try {
+            job()
+        } catch (e) {
+            console.warn('[framework] Async job error:', e)
+        }
+    }
+}
+
+export function scheduleAsyncJob(fn, opts = {}) {
+    const priority = opts.priority || 'high'
+    if (priority === 'low') asyncJobQueueLow.push(fn)
+    else asyncJobQueueHigh.push(fn)
+
+    if (!asyncJobFlushScheduled) {
+        asyncJobFlushScheduled = true
+        setTimeout(flushAsyncJobs, 0)
+    }
+}
+
 function scheduleEffect(effectFn) {
     if (batchDepth > 0) {
         pendingEffects.add(effectFn)
@@ -403,6 +434,188 @@ function hasWatchChanged(newValue, oldValue, isMultiSource, equals) {
     return !equals(newValue, oldValue)
 }
 
+export function resource(sourceOrFetcher, fetcherOrOptions, optionsObj) {
+    let source = null
+    let actualFetcher = null
+    let options = {}
+
+    if (arguments.length === 1) {
+        actualFetcher = sourceOrFetcher
+    } else if (arguments.length === 2) {
+        if (typeof fetcherOrOptions === 'function') {
+            source = sourceOrFetcher
+            actualFetcher = fetcherOrOptions
+        } else {
+            actualFetcher = sourceOrFetcher
+            options = fetcherOrOptions || {}
+        }
+    } else if (arguments.length >= 3) {
+        source = sourceOrFetcher
+        actualFetcher = fetcherOrOptions
+        options = optionsObj || {}
+    }
+
+    const data = signal(undefined)
+    const loading = signal(false)
+    const isFetching = signal(false)
+    const error = signal(undefined)
+
+    let currentPromiseId = 0
+    let currentPromise = null
+    const staleTime = typeof options.staleTime === 'number' ? options.staleTime : 0
+
+    const resourceKey = options.key !== undefined ? String(options.key) : (actualFetcher.name || 'anonymous')
+    const hydratedEntries = getHydratedEntries(resourceKey)
+    const cache = hydratedEntries ? new Map(hydratedEntries) : new Map()
+    _registerResourceCache(resourceKey, cache)
+
+    function serializeKey(input) {
+        if (input === undefined) return 'undefined'
+        if (input === null) return 'null'
+        if (typeof input === 'object') return JSON.stringify(input)
+        return String(input)
+    }
+
+    function makeScheduledPromise(runFetcher) {
+        try {
+            return Promise.resolve(runFetcher())
+        } catch (e) {
+            return Promise.reject(e)
+        }
+    }
+
+    async function load(input, force = false) {
+        const key = serializeKey(input)
+        const cached = force ? null : cache.get(key)
+        const isStale = !cached || (Date.now() - cached.updatedAt > staleTime)
+
+        if (cached) {
+            batch(() => {
+                data(cached.data)
+                error(undefined)
+                loading(false)
+            })
+            if (!isStale && !force) return
+            batch(() => { isFetching(true) })
+        } else {
+            batch(() => {
+                loading(true)
+                isFetching(true)
+                error(undefined)
+            })
+        }
+
+        const id = ++currentPromiseId
+
+        batch(() => {
+            isFetching(true)
+        })
+
+        let promise
+
+        const { byKey, byFetcher } = getInFlightStore()
+
+        if (options.key !== undefined) {
+            const dedupeKey = `key_${options.key}_${key}`
+            promise = byKey.get(dedupeKey)
+            if (!promise) {
+                promise = makeScheduledPromise(() => actualFetcher(input))
+                byKey.set(dedupeKey, promise)
+                promise.finally(() => {
+                    if (byKey.get(dedupeKey) === promise) {
+                        byKey.delete(dedupeKey)
+                    }
+                }).catch(() => {})
+            }
+        } else {
+            let inFlightMap = byFetcher.get(actualFetcher)
+            if (!inFlightMap) {
+                inFlightMap = new Map()
+                byFetcher.set(actualFetcher, inFlightMap)
+            }
+            promise = inFlightMap.get(key)
+            if (!promise) {
+                promise = makeScheduledPromise(() => actualFetcher(input))
+                inFlightMap.set(key, promise)
+                promise.finally(() => {
+                    if (inFlightMap.get(key) === promise) {
+                        inFlightMap.delete(key)
+                    }
+                }).catch(() => {})
+            }
+        }
+
+        currentPromise = promise
+
+        try {
+            const result = await promise
+
+            if (id !== currentPromiseId) return
+
+            cache.set(key, { data: result, updatedAt: Date.now() })
+
+            batch(() => {
+                data(result)
+                loading(false)
+                isFetching(false)
+            })
+
+            currentPromise = null
+        } catch (err) {
+            if (id !== currentPromiseId) return
+
+            batch(() => {
+                error(err)
+                loading(false)
+                isFetching(false)
+            })
+
+            currentPromise = null
+        }
+    }
+
+    if (source) {
+        effect(() => {
+            const input = typeof source === 'function' ? source() : source
+            if (input !== null && input !== false && input !== undefined) {
+                load(input)
+            }
+        })
+    } else {
+        load()
+    }
+
+    const accessor = () => data()
+    accessor.isSignal = true
+    accessor.loading = loading
+    accessor.isFetching = isFetching
+    accessor.error = error
+    accessor.read = () => {
+        if (loading() && currentPromise) {
+            throw currentPromise
+        }
+        const err = error()
+        if (err !== undefined) {
+            throw err
+        }
+        return data()
+    }
+
+    const mutate = (val) => {
+        const input = source ? (typeof source === 'function' ? source() : source) : undefined
+        const key = serializeKey(input)
+        cache.set(key, { data: val, updatedAt: Date.now() })
+        data(val)
+    }
+
+    const refetch = () => {
+        const input = source ? (typeof source === 'function' ? source() : source) : undefined
+        load(input, true)
+    }
+
+    return [accessor, { mutate, refetch }]
+}
+
 function runWatchCleanup(cleanupRef) {
     if (typeof cleanupRef.fn === 'function') {
         const fn = cleanupRef.fn
@@ -410,3 +623,59 @@ function runWatchCleanup(cleanupRef) {
         untrack(() => fn())
     }
 }
+
+export function createSuspense(renderFn, fallbackFn, options = {}) {
+    const out = signal(undefined)
+    const pending = signal(false)
+    const errSig = signal(undefined)
+
+    const retryTick = signal(0)
+    let token = 0
+
+    const dispose = effect(() => {
+        retryTick()
+        const myToken = ++token
+        let canceled = false
+        onCleanup(() => { canceled = true })
+
+        try {
+            pending(false)
+            errSig(undefined)
+            const v = renderFn()
+            out(v)
+        } catch (e) {
+            if (e instanceof Promise) {
+                pending(true)
+                errSig(undefined)
+                out(typeof fallbackFn === 'function' ? fallbackFn() : fallbackFn)
+
+                e.then(
+                    () => {
+                        if (canceled) return
+                        if (myToken !== token) return
+                        retryTick(retryTick() + 1)
+                    },
+                    (err) => {
+                        if (canceled) return
+                        if (myToken !== token) return
+                        errSig(err)
+                        pending(false)
+                        if (options.onError) options.onError(err)
+                        retryTick(retryTick() + 1)
+                    }
+                )
+
+                return
+            }
+
+            errSig(e)
+            pending(false)
+            if (options.onError) options.onError(e)
+        }
+    })
+
+    out.pending = pending
+    out.error = errSig
+
+    return [out, dispose]
+}

package/framework/core/store.js

@@ -1,81 +1,322 @@
-import { getCurrentInstance, setCurrentInstance } from './component.js'
-
-const storesRegistry = new Map()
-const storePlugins = []
-
-export function registerStorePlugin(plugin) {
-    if (typeof plugin === 'function') {
-        storePlugins.push(plugin)
-    }
-}
-
-const isDev = typeof import.meta.env !== 'undefined' ? !!import.meta.env.DEV : true
-if (isDev && typeof window !== 'undefined') {
-    window.__FRAMEWORK_STORES__ = storesRegistry
-}
-
-export function defineStore(id, setup) {
-    if (typeof id !== 'string' || !id.trim()) {
-        console.error('[framework] defineStore requires a valid string ID.')
-    }
-
-    function useStore() {
-        let store = storesRegistry.get(id)
-
-        if (!store) {
-            const prevInstance = getCurrentInstance()
-
-            setCurrentInstance(null)
-
-            try {
-                store = setup()
-
-                if (store instanceof Promise) {
-                    console.error(`[framework] Store "${id}" cannot be async.`)
-                    throw new Error(`Async store "${id}" is not supported.`)
-                }
-
-            } catch (err) {
-                console.error(`[framework] Error initializing store "${id}":`, err)
-                throw err
-            } finally {
-                setCurrentInstance(prevInstance)
-            }
-
-            Object.defineProperties(store, {
-                $id: {
-                    value: id,
-                    enumerable: false
-                },
-                $type: {
-                    value: 'store',
-                    enumerable: false
-                }
-            })
-
-            for (const plugin of storePlugins) {
-                try {
-                    plugin(store, id)
-                } catch (e) {
-                    console.warn(`[framework] Store plugin error for "${id}":`, e)
-                }
-            }
-
-            storesRegistry.set(id, store)
-        }
-
-        return store
-    }
-
-    useStore.$id = id
-
-    return useStore
-}
-
-export function resetStore(id) {
-    storesRegistry.delete(id)
-}
-
-export function clearStores() {
-    storesRegistry.clear()
-}
+import { getCurrentInstance, setCurrentInstance } from './component.js'
+import { batch, effect } from './signal.js'
+
+
+const storesRegistry = new Map()
+const storePlugins = []
+const initializationStack = new Set()
+
+export const MutationType = {
+    DIRECT: 'direct',
+    PATCH_OBJECT: 'patch object',
+    PATCH_FUNCTION: 'patch function'
+}
+
+export function registerStorePlugin(plugin) {
+    if (typeof plugin === 'function') {
+        storePlugins.push(plugin)
+    }
+}
+
+export function useNestedStore(useStoreFn) {
+    if (typeof useStoreFn !== 'function' || !useStoreFn.$id) {
+        console.error('[framework] useNestedStore requires a valid store hook (defineStore result)')
+        throw new Error('Invalid store hook provided to useNestedStore')
+    }
+
+    const targetId = useStoreFn.$id
+
+    if (initializationStack.has(targetId)) {
+        const chain = Array.from(initializationStack).concat(targetId).join(' -> ')
+        console.error(`[framework] Circular dependency detected: ${chain}`)
+        throw new Error(`Circular store dependency detected: ${chain}`)
+    }
+
+    return useStoreFn()
+}
+
+const isDev = typeof import.meta.env !== 'undefined' ? !!import.meta.env.DEV : true
+if (isDev && typeof window !== 'undefined') {
+    window.__FRAMEWORK_STORES__ = storesRegistry
+}
+
+export function defineStore(id, setup) {
+    if (typeof id !== 'string' || !id.trim()) {
+        console.error('[framework] defineStore requires a valid string ID.')
+    }
+
+    function useStore() {
+        let store = storesRegistry.get(id)
+
+        if (!store) {
+            const prevInstance = getCurrentInstance()
+
+            setCurrentInstance(null)
+            initializationStack.add(id)
+
+            try {
+                store = setup()
+
+                if (store instanceof Promise) {
+                    console.error(`[framework] Store "${id}" cannot be async.`)
+                    throw new Error(`Async store "${id}" is not supported.`)
+                }
+
+            } catch (err) {
+                console.error(`[framework] Error initializing store "${id}":`, err)
+                throw err
+            } finally {
+                initializationStack.delete(id)
+                setCurrentInstance(prevInstance)
+            }
+
+            const initialState = {}
+            const signalKeys = []
+            const getterKeys = []
+            for (const key in store) {
+                if (typeof store[key] === 'function' && store[key].isSignal) {
+                    if (store[key].readonly) {
+                        getterKeys.push(key)
+                    } else {
+                        initialState[key] = store[key]()
+                        signalKeys.push(key)
+                    }
+                }
+            }
+
+            // Subscription management
+            const subscriptions = new Map()
+            let subscriptionId = 0
+            let currentMutation = null
+
+            function notifySubscribers() {
+                if (!currentMutation) return
+                const mutation = currentMutation
+                currentMutation = null
+
+                const state = {}
+                for (const key of signalKeys) {
+                    state[key] = store[key]()
+                }
+
+                for (const [subId, sub] of subscriptions) {
+                    if (sub.flush === 'sync') {
+                        sub.callback(mutation, state)
+                    } else {
+                        // Default: post (after all batched updates)
+                        queueMicrotask(() => {
+                            if (subscriptions.has(subId)) {
+                                sub.callback(mutation, state)
+                            }
+                        })
+                    }
+                }
+            }
+
+            function wrapSignal(key, originalSignal) {
+                const wrapped = function(newValue) {
+                    if (arguments.length === 0) {
+                        return originalSignal()
+                    } else {
+                        const result = originalSignal(newValue)
+                        if (!currentMutation) {
+                            currentMutation = {
+                                type: MutationType.DIRECT,
+                                storeId: id,
+                                payload: { [key]: newValue }
+                            }
+                            notifySubscribers()
+                        }
+                        return result
+                    }
+                }
+                wrapped.isSignal = true
+                for (const method of ['map', 'filter', 'slice', 'concat', 'flat', 'flatMap',
+                                      'find', 'findLast', 'findIndex', 'findLastIndex',
+                                      'indexOf', 'lastIndexOf', 'includes', 'every', 'some',
+                                      'reduce', 'at', 'join', 'push', 'pop', 'shift', 'unshift',
+                                      'splice', 'remove', 'clear', 'sort', 'reverse']) {
+                    if (originalSignal[method]) {
+                        wrapped[method] = originalSignal[method]
+                    }
+                }
+                return wrapped
+            }
+
+            function wrapGetter(key, originalGetter) {
+                const wrapped = function(newValue) {
+                    if (arguments.length === 0) {
+                        return originalGetter()
+                    } else {
+                        console.warn(`[framework] Getter "${key}" is read-only`)
+                        return originalGetter()
+                    }
+                }
+                wrapped.isSignal = true
+                wrapped.readonly = true
+                for (const method of ['map', 'filter', 'slice', 'concat', 'flat', 'flatMap',
+                                      'find', 'findLast', 'findIndex', 'findLastIndex',
+                                      'indexOf', 'lastIndexOf', 'includes', 'every', 'some',
+                                      'reduce', 'at', 'join']) {
+                    if (originalGetter[method]) {
+                        wrapped[method] = originalGetter[method]
+                    }
+                }
+                return wrapped
+            }
+
+            const wrappedSignals = {}
+            for (const key of signalKeys) {
+                wrappedSignals[key] = wrapSignal(key, store[key])
+                store[key] = wrappedSignals[key]
+            }
+
+            for (const key of getterKeys) {
+                store[key] = wrapGetter(key, store[key])
+            }
+
+            Object.defineProperties(store, {
+                id: {
+                    value: id,
+                    enumerable: false
+                },
+                type: {
+                    value: 'store',
+                    enumerable: false
+                },
+                patch: {
+                    value: (arg) => {
+                        const isObjectPatch = arg && typeof arg === 'object'
+                        currentMutation = {
+                            type: isObjectPatch ? MutationType.PATCH_OBJECT : MutationType.PATCH_FUNCTION,
+                            storeId: id,
+                            payload: isObjectPatch ? { ...arg } : undefined
+                        }
+
+                        batch(() => {
+                            if (typeof arg === 'function') {
+                                arg(store)
+                            } else if (isObjectPatch) {
+                                for (const key in arg) {
+                                    if (typeof store[key] === 'function' && store[key].isSignal && !store[key].readonly) {
+                                        const originalSignal = wrappedSignals[key]
+                                        originalSignal(arg[key])
+                                    }
+                                }
+                            }
+                        })
+
+                        notifySubscribers()
+                    },
+                    enumerable: false
+                },
+                reset: {
+                    value: () => {
+                        currentMutation = {
+                            type: MutationType.PATCH_FUNCTION,
+                            storeId: id,
+                            payload: undefined
+                        }
+
+                        batch(() => {
+                            for (const key in initialState) {
+                                const originalSignal = wrappedSignals[key]
+                                originalSignal(initialState[key])
+                            }
+                        })
+
+                        notifySubscribers()
+                    },
+                    enumerable: false
+                },
+                subscribe: {
+                    value: (callback, options = {}) => {
+                        if (typeof callback !== 'function') {
+                            console.warn('[framework] subscribe callback must be a function')
+                            return () => {}
+                        }
+
+                        const subId = ++subscriptionId
+                        const sub = {
+                            callback,
+                            flush: options.flush || 'post',
+                            detached: options.detached || false
+                        }
+                        subscriptions.set(subId, sub)
+
+                        if (!sub.detached) {
+                            const instance = getCurrentInstance()
+                            if (instance && instance._unmountHooks) {
+                                instance._unmountHooks.push(() => {
+                                    subscriptions.delete(subId)
+                                })
+                            }
+                        }
+
+                        return () => {
+                            subscriptions.delete(subId)
+                        }
+                    },
+                    enumerable: false
+                }
+            })
+
+            for (const plugin of storePlugins) {
+                try {
+                    plugin(store, id)
+                } catch (e) {
+                    console.warn(`[framework] Store plugin error for "${id}":`, e)
+                }
+            }
+
+            storesRegistry.set(id, store)
+        }
+
+        return store
+    }
+
+    useStore.$id = id
+
+    return useStore
+}
+
+export function resetStore(id) {
+    storesRegistry.delete(id)
+}
+
+export function clearStores() {
+    storesRegistry.clear()
+}
+
+export function storeToRefs(store) {
+    const refs = {}
+    for (const key in store) {
+        const value = store[key]
+        if (typeof value === 'function' && value.isSignal) {
+            refs[key] = value
+        }
+    }
+    return refs
+}
+
+export function storeToState(store) {
+    const state = {}
+    for (const key in store) {
+        const value = store[key]
+        if (typeof value === 'function' && value.isSignal && !value.readonly) {
+            state[key] = value
+        }
+    }
+    return state
+}
+
+export function storeToGetters(store) {
+    const getters = {}
+    for (const key in store) {
+        const value = store[key]
+        if (typeof value === 'function' && value.isSignal && value.readonly) {
+            getters[key] = value
+        }
+    }
+    return getters
+}