solid-alive 0.3.1 → 0.3.3

package/dist/index.js

@@ -1 +1 @@
-import{createComponent as e}from"solid-js/web";import{createContext as t,useContext as n,createRoot as r,getOwner as i,onCleanup as o,runWithOwner as l,createEffect as s,untrack as d}from"solid-js";import{produce as u,createStore as v}from"solid-js/store";const a=Symbol("currentId"),c=Symbol("setActiveCb");var m=t({elements:{},setElements:()=>{},setActiveCb:()=>{},aliveIds:()=>{}});const f=t({[a]:void 0,[c]:()=>{}});function A(t,s,d){return function(v){var A,y,h=n(m);return(null===(A=h.aliveIds())||void 0===A?void 0:A.includes(s))?(h.elements[s]?null===(y=h.elements[s].onActivated)||void 0===y||y.forEach((e=>e())):(h.setElements({[s]:{id:s,subsets:Array.isArray(d)?d:null}}),r((n=>{h.setElements(u((r=>{r[s].dispose=n,r[s].id=s,r[s].owner=i(),r[s].element=e(f.Provider,{get value(){return{[a]:s,[c]:h.setActiveCb}},get children(){return t(v)}})})))}))),o((()=>{var e;null===(e=h.elements[s].onDeactivated)||void 0===e||e.forEach((e=>e()))})),h.elements[s].owner&&l(h.elements[s].owner,(()=>h.elements[s].element))):t(v)}}function y(t){const[n,r]=v(),i=e=>{var t,o,l;if(Array.isArray(e))for(var s of e)i(null===(t=n[s])||void 0===t?void 0:t.subsets),null===(l=null===(o=n[s])||void 0===o?void 0:o.dispose)||void 0===l||l.call(o),r({[s]:void 0})};return s((e=>{var n=Array.isArray(t.include)?t.include:[];if(e.length>n.length){var r=new Set(n);i(e.filter((e=>!r.has(e))))}return n}),Array.isArray(t.include)?t.include:[]),e(m.Provider,{value:{elements:n,setElements:r,setActiveCb:(e,t,n,i)=>{r(u((r=>{r[e][t]?r[e][t][i](n):"add"===i&&(r[e][t]=new Set([n]))})))},aliveIds:()=>t.include},get children(){return t.children}})}function h(e,t){d((()=>{var r=n(f),i=r[a];i&&(r[c](i,e,t,"add"),"onActivated"===e&&s((()=>{!function(e){"undefined"!=typeof Promise&&"function"==typeof Promise.prototype.then?Promise.resolve().then(e):setTimeout(e)}(t)})),o((()=>{r[c](i,e,t,"delete"),t=null})))}))}function p(e){h("onActivated",e)}function b(e){h("onDeactivated",e)}export{y as AliveProvider,A as aliveTransfer,p as onActivated,b as onDeactivated};
+import{createComponent as e}from"solid-js/web";import{createContext as n,useContext as t,createRoot as r,createEffect as i,onCleanup as o,untrack as l}from"solid-js";import{produce as s,createStore as a}from"solid-js/store";const d=Symbol("currentId"),v=Symbol("setActiveCb"),u=Symbol("parentId");var c=n({elements:{},setElements:()=>{},setActiveCb:()=>{},aliveIds:()=>{},info:{frozen:!1},transitionEnterName:()=>{}});const f=n({[d]:void 0,[v]:()=>{}});var m=(n,t,r,i)=>e(f.Provider,{value:{[d]:i,[v]:r,[u]:t},get children(){return n()}}),p=e=>{for(;"function"==typeof e;)e=e();return e},h=!1;function y(e,n,l){return function(a){var v,u,y,A,b=t(c),E=t(f)[d],I=b.transitionEnterName();if(!(null===(v=b.aliveIds())||void 0===v?void 0:v.includes(n)))return m((()=>e(a)));if(E&&(null===(u=b.elements[n])||void 0===u?void 0:u.parentId)&&b.elements[n].parentId!==E)return null;b.elements[n]?b.info.frozen?(null===(y=b.elements[n].subsets)||void 0===y?void 0:y.some((e=>b.elements[e])))||(b.info.frozen=!1):null===(A=b.elements[n].onActivated)||void 0===A||A.forEach((e=>e())):(b.setElements({[n]:{id:n,subsets:Array.isArray(l)?l:null}}),r((t=>{b.setElements(s((r=>{var i;r[n].dispose=t,r[n].parentId=null===(i=Object.values(b.elements).find((e=>{var t;return null===(t=e.subsets)||void 0===t?void 0:t.includes(n)})))||void 0===i?void 0:i.id,r[n].element=m((()=>e(a)),r[n].parentId,b.setActiveCb,n)})))})));var g=e=>{if(e instanceof HTMLElement&&!h){h=!0,e.classList.add(I);var n=()=>{e.removeEventListener("animationend",n),e.classList.remove(I),h=!1};e.addEventListener("animationend",n)}};return I&&!b.info.frozen&&i((()=>{if(!h){var e=n;do{b.elements[e].parentId||g(p(b.elements[e].element)),e=b.elements[e].parentId}while(e)}})),o((()=>{var e,t;b.info.frozen||null===(t=null===(e=b.elements[n])||void 0===e?void 0:e.onDeactivated)||void 0===t||t.forEach((e=>e()))})),b.elements[n].element}}function A(n){const[t,r]=a();return i((e=>{var i=Array.isArray(n.include)?n.include:[];if(e.length>i.length){var o=new Set(i);(e=>{var n,i;if(Array.isArray(e))for(var o of e)null===(i=null===(n=t[o])||void 0===n?void 0:n.dispose)||void 0===i||i.call(n),r({[o]:void 0})})(e.filter((e=>!o.has(e))))}return i}),Array.isArray(n.include)?n.include:[]),e(c.Provider,{value:{info:{frozen:!1},elements:t,setElements:r,setActiveCb:(e,n,t,i)=>{r(s((r=>{r[e][n]?r[e][n][i](t):"add"===i&&(r[e][n]=new Set([t]))})))},aliveIds:()=>n.include,transitionEnterName:()=>n.transitionEnterName},get children(){return n.children}})}const b=(()=>{let e=[],n=!1,t=()=>{},r=/iPad|iPhone|iPod/.test(navigator.userAgent)&&!window.MSStream,i=()=>{n=!1;var t=e.slice(0);e.length=0;for(let e=0;e<t.length;e++)t[e]()};if("undefined"!=typeof Promise&&"function"==typeof Promise.prototype.then){const e=Promise.resolve();t=()=>{e.then(i),r&&setTimeout((()=>{}))}}else if("undefined"!=typeof MutationObserver){let e=1;const n=new MutationObserver(i),r=document.createTextNode(String(e));n.observe(r,{characterData:!0}),t=()=>{e=(e+1)%2,r.data=String(e)}}else t=()=>{setTimeout(i,0)};return r=>{e.push(r),n||(n=!0,t())}})();function E(e,n){l((()=>{var r,i=t(f),l=i[d];l&&(null===(r=i[v])||void 0===r||r.call(i,l,e,n,"add"),"onActivated"===e&&b(n),o((()=>{var t;null===(t=i[v])||void 0===t||t.call(i,l,e,n,"delete"),n=null})))}))}function I(e){E("onActivated",e)}function g(e){E("onDeactivated",e)}function S(){var e=t(c).info;return()=>e.frozen=!0}export{A as AliveProvider,y as aliveTransfer,b as nextTick,I as onActivated,g as onDeactivated,S as useAliveFrozen};

package/dist/types/AliveProvider.d.ts

@@ -1,2 +1,8 @@
 import { ProveiderProps } from "./types";
+/**
+ * @description Alive
+ * @param children jsx.element
+ * @param {Arrya<string> | null} [include]  哪些路由要缓存, 默认不缓存, ['/','/about',...]
+ * @param {string} [transitionEnterName] 动画名称 transitionEnterName="appear"
+ */
 export default function AliveProvider(props: ProveiderProps): import("solid-js").JSX.Element;

package/dist/types/active.d.ts

@@ -1,2 +1,3 @@
 export declare function onActivated(cb: () => void): void;
 export declare function onDeactivated(cb: () => void): void;
+export declare function useAliveFrozen(): () => boolean;

package/dist/types/aliveTransfer.d.ts

@@ -1,2 +1,8 @@
 import { JSX } from "solid-js";
-export default function aliveTransfer(Component: <T>(props: T) => JSX.Element, id: string, subsets?: Array<string>): <T>(props: T) => any;
+/**
+ * @description Alive 组件用的 转换函数; aliveTransfer(Comp, ‘/home’)
+ * @param { ()=> JSX.Element } Component () => JSX.Element
+ * @param { string } id  string,自己的id 值,一定要唯一
+ * @param { Array<string> } [subsets]  [string,...], 子组件的 id值 可不传
+ */
+export default function aliveTransfer(Component: <T>(props: T) => JSX.Element, id: string, subsets?: Array<string> | null): <T>(props: T) => JSX.Element;

package/dist/types/context.d.ts

@@ -1,9 +1,11 @@
 import { Context } from "./types";
 export declare const CURRENTID: unique symbol;
 export declare const SETACTIVECB: unique symbol;
+export declare const PARENTID: unique symbol;
 declare const _default: import("solid-js").Context<Context>;
 export default _default;
 export declare const ChildContext: import("solid-js").Context<{
     [CURRENTID]: string | undefined;
-    [SETACTIVECB]: Context["setActiveCb"];
+    [SETACTIVECB]?: Context["setActiveCb"];
+    [PARENTID]?: string;
 }>;

package/dist/types/index.d.ts

@@ -1,4 +1,5 @@
 import aliveTransfer from "./aliveTransfer";
 import AliveProvider from "./AliveProvider";
-import { onActivated, onDeactivated } from "./active";
-export { aliveTransfer, AliveProvider, onActivated, onDeactivated };
+import { onActivated, onDeactivated, useAliveFrozen } from "./active";
+import nextTick from "./nextTick";
+export { aliveTransfer, AliveProvider, onActivated, onDeactivated, useAliveFrozen, nextTick };

package/dist/types/nextTick.d.ts

@@ -1 +1,2 @@
-export declare function nextTick(cb: () => void): void;
+declare const nextTick: (cb: () => void) => void;
+export default nextTick;

package/dist/types/types.d.ts

@@ -1,4 +1,4 @@
-import { Owner, JSX } from "solid-js"
+import { Owner, JSX, Accessor } from "solid-js"
 import { SetStoreFunction } from "solid-js/store"
 
 export type EmitType = keyof Emit
@@ -14,21 +14,34 @@ export interface Emit {
 
 export interface ProveiderProps {
   children: JSX.Element
-  include?:  Array<string>
+  include?: Array<string>
+  transitionEnterName?: string
+}
+
+export interface Info {
+  frozen: boolean
 }
 
 export interface Element {
   id: string
   element: JSX.Element
+  subsets?:Array<string> | null
   dispose?: () => void
   onActivated?: Set<() => void>
   onDeactivated?: Set<() => void>
-  subsets?: Array<string>
+  parentId?: string
   owner?: Owner | null
 }
 export interface Context {
   elements: Record<string, Element>
   setElements: SetStoreFunction<{}>
-  aliveIds: ()=> Array<string> | undefined
-  setActiveCb: (id:string,t: Activate, cb: () => void, t1: 'add'| 'delete') => void
+  aliveIds: () => Array<string> | undefined
+  setActiveCb: (
+    id: string,
+    t: Activate,
+    cb: () => void,
+    t1: "add" | "delete"
+  ) => void
+  info: { frozen: boolean }
+  transitionEnterName: () => string | void
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-alive",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "author": "1iuxs",
   "description": "solid-alive",
   "type": "module",
@@ -12,9 +12,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
-    "keep-alive",
     "solid-js",
-    "keepalive",
     "cache",
     "solid-alive",
     "solid-keep-alive",
@@ -32,21 +30,21 @@
   },
   "license": "ISC",
   "dependencies": {
-    "solid-js": "^1.8.17"
+    "solid-js": "^1.9.4"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-node-resolve": "^15.3.1",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/css-modules": "^1.0.5",
-    "autoprefixer": "^10.4.19",
-    "rollup": "^4.18.0",
+    "autoprefixer": "^10.4.20",
+    "rollup": "^4.30.1",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-serve": "^1.1.1",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.36.0",
     "rollup-preset-solid": "^2.0.1",
-    "typescript": "^5.4.5"
+    "typescript": "^5.7.3"
   }
 }

package/readme.md

@@ -5,19 +5,14 @@
 ### 描述(describe)
 - 用于 solid 组件缓存,只测试过2级路由缓存
 - AliveProvider 
-  - include : 数组, 不传默认缓存所有,  ['/','/about'], 当数据变少时, 会自动去删除少的数据缓存
-- AliveComponent 不要在 有缓存 的组件中使用
+  - include : 数组,  ['/','/about'], 当数据变少时, 会自动去删除少的数据缓存
 - 在 useAlive 
-  - removeAliveElements: 函数, 可传一个参数, 不传就删除所有缓存 :
-    removeAliveElements(['/home'])
   - onActivated
   - onDeactivated
-  - aliveForzen: 暂时不响应 路由数据变化, aliveForzen()
 
 - 子父 缓存/删除 问题
   -  如果某组件下有子组件,在父的 aliveTransfer中, 
     第三个参数,为对象 写上子组件的唯一id: {children:['/childrenId','asf',...]}
-  -  使用见下图, 也可用 removeAliveElements 删除
 
 
 
@@ -30,8 +25,6 @@ import { AliveProvider } from  'solid-alive'
 
 const root = document.getElementById('root')
 
-  // include, 不传 默认缓存所有: include={['/','/about']}
-  // When the data decreases, the reduced cache data will be automatically deleted
 render(() => 
   <AliveProvider include={[]}>
     <App />
@@ -93,10 +86,6 @@ import {  onActivated,onDeactivated,useAlive, AliveComponent } from "solid-alive
 export default function Single() {
   const { removeAliveElements,aliveFrozen } = useAlive()
 
-  const click = () => {
-    removeAliveElements(['/about']) // delete '/about'; 删除 /about
-    // removeAliveElements() // delete all alive element; 会删除所有缓存的组件
-  }
 
   //todo call 这个会被调用
   onActivated(()=>{
@@ -114,10 +103,6 @@ export default function Single() {
   return (
     <div>
       <h2>Single</h2>
-      { /** 这个 AliveComponent 最好是在 未缓存的组件 中使用, 不然生命周期不同步  */ }
-      <AliveComponent id={'home1'}>
-        <Home />
-      </AliveComponent>
       <input type="text" style={{ border: '2px solid red' }} />
     </div>
   )
@@ -156,20 +141,6 @@ const App: Component = () => {
   const { aliveFrozen } = useAlive()
 
   const [data, setData] = createStore<MenuData[]>([])
-  const a: MenuData = {
-    id: 2,
-    text: 'ABOUT',
-    path: '/about',
-    realPath: '/About/index.tsx',
-    parentId: null,
-  }
- const addRoute =()=>{
-    aliveFrozen() // 暂时不响应下面数据变化
-    setData(d => {
-      return [...d, a]
-    })
-  }
-
   return (
     <Router>
       <Route component={Client}>