solid-alive 0.3.0 → 0.3.1

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

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) => any;

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.1",
   "author": "1iuxs",
   "description": "solid-alive",
   "type": "module",

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