@expressive/mvc 0.11.1 → 0.12.0

package/lib/index.d.ts

@@ -484,15 +484,6 @@ declare class MVC extends Model {
     static meta<T, M extends Class>(this: M, from: (this: M, state: M) => T, expect?: boolean): T;
 }
 
-declare class Lookup {
-    private table;
-    get local(): Model[];
-    private key;
-    get(T: Model.Type): any;
-    add(input: Model.Type | Model): void;
-    push(): this;
-    pop(): void;
-}
 declare function useContext<T extends Model>(Type: Model.Type<T>, required: false): T | undefined;
 declare function useContext<T extends Model>(Type: Model.Type<T>, required?: boolean): T;
 
@@ -557,17 +548,19 @@ declare namespace Provider {
     type Instance<E> = E extends Class ? InstanceType<E> : E extends Model ? E : never;
     type NormalProps<E, I = Instance<E>> = {
         for: E;
+        fallback?: React.ReactNode;
         children?: React.ReactNode | ((instance: I) => React.ReactNode);
         and?: Model.Compat<I>;
     };
     type MultipleProps<T extends Item> = {
         for: Multiple<T>;
-        children?: React.ReactNode | (() => React.ReactNode);
+        fallback?: React.ReactNode;
+        children?: React.ReactNode;
         and?: Model.Compat<Instance<T>>;
     };
     type Props<T extends Item> = MultipleProps<T> | NormalProps<T>;
 }
-declare function Provider<T extends Provider.Item>(props: Provider.Props<T>): React.FunctionComponentElement<React.ProviderProps<Lookup>>;
+declare function Provider<T extends Provider.Item>(props: Provider.Props<T>): JSX.Element;
 
 declare class Global extends MVC {
     static global: boolean;

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, Suspense } from 'react';
 
 const { assign, create, defineProperties, defineProperty, entries, getPrototypeOf, getOwnPropertyNames, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
 function unique(array) {
@@ -770,13 +770,13 @@ function run(task) {
 const Oops$8 = issues({
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
 });
-function factoryMode(self, output, key, required) {
+function factoryMode(self, value, key, required) {
     const { subject, state } = self;
     let pending;
     let error;
-    if (output instanceof Promise) {
+    if (value instanceof Promise) {
         state.set(key, undefined);
-        pending = output
+        pending = value
             .catch(err => error = err)
             .then(val => {
             state.set(key, val);
@@ -787,7 +787,8 @@ function factoryMode(self, output, key, required) {
             self.update(key);
         });
     }
-    state.set(key, output);
+    else
+        state.set(key, value);
     const suspend = () => {
         if (required === false)
             return undefined;
@@ -1182,9 +1183,11 @@ class Lookup {
         let writable = true;
         let T;
         let I;
+        if (MVC.isTypeof(input) && input.global)
+            return input.new();
         if (typeof input == "function") {
             T = input;
-            I = input.new();
+            I = new input();
         }
         else {
             I = input;
@@ -1201,10 +1204,7 @@ class Lookup {
             });
             T = getPrototypeOf(T);
         } while (T !== Model);
-        Control.for(I).state.forEach(value => {
-            if (Parent.get(value) === I)
-                this.add(value);
-        });
+        return I;
     }
     push() {
         return create(this);
@@ -1492,11 +1492,10 @@ const Oops = issues({
 });
 function Provider(props) {
     const context = useNewContext(props.for, props.and);
-    const render = props.children;
     React.useLayoutEffect(() => () => context.pop(), []);
-    return React.createElement(LookupContext.Provider, { value: context }, typeof render == "function"
-        ? React.createElement(RenderFunction, { context, render })
-        : render);
+    return (React.createElement(LookupContext.Provider, { value: context }, props.fallback === false
+        ? props.children
+        : (React.createElement(Suspense, { fallback: props.fallback || null }, props.children))));
 }
 function useNewContext(include, assign) {
     const ambient = useLookup();
@@ -1504,36 +1503,32 @@ function useNewContext(include, assign) {
         if (!include)
             throw Oops.NoType();
         const next = ambient.push();
+        function register(T) {
+            const i = next.add(T);
+            if (assign)
+                assignWeak(i, assign);
+            Control.for(i).state.forEach(value => {
+                if (Parent.get(value) === i)
+                    next.add(value);
+            });
+        }
         if (include instanceof Model || typeof include == "function")
-            next.add(include);
+            register(include);
         else
-            values(include).forEach(x => next.add(x));
+            values(include).forEach(register);
         for (const instance of next.local)
-            if (instance) {
-                if (assign)
-                    assignWeak(instance, assign);
+            if (instance)
                 for (const apply of getPending(instance))
                     apply(next);
-            }
         return next;
     }, []);
     if (assign)
-        for (const into of context.local)
-            if (into)
-                assignWeak(into, assign);
+        context.local.forEach(i => {
+            if (i && !Parent.has(i))
+                assignWeak(i, assign);
+        });
     return context;
 }
-function RenderFunction(props) {
-    const hook = use(refresh => {
-        const targets = props.context.local;
-        if (targets.length == 1)
-            return Control.for(targets[0]).subscribe(() => refresh);
-        return {};
-    });
-    if (hook.commit)
-        React.useLayoutEffect(hook.commit, []);
-    return props.render(hook.proxy);
-}
 function assignWeak(into, from) {
     for (const K in from)
         if (K in into)

package/lib/index.js

@@ -778,13 +778,13 @@ function run(task) {
 const Oops$8 = issues({
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
 });
-function factoryMode(self, output, key, required) {
+function factoryMode(self, value, key, required) {
     const { subject, state } = self;
     let pending;
     let error;
-    if (output instanceof Promise) {
+    if (value instanceof Promise) {
         state.set(key, undefined);
-        pending = output
+        pending = value
             .catch(err => error = err)
             .then(val => {
             state.set(key, val);
@@ -795,7 +795,8 @@ function factoryMode(self, output, key, required) {
             self.update(key);
         });
     }
-    state.set(key, output);
+    else
+        state.set(key, value);
     const suspend = () => {
         if (required === false)
             return undefined;
@@ -1190,9 +1191,11 @@ class Lookup {
         let writable = true;
         let T;
         let I;
+        if (MVC.isTypeof(input) && input.global)
+            return input.new();
         if (typeof input == "function") {
             T = input;
-            I = input.new();
+            I = new input();
         }
         else {
             I = input;
@@ -1209,10 +1212,7 @@ class Lookup {
             });
             T = getPrototypeOf(T);
         } while (T !== Model);
-        Control.for(I).state.forEach(value => {
-            if (Parent.get(value) === I)
-                this.add(value);
-        });
+        return I;
     }
     push() {
         return create(this);
@@ -1500,11 +1500,10 @@ const Oops = issues({
 });
 function Provider(props) {
     const context = useNewContext(props.for, props.and);
-    const render = props.children;
     React__default["default"].useLayoutEffect(() => () => context.pop(), []);
-    return React__default["default"].createElement(LookupContext.Provider, { value: context }, typeof render == "function"
-        ? React__default["default"].createElement(RenderFunction, { context, render })
-        : render);
+    return (React__default["default"].createElement(LookupContext.Provider, { value: context }, props.fallback === false
+        ? props.children
+        : (React__default["default"].createElement(React.Suspense, { fallback: props.fallback || null }, props.children))));
 }
 function useNewContext(include, assign) {
     const ambient = useLookup();
@@ -1512,36 +1511,32 @@ function useNewContext(include, assign) {
         if (!include)
             throw Oops.NoType();
         const next = ambient.push();
+        function register(T) {
+            const i = next.add(T);
+            if (assign)
+                assignWeak(i, assign);
+            Control.for(i).state.forEach(value => {
+                if (Parent.get(value) === i)
+                    next.add(value);
+            });
+        }
         if (include instanceof Model || typeof include == "function")
-            next.add(include);
+            register(include);
         else
-            values(include).forEach(x => next.add(x));
+            values(include).forEach(register);
         for (const instance of next.local)
-            if (instance) {
-                if (assign)
-                    assignWeak(instance, assign);
+            if (instance)
                 for (const apply of getPending(instance))
                     apply(next);
-            }
         return next;
     }, []);
     if (assign)
-        for (const into of context.local)
-            if (into)
-                assignWeak(into, assign);
+        context.local.forEach(i => {
+            if (i && !Parent.has(i))
+                assignWeak(i, assign);
+        });
     return context;
 }
-function RenderFunction(props) {
-    const hook = use(refresh => {
-        const targets = props.context.local;
-        if (targets.length == 1)
-            return Control.for(targets[0]).subscribe(() => refresh);
-        return {};
-    });
-    if (hook.commit)
-        React__default["default"].useLayoutEffect(hook.commit, []);
-    return props.render(hook.proxy);
-}
 function assignWeak(into, from) {
     for (const K in from)
         if (K in into)

package/package.json

@@ -49,5 +49,5 @@
     "tslib": "^2.3.0",
     "typescript": "4.6.3"
   },
-  "version": "0.11.1"
+  "version": "0.12.0"
 }