@psytask/core 1.1.1 → 1.1.3

package/dist/index.d.ts

@@ -69,13 +69,19 @@ declare const createTimer: (
  * Return true to stop timer
  *
  * @param time Current frame time
- * @param records History frame times, the first frame means the first frame
- *   that triggers VSync
+ * @param records History frame times, whose elements represent the start time
+ *   of each frame that triggers VSync
  */
 shouldStop: (time: number, records: TimerRecords) => boolean) => Timer;
 type NodeLike = string | Node;
 type BuiltinData = {
+    /**
+     * History frame times, whose elements represent the start time of each frame
+     * that triggers VSync
+     */
     frame_times: TimerRecords;
+    /** Real show duration */
+    duration: number;
 };
 type ForbiddenData = {
     [K in keyof BuiltinData]?: never;
@@ -210,8 +216,8 @@ declare class Scene<T extends MaybeGenericComponent> extends EventEmitter<SceneE
      * @param options - {@link SceneOptions}
      */
     constructor(component: T, options: SceneOptions<T>);
-    /** Add a microtask to close the scene. It is useful when close in 'show' */
-    close(): Promise<void>;
+    /** Add close task as Microtask if is caled in the frame else next rAF. */
+    close(): void;
 }
 
 export { EventEmitter, Scene, createComponentAdapter, createTimer, generic, getCurrentScene };

package/dist/index.js

@@ -1,4 +1,4 @@
-/** @psytask/core v1.1.1 cubxx MIT */
+/** @psytask/core v1.1.3 cubxx MIT */
 const symbol = Symbol.dispose ?? /* @__PURE__ */ Symbol.for("Symbol.dispose");
 class EventEmitter {
   listeners = {};
@@ -62,13 +62,18 @@ const createTimer = (shouldStop) => {
   const timer = {
     start: (cb) => new Promise((resolve) => {
       const records = [];
-      const record = (time) => (records.push(time), cb?.(time));
-      currentFrameTime && record(currentFrameTime);
+      currentFrameTime && (records.push(currentFrameTime), cb?.(currentFrameTime));
       const frame = (time) => {
-        shouldStop(time, records) ? timer.stop() : (handle = rAF(frame), record(time));
+        const is_stoped = shouldStop(time, records);
+        records.push(time);
+        is_stoped ? timer.stop() : (cb?.(time), handle = rAF(frame));
       };
       let handle = rAF(frame);
-      timer.stop = () => (cancelAnimationFrame(handle), resolve(records));
+      timer.stop = () => {
+        records.pop();
+        cancelAnimationFrame(handle);
+        resolve(records);
+      };
     }),
     stop() {
     }
@@ -133,10 +138,10 @@ class Scene extends EventEmitter {
    */
   //@ts-expect-error impl generic component
   show = this.#show;
-  /** Add a microtask to close the scene. It is useful when close in 'show' */
-  async close() {
-    await 0;
-    this.#timer.stop();
+  /** Add close task as Microtask if is caled in the frame else next rAF. */
+  close() {
+    const t = this.#timer;
+    (currentFrameTime ? queueMicrotask : rAF)(() => t.stop());
   }
   async #show(patchProps) {
     const { root, defaultProps } = this.options;
@@ -150,7 +155,8 @@ class Scene extends EventEmitter {
     root.style.scale = "0";
     return {
       ...this.emit("close").data?.(),
-      frame_times: records
+      frame_times: records,
+      duration: currentFrameTime - records[0]
     };
   }
 }

package/dist/index.min.js

@@ -1 +1 @@
-const f=Symbol.dispose??Symbol.for("Symbol.dispose");class m{listeners={};[f](){this.emit("dispose")}on(t,s){return(this.listeners[t]??=new Set).add(s),this}off(t,s){const e=this.listeners[t];return e&&(e.delete(s),e.size===0&&delete this.listeners[t]),this}once(t,s){const e=r=>{try{s(r)}finally{this.off(t,e)}};return this.on(t,e),this}emit(t,...[s]){const e=this.listeners[t];if(e)for(const r of[...e])r(s);return this}}const y=o=>{throw Error(o)},h=requestAnimationFrame,w=Object,b=(o,t)=>w.assign(o,t),S=document;new Proxy({},{get:(o,t)=>s=>b(S.createElement(t),s)});const g=o=>Array.isArray(o)?o:[o];let d;const p=o=>(d=o,setTimeout(()=>d=0),h(p)),A=o=>{d??p(0);const t={start:s=>new Promise(e=>{const r=[],n=c=>(r.push(c),s?.(c));d&&n(d);const i=c=>{o(c,r)?t.stop():(a=h(i),n(c))};let a=h(i);t.stop=()=>(cancelAnimationFrame(a),e(r))}),stop(){}};return t},E=o=>o,F=o=>({wrap:t=>(s=>t(o(s))),render:(t,s,e)=>{const r=o(s);e&&l.push(e);const n=t(r);e&&l.pop();let i;const a=g(typeof n!="string"&&"node"in n?(i=n.data,n.node):n);return{props:r,nodes:a,data:i}}}),l=[],P=()=>l[l.length-1]??y("Not found current scene");class O extends m{constructor(t,s){super(),this.options=s;const{root:e,adapter:r,defaultProps:n,timer:i}=s;(this.root=e).tabIndex=-1,e.style.scale="0";const{props:a,nodes:c,data:u}=r.render(t,{...n},this.on("dispose",()=>e.remove()));this.#t=i(),this.#s=a,this.data=u,e.append(...c)}root;#t;#s;data;show=this.#e;async close(){await 0,this.#t.stop()}async#e(t){const{root:s,defaultProps:e}=this.options,r={...e,...t};for(const i of Object.keys({...this.#s,...r}))this.#s[i]=r[i];this.emit("show"),s.style.scale="1",s.focus();const n=await this.#t.start(i=>this.emit("frame",i));return s.style.scale="0",{...this.emit("close").data?.(),frame_times:n}}}export{m as EventEmitter,O as Scene,F as createComponentAdapter,A as createTimer,E as generic,P as getCurrentScene};
+const f=Symbol.dispose??Symbol.for("Symbol.dispose");class p{listeners={};[f](){this.emit("dispose")}on(t,s){return(this.listeners[t]??=new Set).add(s),this}off(t,s){const e=this.listeners[t];return e&&(e.delete(s),e.size===0&&delete this.listeners[t]),this}once(t,s){const e=r=>{try{s(r)}finally{this.off(t,e)}};return this.on(t,e),this}emit(t,...[s]){const e=this.listeners[t];if(e)for(const r of[...e])r(s);return this}}const y=o=>{throw Error(o)},d=requestAnimationFrame,w=Object,b=(o,t)=>w.assign(o,t),S=document;new Proxy({},{get:(o,t)=>s=>b(S.createElement(t),s)});const g=o=>Array.isArray(o)?o:[o];let c;const m=o=>(c=o,setTimeout(()=>c=0),d(m)),A=o=>{c??m(0);const t={start:s=>new Promise(e=>{const r=[];c&&(r.push(c),s?.(c));const n=a=>{const h=o(a,r);r.push(a),h?t.stop():(s?.(a),i=d(n))};let i=d(n);t.stop=()=>{r.pop(),cancelAnimationFrame(i),e(r)}}),stop(){}};return t},E=o=>o,F=o=>({wrap:t=>(s=>t(o(s))),render:(t,s,e)=>{const r=o(s);e&&l.push(e);const n=t(r);e&&l.pop();let i;const a=g(typeof n!="string"&&"node"in n?(i=n.data,n.node):n);return{props:r,nodes:a,data:i}}}),l=[],P=()=>l[l.length-1]??y("Not found current scene");class k extends p{constructor(t,s){super(),this.options=s;const{root:e,adapter:r,defaultProps:n,timer:i}=s;(this.root=e).tabIndex=-1,e.style.scale="0";const{props:a,nodes:h,data:u}=r.render(t,{...n},this.on("dispose",()=>e.remove()));this.#t=i(),this.#s=a,this.data=u,e.append(...h)}root;#t;#s;data;show=this.#e;close(){const t=this.#t;(c?queueMicrotask:d)(()=>t.stop())}async#e(t){const{root:s,defaultProps:e}=this.options,r={...e,...t};for(const i of Object.keys({...this.#s,...r}))this.#s[i]=r[i];this.emit("show"),s.style.scale="1",s.focus();const n=await this.#t.start(i=>this.emit("frame",i));return s.style.scale="0",{...this.emit("close").data?.(),frame_times:n,duration:c-n[0]}}}export{p as EventEmitter,k as Scene,F as createComponentAdapter,A as createTimer,E as generic,P as getCurrentScene};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psytask/core",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "type": "module",
   "author": "cubxx",
   "license": "MIT",