aoye 0.0.55 → 0.0.57

package/dist/index.d.ts

@@ -220,6 +220,7 @@ declare class Store {
     static new<T extends Store = any, P extends Store = any, O extends string = ''>(this: new (...args: any[]) => T, keyMap?: PRecord<keyof T, keyof Omit<P, O> | DeepOmitPath<P, O>> | Record<string, string | Function>, staticMap?: PRecord<keyof T, any>): T;
     map<P extends Store = any, O extends string = ''>(keyMap?: PRecord<keyof this, keyof Omit<P, O> | DeepOmitPath<P, O>>): void;
 }
+declare const isStore: (s: any) => s is typeof Store;
 
 declare const ide: typeof requestIdleCallback | typeof setTimeout;
 declare const now: () => number;
@@ -244,5 +245,5 @@ declare function effectUt(callback: (...args: ValueDiff[]) => void, depOrOpt?: a
 declare function effect(callback: (...args: ValueDiff[]) => void, depOrOpt?: any[] | CustomEffectOpt, opt?: CustomEffectOpt): Effect;
 declare function scope(...args: any[]): any;
 
-export { $, Computed, Effect, EffectStrType2Enum, IsStore, Keys, NoopEffect, ScheduleStatus, ScheduleType, Scope, Signal, Store, StoreIgnoreKeys, batchDeep, batchEnd, batchStart, clean, deepSignal, effect, effectUt, execId, execIdInc, flushMicroEffectManual, getPulling, ide, macro, micro, noopEffect, now, runWithPulling, scope, setExecId, setPulling, shareSignal, toRaw };
+export { $, Computed, Effect, EffectStrType2Enum, IsStore, Keys, NoopEffect, ScheduleStatus, ScheduleType, Scope, Signal, Store, StoreIgnoreKeys, batchDeep, batchEnd, batchStart, clean, deepSignal, effect, effectUt, execId, execIdInc, flushMicroEffectManual, getPulling, ide, isStore, macro, micro, noopEffect, now, runWithPulling, scope, setExecId, setPulling, shareSignal, toRaw };
 export type { CreateScope, CreateTaskProps, CustomEffectOpt, DeepOmitPath, DeepPath, DeepValue, Dispose, Key, Link, MatchValue, Mix, OnClean, OutLink, PRecord, ScheduleTypeStr, SideEffect, SignalNode, SignalType, Task, TaskControlReturn, ValueDiff };

package/dist/index.umd.js

@@ -987,7 +987,17 @@
           if (targetIsArray) {
             return arrayMethodReWrites[prop] || value;
           } else {
-            return value;
+            if (!Object.prototype.hasOwnProperty.call(obj, prop)) {
+              return value;
+            }
+            let s = cells.get(prop);
+            if (s) {
+              return s.get();
+            }
+            s = new Signal(value);
+            s.scope = scope;
+            cells.set(prop, s);
+            return s.get();
           }
         }
         let s = cells.get(prop);
@@ -1001,7 +1011,7 @@
         return s.get();
       },
       set(obj, prop, value, receiver) {
-        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof value === 'function') {
+        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
           return Reflect.set(obj, prop, value, receiver);
         }
         const isNewKey = !Reflect.has(obj, prop);
@@ -1009,7 +1019,7 @@
         const success = Reflect.set(obj, prop, value, receiver);
         const cell = cells.get(prop);
         if (cell) {
-          cell.set(deep ? deepSignal(value, scope) : value);
+          cell.set(typeof value === 'function' || !deep ? value : deepSignal(value, scope));
         }
         if (targetIsArray) {
           handleArraySet(obj, prop, value, receiver);
@@ -1020,7 +1030,10 @@
         return success;
       },
       deleteProperty(obj, prop) {
-        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof obj[prop] === 'function') {
+        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
+          return Reflect.deleteProperty(obj, prop);
+        }
+        if (typeof obj[prop] === 'function' && !Object.prototype.hasOwnProperty.call(obj, prop)) {
           return Reflect.deleteProperty(obj, prop);
         }
         cells.delete(prop);
@@ -1465,6 +1478,7 @@
       this.parent = null;
     }
   }
+  const isStore = s => typeof s === 'function' && s[IsStore];
 
   function $(data) {
     if (typeof data === 'object' && data !== null) {
@@ -1607,6 +1621,7 @@
   exports.flushMicroEffectManual = flushMicroEffectManual;
   exports.getPulling = getPulling;
   exports.ide = ide;
+  exports.isStore = isStore;
   exports.macro = macro;
   exports.micro = micro;
   exports.noopEffect = noopEffect;