solid-alive 0.2.7 → 0.2.9

package/dist/index.js

@@ -1 +1 @@
-import{createComponent as e}from"solid-js/web";import{createStore as n,produce as o}from"solid-js/store";import{createContext as t,createComputed as r,on as i,useContext as l,createRoot as s,getOwner as d,createEffect as a,onCleanup as f,runWithOwner as v}from"solid-js";var c=t({elements:{},symbolClose:Symbol("close"),info:{frozen:!1,cbOnOff:"off",currComponentId:""},setInfo:()=>{},insertElement:()=>{},removeAliveElements:()=>{},insertCacheCb:()=>{},setCb:()=>{}});function u(t){let[l,s]=n(),d={frozen:!1,cbOnOff:"off",currComponentId:""},a=Symbol("close"),f=new Map,v=new Map;var u=e=>{let n=e.id,o=Object.values(l).find((e=>{var o;return null===(o=e.subIds)||void 0===o?void 0:o.has(n)}));s([n],Object.assign(Object.assign(Object.assign({},l[n]),e),{fatherId:null==o?void 0:o.id}))},m=e=>{let n=f.get(e),t=v.get(e);f.delete(e),v.delete(e),Reflect.has(l,e)&&s(o((o=>{o[e].onActivated=n,o[e].onDeactivated=t,o[e].loaded=!0})))},b=e=>{var n,o,t;if(Reflect.has(l,e)){var r=null===(n=l[e])||void 0===n?void 0:n.subIds;null==r||r.forEach((n=>n!==e&&b(n))),null===(t=(o=l[e]).dispose)||void 0===t||t.call(o),s({[e]:void 0})}},O=e=>{if(Array.isArray(e))for(const n of e)b(n);else if(!e)for(const e of Object.values(l))b(e.id)},I=(e,n)=>{var{cbOnOff:o,currComponentId:t}=d;if("on"===o&&t!==a&&n){var r={onActivated:f,onDeactivated:v}[e],l=r.get(t)||new Set;l.add(i([],n))&&r.set(t,l)}},h=(e,n)=>{d[e]=n};return r(((e=[])=>{var n=t.includes||[];if(e.length>n.length){var o=new Set(n);O(e.filter((e=>!o.has(e))))}return n}),t.includes||[]),e(c.Provider,{get value(){return{info:d,elements:l,symbolClose:a,setInfo:h,setCb:I,insertElement:u,removeAliveElements:O,insertCacheCb:m,aliveIds:t.includes}},get children(){return t.children}})}function m(e,n,o){return function(t){var{info:i,elements:u,symbolClose:m,setInfo:b,insertElement:O,insertCacheCb:I,aliveIds:h}=l(c);if(!h||!h.includes(n))return e(t);!Reflect.has(u,n)&&s((r=>{b("currComponentId",n),b("cbOnOff","on"),O({id:n,dispose:r,owner:d(),element:e(t),subIds:Array.isArray(o)?new Set(o):null})}));return r((()=>{var e;!u[n].loaded&&(e=>{for(var n,o=null===(n=u[e])||void 0===n?void 0:n.element;"function"==typeof o;)o=o();return o})(n)&&(I(n),!(null===(e=u[n].subIds)||void 0===e?void 0:e.size)&&b("currComponentId",m))})),a((()=>{var e,o,t;i.frozen?!(null===(e=u[n].subIds)||void 0===e?void 0:e.size)&&b("frozen",!1):(null===(o=u[n])||void 0===o?void 0:o.loaded)&&(b("cbOnOff","off"),null===(t=u[n].onActivated)||void 0===t||t.forEach((e=>e())),b("cbOnOff","on"))})),f((()=>{var e,o;i.frozen||(b("cbOnOff","off"),null===(o=null===(e=u[n])||void 0===e?void 0:e.onDeactivated)||void 0===o||o.forEach((e=>e())),b("cbOnOff","on"))})),u[n].owner&&v(u[n].owner,(()=>u[n].element))}}function b(n){var o=m((()=>n.children),n.id,n.subIds);return e(o,{})}function O(){var{setCb:e,removeAliveElements:n,setInfo:o}=l(c);return{onActivated:n=>e("onActivated",n),onDeactivated:n=>e("onDeactivated",n),removeAliveElements:n,setInfo:o}}function I(e){var{onActivated:n}=O();n(e)}function h(e){var{onDeactivated:n}=O();n(e)}function A(){var{removeAliveElements:e,setInfo:n}=O();return{onActivated:I,onDeactivated:h,removeAliveElements:e,aliveFrozen:()=>n("frozen",!0)}}export{b as AliveComponent,u as AliveProvider,m as aliveTransfer,I as onActivated,h as onDeactivated,A as useAlive};
+import{createComponent as e}from"solid-js/web";import{createStore as n,produce as o}from"solid-js/store";import{createContext as r,createComputed as t,on as i,useContext as l,createRoot as s,getOwner as d,onCleanup as v,runWithOwner as a}from"solid-js";var c=r({elements:{},symbolClose:Symbol("close"),info:{frozen:!1,cbOnOff:"off",currComponentId:""},insertElement:()=>{},removeAliveElements:()=>{},setCb:()=>{}});function f(r){let[l,s]=n(),d=Symbol("close"),v={frozen:!1,cbOnOff:"on",currComponentId:d,aliveIds:null};var a=e=>{var n,o,r;l[e]&&(null===(n=l[e].subIds)||void 0===n||n.forEach((n=>n!==e&&a(n))),null===(r=(o=l[e]).dispose)||void 0===r||r.call(o),s({[e]:void 0}))},f=e=>{if(Array.isArray(e))for(const n of e)a(n);else if(!e)for(const e of Object.keys(l))a(e)};return t((e=>{var n=Array.isArray(r.include),o=n?r.include:[];return v.aliveIds=n?r.include:null,e.length>o.length&&f(e.filter((e=>!o.includes(e)))),o}),Array.isArray(r.include)?r.include:[]),e(c.Provider,{value:{info:v,elements:l,symbolClose:d,setCb:(e,n)=>{var r=v.cbOnOff,t=v.currComponentId;"on"===r&&"string"==typeof t&&n&&(!l[t]&&s(t,{}),s(o((o=>{o[t][e]=[...o[t][e]||[],i([],n)]}))),"onActivated"===e&&Promise.resolve().then((()=>{v.cbOnOff="off",n(),v.cbOnOff="on"})))},insertElement:e=>{s([e.id],Object.assign(Object.assign({},l[e.id]),e))},removeAliveElements:f},get children(){return r.children}})}function u(e,n,o){return function(r){var t,{info:i,elements:f,symbolClose:u,insertElement:m}=l(c);return Array.isArray(i.aliveIds)&&!i.aliveIds.includes(n)?e(r):(f[n]?(i.currComponentId=u,i.frozen?!(null===(t=f[n].subIds)||void 0===t?void 0:t.length)&&(i.frozen=!1):Promise.resolve().then((()=>{var e;return null===(e=f[n].onActivated)||void 0===e?void 0:e.forEach((e=>e()))}))):(i.currComponentId=n,s((t=>{m({id:n,dispose:t,owner:d(),element:e(r),subIds:Array.isArray(o)?o:null})}))),v((()=>{var e,o;i.frozen||(i.currComponentId=u,null===(o=null===(e=f[n])||void 0===e?void 0:e.onDeactivated)||void 0===o||o.forEach((e=>e())))})),f[n].owner&&a(f[n].owner,(()=>f[n].element)))}}function m(n){var o=u((()=>n.children),n.id,n.subIds);return e(o,{})}function A(){var{setCb:e,removeAliveElements:n,info:o}=l(c);return{onActivated:n=>e("onActivated",n),onDeactivated:n=>e("onDeactivated",n),removeAliveElements:n,info:o}}function b(e){var{onActivated:n}=A();n(e)}function y(e){var{onDeactivated:n}=A();n(e)}function I(){var{removeAliveElements:e,info:n,onActivated:o,onDeactivated:r}=A();return{onActivated:o,onDeactivated:r,removeAliveElements:e,aliveFrozen:()=>n.frozen=!0}}export{m as AliveComponent,f as AliveProvider,u as aliveTransfer,b as onActivated,y as onDeactivated,I as useAlive};

package/dist/types/AliveProvider.d.ts

@@ -1,7 +1,7 @@
-import { ProveiderProps } from './default';
+import { ProveiderProps } from "./default";
 /**
  * @description Alive
  * @param children jsx.element
- * @param {Arrya<string> | null} [includes]  哪些路由要缓存, 不写默认缓存所有
+ * @param {Arrya<string> | null} [include]  哪些路由要缓存, 不写默认缓存所有
  */
 export default function AliveProvider(props: ProveiderProps): import("solid-js").JSX.Element;

package/dist/types/aliveTransfer.d.ts

@@ -1,4 +1,4 @@
-import { JSX } from 'solid-js';
+import { JSX } from "solid-js";
 /**
  * @description Alive 组件用的 转换函数; aliveTransfer(Comp, ‘/home’)
  * @param { ()=> JSX.Element } Component () => JSX.Element

package/dist/types/default.d.ts

@@ -1,27 +1,22 @@
-import { JSX } from 'solid-js'
+import { JSX, Accessor } from 'solid-js'
 
-interface pub{
-  aliveIds?: Array<string> | null
-}
-
-export interface ProveiderProps  {
+export interface ProveiderProps {
   children: JSX.Element
-  includes?:pub['aliveIds']
+  include?: Array<string> | null
 }
 
-export type tActivated = "onActivated" | "onDeactivated"
+export type tActivated = 'onActivated' | 'onDeactivated'
 
 export interface NodeInfo {
   id: string
-  loaded?: boolean
   owner: any
   component?: ((props: any) => JSX.Element) | null
   element?: JSX.Element | null
-  subIds?: Set<string> | null
+  subIds?: Array<string> | null
   dispose?: (() => void) | null
-  onActivated?: null | Set<() => void>
-  onDeactivated?: null | Set<() => void>
-  fatherId?: string
+  onActivated?: Array<() => void> | null
+  onDeactivated?:  Array<() => void> | null
+  // fatherId?: string
 }
 
 export interface SetElement {
@@ -33,22 +28,23 @@ export interface StoreProps {
 }
 
 export interface IInfo {
-  frozen: boolean 
-  cbOnOff: 'on' | 'off' 
-  currComponentId: string | symbol 
+  frozen: boolean
+  cbOnOff: 'on' | 'off'
+  currComponentId: string | symbol,
+  aliveIds?:Array<string> | null
 }
 
 export type TSetInfo = <T extends keyof IInfo>(key: T, value: IInfo[T]) => void
 
-export interface ContextProps extends pub {
+export interface ContextProps{
   elements: StoreProps
   info: IInfo
   symbolClose: symbol
-  setInfo: TSetInfo
+  // setInfo: TSetInfo
   insertElement: (d: NodeInfo) => void
   removeAliveElements: (ids?: Array<IAliveElementIds>) => void
-  insertCacheCb: (id: string) => void
-  setCb:(t: tActivated, cb: () => void)=>void
+  // insertCacheCb: (id: string) => void
+  setCb: (t: tActivated, cb: () => void) => void
 }
 
 interface IActive {

package/dist/types/useAlive.d.ts

@@ -7,8 +7,8 @@ export declare function onDeactivated(fn: () => void): void;
  * @returns onDeactivated 离开
  */
 export declare function useAlive(): {
-    onActivated: typeof onActivated;
-    onDeactivated: typeof onDeactivated;
+    onActivated: (cb: () => void) => void;
+    onDeactivated: (cb: () => void) => void;
     removeAliveElements: (ids?: Array<import("./default").IAliveElementIds>) => void;
-    aliveFrozen: () => void;
+    aliveFrozen: () => boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-alive",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "author": "1iuxs",
   "description": "solid-alive",
   "type": "module",

package/readme.md

@@ -5,7 +5,7 @@
 ### 描述(describe)
 - 用于 solid 组件缓存,只测试过2级路由缓存
 - AliveProvider 
-  - includes : 数组, 不传默认缓存所有,  ['/','/about']
+  - include : 数组, 不传默认缓存所有,  ['/','/about'], 当数据变少时, 会自动去删除少的数据缓存
 - AliveComponent 不要在 有缓存 的组件中使用
 - 在 useAlive 
   - removeAliveElements: 函数, 可传一个参数, 不传就删除所有缓存 :
@@ -30,9 +30,10 @@ import { AliveProvider } from  'solid-alive'
 
 const root = document.getElementById('root')
 
-  // includes, 默认缓存所有
+  // include, 不传 默认缓存所有: include={['/','/about']}
+  // When the data decreases, the reduced cache data will be automatically deleted
 render(() => 
-  <AliveProvider>
+  <AliveProvider include={[]}>
     <App />
   </AliveProvider>
 , root!)