diff --git a/CHANGELOG.md b/CHANGELOG.md index cf00587..de4b41f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # CHANGELOG +## v1.0.2 (2026-05-17) + +### 新特性 +- **AutoForm**: 新增 `inline` 模式，支持紧凑的单行表单布局，并增强了与 `DataTable` 的联动能力（数据变化自动刷新）。 +- **Resizer**: + - 支持 `$bind` 指令，实现尺寸的双向绑定。 + - 新增 `resizing` 和 `change` 事件，便于监听实时与最终缩放结果。 + +### 优化 +- **UI**: + - `Modal`, `Dialog`, `Toast` 默认主题色由 `body` 改为 `primary`，提升视觉引导。 + - `Toast` 增加 `rounded` 圆角样式。 + - 统一所有表单控件（input/select/textarea）在 `AutoForm` 中的设置默认为 `{}`。 +- **FastList**: 重构虚拟滚动逻辑为独立的 `VirtualScroll` 模块，提升代码复用性与可维护性。 + ## v1.0.1 (2026-05-14) - **Perf**: 优化 `FastList` 渲染逻辑，消除 Layout Thrashing，提升复杂列表（GroupedList/Tree）滚动性能达 10 倍以上。 - **Refactor**: 采用 `requestAnimationFrame` 优化初始化高度计算，减少闪烁。 diff --git a/dist/base.js b/dist/base.js index 2a0670f..be0147a 100644 --- a/dist/base.js +++ b/dist/base.js @@ -107,7 +107,7 @@ Component.register("Modal", (container) => { `
-
+
@@ -124,7 +124,7 @@ Component.register("Dialog", Component.getSetupFunction("Modal"), Util.makeDom( `
-
+
@@ -181,7 +181,7 @@ Component.register("Toast", (container) => { /*html*/ `
-
+
@@ -202,7 +202,7 @@ Component.register("Toast", (container) => { UI$1.toast = function(message, options = {}) { const delay = options.delay ?? 5e3; const t = document.createElement("Toast"); - t.state = { delay, left: delay ? delay / 1e3 : void 0, type: options.type || "body", message, buttons: options.buttons || [] }; + t.state = { delay, left: delay ? delay / 1e3 : void 0, type: options.type || "primary", message, buttons: options.buttons || [] }; $(`[toast-container="${options.container || "default"}"]`).appendChild(t); Promise.resolve().then(() => t.show()); }; @@ -212,10 +212,19 @@ UI$1.toastConfirm = function(message, options = {}) { Component.register("AutoForm", (container) => { if (!container.state.schema) container.state.schema = []; container.vertical = container.hasAttribute("vertical"); + container.inline = container.hasAttribute("inline"); container.request = { method: "POST" }; container.response = {}; container.result = null; - container.data = NewState(container.data || {}); + if (!container.data || !container.data.__watch) { + container.data = NewState(container.data || {}); + } + container.data.__watch("*", () => { + if (container.inline) { + const dt = container.closest("DataTable"); + if (dt && dt.refresh) dt.refresh(); + } + }); container.form = $(container, "form"); container.submit = (opt = {}) => { var _a, _b; @@ -240,27 +249,29 @@ Component.register("AutoForm", (container) => { }, Util.makeDom( /*html*/ ` -
-
+
+
- -
- - + -
-
-
+
@@ -269,7 +280,14 @@ Component.register("AutoForm", (container) => { ` ), Util.makeDom( /*html*/ - `` + `` )); const _pendingAutoFormComponents = []; const AutoForm = { @@ -283,9 +301,7 @@ const AutoForm = { var _a; const template = Component.getTemplate("AutoForm"); if (template) { - (_a = $(template.content, "[control-wrapper]")) == null ? void 0 : _a.appendChild(Util.makeDom(`<${name} $if="item.type.toUpperCase() === '${name.toUpperCase()}'" $name="item.name" $.="item.setting" $bind="this.data[item.name]">`)); - } else if (document.readyState !== "loading") { - console.error("AutoForm template not found during registration of", name); + (_a = $(template.content, "[control-wrapper]")) == null ? void 0 : _a.appendChild(Util.makeDom(`<${name} $if="item.type.toUpperCase() === '${name.toUpperCase()}'" $name="item.name" $.="item.setting || {}" $bind="this.data[item.name]">`)); } } }; @@ -337,113 +353,140 @@ Component.register("TagsInput", (container) => { `` )); AutoForm.register("TagsInput"); -const FastListComponent = Component.register("FastList", (container) => { +const VirtualScroll = () => { const itemHeights = /* @__PURE__ */ new Map(); const groupHeights = /* @__PURE__ */ new Map(); let groupItemCount = 1; - container.state.renderedList = []; const avg = Util.newAvg(); - let containerPaddingTop = 0; - let containerRowGap = 0; + let padTop = 0; + let rowGap = 0; let topMargin = 0; let itemMarginTop = null; let itemMarginBottom = null; - let listStartIndex = 0; - let visibleStartIndex = 0; - let visibleCount = 10; let listInited = false; - container.onItemUpdate = (index2, node) => { - const absoluteIndex = index2 + listStartIndex; - if (itemMarginTop === null) { - const style = window.getComputedStyle(node); - itemMarginTop = parseFloat(style.marginTop) || 0; - itemMarginBottom = parseFloat(style.marginBottom) || 0; - } - if (absoluteIndex === 0) topMargin = itemMarginTop; - const newHeight = node.offsetHeight + itemMarginTop + itemMarginBottom + containerRowGap; - const oldHeight = itemHeights.get(absoluteIndex); - if (newHeight !== oldHeight) { - itemHeights.set(absoluteIndex, newHeight); - avg.add(newHeight); - const offset = newHeight - (oldHeight || 0); - const groupIndex = absoluteIndex - absoluteIndex % groupItemCount; - if (groupHeights.has(groupIndex)) groupHeights.set(groupIndex, groupHeights.get(groupIndex) + offset); - } - }; - container.refresh = () => { - if (!listInited) return; - visibleCount = Math.ceil((container.clientHeight || 100) / (avg.get() || 32)); - let list = []; - const fullList = container.state.list; - const fullSize = fullList.length; - let i = 0; - let prev = containerPaddingTop + topMargin + containerRowGap; - let post = 0; - let starus = 0; - for (i = 0; i < fullSize; i++) { - if (starus === 0) { - const gh = groupHeights.get(i); - if (gh && prev + gh < container.scrollTop) { - prev += gh; - i += Math.min(groupItemCount, fullSize - i) - 1; - } else { - const ih = itemHeights.get(i); - if (prev + ih < container.scrollTop) { - prev += ih; - } else { - starus = 1; - visibleStartIndex = Math.max(0, i); - listStartIndex = Math.max(0, visibleStartIndex - visibleCount); - const listEndIndex = Math.min(listStartIndex + visibleCount * 3, fullSize); - i = listEndIndex - 1; - list = fullList.slice(listStartIndex, listEndIndex); - for (let j = listStartIndex; j < visibleStartIndex; j++) prev -= itemHeights.get(j); - } - } - } else if (starus === 1) { - const gh = groupHeights.get(i); - if (gh) { - post += gh; - i += groupItemCount - 1; - } else { - post += itemHeights.get(i); - } - } - } - container.state.prevHeight = prev - containerPaddingTop - topMargin - containerRowGap; - container.state.postHeight = post; - container.state.renderedList = list; - }; - container.state.__watch("list", (list) => { - listInited = false; - itemHeights.clear(); - groupHeights.clear(); - avg.clear(); - topMargin = 0; - itemMarginTop = null; - itemMarginBottom = null; - if (!(list == null ? void 0 : list.length)) return; - const listSize = list.length || 0; - groupItemCount = Math.ceil(Math.sqrt(listSize)) || 10; - const style = window.getComputedStyle(container); - containerPaddingTop = parseFloat(style.paddingTop) || 0; - containerRowGap = parseFloat(style.rowGap) || 0; - container.state.renderedList = list.slice(0, Math.min(30, listSize)) || []; - requestAnimationFrame(() => { - if (listInited || container.state.list !== list) return; + return { + // 核心1：重置与首屏预渲染 + reset: (list, container) => { + listInited = false; + itemHeights.clear(); + groupHeights.clear(); + avg.clear(); + topMargin = 0; + itemMarginTop = null; + itemMarginBottom = null; + if (!(list == null ? void 0 : list.length)) return []; + const size = list.length; + groupItemCount = Math.ceil(Math.sqrt(size)) || 10; + const style = window.getComputedStyle(container); + padTop = parseFloat(style.paddingTop) || 0; + rowGap = parseFloat(style.rowGap) || 0; + return list.slice(0, Math.min(30, size)); + }, + // 核心2：无痛初始化缓存 (通过 rAF 调用) + init: (list, refreshCallback) => { + if (listInited) return; + const size = list.length; const defaultHeight = avg.get() || 32; - for (let i = 0; i < listSize; i++) { + for (let i = 0; i < size; i++) { if (!itemHeights.has(i)) itemHeights.set(i, defaultHeight); } - for (let i = 0; i < listSize; i += groupItemCount) { + for (let i = 0; i < size; i += groupItemCount) { let sum = 0; - for (let j = i; j < Math.min(i + groupItemCount, listSize); j++) { + for (let j = i; j < Math.min(i + groupItemCount, size); j++) { sum += itemHeights.get(j); } groupHeights.set(i, sum); } listInited = true; - container.refresh(); + refreshCallback(); + }, + // 核心3：原汁原味的极速高度更新 + update: (absoluteIndex, node) => { + if (itemMarginTop === null) { + const style = window.getComputedStyle(node); + itemMarginTop = parseFloat(style.marginTop) || 0; + itemMarginBottom = parseFloat(style.marginBottom) || 0; + } + if (absoluteIndex === 0) topMargin = itemMarginTop; + const newHeight = node.offsetHeight + itemMarginTop + itemMarginBottom + rowGap; + const oldHeight = itemHeights.get(absoluteIndex); + if (newHeight !== oldHeight) { + itemHeights.set(absoluteIndex, newHeight); + avg.add(newHeight); + const offset = newHeight - (oldHeight || 0); + const groupIndex = absoluteIndex - absoluteIndex % groupItemCount; + if (groupHeights.has(groupIndex)) groupHeights.set(groupIndex, groupHeights.get(groupIndex) + offset); + } + }, + // 核心4：原汁原味的状态机滚动计算 + calc: (container, list) => { + if (!listInited || !list) return null; + const size = list.length; + const visibleCount = Math.ceil((container.clientHeight || 100) / (avg.get() || 32)); + let prev = padTop + topMargin + rowGap; + let post = 0; + let status = 0; + let listStartIndex = 0; + let listEndIndex = 0; + for (let i = 0; i < size; i++) { + if (status === 0) { + const gh = groupHeights.get(i); + if (gh && prev + gh < container.scrollTop) { + prev += gh; + i += Math.min(groupItemCount, size - i) - 1; + } else { + const ih = itemHeights.get(i); + if (prev + ih < container.scrollTop) { + prev += ih; + } else { + status = 1; + let visibleStartIndex = Math.max(0, i); + listStartIndex = Math.max(0, visibleStartIndex - visibleCount); + listEndIndex = Math.min(listStartIndex + visibleCount * 3, size); + i = listEndIndex - 1; + for (let j = listStartIndex; j < visibleStartIndex; j++) prev -= itemHeights.get(j); + } + } + } else if (status === 1) { + const gh = groupHeights.get(i); + if (gh) { + post += gh; + i += groupItemCount - 1; + } else { + post += itemHeights.get(i); + } + } + } + return { + prevHeight: prev - padTop - topMargin - rowGap, + postHeight: post, + renderedList: list.slice(listStartIndex, listEndIndex), + listStartIndex + }; + } + }; +}; +const FastListComponent = Component.register("FastList", (container) => { + const vs = VirtualScroll(); + container.state.renderedList = []; + container.onItemUpdate = (index2, node) => { + vs.update(index2 + (container.state._listStartIndex || 0), node); + }; + container.refresh = () => { + const res = vs.calc(container, container.state.list); + if (res) { + container.state.prevHeight = res.prevHeight; + container.state.postHeight = res.postHeight; + container.state._listStartIndex = res.listStartIndex; + container.state.renderedList = res.renderedList; + } + }; + container.state.__watch("list", (list) => { + container.state._listStartIndex = 0; + container.state.renderedList = vs.reset(list, container) || []; + requestAnimationFrame(() => { + if (container.state.list !== list) return; + vs.init(list, container.refresh); }); }); }, Util.makeDom( @@ -707,19 +750,32 @@ if (typeof document !== "undefined") { }); } Component.register("Resizer", (container) => { - const isVertical = container.hasAttribute("vertical"); + container.isVertical = container.hasAttribute("vertical"); const min = parseInt(container.getAttribute("min")) || 10; const max = parseInt(container.getAttribute("max")) || 1e3; const target = container.target || container.previousElementSibling; + container.addEventListener("bind", (e) => { + if (e.detail !== void 0 && e.detail !== null) { + target.style[container.isVertical ? "height" : "width"] = e.detail + "px"; + } + }); const getSize = (startSize, w, h) => { - const newSize = startSize + (isVertical ? h : w); + const newSize = startSize + (container.isVertical ? h : w); return newSize < min ? min : newSize > max ? max : newSize; }; container.addEventListener("mousedown", (event) => { - const startSize = isVertical ? target.offsetHeight : target.offsetWidth; + const startSize = container.isVertical ? target.offsetHeight : target.offsetWidth; MouseMover.start(event, { - onmousemove: ({ w, h }) => target.style[isVertical ? "height" : "width"] = getSize(startSize, w, h) + "px", - onmouseup: ({ w, h }) => container.dispatchEvent(new CustomEvent("resize", { detail: { oldSize: startSize, newSize: getSize(startSize, w, h) }, bubbles: false })) + onmousemove: ({ w, h }) => { + const newSize = getSize(startSize, w, h); + target.style[container.isVertical ? "height" : "width"] = newSize + "px"; + container.dispatchEvent(new CustomEvent("resizing", { detail: { oldSize: startSize, newSize }, bubbles: false })); + }, + onmouseup: ({ w, h }) => { + const newSize = getSize(startSize, w, h); + container.dispatchEvent(new CustomEvent("resize", { detail: { oldSize: startSize, newSize }, bubbles: false })); + container.dispatchEvent(new CustomEvent("change", { detail: newSize, bubbles: false })); + } }); }); }, Util.makeDom( @@ -755,5 +811,6 @@ export { HTTP, MouseMover, State, - UI$1 as UI + UI$1 as UI, + VirtualScroll }; diff --git a/dist/base.min.js b/dist/base.min.js index 1eb4849..23ad66c 100644 --- a/dist/base.min.js +++ b/dist/base.min.js @@ -1 +1 @@ -import{Component as t,NewState as e,Util as i,$ as s,Hash as n,RefreshState as a}from"@web/state";const l={get:({url:t,...e})=>l.request({url:t,method:"GET",...e}),post:({url:t,data:e,...i})=>l.request({url:t,method:"POST",data:e,...i}),put:({url:t,data:e,...i})=>l.request({url:t,method:"PUT",data:e,...i}),delete:({url:t,...e})=>l.request({url:t,method:"DELETE",...e}),head:({url:t,...e})=>l.request({url:t,method:"HEAD",...e}),request:async({url:t,method:e="POST",data:i,headers:s={},responseType:n,timeout:a=1e4})=>{var l;const o={method:e=e.toUpperCase(),signal:null==(l=AbortSignal.timeout)?void 0:l.call(AbortSignal,a)};if(void 0!==i&&"GET"!==e&&"HEAD"!==e){if(i instanceof HTMLFormElement&&(i=new FormData(i)),i&&"object"==typeof i&&!(i instanceof FormData)&&!(i instanceof ArrayBuffer||ArrayBuffer.isView(i))&&Object.values(i).some(t=>t instanceof File||t instanceof Blob||t instanceof FileList||Array.isArray(t)&&t.some(t=>t instanceof File||t instanceof Blob))){const t=new FormData;for(const[e,s]of Object.entries(i))s instanceof FileList||Array.isArray(s)?Array.from(s).forEach(i=>t.append(e,i)):null!=s&&t.append(e,s);i=t}i instanceof FormData?delete s["Content-Type"]:"string"==typeof i||i instanceof ArrayBuffer||ArrayBuffer.isView(i)||(i=JSON.stringify(i),s["Content-Type"]||(s["Content-Type"]="application/json")),o.body=i}Object.keys(s).length&&(o.headers=s);const d={error:null,ok:null,status:0,headers:{},responseType:"",result:null};try{const e=await fetch(t,o);if(Object.assign(d,{ok:e.ok,status:e.status,headers:Object.fromEntries(e.headers.entries())}),!n){const t=e.headers.get("Content-Type")||"";n=t.includes("application/json")?"json":/image|video|audio|pdf|zip|octet-stream/.test(t)?"binary":"text",d.responseType=n}!1===d.ok&&(d.error=(d.statusText||"HTTP "+d.status+" error")+" for "+t),d.result="json"===n?await e.json():"binary"===n?await e.arrayBuffer():await e.text()}catch(t){Object.assign(d,{error:t.message||String(t),ok:!1})}return d}},o=t.register("API",t=>{t.request=e({url:"",method:"GET",headers:{},data:null,timeout:1e4,responseType:""}),t.response=e({loading:!1,ok:null,status:null,error:null,headers:{},responseType:"",result:null}),t.result=e(),t.do=(e={})=>new Promise((i,s)=>{const n={...t.request,...e};if(!n.url)throw new Error(".url is required");n.headers={...t.request.headers,...e.headers},t.response.loading=!0,l.request(n).then(e=>{if(Object.keys(e).forEach(i=>{"result"!==i&&(t.response[i]=e[i])}),e.result&&"object"==typeof e.result&&t.result&&"object"==typeof t.result?Object.assign(t.result,e.result):t.result=e.result,t.response.loading=!1,!1===e.ok)throw new Error(e.error);if("object"==typeof e.result&&e.result.error)throw new Error(e.result.error);t.dispatchEvent(new CustomEvent("response",{detail:e,bubbles:!1})),i(e)}).catch(i=>{var n;!e.noui&&(null==(n=globalThis.UI)?void 0:n.toast)&&UI.toast(i.message,{type:"danger"}),t.dispatchEvent(new CustomEvent("error",{detail:i,bubbles:!0})),s(i)})});let i=null;t.request.__watch(null,()=>{t.hasAttribute("auto")&&t.request.url&&(i||(i=Promise.resolve().then(()=>{t.do(),i=null})))})}),d={};t.register("Modal",t=>{t.modal=new bootstrap.Modal(t),t.addEventListener("bind",e=>{e.detail?t.modal.show():t.modal.hide()}),t.addEventListener("hide.bs.modal",()=>{var e;null==(e=document.activeElement)||e.blur(),t.dispatchEvent(new CustomEvent("change",{bubbles:!1,detail:!1}))}),i.copyFunction(t,t.modal,"show","hide")},i.makeDom('\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n')),t.register("Dialog",t.getSetupFunction("Modal"),i.makeDom('\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n'));let r=0;d.showDialog=function({title:t="",message:e="",buttons:i=["{#Close#}"],type:s="body"}){const n=document.body.appendChild(document.createElement("Dialog"));return n.style.zIndex=2e3+ ++r,Promise.resolve().then(()=>{Object.assign(n.state,{message:e,title:t,type:s,buttons:i}),n.show()}),new Promise(t=>{n.addEventListener("change",e=>{r--,t(n.result||0),n.remove()})})},d.alert=function(t,e={}){return d.showDialog({message:t,...e})},d.confirm=function(t,e={}){return new Promise(i=>d.showDialog({message:t,buttons:["{#Cancel#}","{#Confirm#}"],...e}).then(t=>i(t>=2)).catch(()=>i(!1)))},t.register("Toast",t=>{t.toast=new bootstrap.Toast(t,{autohide:t.state.delay>0}),i.copyFunction(t,t.toast,"show","hide"),t.addEventListener("show.bs.toast",()=>{if(t.state.delay>0){let e;const i=()=>{t.state.left=t.state.delay/1e3,e=setInterval(()=>{(!t.isConnected||--t.state.left<=0)&&clearInterval(e)},1e3)};i(),t.addEventListener("mouseenter",()=>{clearInterval(e),t.state.left=void 0}),t.addEventListener("mouseleave",i)}})},i.makeDom('\n
\n
\n
\n
\n \n \n
\n \n
\n
\n \n
\n
\n
\n'),i.makeDom('
')),d.toast=function(t,e={}){const i=e.delay??5e3,n=document.createElement("Toast");n.state={delay:i,left:i?i/1e3:void 0,type:e.type||"body",message:t,buttons:e.buttons||[]},s(`[toast-container="${e.container||"default"}"]`).appendChild(n),Promise.resolve().then(()=>n.show())},d.toastConfirm=function(t,e={}){return new Promise(i=>d.toast(t,{buttons:["{#Confirm#}"],...e}).then(t=>i(1===t)).catch(()=>i(!1)))},t.register("AutoForm",t=>{t.state.schema||(t.state.schema=[]),t.vertical=t.hasAttribute("vertical"),t.request={method:"POST"},t.response={},t.result=null,t.data=e(t.data||{}),t.form=s(t,"form"),t.submit=(e={})=>{var i,s;if(!t.form.reportValidity())return null==(s=null==(i=globalThis.UI)?void 0:i.toast)?void 0:s.call(i,"{#verify failed#}",{type:"danger"});if(!t.dispatchEvent(new CustomEvent("submit",{detail:t.data,cancelable:!0,bubbles:!1})))return;const n={...t.request,data:t.data,noui:!0,...e};let a=null;if(t.api)a=t.api.do(n);else{if(!t.request.url)return console.warn("{#please config .api or .request.url to auto submit#}");a=l.request(n)}a.then(e=>{if(t.response=e,t.result=e.result,"object"==typeof e.result&&e.result.error)throw new Error(e.result.error);t.dispatchEvent(new CustomEvent("response",{detail:e,bubbles:!1}))}).catch(e=>{var i;(null==(i=globalThis.UI)?void 0:i.toast)&&UI.toast(e.message,{type:"danger"}),t.dispatchEvent(new CustomEvent("error",{detail:e,bubbles:!0}))})}},i.makeDom('\n
\n \n
\n \n
\n \n \n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n'),i.makeDom(""));const c=[],m={register:e=>{"undefined"!=typeof document&&("loading"!==document.readyState&&t.getTemplate("AutoForm")?m._addAutoFormComponent(e):c.push(e))},_addAutoFormComponent:e=>{var n;const a=t.getTemplate("AutoForm");a?null==(n=s(a.content,"[control-wrapper]"))||n.appendChild(i.makeDom(`<${e} $if="item.type.toUpperCase() === '${e.toUpperCase()}'" $name="item.name" $.="item.setting" $bind="this.data[item.name]">`)):"loading"!==document.readyState&&console.error("AutoForm template not found during registration of",e)}};if("undefined"!=typeof document){const t=()=>{c.forEach(t=>m._addAutoFormComponent(t)),c.length=0};"loading"!==document.readyState?setTimeout(t,100):document.addEventListener("DOMContentLoaded",()=>setTimeout(t,100),!0)}t.register("TagsInput",t=>{t.addEventListener("bind",e=>{t.state.tags=e.detail||[]})},i.makeDom(`\n
\n \n \n
\n`),i.makeDom("")),m.register("TagsInput");const u=t.register("FastList",t=>{const e=new Map,s=new Map;let n=1;t.state.renderedList=[];const a=i.newAvg();let l=0,o=0,d=0,r=null,c=null,m=0,u=0,p=10,h=!1;t.onItemUpdate=(t,i)=>{const l=t+m;if(null===r){const t=window.getComputedStyle(i);r=parseFloat(t.marginTop)||0,c=parseFloat(t.marginBottom)||0}0===l&&(d=r);const u=i.offsetHeight+r+c+o,p=e.get(l);if(u!==p){e.set(l,u),a.add(u);const t=u-(p||0),i=l-l%n;s.has(i)&&s.set(i,s.get(i)+t)}},t.refresh=()=>{if(!h)return;p=Math.ceil((t.clientHeight||100)/(a.get()||32));let i=[];const r=t.state.list,c=r.length;let v=0,f=l+d+o,b=0,g=0;for(v=0;v{if(h=!1,e.clear(),s.clear(),a.clear(),d=0,r=null,c=null,!(null==i?void 0:i.length))return;const m=i.length||0;n=Math.ceil(Math.sqrt(m))||10;const u=window.getComputedStyle(t);l=parseFloat(u.paddingTop)||0,o=parseFloat(u.rowGap)||0,t.state.renderedList=i.slice(0,Math.min(30,m))||[],requestAnimationFrame(()=>{if(h||t.state.list!==i)return;const l=a.get()||32;for(let t=0;t\n
\n
\n
\n
\n'));t.attachSelectFeature=(t,e="itemclick",i="selectItem",s="itemActiveTag",n="selectedItem",a="idfield",l="auto-select")=>{const o=l&&t.hasAttribute(l);t[i]=(i,s)=>{o&&(t.state[n]=t.state[n]===i[t[a]]?null:i[t[a]]),t.dispatchEvent(new CustomEvent(e,{bubbles:!1,detail:!o||t.state[n]?{item:i,index:s}:{item:{},index:null}}))},t[s]=e=>null!==t.state[n]&&t.state[n]===e[t[a]]?"active":""},t.register("List",e=>{t.attachSelectFeature(e);const s={idfield:"id",labelfield:"label",summaryfield:"summary"};e.state.__watch("list",t=>{i.updateDefaults(e,s)})},i.makeDom('\n
\n
\n \n
${item[this.labelfield]}
\n
\n
\n
\n
\n')),t.register("GroupedList",e=>{t.getSetupFunction("List")(e),e._selectItem=e.selectItem,e.selectItem=(t,i)=>{e.state.selectedGroup=null,e._selectItem(t,i)},t.attachSelectFeature(e,"groupclick","selectGroup","groupActiveTag","selectedGroup","groupidfield",e.hasAttribute("auto-select-group")||e.hasAttribute("auto-select")&&"group-selectable"),e._selectGroup=e.selectGroup,e.selectGroup=(t,i)=>{e.state.selectedItem=null,e._selectGroup(t,i)};const s={typefield:"type",groupidfield:"id",grouplabelfield:"label",groupsummaryfield:"summary",groupfield:"group"};e.state.__watch("list",t=>{i.updateDefaults(e,s);const n=[];return(e.state.groups||[]).forEach(i=>{n.push({[e.typefield]:"group",...i}),t&&t.forEach(t=>{t[e.groupfield]===i[e.groupidfield]&&n.push({[e.typefield]:"item",...t})})}),n})},i.makeDom('\n
\n \n
\n')),t.register("FastGroupedList",e=>{t.getSetupFunction("List")(e),t.getSetupFunction("GroupedList")(e)},i.makeDom('\n\n
\n
\n \n
${item[this.grouplabelfield]}
\n
\n
\n
\n
\n \n
${item[this.labelfield]}
\n
\n
\n
\n
\n\n')),t.register("Tree",t=>{const e={parentfield:"parent",groupicon:"folder",itemicon:"file"};t.state.__watch("list",()=>{i.updateDefaults(t,e);const s={};(t.state.list||[]).forEach(e=>{var i;return(s[i=e[t.parentfield]||""]??(s[i]=[])).push(e)});const n=[],a=(e,i)=>e.forEach(e=>{var l;const o=e[t.idfield],d=!!(null==(l=s[o])?void 0:l.length);n.push({...e,_level:i,_hasChildren:d}),d&&a(s[o],i+1)});return a(s[""]||[],0),n})},i.makeDom('\n\n\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t
\n\n'));const p=t.register("FastTree",e=>{t.getSetupFunction("List")(e),t.getSetupFunction("Tree")(e)},i.makeDom('\n\n\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t
\n\n'));t.register("CollapseTree",s=>{t.attachSelectFeature(s);const n={idfield:"id",parentfield:"parent",labelfield:"label",summaryfield:"summary"};s.collapsed=e({}),s.state.__watch("list",()=>{i.updateDefaults(s,n);const t={};(s.state.list||[]).forEach(e=>{var i;return(t[i=e[s.parentfield]||""]??(t[i]=[])).push(e)});const e=[],a=(i,n,l)=>i.forEach(i=>{var o;const d=i[s.idfield],r=!!(null==(o=t[d])?void 0:o.length);e.push({...i,_level:n,_hasChildren:r,_parents:l}),r&&a(t[d],n+1,[...l,d])});return a(t[""]||[],0,[]),e})},i.makeDom('\n\n\t
\n\t\t
\n\t\t\t\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t
\n\n')),t.register("Nav",t=>{t.click=(e,i)=>{e.noselect||i||(n.nav=e.name),t.dispatchEvent(new CustomEvent("nav",{detail:{item:e},bubbles:!1}))}},i.makeDom('\n
\n\t\n\t\n\t\n\t
\n\t
\n\t\t\n\t\t
\n\t\t\t\n\t\t\t
\n\t\t\t\t\n\t\t\t
\n\t\t
\n\t
\n
\n'));let h=!1,v={},f={};const b={start:(t,{onmousemove:e,onmouseup:i})=>{v={x:t.clientX,y:t.clientY,w:0,h:0},f={onmousemove:e,onmouseup:i},h=!0}};globalThis.MouseMover=b,"undefined"!=typeof document&&(document.addEventListener("mouseup",t=>{var e;h&&(h=!1,null==(e=f.onmouseup)||e.call(f,{event:t,...v}))}),document.addEventListener("mousemove",t=>{var e;h&&(v.w=t.clientX-v.x,v.h=t.clientY-v.y,null==(e=f.onmousemove)||e.call(f,{event:t,...v}))})),t.register("Resizer",t=>{const e=t.hasAttribute("vertical"),i=parseInt(t.getAttribute("min"))||10,s=parseInt(t.getAttribute("max"))||1e3,n=t.target||t.previousElementSibling,a=(t,n,a)=>{const l=t+(e?a:n);return ls?s:l};t.addEventListener("mousedown",i=>{const s=e?n.offsetHeight:n.offsetWidth;b.start(i,{onmousemove:({w:t,h:i})=>n.style[e?"height":"width"]=a(s,t,i)+"px",onmouseup:({w:e,h:i})=>t.dispatchEvent(new CustomEvent("resize",{detail:{oldSize:s,newSize:a(s,e,i)},bubbles:!1}))})})},i.makeDom("\n
\n"));const g=e({exitBlocks:0});if(globalThis.State=g,"undefined"!=typeof window&&window.addEventListener("beforeunload",t=>{g.exitBlocks>0&&t.preventDefault()}),globalThis.HTTP=l,globalThis.UI=d,globalThis.AutoForm=m,globalThis.MouseMover=b,"undefined"!=typeof document){const t=()=>{console.log("Base project triggering RefreshState"),a(document.documentElement)};"loading"!==document.readyState?t():document.addEventListener("DOMContentLoaded",t,!0)}export{o as APIComponent,m as AutoForm,u as FastListComponent,p as FastTreeComponent,l as HTTP,b as MouseMover,g as State,d as UI}; +import{Component as t,NewState as e,Util as i,$ as s,Hash as n,RefreshState as a}from"@web/state";const l={get:({url:t,...e})=>l.request({url:t,method:"GET",...e}),post:({url:t,data:e,...i})=>l.request({url:t,method:"POST",data:e,...i}),put:({url:t,data:e,...i})=>l.request({url:t,method:"PUT",data:e,...i}),delete:({url:t,...e})=>l.request({url:t,method:"DELETE",...e}),head:({url:t,...e})=>l.request({url:t,method:"HEAD",...e}),request:async({url:t,method:e="POST",data:i,headers:s={},responseType:n,timeout:a=1e4})=>{var l;const o={method:e=e.toUpperCase(),signal:null==(l=AbortSignal.timeout)?void 0:l.call(AbortSignal,a)};if(void 0!==i&&"GET"!==e&&"HEAD"!==e){if(i instanceof HTMLFormElement&&(i=new FormData(i)),i&&"object"==typeof i&&!(i instanceof FormData)&&!(i instanceof ArrayBuffer||ArrayBuffer.isView(i))&&Object.values(i).some(t=>t instanceof File||t instanceof Blob||t instanceof FileList||Array.isArray(t)&&t.some(t=>t instanceof File||t instanceof Blob))){const t=new FormData;for(const[e,s]of Object.entries(i))s instanceof FileList||Array.isArray(s)?Array.from(s).forEach(i=>t.append(e,i)):null!=s&&t.append(e,s);i=t}i instanceof FormData?delete s["Content-Type"]:"string"==typeof i||i instanceof ArrayBuffer||ArrayBuffer.isView(i)||(i=JSON.stringify(i),s["Content-Type"]||(s["Content-Type"]="application/json")),o.body=i}Object.keys(s).length&&(o.headers=s);const r={error:null,ok:null,status:0,headers:{},responseType:"",result:null};try{const e=await fetch(t,o);if(Object.assign(r,{ok:e.ok,status:e.status,headers:Object.fromEntries(e.headers.entries())}),!n){const t=e.headers.get("Content-Type")||"";n=t.includes("application/json")?"json":/image|video|audio|pdf|zip|octet-stream/.test(t)?"binary":"text",r.responseType=n}!1===r.ok&&(r.error=(r.statusText||"HTTP "+r.status+" error")+" for "+t),r.result="json"===n?await e.json():"binary"===n?await e.arrayBuffer():await e.text()}catch(t){Object.assign(r,{error:t.message||String(t),ok:!1})}return r}},o=t.register("API",t=>{t.request=e({url:"",method:"GET",headers:{},data:null,timeout:1e4,responseType:""}),t.response=e({loading:!1,ok:null,status:null,error:null,headers:{},responseType:"",result:null}),t.result=e(),t.do=(e={})=>new Promise((i,s)=>{const n={...t.request,...e};if(!n.url)throw new Error(".url is required");n.headers={...t.request.headers,...e.headers},t.response.loading=!0,l.request(n).then(e=>{if(Object.keys(e).forEach(i=>{"result"!==i&&(t.response[i]=e[i])}),e.result&&"object"==typeof e.result&&t.result&&"object"==typeof t.result?Object.assign(t.result,e.result):t.result=e.result,t.response.loading=!1,!1===e.ok)throw new Error(e.error);if("object"==typeof e.result&&e.result.error)throw new Error(e.result.error);t.dispatchEvent(new CustomEvent("response",{detail:e,bubbles:!1})),i(e)}).catch(i=>{var n;!e.noui&&(null==(n=globalThis.UI)?void 0:n.toast)&&UI.toast(i.message,{type:"danger"}),t.dispatchEvent(new CustomEvent("error",{detail:i,bubbles:!0})),s(i)})});let i=null;t.request.__watch(null,()=>{t.hasAttribute("auto")&&t.request.url&&(i||(i=Promise.resolve().then(()=>{t.do(),i=null})))})}),r={};t.register("Modal",t=>{t.modal=new bootstrap.Modal(t),t.addEventListener("bind",e=>{e.detail?t.modal.show():t.modal.hide()}),t.addEventListener("hide.bs.modal",()=>{var e;null==(e=document.activeElement)||e.blur(),t.dispatchEvent(new CustomEvent("change",{bubbles:!1,detail:!1}))}),i.copyFunction(t,t.modal,"show","hide")},i.makeDom('\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n')),t.register("Dialog",t.getSetupFunction("Modal"),i.makeDom('\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n'));let d=0;r.showDialog=function({title:t="",message:e="",buttons:i=["{#Close#}"],type:s="body"}){const n=document.body.appendChild(document.createElement("Dialog"));return n.style.zIndex=2e3+ ++d,Promise.resolve().then(()=>{Object.assign(n.state,{message:e,title:t,type:s,buttons:i}),n.show()}),new Promise(t=>{n.addEventListener("change",e=>{d--,t(n.result||0),n.remove()})})},r.alert=function(t,e={}){return r.showDialog({message:t,...e})},r.confirm=function(t,e={}){return new Promise(i=>r.showDialog({message:t,buttons:["{#Cancel#}","{#Confirm#}"],...e}).then(t=>i(t>=2)).catch(()=>i(!1)))},t.register("Toast",t=>{t.toast=new bootstrap.Toast(t,{autohide:t.state.delay>0}),i.copyFunction(t,t.toast,"show","hide"),t.addEventListener("show.bs.toast",()=>{if(t.state.delay>0){let e;const i=()=>{t.state.left=t.state.delay/1e3,e=setInterval(()=>{(!t.isConnected||--t.state.left<=0)&&clearInterval(e)},1e3)};i(),t.addEventListener("mouseenter",()=>{clearInterval(e),t.state.left=void 0}),t.addEventListener("mouseleave",i)}})},i.makeDom('\n
\n
\n
\n
\n \n \n
\n \n
\n
\n \n
\n
\n
\n'),i.makeDom('
')),r.toast=function(t,e={}){const i=e.delay??5e3,n=document.createElement("Toast");n.state={delay:i,left:i?i/1e3:void 0,type:e.type||"primary",message:t,buttons:e.buttons||[]},s(`[toast-container="${e.container||"default"}"]`).appendChild(n),Promise.resolve().then(()=>n.show())},r.toastConfirm=function(t,e={}){return new Promise(i=>r.toast(t,{buttons:["{#Confirm#}"],...e}).then(t=>i(1===t)).catch(()=>i(!1)))},t.register("AutoForm",t=>{t.state.schema||(t.state.schema=[]),t.vertical=t.hasAttribute("vertical"),t.inline=t.hasAttribute("inline"),t.request={method:"POST"},t.response={},t.result=null,t.data&&t.data.__watch||(t.data=e(t.data||{})),t.data.__watch("*",()=>{if(t.inline){const e=t.closest("DataTable");e&&e.refresh&&e.refresh()}}),t.form=s(t,"form"),t.submit=(e={})=>{var i,s;if(!t.form.reportValidity())return null==(s=null==(i=globalThis.UI)?void 0:i.toast)?void 0:s.call(i,"{#verify failed#}",{type:"danger"});if(!t.dispatchEvent(new CustomEvent("submit",{detail:t.data,cancelable:!0,bubbles:!1})))return;const n={...t.request,data:t.data,noui:!0,...e};let a=null;if(t.api)a=t.api.do(n);else{if(!t.request.url)return console.warn("{#please config .api or .request.url to auto submit#}");a=l.request(n)}a.then(e=>{if(t.response=e,t.result=e.result,"object"==typeof e.result&&e.result.error)throw new Error(e.result.error);t.dispatchEvent(new CustomEvent("response",{detail:e,bubbles:!1}))}).catch(e=>{var i;(null==(i=globalThis.UI)?void 0:i.toast)&&UI.toast(e.message,{type:"danger"}),t.dispatchEvent(new CustomEvent("error",{detail:e,bubbles:!0}))})}},i.makeDom('\n
\n
\n
\n \n
\n \n \n
\n \n
\n
\n \n
\n \n
\n
\n
\n
\n \n
\n
\n
\n'),i.makeDom(""));const c=[],m={register:e=>{"undefined"!=typeof document&&("loading"!==document.readyState&&t.getTemplate("AutoForm")?m._addAutoFormComponent(e):c.push(e))},_addAutoFormComponent:e=>{var n;const a=t.getTemplate("AutoForm");a&&(null==(n=s(a.content,"[control-wrapper]"))||n.appendChild(i.makeDom(`<${e} $if="item.type.toUpperCase() === '${e.toUpperCase()}'" $name="item.name" $.="item.setting || {}" $bind="this.data[item.name]">`)))}};if("undefined"!=typeof document){const t=()=>{c.forEach(t=>m._addAutoFormComponent(t)),c.length=0};"loading"!==document.readyState?setTimeout(t,100):document.addEventListener("DOMContentLoaded",()=>setTimeout(t,100),!0)}t.register("TagsInput",t=>{t.addEventListener("bind",e=>{t.state.tags=e.detail||[]})},i.makeDom(`\n
\n \n \n
\n`),i.makeDom("")),m.register("TagsInput");const u=()=>{const t=new Map,e=new Map;let s=1;const n=i.newAvg();let a=0,l=0,o=0,r=null,d=null,c=!1;return{reset:(i,m)=>{if(c=!1,t.clear(),e.clear(),n.clear(),o=0,r=null,d=null,!(null==i?void 0:i.length))return[];const u=i.length;s=Math.ceil(Math.sqrt(u))||10;const p=window.getComputedStyle(m);return a=parseFloat(p.paddingTop)||0,l=parseFloat(p.rowGap)||0,i.slice(0,Math.min(30,u))},init:(i,a)=>{if(c)return;const l=i.length,o=n.get()||32;for(let e=0;e{if(null===r){const t=window.getComputedStyle(a);r=parseFloat(t.marginTop)||0,d=parseFloat(t.marginBottom)||0}0===i&&(o=r);const c=a.offsetHeight+r+d+l,m=t.get(i);if(c!==m){t.set(i,c),n.add(c);const a=c-(m||0),l=i-i%s;e.has(l)&&e.set(l,e.get(l)+a)}},calc:(i,r)=>{if(!c||!r)return null;const d=r.length,m=Math.ceil((i.clientHeight||100)/(n.get()||32));let u=a+o+l,p=0,h=0,v=0,f=0;for(let n=0;n{const e=u();t.state.renderedList=[],t.onItemUpdate=(i,s)=>{e.update(i+(t.state._listStartIndex||0),s)},t.refresh=()=>{const i=e.calc(t,t.state.list);i&&(t.state.prevHeight=i.prevHeight,t.state.postHeight=i.postHeight,t.state._listStartIndex=i.listStartIndex,t.state.renderedList=i.renderedList)},t.state.__watch("list",i=>{t.state._listStartIndex=0,t.state.renderedList=e.reset(i,t)||[],requestAnimationFrame(()=>{t.state.list===i&&e.init(i,t.refresh)})})},i.makeDom('\n
\n
\n
\n
\n
\n'));t.attachSelectFeature=(t,e="itemclick",i="selectItem",s="itemActiveTag",n="selectedItem",a="idfield",l="auto-select")=>{const o=l&&t.hasAttribute(l);t[i]=(i,s)=>{o&&(t.state[n]=t.state[n]===i[t[a]]?null:i[t[a]]),t.dispatchEvent(new CustomEvent(e,{bubbles:!1,detail:!o||t.state[n]?{item:i,index:s}:{item:{},index:null}}))},t[s]=e=>null!==t.state[n]&&t.state[n]===e[t[a]]?"active":""},t.register("List",e=>{t.attachSelectFeature(e);const s={idfield:"id",labelfield:"label",summaryfield:"summary"};e.state.__watch("list",t=>{i.updateDefaults(e,s)})},i.makeDom('\n
\n
\n \n
${item[this.labelfield]}
\n
\n
\n
\n
\n')),t.register("GroupedList",e=>{t.getSetupFunction("List")(e),e._selectItem=e.selectItem,e.selectItem=(t,i)=>{e.state.selectedGroup=null,e._selectItem(t,i)},t.attachSelectFeature(e,"groupclick","selectGroup","groupActiveTag","selectedGroup","groupidfield",e.hasAttribute("auto-select-group")||e.hasAttribute("auto-select")&&"group-selectable"),e._selectGroup=e.selectGroup,e.selectGroup=(t,i)=>{e.state.selectedItem=null,e._selectGroup(t,i)};const s={typefield:"type",groupidfield:"id",grouplabelfield:"label",groupsummaryfield:"summary",groupfield:"group"};e.state.__watch("list",t=>{i.updateDefaults(e,s);const n=[];return(e.state.groups||[]).forEach(i=>{n.push({[e.typefield]:"group",...i}),t&&t.forEach(t=>{t[e.groupfield]===i[e.groupidfield]&&n.push({[e.typefield]:"item",...t})})}),n})},i.makeDom('\n
\n \n
\n')),t.register("FastGroupedList",e=>{t.getSetupFunction("List")(e),t.getSetupFunction("GroupedList")(e)},i.makeDom('\n\n
\n
\n \n
${item[this.grouplabelfield]}
\n
\n
\n
\n
\n \n
${item[this.labelfield]}
\n
\n
\n
\n
\n\n')),t.register("Tree",t=>{const e={parentfield:"parent",groupicon:"folder",itemicon:"file"};t.state.__watch("list",()=>{i.updateDefaults(t,e);const s={};(t.state.list||[]).forEach(e=>{var i;return(s[i=e[t.parentfield]||""]??(s[i]=[])).push(e)});const n=[],a=(e,i)=>e.forEach(e=>{var l;const o=e[t.idfield],r=!!(null==(l=s[o])?void 0:l.length);n.push({...e,_level:i,_hasChildren:r}),r&&a(s[o],i+1)});return a(s[""]||[],0),n})},i.makeDom('\n\n\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t
\n\n'));const h=t.register("FastTree",e=>{t.getSetupFunction("List")(e),t.getSetupFunction("Tree")(e)},i.makeDom('\n\n\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t
\n\n'));t.register("CollapseTree",s=>{t.attachSelectFeature(s);const n={idfield:"id",parentfield:"parent",labelfield:"label",summaryfield:"summary"};s.collapsed=e({}),s.state.__watch("list",()=>{i.updateDefaults(s,n);const t={};(s.state.list||[]).forEach(e=>{var i;return(t[i=e[s.parentfield]||""]??(t[i]=[])).push(e)});const e=[],a=(i,n,l)=>i.forEach(i=>{var o;const r=i[s.idfield],d=!!(null==(o=t[r])?void 0:o.length);e.push({...i,_level:n,_hasChildren:d,_parents:l}),d&&a(t[r],n+1,[...l,r])});return a(t[""]||[],0,[]),e})},i.makeDom('\n\n\t
\n\t\t
\n\t\t\t\n\t\t
\n\t\t
\n\t\t
\n\t\t
\n\t
\n\n')),t.register("Nav",t=>{t.click=(e,i)=>{e.noselect||i||(n.nav=e.name),t.dispatchEvent(new CustomEvent("nav",{detail:{item:e},bubbles:!1}))}},i.makeDom('\n
\n\t\n\t\n\t\n\t
\n\t
\n\t\t\n\t\t
\n\t\t\t\n\t\t\t
\n\t\t\t\t\n\t\t\t
\n\t\t
\n\t
\n
\n'));let v=!1,f={},g={};const b={start:(t,{onmousemove:e,onmouseup:i})=>{f={x:t.clientX,y:t.clientY,w:0,h:0},g={onmousemove:e,onmouseup:i},v=!0}};globalThis.MouseMover=b,"undefined"!=typeof document&&(document.addEventListener("mouseup",t=>{var e;v&&(v=!1,null==(e=g.onmouseup)||e.call(g,{event:t,...f}))}),document.addEventListener("mousemove",t=>{var e;v&&(f.w=t.clientX-f.x,f.h=t.clientY-f.y,null==(e=g.onmousemove)||e.call(g,{event:t,...f}))})),t.register("Resizer",t=>{t.isVertical=t.hasAttribute("vertical");const e=parseInt(t.getAttribute("min"))||10,i=parseInt(t.getAttribute("max"))||1e3,s=t.target||t.previousElementSibling;t.addEventListener("bind",e=>{void 0!==e.detail&&null!==e.detail&&(s.style[t.isVertical?"height":"width"]=e.detail+"px")});const n=(s,n,a)=>{const l=s+(t.isVertical?a:n);return li?i:l};t.addEventListener("mousedown",e=>{const i=t.isVertical?s.offsetHeight:s.offsetWidth;b.start(e,{onmousemove:({w:e,h:a})=>{const l=n(i,e,a);s.style[t.isVertical?"height":"width"]=l+"px",t.dispatchEvent(new CustomEvent("resizing",{detail:{oldSize:i,newSize:l},bubbles:!1}))},onmouseup:({w:e,h:s})=>{const a=n(i,e,s);t.dispatchEvent(new CustomEvent("resize",{detail:{oldSize:i,newSize:a},bubbles:!1})),t.dispatchEvent(new CustomEvent("change",{detail:a,bubbles:!1}))}})})},i.makeDom("\n
\n"));const x=e({exitBlocks:0});if(globalThis.State=x,"undefined"!=typeof window&&window.addEventListener("beforeunload",t=>{x.exitBlocks>0&&t.preventDefault()}),globalThis.HTTP=l,globalThis.UI=r,globalThis.AutoForm=m,globalThis.MouseMover=b,"undefined"!=typeof document){const t=()=>{console.log("Base project triggering RefreshState"),a(document.documentElement)};"loading"!==document.readyState?t():document.addEventListener("DOMContentLoaded",t,!0)}export{o as APIComponent,m as AutoForm,p as FastListComponent,h as FastTreeComponent,l as HTTP,b as MouseMover,x as State,r as UI,u as VirtualScroll}; diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 771baf0..0239663 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "@web/base", - "version": "1.0.0", + "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { @@ -183,6 +183,20 @@ "@esbuild/win32-x64": "0.21.5" } }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/nanoid": { "version": "3.3.12", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", @@ -431,6 +445,20 @@ "optional": true } } + }, + "node_modules/vite/node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } } } } diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json index e806092..14cf9c6 100644 --- a/node_modules/.vite/deps/_metadata.json +++ b/node_modules/.vite/deps/_metadata.json @@ -1,8 +1,8 @@ { - "hash": "f5c4792c", + "hash": "a2c51734", "configHash": "a1c4c8e0", - "lockfileHash": "4618e5dd", - "browserHash": "7960c498", + "lockfileHash": "99ec7e3e", + "browserHash": "7e396f40", "optimized": {}, "chunks": {} } \ No newline at end of file diff --git a/node_modules/.vite/deps_temp_b6940abf/package.json b/node_modules/.vite/deps_temp_b6940abf/package.json deleted file mode 100644 index 3dbc1ca..0000000 --- a/node_modules/.vite/deps_temp_b6940abf/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "module" -} diff --git a/node_modules/fsevents/LICENSE b/node_modules/fsevents/LICENSE new file mode 100644 index 0000000..5d70441 --- /dev/null +++ b/node_modules/fsevents/LICENSE @@ -0,0 +1,22 @@ +MIT License +----------- + +Copyright (C) 2010-2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/node_modules/fsevents/README.md b/node_modules/fsevents/README.md new file mode 100644 index 0000000..025c9a1 --- /dev/null +++ b/node_modules/fsevents/README.md @@ -0,0 +1,83 @@ +# fsevents [![NPM](https://nodei.co/npm/fsevents.png)](https://nodei.co/npm/fsevents/) + +Native access to MacOS FSEvents in [Node.js](https://nodejs.org/) + +The FSEvents API in MacOS allows applications to register for notifications of +changes to a given directory tree. It is a very fast and lightweight alternative +to kqueue. + +This is a low-level library. For a cross-platform file watching module that +uses fsevents, check out [Chokidar](https://github.com/paulmillr/chokidar). + +## Installation + +Supports only **Node.js v8.16 and higher**. + +```sh +npm install fsevents +``` + +## Usage + +```js +const fsevents = require('fsevents'); +const stop = fsevents.watch(__dirname, (path, flags, id) => { + const info = fsevents.getInfo(path, flags, id); +}); // To start observation +stop(); // To end observation +``` + +The callback passed as the second parameter to `.watch` get's called whenever the operating system detects a +a change in the file system. It takes three arguments: + +###### `fsevents.watch(dirname: string, (path: string, flags: number, id: string) => void): () => Promise` + + * `path: string` - the item in the filesystem that have been changed + * `flags: number` - a numeric value describing what the change was + * `id: string` - an unique-id identifying this specific event + + Returns closer callback which when called returns a Promise resolving when the watcher process has been shut down. + +###### `fsevents.getInfo(path: string, flags: number, id: string): FsEventInfo` + +The `getInfo` function takes the `path`, `flags` and `id` arguments and converts those parameters into a structure +that is easier to digest to determine what the change was. + +The `FsEventsInfo` has the following shape: + +```js +/** + * @typedef {'created'|'modified'|'deleted'|'moved'|'root-changed'|'cloned'|'unknown'} FsEventsEvent + * @typedef {'file'|'directory'|'symlink'} FsEventsType + */ +{ + "event": "created", // {FsEventsEvent} + "path": "file.txt", + "type": "file", // {FsEventsType} + "changes": { + "inode": true, // Had iNode Meta-Information changed + "finder": false, // Had Finder Meta-Data changed + "access": false, // Had access permissions changed + "xattrs": false // Had xAttributes changed + }, + "flags": 0x100000000 +} +``` + +## Changelog + +- v2.3 supports Apple Silicon ARM CPUs +- v2 supports node 8.16+ and reduces package size massively +- v1.2.8 supports node 6+ +- v1.2.7 supports node 4+ + +## Troubleshooting + +- I'm getting `EBADPLATFORM` `Unsupported platform for fsevents` error. +- It's fine, nothing is broken. fsevents is macos-only. Other platforms are skipped. If you want to hide this warning, report a bug to NPM bugtracker asking them to hide ebadplatform warnings by default. + +## License + +The MIT License Copyright (C) 2010-2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller — see LICENSE file. + +Visit our [GitHub page](https://github.com/fsevents/fsevents) and [NPM Page](https://npmjs.org/package/fsevents) diff --git a/node_modules/fsevents/fsevents.d.ts b/node_modules/fsevents/fsevents.d.ts new file mode 100644 index 0000000..2723c04 --- /dev/null +++ b/node_modules/fsevents/fsevents.d.ts @@ -0,0 +1,46 @@ +declare type Event = "created" | "cloned" | "modified" | "deleted" | "moved" | "root-changed" | "unknown"; +declare type Type = "file" | "directory" | "symlink"; +declare type FileChanges = { + inode: boolean; + finder: boolean; + access: boolean; + xattrs: boolean; +}; +declare type Info = { + event: Event; + path: string; + type: Type; + changes: FileChanges; + flags: number; +}; +declare type WatchHandler = (path: string, flags: number, id: string) => void; +export declare function watch(path: string, handler: WatchHandler): () => Promise; +export declare function watch(path: string, since: number, handler: WatchHandler): () => Promise; +export declare function getInfo(path: string, flags: number): Info; +export declare const constants: { + None: 0x00000000; + MustScanSubDirs: 0x00000001; + UserDropped: 0x00000002; + KernelDropped: 0x00000004; + EventIdsWrapped: 0x00000008; + HistoryDone: 0x00000010; + RootChanged: 0x00000020; + Mount: 0x00000040; + Unmount: 0x00000080; + ItemCreated: 0x00000100; + ItemRemoved: 0x00000200; + ItemInodeMetaMod: 0x00000400; + ItemRenamed: 0x00000800; + ItemModified: 0x00001000; + ItemFinderInfoMod: 0x00002000; + ItemChangeOwner: 0x00004000; + ItemXattrMod: 0x00008000; + ItemIsFile: 0x00010000; + ItemIsDir: 0x00020000; + ItemIsSymlink: 0x00040000; + ItemIsHardlink: 0x00100000; + ItemIsLastHardlink: 0x00200000; + OwnEvent: 0x00080000; + ItemCloned: 0x00400000; +}; +export {}; diff --git a/node_modules/fsevents/fsevents.js b/node_modules/fsevents/fsevents.js new file mode 100644 index 0000000..f1b31c9 --- /dev/null +++ b/node_modules/fsevents/fsevents.js @@ -0,0 +1,82 @@ +/* + ** © 2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller + ** Licensed under MIT License. + */ + +/* jshint node:true */ +"use strict"; + +if (process.platform !== "darwin") { + throw new Error(`Module 'fsevents' is not compatible with platform '${process.platform}'`); +} + +const Native = require("./fsevents.node"); +const events = Native.constants; + +function watch(path, since, handler) { + if (typeof path !== "string") { + throw new TypeError(`fsevents argument 1 must be a string and not a ${typeof path}`); + } + if ("function" === typeof since && "undefined" === typeof handler) { + handler = since; + since = Native.flags.SinceNow; + } + if (typeof since !== "number") { + throw new TypeError(`fsevents argument 2 must be a number and not a ${typeof since}`); + } + if (typeof handler !== "function") { + throw new TypeError(`fsevents argument 3 must be a function and not a ${typeof handler}`); + } + + let instance = Native.start(Native.global, path, since, handler); + if (!instance) throw new Error(`could not watch: ${path}`); + return () => { + const result = instance ? Promise.resolve(instance).then(Native.stop) : Promise.resolve(undefined); + instance = undefined; + return result; + }; +} + +function getInfo(path, flags) { + return { + path, + flags, + event: getEventType(flags), + type: getFileType(flags), + changes: getFileChanges(flags), + }; +} + +function getFileType(flags) { + if (events.ItemIsFile & flags) return "file"; + if (events.ItemIsDir & flags) return "directory"; + if (events.ItemIsSymlink & flags) return "symlink"; +} +function anyIsTrue(obj) { + for (let key in obj) { + if (obj[key]) return true; + } + return false; +} +function getEventType(flags) { + if (events.ItemRemoved & flags) return "deleted"; + if (events.ItemRenamed & flags) return "moved"; + if (events.ItemCreated & flags) return "created"; + if (events.ItemModified & flags) return "modified"; + if (events.RootChanged & flags) return "root-changed"; + if (events.ItemCloned & flags) return "cloned"; + if (anyIsTrue(flags)) return "modified"; + return "unknown"; +} +function getFileChanges(flags) { + return { + inode: !!(events.ItemInodeMetaMod & flags), + finder: !!(events.ItemFinderInfoMod & flags), + access: !!(events.ItemChangeOwner & flags), + xattrs: !!(events.ItemXattrMod & flags), + }; +} + +exports.watch = watch; +exports.getInfo = getInfo; +exports.constants = events; diff --git a/node_modules/fsevents/fsevents.node b/node_modules/fsevents/fsevents.node new file mode 100755 index 0000000..00fac7e Binary files /dev/null and b/node_modules/fsevents/fsevents.node differ diff --git a/node_modules/fsevents/package.json b/node_modules/fsevents/package.json new file mode 100644 index 0000000..af6da84 --- /dev/null +++ b/node_modules/fsevents/package.json @@ -0,0 +1,62 @@ +{ + "name": "fsevents", + "version": "2.3.2", + "description": "Native Access to MacOS FSEvents", + "main": "fsevents.js", + "types": "fsevents.d.ts", + "os": [ + "darwin" + ], + "files": [ + "fsevents.d.ts", + "fsevents.js", + "fsevents.node" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + }, + "scripts": { + "clean": "node-gyp clean && rm -f fsevents.node", + "build": "node-gyp clean && rm -f fsevents.node && node-gyp rebuild && node-gyp clean", + "test": "/bin/bash ./test.sh 2>/dev/null", + "prepublishOnly": "npm run build" + }, + "repository": { + "type": "git", + "url": "https://github.com/fsevents/fsevents.git" + }, + "keywords": [ + "fsevents", + "mac" + ], + "contributors": [ + { + "name": "Philipp Dunkel", + "email": "pip@pipobscure.com" + }, + { + "name": "Ben Noordhuis", + "email": "info@bnoordhuis.nl" + }, + { + "name": "Elan Shankar", + "email": "elan.shanker@gmail.com" + }, + { + "name": "Miroslav Bajtoš", + "email": "mbajtoss@gmail.com" + }, + { + "name": "Paul Miller", + "url": "https://paulmillr.com" + } + ], + "license": "MIT", + "bugs": { + "url": "https://github.com/fsevents/fsevents/issues" + }, + "homepage": "https://github.com/fsevents/fsevents", + "devDependencies": { + "node-gyp": "^6.1.0" + } +} diff --git a/node_modules/vite/node_modules/fsevents/LICENSE b/node_modules/vite/node_modules/fsevents/LICENSE new file mode 100644 index 0000000..5d70441 --- /dev/null +++ b/node_modules/vite/node_modules/fsevents/LICENSE @@ -0,0 +1,22 @@ +MIT License +----------- + +Copyright (C) 2010-2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/node_modules/vite/node_modules/fsevents/README.md b/node_modules/vite/node_modules/fsevents/README.md new file mode 100644 index 0000000..50373a0 --- /dev/null +++ b/node_modules/vite/node_modules/fsevents/README.md @@ -0,0 +1,89 @@ +# fsevents + +Native access to MacOS FSEvents in [Node.js](https://nodejs.org/) + +The FSEvents API in MacOS allows applications to register for notifications of +changes to a given directory tree. It is a very fast and lightweight alternative +to kqueue. + +This is a low-level library. For a cross-platform file watching module that +uses fsevents, check out [Chokidar](https://github.com/paulmillr/chokidar). + +## Usage + +```sh +npm install fsevents +``` + +Supports only **Node.js v8.16 and higher**. + +```js +const fsevents = require('fsevents'); + +// To start observation +const stop = fsevents.watch(__dirname, (path, flags, id) => { + const info = fsevents.getInfo(path, flags); +}); + +// To end observation +stop(); +``` + +> **Important note:** The API behaviour is slightly different from typical JS APIs. The `stop` function **must** be +> retrieved and stored somewhere, even if you don't plan to stop the watcher. If you forget it, the garbage collector +> will eventually kick in, the watcher will be unregistered, and your callbacks won't be called anymore. + +The callback passed as the second parameter to `.watch` get's called whenever the operating system detects a +a change in the file system. It takes three arguments: + +###### `fsevents.watch(dirname: string, (path: string, flags: number, id: string) => void): () => Promise` + + * `path: string` - the item in the filesystem that have been changed + * `flags: number` - a numeric value describing what the change was + * `id: string` - an unique-id identifying this specific event + + Returns closer callback which when called returns a Promise resolving when the watcher process has been shut down. + +###### `fsevents.getInfo(path: string, flags: number, id: string): FsEventInfo` + +The `getInfo` function takes the `path`, `flags` and `id` arguments and converts those parameters into a structure +that is easier to digest to determine what the change was. + +The `FsEventsInfo` has the following shape: + +```js +/** + * @typedef {'created'|'modified'|'deleted'|'moved'|'root-changed'|'cloned'|'unknown'} FsEventsEvent + * @typedef {'file'|'directory'|'symlink'} FsEventsType + */ +{ + "event": "created", // {FsEventsEvent} + "path": "file.txt", + "type": "file", // {FsEventsType} + "changes": { + "inode": true, // Had iNode Meta-Information changed + "finder": false, // Had Finder Meta-Data changed + "access": false, // Had access permissions changed + "xattrs": false // Had xAttributes changed + }, + "flags": 0x100000000 +} +``` + +## Changelog + +- v2.3 supports Apple Silicon ARM CPUs +- v2 supports node 8.16+ and reduces package size massively +- v1.2.8 supports node 6+ +- v1.2.7 supports node 4+ + +## Troubleshooting + +- I'm getting `EBADPLATFORM` `Unsupported platform for fsevents` error. +- It's fine, nothing is broken. fsevents is macos-only. Other platforms are skipped. If you want to hide this warning, report a bug to NPM bugtracker asking them to hide ebadplatform warnings by default. + +## License + +The MIT License Copyright (C) 2010-2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller — see LICENSE file. + +Visit our [GitHub page](https://github.com/fsevents/fsevents) and [NPM Page](https://npmjs.org/package/fsevents) diff --git a/node_modules/vite/node_modules/fsevents/fsevents.d.ts b/node_modules/vite/node_modules/fsevents/fsevents.d.ts new file mode 100644 index 0000000..2723c04 --- /dev/null +++ b/node_modules/vite/node_modules/fsevents/fsevents.d.ts @@ -0,0 +1,46 @@ +declare type Event = "created" | "cloned" | "modified" | "deleted" | "moved" | "root-changed" | "unknown"; +declare type Type = "file" | "directory" | "symlink"; +declare type FileChanges = { + inode: boolean; + finder: boolean; + access: boolean; + xattrs: boolean; +}; +declare type Info = { + event: Event; + path: string; + type: Type; + changes: FileChanges; + flags: number; +}; +declare type WatchHandler = (path: string, flags: number, id: string) => void; +export declare function watch(path: string, handler: WatchHandler): () => Promise; +export declare function watch(path: string, since: number, handler: WatchHandler): () => Promise; +export declare function getInfo(path: string, flags: number): Info; +export declare const constants: { + None: 0x00000000; + MustScanSubDirs: 0x00000001; + UserDropped: 0x00000002; + KernelDropped: 0x00000004; + EventIdsWrapped: 0x00000008; + HistoryDone: 0x00000010; + RootChanged: 0x00000020; + Mount: 0x00000040; + Unmount: 0x00000080; + ItemCreated: 0x00000100; + ItemRemoved: 0x00000200; + ItemInodeMetaMod: 0x00000400; + ItemRenamed: 0x00000800; + ItemModified: 0x00001000; + ItemFinderInfoMod: 0x00002000; + ItemChangeOwner: 0x00004000; + ItemXattrMod: 0x00008000; + ItemIsFile: 0x00010000; + ItemIsDir: 0x00020000; + ItemIsSymlink: 0x00040000; + ItemIsHardlink: 0x00100000; + ItemIsLastHardlink: 0x00200000; + OwnEvent: 0x00080000; + ItemCloned: 0x00400000; +}; +export {}; diff --git a/node_modules/vite/node_modules/fsevents/fsevents.js b/node_modules/vite/node_modules/fsevents/fsevents.js new file mode 100644 index 0000000..198da98 --- /dev/null +++ b/node_modules/vite/node_modules/fsevents/fsevents.js @@ -0,0 +1,83 @@ +/* + ** © 2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller + ** Licensed under MIT License. + */ + +/* jshint node:true */ +"use strict"; + +if (process.platform !== "darwin") { + throw new Error(`Module 'fsevents' is not compatible with platform '${process.platform}'`); +} + +const Native = require("./fsevents.node"); +const events = Native.constants; + +function watch(path, since, handler) { + if (typeof path !== "string") { + throw new TypeError(`fsevents argument 1 must be a string and not a ${typeof path}`); + } + if ("function" === typeof since && "undefined" === typeof handler) { + handler = since; + since = Native.flags.SinceNow; + } + if (typeof since !== "number") { + throw new TypeError(`fsevents argument 2 must be a number and not a ${typeof since}`); + } + if (typeof handler !== "function") { + throw new TypeError(`fsevents argument 3 must be a function and not a ${typeof handler}`); + } + + let instance = Native.start(Native.global, path, since, handler); + if (!instance) throw new Error(`could not watch: ${path}`); + return () => { + const result = instance ? Promise.resolve(instance).then(Native.stop) : Promise.resolve(undefined); + instance = undefined; + return result; + }; +} + +function getInfo(path, flags) { + return { + path, + flags, + event: getEventType(flags), + type: getFileType(flags), + changes: getFileChanges(flags), + }; +} + +function getFileType(flags) { + if (events.ItemIsFile & flags) return "file"; + if (events.ItemIsDir & flags) return "directory"; + if (events.MustScanSubDirs & flags) return "directory"; + if (events.ItemIsSymlink & flags) return "symlink"; +} +function anyIsTrue(obj) { + for (let key in obj) { + if (obj[key]) return true; + } + return false; +} +function getEventType(flags) { + if (events.ItemRemoved & flags) return "deleted"; + if (events.ItemRenamed & flags) return "moved"; + if (events.ItemCreated & flags) return "created"; + if (events.ItemModified & flags) return "modified"; + if (events.RootChanged & flags) return "root-changed"; + if (events.ItemCloned & flags) return "cloned"; + if (anyIsTrue(flags)) return "modified"; + return "unknown"; +} +function getFileChanges(flags) { + return { + inode: !!(events.ItemInodeMetaMod & flags), + finder: !!(events.ItemFinderInfoMod & flags), + access: !!(events.ItemChangeOwner & flags), + xattrs: !!(events.ItemXattrMod & flags), + }; +} + +exports.watch = watch; +exports.getInfo = getInfo; +exports.constants = events; diff --git a/node_modules/vite/node_modules/fsevents/fsevents.node b/node_modules/vite/node_modules/fsevents/fsevents.node new file mode 100755 index 0000000..1cc3345 Binary files /dev/null and b/node_modules/vite/node_modules/fsevents/fsevents.node differ diff --git a/node_modules/vite/node_modules/fsevents/package.json b/node_modules/vite/node_modules/fsevents/package.json new file mode 100644 index 0000000..5d0ee15 --- /dev/null +++ b/node_modules/vite/node_modules/fsevents/package.json @@ -0,0 +1,62 @@ +{ + "name": "fsevents", + "version": "2.3.3", + "description": "Native Access to MacOS FSEvents", + "main": "fsevents.js", + "types": "fsevents.d.ts", + "os": [ + "darwin" + ], + "files": [ + "fsevents.d.ts", + "fsevents.js", + "fsevents.node" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + }, + "scripts": { + "clean": "node-gyp clean && rm -f fsevents.node", + "build": "node-gyp clean && rm -f fsevents.node && node-gyp rebuild && node-gyp clean", + "test": "/bin/bash ./test.sh 2>/dev/null", + "prepublishOnly": "npm run build" + }, + "repository": { + "type": "git", + "url": "https://github.com/fsevents/fsevents.git" + }, + "keywords": [ + "fsevents", + "mac" + ], + "contributors": [ + { + "name": "Philipp Dunkel", + "email": "pip@pipobscure.com" + }, + { + "name": "Ben Noordhuis", + "email": "info@bnoordhuis.nl" + }, + { + "name": "Elan Shankar", + "email": "elan.shanker@gmail.com" + }, + { + "name": "Miroslav Bajtoš", + "email": "mbajtoss@gmail.com" + }, + { + "name": "Paul Miller", + "url": "https://paulmillr.com" + } + ], + "license": "MIT", + "bugs": { + "url": "https://github.com/fsevents/fsevents/issues" + }, + "homepage": "https://github.com/fsevents/fsevents", + "devDependencies": { + "node-gyp": "^9.4.0" + } +} diff --git a/package-lock.json b/package-lock.json index c3d5838..e42e0d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@web/base", - "version": "1.0.0", + "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@web/base", - "version": "1.0.0", + "version": "1.0.2", "devDependencies": { "@playwright/test": "^1.40.0", "@rollup/plugin-terser": "^1.0.0", diff --git a/package.json b/package.json index a5a9356..b14ade0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@web/base", - "version": "1.0.1", + "version": "1.0.2", "type": "module", "main": "dist/base.js", "module": "dist/base.js", diff --git a/src/form.js b/src/form.js index 64caad4..646da8d 100644 --- a/src/form.js +++ b/src/form.js @@ -4,10 +4,23 @@ import { HTTP } from './http.js' Component.register('AutoForm', container => { if (!container.state.schema) container.state.schema = [] container.vertical = container.hasAttribute('vertical') + container.inline = container.hasAttribute('inline') container.request = { method: 'POST' } container.response = {} container.result = null - container.data = NewState(container.data || {}) + + // 立即初始化数据代理，避免异步延迟导致 Select 等组件初始化时找不到值而重置 + if (!container.data || !container.data.__watch) { + container.data = NewState(container.data || {}) + } + + container.data.__watch('*', () => { + if (container.inline) { + const dt = container.closest('DataTable') + if (dt && dt.refresh) dt.refresh() + } + }) + container.form = $(container, 'form') container.submit = (opt = {}) => { if (!container.form.reportValidity()) return globalThis.UI?.toast?.('{#verify failed#}', { type: 'danger' }) @@ -28,33 +41,42 @@ Component.register('AutoForm', container => { }) } }, Util.makeDom(/*html*/` -
-
+
+
- -
- - + -
-
-
+
-`), Util.makeDom(/*html*/``)) +`), Util.makeDom(/*html*/``)) const _pendingAutoFormComponents = [] export const AutoForm = { @@ -67,11 +89,8 @@ export const AutoForm = { _addAutoFormComponent: name => { const template = Component.getTemplate('AutoForm') if (template) { - $(template.content, '[control-wrapper]')?.appendChild(Util.makeDom(`<${name} $if="item.type.toUpperCase() === '${name.toUpperCase()}'" $name="item.name" $.="item.setting" $bind="this.data[item.name]">`)) - } else if (document.readyState !== 'loading') { - // If template still missing after DOM ready, something is wrong - console.error('AutoForm template not found during registration of', name) - } + $(template.content, '[control-wrapper]')?.appendChild(Util.makeDom(`<${name} $if="item.type.toUpperCase() === '${name.toUpperCase()}'" $name="item.name" $.="item.setting || {}" $bind="this.data[item.name]">`)) + } } } @@ -80,7 +99,7 @@ if (typeof document !== 'undefined') { _pendingAutoFormComponents.forEach(name => AutoForm._addAutoFormComponent(name)) _pendingAutoFormComponents.length = 0 } - if (document.readyState !== 'loading') setTimeout(initAutoForm, 100) // Wait slightly for component templates to be added to body + if (document.readyState !== 'loading') setTimeout(initAutoForm, 100) else document.addEventListener('DOMContentLoaded', () => setTimeout(initAutoForm, 100), true) } diff --git a/src/interaction.js b/src/interaction.js index 806eadf..a8a1978 100644 --- a/src/interaction.js +++ b/src/interaction.js @@ -28,19 +28,32 @@ if (typeof document !== 'undefined') { } Component.register('Resizer', container => { - const isVertical = container.hasAttribute('vertical') + container.isVertical = container.hasAttribute('vertical') const min = parseInt(container.getAttribute('min')) || 10 const max = parseInt(container.getAttribute('max')) || 1000 const target = container.target || container.previousElementSibling + container.addEventListener('bind', e => { + if (e.detail !== undefined && e.detail !== null) { + target.style[container.isVertical ? 'height' : 'width'] = e.detail + 'px' + } + }) const getSize = (startSize, w, h) => { - const newSize = startSize + (isVertical ? h : w) + const newSize = startSize + (container.isVertical ? h : w) return newSize < min ? min : newSize > max ? max : newSize } container.addEventListener('mousedown', event => { - const startSize = isVertical ? target.offsetHeight : target.offsetWidth + const startSize = container.isVertical ? target.offsetHeight : target.offsetWidth MouseMover.start(event, { - onmousemove: ({ w, h }) => target.style[isVertical ? 'height' : 'width'] = getSize(startSize, w, h) + 'px', - onmouseup: ({ w, h }) => container.dispatchEvent(new CustomEvent('resize', { detail: { oldSize: startSize, newSize: getSize(startSize, w, h) }, bubbles: false })), + onmousemove: ({ w, h }) => { + const newSize = getSize(startSize, w, h) + target.style[container.isVertical ? 'height' : 'width'] = newSize + 'px' + container.dispatchEvent(new CustomEvent('resizing', { detail: { oldSize: startSize, newSize }, bubbles: false })) + }, + onmouseup: ({ w, h }) => { + const newSize = getSize(startSize, w, h) + container.dispatchEvent(new CustomEvent('resize', { detail: { oldSize: startSize, newSize }, bubbles: false })) + container.dispatchEvent(new CustomEvent('change', { detail: newSize, bubbles: false })) + }, }) }) }, Util.makeDom(/*html*/` diff --git a/src/list.js b/src/list.js index e59559e..822f104 100644 --- a/src/list.js +++ b/src/list.js @@ -1,117 +1,160 @@ import { Component, NewState, Util, Hash } from '@web/state' -export const FastListComponent = Component.register('FastList', container => { +export const VirtualScroll = () => { const itemHeights = new Map() const groupHeights = new Map() let groupItemCount = 1 - container.state.renderedList = [] const avg = Util.newAvg() - let containerPaddingTop = 0 - let containerRowGap = 0 + + let padTop = 0 + let rowGap = 0 let topMargin = 0 let itemMarginTop = null let itemMarginBottom = null - let listStartIndex = 0 - let visibleStartIndex = 0 - let visibleCount = 10 let listInited = false - container.onItemUpdate = (index, node) => { - const absoluteIndex = index + listStartIndex - if (itemMarginTop === null) { - const style = window.getComputedStyle(node) - itemMarginTop = parseFloat(style.marginTop) || 0 - itemMarginBottom = parseFloat(style.marginBottom) || 0 - } - if (absoluteIndex === 0) topMargin = itemMarginTop + return { + // 核心1：重置与首屏预渲染 + reset: (list, container) => { + listInited = false + itemHeights.clear() + groupHeights.clear() + avg.clear() + topMargin = 0 + itemMarginTop = null + itemMarginBottom = null - const newHeight = node.offsetHeight + itemMarginTop + itemMarginBottom + containerRowGap - const oldHeight = itemHeights.get(absoluteIndex) - if (newHeight !== oldHeight) { - itemHeights.set(absoluteIndex, newHeight) - avg.add(newHeight) - const offset = newHeight - (oldHeight || 0) - const groupIndex = absoluteIndex - (absoluteIndex % groupItemCount) - if (groupHeights.has(groupIndex)) groupHeights.set(groupIndex, groupHeights.get(groupIndex) + offset) - } - } + if (!list?.length) return [] - container.refresh = () => { - if (!listInited) return - visibleCount = Math.ceil((container.clientHeight || 100) / (avg.get() || 32)) - let list = [] - const fullList = container.state.list - const fullSize = fullList.length - let i = 0 - let prev = containerPaddingTop + topMargin + containerRowGap - let post = 0 - let starus = 0 - for (i = 0; i < fullSize; i++) { - if (starus === 0) { - const gh = groupHeights.get(i) - if (gh && prev + gh < container.scrollTop) { - prev += gh - i += Math.min(groupItemCount, fullSize - i) - 1 - } else { - const ih = itemHeights.get(i) - if (prev + ih < container.scrollTop) { - prev += ih - } else { - starus = 1 - visibleStartIndex = Math.max(0, i) - listStartIndex = Math.max(0, visibleStartIndex - visibleCount) - const listEndIndex = Math.min(listStartIndex + visibleCount * 3, fullSize) - i = listEndIndex - 1 - list = fullList.slice(listStartIndex, listEndIndex) - for (let j = listStartIndex; j < visibleStartIndex; j++) prev -= itemHeights.get(j) - } - } - } else if (starus === 1) { - const gh = groupHeights.get(i) - if (gh) { - post += gh - i += groupItemCount - 1 - } else { - post += itemHeights.get(i) - } - } - } - container.state.prevHeight = prev - containerPaddingTop - topMargin - containerRowGap - container.state.postHeight = post - container.state.renderedList = list - } - container.state.__watch('list', list => { - listInited = false - itemHeights.clear() - groupHeights.clear() - avg.clear() - topMargin = 0 - itemMarginTop = null - itemMarginBottom = null - if (!list?.length) return + const size = list.length + groupItemCount = Math.ceil(Math.sqrt(size)) || 10 - const listSize = list.length || 0 - groupItemCount = Math.ceil(Math.sqrt(listSize)) || 10 - const style = window.getComputedStyle(container) - containerPaddingTop = parseFloat(style.paddingTop) || 0 - containerRowGap = parseFloat(style.rowGap) || 0 - container.state.renderedList = list.slice(0, Math.min(30, listSize)) || [] - - requestAnimationFrame(() => { - if (listInited || container.state.list !== list) return + const style = window.getComputedStyle(container) + padTop = parseFloat(style.paddingTop) || 0 + rowGap = parseFloat(style.rowGap) || 0 + + return list.slice(0, Math.min(30, size)) + }, + + // 核心2：无痛初始化缓存 (通过 rAF 调用) + init: (list, refreshCallback) => { + if (listInited) return + const size = list.length const defaultHeight = avg.get() || 32 - for (let i = 0; i < listSize; i++) { + + for (let i = 0; i < size; i++) { if (!itemHeights.has(i)) itemHeights.set(i, defaultHeight) } - for (let i = 0; i < listSize; i += groupItemCount) { + for (let i = 0; i < size; i += groupItemCount) { let sum = 0 - for (let j = i; j < Math.min(i + groupItemCount, listSize); j++) { + for (let j = i; j < Math.min(i + groupItemCount, size); j++) { sum += itemHeights.get(j) } groupHeights.set(i, sum) } listInited = true - container.refresh() + refreshCallback() + }, + + // 核心3：原汁原味的极速高度更新 + update: (absoluteIndex, node) => { + if (itemMarginTop === null) { + const style = window.getComputedStyle(node) + itemMarginTop = parseFloat(style.marginTop) || 0 + itemMarginBottom = parseFloat(style.marginBottom) || 0 + } + if (absoluteIndex === 0) topMargin = itemMarginTop + + const newHeight = node.offsetHeight + itemMarginTop + itemMarginBottom + rowGap + const oldHeight = itemHeights.get(absoluteIndex) + + if (newHeight !== oldHeight) { + itemHeights.set(absoluteIndex, newHeight) + avg.add(newHeight) + const offset = newHeight - (oldHeight || 0) + const groupIndex = absoluteIndex - (absoluteIndex % groupItemCount) + if (groupHeights.has(groupIndex)) groupHeights.set(groupIndex, groupHeights.get(groupIndex) + offset) + } + }, + + // 核心4：原汁原味的状态机滚动计算 + calc: (container, list) => { + if (!listInited || !list) return null + + const size = list.length + const visibleCount = Math.ceil((container.clientHeight || 100) / (avg.get() || 32)) + + let prev = padTop + topMargin + rowGap + let post = 0 + let status = 0 + let listStartIndex = 0 + let listEndIndex = 0 + + for (let i = 0; i < size; i++) { + if (status === 0) { + const gh = groupHeights.get(i) + if (gh && prev + gh < container.scrollTop) { + prev += gh + i += Math.min(groupItemCount, size - i) - 1 + } else { + const ih = itemHeights.get(i) + if (prev + ih < container.scrollTop) { + prev += ih + } else { + status = 1 + let visibleStartIndex = Math.max(0, i) + listStartIndex = Math.max(0, visibleStartIndex - visibleCount) + listEndIndex = Math.min(listStartIndex + visibleCount * 3, size) + i = listEndIndex - 1 + for (let j = listStartIndex; j < visibleStartIndex; j++) prev -= itemHeights.get(j) + } + } + } else if (status === 1) { + const gh = groupHeights.get(i) + if (gh) { + post += gh + i += groupItemCount - 1 + } else { + post += itemHeights.get(i) + } + } + } + + return { + prevHeight: prev - padTop - topMargin - rowGap, + postHeight: post, + renderedList: list.slice(listStartIndex, listEndIndex), + listStartIndex + } + } + } +} + +export const FastListComponent = Component.register('FastList', container => { + const vs = VirtualScroll() + container.state.renderedList = [] + + container.onItemUpdate = (index, node) => { + vs.update(index + (container.state._listStartIndex || 0), node) + } + + container.refresh = () => { + const res = vs.calc(container, container.state.list) + if (res) { + container.state.prevHeight = res.prevHeight + container.state.postHeight = res.postHeight + container.state._listStartIndex = res.listStartIndex + container.state.renderedList = res.renderedList + } + } + + container.state.__watch('list', list => { + container.state._listStartIndex = 0 + container.state.renderedList = vs.reset(list, container) || [] + + requestAnimationFrame(() => { + if (container.state.list !== list) return + vs.init(list, container.refresh) }) }) diff --git a/src/ui.js b/src/ui.js index 1548061..a3cba63 100644 --- a/src/ui.js +++ b/src/ui.js @@ -15,7 +15,7 @@ Component.register('Modal', container => { }, Util.makeDom(/*html*/`
-
+
@@ -30,7 +30,7 @@ Component.register('Modal', container => { Component.register('Dialog', Component.getSetupFunction('Modal'), Util.makeDom(/*html*/`
-
+
@@ -84,7 +84,7 @@ Component.register('Toast', container => { }) }, Util.makeDom(/*html*/`
-
+
@@ -102,7 +102,7 @@ Component.register('Toast', container => { UI.toast = function (message, options = {}) { const delay = options.delay ?? 5000 const t = document.createElement('Toast') - t.state = { delay, left: delay ? delay / 1000 : undefined, type: options.type || 'body', message, buttons: options.buttons || [] } + t.state = { delay, left: delay ? delay / 1000 : undefined, type: options.type || 'primary', message, buttons: options.buttons || [] } $(`[toast-container="${options.container || 'default'}"]`).appendChild(t) Promise.resolve().then(() => t.show()) }