@expressive/mvc 0.31.0 → 0.33.0

package/lib/index.d.ts

@@ -342,7 +342,7 @@ declare class Control<T extends {} = any> {
     static use: Control.UseHook;
     static has: Control.GetContext;
     static for: typeof control;
-    static does: typeof does;
+    static apply: typeof apply;
     static watch: typeof watch;
     id: string | number | false;
     subject: T;
@@ -367,7 +367,7 @@ type Focus<T extends {}> = T & {
     is: T;
 };
 declare function watch<T extends {}>(value: T, cb: Observer): Focus<T>;
-declare function does<T = any>(instruction: Control.Instruction<T>): T;
+declare function apply<T = any>(instruction: Control.Instruction<T>): T;
 
 declare const STATE = "__state";
 declare const UPDATE = "__update";

package/lib/index.esm.js

@@ -42,7 +42,7 @@ function issues(register) {
 
 const { assign, create, defineProperties, defineProperty, entries, keys, getPrototypeOf, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
 
-const Oops$7 = issues({
+const Oops$8 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
 });
 function get$1(argument) {
@@ -57,7 +57,7 @@ function get$1(argument) {
                     ? Control.watch(got, k => k ? onUpdate : undefined)
                     : got;
             else if (argument !== false)
-                throw Oops$7.NotFound(this);
+                throw Oops$8.NotFound(this);
             return {
                 mount() {
                     onUpdate = refresh;
@@ -73,7 +73,7 @@ function get$1(argument) {
         let proxy;
         const found = context.get(this);
         if (!found)
-            throw Oops$7.NotFound(this);
+            throw Oops$8.NotFound(this);
         function forceUpdate(action) {
             if (typeof action == "function")
                 action = action();
@@ -172,12 +172,12 @@ function use$1(apply, repeat) {
     return render(apply);
 }
 
-const Oops$6 = issues({
+const Oops$7 = issues({
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
     Destoryed: () => "Model is destroyed."
 });
 function suspense(source, key) {
-    const error = Oops$6.NotReady(source.subject, key);
+    const error = Oops$7.NotReady(source.subject, key);
     const watch = source.observers.get(key);
     const promise = new Promise((resolve, reject) => {
         function onUpdate(key) {
@@ -189,7 +189,7 @@ function suspense(source, key) {
                     }
                 };
             if (key === null)
-                reject(Oops$6.Destoryed());
+                reject(Oops$7.Destoryed());
         }
         watch.add(onUpdate);
     });
@@ -221,7 +221,7 @@ function mayRetry(fn) {
     return compute();
 }
 
-const Oops$5 = issues({
+const Oops$6 = issues({
     BadCallback: () => `Callback for effect-callback may only return a function.`
 });
 function createEffect(source, callback) {
@@ -239,7 +239,7 @@ function createEffect(source, callback) {
                 if (unSet instanceof Promise)
                     unSet = undefined;
                 if (unSet && typeof unSet !== "function")
-                    throw Oops$5.BadCallback();
+                    throw Oops$6.BadCallback();
             });
             if (output instanceof Promise) {
                 output.finally(() => busy = false);
@@ -269,7 +269,7 @@ function createValueEffect(callback, ignoreNull) {
         if (typeof out == "function")
             unSet = out;
         else
-            throw Oops$5.BadCallback();
+            throw Oops$6.BadCallback();
     };
 }
 
@@ -425,7 +425,7 @@ function uid() {
     return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
-const Oops$4 = issues({
+const Oops$5 = issues({
     BadAssignment: (parent, expected, got) => `${parent} expected Model of type ${expected} but got ${got}.`,
 });
 const REGISTER = new WeakMap();
@@ -540,7 +540,7 @@ Control.after = new Set();
 Control.before = new Set();
 Control.pending = new Set();
 Control.for = control;
-Control.does = does;
+Control.apply = apply;
 Control.watch = watch;
 function control(subject, ready) {
     const control = REGISTER.get(subject);
@@ -553,9 +553,9 @@ function control(subject, ready) {
         return () => done && done();
     }
     if (pending && ready) {
-        PENDING$1.delete(control);
         for (const key in control.subject)
             control.add(key);
+        PENDING$1.delete(control);
         pending.forEach(cb => cb(control));
     }
     return control;
@@ -586,7 +586,7 @@ function setRecursive(on, key, value) {
             control(next, true);
             return true;
         }
-        throw Oops$4.BadAssignment(`${on.subject}.${key}`, value.constructor, next);
+        throw Oops$5.BadAssignment(`${on.subject}.${key}`, value.constructor, next);
     };
     on.watch(key, { set });
     set(value);
@@ -605,7 +605,7 @@ function watch(value, cb) {
     OBSERVER.set(value, cb);
     return value;
 }
-function does(instruction) {
+function apply(instruction) {
     const placeholder = Symbol("instruction");
     INSTRUCT.set(placeholder, (onto, key) => {
         delete onto.subject[key];
@@ -616,15 +616,15 @@ function does(instruction) {
     return placeholder;
 }
 
-const Oops$3 = issues({
+const Oops$4 = issues({
     DuplicatePending: (key) => `Invoked action ${key} but one is already active.`
 });
 function run(task) {
-    return does((key, control) => {
+    return apply((key, control) => {
         let pending = false;
         const invoke = (...args) => __awaiter(this, void 0, void 0, function* () {
             if (pending)
-                return Promise.reject(Oops$3.DuplicatePending(key));
+                return Promise.reject(Oops$4.DuplicatePending(key));
             pending = true;
             control.update(key);
             try {
@@ -646,7 +646,7 @@ function run(task) {
     });
 }
 
-const Oops$2 = issues({
+const Oops$3 = issues({
     PeerNotAllowed: (model, property) => `Attempted to use an instruction result (probably use or get) as computed source for ${model}.${property}. This is not allowed.`,
     Failed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} ${parent}.${property}.`,
     Required: (expects, child) => `New ${child} created standalone but requires parent of type ${expects}.`,
@@ -654,10 +654,10 @@ const Oops$2 = issues({
     AmbientRequired: (requested, requester) => `Attempted to find an instance of ${requested} in context. It is required by ${requester}, but one could not be found.`
 });
 function get(arg0, arg1) {
-    return does((key, control) => {
+    return apply((key, control) => {
         let { subject } = control;
         if (typeof arg0 == "symbol")
-            throw Oops$2.PeerNotAllowed(subject, key);
+            throw Oops$3.PeerNotAllowed(subject, key);
         let source = cb => cb(subject);
         if (arg0 instanceof Model)
             subject = arg0;
@@ -665,7 +665,7 @@ function get(arg0, arg1) {
             const hasParent = parent(subject);
             if (!hasParent) {
                 if (arg1 === true)
-                    throw Oops$2.Required(arg0, subject);
+                    throw Oops$3.Required(arg0, subject);
                 const fetch = Control.has(subject);
                 source = got => {
                     fetch(context => {
@@ -673,14 +673,14 @@ function get(arg0, arg1) {
                         if (model)
                             got(model);
                         else if (arg1 !== false)
-                            throw Oops$2.AmbientRequired(arg0, subject);
+                            throw Oops$3.AmbientRequired(arg0, subject);
                     });
                 };
             }
             else if (!arg0 || hasParent instanceof arg0)
                 subject = hasParent;
             else
-                throw Oops$2.Unexpected(arg0, subject, hasParent);
+                throw Oops$3.Unexpected(arg0, subject, hasParent);
         }
         else if (typeof arg0 == "function")
             arg1 = arg0.call(subject, key, subject);
@@ -723,7 +723,7 @@ function computed(parent, key, source, setter) {
             next = setter.call(proxy, proxy);
         }
         catch (err) {
-            Oops$2.Failed(parent.subject, key, initial).warn();
+            Oops$3.Failed(parent.subject, key, initial).warn();
             if (initial)
                 throw err;
             console.error(err);
@@ -779,11 +779,18 @@ function flushComputed() {
 }
 Control.before.add(flushComputed);
 
+const Oops$2 = issues({
+    BadRefObject: () => `ref instruction does not support object which is not 'this'`
+});
 function ref(arg, arg2) {
-    return does((key, source) => {
+    return apply((key, source) => {
         let value = {};
-        if (typeof arg == "object")
-            for (const key in control(arg, true).state)
+        if (typeof arg != "object")
+            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
+        else if (arg !== source.subject)
+            throw Oops$2.BadRefObject();
+        else
+            for (const key in source.state)
                 defineProperty(value, key, typeof arg2 == "function" ? {
                     configurable: true,
                     get() {
@@ -794,8 +801,6 @@ function ref(arg, arg2) {
                 } : {
                     value: createRef(source, key)
                 });
-        else
-            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
         source.state[key] = undefined;
         source.observers.set(key, new Set());
         defineProperty(source.subject, key, { value });
@@ -815,7 +820,7 @@ const Oops$1 = issues({
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
 });
 function set(value, argument) {
-    return does((key, control) => {
+    return apply((key, control) => {
         const { state, subject } = control;
         if (typeof value == "function" || value instanceof Promise) {
             const output = {};
@@ -885,7 +890,7 @@ function set(value, argument) {
 }
 
 function use(input, argument) {
-    return does((key, source) => {
+    return apply((key, source) => {
         const { state, subject } = source;
         if (typeof input === "function")
             input = new input();

package/lib/index.js

@@ -46,7 +46,7 @@ function issues(register) {
 
 const { assign, create, defineProperties, defineProperty, entries, keys, getPrototypeOf, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
 
-const Oops$7 = issues({
+const Oops$8 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
 });
 function get$1(argument) {
@@ -61,7 +61,7 @@ function get$1(argument) {
                     ? Control.watch(got, k => k ? onUpdate : undefined)
                     : got;
             else if (argument !== false)
-                throw Oops$7.NotFound(this);
+                throw Oops$8.NotFound(this);
             return {
                 mount() {
                     onUpdate = refresh;
@@ -77,7 +77,7 @@ function get$1(argument) {
         let proxy;
         const found = context.get(this);
         if (!found)
-            throw Oops$7.NotFound(this);
+            throw Oops$8.NotFound(this);
         function forceUpdate(action) {
             if (typeof action == "function")
                 action = action();
@@ -176,12 +176,12 @@ function use$1(apply, repeat) {
     return render(apply);
 }
 
-const Oops$6 = issues({
+const Oops$7 = issues({
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
     Destoryed: () => "Model is destroyed."
 });
 function suspense(source, key) {
-    const error = Oops$6.NotReady(source.subject, key);
+    const error = Oops$7.NotReady(source.subject, key);
     const watch = source.observers.get(key);
     const promise = new Promise((resolve, reject) => {
         function onUpdate(key) {
@@ -193,7 +193,7 @@ function suspense(source, key) {
                     }
                 };
             if (key === null)
-                reject(Oops$6.Destoryed());
+                reject(Oops$7.Destoryed());
         }
         watch.add(onUpdate);
     });
@@ -225,7 +225,7 @@ function mayRetry(fn) {
     return compute();
 }
 
-const Oops$5 = issues({
+const Oops$6 = issues({
     BadCallback: () => `Callback for effect-callback may only return a function.`
 });
 function createEffect(source, callback) {
@@ -243,7 +243,7 @@ function createEffect(source, callback) {
                 if (unSet instanceof Promise)
                     unSet = undefined;
                 if (unSet && typeof unSet !== "function")
-                    throw Oops$5.BadCallback();
+                    throw Oops$6.BadCallback();
             });
             if (output instanceof Promise) {
                 output.finally(() => busy = false);
@@ -273,7 +273,7 @@ function createValueEffect(callback, ignoreNull) {
         if (typeof out == "function")
             unSet = out;
         else
-            throw Oops$5.BadCallback();
+            throw Oops$6.BadCallback();
     };
 }
 
@@ -429,7 +429,7 @@ function uid() {
     return (Math.random() * 0.722 + 0.278).toString(36).substring(2, 8).toUpperCase();
 }
 
-const Oops$4 = issues({
+const Oops$5 = issues({
     BadAssignment: (parent, expected, got) => `${parent} expected Model of type ${expected} but got ${got}.`,
 });
 const REGISTER = new WeakMap();
@@ -544,7 +544,7 @@ Control.after = new Set();
 Control.before = new Set();
 Control.pending = new Set();
 Control.for = control;
-Control.does = does;
+Control.apply = apply;
 Control.watch = watch;
 function control(subject, ready) {
     const control = REGISTER.get(subject);
@@ -557,9 +557,9 @@ function control(subject, ready) {
         return () => done && done();
     }
     if (pending && ready) {
-        PENDING$1.delete(control);
         for (const key in control.subject)
             control.add(key);
+        PENDING$1.delete(control);
         pending.forEach(cb => cb(control));
     }
     return control;
@@ -590,7 +590,7 @@ function setRecursive(on, key, value) {
             control(next, true);
             return true;
         }
-        throw Oops$4.BadAssignment(`${on.subject}.${key}`, value.constructor, next);
+        throw Oops$5.BadAssignment(`${on.subject}.${key}`, value.constructor, next);
     };
     on.watch(key, { set });
     set(value);
@@ -609,7 +609,7 @@ function watch(value, cb) {
     OBSERVER.set(value, cb);
     return value;
 }
-function does(instruction) {
+function apply(instruction) {
     const placeholder = Symbol("instruction");
     INSTRUCT.set(placeholder, (onto, key) => {
         delete onto.subject[key];
@@ -620,15 +620,15 @@ function does(instruction) {
     return placeholder;
 }
 
-const Oops$3 = issues({
+const Oops$4 = issues({
     DuplicatePending: (key) => `Invoked action ${key} but one is already active.`
 });
 function run(task) {
-    return does((key, control) => {
+    return apply((key, control) => {
         let pending = false;
         const invoke = (...args) => __awaiter(this, void 0, void 0, function* () {
             if (pending)
-                return Promise.reject(Oops$3.DuplicatePending(key));
+                return Promise.reject(Oops$4.DuplicatePending(key));
             pending = true;
             control.update(key);
             try {
@@ -650,7 +650,7 @@ function run(task) {
     });
 }
 
-const Oops$2 = issues({
+const Oops$3 = issues({
     PeerNotAllowed: (model, property) => `Attempted to use an instruction result (probably use or get) as computed source for ${model}.${property}. This is not allowed.`,
     Failed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} ${parent}.${property}.`,
     Required: (expects, child) => `New ${child} created standalone but requires parent of type ${expects}.`,
@@ -658,10 +658,10 @@ const Oops$2 = issues({
     AmbientRequired: (requested, requester) => `Attempted to find an instance of ${requested} in context. It is required by ${requester}, but one could not be found.`
 });
 function get(arg0, arg1) {
-    return does((key, control) => {
+    return apply((key, control) => {
         let { subject } = control;
         if (typeof arg0 == "symbol")
-            throw Oops$2.PeerNotAllowed(subject, key);
+            throw Oops$3.PeerNotAllowed(subject, key);
         let source = cb => cb(subject);
         if (arg0 instanceof Model)
             subject = arg0;
@@ -669,7 +669,7 @@ function get(arg0, arg1) {
             const hasParent = parent(subject);
             if (!hasParent) {
                 if (arg1 === true)
-                    throw Oops$2.Required(arg0, subject);
+                    throw Oops$3.Required(arg0, subject);
                 const fetch = Control.has(subject);
                 source = got => {
                     fetch(context => {
@@ -677,14 +677,14 @@ function get(arg0, arg1) {
                         if (model)
                             got(model);
                         else if (arg1 !== false)
-                            throw Oops$2.AmbientRequired(arg0, subject);
+                            throw Oops$3.AmbientRequired(arg0, subject);
                     });
                 };
             }
             else if (!arg0 || hasParent instanceof arg0)
                 subject = hasParent;
             else
-                throw Oops$2.Unexpected(arg0, subject, hasParent);
+                throw Oops$3.Unexpected(arg0, subject, hasParent);
         }
         else if (typeof arg0 == "function")
             arg1 = arg0.call(subject, key, subject);
@@ -727,7 +727,7 @@ function computed(parent, key, source, setter) {
             next = setter.call(proxy, proxy);
         }
         catch (err) {
-            Oops$2.Failed(parent.subject, key, initial).warn();
+            Oops$3.Failed(parent.subject, key, initial).warn();
             if (initial)
                 throw err;
             console.error(err);
@@ -783,11 +783,18 @@ function flushComputed() {
 }
 Control.before.add(flushComputed);
 
+const Oops$2 = issues({
+    BadRefObject: () => `ref instruction does not support object which is not 'this'`
+});
 function ref(arg, arg2) {
-    return does((key, source) => {
+    return apply((key, source) => {
         let value = {};
-        if (typeof arg == "object")
-            for (const key in control(arg, true).state)
+        if (typeof arg != "object")
+            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
+        else if (arg !== source.subject)
+            throw Oops$2.BadRefObject();
+        else
+            for (const key in source.state)
                 defineProperty(value, key, typeof arg2 == "function" ? {
                     configurable: true,
                     get() {
@@ -798,8 +805,6 @@ function ref(arg, arg2) {
                 } : {
                     value: createRef(source, key)
                 });
-        else
-            value = createRef(source, key, arg && createValueEffect(arg, arg2 !== false));
         source.state[key] = undefined;
         source.observers.set(key, new Set());
         defineProperty(source.subject, key, { value });
@@ -819,7 +824,7 @@ const Oops$1 = issues({
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
 });
 function set(value, argument) {
-    return does((key, control) => {
+    return apply((key, control) => {
         const { state, subject } = control;
         if (typeof value == "function" || value instanceof Promise) {
             const output = {};
@@ -889,7 +894,7 @@ function set(value, argument) {
 }
 
 function use(input, argument) {
-    return does((key, source) => {
+    return apply((key, source) => {
         const { state, subject } = source;
         if (typeof input === "function")
             input = new input();

package/package.json

@@ -26,6 +26,6 @@
     "prebuild": "rm -rf lib/",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.31.0",
-  "gitHead": "63fd9a26371cb53d00ff2e3f5f2673660c6213de"
+  "version": "0.33.0",
+  "gitHead": "b6cd486f362d8188fcf11dde504978c45638ab40"
 }