Merge pull request #35 from opensource-nepal/tests

Updated tests and some codes for edge cases

Author: sugat009

src/NepaliDate.ts

@@ -145,15 +145,6 @@ class NepaliDate {
         return this.timestamp
     }
 
-    /**
-     * Parses a string representation of a Nepali calendar date and sets the NepaliDate object accordingly.
-     *
-     * @param {string} dateString - The string representation of the Nepali calendar date.
-     */
-    parse(dateString: string) {
-        this.set.apply(this, parse(dateString))
-    }
-
     /**
      * Retrieves the year of the Nepali date in the Nepali calendar.
      *
@@ -419,10 +410,10 @@ class NepaliDate {
         year: number,
         month: number,
         date: number,
-        hour: number = 0,
-        minute: number = 0,
-        second: number = 0,
-        ms: number = 0
+        hour: number,
+        minute: number,
+        second: number,
+        ms: number
     ) {
         validateTime(hour, minute, second, ms)
         const [yearEn, month0EN, dayEn] = dateConverter.nepaliToEnglish(
@@ -495,7 +486,9 @@ class NepaliDate {
     }
 }
 
-NepaliDate.minimum = () => new Date(dateConverter.enMinYear(), 0, 1)
-NepaliDate.maximum = () => new Date(dateConverter.enMaxYear(), 11, 31)
+NepaliDate.minimum = () =>
+    NepaliDate.fromEnglishDate(dateConverter.enMinYear(), 0, 1).getDateObject()
+NepaliDate.maximum = () =>
+    NepaliDate.fromEnglishDate(dateConverter.enMaxYear(), 11, 31).getDateObject()
 
 export default NepaliDate

src/dateConverter/dateConverter.ts

@@ -94,11 +94,7 @@ const npMaxYear = (): number => {
  * @returns A boolean indicating whether the year is a leap year.
  */
 const _isLeapYear = (year: number): boolean => {
-    if (year % 400 === 0) return true
-
-    if (year % 100 === 0) return false
-
-    return year % 4 === 0
+    return year % 400 === 0 || (year % 4 === 0 && year % 100 !== 0)
 }
 
 /**

src/format.ts

@@ -327,7 +327,10 @@ function millisecondNp(format: string, size: number): Formatter {
 
 function amPmUpperCaseEn(format: string, size: number): Formatter {
     return date => {
-        return date.hour > 12 ? 'PM' : 'AM'
+        if (size === 1) {
+            return date.hour > 12 ? 'PM' : 'AM'
+        }
+        return format.repeat(size)
     }
 }
 
@@ -344,13 +347,16 @@ function amPmNp(format: string, size: number): Formatter {
          * - बेलुका
          * - रात
          */
-        return format
+        return format.repeat(size)
     }
 }
 
 function amPmLowerCaseEn(format: string, size: number): Formatter {
     return date => {
-        return date.hour > 12 ? 'pm' : 'am'
+        if (size === 1) {
+            return date.hour > 12 ? 'pm' : 'am'
+        }
+        return format.repeat(size)
     }
 }
 

src/parse.ts

@@ -53,14 +53,22 @@ function parseDate(dateString: string): number[] {
 function parseTime(timeString: string): number[] {
     if (!timeString) return [0, 0, 0, 0]
 
-    const parts: string[] = timeString.split(':', 4)
-    const [hour = 0, minute = 0, second = 0, ms = 0] = parts.map(d => {
+    // fetching milliseconds first
+    const [hmsString, msString = '0'] = timeString.split('.', 2)
+
+    const parts: string[] = hmsString.split(':', 3)
+    const [hour, minute = 0, second = 0] = parts.map(d => {
         const n = parseInt(d, 10)
         if (Number.isNaN(n)) {
             throw new Error('Invalid time')
         }
         return n
     })
+
+    // converting milliseconds into numbers
+    let ms = parseInt(msString, 10)
+    if (Number.isNaN(ms)) ms = 0
+
     return [hour, minute, second, ms]
 }
 

src/validators.ts

@@ -69,8 +69,8 @@ export const validateMillisecond = (millisecond: number) => {
 export const validateTime = (
     hour: number,
     minute: number,
-    second: number = 0,
-    ms: number = 0
+    second: number,
+    ms: number
 ) => {
     validateHour(hour)
     validateMinute(minute)