mdtg 0.0.4 → 1.1.0

package/.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  lint:
+    name: Linting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - run: npm install
+      - name: Check format
+        run: npm run lint
+  build:
+    name: Testing
+    needs: lint
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-24.04-arm]
+        node-version: [18, 20, 22]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm test

package/README.md

@@ -2,10 +2,6 @@
 
 This is a package that helps you to convert `Date` objects to [military date time](https://en.wikipedia.org/wiki/Date-time_group) and vice versa.
 
-#### Limitations
-
-Currently there is no support for different timezones.
-
 ### Install
 
 ```bash
@@ -24,6 +20,7 @@ console.log(mdtg.toMDT({ form: "shortened" }));
 console.log(mdtg.toMDT({ form: "long" }));
 
 console.log(MDTG.parse("12135530Zaug24"));
-console.log(MDTG.parse("121355Zaug24"));
-console.log(MDTG.parse("121355Z"));
+console.log(MDTG.parse("12135530Asep24"));
+console.log(MDTG.parse("121355LOCT24"));
+console.log(MDTG.parse("121355M"));
 ```

package/index.js

@@ -17,34 +17,88 @@ export class MDTG {
     "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) {
-    this.#currentDate = date ?? new 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}Z$/.test(str);
+    return /^[0-9]{6}[A-Z]$/.test(str);
   }
 
   static isShortenedFormat(str) {
-    return /^[0-9]{6}Z(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[0-9]{2}$/i.test(
+    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}Z(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[0-9]{2}$/i.test(
+    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() {
+  #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 = [
-      this.#currentDate.getDate(),
-      this.#currentDate.getHours(),
-      this.#currentDate.getMinutes(),
+      newDate.getUTCDate(),
+      newDate.getUTCHours(),
+      newDate.getUTCMinutes(),
     ]
       .map(normalizeNumber)
-      .concat("Z")
+      .concat(timezone.toUpperCase())
       .join("");
     if (!MDTG.isShortFormat(shortMDT)) {
       throw new Error("There was an error while building short MDT");
@@ -52,18 +106,31 @@ export class MDTG {
     return shortMDT;
   }
 
-  #toLongMDT() {
+  #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 = [
-      this.#currentDate.getDate(),
-      this.#currentDate.getHours(),
-      this.#currentDate.getMinutes(),
-      this.#currentDate.getSeconds(),
+      newDate.getUTCDate(),
+      newDate.getUTCHours(),
+      newDate.getUTCMinutes(),
+      newDate.getUTCSeconds(),
     ]
       .map(normalizeNumber)
       .concat(
-        "Z",
-        MDTG.months[this.#currentDate.getMonth()],
-        normalizeNumber(this.#currentDate.getFullYear() % 2000),
+        timezone.toUpperCase(),
+        MDTG.months[newDate.getUTCMonth()],
+        normalizeNumber(newDate.getUTCFullYear() % 2000),
       )
       .join("");
     if (!MDTG.isLongFormat(longMDT)) {
@@ -72,11 +139,24 @@ export class MDTG {
     return longMDT;
   }
 
-  #toShortenedMDT() {
+  #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(),
-      MDTG.months[this.#currentDate.getMonth()],
-      normalizeNumber(this.#currentDate.getFullYear() % 2000),
+      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");
@@ -86,11 +166,11 @@ export class MDTG {
 
   toMDT(options) {
     if (options?.form === "short") {
-      return this.#toShortMDT();
+      return this.#toShortMDT(options?.timezone);
     } else if (options?.form === "shortened") {
-      return this.#toShortenedMDT();
+      return this.#toShortenedMDT(options?.timezone);
     } else {
-      return this.#toLongMDT();
+      return this.#toLongMDT(options?.timezone);
     }
   }
 
@@ -99,37 +179,59 @@ export class MDTG {
       const day = Number.parseInt(str.slice(0, 2));
       const hours = Number.parseInt(str.slice(2, 4));
       const minutes = Number.parseInt(str.slice(4, 6));
-      const _timezone = str.slice(-1);
+      const timezoneOffset = str.slice(-1).toUpperCase();
 
       const today = new Date();
       const date = new Date(
-        today.getFullYear(),
-        today.getMonth(),
-        day,
-        hours,
-        minutes,
-        0,
-        0,
+        Date.UTC(
+          today.getUTCFullYear(),
+          today.getUTCMonth(),
+          day,
+          hours + this.offset[timezoneOffset],
+          minutes,
+          0,
+          0,
+        ),
       );
       return date;
     } else if (MDTG.isShortenedFormat(str)) {
       const day = Number.parseInt(str.slice(0, 2));
       const hours = Number.parseInt(str.slice(2, 4));
       const minutes = Number.parseInt(str.slice(4, 6));
-      const _timezone = str.slice(6, 7);
+      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));
-      const date = new Date(year, month, day, hours, minutes, 0, 0);
+      const date = new Date(
+        Date.UTC(
+          year,
+          month,
+          day,
+          hours + this.offset[timezoneOffset],
+          minutes,
+          0,
+          0,
+        ),
+      );
       return date;
     } else if (MDTG.isLongFormat(str)) {
       const day = Number.parseInt(str.slice(0, 2));
       const hours = Number.parseInt(str.slice(2, 4));
       const minutes = Number.parseInt(str.slice(4, 6));
       const seconds = Number.parseInt(str.slice(6, 8));
-      const _timezone = str.slice(8, 9);
+      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));
-      const date = new Date(year, month, day, hours, minutes, seconds, 0);
+      const date = new Date(
+        Date.UTC(
+          year,
+          month,
+          day,
+          hours + this.offset[timezoneOffset],
+          minutes,
+          seconds,
+          0,
+        ),
+      );
       return date;
     } else {
       throw Error("There was an error while parsing the string " + str);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdtg",
-  "version": "0.0.4",
+  "version": "1.1.0",
   "main": "index.js",
   "type": "module",
   "scripts": {