@eliasrrosa/tutorhub-public-assets 0.0.8 → 0.0.10

package/dist/domain/entities/ISO8601Time.d.ts

@@ -2,7 +2,7 @@ import { IISO8601TimeValidator } from "./ISO8601TimeValidator";
 import { ITime } from "./Time";
 /**
  * Interface for interacting with ISO8601 time formats.
- * Accepted formats: HH:MM:SS and HH:MM.
+ * Accepted formats: HH:MM:SS, HH:MM, HH:MM:SSZ, HH:MM:SS.sssZ and HH:MM:SS(+|-)HH:MM.
  *
  * @throws if instantiated with a different format
  * @throws if any method is called with a different format

package/dist/domain/entities/ISO8601Time.js

@@ -4,7 +4,7 @@ exports.ISO8601Time = void 0;
 const ISO8601TimeValidator_1 = require("./ISO8601TimeValidator");
 /**
  * Interface for interacting with ISO8601 time formats.
- * Accepted formats: HH:MM:SS and HH:MM.
+ * Accepted formats: HH:MM:SS, HH:MM, HH:MM:SSZ, HH:MM:SS.sssZ and HH:MM:SS(+|-)HH:MM.
  *
  * @throws if instantiated with a different format
  * @throws if any method is called with a different format

package/dist/domain/entities/ISO8601Time.test.js

@@ -20,6 +20,46 @@ describe("ISO8601Time", () => {
             const time = new ISO8601Time_1.ISO8601Time();
             expect(time.value).toBe("23:00:00");
         });
+        it("Should throw given irregular time format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("000:00:10");
+            expect(time).toThrow();
+        });
+        it("Should not throw given HH:MM format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("10:00");
+            expect(time).not.toThrow();
+        });
+        it("Should not throw given HH:MM:SS format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("10:00:00");
+            expect(time).not.toThrow();
+        });
+        it("Should throw given invalid HH:MM:SS format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("25:00:00");
+            expect(time).toThrow();
+        });
+        it("Should throw given invalid HH:MM format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("12:60");
+            expect(time).toThrow();
+        });
+        it("Should throw given invalid negative timezone", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("12:00:00-15:00");
+            expect(time).toThrow();
+        });
+        it("Should throw given invalid positive timezone", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("12:00:00+13:00");
+            expect(time).toThrow();
+        });
+        it("Should not throw given HH:MM:SS(+|-)HH:MM format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("12:00:00-03:00");
+            expect(time).not.toThrow();
+        });
+        it("Should not throw given HH:MM:SS.sssZ format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("12:00:00.000Z");
+            expect(time).not.toThrow();
+        });
+        it("Should not throw given HH:MM:SSZ format", () => {
+            const time = () => new ISO8601Time_1.ISO8601Time("12:00:00Z");
+            expect(time).not.toThrow();
+        });
     });
     describe("ISO8601Time.getNow()", () => {
         it("Should get now time.", () => {

package/dist/domain/entities/ISO8601TimeValidator.d.ts

@@ -2,11 +2,24 @@ import { ITimeValidator } from "./TimeValidator";
 export interface IISO8601TimeValidator extends ITimeValidator {
     isHHmmSS: (time: string) => boolean;
     isHHmm: (time: string) => boolean;
+    isHHmmSSPlusNumberedTimezone: (time: string) => boolean;
+    isHHmmSSsssZ: (time: string) => boolean;
+    isHHmmSSZ: (time: string) => boolean;
+    /** Accepted formats: `HH:MM:SS`, `HH:MM`, `HH:MM:SSZ`, `HH:MM:SS.sssZ` and `HH:MM:SS(+|-)HH:MM`. */
+    formatIsValid: (time: string) => boolean;
 }
-export declare class ISO8601TimeValidator implements ITimeValidator {
+export declare class ISO8601TimeValidator implements IISO8601TimeValidator {
+    private upTo23;
+    private upTo59;
     private hhMMssPattern;
     private hhMMPattern;
+    private hhMMssPlusNumberedTimezonePattern;
+    private hhMMssZPattern;
+    private hhMMssSSSZPattern;
     formatIsValid(time: string): boolean;
     isHHmmSS(time: string): boolean;
     isHHmm(time: string): boolean;
+    isHHmmSSPlusNumberedTimezone: (time: string) => boolean;
+    isHHmmSSZ: (time: string) => boolean;
+    isHHmmSSsssZ: (time: string) => boolean;
 }

package/dist/domain/entities/ISO8601TimeValidator.js

@@ -3,11 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISO8601TimeValidator = void 0;
 class ISO8601TimeValidator {
     constructor() {
-        this.hhMMssPattern = new RegExp("^([0-1][0-9]|[2][0-3]):[0-5][0-9]:[0-5][0-9]$");
-        this.hhMMPattern = new RegExp("^([0-1][0-9]|[2][0-3]):[0-5][0-9]$");
+        this.upTo23 = "([0-1][0-9]|[2][0-3])";
+        this.upTo59 = "[0-5][0-9]";
+        this.hhMMssPattern = new RegExp(`^${this.upTo23}:${this.upTo59}:${this.upTo59}$`);
+        this.hhMMPattern = new RegExp(`^${this.upTo23}:${this.upTo59}$`);
+        this.hhMMssPlusNumberedTimezonePattern = new RegExp(`^${this.upTo23}:${this.upTo59}:${this.upTo59}(\\+((0[0-9]|1[0-2]):${this.upTo59})|\\-((0[0-9]|1[0-4]):${this.upTo59}))$`);
+        this.hhMMssZPattern = new RegExp(`^${this.upTo23}:${this.upTo59}:${this.upTo59}Z$`);
+        this.hhMMssSSSZPattern = new RegExp(`^${this.upTo23}:${this.upTo59}:${this.upTo59}.[0-9]{3}Z$`);
+        this.isHHmmSSPlusNumberedTimezone = (time) => {
+            return this.hhMMssPlusNumberedTimezonePattern.test(time);
+        };
+        this.isHHmmSSZ = (time) => {
+            return this.hhMMssZPattern.test(time);
+        };
+        this.isHHmmSSsssZ = (time) => {
+            return this.hhMMssSSSZPattern.test(time);
+        };
     }
     formatIsValid(time) {
-        return this.isHHmm(time) || this.isHHmmSS(time);
+        return (this.isHHmm(time) ||
+            this.isHHmmSS(time) ||
+            this.isHHmmSSPlusNumberedTimezone(time) ||
+            this.isHHmmSSZ(time) ||
+            this.isHHmmSSsssZ(time));
     }
     isHHmmSS(time) {
         return this.hhMMssPattern.test(time);

package/dist/domain/entities/ISO8601TimeValidator.test.js

@@ -4,12 +4,24 @@ const ISO8601TimeValidator_1 = require("./ISO8601TimeValidator");
 describe("ISO8601TimeValidator", () => {
     const validator = new ISO8601TimeValidator_1.ISO8601TimeValidator();
     describe("ISO8601TimeValidator.formatIsValid()", () => {
-        it("Should not accept ISO8601 timestamp with offset.", () => {
+        it("Should accept ISO8601 timestamp with offset.", () => {
             const time = "00:00:00-03:00";
-            expect(validator.formatIsValid(time)).toBe(false);
+            expect(validator.formatIsValid(time)).toBe(true);
         });
-        it("Should not accept ISO8601 format with timestamp.", () => {
+        it("Should accept ISO8601 format with another offset.", () => {
             const time = "00:00:00-02:00";
+            expect(validator.formatIsValid(time)).toBe(true);
+        });
+        it("Should accept HH:MM:SSZ format.", () => {
+            const time = "00:00:00Z";
+            expect(validator.formatIsValid(time)).toBe(true);
+        });
+        it("Should accept HH:MM:SS.sssZ format.", () => {
+            const time = "00:00:00.000Z";
+            expect(validator.formatIsValid(time)).toBe(true);
+        });
+        it("Should not accept HH:MM:SS.sssZ format with non-numeric digits.", () => {
+            const time = "00:00:00.00dZ";
             expect(validator.formatIsValid(time)).toBe(false);
         });
         it("Should not accept non-ISO8601 formats.", () => {

package/dist/domain/entities/TimeSlot.d.ts

@@ -1,4 +1,5 @@
+import { ITime } from "./Time";
 export interface ITimeSlot {
-    startTime: string;
-    endTime: string;
+    startTime: ITime;
+    endTime: ITime;
 }

package/dist/domain/entities/UserUnavailableTime.d.ts

@@ -3,6 +3,7 @@ import { ICourse } from "./Course";
 import { IRescheduleRequest } from "./RescheduleRequest";
 import { IDateTimeSlot } from "./DateTimeSlot";
 import { IDate } from "./Date";
+import { ITime } from "./Time";
 export interface IUserUnavailableTime {
     id: string;
     userId: string;
@@ -10,8 +11,8 @@ export interface IUserUnavailableTime {
     groupId: string;
     date: IDate;
     dayOfTheWeek: number;
-    startTime: string;
-    endTime: string;
+    startTime: ITime;
+    endTime: ITime;
     isAvailableTime: boolean;
     course?: ICourse;
     courseId: string | null;
@@ -24,8 +25,8 @@ export declare class UserUnavailableTime implements IUserUnavailableTime {
     user?: IUserAuth;
     groupId: string;
     date: IDate;
-    startTime: string;
-    endTime: string;
+    startTime: ITime;
+    endTime: ITime;
     isAvailableTime: boolean;
     dayOfTheWeek: number;
     course?: ICourse;
@@ -37,8 +38,8 @@ export declare class UserUnavailableTime implements IUserUnavailableTime {
         user?: IUserAuth;
         groupId: string;
         date: IDate;
-        startTime: string;
-        endTime: string;
+        startTime: ITime | string;
+        endTime: ITime | string;
         isAvailableTime: boolean;
         course?: ICourse;
         courseId: string | null;

package/dist/domain/entities/UserUnavailableTime.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserUnavailableTime = void 0;
+const ISO8601Time_1 = require("./ISO8601Time");
 class UserUnavailableTime {
     constructor(opts) {
         this.getDateTimeSlot = () => {
@@ -18,8 +19,8 @@ class UserUnavailableTime {
         this.groupId = opts.groupId;
         this.date = opts.date;
         this.dayOfTheWeek = this.getDayOfTheWeek();
-        this.startTime = opts.startTime;
-        this.endTime = opts.endTime;
+        this.startTime = typeof opts.startTime == "string" ? new ISO8601Time_1.ISO8601Time(opts.startTime) : opts.startTime;
+        this.endTime = typeof opts.endTime == "string" ? new ISO8601Time_1.ISO8601Time(opts.endTime) : opts.endTime;
         this.isAvailableTime = opts.isAvailableTime;
         this.course = opts.course;
         this.courseId = opts.courseId;

package/dist/domain/entities/UserUnavailableTime.test.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ISO8601Date_1 = require("./ISO8601Date");
+const ISO8601Time_1 = require("./ISO8601Time");
 const UserUnavailableTime_1 = require("./UserUnavailableTime");
 describe("UserUnavailableTime", () => {
-    const availableTime = new UserUnavailableTime_1.UserUnavailableTime({
+    const availableTimeData = {
         courseId: "courseId",
         date: new ISO8601Date_1.ISO8601Date("2025-01-01"),
         endTime: "15:00",
@@ -12,11 +13,32 @@ describe("UserUnavailableTime", () => {
         id: "id",
         isAvailableTime: true,
         userId: "userId",
+    };
+    describe("UserUnavailableTime constructor()", () => {
+        it("Should be instantiable.", () => {
+            const availableTime = new UserUnavailableTime_1.UserUnavailableTime(availableTimeData);
+            expect(availableTime).toBeDefined();
+        });
+        it("Should contain the proper dayOfTheWeek.", () => {
+            const availableTime = new UserUnavailableTime_1.UserUnavailableTime(availableTimeData);
+            expect(availableTime.dayOfTheWeek).toBe(3);
+        });
+        it("Should instantiate ISO8601Time for startTime and endTime", () => {
+            const availableTime = new UserUnavailableTime_1.UserUnavailableTime(availableTimeData);
+            expect(availableTime.startTime).toBeInstanceOf(ISO8601Time_1.ISO8601Time);
+            expect(availableTime.endTime).toBeInstanceOf(ISO8601Time_1.ISO8601Time);
+        });
+        it("Should throw given invalid startTime or endTime format", () => {
+            const availableTime = () => new UserUnavailableTime_1.UserUnavailableTime(Object.assign(Object.assign({}, availableTimeData), { startTime: "25:00:00" }));
+            expect(availableTime).toThrow();
+        });
     });
-    it("Should be instantiable.", () => {
-        expect(availableTime).toBeDefined();
-    });
-    it("Should contain the proper dayOfTheWeek.", () => {
-        expect(availableTime.dayOfTheWeek).toBe(3);
+    describe("UserUnavailableTime.getDateTimeSlot()", () => {
+        const availableTime = new UserUnavailableTime_1.UserUnavailableTime(Object.assign({}, availableTimeData));
+        it("Should return an object of type IDateTimeSlot", () => {
+            expect(availableTime.getDateTimeSlot().date).toBeInstanceOf(ISO8601Date_1.ISO8601Date);
+            expect(availableTime.getDateTimeSlot().timeSlot.endTime).toBeInstanceOf(ISO8601Time_1.ISO8601Time);
+            expect(availableTime.getDateTimeSlot().timeSlot.startTime).toBeInstanceOf(ISO8601Time_1.ISO8601Time);
+        });
     });
 });

package/dist/index.cjs

@@ -224,15 +224,33 @@ var ISO8601DateTime = class _ISO8601DateTime {
 // src/domain/entities/ISO8601TimeValidator.ts
 var ISO8601TimeValidator = class {
   constructor() {
+    this.upTo23 = "([0-1][0-9]|[2][0-3])";
+    this.upTo59 = "[0-5][0-9]";
     this.hhMMssPattern = new RegExp(
-      "^([0-1][0-9]|[2][0-3]):[0-5][0-9]:[0-5][0-9]$"
+      `^${this.upTo23}:${this.upTo59}:${this.upTo59}$`
     );
-    this.hhMMPattern = new RegExp(
-      "^([0-1][0-9]|[2][0-3]):[0-5][0-9]$"
+    this.hhMMPattern = new RegExp(`^${this.upTo23}:${this.upTo59}$`);
+    this.hhMMssPlusNumberedTimezonePattern = new RegExp(
+      `^${this.upTo23}:${this.upTo59}:${this.upTo59}(\\+((0[0-9]|1[0-2]):${this.upTo59})|\\-((0[0-9]|1[0-4]):${this.upTo59}))$`
     );
+    this.hhMMssZPattern = new RegExp(
+      `^${this.upTo23}:${this.upTo59}:${this.upTo59}Z$`
+    );
+    this.hhMMssSSSZPattern = new RegExp(
+      `^${this.upTo23}:${this.upTo59}:${this.upTo59}.[0-9]{3}Z$`
+    );
+    this.isHHmmSSPlusNumberedTimezone = (time) => {
+      return this.hhMMssPlusNumberedTimezonePattern.test(time);
+    };
+    this.isHHmmSSZ = (time) => {
+      return this.hhMMssZPattern.test(time);
+    };
+    this.isHHmmSSsssZ = (time) => {
+      return this.hhMMssSSSZPattern.test(time);
+    };
   }
   formatIsValid(time) {
-    return this.isHHmm(time) || this.isHHmmSS(time);
+    return this.isHHmm(time) || this.isHHmmSS(time) || this.isHHmmSSPlusNumberedTimezone(time) || this.isHHmmSSZ(time) || this.isHHmmSSsssZ(time);
   }
   isHHmmSS(time) {
     return this.hhMMssPattern.test(time);
@@ -315,8 +333,8 @@ var UserUnavailableTime = class {
     this.groupId = opts.groupId;
     this.date = opts.date;
     this.dayOfTheWeek = this.getDayOfTheWeek();
-    this.startTime = opts.startTime;
-    this.endTime = opts.endTime;
+    this.startTime = typeof opts.startTime == "string" ? new ISO8601Time(opts.startTime) : opts.startTime;
+    this.endTime = typeof opts.endTime == "string" ? new ISO8601Time(opts.endTime) : opts.endTime;
     this.isAvailableTime = opts.isAvailableTime;
     this.course = opts.course;
     this.courseId = opts.courseId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eliasrrosa/tutorhub-public-assets",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Assets, mainly interfaces, to be shared among different Tutorhub apps.",
   "type": "module",
   "main": "./dist/index.cjs",