fusee-framework 1.6.0 → 1.8.0

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
+}

package/framework/index.js

@@ -1,11 +1,12 @@
-// ─── Framework Public API ─────────────────────────────────────────────────────
-export { signal, computed, effect, batch, untrack, inspect, watch } from './core/signal.js'
-export { defineComponent, defineAsyncComponent, onMount, onUnmount, parseSlots, provide, inject, getCurrentInstance } from './core/component.js'
-export { createRouter, navigate, mountOutlet } from './router/router.js'
-export { mountTemplate } from './core/compiler.js'
-
-export { defineComposable, assertSetupContext } from './core/composable.js'
-export { defineStore, resetStore, clearStores, registerStorePlugin } from './core/store.js'
-export { directive } from './core/directives.js'
-
-export const emit = () => console.warn('[framework] emit() can only be used inside component setup()')
+// ─── Framework Public API ─────────────────────────────────────────────────────
+export { signal, computed, effect, batch, untrack, inspect, watch, onCleanup, resource, createSuspense, scheduleAsyncJob } from './core/signal.js'
+export { defineComponent, defineAsyncComponent, onMount, onUnmount, parseSlots, provide, inject, getCurrentInstance } from './core/component.js'
+export { InjectionToken, provideGlobal } from './core/di.js'
+export { createRouter, navigate, mountOutlet, currentRoute, routeParams, routeQuery, matchedRoutes } from './router/router.js'
+export { generateRoutes } from './router/file-router.js'
+export { mountTemplate } from './core/compiler.js'
+export { defineComposable, assertSetupContext } from './core/composable.js'
+export { defineStore, resetStore, clearStores, registerStorePlugin, storeToRefs, storeToState, storeToGetters, useNestedStore, MutationType } from './core/store.js'
+export { directive } from './core/directives.js'
+export { reconcile } from './core/reconcile.js'
+export const emit = () => console.warn('[framework] emit() can only be used inside component setup()')

package/framework/router/file-router.js

@@ -0,0 +1,177 @@
+import { defineAsyncComponent } from '../core/component.js';
+
+export function generateRoutes(globResults, options = {}) {
+    const entries = _parseGlobEntries(globResults, options);
+    const tree = _buildRouteTree(entries, false);
+    _sortRoutesRecursive(tree);
+    return tree;
+}
+
+function _parseGlobEntries(globResults, options) {
+    const entries = [];
+
+    for (const filePath of Object.keys(globResults)) {
+        const loader = globResults[filePath];
+
+        let cleanPath = filePath
+            .replace(/^\.?\/?app\/pages\//, '')
+            .replace(/^\.?\/?pages\//, '')
+            .replace(/\.[jt]sx?$/, '');
+
+        const parts = cleanPath.split('/');
+        const rawFileName = parts.pop();
+        const rawDirSegments = parts;
+
+        const dirSegments = rawDirSegments.map(_transformSegment);
+        const fileName = _transformSegment(rawFileName);
+
+        const isIndex = rawFileName === 'index';
+        const isCatchAll = /^\[\.\.\./.test(rawFileName);
+
+        entries.push({
+            filePath,
+            loader,
+            dirSegments,
+            fileName,
+            isIndex,
+            isCatchAll,
+            component: defineAsyncComponent({
+                loader,
+                loadingComponent: options.loadingComponent
+            })
+        });
+    }
+
+    return entries;
+}
+
+function _transformSegment(seg) {
+    return seg
+        .replace(/\[\.\.\.([^\]]+)\]/g, '*')
+        .replace(/\[([^\]]+)\]/g, ':$1');
+}
+
+function _buildRouteTree(entries, isChild) {
+    const filesHere = new Map();
+    const grouped = new Map();
+
+    for (const entry of entries) {
+        if (entry.dirSegments.length === 0) {
+            filesHere.set(entry.fileName, entry);
+        } else {
+            const firstDir = entry.dirSegments[0];
+            if (!grouped.has(firstDir)) grouped.set(firstDir, []);
+            grouped.get(firstDir).push(entry);
+        }
+    }
+
+    let rootLayoutEntry = null;
+    if (filesHere.has('_layout')) {
+        rootLayoutEntry = filesHere.get('_layout');
+        filesHere.delete('_layout');
+    }
+
+    const routes = [];
+    const usedAsLayout = new Set();
+
+    for (const [dirName, dirEntries] of grouped) {
+        const layoutEntry = filesHere.get(dirName);
+
+        if (layoutEntry) {
+            usedAsLayout.add(dirName);
+
+            const childEntries = dirEntries.map(e => ({
+                ...e,
+                dirSegments: e.dirSegments.slice(1)
+            }));
+
+            const children = _buildRouteTree(childEntries, true);
+
+            routes.push({
+                path: isChild ? dirName : '/' + dirName,
+                component: layoutEntry.component,
+                children
+            });
+        } else {
+            for (const entry of dirEntries) {
+                const segments = [...entry.dirSegments];
+                if (!entry.isIndex) segments.push(entry.fileName);
+
+                const routePath = isChild
+                    ? segments.join('/')
+                    : '/' + segments.join('/');
+
+                routes.push({
+                    path: routePath,
+                    component: entry.component
+                });
+            }
+        }
+    }
+
+    for (const [name, entry] of filesHere) {
+        if (usedAsLayout.has(name)) continue;
+
+        if (entry.isIndex) {
+            routes.push({ path: isChild ? '' : '/', component: entry.component });
+        } else if (entry.isCatchAll || name === '*') {
+            routes.push({ path: '*', component: entry.component });
+        } else {
+            routes.push({
+                path: isChild ? name : '/' + name,
+                component: entry.component
+            });
+        }
+    }
+
+    if (rootLayoutEntry) {
+        return [{
+            path: '',
+            component: rootLayoutEntry.component,
+            children: routes
+        }];
+    }
+
+    return routes;
+}
+
+function _sortRoutesRecursive(routes) {
+    routes.sort(_compareRoutes);
+    for (const route of routes) {
+        if (route.children) _sortRoutesRecursive(route.children);
+    }
+}
+
+function _getPathArray(path) {
+    return Array.isArray(path) ? path : [path];
+}
+
+function _compareRoutes(a, b) {
+    const aPaths = _getPathArray(a.path);
+    const bPaths = _getPathArray(b.path);
+    
+    const aPath = aPaths[0];
+    const bPath = bPaths[0];
+    
+    if (aPath === '*' && bPath !== '*') return 1;
+    if (aPath !== '*' && bPath === '*') return -1;
+
+    const aWild = aPath.endsWith('/*');
+    const bWild = bPath.endsWith('/*');
+    if (aWild && !bWild) return 1;
+    if (!aWild && bWild) return -1;
+
+    const aDynamic = aPath.includes(':');
+    const bDynamic = bPath.includes(':');
+    if (aDynamic && !bDynamic) return 1;
+    if (!aDynamic && bDynamic) return -1;
+
+    if (a.children && !b.children) return -1;
+    if (!a.children && b.children) return 1;
+
+    const aSegs = aPath.split('/').filter(Boolean).length;
+    const bSegs = bPath.split('/').filter(Boolean).length;
+    if (aSegs !== bSegs) return bSegs - aSegs;
+
+    return aPath.localeCompare(bPath);
+}