fish-helper 0.0.6 → 0.0.7

package/README.md

@@ -14,7 +14,7 @@ const helper = require('fish-helper')
 >
 > - after_lt_hour(date, hour)  ------- The <strong>date</strong> is greater than <strong>now</strong>, and the date is less than <strong>hour</strong> from <strong>now</strong>
 >
->  - after_gt_hour(date, hour)  ------- The <strong>date</strong> is greater than <strong>now</strong>, and the date is greater than <strong>hour</strong> from <strong>now</strong>
+> - after_gt_hour(date, hour)  ------- The <strong>date</strong> is greater than <strong>now</strong>, and the date is greater than <strong>hour</strong> from <strong>now</strong>
 >
 > - is_current_year(date)  ------- return Boolean
 >
@@ -24,6 +24,8 @@ const helper = require('fish-helper')
 >
 > - format_num2date(timestamp)  ------- convert time to Object; return Object that include keys: day、hour、minute、seconds
 >
-> - count_down({date, interval}, fn)  -------  fn is a callback function that takes a remaining time argument； return a function to stop the timer
+> - count_down(date, fn)  -------  End time countdown, end time can be passed in by itself;  fn is a callback function that takes a remaining time argument； return a function to stop the timer
 >
+> - count_down_by_remain_seconds(fn, seconds)  -------  60-second countdown. Time can pass by itself
+> 
 > - format_thousandth(num)  ------- format the data as a string with thousands of bits

package/build/helper.cjs.js

@@ -1 +1 @@
-"use strict";function t(t,e,r,a){if("a"===r&&!a)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!a:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?a:"a"===r?a.call(t):a?a.value:e.get(t)}function e(t,e,r,a,i){if("m"===a)throw new TypeError("Private method is not writable");if("a"===a&&!i)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===a?i.call(t,r):i?i.value=r:e.set(t,r),r}var r,a,i,s,n,o,h,l,u;const c=()=>null;a=new WeakMap,i=new WeakMap,s=new WeakMap,n=new WeakMap,r=new WeakSet,o=function(t){if(!t)return Date.now();let e=null;return e="string"==typeof t?t.replace(/(\/|\.|_)/g,"-"):new Date(t),new Date(e).getTime()},h=function(t){return`0${t}`.slice(-2)},l=function({date:e,hour:i=1,type:s="before_lt_hour"}){let n=t(this,r,"m",o).call(this,e);const h=new Date(n).getTime(),l=Date.now(),u=h<l,c=h>l;return"before_lt_hour"===s?u&&h+t(this,a,"f")*i>l:"before_gt_hour"===s?u&&h+t(this,a,"f")*i<l:"after_lt_hour"===s?c&&l+t(this,a,"f")*i>h:"after_gt_hour"===s&&(c&&l+t(this,a,"f")*i<h)},u=function a(o=Date.now(),h=1e3,l=c){if(o<=Date.now()||h<0)return l(0),clearTimeout(t(this,n,"f"));e(this,n,setTimeout((()=>{e(this,i,t(this,i,"f")+1,"f"),l(o-Date.now());const n=Date.now()-(t(this,s,"f")+t(this,i,"f")*h);h<=n?(e(this,i,0,"f"),e(this,s,Date.now(),"f"),t(this,r,"m",a).call(this,o,0,l)):t(this,r,"m",a).call(this,o,h,l)}),h),"f")};var f=new class{constructor(){r.add(this),a.set(this,36e5),i.set(this,0),s.set(this,0),n.set(this,0)}before_lt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"before_lt_hour"})}before_gt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"before_gt_hour"})}after_lt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"after_lt_hour"})}after_gt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"after_gt_hour"})}is_current_year(e){const a=t(this,r,"m",o).call(this,e);return(new Date).getFullYear()===new Date(a).getFullYear()}get_time_obj(e){const a=t(this,r,"m",o).call(this,e),i=new Date(a),s=t(this,r,"m",h).call(this,i.getMonth()+1),n=t(this,r,"m",h).call(this,i.getDate()),l=t(this,r,"m",h).call(this,i.getHours()),u=t(this,r,"m",h).call(this,i.getMinutes()),c=t(this,r,"m",h).call(this,i.getSeconds());return{year:String(i.getFullYear()),month:s,day:n,hour:l,minute:u,seconds:c,day_of_week:String(i.getDay())}}format_count({num:t=0,decimal:e=1,divide:r=1e4,suffix:a="万",show_suffix_always:i=!1}){if(!t)return 0;if(r<=0||e<0)return i?`${t} ${a}`:t;const s=parseFloat(t);if(s<=0)return i?`${s} ${a}`:s;if(s>1&&s<=r)return i?`${s} ${a}`:s;const[n,o]=(s/r).toFixed(e).split(".");return o&&0!==parseFloat(o)?`${n}.${o} ${a}`:`${n} ${a}`}format_num2date(e=Date.now()){const a=parseInt(e/1e3/60/60/24%24),i=parseInt(e/1e3/60/60%24),s=parseInt(e/1e3/60%60),n=parseInt(e/1e3%60);return{day:t(this,r,"m",h).call(this,a),hour:t(this,r,"m",h).call(this,i),minute:t(this,r,"m",h).call(this,s),seconds:t(this,r,"m",h).call(this,n)}}count_down({date:a=Date.now(),interval:h=1e3},l=c){const f=t(this,r,"m",o).call(this,a);return e(this,i,0,"f"),e(this,s,Date.now(),"f"),t(this,r,"m",u).call(this,f,h,l),()=>clearTimeout(t(this,n,"f"))}format_thousandth(t){return t.toString().replace(/\d+/,(function(t){return t.replace(/(\d)(?=(\d{3})+$)/g,(function(t){return t+","}))}))}};module.exports=f;
+"use strict";function t(t,e,r,a){if("a"===r&&!a)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!a:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?a:"a"===r?a.call(t):a?a.value:e.get(t)}function e(t,e,r,a,s){if("m"===a)throw new TypeError("Private method is not writable");if("a"===a&&!s)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!s:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===a?s.call(t,r):s?s.value=r:e.set(t,r),r}var r,a,s,i,n,o,h,l;const f=()=>null,u=1e3;r=new WeakMap,a=new WeakMap,s=new WeakMap,i=new WeakMap,n=new WeakMap,o=new WeakMap,h=new WeakMap,l=new WeakMap;var c=new class{constructor(){r.set(this,36e5),a.set(this,0),s.set(this,0),i.set(this,0),n.set(this,(t=>{if(!t)return Date.now();let e=null;return e="string"==typeof t?t.replace(/(\/|\.|_)/g,"-"):new Date(t),new Date(e).getTime()})),o.set(this,(t=>`0${t}`.slice(-2))),h.set(this,(({date:e,hour:a=1,type:s="before_lt_hour"})=>{let i=t(this,n,"f").call(this,e);const o=new Date(i).getTime(),h=Date.now(),l=o<h,f=o>h;return"before_lt_hour"===s?l&&o+t(this,r,"f")*a>h:"before_gt_hour"===s?l&&o+t(this,r,"f")*a<h:"after_lt_hour"===s?f&&h+t(this,r,"f")*a>o:"after_gt_hour"===s&&(f&&h+t(this,r,"f")*a<o)})),l.set(this,((r=Date.now(),n=f,o=1e3)=>{r<=Date.now()?clearTimeout(t(this,i,"f")):e(this,i,setTimeout((()=>{if(r<=Date.now())return;e(this,a,t(this,a,"f")+1,"f"),n(r-Date.now());const i=Math.abs(Date.now()-(t(this,s,"f")+t(this,a,"f")*u));u<=i?(e(this,a,0,"f"),e(this,s,Date.now(),"f"),t(this,l,"f").call(this,r,n,0)):t(this,l,"f").call(this,r,n)}),o),"f")}))}before_lt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"before_lt_hour"})}before_gt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"before_gt_hour"})}after_lt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"after_lt_hour"})}after_gt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"after_gt_hour"})}is_current_year(e){const r=t(this,n,"f").call(this,e);return(new Date).getFullYear()===new Date(r).getFullYear()}get_time_obj(e){const r=t(this,n,"f").call(this,e),a=new Date(r),s=t(this,o,"f").call(this,a.getMonth()+1),i=t(this,o,"f").call(this,a.getDate()),h=t(this,o,"f").call(this,a.getHours()),l=t(this,o,"f").call(this,a.getMinutes()),f=t(this,o,"f").call(this,a.getSeconds());return{year:String(a.getFullYear()),month:s,day:i,hour:h,minute:l,seconds:f,day_of_week:String(a.getDay())}}format_count({num:t=0,decimal:e=1,divide:r=1e4,suffix:a="万",show_suffix_always:s=!1}){if(!t)return 0;if(r<=0||e<0)return s?`${t} ${a}`:t;const i=parseFloat(t);if(i<=0)return s?`${i} ${a}`:i;if(i>1&&i<=r)return s?`${i} ${a}`:i;const[n,o]=(i/r).toFixed(e).split(".");return o&&0!==parseFloat(o)?`${n}.${o} ${a}`:`${n} ${a}`}format_num2date(e=Date.now()){const r=parseInt(e/1e3/60/60/24%24),a=parseInt(e/1e3/60/60%24),s=parseInt(e/1e3/60%60),i=parseInt(e/1e3%60);return{day:t(this,o,"f").call(this,r),hour:t(this,o,"f").call(this,a),minute:t(this,o,"f").call(this,s),seconds:t(this,o,"f").call(this,i)}}count_down(r=Date.now(),o=f){const h=t(this,n,"f").call(this,r);return e(this,a,0,"f"),e(this,s,Date.now(),"f"),t(this,l,"f").call(this,h,o),()=>clearTimeout(t(this,i,"f"))}count_down_by_remain_seconds(t=f,e=60){const r=Date.now()+1e3*e;return this.count_down(r,t)}format_thousandth(t){return t.toString().replace(/\d+/,(function(t){return t.replace(/(\d)(?=(\d{3})+$)/g,(function(t){return t+","}))}))}};module.exports=c;

package/build/helper.es.js

@@ -1 +1 @@
-function t(t,e,r,a){if("a"===r&&!a)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!a:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?a:"a"===r?a.call(t):a?a.value:e.get(t)}function e(t,e,r,a,i){if("m"===a)throw new TypeError("Private method is not writable");if("a"===a&&!i)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===a?i.call(t,r):i?i.value=r:e.set(t,r),r}var r,a,i,n,s,o,h,l,u;const c=()=>null;a=new WeakMap,i=new WeakMap,n=new WeakMap,s=new WeakMap,r=new WeakSet,o=function(t){if(!t)return Date.now();let e=null;return e="string"==typeof t?t.replace(/(\/|\.|_)/g,"-"):new Date(t),new Date(e).getTime()},h=function(t){return`0${t}`.slice(-2)},l=function({date:e,hour:i=1,type:n="before_lt_hour"}){let s=t(this,r,"m",o).call(this,e);const h=new Date(s).getTime(),l=Date.now(),u=h<l,c=h>l;return"before_lt_hour"===n?u&&h+t(this,a,"f")*i>l:"before_gt_hour"===n?u&&h+t(this,a,"f")*i<l:"after_lt_hour"===n?c&&l+t(this,a,"f")*i>h:"after_gt_hour"===n&&(c&&l+t(this,a,"f")*i<h)},u=function a(o=Date.now(),h=1e3,l=c){if(o<=Date.now()||h<0)return l(0),clearTimeout(t(this,s,"f"));e(this,s,setTimeout((()=>{e(this,i,t(this,i,"f")+1,"f"),l(o-Date.now());const s=Date.now()-(t(this,n,"f")+t(this,i,"f")*h);h<=s?(e(this,i,0,"f"),e(this,n,Date.now(),"f"),t(this,r,"m",a).call(this,o,0,l)):t(this,r,"m",a).call(this,o,h,l)}),h),"f")};var f=new class{constructor(){r.add(this),a.set(this,36e5),i.set(this,0),n.set(this,0),s.set(this,0)}before_lt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"before_lt_hour"})}before_gt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"before_gt_hour"})}after_lt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"after_lt_hour"})}after_gt_hour(e,a=1){return t(this,r,"m",l).call(this,{date:e,hour:a,type:"after_gt_hour"})}is_current_year(e){const a=t(this,r,"m",o).call(this,e);return(new Date).getFullYear()===new Date(a).getFullYear()}get_time_obj(e){const a=t(this,r,"m",o).call(this,e),i=new Date(a),n=t(this,r,"m",h).call(this,i.getMonth()+1),s=t(this,r,"m",h).call(this,i.getDate()),l=t(this,r,"m",h).call(this,i.getHours()),u=t(this,r,"m",h).call(this,i.getMinutes()),c=t(this,r,"m",h).call(this,i.getSeconds());return{year:String(i.getFullYear()),month:n,day:s,hour:l,minute:u,seconds:c,day_of_week:String(i.getDay())}}format_count({num:t=0,decimal:e=1,divide:r=1e4,suffix:a="万",show_suffix_always:i=!1}){if(!t)return 0;if(r<=0||e<0)return i?`${t} ${a}`:t;const n=parseFloat(t);if(n<=0)return i?`${n} ${a}`:n;if(n>1&&n<=r)return i?`${n} ${a}`:n;const[s,o]=(n/r).toFixed(e).split(".");return o&&0!==parseFloat(o)?`${s}.${o} ${a}`:`${s} ${a}`}format_num2date(e=Date.now()){const a=parseInt(e/1e3/60/60/24%24),i=parseInt(e/1e3/60/60%24),n=parseInt(e/1e3/60%60),s=parseInt(e/1e3%60);return{day:t(this,r,"m",h).call(this,a),hour:t(this,r,"m",h).call(this,i),minute:t(this,r,"m",h).call(this,n),seconds:t(this,r,"m",h).call(this,s)}}count_down({date:a=Date.now(),interval:h=1e3},l=c){const f=t(this,r,"m",o).call(this,a);return e(this,i,0,"f"),e(this,n,Date.now(),"f"),t(this,r,"m",u).call(this,f,h,l),()=>clearTimeout(t(this,s,"f"))}format_thousandth(t){return t.toString().replace(/\d+/,(function(t){return t.replace(/(\d)(?=(\d{3})+$)/g,(function(t){return t+","}))}))}};export{f as default};
+function t(t,e,r,a){if("a"===r&&!a)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!a:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?a:"a"===r?a.call(t):a?a.value:e.get(t)}function e(t,e,r,a,s){if("m"===a)throw new TypeError("Private method is not writable");if("a"===a&&!s)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!s:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===a?s.call(t,r):s?s.value=r:e.set(t,r),r}var r,a,s,i,n,o,h,l;const f=()=>null,u=1e3;r=new WeakMap,a=new WeakMap,s=new WeakMap,i=new WeakMap,n=new WeakMap,o=new WeakMap,h=new WeakMap,l=new WeakMap;var c=new class{constructor(){r.set(this,36e5),a.set(this,0),s.set(this,0),i.set(this,0),n.set(this,(t=>{if(!t)return Date.now();let e=null;return e="string"==typeof t?t.replace(/(\/|\.|_)/g,"-"):new Date(t),new Date(e).getTime()})),o.set(this,(t=>`0${t}`.slice(-2))),h.set(this,(({date:e,hour:a=1,type:s="before_lt_hour"})=>{let i=t(this,n,"f").call(this,e);const o=new Date(i).getTime(),h=Date.now(),l=o<h,f=o>h;return"before_lt_hour"===s?l&&o+t(this,r,"f")*a>h:"before_gt_hour"===s?l&&o+t(this,r,"f")*a<h:"after_lt_hour"===s?f&&h+t(this,r,"f")*a>o:"after_gt_hour"===s&&(f&&h+t(this,r,"f")*a<o)})),l.set(this,((r=Date.now(),n=f,o=1e3)=>{r<=Date.now()?clearTimeout(t(this,i,"f")):e(this,i,setTimeout((()=>{if(r<=Date.now())return;e(this,a,t(this,a,"f")+1,"f"),n(r-Date.now());const i=Math.abs(Date.now()-(t(this,s,"f")+t(this,a,"f")*u));u<=i?(e(this,a,0,"f"),e(this,s,Date.now(),"f"),t(this,l,"f").call(this,r,n,0)):t(this,l,"f").call(this,r,n)}),o),"f")}))}before_lt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"before_lt_hour"})}before_gt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"before_gt_hour"})}after_lt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"after_lt_hour"})}after_gt_hour(e,r=1){return t(this,h,"f").call(this,{date:e,hour:r,type:"after_gt_hour"})}is_current_year(e){const r=t(this,n,"f").call(this,e);return(new Date).getFullYear()===new Date(r).getFullYear()}get_time_obj(e){const r=t(this,n,"f").call(this,e),a=new Date(r),s=t(this,o,"f").call(this,a.getMonth()+1),i=t(this,o,"f").call(this,a.getDate()),h=t(this,o,"f").call(this,a.getHours()),l=t(this,o,"f").call(this,a.getMinutes()),f=t(this,o,"f").call(this,a.getSeconds());return{year:String(a.getFullYear()),month:s,day:i,hour:h,minute:l,seconds:f,day_of_week:String(a.getDay())}}format_count({num:t=0,decimal:e=1,divide:r=1e4,suffix:a="万",show_suffix_always:s=!1}){if(!t)return 0;if(r<=0||e<0)return s?`${t} ${a}`:t;const i=parseFloat(t);if(i<=0)return s?`${i} ${a}`:i;if(i>1&&i<=r)return s?`${i} ${a}`:i;const[n,o]=(i/r).toFixed(e).split(".");return o&&0!==parseFloat(o)?`${n}.${o} ${a}`:`${n} ${a}`}format_num2date(e=Date.now()){const r=parseInt(e/1e3/60/60/24%24),a=parseInt(e/1e3/60/60%24),s=parseInt(e/1e3/60%60),i=parseInt(e/1e3%60);return{day:t(this,o,"f").call(this,r),hour:t(this,o,"f").call(this,a),minute:t(this,o,"f").call(this,s),seconds:t(this,o,"f").call(this,i)}}count_down(r=Date.now(),o=f){const h=t(this,n,"f").call(this,r);return e(this,a,0,"f"),e(this,s,Date.now(),"f"),t(this,l,"f").call(this,h,o),()=>clearTimeout(t(this,i,"f"))}count_down_by_remain_seconds(t=f,e=60){const r=Date.now()+1e3*e;return this.count_down(r,t)}format_thousandth(t){return t.toString().replace(/\d+/,(function(t){return t.replace(/(\d)(?=(\d{3})+$)/g,(function(t){return t+","}))}))}};export{c as default};

package/build/types/index.d.ts

@@ -15,10 +15,6 @@ interface FormatCount {
     suffix?: string;
     show_suffix_always?: boolean;
 }
-interface CountDown {
-    date?: DateType;
-    interval?: number;
-}
 type CountDownCallback = (num: number) => any;
 declare class Helper {
     #private;
@@ -30,7 +26,8 @@ declare class Helper {
     get_time_obj(date?: DateType): GetTimeObj;
     format_count({ num, decimal, divide, suffix, show_suffix_always }: FormatCount): number | string;
     format_num2date(timestamp?: number): Required<Omit<GetTimeObj, 'day_of_week' | 'year' | 'month'>>;
-    count_down({ date, interval }: CountDown, fn?: CountDownCallback): Function;
+    count_down(date?: DateType, fn?: CountDownCallback): Function;
+    count_down_by_remain_seconds(fn?: CountDownCallback, seconds?: number): Function;
     format_thousandth(num: number | string): string;
 }
 declare const _default: Helper;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fish-helper",
   "private": false,
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": "build/helper.cjs.js",
   "module": "build/helper.es.js",
   "types": "build/types/index.d.ts",