@gez/date-time-kit 2.0.0-alpha.10 → 2.0.0-alpha.12

package/dist/components/quick-selector/index.d.ts

@@ -1,7 +1,7 @@
 import { type Weeks } from '../calendar';
 import { type BaseAttrs, type Emit2EventMap, UiBase } from '../web-component-base';
-import { type DataLimit, type GenPeriodTimesOptions, type QuickKey, genPeriodTimes, quickPeriodTime, quickPeriodTimes } from './quick-key';
-export { type QuickKey, type DataLimit, type GenPeriodTimesOptions, genPeriodTimes, quickPeriodTime, quickPeriodTimes };
+import { type DataLimit, type GenPeriodTimesOptions, type PeriodTimeInfo, type QuickGenPeriodTimesOptions, type QuickKey, genPeriodTimes, quickGenPeriodTime, quickGenPeriodTimeInfo, quickGenPeriodTimes } from './quick-key';
+export { type QuickKey, type DataLimit, type GenPeriodTimesOptions, type QuickGenPeriodTimesOptions, type PeriodTimeInfo, type Weeks, genPeriodTimes, quickGenPeriodTime, quickGenPeriodTimes, quickGenPeriodTimeInfo };
 export interface Attrs extends BaseAttrs {
     /**
      * Timezone in minutes. For example: UTC+05:45 => `345`, UTC-01:00 => `-60`.
@@ -32,15 +32,7 @@ export interface Attrs extends BaseAttrs {
     'end-time'?: string | number | '';
 }
 export interface Emits {
-    'time-changed': {
-        type: 'all';
-        start?: null;
-        end?: null;
-    } | {
-        type: QuickKey;
-        start: Date;
-        end: Date;
-    };
+    'time-changed': PeriodTimeInfo;
     'open-change': boolean;
 }
 export type EventMap = Emit2EventMap<Emits>;
@@ -81,14 +73,15 @@ export declare class Ele extends UiBase<Attrs, Emits> {
         start: Date;
         end: Date;
     };
-    readonly quickPeriodTimes: <T extends DataLimit = DataLimit>(periods: T[]) => Record<Exclude<T, "all">, {
+    readonly quickGenPeriodTimes: <T extends DataLimit = DataLimit>(periods: T[]) => Record<Exclude<T, "all">, {
         start: Date;
         end: Date;
     }> & ("all" extends T ? {
         all: null;
     } : {});
-    readonly quickPeriodTime: <T extends DataLimit = DataLimit>(period: T) => T extends "all" ? null : {
+    readonly quickGenPeriodTime: <T extends DataLimit = DataLimit>(period: T) => T extends "all" ? null : {
         start: Date;
         end: Date;
     };
+    readonly quickGenPeriodTimeInfo: <T extends DataLimit = DataLimit>(type: T) => PeriodTimeInfo<T, Date>;
 }

package/dist/components/quick-selector/index.mjs

@@ -11,13 +11,15 @@ import styleStr from "./index.css.mjs";
 import html, { getCurrentTz, utcText } from "./index.html.mjs";
 import {
   genPeriodTimes,
-  quickPeriodTime,
-  quickPeriodTimes
+  quickGenPeriodTime,
+  quickGenPeriodTimeInfo,
+  quickGenPeriodTimes
 } from "./quick-key.mjs";
 export {
   genPeriodTimes,
-  quickPeriodTime,
-  quickPeriodTimes
+  quickGenPeriodTime,
+  quickGenPeriodTimes,
+  quickGenPeriodTimeInfo
 };
 export class Ele extends UiBase {
   constructor() {
@@ -37,7 +39,7 @@ export class Ele extends UiBase {
         ele.timeStart = startTime;
         ele.timeEnd = endTime;
       } else {
-        const defaultPeriod = this.quickPeriodTime("last30Days");
+        const defaultPeriod = this.quickGenPeriodTime("last30Days");
         ele.timeStart = defaultPeriod.start;
         ele.timeEnd = defaultPeriod.end;
       }
@@ -79,15 +81,8 @@ export class Ele extends UiBase {
       if (name === "radio") {
         const v = value;
         if (v === "custom") return;
-        const t = this.quickPeriodTime(v);
-        this.dispatchEvent(
-          "time-changed",
-          !t ? { type: "all" } : {
-            ...t,
-            type: v
-          },
-          true
-        );
+        const t = this.quickGenPeriodTimeInfo(v);
+        this.dispatchEvent("time-changed", t, true);
       } else if (name === "tz") {
         this.timezone = +value;
       }
@@ -107,8 +102,9 @@ export class Ele extends UiBase {
       );
     });
     __publicField(this, "genPeriodTimes", (options) => genPeriodTimes({ weekStartAt: this.weekStartAt, ...options }));
-    __publicField(this, "quickPeriodTimes", (periods) => quickPeriodTimes({ weekStartAt: this.weekStartAt, periods }));
-    __publicField(this, "quickPeriodTime", (period) => quickPeriodTime({ weekStartAt: this.weekStartAt, period }));
+    __publicField(this, "quickGenPeriodTimes", (periods) => quickGenPeriodTimes({ weekStartAt: this.weekStartAt, periods }));
+    __publicField(this, "quickGenPeriodTime", (period) => quickGenPeriodTime(period, { weekStartAt: this.weekStartAt }));
+    __publicField(this, "quickGenPeriodTimeInfo", (type) => quickGenPeriodTimeInfo(type, { weekStartAt: this.weekStartAt }));
     this._applyTemplate();
   }
   static get observedAttributes() {

package/dist/components/quick-selector/quick-key.d.ts

@@ -3,31 +3,37 @@ import { type Weeks } from '../calendar';
 export type { DataLimit };
 export type QuickKey = DataLimit | 'custom';
 export declare const limitKeys: DataLimit[];
-export type GenPeriodTimesOptions = {
-    start?: (time: Date, weekOffset: number) => void;
-    end?: (time: Date, weekOffset: number) => void;
+export interface QuickGenPeriodTimesOptions {
     initTime?: Date;
     weekStartAt?: Weeks;
-};
+}
+export interface GenPeriodTimesOptions extends QuickGenPeriodTimesOptions {
+    start?: (time: Date, weekOffset: number) => void;
+    end?: (time: Date, weekOffset: number) => void;
+}
 export declare const genPeriodTimes: ({ start, end, initTime, weekStartAt }?: GenPeriodTimesOptions) => {
     start: Date;
     end: Date;
 };
-export declare const quickPeriodTimes: <T extends DataLimit = DataLimit>({ weekStartAt, periods, initTime }?: {
-    weekStartAt?: Weeks;
+export declare const quickGenPeriodTimes: <T extends DataLimit = DataLimit>({ periods, ...options }?: {
     periods?: T[];
-    initTime?: Date;
-}) => Record<Exclude<T, "all">, {
+} & QuickGenPeriodTimesOptions) => Record<Exclude<T, "all">, {
     start: Date;
     end: Date;
 }> & ("all" extends T ? {
     all: null;
 } : {});
-export declare const quickPeriodTime: <T extends DataLimit = DataLimit>({ period, weekStartAt, initTime }: {
-    period: T;
-    weekStartAt?: Weeks;
-    initTime?: Date;
-}) => T extends "all" ? null : {
+export declare const quickGenPeriodTime: <T extends DataLimit = DataLimit>(period: T, options?: QuickGenPeriodTimesOptions) => T extends "all" ? null : {
     start: Date;
     end: Date;
 };
+export type PeriodTimeInfo<T extends QuickKey = QuickKey, RT = Date> = T extends 'all' ? {
+    type: 'all';
+    start?: null;
+    end?: null;
+} : {
+    type: Exclude<T, 'all'>;
+    start: RT;
+    end: RT;
+};
+export declare const quickGenPeriodTimeInfo: <T extends DataLimit = DataLimit>(type: T, options?: QuickGenPeriodTimesOptions) => PeriodTimeInfo<T>;

package/dist/components/quick-selector/quick-key.mjs

@@ -79,27 +79,17 @@ const presetPeriods = {
     end: (t) => t.setFullYear(t.getFullYear() + 1, 0, 0)
   })
 };
-export const quickPeriodTimes = ({
-  weekStartAt = "sun",
+export const quickGenPeriodTimes = ({
   periods = limitKeys,
-  initTime = /* @__PURE__ */ new Date()
+  ...options
 } = {}) => {
   periods = [...new Set(periods)].filter((k) => k in presetPeriods);
   return Object.fromEntries(
-    periods.map((k) => [
-      k,
-      presetPeriods[k]({
-        weekStartAt,
-        initTime
-      })
-    ])
+    periods.map((k) => [k, presetPeriods[k](options)])
   );
 };
-export const quickPeriodTime = ({
-  period,
-  weekStartAt = "sun",
-  initTime = /* @__PURE__ */ new Date()
-}) => presetPeriods[period]({
-  weekStartAt,
-  initTime
-});
+export const quickGenPeriodTime = (period, options = {}) => presetPeriods[period](options);
+export const quickGenPeriodTimeInfo = (type, options = {}) => {
+  const t = quickGenPeriodTime(type, options);
+  return !t ? { type } : { type, ...t };
+};

package/package.json

@@ -17,7 +17,7 @@
         "unbuild": "3.6.0",
         "vitest": "3.2.4"
     },
-    "version": "2.0.0-alpha.10",
+    "version": "2.0.0-alpha.12",
     "type": "module",
     "private": false,
     "exports": {
@@ -36,5 +36,5 @@
         "template",
         "public"
     ],
-    "gitHead": "a8a4a502a4fafa996d3695f49ec93f5f8de73f16"
+    "gitHead": "3254b805ced5c33af1c998ed071fe63dc85c7dca"
 }

package/src/components/quick-selector/index.ts

@@ -12,19 +12,26 @@ import html, { getCurrentTz, utcText } from './index.html';
 import {
     type DataLimit,
     type GenPeriodTimesOptions,
+    type PeriodTimeInfo,
+    type QuickGenPeriodTimesOptions,
     type QuickKey,
     genPeriodTimes,
-    quickPeriodTime,
-    quickPeriodTimes
+    quickGenPeriodTime,
+    quickGenPeriodTimeInfo,
+    quickGenPeriodTimes
 } from './quick-key';
 
 export {
     type QuickKey,
     type DataLimit,
     type GenPeriodTimesOptions,
+    type QuickGenPeriodTimesOptions,
+    type PeriodTimeInfo,
+    type Weeks,
     genPeriodTimes,
-    quickPeriodTime,
-    quickPeriodTimes
+    quickGenPeriodTime,
+    quickGenPeriodTimes,
+    quickGenPeriodTimeInfo
 };
 
 export interface Attrs extends BaseAttrs {
@@ -58,17 +65,7 @@ export interface Attrs extends BaseAttrs {
 }
 
 export interface Emits {
-    'time-changed':
-        | {
-              type: 'all';
-              start?: null;
-              end?: null;
-          }
-        | {
-              type: QuickKey;
-              start: Date;
-              end: Date;
-          };
+    'time-changed': PeriodTimeInfo;
     'open-change': boolean;
 }
 export type EventMap = Emit2EventMap<Emits>;
@@ -269,7 +266,7 @@ export class Ele extends UiBase<Attrs, Emits> {
             ele.timeStart = startTime;
             ele.timeEnd = endTime;
         } else {
-            const defaultPeriod = this.quickPeriodTime('last30Days');
+            const defaultPeriod = this.quickGenPeriodTime('last30Days');
             ele.timeStart = defaultPeriod.start;
             ele.timeEnd = defaultPeriod.end;
         }
@@ -327,17 +324,8 @@ export class Ele extends UiBase<Attrs, Emits> {
         if (name === 'radio') {
             const v = value as QuickKey;
             if (v === 'custom') return;
-            const t = this.quickPeriodTime(v);
-            this.dispatchEvent(
-                'time-changed',
-                !t
-                    ? { type: 'all' }
-                    : {
-                          ...t,
-                          type: v
-                      },
-                true
-            );
+            const t = this.quickGenPeriodTimeInfo(v);
+            this.dispatchEvent('time-changed', t, true);
         } else if (name === 'tz') {
             this.timezone = +value;
         }
@@ -359,12 +347,15 @@ export class Ele extends UiBase<Attrs, Emits> {
 
     public readonly genPeriodTimes = (options: GenPeriodTimesOptions) =>
         genPeriodTimes({ weekStartAt: this.weekStartAt, ...options });
-    public readonly quickPeriodTimes = <T extends DataLimit = DataLimit>(
+    public readonly quickGenPeriodTimes = <T extends DataLimit = DataLimit>(
         periods: T[]
-    ) => quickPeriodTimes({ weekStartAt: this.weekStartAt, periods });
-    public readonly quickPeriodTime = <T extends DataLimit = DataLimit>(
+    ) => quickGenPeriodTimes({ weekStartAt: this.weekStartAt, periods });
+    public readonly quickGenPeriodTime = <T extends DataLimit = DataLimit>(
         period: T
-    ) => quickPeriodTime({ weekStartAt: this.weekStartAt, period });
+    ) => quickGenPeriodTime(period, { weekStartAt: this.weekStartAt });
+    public readonly quickGenPeriodTimeInfo = <T extends DataLimit = DataLimit>(
+        type: T
+    ) => quickGenPeriodTimeInfo(type, { weekStartAt: this.weekStartAt });
 }
 
 Ele.define();

package/src/components/quick-selector/quick-key.ts

@@ -35,12 +35,14 @@ const genStartDate = (fn?: (_t: Date) => void, t?: Date) =>
 const genEndDate = (fn?: (_t: Date) => void, t?: Date) =>
     genDateWithHours(false, fn, t);
 
-export type GenPeriodTimesOptions = {
-    start?: (time: Date, weekOffset: number) => void;
-    end?: (time: Date, weekOffset: number) => void;
+export interface QuickGenPeriodTimesOptions {
     initTime?: Date;
     weekStartAt?: Weeks;
-};
+}
+export interface GenPeriodTimesOptions extends QuickGenPeriodTimesOptions {
+    start?: (time: Date, weekOffset: number) => void;
+    end?: (time: Date, weekOffset: number) => void;
+}
 
 export const genPeriodTimes = ({
     start,
@@ -115,38 +117,44 @@ const presetPeriods = {
         })
 };
 
-export const quickPeriodTimes = <T extends DataLimit = DataLimit>({
-    weekStartAt = 'sun',
+export const quickGenPeriodTimes = <T extends DataLimit = DataLimit>({
     periods = limitKeys as T[],
-    initTime = new Date()
-}: {
-    weekStartAt?: Weeks;
-    periods?: T[];
-    initTime?: Date;
-} = {}) => {
+    ...options
+}: { periods?: T[] } & QuickGenPeriodTimesOptions = {}) => {
     periods = [...new Set(periods)].filter((k) => k in presetPeriods);
     return Object.fromEntries(
-        periods.map((k) => [
-            k,
-            presetPeriods[k]({
-                weekStartAt,
-                initTime
-            })
-        ])
+        periods.map((k) => [k, presetPeriods[k](options)])
     ) as Record<Exclude<T, 'all'>, { start: Date; end: Date }> &
         ('all' extends T ? { all: null } : {});
 };
 
-export const quickPeriodTime = <T extends DataLimit = DataLimit>({
-    period,
-    weekStartAt = 'sun',
-    initTime = new Date()
-}: {
-    period: T;
-    weekStartAt?: Weeks;
-    initTime?: Date;
-}) =>
-    presetPeriods[period]({
-        weekStartAt,
-        initTime
-    }) as T extends 'all' ? null : { start: Date; end: Date };
+export const quickGenPeriodTime = <T extends DataLimit = DataLimit>(
+    period: T,
+    options: QuickGenPeriodTimesOptions = {}
+) =>
+    presetPeriods[period](options) as T extends 'all'
+        ? null
+        : { start: Date; end: Date };
+
+export type PeriodTimeInfo<
+    T extends QuickKey = QuickKey,
+    RT = Date
+> = T extends 'all'
+    ? {
+          type: 'all';
+          start?: null;
+          end?: null;
+      }
+    : {
+          type: Exclude<T, 'all'>;
+          start: RT;
+          end: RT;
+      };
+
+export const quickGenPeriodTimeInfo = <T extends DataLimit = DataLimit>(
+    type: T,
+    options: QuickGenPeriodTimesOptions = {}
+) => {
+    const t = quickGenPeriodTime(type, options);
+    return (!t ? { type } : { type, ...t }) as PeriodTimeInfo<T>;
+};