@expressive/mvc 0.17.0 → 0.17.1

package/lib/index.d.ts

@@ -73,7 +73,7 @@ declare namespace Model {
     /** Including but not limited to T. */
     type Extends<T> = T | (string & Record<never, never>);
     /** Any typeof Model, using class constructor as the reference. */
-    export type Type<T extends Model = Model> = (abstract new (...args: any[]) => T) & typeof Model;
+    export type Type<T extends Model = Model> = (abstract new (...args: any[]) => T);
     /** A typeof Model, specifically one which may be created without arguments. */
     export type New<T extends Model = Model> = (new () => T) & typeof Model;
     export type Effect<T> = (this: T, argument: T) => Callback | Promise<any> | void;

package/lib/index.esm.js

@@ -1203,7 +1203,7 @@ class Register {
             const key = this.has(T);
             defineProperty(this, key, {
                 configurable: true,
-                value: this.hasOwnProperty(key) ? null : I,
+                value: this.hasOwnProperty(key) && I !== this[key] ? null : I,
                 writable
             });
             T = getPrototypeOf(T);
@@ -1241,7 +1241,8 @@ const Global$1 = new Register();
 const Oops$3 = issues({
     AlreadyExists: (name) => `Shared instance of ${name} already exists! Consider unmounting existing, or use ${name}.reset() to force-delete it.`,
     DoesNotExist: (name) => `Tried to access singleton ${name}, but none exist! Did you forget to initialize?\nCall ${name}.new() before attempting to access, or consider using ${name}.use() instead.`,
-    NotFound: (name) => `Couldn't find ${name} in context; did you forget to use a Provider?`
+    NotFound: (name) => `Couldn't find ${name} in context; did you forget to use a Provider?`,
+    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined by same Provider.`
 });
 const LookupContext = React.createContext(Global$1);
 function useLookup() {
@@ -1254,6 +1255,8 @@ function useLookup() {
 }
 function useContext(Type, required) {
     const instance = useLookup().get(Type);
+    if (instance === null)
+        throw Oops$3.MultipleExist(Type.name);
     if (!instance && required !== false)
         throw MVC.isTypeof(Type) && Type.global
             ? Oops$3.DoesNotExist(Type.name)
@@ -1547,6 +1550,7 @@ function useNewContext(include, assign) {
         entries(include).forEach(e => register(...e));
     for (const instance of init) {
         control(instance).state.forEach(value => {
+            // TODO: should this run repeatedly?
             if (Parent.get(value) === instance) {
                 context.add(value);
                 init.add(value);
@@ -1554,6 +1558,8 @@ function useNewContext(include, assign) {
         });
         for (const apply of getPending(instance))
             apply(context);
+        // TODO: add test to validate this.
+        init.delete(instance);
     }
     React.useLayoutEffect(() => () => context.pop(), []);
     return context;

package/lib/index.js

@@ -1211,7 +1211,7 @@ class Register {
             const key = this.has(T);
             defineProperty(this, key, {
                 configurable: true,
-                value: this.hasOwnProperty(key) ? null : I,
+                value: this.hasOwnProperty(key) && I !== this[key] ? null : I,
                 writable
             });
             T = getPrototypeOf(T);
@@ -1249,7 +1249,8 @@ const Global$1 = new Register();
 const Oops$3 = issues({
     AlreadyExists: (name) => `Shared instance of ${name} already exists! Consider unmounting existing, or use ${name}.reset() to force-delete it.`,
     DoesNotExist: (name) => `Tried to access singleton ${name}, but none exist! Did you forget to initialize?\nCall ${name}.new() before attempting to access, or consider using ${name}.use() instead.`,
-    NotFound: (name) => `Couldn't find ${name} in context; did you forget to use a Provider?`
+    NotFound: (name) => `Couldn't find ${name} in context; did you forget to use a Provider?`,
+    MultipleExist: (name) => `Did find ${name} in context, but multiple were defined by same Provider.`
 });
 const LookupContext = React__default["default"].createContext(Global$1);
 function useLookup() {
@@ -1262,6 +1263,8 @@ function useLookup() {
 }
 function useContext(Type, required) {
     const instance = useLookup().get(Type);
+    if (instance === null)
+        throw Oops$3.MultipleExist(Type.name);
     if (!instance && required !== false)
         throw MVC.isTypeof(Type) && Type.global
             ? Oops$3.DoesNotExist(Type.name)
@@ -1555,6 +1558,7 @@ function useNewContext(include, assign) {
         entries(include).forEach(e => register(...e));
     for (const instance of init) {
         control(instance).state.forEach(value => {
+            // TODO: should this run repeatedly?
             if (Parent.get(value) === instance) {
                 context.add(value);
                 init.add(value);
@@ -1562,6 +1566,8 @@ function useNewContext(include, assign) {
         });
         for (const apply of getPending(instance))
             apply(context);
+        // TODO: add test to validate this.
+        init.delete(instance);
     }
     React__default["default"].useLayoutEffect(() => () => context.pop(), []);
     return context;

package/package.json

@@ -49,5 +49,5 @@
     "tslib": "^2.3.0",
     "typescript": "4.6.3"
   },
-  "version": "0.17.0"
+  "version": "0.17.1"
 }