Added support for the fromJson method

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chiral",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "A library to simplify timekeeping.",
   "author": "Isaac Shea <[email protected]>",
   "license": "MIT",

src/models/date.test.ts → src/date/date.test.ts

@@ -1,4 +1,4 @@
-import RealDate from "./date";
+import { RealDate } from "./date";
 
 test("RealDate", () => {
   const baseDate = new RealDate(2021, 1, 1);
@@ -142,4 +142,13 @@ test("RealDate", () => {
 
   expect(equalDate3.isBetween(equalDate1, equalDate2, { p: "m" })).toBe(true);
   expect(equalDate3.isBetween(equalDate2, equalDate1, { p: "m" })).toBe(true);
+
+
+  /** Test static methods */
+  // fromJson
+  const fromJsonDate = new RealDate(2021, 3, 23);
+  const fromJsonString = JSON.parse(JSON.stringify(fromJsonDate));
+  const fromJsonDate2 = RealDate.fromJson(fromJsonString);
+  expect(fromJsonDate.equals(fromJsonDate2)).toBe(true);
+  expect(fromJsonDate.day).toBe(fromJsonDate2.day);
 });

src/models/date.ts → src/date/date.ts

@@ -1,7 +1,7 @@
 import padNumber from "../helpers/padNumber";
-import { Chiral } from "./types";
+import { Chiral } from "../types/types";
 
-export default class RealDate implements Chiral.Date.I_Date<RealDate> {
+export class RealDate implements Chiral.Date.I_Date<RealDate> {
   protected _type: "RealDate" = "RealDate";
 
   private _date: Date;
@@ -230,8 +230,17 @@ export default class RealDate implements Chiral.Date.I_Date<RealDate> {
     "September", "October", "November", "December",
   ];
 
+  /** Creates a new `RealDate` from the current system date */
   static now(): RealDate {
     const d = new Date();
     return new RealDate(d.getFullYear(), d.getMonth() + 1, d.getDate());
   }
+
+  /** Creates a new `RealDate` from a JSON object */
+  static fromJson(json: any): RealDate {
+    if (!json.hasOwnProperty("_date")) throw new Error("Invalid JSON");
+    const date = new RealDate();
+    date._date = new Date(json._date);
+    return date;
+  }
 }

src/date/index.ts

@@ -0,0 +1 @@
+export * from "./date"

src/index.ts

@@ -1 +1,3 @@
-export * from "./models";
+export * from "./date";
+export * from "./time";
+export * from "./types";

src/time/index.ts

@@ -0,0 +1 @@
+export * from "./time"

src/models/time.test.ts → src/time/time.test.ts

@@ -1,5 +1,5 @@
-import RealDate from "./date";
-import RealTime from "./time";
+import { RealDate } from "../date";
+import { RealTime } from "./time";
 
 test("RealTime", () => {
   const baseTime = new RealTime(1, 2, 3, 4);
@@ -145,4 +145,14 @@ test("RealTime", () => {
   const typeofTime = new RealTime(1, 2, 3, 4);
   expect(typeofTime.typeof(new RealDate())).toBe(false);
   expect(typeofTime.typeof(new RealTime())).toBe(true);
+
+
+  /** Test fromJson */
+  const jsonTime = new RealTime(1, 2, 3, 4);
+  const jsonTimeJson = JSON.parse(JSON.stringify(jsonTime));
+  const fromJsonTime = RealTime.fromJson(jsonTimeJson);
+  const jsonTime2 = new RealTime(1, 2, 3, 4);
+  expect(fromJsonTime.equals(jsonTime2)).toBe(true);
+  expect(fromJsonTime.hours).toBe(jsonTime2.hours);
+  expect(fromJsonTime.minutes).toBe(2);
 });

src/models/time.ts → src/time/time.ts

@@ -1,8 +1,8 @@
 import { Round } from "../helpers";
 import padNumber from "../helpers/padNumber";
-import { Chiral } from "./types";
+import { Chiral } from "../types/types";
 
-export default class RealTime implements Chiral.Time.I_Time<RealTime> {
+export class RealTime implements Chiral.Time.I_Time<RealTime> {
   protected _type: "RealTime" = "RealTime";
 
 
@@ -340,6 +340,8 @@ export default class RealTime implements Chiral.Time.I_Time<RealTime> {
     mil: "",
   };
 
+
+  /** Creates a new `RealTime` from the current system time */
   static now() {
     const now = new Date();
     return new RealTime(
@@ -349,4 +351,12 @@ export default class RealTime implements Chiral.Time.I_Time<RealTime> {
       now.getMilliseconds(),
     );
   }
+
+  /** Creates a new `RealTime` from a JSON object */
+  static fromJson(json: any): RealTime {
+    if (!json.hasOwnProperty("_millis")) throw new Error("Invalid JSON");
+    const time = new RealTime();
+    time._millis = json._millis;
+    return time;
+  }
 }

src/types/index.ts

@@ -0,0 +1 @@
+export * from "./types"