solid-alive 0.2.0 → 0.2.2

package/dist/index.js

@@ -1 +1 @@
-import{createComponent as e}from"solid-js/web";import{createStore as n,produce as t}from"solid-js/store";import{createContext as o,on as r,useContext as i,createRoot as l,createEffect as a,onCleanup as v}from"solid-js";var d=o({elements:{},info:{frozen:!1},setInfo:()=>{},insertElement:()=>{},onDeactivated:()=>{},onActivated:()=>{},removeAliveElement:()=>{},setCurrentComponentId:()=>{},insertCacheCb:()=>{}});function c(o){let[i,l]=n(),[a,v]=n({frozen:!0}),c="",s=new Map,f=new Map,u={onActivated:{},onDeactivated:{}};var m=e=>{var n;if(Reflect.has(i,e)){var t=null===(n=i[e])||void 0===n?void 0:n.children;null==t||t.forEach((n=>n!==e&&m(n))),l((n=>{var t,o;return n[e].onDeactivated=null,n[e].component=null,null===(o=(t=n[e]).dispose)||void 0===o||o.call(t),n[e].dispose=null,n[e].onActivated=null,n[e].onDeactivated=null,n[e].children=null,n[e]=null,delete n[e],n}))}},p=e=>{var{caller:n,path:t}=function(){var e=null,n=null;try{throw new Error}catch(l){var t=l.stack.split("\n"),o=t[0].includes("@")?5:6,r=t[o].trim(),i=r.includes("@")?r.split("@"):r.split(" ").slice(1);e=i[0],n=i[1]}return{caller:e,path:n}}(),o=u[e];return o[n]&&o[n]!==t?(console.warn(`[solid-alive]:检测到多个${e}函数 ${t}`),!1):(u[e][n]=t,!0)},h=(e,n)=>{if(!a.frozen&&n&&p(e)){var t={onActivated:s,onDeactivated:f}[e],o=t.get(c)||new Set;o.add(r([],n))&&t.set(c,o)}};return e(d.Provider,{value:{info:a,elements:i,setInfo:v,onActivated:e=>{h("onActivated",e)},onDeactivated:e=>{h("onDeactivated",e)},insertElement:e=>{let n=e.id;l([n],Object.assign(Object.assign({},i[n]),e))},removeAliveElement:e=>{if(null==e)for(const e of Object.values(i))m(e.id);else m(e)},setCurrentComponentId:e=>{c=e},insertCacheCb:e=>{let n=s.get(e),o=f.get(e);s.delete(e),f.delete(e),u.onActivated={},u.onDeactivated={},Reflect.has(i,e)&&l(t((t=>{t[e].onActivated=n,t[e].onDeactivated=o,t[e].loaded=!0})))}},get children(){return o.children}})}let s=new Set([]);function f(n,t,o){var{info:r,elements:c,setInfo:f,insertElement:u,setCurrentComponentId:m,insertCacheCb:p}=i(d);Reflect.has(c,t)||(f("frozen",!1),m(t),l((r=>{u({id:t,dispose:r,component:e(n,{}),children:Array.isArray(o)?new Set(o):null})})));var h=e=>{var n;if(c[e].isTop)return e;var t=null===(n=Object.values(c).find((n=>{var t;return null===(t=n.children)||void 0===t?void 0:t.has(e)})))||void 0===n?void 0:n.id;return t&&(t=h(t)),t||e};return s.has(h(t))||s.clear(),a((()=>{var e,n;if(f("frozen",!1),!s.has(t))if(c[t].loaded)s.add(t),f("frozen",!0),null===(e=c[t].onActivated)||void 0===e||e.forEach((e=>e())),f("frozen",!1);else{let e=null===(n=c[t])||void 0===n?void 0:n.component;for(;"function"==typeof e;)e=e();e instanceof HTMLElement&&p(t)}})),v((()=>{var e;r.frozen||(f("frozen",!0),null===(e=c[t].onDeactivated)||void 0===e||e.forEach((e=>e())),f("frozen",!1))})),c[t].component}function u(){var{onActivated:e,onDeactivated:n,removeAliveElement:t,setInfo:o}=i(d);return{onActivated:e,onDeactivated:n,removeAliveElement:t,setInfo:o}}function m(e){var{onActivated:n}=u();n(e)}function p(e){var{onDeactivated:n}=u();n(e)}function h(){var{removeAliveElement:e,setInfo:n}=u();return{removeAliveElement:e,aliveFrozen:()=>n("frozen",!0)}}export{c as AliveProvider,f as AliveTransfer,m as onActivated,p as onDeactivated,h as useAlive};
+import{createComponent as e}from"solid-js/web";import{createStore as t,produce as n}from"solid-js/store";import{createContext as r,on as o,useContext as a,createRoot as i,createComputed as l,createEffect as s,onCleanup as d}from"solid-js";var v=r({elements:{},info:{frozen:!1},setInfo:()=>{},insertElement:()=>{},onDeactivated:()=>{},onActivated:()=>{},removeAliveElements:()=>{},setCurrentComponentId:()=>{},insertCacheCb:()=>{}});function c(r){let[a,i]=t(),[l,s]=t({frozen:!0}),d="",c=new Map,f=new Map,u={onActivated:{},onDeactivated:{}};var m=e=>{var t;if(Reflect.has(a,e)){var n=null===(t=a[e])||void 0===t?void 0:t.subIds;null==n||n.forEach((t=>t!==e&&m(t))),i((t=>{var n,r;return null===(r=(n=t[e]).dispose)||void 0===r||r.call(n),t[e]=null,delete t[e],t}))}},A=e=>{var{caller:t,path:n}=function(){var e=null,t=null;try{throw new Error}catch(i){var n=i.stack.split("\n"),r=n[0].includes("@")?5:6,o=n[r].trim(),a=o.includes("@")?o.split("@"):o.split(" ").slice(1);e=a[0],t=a[1]}return{caller:e,path:t}}(),r=u[e];return(!r[t]||r[t]===n)&&(u[e][t]=n,!0)},h=(e,t)=>{if(!l.frozen&&t&&A(e)){var n={onActivated:c,onDeactivated:f}[e],r=n.get(d)||new Set;r.add(o([],t))&&n.set(d,r)}};return e(v.Provider,{value:{info:l,elements:a,setInfo:s,onActivated:e=>{h("onActivated",e)},onDeactivated:e=>{h("onDeactivated",e)},insertElement:e=>{let t=e.id;var n=Object.values(a).find((e=>{var n;return null===(n=e.subIds)||void 0===n?void 0:n.has(t)}));i([t],Object.assign(Object.assign(Object.assign({},a[t]),e),{fatherId:null==n?void 0:n.id}))},removeAliveElements:e=>{if(Array.isArray(e))for(const t of e)m(t);else if(!e)for(const e of Object.values(a))m(e.id)},setCurrentComponentId:e=>{d=e},insertCacheCb:e=>{let t=c.get(e),r=f.get(e);c.delete(e),f.delete(e),u.onActivated={},u.onDeactivated={},Reflect.has(a,e)&&i(n((n=>{n[e].onActivated=t,n[e].onDeactivated=r,n[e].loaded=!0})))}},get children(){return r.children}})}let f=new Set([]);function u(e,t,n){return function(r){var{info:o,elements:c,setInfo:u,insertElement:m,setCurrentComponentId:A,insertCacheCb:h}=a(v);Reflect.has(c,t)||(u("frozen",!1),A(t),i((o=>{m({id:t,dispose:o,owner:null,element:e(r),subIds:Array.isArray(n)?new Set(n):null})})));var p=e=>{var t=c[e].fatherId;return t?p(t):e};return l((()=>{var e;if(c[t].loaded)return;let n=null===(e=c[t])||void 0===e?void 0:e.element;for(;"function"==typeof n;)n=n();(Array.isArray(n)||n instanceof HTMLElement)&&h(t)})),f.size&&!f.has(p(t))&&f.clear(),s((()=>{var e;u("frozen",!1),f.has(t)||c[t].loaded&&(f.add(t),u("frozen",!0),null===(e=c[t].onActivated)||void 0===e||e.forEach((e=>e())),u("frozen",!1))})),d((()=>{var e;o.frozen||(u("frozen",!0),null===(e=c[t].onDeactivated)||void 0===e||e.forEach((e=>e())))})),c[t].element}}function m(t){var n=u((()=>t.children),t.id,t.subIds);return e(n,{})}function A(){var{onActivated:e,onDeactivated:t,removeAliveElements:n,setInfo:r}=a(v);return{onActivated:e,onDeactivated:t,removeAliveElements:n,setInfo:r}}function h(e){var{onActivated:t}=A();t(e)}function p(e){var{onDeactivated:t}=A();t(e)}function I(){var{removeAliveElements:e,setInfo:t}=A();return{removeAliveElements:e,aliveFrozen:()=>t("frozen",!0)}}export{m as AliveComponent,c as AliveProvider,u as aliveTransfer,h as onActivated,p as onDeactivated,I as useAlive};

package/dist/types/AliveComponent.d.ts

@@ -0,0 +1,6 @@
+import { JSX } from 'solid-js';
+export declare function AliveComponent(props: {
+    children: JSX.Element;
+    id: string;
+    subIds?: Array<string>;
+}): JSX.Element;

package/dist/types/AliveProvider.d.ts

@@ -1,4 +1,4 @@
-import { ProveiderProps } from "./default";
+import { ProveiderProps } from './default';
 /**
  * @description Alive
  * @param children jsx.element

package/dist/types/aliveTransfer.d.ts

@@ -0,0 +1,8 @@
+import { JSX } from 'solid-js';
+/**
+ * @description Alive 组件用的 转换函数
+ * @param { ()=> JSX.Element } Component,
+ * @param { string } id  string,自己的id 值,一定要唯一
+ * @param { Array<string> } [subIds]  [string,...], 子组件的 id值 可不传，这样默认销毁时不会去干掉子组件，
+ */
+export default function aliveTransfer(Component: <T>(props: T) => JSX.Element, id: string, subIds?: Array<string>): <T>(props: T) => JSX.Element;

package/dist/types/default.d.ts

@@ -7,12 +7,15 @@ export interface ProveiderProps {
 export interface NodeInfo {
   id: string
   loaded?: boolean
-  component?: JSX.Element | null
-  children?: Set<string> | null
+  owner: any,
+  props?:any
+  component?: ((props:any) => JSX.Element) | null
+  element?: JSX.Element | null
+  subIds?: Set<string> | null
   dispose?: (() => void) | null
   onActivated?: null | Set<() => void>
   onDeactivated?: null | Set<() => void>
-  isTop?: boolean | null
+  fatherId?: string
 }
 
 export interface SetElement {
@@ -36,15 +39,17 @@ export interface ContextProps {
   insertElement: (d: NodeInfo) => void
   onActivated: (cb: () => void) => void
   onDeactivated: (cb: () => void) => void
-  removeAliveElement: (id?: string) => void
+  removeAliveElements: (ids?: Array<IAliveElementIds>) => void
   setCurrentComponentId: (id: string | symbol) => void
-  insertCacheCb: (id: string) => void
+  insertCacheCb: (id: string ) => void
 }
 
 interface IActive {
-  [key:string]: string
+  [key: string]: string
 }
 export interface IPrevCall {
   onActivated: IActive
   onDeactivated: IActive
 }
+
+export type IAliveElementIds =  string

package/dist/types/index.d.ts

@@ -1,4 +1,5 @@
 import AliveProvider from './AliveProvider';
-import AliveTransfer from './AliveTransfer';
+import aliveTransfer from './aliveTransfer';
+import { AliveComponent } from './AliveComponent';
 import { onActivated, onDeactivated, useAlive } from './useAlive';
-export { AliveProvider, AliveTransfer, onActivated, onDeactivated, useAlive };
+export { AliveComponent, AliveProvider, aliveTransfer, onActivated, onDeactivated, useAlive, };

package/dist/types/useAlive.d.ts

@@ -5,6 +5,6 @@ export declare function onDeactivated(fn: () => void): void;
  * @returns aliveFrozen 让 alive 暂时失去响应, 一般在加新增路由数据时使用
  */
 export declare function useAlive(): {
-    removeAliveElement: (id?: string) => void;
+    removeAliveElements: (ids?: Array<import("./default").IAliveElementIds>) => void;
     aliveFrozen: () => void;
 };

package/package.json

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

package/{README.md → readme.md}

@@ -5,14 +5,16 @@
 ### 描述(describe)
 - 用于 solid 组件缓存,只测试过2级路由缓存
 - AliveProvider 
+- AliveComponent 不要在 有缓存 的组件中使用
 - 在 useAlive 
-  - removeAliveElement: 函数, 可传一个参数, 不传就删除所有缓存 :
-    removeAliveElement('/home')
+  - removeAliveElements: 函数, 可传一个参数, 不传就删除所有缓存 :
+    removeAliveElements(['/home'])
   - aliveForzen: 暂时不响应 路由数据变化, aliveForzen()
+
 - 子父 缓存/删除 问题
-  -  如果某组件下有子组件,在父的 AliveTransfer中, 
+  -  如果某组件下有子组件,在父的 aliveTransfer中, 
     第三个参数,为对象 写上子组件的唯一id: {children:['/childrenId','asf',...]}
-  -  使用见下图, 也可用     -removeAliveElement 删除
+  -  使用见下图, 也可用 removeAliveElements 删除
 
 
 
@@ -32,10 +34,10 @@ render(() =>
 , root!)
  ```
 
-2 /App.tsx ,在 solid-alive 中 有 AliveTransfer, 参数: JSX , id:string, children?:[string..]
+2 /App.tsx ,在 solid-alive 中 有 aliveTransfer, 参数: JSX , id:string, children?:[string..]
  ```jsx
  import { Route, Router } from '@solidjs/router';
-import { AliveTransfer } from 'solid-alive';
+import { aliveTransfer } from 'solid-alive';
 
 import Home from './views/Home';
 import Client from './views/Client';
@@ -44,14 +46,12 @@ import Team from './views/Blog/Team';
 import Blog from './views/Blog';
 import Single from './views/Blog/Single';
 
-const AboutTsf = () => AliveTransfer(About, '/about');
 
-// 当Blog 下有子组件时, 第三个参数一定要, 与子组件的
-const BlogTsf = (props: any) =>
-  AliveTransfer(Blog.bind(null, props), '/blog', ['single', '/team']);
-// blog 下的子组件
-const SingleTsf = () => AliveTransfer(Single, 'single');
-const TeamTsf = () => AliveTransfer(Team, '/team');
+const HomeTransfer = aliveTransfer(Home, '/')
+const AboutTransfer = aliveTransfer(About, '/about')
+const ShopTransfer = aliveTransfer(Shop, '/shop', ['/shopPage'])
+const ShopPageTransfer = aliveTransfer(ShopPage, '/shopPage')
+const BlogTransfer = aliveTransfer(Blog, '/blog', ['contact', 'single'])
 
 export default function App() {
   return (
@@ -63,7 +63,6 @@ export default function App() {
         <Route component={AboutTsf} path={'/about'} />
         {/* 父子 缓存 Parent Child Nesting */}
         <Route component={BlogTsf} path={'/blog'}>
-          <Route component={TeamTsf} path={'team'} />
           <Route component={SingleTsf} path={'single'} />
         </Route>
       </Route>
@@ -85,15 +84,14 @@ export default function Blog(props: any) {
 
 -  子  /views/Blog/Single/index.tsx 中
 ```tsx
-import {  onActivated,onDeactivated,useAlive } from "solid-alive"
+import {  onActivated,onDeactivated,useAlive, AliveComponent } from "solid-alive"
 
 export default function Single() {
-  const { removeAliveElement,aliveFrozen } = useAlive()
+  const { removeAliveElements,aliveFrozen } = useAlive()
 
-  let divRef: Element | undefined = undefined
   const click = () => {
-    removeAliveElement('/about') // delete '/about'; 删除 /about
-    // removeAliveElement() // delete all alive element; 会删除所有缓存的组件
+    removeAliveElements(['/about']) // delete '/about'; 删除 /about
+    // removeAliveElements() // delete all alive element; 会删除所有缓存的组件
   }
 
   //todo call 这个会被调用
@@ -112,18 +110,22 @@ export default function Single() {
   return (
     <div>
       <h2>Single</h2>
+      { /** 这个 AliveComponent 最好是在 未缓存的组件 中使用, 不然生命周期不同步  */ }
+      <AliveComponent id={'home1'}>
+        <Home />
+      </AliveComponent>
       <input type="text" style={{ border: '2px solid red' }} />
     </div>
   )
 }
 ```
 
-
+3 动态生成 路由
 ```tsx
-/** 动态路由 App.tsx */
+/**  App.tsx */
 import { createEffect, lazy, type Component } from 'solid-js'
 import { Route, Router } from '@solidjs/router'
-import { useAlive,AliveTransfer } from "solid-alive"
+import { useAlive, aliveTransfer } from "solid-alive"
 
 const modules = import.meta.glob<{ default: Component<any> }>([
   './views/**/**.tsx',
@@ -132,14 +134,13 @@ const modules = import.meta.glob<{ default: Component<any> }>([
 
 const transferRouter = (data: MenuData[]) =>
   data.flatMap(item => {
-    let m = modules[`./views${item.realPath}`]
-    if (!m) return []
-    const Transfer = (props: any) =>
-      AliveTransfer(
-        lazy(m).bind(null, props),
-        item.path,
-        item.children?.map(item => item.path)
-      )
+    let module = modules[`./views${item.realPath}`]
+    if (!module) return []
+    const Transfer = aliveTransfer(
+      lazy(module),
+      item.path,
+      item.children?.map(item => item.path)
+    )
     return (
       <Route component={Transfer} path={item.path.split('/').at(-1)}>
         {item.children ? transferRouter(item.children) : null}
@@ -157,9 +158,6 @@ const App: Component = () => {
     path: '/about',
     realPath: '/About/index.tsx',
     parentId: null,
-    hidden: 0,
-    sort: 2,
-    cache: 1
   }
  const addRoute =()=>{
     aliveFrozen() // 暂时不响应下面数据变化
@@ -172,13 +170,11 @@ const App: Component = () => {
     <Router>
       <Route component={Client}>
         {/* treeData 将 data变成 树结构数据 */}
-        {transferRouter(treeData(data, 'id', 'parentId'))}
+        {transferRouter(treeData(data))}
       </Route>
     </Router>
   )
 }
 
 export default App
-
-
 ```

package/dist/types/AliveTransfer.d.ts

@@ -1,8 +0,0 @@
-import { JSX } from 'solid-js';
-/**
- * @description Alive 组件用的 转换函数
- * @param { ()=> JSX.Element } Componet,
- * @param { string } id  string,自己的id 值,一定要唯一
- * @param { Array<string> } [children]  [string,...], 子组件的 id值 可不传，这样默认销毁时不会去干掉子组件，
- */
-export default function AliveTransfer(Component: () => JSX.Element, id: string, children?: Array<string> | null): JSX.Element;