solid-alive 0.2.1 → 0.2.5

package/dist/index.js

@@ -1 +1 @@
-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 i,createRoot as a,createComputed as l,createEffect as v,onCleanup as d}from"solid-js";var s=r({elements:{},info:{frozen:!1},setInfo:()=>{},insertElement:()=>{},onDeactivated:()=>{},onActivated:()=>{},removeAliveElements:()=>{},setCurrentComponentId:()=>{},insertCacheCb:()=>{}});function c(r){let[i,a]=t(),[l,v]=t({frozen:!0}),d="",c=new Map,f=new Map,u={onActivated:{},onDeactivated:{}};var m=e=>{var t;if(Reflect.has(i,e)){var n=null===(t=i[e])||void 0===t?void 0:t.subIds;null==n||n.forEach((t=>t!==e&&m(t))),a((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(a){var n=a.stack.split("\n"),r=n[0].includes("@")?5:6,o=n[r].trim(),i=o.includes("@")?o.split("@"):o.split(" ").slice(1);e=i[0],t=i[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(s.Provider,{value:{info:l,elements:i,setInfo:v,onActivated:e=>{h("onActivated",e)},onDeactivated:e=>{h("onDeactivated",e)},insertElement:e=>{let t=e.id;a([t],Object.assign(Object.assign({},i[t]),e))},removeAliveElements:e=>{if(e&&Array.isArray(e))for(const t of e)m(t);else for(const e of Object.values(i))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(i,e)&&a(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,r){return function(o){var{info:c,elements:u,setInfo:m,insertElement:A,setCurrentComponentId:h,insertCacheCb:p}=i(s);Reflect.has(u,t)||(m("frozen",!1),h(t),a((i=>{A({id:t,dispose:i,owner:null,component:r?e:null,element:e(o),subIds:Array.isArray(n)?new Set(n):null})})));var E=e=>{var t;if(u[e].isTop)return e;var n=null===(t=Object.values(u).find((t=>{var n;return null===(n=t.subIds)||void 0===n?void 0:n.has(e)})))||void 0===t?void 0:t.id;return n&&(n=E(n)),n||e};return f.has(E(t))||f.clear(),l((()=>{var e;if(!u[t].loaded){let n=null===(e=u[t])||void 0===e?void 0:e.element;for(;"function"==typeof n;)n=n();n instanceof HTMLElement&&p(t)}})),v((()=>{var e;m("frozen",!1),f.has(t)||u[t].loaded&&(f.add(t),m("frozen",!0),null===(e=u[t].onActivated)||void 0===e||e.forEach((e=>e())),m("frozen",!1))})),d((()=>{var e;c.frozen||(m("frozen",!0),null===(e=u[t].onDeactivated)||void 0===e||e.forEach((e=>e())))})),u[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}=i(s);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 E(){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,E as useAlive};
+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,createComputed as a,createEffect as d,onCleanup as s}from"solid-js";var v=o({elements:{},symbolClose:Symbol("close"),info:{frozen:!1,cbOnOff:"off",currComponentId:""},setInfo:()=>{},insertElement:()=>{},onDeactivated:()=>{},onActivated:()=>{},removeAliveElements:()=>{},insertCacheCb:()=>{}});function c(o){let[i,l]=n(),a={frozen:!1,cbOnOff:"off",currComponentId:""},d=Symbol("close"),s=new Map,c=new Map,f={onActivated:{},onDeactivated:{}};var u=e=>{var n;if(Reflect.has(i,e)){var t=null===(n=i[e])||void 0===n?void 0:n.subIds;null==t||t.forEach((n=>n!==e&&u(n))),l({[e]:void 0})}},m=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=f[e];return(!o[n]||o[n]===t)&&(f[e][n]=t,!0)},b=(e,n)=>{var{cbOnOff:t,currComponentId:o}=a;if("on"===t&&o!==d&&n&&m(e)){var i={onActivated:s,onDeactivated:c}[e],l=i.get(o)||new Set;l.add(r([],n))&&i.set(o,l)}};return e(v.Provider,{value:{info:a,elements:i,symbolClose:d,setInfo:(e,n)=>{a[e]=n},onActivated:e=>{b("onActivated",e)},onDeactivated:e=>{b("onDeactivated",e)},insertElement:e=>{let n=e.id,t=Object.values(i).find((e=>{var t;return null===(t=e.subIds)||void 0===t?void 0:t.has(n)}));l([n],Object.assign(Object.assign(Object.assign({},i[n]),e),{fatherId:null==t?void 0:t.id}))},removeAliveElements:e=>{if(Array.isArray(e))for(const n of e)u(n);else if(!e)for(const e of Object.values(i))u(e.id)},insertCacheCb:e=>{let n=s.get(e),o=c.get(e);s.delete(e),c.delete(e),f.onActivated={},f.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 f=new Set([]);function u(e,n,t){return function(o){var{info:r,elements:c,symbolClose:u,setInfo:m,insertElement:b,insertCacheCb:A}=i(v);Reflect.has(c,n)||l((r=>{m("currComponentId",n),m("cbOnOff","on"),b({id:n,dispose:r,owner:null,element:e(o),subIds:Array.isArray(t)?new Set(t):null})}));var O=e=>{var n=c[e].fatherId;return n?O(n):e};return f.size&&!f.has(O(n))&&f.clear(),a((()=>{var e;!c[n].loaded&&(e=>{var n;let t=null===(n=c[e])||void 0===n?void 0:n.element;for(;"function"==typeof t;)t=t();return!!(t instanceof HTMLElement||Array.isArray(t))&&t})(n)&&(A(n),!(null===(e=c[n].subIds)||void 0===e?void 0:e.size)&&m("currComponentId",u))})),d((()=>{var e,t,o;r.frozen?!(null===(e=c[n].subIds)||void 0===e?void 0:e.size)&&m("frozen",!1):(null===(t=c[n])||void 0===t?void 0:t.loaded)&&(f.add(n),m("cbOnOff","off"),null===(o=c[n].onActivated)||void 0===o||o.forEach((e=>e())),m("cbOnOff","on"))})),s((()=>{var e,t;r.frozen||(m("cbOnOff","off"),null===(t=null===(e=c[n])||void 0===e?void 0:e.onDeactivated)||void 0===t||t.forEach((e=>e())),m("cbOnOff","on"))})),c[n].element}}function m(n){var t=u((()=>n.children),n.id,n.subIds);return e(t,{})}function b(){var{onActivated:e,onDeactivated:n,removeAliveElements:t,setInfo:o}=i(v);return{onActivated:e,onDeactivated:n,removeAliveElements:t,setInfo:o}}function A(e){var{onActivated:n}=b();n(e)}function O(e){var{onDeactivated:n}=b();n(e)}function h(){var{removeAliveElements:e,setInfo:n}=b();return{removeAliveElements:e,aliveFrozen:()=>n("frozen",!0)}}export{m as AliveComponent,c as AliveProvider,u as aliveTransfer,A as onActivated,O as onDeactivated,h as useAlive};

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

@@ -1,8 +1,8 @@
 import { JSX } from 'solid-js';
 /**
- * @description Alive 组件用的 转换函数
- * @param { ()=> JSX.Element } Component,
+ * @description Alive 组件用的 转换函数; aliveTransfer(Comp, ‘/home’)
+ * @param { ()=> JSX.Element } Component () => JSX.Element
  * @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>, saveComponent?: boolean): <T>(props: T) => JSX.Element;
+export default function aliveTransfer(Component: <T>(props: T) => JSX.Element, id: string, subIds?: Array<string>): <T>(props: T) => JSX.Element;

package/dist/types/context.d.ts

@@ -1,3 +1,3 @@
-import { ContextProps } from "./default";
+import { ContextProps } from './default';
 declare var Context: import("solid-js").Context<ContextProps>;
 export default Context;

package/dist/types/default.d.ts

@@ -7,14 +7,15 @@ export interface ProveiderProps {
 export interface NodeInfo {
   id: string
   loaded?: boolean
-  owner: any,
-  component?: ((props:any) => JSX.Element) | 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 {
@@ -26,7 +27,9 @@ export interface StoreProps {
 }
 
 export interface IInfo {
-  frozen: boolean
+  frozen: boolean 
+  cbOnOff: 'on' | 'off' 
+  currComponentId: string | symbol 
 }
 
 export type TSetInfo = <T extends keyof IInfo>(key: T, value: IInfo[T]) => void
@@ -34,13 +37,13 @@ export type TSetInfo = <T extends keyof IInfo>(key: T, value: IInfo[T]) => void
 export interface ContextProps {
   elements: StoreProps
   info: IInfo
+  symbolClose: symbol
   setInfo: TSetInfo
   insertElement: (d: NodeInfo) => void
   onActivated: (cb: () => void) => void
   onDeactivated: (cb: () => void) => void
   removeAliveElements: (ids?: Array<IAliveElementIds>) => void
-  setCurrentComponentId: (id: string | symbol) => void
-  insertCacheCb: (id: string ) => void
+  insertCacheCb: (id: string) => void
 }
 
 interface IActive {
@@ -51,4 +54,4 @@ export interface IPrevCall {
   onDeactivated: IActive
 }
 
-export type IAliveElementIds =  string
+export type IAliveElementIds = string

package/package.json

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

package/{README.md → readme.md}

@@ -10,10 +10,11 @@
   - removeAliveElements: 函数, 可传一个参数, 不传就删除所有缓存 :
     removeAliveElements(['/home'])
   - aliveForzen: 暂时不响应 路由数据变化, aliveForzen()
+
 - 子父 缓存/删除 问题
-  -  如果某组件下有子组件,在父的 AliveTransfer中, 
+  -  如果某组件下有子组件,在父的 aliveTransfer中, 
     第三个参数,为对象 写上子组件的唯一id: {children:['/childrenId','asf',...]}
-  -  使用见下图, 也可用     -removeAliveElements 删除
+  -  使用见下图, 也可用 removeAliveElements 删除
 
 
 
@@ -22,7 +23,7 @@
  ```jsx
 import { render } from 'solid-js/web'
 import App from './App'
-import { aliveProvider } from  'solid-alive'
+import { AliveProvider } from  'solid-alive'
 
 const root = document.getElementById('root')
 
@@ -33,7 +34,7 @@ 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';
@@ -48,10 +49,9 @@ import Single from './views/Blog/Single';
 
 const HomeTransfer = aliveTransfer(Home, '/')
 const AboutTransfer = aliveTransfer(About, '/about')
-const ShopTransfer = aliveTransfer(Shop, '/shop',['/shopPage'])
+const ShopTransfer = aliveTransfer(Shop, '/shop', ['/shopPage'])
 const ShopPageTransfer = aliveTransfer(ShopPage, '/shopPage')
 const BlogTransfer = aliveTransfer(Blog, '/blog', ['contact', 'single'])
-const SingleTsf = aliveTransfer(Single,'single')
 
 export default function App() {
   return (
@@ -89,7 +89,6 @@ import {  onActivated,onDeactivated,useAlive, AliveComponent } from "solid-alive
 export default function Single() {
   const { removeAliveElements,aliveFrozen } = useAlive()
 
-  let divRef: Element | undefined = undefined
   const click = () => {
     removeAliveElements(['/about']) // delete '/about'; 删除 /about
     // removeAliveElements() // delete all alive element; 会删除所有缓存的组件
@@ -126,7 +125,7 @@ export default function Single() {
 /**  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',
@@ -171,7 +170,7 @@ const App: Component = () => {
     <Router>
       <Route component={Client}>
         {/* treeData 将 data变成 树结构数据 */}
-        {transferRouter(treeData(data, 'id', 'parentId'))}
+        {transferRouter(treeData(data))}
       </Route>
     </Router>
   )