@expressive/mvc 0.7.1 → 0.7.2

package/lib/index.d.ts

@@ -506,16 +506,13 @@ declare namespace Consumer {
 }
 declare function Consumer<T extends Class>(props: Consumer.Props<T>): any;
 
-declare type Collection = Array<Model | typeof Model> | {
-    [anything: string]: Model | typeof Model;
-};
 declare class Lookup {
     private table;
     get local(): Model[];
     private key;
     get(T: typeof Model): any;
-    push(I: Model | typeof Model | Collection): this;
-    register(I: Model | typeof Model): Model;
+    push(): this;
+    inject(T: typeof Model, I: Model, writable?: boolean): void;
     pop(): void;
 }
 

package/lib/index.esm.js

@@ -922,12 +922,15 @@ function createProxy(emit, watch) {
         assign(proxy, {
             from,
             delete(key) {
+                // TODO: this commit's fix needs tests.
+                // Was not cause by coverage.
+                const out = from.delete(key);
                 emit(key);
-                return from.delete(key);
+                return out;
             },
             clear() {
-                emit(ANY);
                 from.clear();
+                emit(ANY);
             },
             has(key) {
                 watch(this, key);
@@ -1107,26 +1110,10 @@ class Lookup {
     get(T) {
         return this[this.key(T)];
     }
-    push(I) {
-        const next = create(this);
-        if (I instanceof Model || typeof I == "function")
-            next.register(I);
-        else
-            for (const i of values(I))
-                next.register(i);
-        return next;
+    push() {
+        return create(this);
     }
-    register(I) {
-        let writable = true;
-        let T;
-        if (I instanceof Model) {
-            T = I.constructor;
-            writable = false;
-        }
-        else {
-            T = I;
-            I = I.create();
-        }
+    inject(T, I, writable) {
         do {
             const key = this.key(T);
             const conflict = this.hasOwnProperty(key);
@@ -1137,7 +1124,6 @@ class Lookup {
             });
             T = getPrototypeOf(T);
         } while (T !== Model);
-        return I;
     }
     pop() {
         for (const key of getOwnPropertySymbols(this)) {
@@ -1420,7 +1406,28 @@ const Oops$1 = issues({
 function Provider(props) {
     if ("of" in props)
         throw Oops$1.PropDeprecated();
-    const context = useNewContext(props.for);
+    const from = useLookup();
+    const context = React.useMemo(() => {
+        const I = props.for;
+        if (!I)
+            throw Oops$1.NoType();
+        const layer = from.push();
+        function register(I) {
+            if (I instanceof Model)
+                layer.inject(I.constructor, I, false);
+            else
+                layer.inject(I, I.create(), true);
+        }
+        if (I instanceof Model || typeof I == "function")
+            register(I);
+        else
+            values(I).forEach(register);
+        for (const instance of layer.local)
+            if (instance)
+                for (const apply of getPending(instance))
+                    apply(layer);
+        return layer;
+    }, []);
     const render = props.children;
     useAppliedProps(context, props);
     React.useLayoutEffect(() => () => context.pop(), []);
@@ -1428,19 +1435,6 @@ function Provider(props) {
         ? React.createElement(RenderFunction, { context, render })
         : render);
 }
-function useNewContext(inject) {
-    const from = useLookup();
-    return React.useMemo(() => {
-        if (!inject)
-            throw Oops$1.NoType();
-        const context = from.push(inject);
-        for (const instance of context.local)
-            if (instance)
-                for (const apply of getPending(instance))
-                    apply(context);
-        return context;
-    }, []);
-}
 function useAppliedProps(within, props) {
     const update = React.useMemo(() => {
         const targets = within.local;