@hapiboo/date 2.0.3 → 3.0.1

package/dist/class.d.ts

@@ -47,4 +47,5 @@ export declare class DateObject {
     valueOf(): number;
     getDaysDifference(dateToCompare: DateObject): number;
     getHoursDifference(dateToCompare: DateObject): number;
+    getMilisecondsDifference(dateToCompare: DateObject): number;
 }

package/dist/class.js

@@ -160,5 +160,8 @@ class DateObject {
     getHoursDifference(dateToCompare) {
         return luxon_1.Interval.fromDateTimes(this.val, dateToCompare.val).toDuration(['hours', 'minutes']).hours;
     }
+    getMilisecondsDifference(dateToCompare) {
+        return this.val.diff(dateToCompare.val).as('milliseconds');
+    }
 }
 exports.DateObject = DateObject;

package/package.json

@@ -1,29 +1,33 @@
 {
   "name": "@hapiboo/date",
-  "version": "2.0.3",
+  "version": "3.0.1",
   "description": "MK13 Studio Hapiboo - date services",
   "author": "MK13 Studio",
   "license": "ISC",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "luxon": "^3.7.1"
   },
   "devDependencies": {
     "@types/luxon": "^3.6.2",
-    "@typescript-eslint/eslint-plugin": "^8.38.0",
-    "@typescript-eslint/parser": "^8.38.0",
-    "eslint": "^9.32.0",
-    "typescript": "5.8.3",
-    "typescript-eslint": "^8.38.0"
+    "@typescript-eslint/eslint-plugin": "^8.51.0",
+    "@typescript-eslint/parser": "^8.51.0",
+    "eslint": "^9.39.2",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.51.0"
   },
   "scripts": {
-    "s_public": "cp package.public.json package.json",
-    "s_dev": "cp package.dev.json package.json",
-    "s_clean": "rm -f pnpm-lock.yaml && rm -rf node_modules dist",
-    "s_build": "tsc --project tsconfig.public.json",
-    "s_lint": "eslint 'src/*.ts'",
-    "s_check": "bash ../../scripts/publish.sh ./",
-    "s_publish": "pnpm s_clean && pnpm i -w=false && pnpm s_lint && pnpm s_build && pnpm s_check && pnpm s_dev"
+    "version-to-publish": "pnpm exec tsx ../../scripts/version_update.ts packages/date --publish-version",
+    "publish-check": "bash ../../scripts/publish.sh ./",
+    "version-to-children": "pnpm exec tsx ../../scripts/version_update.ts packages/date --update-children",
+    "ci:publish-prepare": "rm -f pnpm-lock.yaml && rm -rf node_modules dist && pnpm install --ignore-workspace --no-frozen-lockfile && eslint 'src/*.ts' && echo \"Linter OK\" && tsc && echo \"Build OK\"",
+    "ci:publish": "pnpm ci:publish-prepare && pnpm version-to-publish && pnpm publish-check && pnpm version-to-children"
   }
 }

package/eslint.config.mjs

@@ -1,16 +0,0 @@
-import tseslint from "typescript-eslint";
-import { defineConfig } from "eslint/config";
-
-export default defineConfig([
-    ...tseslint.configs.recommended,
-    {
-        files: ["**/*.{ts,mts,cts}"],
-        rules: {
-            "@typescript-eslint/no-namespace": "off",
-            indent: ['error', 4],
-            'linebreak-style': ['error', 'unix'],
-            quotes: ['error', 'single'],
-            semi: ['error', 'always'],
-        },
-    },
-]);

package/package.dev.json

@@ -1,30 +0,0 @@
-{
-    "name": "@hapiboo/date",
-    "version": "2.0.4-dev",
-    "description": "MK13 Studio Hapiboo - date services",
-    "author": "MK13 Studio",
-    "license": "ISC",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "scripts": {
-        "s_public": "cp package.public.json package.json",
-        "s_dev": "cp package.dev.json package.json",
-        "s_clean": "rm -f pnpm-lock.yaml && rm -rf node_modules dist",
-        "s_dependency": "cd .. && cd __core && pnpm s_build",
-        "s_build": "tsc --project tsconfig.dev.json",
-        "s_lint": "eslint 'src/*.ts'",
-        "s_lint_fix": "eslint 'src/*.ts' --fix",
-        "s_prepare": "pnpm s_clean && pnpm i && pnpm s_lint && pnpm s_build"
-    },
-    "dependencies": {
-        "luxon": "^3.7.1"
-    },
-    "devDependencies": {
-        "@types/luxon": "^3.6.2",
-        "@typescript-eslint/eslint-plugin": "^8.38.0",
-        "@typescript-eslint/parser": "^8.38.0",
-        "eslint": "^9.32.0",
-        "typescript": "5.8.3",
-        "typescript-eslint": "^8.38.0"
-    }
-}

package/package.public.json

@@ -1,29 +0,0 @@
-{
-    "name": "@hapiboo/date",
-    "version": "2.0.3",
-    "description": "MK13 Studio Hapiboo - date services",
-    "author": "MK13 Studio",
-    "license": "ISC",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "scripts": {
-        "s_public": "cp package.public.json package.json",
-        "s_dev": "cp package.dev.json package.json",
-        "s_clean": "rm -f pnpm-lock.yaml && rm -rf node_modules dist",
-        "s_build": "tsc --project tsconfig.public.json",
-        "s_lint": "eslint 'src/*.ts'",
-        "s_check": "bash ../../scripts/publish.sh ./",
-        "s_publish": "pnpm s_clean && pnpm i -w=false && pnpm s_lint && pnpm s_build && pnpm s_check && pnpm s_dev"
-    },
-    "dependencies": {
-        "luxon": "^3.7.1"
-    },
-    "devDependencies": {
-        "@types/luxon": "^3.6.2",
-        "@typescript-eslint/eslint-plugin": "^8.38.0",
-        "@typescript-eslint/parser": "^8.38.0",
-        "eslint": "^9.32.0",
-        "typescript": "5.8.3",
-        "typescript-eslint": "^8.38.0"
-    }
-}

package/src/class.ts

@@ -1,174 +0,0 @@
-import { DateTime, Duration, Interval }  from 'luxon';
-import { dateService } from './service';
-import { holidayService } from './holiday';
-
-export class DateObject {
-    private val: DateTime;
-
-    private constructor(val: DateTime) {
-        this.val = val;
-    }
-
-    static set(epochMilliseconds: number): DateObject {
-        return new DateObject(DateTime.fromMillis(epochMilliseconds));
-    }
-    static now(): DateObject {
-        return new DateObject(DateTime.local());
-    }
-    static today(): DateObject {
-        const now = DateTime.local();
-        return dateService.date(now.year, now.month, now.day);
-    }
-    static yesterday(): DateObject {
-        return DateObject.today().addDay(-1);
-    }
-    static startOfWeek(): DateObject {
-        const today = DateObject.today();
-        return today.addDay(1 - today.weekday);
-    }
-    static startOfMonth(): DateObject {
-        const now = DateTime.local();
-        return dateService.date(now.year, now.month, 1);
-    }
-    static startOfYear(): DateObject {
-        const now = DateTime.local();
-        return dateService.date(now.year, 1, 1);
-    }
-
-    get _value(): string {
-        return this.toString();
-    }
-    get hour(): number {
-        return this.val.hour;
-    }
-    get day(): number {
-        return this.val.day;
-    }
-    get month(): number {
-        return this.val.month;
-    }
-    get year(): number {
-        return this.val.year;
-    }
-    get weekday(): number {
-        return this.val.weekday;
-    }
-
-    toString(): string {
-        return this.val.toString();
-    }
-    toUtc(): string {
-        return this.val.toUTC().toString();
-    }
-    toDateShort(): string {
-        return this.val.toLocaleString(DateTime.DATE_SHORT);
-    }
-    toLocaleDateShort(locale: string): string {
-        return this.val.setLocale(locale).toLocaleString(DateTime.DATE_SHORT);
-    }
-    toMonthShortString(): string {
-        return this.val.toFormat('LLL').toUpperCase();
-    }
-    toWeekdayString(): string {
-        return this.val.toFormat('ccc');
-    }
-
-    private clone() : DateTime {
-        return DateTime.local(this.val.year, this.val.month, this.val.day, this.val.hour, this.val.minute, this.val.second, this.val.millisecond);
-    }
-
-    addMilisecond(count: number): DateObject {
-        return new DateObject(this.clone().plus(Duration.fromObject({milliseconds: count})));
-    }
-    addSecond(count: number): DateObject {
-        return new DateObject(this.clone().plus(Duration.fromObject({seconds: count})));
-    }
-    addMinute(count: number): DateObject {
-        return new DateObject(this.clone().plus(Duration.fromObject({minutes: count})));
-    }
-    addHour(count: number): DateObject {
-        return new DateObject(this.clone().plus(Duration.fromObject({hours: count})));
-    }
-    addDay(count: number): DateObject {
-        return new DateObject(this.clone().plus(Duration.fromObject({days: count})));
-    }
-    addMonth(count: number): DateObject {
-        return new DateObject(this.clone().plus(Duration.fromObject({months: count})));
-    }
-    addYear(count: number): DateObject {
-        return new DateObject(this.clone().plus(Duration.fromObject({years: count})));
-    }
-
-    resetYear(): DateObject {
-        return new DateObject(this.clone().set({ year: 2000 }));
-    }
-    resetDay(): DateObject {
-        return new DateObject(this.resetYear().val.set({ month: 1, day: 1 }));
-    }
-
-    removeMinutes(): DateObject {
-        return new DateObject(this.clone().set({ minute: 0, second: 0, millisecond: 0 }));
-    }
-    removeHours(): DateObject {
-        return new DateObject(this.removeMinutes().val.set({ hour: 0 }));
-    }
-    removeDays(): DateObject {
-        return new DateObject(this.removeHours().val.set({ day: 1 }));
-    }
-
-    equals(dateToCompare: DateObject): boolean {
-        return +this.val === +dateToCompare.val;
-    }
-    sameDay(dateToCompare: DateObject): boolean {
-        return this.val.hasSame(dateToCompare.val, 'day') &&
-            this.val.hasSame(dateToCompare.val, 'month') && 
-            this.val.hasSame(dateToCompare.val, 'year');
-    } 
-    isDateBetween(startDate: DateObject, endDate: DateObject): boolean {
-        return this.val >= startDate.val && this.val <= endDate.val;
-    }
-    isGreater(dateToCompare: DateObject): boolean {
-        return this.val > dateToCompare.val;
-    }
-    isGreaterOrEqual(dateToCompare: DateObject): boolean {
-        return this.val >= dateToCompare.val;
-    }
-    isSmaller(dateToCompare: DateObject): boolean {
-        return this.val < dateToCompare.val;
-    }
-    isSmallerOrEqual(dateToCompare: DateObject): boolean {
-        return this.val <= dateToCompare.val;
-    }
-
-    compare(dateToCompare: DateObject): number {
-        if (this.equals(dateToCompare)) {
-            return 0;
-        } else if (this.isGreater(dateToCompare)) {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
-
-    isWeekday(): boolean {
-        return this.weekday < 6;
-    }
-    isWeekend(): boolean {
-        return this.weekday > 5;
-    }
-
-    isHoliday(): boolean {
-        return holidayService.isHoliday(this);
-    }
-
-    valueOf(): number {
-        return this.val.valueOf();
-    }
-
-    getDaysDifference(dateToCompare: DateObject): number {
-        return Interval.fromDateTimes(this.val, dateToCompare.val).count('day');
-    }
-    getHoursDifference(dateToCompare: DateObject): number {
-        return Interval.fromDateTimes(this.val, dateToCompare.val).toDuration(['hours', 'minutes']).hours;
-    }
-}

package/src/holiday.ts

@@ -1,102 +0,0 @@
-import { dateService } from './service';
-import { DateObject } from './class';
-
-export class Holiday {
-    name: string;
-    month: number;
-    day: number | { weekday: number, count: number};
-
-    constructor(name: string, month: number, day: number | { weekday: number, count: number}) {
-        this.name = name;
-        this.month = month;
-        this.day = day;
-    }
-}
-
-function getNthDay(year: number, month: number, weekday: number, count: number): DateObject {
-    const firstDayOfMonth = dateService.date(year, month, 1);
-    
-    // is target day before or after first day
-    const offsetThreshold = firstDayOfMonth.weekday - weekday;
-
-    let offsetFromTargetDay: number;
-    if (offsetThreshold > 0) {
-        // get to target day if target is after first day
-        offsetFromTargetDay = 7 - offsetThreshold;
-    } else {
-        // reverse threshold to get to target from first day
-        offsetFromTargetDay = offsetThreshold * -1;
-    }
-    
-    const firstOccurenceOfTargetDay = firstDayOfMonth.addDay(offsetFromTargetDay);
-    const nthDay = firstOccurenceOfTargetDay.addDay((count - 1) * 7);
-    
-    return nthDay;
-}
-
-export namespace holidayService {
-    const _list: Holiday[] = [];
-
-    type KnownHolidays = {
-        ChristmasEve: Holiday;
-        ChristmasDay: Holiday;
-        Christmas2ndDay: Holiday;
-        NewYearDay: Holiday;
-        USIndependenceDay: Holiday;
-        USThanksgivingDay: Holiday;
-        USMemorialDay: Holiday;
-        USLaborDay: Holiday;
-        PLIndependenceDay: Holiday;
-        PLLaborDay: Holiday;
-        PLConstitutionDay: Holiday;
-        PLAllSaintsDay: Holiday;
-    };
-
-    export const known: KnownHolidays = {
-        ChristmasEve: new Holiday('Christmas Day', 12, 24),
-        ChristmasDay: new Holiday('Christmas Day', 12, 25),
-        Christmas2ndDay: new Holiday('Christmas Day', 12, 26),
-        NewYearDay: new Holiday('New Year\'s Day', 1, 2),
-        USIndependenceDay: new Holiday('Independence Day', 7, 4),
-        USThanksgivingDay: new Holiday('Thanksgiving Day', 11, { weekday: 4, count: 4 }),
-        USMemorialDay: new Holiday('Memorial Day', 5, { weekday: 1, count: -1 }),
-        USLaborDay: new Holiday('Labor Day', 9, { weekday: 1, count: 1 }),
-        PLIndependenceDay: new Holiday('Independence Day', 11, 11),
-        PLConstitutionDay: new Holiday('Constitution Day', 5, 3),
-        PLLaborDay: new Holiday('Labor Day', 5, 1),
-        PLAllSaintsDay: new Holiday('All Saints Day', 11, 1),
-    };
-
-    export function registerHoliday(holiday: Holiday){
-        _list.push(holiday);
-    }
-    export function isHoliday(date: DateObject): boolean {
-        return _list.some((holiday) => {
-            return checkHoliday(date, holiday);
-        });
-    }
-    export function checkHoliday(date: DateObject, holiday: Holiday): boolean{
-        const justDate = date.removeHours();
-        let holy: DateObject;
-
-        if (typeof holiday.day === 'number') {
-            //fixed holiday
-            holy = dateService.date(justDate.year, holiday.month, holiday.day);
-        } else {
-            //moveable holiday
-            if (holiday.day.count > 1) {
-                //we're counting from beginning
-                //let's get nth weekday in specific month
-                holy = getNthDay(justDate.year, holiday.month, holiday.day.weekday, holiday.day.count);
-            } else {
-                //we're counting from the end
-                //let's get started from the first weekday in next month
-                holy = getNthDay(
-                    holiday.month === 12 ? justDate.year + 1 : justDate.year, 
-                    holiday.month === 12 ? 1 : holiday.month + 1, 
-                    holiday.day.weekday, 1).addDay(7 * holiday.day.count);
-            }
-        }
-        return justDate.sameDay(holy);
-    }
-}

package/src/index.ts

@@ -1,6 +0,0 @@
-import { dateService } from './service';
-import { DateObject } from './class';
-import { dateUtils } from './utils';
-import { holidayService, Holiday } from './holiday';
-
-export { DateObject, Holiday, dateService, holidayService, dateUtils };

package/src/service.ts

@@ -1,43 +0,0 @@
-import { DateTime, Settings }  from 'luxon';
-import { DateObject } from './class';
-
-Settings.defaultZone = 'utc';
-
-export namespace dateService {
-    
-    export function initialize(defaultZoneName: string, defaultLocaleName: string) {
-        Settings.defaultZone = defaultZoneName;
-        Settings.defaultLocale = defaultLocaleName;
-    }
-
-    export function parseUtcDate(datetime: string | undefined) : DateObject | undefined {
-        if (datetime) {
-            const temp = DateTime.fromISO(datetime);
-            if (temp) {
-                if (temp.isValid) {
-                    return DateObject.set(temp.setZone(Settings.defaultZone).valueOf());    
-                } else {
-                    console.error(`Invalid date parsing value: '${datetime}'`);
-                    console.error(temp.invalidReason);
-                    console.error(temp.invalidExplanation);
-
-                    return undefined;
-                }
-            } else {
-                return undefined;
-            }
-        } else {
-            return undefined;
-        }   
-    }
-
-    export function date(year: number, month: number, day: number) : DateObject {
-        return DateObject.set(DateTime.local(year, month, day).valueOf());
-    }
-    export function datetime(year: number, month: number, day: number, hour: number, minute: number): DateObject {
-        return DateObject.set(DateTime.local(year, month, day, hour, minute).valueOf());
-    }
-    export function daytime(day: DateObject, hour: number = 0, minute: number = 0): DateObject {
-        return datetime(day.year, day.month, day.day, hour, minute);
-    }
-}

package/src/utils.ts

@@ -1,30 +0,0 @@
-import { dateService } from './service';
-import { DateObject } from './class';
-
-export namespace dateUtils {
-
-    export function checkPeriod(value: DateObject, start?: DateObject, stop?: DateObject): boolean {
-        if (!start) {
-            start = dateService.date(0, 1, 1);
-        }
-
-        if (!stop) {
-            stop = dateService.date(3000, 12, 31);
-        }
-
-        return checkDatePeriod(value, start, stop);
-    }
-    export function checkDatePeriod(value: DateObject, start: DateObject, stop: DateObject): boolean {
-        return value >= start && value <= stop;
-    }
-    export function checkSameYearPeriod(value: DateObject, start: DateObject, stop: DateObject): boolean {
-        return checkDatePeriod(value, start, stop);
-    }
-    export function checkSameDayPeriod(value: DateObject, start: DateObject, stop: DateObject): boolean {
-        const val = value.resetDay();
-        const str = start.resetDay();
-        const stp = stop.resetDay();
-
-        return checkDatePeriod(val, str, stp);
-    }
-}

package/tsconfig.base.json

@@ -1,18 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "ES2020",
-        "module": "commonjs",
-        "lib": ["ES2020"],
-        "outDir": "./dist",
-        "rootDir": "./src",
-        "strict": true,
-        "esModuleInterop": true,
-        "skipLibCheck": true,
-        "forceConsistentCasingInFileNames": true,
-        "moduleResolution": "node",
-        "resolveJsonModule": true,
-        "declaration": true,
-        },
-    "include": ["src/**/*"],
-    "exclude": ["node_modules", "dist"]
-} 

package/tsconfig.dev.json

@@ -1,7 +0,0 @@
-{
-    "extends": "./tsconfig.base.json",
-    "compilerOptions": {
-        "sourceMap": true,
-        "declarationMap": true
-    } 
-}

package/tsconfig.public.json

@@ -1,7 +0,0 @@
-{
-    "extends": "./tsconfig.base.json",
-    "compilerOptions": {
-        "sourceMap": false,
-        "declarationMap": false
-    }
-}