solid-alive 0.3.0 → 0.3.2

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 r,createComputed as i,on as t,useContext as l,createRoot as s,getOwner as d,onCleanup as f,runWithOwner as v}from"solid-js";var a=r({elements:{},symbolClose:Symbol("close"),info:{frozen:!1,cbOnOff:"off",currComponentId:"",first:!0},insertElement:()=>{},removeAliveElements:()=>{},setCb:()=>{}});function c(r){let[l,s]=n(),d=Symbol("close"),f={frozen:!1,cbOnOff:"on",currComponentId:d,aliveIds:null,first:!0};var v=e=>{var n,o,r;l[e]&&(null===(n=l[e].subIds)||void 0===n||n.forEach((n=>n!==e&&v(n))),null===(r=(o=l[e]).dispose)||void 0===r||r.call(o),s({[e]:void 0}))},c=e=>{if(Array.isArray(e))for(const n of e)v(n);else if(!e)for(const e of Object.keys(l))v(e)};return i((e=>{var n=Array.isArray(r.include),o=n?r.include:[];return f.aliveIds=n?r.include:null,e.length>o.length&&c(e.filter((e=>!o.includes(e)))),o}),Array.isArray(r.include)?r.include:[]),e(a.Provider,{value:{info:f,elements:l,symbolClose:d,setCb:(e,n)=>{var r=f.cbOnOff,i=f.currComponentId;"on"===r&&"string"==typeof i&&n&&(!l[i]&&s({[i]:{id:i}}),s(o((o=>{o[i][e]=[...o[i][e]||[],t([],n)]}))),"onActivated"===e&&Promise.resolve().then((()=>{f.cbOnOff="off",n(),f.cbOnOff="on"})))},insertElement:e=>{s([e.id],Object.assign(Object.assign({},l[e.id]),e))},removeAliveElements:c},get children(){return r.children}})}function u(e,n,o){return function(r){var i,{info:t,elements:c,symbolClose:u,insertElement:m}=l(a);return Array.isArray(t.aliveIds)&&!t.aliveIds.includes(n)?e(r):(c[n]?t.frozen?!(null===(i=c[n].subIds)||void 0===i?void 0:i.length)&&(t.frozen=!1):Promise.resolve().then((()=>{var e;return null===(e=c[n].onActivated)||void 0===e?void 0:e.forEach((e=>e()))})):(t.currComponentId=n,s((i=>{m({id:n,dispose:i,owner:d(),element:e(r),subIds:Array.isArray(o)?o:null})}))),f((()=>{var e,o,r;t.frozen||(t.first&&(t.currComponentId=u,t.first=!1),!(null===(e=c[n].subIds)||void 0===e?void 0:e.length)&&(t.first=!0),t.cbOnOff="off",null===(r=null===(o=c[n])||void 0===o?void 0:o.onDeactivated)||void 0===r||r.forEach((e=>e())),t.cbOnOff="on")})),c[n].owner&&v(c[n].owner,(()=>c[n].element)))}}function m(n){var o=u((()=>n.children),n.id,n.subIds);return e(o,{})}function b(){var{setCb:e,removeAliveElements:n,info:o}=l(a);return{onActivated:n=>e("onActivated",n),onDeactivated:n=>e("onDeactivated",n),removeAliveElements:n,info:o}}function A(e){var{onActivated:n}=b();n(e)}function y(e){var{onDeactivated:n}=b();n(e)}function O(){var{removeAliveElements:e,info:n,onActivated:o,onDeactivated:r}=b();return{onActivated:o,onDeactivated:r,removeAliveElements:e,aliveFrozen:()=>n.frozen=!0}}export{m as AliveComponent,c as AliveProvider,u as aliveTransfer,A as onActivated,y as onDeactivated,O as useAlive};
+import{createComponent as e}from"solid-js/web";import{createContext as t,useContext as n,createRoot as r,getOwner as i,onCleanup as l,runWithOwner as o,createEffect as s,untrack as d}from"solid-js";import{produce as v,createStore as a}from"solid-js/store";const u=Symbol("currentId"),c=Symbol("setActiveCb");var m=t({elements:{},setElements:()=>{},setActiveCb:()=>{},aliveIds:()=>{}});const f=t({[u]:void 0,[c]:()=>{}});var A=(t,n,r)=>e(f.Provider,{value:{[u]:r,[c]:n},get children(){return t()}});function y(e,t,s){return function(d){var a,u,c=n(m);return(null===(a=c.aliveIds())||void 0===a?void 0:a.includes(t))?(c.elements[t]?null===(u=c.elements[t].onActivated)||void 0===u||u.forEach((e=>e())):(c.setElements({[t]:{id:t,subsets:Array.isArray(s)?s:null}}),r((n=>{c.setElements(v((r=>{r[t].dispose=n,r[t].id=t,r[t].owner=i(),r[t].element=A((()=>e(d)),c.setActiveCb,t)})))}))),l((()=>{var e;null===(e=c.elements[t].onDeactivated)||void 0===e||e.forEach((e=>e()))})),c.elements[t].owner&&o(c.elements[t].owner,(()=>c.elements[t].element))):A((()=>e(d)))}}function h(t){const[n,r]=a(),i=e=>{var t,l,o;if(Array.isArray(e))for(var s of e)i(null===(t=n[s])||void 0===t?void 0:t.subsets),null===(o=null===(l=n[s])||void 0===l?void 0:l.dispose)||void 0===o||o.call(l),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(v((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 p(e,t){d((()=>{var r,i=n(f),o=i[u];o&&(null===(r=i[c])||void 0===r||r.call(i,o,e,t,"add"),"onActivated"===e&&s((()=>{!function(e){"undefined"!=typeof Promise&&"function"==typeof Promise.prototype.then?Promise.resolve().then(e):setTimeout(e)}(t)})),l((()=>{var n;null===(n=i[c])||void 0===n||n.call(i,o,e,t,"delete"),t=null})))}))}function b(e){p("onActivated",e)}function w(e){p("onDeactivated",e)}export{h as AliveProvider,y as aliveTransfer,b as onActivated,w as onDeactivated};

package/dist/types/AliveProvider.d.ts

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

package/dist/types/active.d.ts

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

package/dist/types/aliveTransfer.d.ts

@@ -1,8 +1,2 @@
 import { JSX } from "solid-js";
-/**
- * @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>): <T>(props: T) => any;
+export default function aliveTransfer(Component: <T>(props: T) => JSX.Element, id: string, subsets?: Array<string>): <T>(props: T) => JSX.Element;

package/dist/types/context.d.ts

@@ -1,3 +1,9 @@
-import { ContextProps } from './default';
-declare var Context: import("solid-js").Context<ContextProps>;
-export default Context;
+import { Context } from "./types";
+export declare const CURRENTID: unique symbol;
+export declare const SETACTIVECB: 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"];
+}>;

package/dist/types/index.d.ts

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

package/dist/types/nextTick.d.ts

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

package/dist/types/types.d.ts

@@ -0,0 +1,34 @@
+import { Owner, JSX } from "solid-js"
+import { SetStoreFunction } from "solid-js/store"
+
+export type EmitType = keyof Emit
+
+export type EmitValue<T extends EmitType> = Emit[T]
+
+export type Activate = "onActivated" | "onDeactivated"
+
+export interface Emit {
+  onActivated: () => void
+  onDeactivated: () => void
+}
+
+export interface ProveiderProps {
+  children: JSX.Element
+  include?:  Array<string>
+}
+
+export interface Element {
+  id: string
+  element: JSX.Element
+  dispose?: () => void
+  onActivated?: Set<() => void>
+  onDeactivated?: Set<() => void>
+  subsets?: Array<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
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-alive",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "author": "1iuxs",
   "description": "solid-alive",
   "type": "module",
@@ -32,21 +32,21 @@
   },
   "license": "ISC",
   "dependencies": {
-    "solid-js": "^1.8.17"
+    "solid-js": "^1.9.3"
   },
   "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.29.2",
     "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.2"
   }
 }

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}>

package/dist/types/AliveComponent.d.ts

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

package/dist/types/default.d.ts

@@ -1,54 +0,0 @@
-import { JSX, Accessor } from 'solid-js'
-
-export interface ProveiderProps {
-  children: JSX.Element
-  include?: Array<string> | null
-}
-
-export type tActivated = 'onActivated' | 'onDeactivated'
-
-export interface NodeInfo {
-  id: string
-  owner?: any
-  component?: ((props: any) => JSX.Element) | null
-  element?: JSX.Element | null
-  subIds?: Array<string> | null
-  dispose?: (() => void) | null
-  onActivated?: Array<() => void> | null
-  onDeactivated?:  Array<() => void> | null
-}
-
-export interface SetElement {
-  (id: string, values: NodeInfo): void
-}
-
-export interface StoreProps {
-  [key: string]: NodeInfo
-}
-
-export interface IInfo {
-  frozen: boolean
-  cbOnOff: 'on' | 'off'
-  currComponentId: string | symbol,
-  aliveIds?:Array<string> | null,
-  first:boolean
-}
-
-export interface ContextProps{
-  elements: StoreProps
-  info: IInfo
-  symbolClose: symbol
-  insertElement: (d: NodeInfo) => void
-  removeAliveElements: (ids?: Array<IAliveElementIds>) => void
-  setCb: (t: tActivated, cb: () => void) => void
-}
-
-interface IActive {
-  [key: string]: string
-}
-export interface IPrevCall {
-  onActivated: IActive
-  onDeactivated: IActive
-}
-
-export type IAliveElementIds = string

package/dist/types/useAlive.d.ts

@@ -1,14 +0,0 @@
-export declare function onActivated(fn: () => void): void;
-export declare function onDeactivated(fn: () => void): void;
-/**
- * @returns removeAliveElement  删除缓存组件,
- * @returns aliveFrozen 让 alive 暂时失去响应, 一般在加新增路由数据时使用
- * @returns onActivated 进入
- * @returns onDeactivated 离开
- */
-export declare function useAlive(): {
-    onActivated: (cb: () => void) => void;
-    onDeactivated: (cb: () => void) => void;
-    removeAliveElements: (ids?: Array<import("./default").IAliveElementIds>) => void;
-    aliveFrozen: () => boolean;
-};