@ibyar/expressions 0.5.1 → 0.5.6

package/scope/event.js

@@ -1,41 +1,35 @@
 import { ReactiveScope } from './scope.js';
-function visitInnerScope(eventNames, events, scope, scopeMap) {
+function visitInnerScope(eventNames, events, scope, scopeTuples) {
     eventNames.forEach(eventName => {
         if (eventName.startsWith(':')) {
             return;
         }
-        scopeMap.set(eventName, scope);
+        scopeTuples.push([eventName, scope]);
         const nextEvents = Object.keys(events[eventName]);
         if (!nextEvents.length) {
             return;
         }
         const innerScope = scope.getScopeOrCreat(eventName);
-        visitInnerScope(nextEvents, events[eventName], innerScope, scopeMap);
+        visitInnerScope(nextEvents, events[eventName], innerScope, scopeTuples);
     });
 }
 export function findScopeByEventMap(events, stack) {
-    const scopeMap = new Map();
+    const scopeTuples = [];
     const rootEventNames = Object.keys(events);
     rootEventNames.forEach(eventName => {
         const scope = stack.findScope(eventName);
-        scopeMap.set(eventName, scope);
+        scopeTuples.push([eventName, scope]);
         const nextEvents = Object.keys(events[eventName]);
         if (!nextEvents.length) {
             return;
         }
         const eventScope = scope.getScopeOrCreat(eventName);
-        visitInnerScope(nextEvents, events[eventName], eventScope, scopeMap);
+        visitInnerScope(nextEvents, events[eventName], eventScope, scopeTuples);
     });
-    return scopeMap;
+    return scopeTuples;
 }
 export function findReactiveScopeByEventMap(events, stack) {
     const allScopes = findScopeByEventMap(events, stack);
-    const scopeMap = new Map();
-    allScopes.forEach((scope, eventName) => {
-        if (scope instanceof ReactiveScope) {
-            scopeMap.set(eventName, scope);
-        }
-    });
-    return scopeMap;
+    return allScopes.filter(tuple => tuple[1] instanceof ReactiveScope);
 }
 //# sourceMappingURL=event.js.map

package/scope/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/expressions/scope/event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAuB,MAAM,YAAY,CAAC;AAGhE,SAAS,eAAe,CAAC,UAAoB,EAAE,MAA0B,EAAE,KAA0B,EAAE,QAAoC;IAC1I,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC9B,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9B,OAAO;SACP;QACD,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACvB,OAAO;SACP;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACpD,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAA0B,EAAE,KAAY;IAC3E,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;IAClD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAClC,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAe,SAAS,CAAC,CAAC;QACvD,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACvB,OAAO;SACP;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAe,SAAS,CAAC,CAAC;QAClE,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAA0B,EAAE,KAAY;IACnF,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAErD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAuC,CAAC;IAChE,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QACtC,IAAI,KAAK,YAAY,aAAa,EAAE;YACnC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SAC/B;IACF,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AACjB,CAAC","sourcesContent":["import { ExpressionEventMap } from '../api/expression.js';\nimport { ReactiveScope, Scope, ScopeContext } from './scope.js';\nimport { Stack } from './stack.js';\n\nfunction visitInnerScope(eventNames: string[], events: ExpressionEventMap, scope: Scope<ScopeContext>, scopeMap: Map<string, Scope<object>>) {\n\teventNames.forEach(eventName => {\n\t\tif (eventName.startsWith(':')) {\n\t\t\treturn;\n\t\t}\n\t\tscopeMap.set(eventName, scope);\n\t\tconst nextEvents = Object.keys(events[eventName]);\n\t\tif (!nextEvents.length) {\n\t\t\treturn;\n\t\t}\n\t\tconst innerScope = scope.getScopeOrCreat(eventName);\n\t\tvisitInnerScope(nextEvents, events[eventName], innerScope, scopeMap);\n\t});\n}\n\nexport function findScopeByEventMap(events: ExpressionEventMap, stack: Stack): Map<string, Scope<ScopeContext>> {\n\tconst scopeMap = new Map<string, Scope<object>>();\n\tconst rootEventNames = Object.keys(events);\n\trootEventNames.forEach(eventName => {\n\t\tconst scope = stack.findScope<ScopeContext>(eventName);\n\t\tscopeMap.set(eventName, scope);\n\t\tconst nextEvents = Object.keys(events[eventName]);\n\t\tif (!nextEvents.length) {\n\t\t\treturn;\n\t\t}\n\t\tconst eventScope = scope.getScopeOrCreat<ScopeContext>(eventName);\n\t\tvisitInnerScope(nextEvents, events[eventName], eventScope, scopeMap);\n\t});\n\treturn scopeMap;\n}\n\nexport function findReactiveScopeByEventMap(events: ExpressionEventMap, stack: Stack): Map<string, ReactiveScope<ScopeContext>> {\n\tconst allScopes = findScopeByEventMap(events, stack);\n\n\tconst scopeMap = new Map<string, ReactiveScope<ScopeContext>>();\n\tallScopes.forEach((scope, eventName) => {\n\t\tif (scope instanceof ReactiveScope) {\n\t\t\tscopeMap.set(eventName, scope);\n\t\t}\n\t});\n\treturn scopeMap;\n}\n"]}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/expressions/scope/event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAuB,MAAM,YAAY,CAAC;AAGhE,SAAS,eAAe,CAAC,UAAoB,EAAE,MAA0B,EAAE,KAA0B,EAAE,WAA4C;IAClJ,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC9B,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9B,OAAO;SACP;QACD,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACvB,OAAO;SACP;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACpD,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAA0B,EAAE,KAAY;IAC3E,MAAM,WAAW,GAAoC,EAAE,CAAC;IACxD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAClC,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAe,SAAS,CAAC,CAAC;QACvD,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACvB,OAAO;SACP;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,eAAe,CAAe,SAAS,CAAC,CAAC;QAClE,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IACH,OAAO,WAAW,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAA0B,EAAE,KAAY;IACnF,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACrD,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,aAAa,CAA4C,CAAC;AAChH,CAAC","sourcesContent":["import { ExpressionEventMap } from '../api/expression.js';\nimport { ReactiveScope, Scope, ScopeContext } from './scope.js';\nimport { Stack } from './stack.js';\n\nfunction visitInnerScope(eventNames: string[], events: ExpressionEventMap, scope: Scope<ScopeContext>, scopeTuples: [string, Scope<ScopeContext>][]) {\n\teventNames.forEach(eventName => {\n\t\tif (eventName.startsWith(':')) {\n\t\t\treturn;\n\t\t}\n\t\tscopeTuples.push([eventName, scope]);\n\t\tconst nextEvents = Object.keys(events[eventName]);\n\t\tif (!nextEvents.length) {\n\t\t\treturn;\n\t\t}\n\t\tconst innerScope = scope.getScopeOrCreat(eventName);\n\t\tvisitInnerScope(nextEvents, events[eventName], innerScope, scopeTuples);\n\t});\n}\n\nexport function findScopeByEventMap(events: ExpressionEventMap, stack: Stack): [string, Scope<ScopeContext>][] {\n\tconst scopeTuples: [string, Scope<ScopeContext>][] = [];\n\tconst rootEventNames = Object.keys(events);\n\trootEventNames.forEach(eventName => {\n\t\tconst scope = stack.findScope<ScopeContext>(eventName);\n\t\tscopeTuples.push([eventName, scope]);\n\t\tconst nextEvents = Object.keys(events[eventName]);\n\t\tif (!nextEvents.length) {\n\t\t\treturn;\n\t\t}\n\t\tconst eventScope = scope.getScopeOrCreat<ScopeContext>(eventName);\n\t\tvisitInnerScope(nextEvents, events[eventName], eventScope, scopeTuples);\n\t});\n\treturn scopeTuples;\n}\n\nexport function findReactiveScopeByEventMap(events: ExpressionEventMap, stack: Stack): [string, ReactiveScope<ScopeContext>][] {\n\tconst allScopes = findScopeByEventMap(events, stack);\n\treturn allScopes.filter(tuple => tuple[1] instanceof ReactiveScope) as [string, ReactiveScope<ScopeContext>][];\n}\n"]}

package/scope/finalizer.d.ts

@@ -0,0 +1,4 @@
+declare type Actions = (() => void)[];
+export declare function finalizerRegister(target: object, actions: Actions, unregisterToken?: object): void;
+export declare function finalizerUnregister(unregisterToken: object): void;
+export {};

package/scope/finalizer.js

@@ -0,0 +1,11 @@
+const actionsFinalizer = !FinalizationRegistry ? undefined : new FinalizationRegistry(actions => actions.forEach(action => { try {
+    action();
+}
+catch (e) { } }));
+export function finalizerRegister(target, actions, unregisterToken) {
+    actionsFinalizer?.register(target, actions, unregisterToken);
+}
+export function finalizerUnregister(unregisterToken) {
+    actionsFinalizer?.unregister(unregisterToken);
+}
+//# sourceMappingURL=finalizer.js.map

package/scope/finalizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"finalizer.js","sourceRoot":"","sources":["../../../src/expressions/scope/finalizer.ts"],"names":[],"mappings":"AACA,MAAM,gBAAgB,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,oBAAoB,CACpF,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI;IAAE,MAAM,EAAE,CAAC;CAAE;AAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CACzE,CAAC;AAGF,MAAM,UAAU,iBAAiB,CAAC,MAAc,EAAE,OAAgB,EAAE,eAAwB;IAC3F,gBAAgB,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;AAC9D,CAAC;AAGD,MAAM,UAAU,mBAAmB,CAAC,eAAuB;IAC1D,gBAAgB,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;AAC/C,CAAC","sourcesContent":["type Actions = (() => void)[];\nconst actionsFinalizer = !FinalizationRegistry ? undefined : new FinalizationRegistry<Actions>(\n\tactions => actions.forEach(action => { try { action(); } catch (e) { } })\n);\n\n\nexport function finalizerRegister(target: object, actions: Actions, unregisterToken?: object): void {\n\tactionsFinalizer?.register(target, actions, unregisterToken);\n}\n\n\nexport function finalizerUnregister(unregisterToken: object): void {\n\tactionsFinalizer?.unregister(unregisterToken);\n}\n"]}

package/scope/proxy.d.ts

@@ -2,12 +2,11 @@ import type { Scope, ScopeContext } from './scope.js';
 export declare class FunctionProxyHandler<T extends Function> implements ProxyHandler<T> {
     private thisContext;
     constructor(thisContext: object);
-    apply(targetFunc: T, ignoreThisArg: any, argArray: any[]): any;
+    apply(targetFunc: T, targetThisArg: any, argArray: any[]): any;
+    private computeThisArg;
 }
 export declare class ScopeProxyHandler<T extends ScopeContext> implements ProxyHandler<ScopeContext> {
     private scope;
-    private proxyMap;
-    private proxyValueMap;
     private functionHandler;
     constructor(scope: Scope<T>);
     has(model: T, propertyKey: PropertyKey): boolean;

package/scope/proxy.js

@@ -2,57 +2,53 @@ export class FunctionProxyHandler {
     constructor(thisContext) {
         this.thisContext = thisContext;
     }
-    apply(targetFunc, ignoreThisArg, argArray) {
-        return targetFunc.apply(this.thisContext, argArray);
+    apply(targetFunc, targetThisArg, argArray) {
+        return targetFunc.apply(this.computeThisArg(targetThisArg), argArray);
+    }
+    computeThisArg(targetThisArg) {
+        switch (true) {
+            case this.thisContext instanceof Map:
+            case this.thisContext instanceof Set:
+            case this.thisContext instanceof Date:
+            case this.thisContext instanceof WeakMap:
+            case this.thisContext instanceof WeakSet:
+            case this.thisContext instanceof Promise:
+            case this.thisContext instanceof HTMLElement:
+                return this.thisContext;
+            default:
+                return targetThisArg;
+        }
     }
 }
 export class ScopeProxyHandler {
     constructor(scope) {
         this.scope = scope;
-        this.proxyMap = new Map();
-        this.proxyValueMap = new WeakMap();
     }
     has(model, propertyKey) {
         return this.scope.has(propertyKey);
     }
     get(model, propertyKey, receiver) {
-        if (this.proxyMap.has(propertyKey)) {
-            return this.proxyMap.get(propertyKey);
-        }
         const value = this.scope.get(propertyKey);
+        if (value == null) {
+            return value;
+        }
         if (typeof value === 'object') {
             const scope = this.scope.getScope(propertyKey);
             if (scope) {
-                const proxy = new Proxy(value, new ScopeProxyHandler(scope));
-                this.proxyMap.set(propertyKey, proxy);
-                this.proxyValueMap.set(proxy, value);
-                return proxy;
+                return new Proxy(value, new ScopeProxyHandler(scope));
             }
         }
         else if (typeof value === 'function') {
-            const proxy = new Proxy(value, this.functionHandler
+            return new Proxy(value, this.functionHandler
                 ?? (this.functionHandler = new FunctionProxyHandler(this.scope.getContext())));
-            this.proxyMap.set(propertyKey, proxy);
-            this.proxyValueMap.set(proxy, value);
-            return proxy;
         }
         return value;
     }
     set(model, propertyKey, value, receiver) {
-        if ((typeof value === 'object' || typeof value === 'function') && this.proxyValueMap.has(value)) {
-            value = this.proxyValueMap.get(value);
-        }
         return this.scope.set(propertyKey, value);
     }
     deleteProperty(model, propertyKey) {
-        const isDelete = Reflect.deleteProperty(model, propertyKey);
-        if (isDelete) {
-            this.scope.set(propertyKey, undefined);
-            if (this.proxyMap.has(propertyKey)) {
-                this.proxyMap.delete(propertyKey);
-            }
-        }
-        return isDelete;
+        return this.scope.delete(propertyKey);
     }
 }
 export function createRevocableProxyForContext(context, scope) {

package/scope/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/expressions/scope/proxy.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Scope, ScopeContext } from './scope.js';\n\nexport class FunctionProxyHandler<T extends Function> implements ProxyHandler<T> {\n\tconstructor(private thisContext: object) { }\n\tapply(targetFunc: T, ignoreThisArg: any, argArray: any[]): any {\n\t\treturn targetFunc.apply(this.thisContext, argArray);\n\t}\n}\n\n/**\n * crete new proxy handler object as scoped context\n */\nexport class ScopeProxyHandler<T extends ScopeContext> implements ProxyHandler<ScopeContext> {\n\tprivate proxyMap = new Map<PropertyKey, T>();\n\tprivate proxyValueMap = new WeakMap<object, object>();\n\tprivate functionHandler: FunctionProxyHandler<Function>;\n\tconstructor(private scope: Scope<T>) { }\n\thas(model: T, propertyKey: PropertyKey): boolean {\n\t\treturn this.scope.has(propertyKey);\n\t}\n\tget(model: T, propertyKey: PropertyKey, receiver: any): any {\n\t\tif (this.proxyMap.has(propertyKey)) {\n\t\t\treturn this.proxyMap.get(propertyKey);\n\t\t}\n\t\tconst value = this.scope.get(propertyKey);\n\t\tif (typeof value === 'object') {\n\t\t\tconst scope = this.scope.getScope(propertyKey);\n\t\t\tif (scope) {\n\t\t\t\tconst proxy = new Proxy(value, new ScopeProxyHandler(scope));\n\t\t\t\tthis.proxyMap.set(propertyKey, proxy);\n\t\t\t\tthis.proxyValueMap.set(proxy, value);\n\t\t\t\treturn proxy;\n\t\t\t}\n\t\t} else if (typeof value === 'function') {\n\t\t\tconst proxy = new Proxy(value, this.functionHandler\n\t\t\t\t?? (this.functionHandler = new FunctionProxyHandler(this.scope.getContext()))\n\t\t\t);\n\t\t\tthis.proxyMap.set(propertyKey, proxy);\n\t\t\tthis.proxyValueMap.set(proxy, value);\n\t\t\treturn proxy;\n\t\t}\n\t\treturn value;\n\t}\n\tset(model: T, propertyKey: PropertyKey, value: any, receiver: any): boolean {\n\t\tif ((typeof value === 'object' || typeof value === 'function') && this.proxyValueMap.has(value)) {\n\t\t\tvalue = this.proxyValueMap.get(value);\n\t\t}\n\t\treturn this.scope.set(propertyKey, value);\n\t}\n\tdeleteProperty(model: T, propertyKey: string | symbol): boolean {\n\t\tconst isDelete = Reflect.deleteProperty(model, propertyKey);\n\t\tif (isDelete) {\n\t\t\tthis.scope.set(propertyKey, undefined);\n\t\t\tif (this.proxyMap.has(propertyKey)) {\n\t\t\t\tthis.proxyMap.delete(propertyKey);\n\t\t\t}\n\t\t}\n\t\treturn isDelete;\n\t}\n}\n\nexport type RevocableProxy<T> = {\n\tproxy: T;\n\trevoke: () => void;\n};\n\nexport function createRevocableProxyForContext<T extends object>(context: T, scope: Scope<T>): RevocableProxy<T> {\n\treturn Proxy.revocable<T>(context, new ScopeProxyHandler(scope));\n}\n\nexport function createProxyForContext<T extends object>(scope: Scope<T>): T {\n\treturn new Proxy<T>(scope.getContext(), new ScopeProxyHandler(scope));\n}\n"]}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/expressions/scope/proxy.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,oBAAoB;IAChC,YAAoB,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;IAAI,CAAC;IAC5C,KAAK,CAAC,UAAa,EAAE,aAAkB,EAAE,QAAe;QACvD,OAAO,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAEO,cAAc,CAAC,aAAkB;QACxC,QAAQ,IAAI,EAAE;YAEb,KAAK,IAAI,CAAC,WAAW,YAAY,GAAG,CAAC;YACrC,KAAK,IAAI,CAAC,WAAW,YAAY,GAAG,CAAC;YACrC,KAAK,IAAI,CAAC,WAAW,YAAY,IAAI,CAAC;YACtC,KAAK,IAAI,CAAC,WAAW,YAAY,OAAO,CAAC;YACzC,KAAK,IAAI,CAAC,WAAW,YAAY,OAAO,CAAC;YACzC,KAAK,IAAI,CAAC,WAAW,YAAY,OAAO,CAAC;YACzC,KAAK,IAAI,CAAC,WAAW,YAAY,WAAW;gBAC3C,OAAO,IAAI,CAAC,WAAW,CAAC;YACzB;gBACC,OAAO,aAAa,CAAC;SACtB;IACF,CAAC;CACD;AAKD,MAAM,OAAO,iBAAiB;IAE7B,YAAoB,KAAe;QAAf,UAAK,GAAL,KAAK,CAAU;IAAI,CAAC;IACxC,GAAG,CAAC,KAAQ,EAAE,WAAwB;QACrC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IACD,GAAG,CAAC,KAAQ,EAAE,WAAwB,EAAE,QAAa;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,KAAK,IAAI,IAAI,EAAE;YAClB,OAAO,KAAK,CAAC;SACb;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC/C,IAAI,KAAK,EAAE;gBACV,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;aACtD;SACD;aAAM,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YACvC,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe;mBACxC,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAC7E,CAAC;SACF;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACD,GAAG,CAAC,KAAQ,EAAE,WAAwB,EAAE,KAAU,EAAE,QAAa;QAChE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;IACD,cAAc,CAAC,KAAQ,EAAE,WAA4B;QACpD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;CACD;AAOD,MAAM,UAAU,8BAA8B,CAAmB,OAAU,EAAE,KAAe;IAC3F,OAAO,KAAK,CAAC,SAAS,CAAI,OAAO,EAAE,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAmB,KAAe;IACtE,OAAO,IAAI,KAAK,CAAI,KAAK,CAAC,UAAU,EAAE,EAAE,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;AACvE,CAAC","sourcesContent":["import type { Scope, ScopeContext } from './scope.js';\n\nexport class FunctionProxyHandler<T extends Function> implements ProxyHandler<T> {\n\tconstructor(private thisContext: object) { }\n\tapply(targetFunc: T, targetThisArg: any, argArray: any[]): any {\n\t\treturn targetFunc.apply(this.computeThisArg(targetThisArg), argArray);\n\t}\n\n\tprivate computeThisArg(targetThisArg: any): any {\n\t\tswitch (true) {\n\t\t\t// exclude classes that have binding hook\n\t\t\tcase this.thisContext instanceof Map:\n\t\t\tcase this.thisContext instanceof Set:\n\t\t\tcase this.thisContext instanceof Date:\n\t\t\tcase this.thisContext instanceof WeakMap:\n\t\t\tcase this.thisContext instanceof WeakSet:\n\t\t\tcase this.thisContext instanceof Promise:\n\t\t\tcase this.thisContext instanceof HTMLElement:\n\t\t\t\treturn this.thisContext;\n\t\t\tdefault:\n\t\t\t\treturn targetThisArg;\n\t\t}\n\t}\n}\n\n/**\n * crete new proxy handler object as scoped context\n */\nexport class ScopeProxyHandler<T extends ScopeContext> implements ProxyHandler<ScopeContext> {\n\tprivate functionHandler: FunctionProxyHandler<Function>;\n\tconstructor(private scope: Scope<T>) { }\n\thas(model: T, propertyKey: PropertyKey): boolean {\n\t\treturn this.scope.has(propertyKey);\n\t}\n\tget(model: T, propertyKey: PropertyKey, receiver: any): any {\n\t\tconst value = this.scope.get(propertyKey);\n\t\tif (value == null) {\n\t\t\treturn value;\n\t\t}\n\t\tif (typeof value === 'object') {\n\t\t\tconst scope = this.scope.getScope(propertyKey);\n\t\t\tif (scope) {\n\t\t\t\treturn new Proxy(value, new ScopeProxyHandler(scope));\n\t\t\t}\n\t\t} else if (typeof value === 'function') {\n\t\t\treturn new Proxy(value, this.functionHandler\n\t\t\t\t?? (this.functionHandler = new FunctionProxyHandler(this.scope.getContext()))\n\t\t\t);\n\t\t}\n\t\treturn value;\n\t}\n\tset(model: T, propertyKey: PropertyKey, value: any, receiver: any): boolean {\n\t\treturn this.scope.set(propertyKey, value);\n\t}\n\tdeleteProperty(model: T, propertyKey: string | symbol): boolean {\n\t\treturn this.scope.delete(propertyKey);\n\t}\n}\n\nexport type RevocableProxy<T> = {\n\tproxy: T;\n\trevoke: () => void;\n};\n\nexport function createRevocableProxyForContext<T extends object>(context: T, scope: Scope<T>): RevocableProxy<T> {\n\treturn Proxy.revocable<T>(context, new ScopeProxyHandler(scope));\n}\n\nexport function createProxyForContext<T extends object>(scope: Scope<T>): T {\n\treturn new Proxy<T>(scope.getContext(), new ScopeProxyHandler(scope));\n}\n"]}

package/scope/scope.d.ts

@@ -1,48 +1,32 @@
-export declare type ScopeType = 'block' | 'function' | 'class' | 'module' | 'global';
+import { TypeOf } from '../api/utils.js';
 export declare type ScopeContext = {
     [key: PropertyKey]: ScopeContext | any;
 };
 export interface Scope<T = ScopeContext> {
-    type: ScopeType;
     get(propertyKey: keyof T): any;
     set(propertyKey: keyof T, value?: any, receiver?: any): boolean;
     has(propertyKey: keyof T): boolean;
     delete(propertyKey: keyof T): boolean;
     getContext(): T;
+    getContextProxy?(): T;
     getScope<V extends ScopeContext>(propertyKey: keyof T): Scope<V> | undefined;
     getScopeOrCreat<V extends ScopeContext>(propertyKey: keyof T): Scope<V>;
+    getClass(): TypeOf<Scope<ScopeContext>>;
 }
 export declare class Scope<T extends ScopeContext> implements Scope<T> {
     protected context: T;
-    type: ScopeType;
-    static for<T extends ScopeContext>(context: T, type: ScopeType): Scope<T>;
-    static blockScopeFor<T extends ScopeContext>(context: T): Scope<T>;
-    static functionScopeFor<T extends ScopeContext>(context: T): Scope<T>;
-    static classScopeFor<T extends ScopeContext>(context: T): Scope<T>;
-    static moduleScopeFor<T extends ScopeContext>(context: T): Scope<T>;
-    static globalScopeFor<T extends ScopeContext>(context: T): Scope<T>;
-    static blockScope<T extends ScopeContext>(): Scope<T>;
-    static functionScope<T extends ScopeContext>(): Scope<T>;
-    static classScope<T extends ScopeContext>(): Scope<T>;
-    static moduleScope<T extends ScopeContext>(): Scope<T>;
-    static globalScope<T extends ScopeContext>(): Scope<T>;
+    static for<T extends ScopeContext>(context: T, propertyKeys?: (keyof T)[]): Scope<T>;
+    static blockScope<T extends ScopeContext>(propertyKeys?: (keyof T)[]): Scope<T>;
     protected scopeMap: Map<keyof T, Scope<any>>;
-    constructor(context: T, type: ScopeType);
+    protected propertyKeys?: (keyof T)[];
+    constructor(context: T, propertyKeys?: (keyof T)[]);
 }
 export declare class ReadOnlyScope<T extends ScopeContext> extends Scope<T> {
-    static for<T extends ScopeContext>(context: T, type: ScopeType): ReadOnlyScope<T>;
-    static blockScopeFor<T extends ScopeContext>(context: T): ReadOnlyScope<T>;
-    static functionScopeFor<T extends ScopeContext>(context: T): ReadOnlyScope<T>;
-    static classScopeFor<T extends ScopeContext>(context: T): ReadOnlyScope<T>;
-    static moduleScopeFor<T extends ScopeContext>(context: T): ReadOnlyScope<T>;
-    static globalScopeFor<T extends ScopeContext>(context: T): ReadOnlyScope<T>;
-    static blockScope<T extends ScopeContext>(): ReadOnlyScope<T>;
-    static functionScope<T extends ScopeContext>(): ReadOnlyScope<T>;
-    static classScope<T extends ScopeContext>(): ReadOnlyScope<T>;
-    static moduleScope<T extends ScopeContext>(): ReadOnlyScope<T>;
-    static globalScope<T extends ScopeContext>(): ReadOnlyScope<T>;
+    static for<T extends ScopeContext>(context: T, propertyKeys?: (keyof T)[]): ReadOnlyScope<T>;
+    static blockScope<T extends ScopeContext>(propertyKeys?: (keyof T)[]): ReadOnlyScope<T>;
     set(propertyKey: keyof T, value: any, receiver?: any): boolean;
     delete(propertyKey: keyof T): boolean;
+    getClass(): TypeOf<ReadOnlyScope<ScopeContext>>;
 }
 export declare class ScopeSubscription<T> {
     private propertyKey;
@@ -64,22 +48,13 @@ export declare class ValueChangeObserver<T> {
     destroy(): void;
 }
 export declare class ReactiveScope<T extends ScopeContext> extends Scope<T> {
-    protected name?: string | undefined;
     protected parent?: ReactiveScope<any> | undefined;
-    static for<T extends ScopeContext>(context: T, type: ScopeType): ReactiveScope<T>;
-    static blockScopeFor<T extends ScopeContext>(context: T): ReactiveScope<T>;
-    static functionScopeFor<T extends ScopeContext>(context: T): ReactiveScope<T>;
-    static classScopeFor<T extends ScopeContext>(context: T): ReactiveScope<T>;
-    static moduleScopeFor<T extends ScopeContext>(context: T): ReactiveScope<T>;
-    static globalScopeFor<T extends ScopeContext>(context: T): ReactiveScope<T>;
-    static blockScope<T extends ScopeContext>(): ReactiveScope<T>;
-    static functionScope<T extends ScopeContext>(): ReactiveScope<T>;
-    static classScope<T extends ScopeContext>(): ReactiveScope<T>;
-    static moduleScope<T extends ScopeContext>(): ReactiveScope<T>;
-    static globalScope<T extends ScopeContext>(): ReactiveScope<T>;
+    static for<T extends ScopeContext>(context: T, propertyKeys?: (keyof T)[]): ReactiveScope<T>;
+    static blockScope<T extends ScopeContext>(propertyKeys?: (keyof T)[]): ReactiveScope<T>;
     protected observer: ValueChangeObserver<T>;
-    constructor(context: T, type: ScopeType);
-    constructor(context: T, type: ScopeType, name: string, parent: ReactiveScope<any>);
+    protected name?: string;
+    constructor(context: T, propertyKeys?: (keyof T)[]);
+    constructor(context: T, name: string, parent: ReactiveScope<any>, propertyKeys?: (keyof T)[]);
     set(propertyKey: keyof T, newValue: any, receiver?: any): boolean;
     delete(propertyKey: keyof T): boolean;
     getScope<V extends ScopeContext>(propertyKey: keyof T): ReactiveScope<V> | undefined;
@@ -87,28 +62,42 @@ export declare class ReactiveScope<T extends ScopeContext> extends Scope<T> {
     emit(propertyKey: keyof T, newValue: any, oldValue?: any): void;
     subscribe(propertyKey: keyof T, callback: ValueChangedCallback): ScopeSubscription<T>;
     unsubscribe(propertyKey?: keyof T, subscription?: ScopeSubscription<T>): void;
+    getClass(): TypeOf<ReactiveScope<ScopeContext>>;
 }
 export interface ScopeControl<T extends ScopeContext> {
+    isAttached(): boolean;
     detach(): void;
     reattach(): void;
-    emitChanges(propertyKey?: keyof T): void;
+    emitChanges(propertyKey?: keyof T, propertyValue?: any): void;
 }
 export declare class ReactiveScopeControl<T extends ScopeContext> extends ReactiveScope<T> implements ScopeControl<T> {
-    static for<T extends ScopeContext>(context: T, type: ScopeType): ReactiveScopeControl<T>;
-    static blockScopeFor<T extends ScopeContext>(context: T): ReactiveScopeControl<T>;
-    static functionScopeFor<T extends ScopeContext>(context: T): ReactiveScopeControl<T>;
-    static classScopeFor<T extends ScopeContext>(context: T): ReactiveScopeControl<T>;
-    static moduleScopeFor<T extends ScopeContext>(context: T): ReactiveScopeControl<T>;
-    static globalScopeFor<T extends ScopeContext>(context: T): ReactiveScopeControl<T>;
-    static blockScope<T extends ScopeContext>(): ReactiveScopeControl<T>;
-    static functionScope<T extends ScopeContext>(): ReactiveScopeControl<T>;
-    static classScope<T extends ScopeContext>(): ReactiveScopeControl<T>;
-    static moduleScope<T extends ScopeContext>(): ReactiveScopeControl<T>;
-    static globalScope<T extends ScopeContext>(): ReactiveScopeControl<T>;
+    static for<T extends ScopeContext>(context: T, propertyKeys?: (keyof T)[]): ReactiveScopeControl<T>;
+    static blockScope<T extends ScopeContext>(propertyKeys?: (keyof T)[]): ReactiveScopeControl<T>;
     protected attached: boolean;
     protected marked: ScopeContext;
     emit(propertyKey: keyof T, newValue: any, oldValue?: any): void;
+    isAttached(): boolean;
     detach(): void;
     reattach(): void;
-    emitChanges(propertyKey?: keyof T): void;
+    emitChanges(propertyKey?: keyof T, propertyValue?: any): void;
+    getClass(): TypeOf<ReactiveScopeControl<ScopeContext>>;
 }
+interface ImportMeta {
+    url: URL;
+    resolve?(specified: string, parent?: string | URL): Promise<string>;
+}
+export interface ModuleImport {
+    meta: ImportMeta;
+}
+export interface ModuleContext extends ScopeContext {
+    import: ModuleImport & ((path: string) => Promise<any>);
+}
+export declare class ModuleScope extends ReactiveScope<ModuleContext> {
+    constructor(context: ModuleContext, propertyKeys?: (keyof ModuleContext)[]);
+    importModule(propertyKey: keyof ModuleContext, scope: ModuleScope): void;
+}
+export declare class WebModuleScope extends ModuleScope {
+    constructor();
+    updateContext(context: any): void;
+}
+export {};