feat: bump 3.5.14

heluxjs · Dec 16, 2023 · ebf4cbb · ebf4cbb
1 parent 9b799ec
commit ebf4cbb
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "helux",
-  "version": "3.5.12",
+  "version": "3.5.14",
   "description": "A state library core that integrates atom, signal, collection dep, derive and watch, it supports all react like frameworks( including react 18 ).",
   "keywords": [],
   "author": {

diff --git a/packages/helux-core/src/api.ts b/packages/helux-core/src/api.ts
@@ -37,6 +37,7 @@ const { shallowCompare, isDiff } = limuUtils;
 const createShared = share; // for compatible wit v2 helux
 const $ = signal; // signal api alias
 
+// user can copy this file content to build a lib that can support another react like framework
 export {
   atom,
   atomx,

diff --git a/packages/helux-core/src/consts/user.ts b/packages/helux-core/src/consts/user.ts
@@ -1,6 +1,6 @@
 import { VER as limuVer } from 'limu';
 
-export const VER = '3.5.13';
+export const VER = '3.5.14';
 
 export const LIMU_VER = limuVer;
 

diff --git a/packages/helux-core/src/factory/creator/current.ts b/packages/helux-core/src/factory/creator/current.ts
@@ -39,7 +39,7 @@ export function currentDraftRoot() {
 export const TRIGGERED_WATCH = {
   current: () => CURRENT_TRIGGERED_WATCH,
   set: (val: any) => (CURRENT_TRIGGERED_WATCH = val),
-  del: () => 0,
+  del: () => CURRENT_TRIGGERED_WATCH = '',
 };
 
 export const DEPS_CB = {

diff --git a/packages/helux-core/src/factory/creator/fake.ts b/packages/helux-core/src/factory/creator/fake.ts
@@ -24,6 +24,7 @@ export const fakeReativeMeta: IReactiveMeta = {
 // { [MUTATE_FN_ITEM]: 1, fn: fnItem, deps: noopArr, oriDesc: desc, desc, depKeys: [] }
 export const fakeMutateFnItem: MutateFnStdItem = {
   fn: noop,
+  onlyDeps: false,
   depKeys: [],
   oriDesc: '',
   desc: '',

diff --git a/packages/helux-core/src/factory/creator/mutateFn.ts b/packages/helux-core/src/factory/creator/mutateFn.ts
@@ -12,7 +12,7 @@ import type { Fn, From, IInnerSetStateOptions, IWatchAndCallMutateDictOptions, M
 import { createWatchLogic } from '../createWatch';
 import { buildReactive, flushActive, innerFlush } from './reactive';
 
-const noopAny: any = () => {};
+const noopAny: any = () => { };
 
 interface ICallMutateBase {
   /** 透传给用户 */
@@ -155,7 +155,7 @@ export function callMutateFnLogic<T = SharedState>(targetState: T, options: ICal
     finish(result, innerSetOptions);
 
     // 存档一下收集到依赖，方便后续探测异步函数里的死循环可能存在的情况
-    if (isFirstCall) {
+    if (isFirstCall && !fnItem.onlyDeps) {
       const fnCtx = getRunningFn().fnCtx;
       if (fnCtx) {
         // 异步函数强制忽略依赖收集行为
@@ -178,10 +178,10 @@ export function callMutateFnLogic<T = SharedState>(targetState: T, options: ICal
       }
     }
 
-    isMutate && TRIGGERED_WATCH.del();
+    TRIGGERED_WATCH.del();
     return [internal.snap, null];
   } catch (err: any) {
-    isMutate && TRIGGERED_WATCH.del();
+    TRIGGERED_WATCH.del();
     // TODO 同步函数错误发送给插件
     if (throwErr) {
       throw err;
@@ -207,7 +207,7 @@ export function watchAndCallMutateDict(options: IWatchAndCallMutateDictOptions)
     createWatchLogic(
       ({ sn, isFirstCall }) => {
         flushActive();
-        const { desc, fn, task, immediate } = item;
+        const { desc, fn, task, immediate, onlyDeps } = item;
         const fnCtx = getRunningFn().fnCtx;
         if (isFirstCall && fnCtx) {
           // 将子函数信息挂上去
@@ -216,6 +216,10 @@ export function watchAndCallMutateDict(options: IWatchAndCallMutateDictOptions)
           fnCtx.checkDeadCycle = item.checkDeadCycle ?? internal.checkDeadCycle;
           // 双向记录一下 fnItem 和 watch 函数之间的关系
           item.watchKey = fnCtx.fnKey;
+          // 设定了依赖全部从 deps 函数获取
+          if (onlyDeps) {
+            item.depKeys = markFnEnd();
+          }
         }
 
         FN_DEP_KEYS.del();

diff --git a/packages/helux-core/src/factory/creator/operateState.ts b/packages/helux-core/src/factory/creator/operateState.ts
@@ -1,6 +1,5 @@
 import { getVal, matchDictKey, nodupPush } from '@helux/utils';
 import { IOperateParams } from 'limu';
-import { FROM } from '../../consts';
 import { recordBlockDepKey } from '../../helpers/blockDep';
 import { recordFnDepKeys } from '../../helpers/fnDep';
 import type { IMutateCtx, KeyIdsDict, NumStrSymbol } from '../../types/base';
@@ -12,8 +11,6 @@ import type { TInternal } from './buildInternal';
 import { REACTIVE_META } from './current';
 import { markExpired, nextTickFlush } from './reactive';
 
-const { MUTATE } = FROM;
-
 /**
  * 如果变化命中了 rules[].ids 或 globaIds 规则，则添加到 mutateCtx.ids 或 globalIds 里
  */

diff --git a/packages/helux-core/src/factory/creator/parse.ts b/packages/helux-core/src/factory/creator/parse.ts
@@ -85,13 +85,14 @@ export function parseMutateFn(fnItem: Dict, inputDesc?: string, checkDupDict?: D
       fn: fnItem,
       deps: noopArr,
       oriDesc: desc,
+      onlyDeps: false,
       desc,
       depKeys: [],
       checkDeadCycle: undefined,
       watchKey: '',
     };
   } else if (isObj(fnItem)) {
-    const { fn, desc, deps, task, immediate, checkDeadCycle } = fnItem;
+    const { fn, desc, deps, task, immediate, checkDeadCycle, onlyDeps = false } = fnItem;
     const descVar = inputDesc || desc || '';
     const fnVar = isFn(fn) ? fn : undefined;
     const taskVar = isFn(task) ? task : undefined;
@@ -106,6 +107,7 @@ export function parseMutateFn(fnItem: Dict, inputDesc?: string, checkDupDict?: D
         oriDesc: descVar,
         deps: depsVar,
         task: taskVar,
+        onlyDeps,
         immediate,
         depKeys: [],
       };

diff --git a/packages/helux-core/src/factory/creator/reactive.ts b/packages/helux-core/src/factory/creator/reactive.ts
@@ -130,7 +130,7 @@ function getReactiveVal(internal: TInternal, forAtom: boolean) {
   return forAtom ? draft.val : draft;
 }
 
-function marUsing(rKey: string) {
+function markUsing(rKey: string) {
   REACTIVE_META.markUsing(rKey);
   const watchFnKey = TRIGGERED_WATCH.current();
   if (watchFnKey) {
@@ -168,14 +168,14 @@ export function buildReactive(internal: TInternal, fnDepKeys: string[], options?
       [IS_ATOM]: forAtom,
     };
     const set = (forAtom: boolean, key: any, value: any) => {
-      marUsing(rKey);
+      markUsing(rKey);
       const draftVal = getReactiveVal(internal, forAtom);
       // handleOperate 里会自动触发 nextTickFlush
       draftVal[key] = value;
       return true;
     };
     const get = (forAtom: boolean, key: any, innerData: Dict) => {
-      marUsing(rKey);
+      markUsing(rKey);
       const val = innerData[key];
       if (val !== undefined) {
         return val;

diff --git a/packages/helux-core/src/types/api.d.ts b/packages/helux-core/src/types/api.d.ts
@@ -1,6 +1,6 @@
 /*
 |------------------------------------------------------------------------------------------------
-| [email protected].13
+| [email protected].14
 | A state library core that integrates atom, signal, collection dep, derive and watch,
 | it supports all react like frameworks ( including react 18 ).
 |------------------------------------------------------------------------------------------------
@@ -59,7 +59,7 @@ import type {
   WatchOptionsType,
 } from './base';
 
-export declare const VER: '3.5.13';
+export declare const VER: '3.5.14';
 
 export declare const LIMU_VER: string;
 

diff --git a/packages/helux-core/src/types/base.d.ts b/packages/helux-core/src/types/base.d.ts
@@ -293,6 +293,11 @@ export type MutateFn<T = SharedState, P = ReadOnlyArr> = (
 export type MutateFnItem<T = SharedState, P = ReadOnlyArr> = {
   /** 异步 mutate 的依赖项列表 */
   deps?: (state: StateType<T>) => P;
+  /**
+   * defalt: false
+   * 依赖全部由 deps 函数提供，fn 执行过程中不收集任何依赖
+   */
+  onlyDeps?: boolean;
   /** fn 和 deps 均可以收集依赖，对应存在 task 的场景，deps 或 fn 两者保证至少有一个 */
   fn?: MutateFn<T, P>;
   task?: MutateTask<T, P>;