@yangsaiyam/helper 1.5.0 → 1.5.2

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@yangsaiyam/helper",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "exports": {
     ".": "./src/index.ts"
+  },
+  "dependencies": {
+    "dayjs": "^1.11.20"
   }
 }

package/src/roles/index.test.ts

@@ -46,14 +46,36 @@ assert.equal(
   permissionLabelKey(Permission.CONTACT_FORM_DELETE),
   "permissions.contactFormDelete",
 );
+assert.equal(
+  permissionLabelKey(Permission.OTP_ATTEMPTS_READ),
+  "permissions.otpAttemptsRead",
+);
+assert.equal(
+  permissionLabelKey(Permission.TWO_FACTOR_AUTH_WRITE),
+  "permissions.twoFactorAuthWrite",
+);
+assert.equal(permissionLabelKey(Permission.VIEWS_READ), "permissions.viewsRead");
 
 assert.ok(ROLE_PERMISSIONS["super-admin"].includes(Permission.USERS_DELETE));
+assert.ok(ROLE_PERMISSIONS["super-admin"].includes(Permission.OTP_ATTEMPTS_READ));
+assert.ok(
+  ROLE_PERMISSIONS["super-admin"].includes(Permission.TWO_FACTOR_AUTH_WRITE),
+);
+assert.ok(ROLE_PERMISSIONS["super-admin"].includes(Permission.VIEWS_READ));
 assert.ok(ROLE_PERMISSIONS.admin.includes(Permission.CONTACT_FORM_DELETE));
+assert.ok(ROLE_PERMISSIONS.admin.includes(Permission.VIEWS_READ));
+assert.equal(
+  ROLE_PERMISSIONS.admin.includes(Permission.USERS_WRITE),
+  false,
+);
 assert.ok(ROLE_PERMISSIONS.hr.includes(Permission.JOB_APPLICATIONS_READ));
-assert.deepEqual(ROLE_PERMISSIONS.staff, [Permission.CAREERS_READ]);
+assert.deepEqual(ROLE_PERMISSIONS.staff, [Permission.CONTACT_FORM_READ]);
 
 assert.equal(hasPermission("super-admin", Permission.USERS_WRITE), true);
+assert.equal(hasPermission("super-admin", Permission.OTP_ATTEMPTS_WRITE), true);
 assert.equal(hasPermission(1, Permission.USERS_WRITE), false);
 assert.equal(hasPermission("hr", Permission.CAREERS_WRITE), true);
 assert.equal(hasPermission("staff", Permission.CAREERS_WRITE), false);
+assert.equal(hasPermission("staff", Permission.CONTACT_FORM_READ), true);
+assert.equal(hasPermission("admin", Permission.VIEWS_READ), true);
 assert.equal(hasPermission(undefined, Permission.CAREERS_READ), false);

package/src/roles/index.ts

@@ -74,6 +74,11 @@ export const Permission = {
   CONTACT_FORM_READ: "contact-form:read",
   CONTACT_FORM_DELETE: "contact-form:delete",
   JOB_APPLICATIONS_READ: "job-applications:read",
+  OTP_ATTEMPTS_READ: "otp-attempts:read",
+  OTP_ATTEMPTS_WRITE: "otp-attempts:write",
+  TWO_FACTOR_AUTH_READ: "two-factor-auth:read",
+  TWO_FACTOR_AUTH_WRITE: "two-factor-auth:write",
+  VIEWS_READ: "views:read",
 } as const;
 
 export type Permission = (typeof Permission)[keyof typeof Permission];
@@ -90,6 +95,11 @@ export const PERMISSION_I18N_KEY: Record<Permission, string> = {
   [Permission.CONTACT_FORM_READ]: "permissions.contactFormRead",
   [Permission.CONTACT_FORM_DELETE]: "permissions.contactFormDelete",
   [Permission.JOB_APPLICATIONS_READ]: "permissions.jobApplicationsRead",
+  [Permission.OTP_ATTEMPTS_READ]: "permissions.otpAttemptsRead",
+  [Permission.OTP_ATTEMPTS_WRITE]: "permissions.otpAttemptsWrite",
+  [Permission.TWO_FACTOR_AUTH_READ]: "permissions.twoFactorAuthRead",
+  [Permission.TWO_FACTOR_AUTH_WRITE]: "permissions.twoFactorAuthWrite",
+  [Permission.VIEWS_READ]: "permissions.viewsRead",
 };
 
 export const ROLE_PERMISSIONS: Record<CanonicalRole, Permission[]> = {
@@ -105,6 +115,11 @@ export const ROLE_PERMISSIONS: Record<CanonicalRole, Permission[]> = {
     Permission.CONTACT_FORM_READ,
     Permission.CONTACT_FORM_DELETE,
     Permission.JOB_APPLICATIONS_READ,
+    Permission.OTP_ATTEMPTS_READ,
+    Permission.OTP_ATTEMPTS_WRITE,
+    Permission.TWO_FACTOR_AUTH_READ,
+    Permission.TWO_FACTOR_AUTH_WRITE,
+    Permission.VIEWS_READ,
   ],
   admin: [
     Permission.ALLOWED_EMAILS_READ,
@@ -116,6 +131,7 @@ export const ROLE_PERMISSIONS: Record<CanonicalRole, Permission[]> = {
     Permission.CONTACT_FORM_READ,
     Permission.CONTACT_FORM_DELETE,
     Permission.JOB_APPLICATIONS_READ,
+    Permission.VIEWS_READ,
   ],
   hr: [
     Permission.CAREERS_READ,
@@ -123,7 +139,7 @@ export const ROLE_PERMISSIONS: Record<CanonicalRole, Permission[]> = {
     Permission.CAREERS_DELETE,
     Permission.JOB_APPLICATIONS_READ,
   ],
-  staff: [Permission.CAREERS_READ],
+  staff: [Permission.CONTACT_FORM_READ],
 };
 
 export function hasPermission(

package/src/time/index.test.ts

@@ -1,7 +1,9 @@
 import assert from "node:assert/strict";
 
 import {
+  convertTimestampToTimezone,
   TIMEZONE,
+  TIMEZONE_CURRENT_UTC_OFFSET,
   TIMEZONE_TO_UTC,
   normalizeTimezone,
   timezoneLabelKey,
@@ -21,7 +23,14 @@ assert.equal(timezoneToUtc("UTC"), "UTC+00:00");
 assert.equal(timezoneToUtc("Etc/UTC"), "UTC+00:00");
 assert.equal(timezoneToUtc("Asia/Kuala_Lumpur"), "UTC+08:00");
 assert.equal(timezoneToUtc("kuala lumpur"), "UTC+08:00");
-assert.equal(timezoneToUtc("America/New_York"), "UTC-05:00");
+assert.equal(
+  timezoneToUtc("America/New_York", Date.UTC(2024, 0, 1, 12, 0, 0)),
+  "UTC-05:00",
+);
+assert.equal(
+  timezoneToUtc("America/New_York", Date.UTC(2024, 6, 1, 12, 0, 0)),
+  "UTC-04:00",
+);
 assert.equal(timezoneToUtc("unknown"), undefined);
 
 assert.equal(timezoneLabelKey("UTC"), "time.timezone.utc");
@@ -38,5 +47,30 @@ assert.deepEqual(TIMEZONE[0], {
 });
 assert.equal(TIMEZONE[2]?.value, "Asia/Singapore");
 
-assert.equal(TIMEZONE_TO_UTC.UTC, "UTC+00:00");
-assert.equal(TIMEZONE_TO_UTC["Asia/Kuala_Lumpur"], "UTC+08:00");
+assert.equal(TIMEZONE_CURRENT_UTC_OFFSET.UTC, "UTC+00:00");
+assert.equal(TIMEZONE_CURRENT_UTC_OFFSET["Asia/Kuala_Lumpur"], "UTC+08:00");
+assert.equal(TIMEZONE_TO_UTC, TIMEZONE_CURRENT_UTC_OFFSET);
+
+const utcNineAm = Date.UTC(2024, 0, 1, 9, 0, 0);
+const klNineAm = Date.UTC(2024, 0, 1, 1, 0, 0);
+
+assert.equal(
+  convertTimestampToTimezone(utcNineAm, "UTC", "Asia/Kuala_Lumpur"),
+  Date.UTC(2024, 0, 1, 1, 0, 0),
+);
+assert.equal(
+  convertTimestampToTimezone(
+    klNineAm,
+    "Asia/Kuala_Lumpur",
+    "America/New_York",
+  ),
+  Date.UTC(2024, 0, 1, 14, 0, 0),
+);
+assert.equal(
+  convertTimestampToTimezone(utcNineAm, "unknown", "Asia/Kuala_Lumpur"),
+  undefined,
+);
+assert.equal(
+  convertTimestampToTimezone(utcNineAm, "UTC", "unknown"),
+  undefined,
+);

package/src/time/index.ts

@@ -1,5 +1,12 @@
+import dayjs from "dayjs";
+import timezone from "dayjs/plugin/timezone.js";
+import utc from "dayjs/plugin/utc.js";
+
 import type { MappingOption } from "../shared/types";
 
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
 export const TIMEZONE = [
   { key: 1, value: "UTC", i18nKey: "time.timezone.utc" },
   {
@@ -82,25 +89,6 @@ export const TIMEZONE = [
 export type CanonicalTimezone = (typeof TIMEZONE)[number]["value"];
 export type TimezoneInput = CanonicalTimezone | string;
 
-export const TIMEZONE_TO_UTC: Record<CanonicalTimezone, string> = {
-  UTC: "UTC+00:00",
-  "Asia/Kuala_Lumpur": "UTC+08:00",
-  "Asia/Singapore": "UTC+08:00",
-  "Asia/Bangkok": "UTC+07:00",
-  "Asia/Jakarta": "UTC+07:00",
-  "Asia/Manila": "UTC+08:00",
-  "Asia/Hong_Kong": "UTC+08:00",
-  "Asia/Shanghai": "UTC+08:00",
-  "Asia/Tokyo": "UTC+09:00",
-  "Australia/Sydney": "UTC+10:00",
-  "Europe/London": "UTC+00:00",
-  "Europe/Berlin": "UTC+01:00",
-  "America/New_York": "UTC-05:00",
-  "America/Chicago": "UTC-06:00",
-  "America/Denver": "UTC-07:00",
-  "America/Los_Angeles": "UTC-08:00",
-};
-
 const TIMEZONE_ALIAS_TO_CANONICAL: Record<string, CanonicalTimezone> = {
   utc: "UTC",
   "etc/utc": "UTC",
@@ -164,6 +152,7 @@ export function normalizeTimezone(
 
 export function timezoneToUtc(
   timezone: TimezoneInput | undefined,
+  timestamp = Date.now(),
 ): string | undefined {
   const normalizedTimezone = normalizeTimezone(timezone);
 
@@ -171,9 +160,15 @@ export function timezoneToUtc(
     return undefined;
   }
 
-  return TIMEZONE_TO_UTC[normalizedTimezone];
+  return `UTC${dayjs(timestamp).tz(normalizedTimezone).format("Z")}`;
 }
 
+export const TIMEZONE_CURRENT_UTC_OFFSET: Record<CanonicalTimezone, string> = Object.fromEntries(
+  TIMEZONE.map(({ value }) => [value, timezoneToUtc(value)]),
+) as Record<CanonicalTimezone, string>;
+
+export const TIMEZONE_TO_UTC = TIMEZONE_CURRENT_UTC_OFFSET;
+
 export function timezoneLabelKey(timezone: TimezoneInput | undefined): string {
   const normalizedTimezone = normalizeTimezone(timezone);
 
@@ -183,3 +178,21 @@ export function timezoneLabelKey(timezone: TimezoneInput | undefined): string {
 
   return TIMEZONE_I18N_KEY[normalizedTimezone];
 }
+
+export function convertTimestampToTimezone(
+  timestamp: number,
+  sourceTimezone: TimezoneInput | undefined,
+  targetTimezone: TimezoneInput | undefined,
+): number | undefined {
+  const normalizedSourceTimezone = normalizeTimezone(sourceTimezone);
+  const normalizedTargetTimezone = normalizeTimezone(targetTimezone);
+
+  if (!normalizedSourceTimezone || !normalizedTargetTimezone) {
+    return undefined;
+  }
+
+  const sourceDateTime = dayjs(timestamp).tz(normalizedSourceTimezone);
+  const preservedWallClock = sourceDateTime.format("YYYY-MM-DDTHH:mm:ss.SSS");
+
+  return dayjs.tz(preservedWallClock, normalizedTargetTimezone).valueOf();
+}