mdtg 1.3.1 → 2.0.1

package/index.js

@@ -1,244 +1,249 @@
 const normalizeNumber = (number) => String(number).padStart(2, "0");
+const parseInteger = (input) => Number.parseInt(input, 10);
 
 export class MDTG {
-	#currentDate = null;
-	static months = [
-		"jan",
-		"feb",
-		"mar",
-		"apr",
-		"may",
-		"jun",
-		"jul",
-		"aug",
-		"sep",
-		"oct",
-		"nov",
-		"dec",
-	];
-
-	static offset = {
-		Y: 12,
-		X: 11,
-		W: 10,
-		V: 9,
-		U: 8,
-		T: 7,
-		S: 6,
-		R: 5,
-		Q: 4,
-		P: 3,
-		O: 2,
-		N: 1,
-		Z: 0,
-		A: -1,
-		B: -2,
-		C: -3,
-		D: -4,
-		E: -5,
-		F: -6,
-		G: -7,
-		H: -8,
-		I: -9,
-		J: -10,
-		K: -11,
-		L: -12,
-		M: -13,
-	};
-
-	constructor(date) {
-		const now = new Date();
-		this.#currentDate =
-			date ??
-			new Date(
-				Date.UTC(
-					now.getUTCFullYear(),
-					now.getUTCMonth(),
-					now.getUTCDate(),
-					now.getUTCHours(),
-					now.getUTCMinutes(),
-					now.getUTCSeconds(),
-					now.getUTCMilliseconds(),
-				),
-			);
-	}
-
-	static isShortFormat(str) {
-		return /^[0-9]{6}[A-Z]$/.test(str);
-	}
-
-	static isShortenedFormat(str) {
-		return /^[0-9]{6}[A-Z](jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[0-9]{2}$/i.test(
-			str,
-		);
-	}
-
-	static isLongFormat(str) {
-		return /^[0-9]{8}[A-Z](jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[0-9]{2}$/i.test(
-			str,
-		);
-	}
-
-	#toShortMDT(timezone = "Z") {
-		if (!/^[A-Z]$/.test(timezone.toUpperCase())) {
-			timezone = "Z";
-		}
-		const newDate = new Date(
-			Date.UTC(
-				this.#currentDate.getUTCFullYear(),
-				this.#currentDate.getUTCMonth(),
-				this.#currentDate.getUTCDate(),
-				this.#currentDate.getUTCHours() - MDTG.offset[timezone.toUpperCase()],
-				this.#currentDate.getUTCMinutes(),
-			),
-		);
-		const shortMDT = [
-			newDate.getUTCDate(),
-			newDate.getUTCHours(),
-			newDate.getUTCMinutes(),
-		]
-			.map(normalizeNumber)
-			.concat(timezone.toUpperCase())
-			.join("");
-		if (!MDTG.isShortFormat(shortMDT)) {
-			throw new Error("There was an error while building short MDT");
-		}
-		return shortMDT;
-	}
-
-	#toLongMDT(timezone = "Z") {
-		if (!/^[A-Z]$/.test(timezone.toUpperCase())) {
-			timezone = "Z";
-		}
-		const newDate = new Date(
-			Date.UTC(
-				this.#currentDate.getUTCFullYear(),
-				this.#currentDate.getUTCMonth(),
-				this.#currentDate.getUTCDate(),
-				this.#currentDate.getUTCHours() - MDTG.offset[timezone.toUpperCase()],
-				this.#currentDate.getUTCMinutes(),
-				this.#currentDate.getUTCSeconds(),
-			),
-		);
-		const longMDT = [
-			newDate.getUTCDate(),
-			newDate.getUTCHours(),
-			newDate.getUTCMinutes(),
-			newDate.getUTCSeconds(),
-		]
-			.map(normalizeNumber)
-			.concat(
-				timezone.toUpperCase(),
-				MDTG.months[newDate.getUTCMonth()],
-				normalizeNumber(newDate.getUTCFullYear() % 2000),
-			)
-			.join("");
-		if (!MDTG.isLongFormat(longMDT)) {
-			throw new Error("There was an error while building long MDT");
-		}
-		return longMDT;
-	}
-
-	#toShortenedMDT(timezone = "Z") {
-		if (!/^[A-Z]$/.test(timezone.toUpperCase())) {
-			timezone = "Z";
-		}
-		const newDate = new Date(
-			Date.UTC(
-				this.#currentDate.getUTCFullYear(),
-				this.#currentDate.getUTCMonth(),
-				this.#currentDate.getUTCDate(),
-				this.#currentDate.getUTCHours() - MDTG.offset[timezone.toUpperCase()],
-				this.#currentDate.getUTCMinutes(),
-				this.#currentDate.getUTCSeconds(),
-			),
-		);
-		const shortenedMDT = [
-			this.#toShortMDT(timezone.toUpperCase()),
-			MDTG.months[newDate.getUTCMonth()],
-			normalizeNumber(newDate.getUTCFullYear() % 2000),
-		].join("");
-		if (!MDTG.isShortenedFormat(shortenedMDT)) {
-			throw new Error("There was an error while building shortened MDT");
-		}
-		return shortenedMDT;
-	}
-
-	toMDT(options) {
-		if (options?.form === "short") {
-			return this.#toShortMDT(options?.timezone);
-		} else if (options?.form === "shortened") {
-			return this.#toShortenedMDT(options?.timezone);
-		} else {
-			return this.#toLongMDT(options?.timezone);
-		}
-	}
-
-	static parse(str) {
-		if (MDTG.isShortFormat(str)) {
-			const day = Number.parseInt(str.slice(0, 2), 10);
-			const hours = Number.parseInt(str.slice(2, 4), 10);
-			const minutes = Number.parseInt(str.slice(4, 6), 10);
-			const timezoneOffset = str.slice(-1).toUpperCase();
-
-			const today = new Date();
-			const date = new Date(
-				Date.UTC(
-					today.getUTCFullYear(),
-					today.getUTCMonth(),
-					day,
-					hours + MDTG.offset[timezoneOffset],
-					minutes,
-					0,
-					0,
-				),
-			);
-			return date;
-		} else if (MDTG.isShortenedFormat(str)) {
-			const day = Number.parseInt(str.slice(0, 2), 10);
-			const hours = Number.parseInt(str.slice(2, 4), 10);
-			const minutes = Number.parseInt(str.slice(4, 6), 10);
-			const timezoneOffset = str.slice(6, 7).toUpperCase();
-			const month = MDTG.months.indexOf(str.slice(7, 10).toLowerCase());
-			const year = 2000 + Number.parseInt(str.slice(10, 12), 10);
-			const date = new Date(
-				Date.UTC(
-					year,
-					month,
-					day,
-					hours + MDTG.offset[timezoneOffset],
-					minutes,
-					0,
-					0,
-				),
-			);
-			return date;
-		} else if (MDTG.isLongFormat(str)) {
-			const day = Number.parseInt(str.slice(0, 2), 10);
-			const hours = Number.parseInt(str.slice(2, 4), 10);
-			const minutes = Number.parseInt(str.slice(4, 6), 10);
-			const seconds = Number.parseInt(str.slice(6, 8), 10);
-			const timezoneOffset = str.slice(8, 9).toUpperCase();
-			const month = MDTG.months.indexOf(str.slice(9, 12).toLowerCase());
-			const year = 2000 + Number.parseInt(str.slice(12, 14), 10);
-			const date = new Date(
-				Date.UTC(
-					year,
-					month,
-					day,
-					hours + MDTG.offset[timezoneOffset],
-					minutes,
-					seconds,
-					0,
-				),
-			);
-			return date;
-		} else {
-			throw Error(`There was an error while parsing the string "${str}"`);
-		}
-	}
-
-	toDate() {
-		return this.#currentDate;
-	}
+  #currentDate;
+
+  static FORM = {
+    SHORT: "short",
+    SHORTENED: "shortened",
+    LONG: "long",
+  };
+
+  static #months = [
+    "jan",
+    "feb",
+    "mar",
+    "apr",
+    "may",
+    "jun",
+    "jul",
+    "aug",
+    "sep",
+    "oct",
+    "nov",
+    "dec",
+  ];
+
+  static #shortFormatRegex = /^[0-9]{6}[A-Z]$/;
+  static #shortenedFormatRegex =
+    /^[0-9]{6}[A-Z](jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[0-9]{2}$/i;
+  static #longFormatRegex =
+    /^[0-9]{8}[A-Z](jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[0-9]{2}$/i;
+
+  static #offset = {
+    Y: 12,
+    X: 11,
+    W: 10,
+    V: 9,
+    U: 8,
+    T: 7,
+    S: 6,
+    R: 5,
+    Q: 4,
+    P: 3,
+    O: 2,
+    N: 1,
+    Z: 0,
+    A: -1,
+    B: -2,
+    C: -3,
+    D: -4,
+    E: -5,
+    F: -6,
+    G: -7,
+    H: -8,
+    I: -9,
+    J: -10,
+    K: -11,
+    L: -12,
+    M: -13,
+  };
+
+  constructor(date) {
+    if (date && !(date instanceof Date)) {
+      throw new TypeError("Expected Date object");
+    }
+
+    const now = new Date();
+
+    this.#currentDate =
+      date ??
+      new Date(
+        Date.UTC(
+          now.getUTCFullYear(),
+          now.getUTCMonth(),
+          now.getUTCDate(),
+          now.getUTCHours(),
+          now.getUTCMinutes(),
+          now.getUTCSeconds(),
+          now.getUTCMilliseconds(),
+        ),
+      );
+  }
+
+  static #validateTimezone(tz) {
+    const key = tz?.toUpperCase();
+    return key in MDTG.#offset ? key : "Z";
+  }
+
+  #createDateWithOffset(offset) {
+    const d = this.#currentDate;
+
+    return new Date(
+      Date.UTC(
+        d.getUTCFullYear(),
+        d.getUTCMonth(),
+        d.getUTCDate(),
+        d.getUTCHours() - offset,
+        d.getUTCMinutes(),
+        d.getUTCSeconds(),
+      ),
+    );
+  }
+
+  static isShortFormat(str) {
+    return MDTG.#shortFormatRegex.test(str);
+  }
+
+  static isShortenedFormat(str) {
+    return MDTG.#shortenedFormatRegex.test(str);
+  }
+
+  static isLongFormat(str) {
+    return MDTG.#longFormatRegex.test(str);
+  }
+
+  #toShortMDT(timezone = "Z") {
+    const tz = MDTG.#validateTimezone(timezone);
+    const date = this.#createDateWithOffset(MDTG.#offset[tz]);
+
+    const result = [date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes()]
+      .map(normalizeNumber)
+      .concat(tz)
+      .join("");
+
+    if (!MDTG.isShortFormat(result)) {
+      throw new Error("Failed to build short MDTG");
+    }
+
+    return result;
+  }
+
+  #toLongMDT(timezone = "Z") {
+    const tz = MDTG.#validateTimezone(timezone);
+    const date = this.#createDateWithOffset(MDTG.#offset[tz]);
+
+    const result = [
+      date.getUTCDate(),
+      date.getUTCHours(),
+      date.getUTCMinutes(),
+      date.getUTCSeconds(),
+    ]
+      .map(normalizeNumber)
+      .concat(
+        tz,
+        MDTG.#months[date.getUTCMonth()],
+        normalizeNumber(date.getUTCFullYear() % 100),
+      )
+      .join("");
+
+    if (!MDTG.isLongFormat(result)) {
+      throw new Error("Failed to build long MDTG");
+    }
+
+    return result;
+  }
+
+  #toShortenedMDT(timezone = "Z") {
+    const tz = MDTG.#validateTimezone(timezone);
+    const date = this.#createDateWithOffset(MDTG.#offset[tz]);
+
+    const result = [
+      this.#toShortMDT(tz),
+      MDTG.#months[date.getUTCMonth()],
+      normalizeNumber(date.getUTCFullYear() % 100),
+    ].join("");
+
+    if (!MDTG.isShortenedFormat(result)) {
+      throw new Error("Failed to build shortened MDTG");
+    }
+
+    return result;
+  }
+
+  toMDT({ form = MDTG.FORM.LONG, timezone = "Z" } = {}) {
+    switch (form) {
+      case MDTG.FORM.SHORT:
+        return this.#toShortMDT(timezone);
+      case MDTG.FORM.SHORTENED:
+        return this.#toShortenedMDT(timezone);
+      default:
+        return this.#toLongMDT(timezone);
+    }
+  }
+
+  static #parseShort(str) {
+    const day = parseInteger(str.slice(0, 2));
+    const hours = parseInteger(str.slice(2, 4));
+    const minutes = parseInteger(str.slice(4, 6));
+    const tz = str.slice(6, 7).toUpperCase();
+
+    const today = new Date();
+
+    return new Date(
+      Date.UTC(
+        today.getUTCFullYear(),
+        today.getUTCMonth(),
+        day,
+        hours + MDTG.#offset[tz],
+        minutes,
+      ),
+    );
+  }
+
+  static #parseShortened(str) {
+    const day = parseInteger(str.slice(0, 2));
+    const hours = parseInteger(str.slice(2, 4));
+    const minutes = parseInteger(str.slice(4, 6));
+    const tz = str.slice(6, 7).toUpperCase();
+
+    const month = MDTG.#months.indexOf(str.slice(7, 10).toLowerCase());
+    if (month === -1) throw new Error("Invalid month");
+
+    const year = 2000 + parseInteger(str.slice(10, 12));
+
+    return new Date(
+      Date.UTC(year, month, day, hours + MDTG.#offset[tz], minutes),
+    );
+  }
+
+  static #parseLong(str) {
+    const day = parseInteger(str.slice(0, 2));
+    const hours = parseInteger(str.slice(2, 4));
+    const minutes = parseInteger(str.slice(4, 6));
+    const seconds = parseInteger(str.slice(6, 8));
+    const tz = str.slice(8, 9).toUpperCase();
+
+    const month = MDTG.#months.indexOf(str.slice(9, 12).toLowerCase());
+    if (month === -1) throw new Error("Invalid month");
+
+    const year = 2000 + parseInteger(str.slice(12, 14));
+
+    return new Date(
+      Date.UTC(year, month, day, hours + MDTG.#offset[tz], minutes, seconds),
+    );
+  }
+
+  static parse(str) {
+    if (MDTG.isShortFormat(str)) return MDTG.#parseShort(str);
+    if (MDTG.isShortenedFormat(str)) return MDTG.#parseShortened(str);
+    if (MDTG.isLongFormat(str)) return MDTG.#parseLong(str);
+
+    throw new Error(`Invalid MDTG string "${str}"`);
+  }
+
+  toDate() {
+    return new Date(this.#currentDate);
+  }
 }

package/package.json

@@ -1,28 +1,29 @@
 {
-	"name": "mdtg",
-	"version": "1.3.1",
-	"main": "index.js",
-	"type": "module",
-	"engines": {
-		"node": ">=18.0.0",
-		"npm": ">=8.6.0"
-	},
-	"scripts": {
-		"format": "biome format .",
-		"prelint": "npm run format",
-		"lint": "biome lint .",
-		"test": "vitest run"
-	},
-	"keywords": [
-		"military",
-		"date",
-		"time"
-	],
-	"author": "0xflotus",
-	"license": "MIT",
-	"description": "This package offers you methods to convert Date Objects to military date time and vice versa",
-	"devDependencies": {
-		"@biomejs/biome": "2.3.13",
-		"vitest": "4.0.18"
-	}
+  "name": "mdtg",
+  "version": "2.0.1",
+  "main": "index.js",
+  "type": "module",
+  "engines": {
+    "node": ">=24.0.0"
+  },
+  "scripts": {
+    "coverage": "vitest run --coverage",
+    "format": "biome format .",
+    "prelint": "npm run format",
+    "lint": "biome lint .",
+    "test": "vitest run"
+  },
+  "keywords": [
+    "military",
+    "date",
+    "time"
+  ],
+  "author": "0xflotus",
+  "license": "MIT",
+  "description": "This package offers you methods to convert Date Objects to military date time and vice versa",
+  "devDependencies": {
+    "@biomejs/biome": "2.4.7",
+    "@vitest/coverage-v8": "4.1.0",
+    "vitest": "4.1.0"
+  }
 }