move from utils/utils to helpers

fadi-george · fadi-george · commit 44ebe8648215 · 2025-07-29T13:36:22.000-07:00
diff --git a/__test__/support/helpers/executors.ts b/__test__/support/helpers/executors.ts
@@ -1,6 +1,6 @@
 import { OP_REPO_EXECUTION_INTERVAL } from 'src/core/operationRepo/constants';
 import { GroupComparisonType, Operation } from 'src/core/operations/Operation';
-import { delay } from 'src/shared/utils/utils';
+import { delay } from 'src/shared/helpers/general';
 
 export class SomeOperation extends Operation {
   constructor() {
diff --git a/src/core/executors/LoginUserOperationExecutor.ts b/src/core/executors/LoginUserOperationExecutor.ts
@@ -5,14 +5,14 @@ import {
 } from 'src/core/types/operation';
 import OneSignalError from 'src/shared/errors/OneSignalError';
 import EventHelper from 'src/shared/helpers/EventHelper';
+import { getTimeZoneId } from 'src/shared/helpers/general';
 import {
   getResponseStatusType,
   ResponseStatusType,
 } from 'src/shared/helpers/NetworkUtils';
 import Log from 'src/shared/libraries/Log';
 import Database from 'src/shared/services/Database';
 import LocalStorage from 'src/shared/utils/LocalStorage';
-import { getTimeZoneId } from 'src/shared/utils/utils';
 import { IdentityConstants, OPERATION_NAME } from '../constants';
 import { type IPropertiesModelKeys } from '../models/PropertiesModel';
 import { type IdentityModelStore } from '../modelStores/IdentityModelStore';
diff --git a/src/core/operationRepo/OperationRepo.ts b/src/core/operationRepo/OperationRepo.ts
@@ -4,9 +4,9 @@ import {
   type IOperationRepo,
   type IStartableService,
 } from 'src/core/types/operation';
+import { delay } from 'src/shared/helpers/general';
 import Log from 'src/shared/libraries/Log';
 import Database from 'src/shared/services/Database';
-import { delay } from 'src/shared/utils/utils';
 import { type OperationModelStore } from '../modelRepo/OperationModelStore';
 import { GroupComparisonType, type Operation } from '../operations/Operation';
 import { ModelName } from '../types/models';
diff --git a/src/onesignal/User.ts b/src/onesignal/User.ts
@@ -4,13 +4,14 @@ import {
   SubscriptionType,
   type SubscriptionTypeValue,
 } from 'src/core/types/subscription';
+import { isObject, isValidEmail } from 'src/shared/helpers/general';
 import Log from 'src/shared/libraries/Log';
 import { IDManager } from 'src/shared/managers/IDManager';
 import {
   InvalidArgumentError,
   InvalidArgumentReason,
 } from '../shared/errors/InvalidArgumentError';
-import { isObject, isValidEmail, logMethodCall } from '../shared/utils/utils';
+import { logMethodCall } from '../shared/utils/utils';
 
 export default class User {
   static singletonInstance?: User = undefined;
diff --git a/src/page/bell/ActiveAnimatedElement.ts b/src/page/bell/ActiveAnimatedElement.ts
@@ -1,11 +1,7 @@
+import { addCssClass, removeCssClass } from 'src/shared/helpers/dom';
 import Log from '../../shared/libraries/Log';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
-import {
-  addCssClass,
-  contains,
-  once,
-  removeCssClass,
-} from '../../shared/utils/utils';
+import { contains, once } from '../../shared/utils/utils';
 import AnimatedElement from './AnimatedElement';
 
 export default class ActiveAnimatedElement extends AnimatedElement {
diff --git a/src/page/bell/AnimatedElement.ts b/src/page/bell/AnimatedElement.ts
@@ -1,11 +1,7 @@
+import { addCssClass, removeCssClass } from 'src/shared/helpers/dom';
 import Log from '../../shared/libraries/Log';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
-import {
-  addCssClass,
-  contains,
-  once,
-  removeCssClass,
-} from '../../shared/utils/utils';
+import { contains, once } from '../../shared/utils/utils';
 
 export default class AnimatedElement {
   public selector: string;
diff --git a/src/page/bell/Bell.ts b/src/page/bell/Bell.ts
@@ -1,4 +1,10 @@
 import type { AppUserConfigNotifyButton } from 'src/shared/config';
+import {
+  addCssClass,
+  addDomElement,
+  removeDomElement,
+} from 'src/shared/helpers/dom';
+import { delay } from 'src/shared/helpers/general';
 import type { BellPosition, BellSize, BellText } from 'src/shared/prompts';
 import { Browser, getBrowserName } from 'src/shared/useragent';
 import OneSignal from '../../onesignal/OneSignal';
@@ -8,15 +14,7 @@ import Log from '../../shared/libraries/Log';
 import { NotificationPermission } from '../../shared/models/NotificationPermission';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
 import BrowserUtils from '../../shared/utils/BrowserUtils';
-import {
-  addCssClass,
-  addDomElement,
-  contains,
-  delay,
-  nothing,
-  once,
-  removeDomElement,
-} from '../../shared/utils/utils';
+import { contains, nothing, once } from '../../shared/utils/utils';
 import { DismissPrompt } from '../models/Dismiss';
 import type { SubscriptionChangeEvent } from '../models/SubscriptionChangeEvent';
 import { ResourceLoadState } from '../services/DynamicResourceLoader';
diff --git a/src/page/bell/Button.ts b/src/page/bell/Button.ts
@@ -1,10 +1,10 @@
-import { removeDomElement, addDomElement } from '../../shared/utils/utils';
-import OneSignalEvent from '../../shared/services/OneSignalEvent';
+import { addDomElement, removeDomElement } from 'src/shared/helpers/dom';
+import InitHelper from 'src/shared/helpers/InitHelper';
+import LimitStore from 'src/shared/services/LimitStore';
+import OneSignalEvent from 'src/shared/services/OneSignalEvent';
 import ActiveAnimatedElement from './ActiveAnimatedElement';
 import Bell from './Bell';
-import LimitStore from '../../shared/services/LimitStore';
 import Message from './Message';
-import InitHelper from '../../shared/helpers/InitHelper';
 
 export default class Button extends ActiveAnimatedElement {
   public events: any;
diff --git a/src/page/bell/Dialog.ts b/src/page/bell/Dialog.ts
@@ -1,15 +1,12 @@
+import { addDomElement, clearDomElementChildren } from 'src/shared/helpers/dom';
 import {
   Browser,
   getBrowserName,
   isMobileBrowser,
   isTabletBrowser,
 } from 'src/shared/useragent';
+import { getPlatformNotificationIcon } from 'src/shared/utils/utils';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
-import {
-  addDomElement,
-  clearDomElementChildren,
-  getPlatformNotificationIcon,
-} from '../../shared/utils/utils';
 import type { NotificationIcons } from '../models/NotificationIcons';
 import AnimatedElement from './AnimatedElement';
 import Bell from './Bell';
diff --git a/src/page/bell/Launcher.ts b/src/page/bell/Launcher.ts
@@ -1,17 +1,15 @@
-import type { BellSize } from 'src/shared/prompts';
 import {
   InvalidStateError,
   InvalidStateReason,
-} from '../../shared/errors/InvalidStateError';
-import Log from '../../shared/libraries/Log';
+} from 'src/shared/errors/InvalidStateError';
 import {
   addCssClass,
-  contains,
   hasCssClass,
-  nothing,
-  once,
   removeCssClass,
-} from '../../shared/utils/utils';
+} from 'src/shared/helpers/dom';
+import Log from 'src/shared/libraries/Log';
+import type { BellSize } from 'src/shared/prompts';
+import { contains, nothing, once } from 'src/shared/utils/utils';
 import ActiveAnimatedElement from './ActiveAnimatedElement';
 import Bell from './Bell';
 
diff --git a/src/page/bell/Message.ts b/src/page/bell/Message.ts
@@ -1,6 +1,7 @@
-import Log from '../../shared/libraries/Log';
-import BrowserUtils from '../../shared/utils/BrowserUtils';
-import { delay, nothing } from '../../shared/utils/utils';
+import { delay } from 'src/shared/helpers/general';
+import Log from 'src/shared/libraries/Log';
+import BrowserUtils from 'src/shared/utils/BrowserUtils';
+import { nothing } from 'src/shared/utils/utils';
 import AnimatedElement from './AnimatedElement';
 import Bell from './Bell';
 
diff --git a/src/page/managers/PromptsManager.ts b/src/page/managers/PromptsManager.ts
@@ -1,3 +1,4 @@
+import { delay } from 'src/shared/helpers/general';
 import {
   CONFIG_DEFAULTS_SLIDEDOWN_OPTIONS,
   DelayedPromptType,
@@ -19,7 +20,6 @@ import InitHelper from '../../shared/helpers/InitHelper';
 import PromptsHelper from '../../shared/helpers/PromptsHelper';
 import Log from '../../shared/libraries/Log';
 import OneSignalEvent from '../../shared/services/OneSignalEvent';
-import { awaitableTimeout } from '../../shared/utils/AwaitableTimeout';
 import OneSignalUtils from '../../shared/utils/OneSignalUtils';
 import type { ContextInterface } from '../models/Context';
 import { DismissPrompt } from '../models/Dismiss';
@@ -145,7 +145,7 @@ export class PromptsManager {
     }
 
     if (timeDelaySeconds > 0) {
-      await awaitableTimeout(timeDelaySeconds * 1_000);
+      await delay(timeDelaySeconds * 1_000);
     }
 
     switch (type) {
diff --git a/src/page/managers/slidedownManager/SlidedownManager.ts b/src/page/managers/slidedownManager/SlidedownManager.ts
@@ -1,4 +1,5 @@
 import type { TagsObjectForApi, TagsObjectWithBoolean } from 'src/page/tags';
+import { delay } from 'src/shared/helpers/general';
 import {
   CONFIG_DEFAULTS_SLIDEDOWN_OPTIONS,
   DelayedPromptType,
@@ -24,7 +25,6 @@ import PromptsHelper from '../../../shared/helpers/PromptsHelper';
 import Log from '../../../shared/libraries/Log';
 import { NotificationPermission } from '../../../shared/models/NotificationPermission';
 import type { PushSubscriptionState } from '../../../shared/models/PushSubscriptionState';
-import { awaitableTimeout } from '../../../shared/utils/AwaitableTimeout';
 import { OneSignalUtils } from '../../../shared/utils/OneSignalUtils';
 import TagUtils from '../../../shared/utils/TagUtils';
 import AlreadySubscribedError from '../../errors/AlreadySubscribedError';
@@ -279,10 +279,10 @@ export class SlidedownManager {
     if (!confirmMessage) {
       return;
     }
-    await awaitableTimeout(1000);
+    await delay(1000);
     const confirmationToast = new ConfirmationToast(confirmMessage);
     await confirmationToast.show();
-    await awaitableTimeout(5000);
+    await delay(5000);
     confirmationToast.close();
     ConfirmationToast.triggerSlidedownEvent(ConfirmationToast.EVENTS.CLOSED);
   }
@@ -418,7 +418,7 @@ export class SlidedownManager {
         await this.showConfirmationToast();
       }
       // timeout to allow slidedown close animation to finish in case another slidedown is queued
-      await awaitableTimeout(1000);
+      await delay(1000);
 
       Slidedown.triggerSlidedownEvent(Slidedown.EVENTS.CLOSED);
     }
diff --git a/src/page/slidedown/ChannelCaptureContainer.ts b/src/page/slidedown/ChannelCaptureContainer.ts
@@ -1,3 +1,8 @@
+import {
+  addCssClass,
+  getDomElementOrStub,
+  removeCssClass,
+} from 'src/shared/helpers/dom';
 import {
   DelayedPromptType,
   type DelayedPromptTypeValue,
@@ -10,11 +15,6 @@ import {
   DANGER_ICON,
   SLIDEDOWN_CSS_IDS,
 } from '../../shared/slidedown/constants';
-import {
-  addCssClass,
-  getDomElementOrStub,
-  removeCssClass,
-} from '../../shared/utils/utils';
 import {
   ItiScriptURLHashes,
   ItiScriptURLs,
diff --git a/src/page/slidedown/ConfirmationToast.ts b/src/page/slidedown/ConfirmationToast.ts
@@ -1,17 +1,17 @@
-import { isMobileBrowser } from 'src/shared/useragent';
-import OneSignalEvent from '../../shared/services/OneSignalEvent';
+import {
+  addCssClass,
+  getDomElementOrStub,
+  removeDomElement,
+} from 'src/shared/helpers/dom';
+import OneSignalEvent from 'src/shared/services/OneSignalEvent';
 import {
   SLIDEDOWN_CSS_CLASSES,
   SLIDEDOWN_CSS_IDS,
   TOAST_CLASSES,
   TOAST_IDS,
-} from '../../shared/slidedown/constants';
-import {
-  addCssClass,
-  getDomElementOrStub,
-  once,
-  removeDomElement,
-} from '../../shared/utils/utils';
+} from 'src/shared/slidedown/constants';
+import { isMobileBrowser } from 'src/shared/useragent';
+import { once } from 'src/shared/utils/utils';
 
 export default class ConfirmationToast {
   private message: string;
diff --git a/src/page/slidedown/Slidedown.ts b/src/page/slidedown/Slidedown.ts
@@ -1,27 +1,26 @@
+import {
+  addCssClass,
+  addDomElement,
+  getDomElementOrStub,
+  removeCssClass,
+  removeDomElement,
+} from 'src/shared/helpers/dom';
 import { getValueOrDefault } from 'src/shared/helpers/general';
+import MainHelper from 'src/shared/helpers/MainHelper';
+import PromptsHelper from 'src/shared/helpers/PromptsHelper';
 import {
   DelayedPromptType,
   SERVER_CONFIG_DEFAULTS_SLIDEDOWN,
   type SlidedownPromptOptions,
 } from 'src/shared/prompts';
-import { isMobileBrowser } from 'src/shared/useragent';
-import MainHelper from '../../shared/helpers/MainHelper';
-import PromptsHelper from '../../shared/helpers/PromptsHelper';
-import OneSignalEvent from '../../shared/services/OneSignalEvent';
+import OneSignalEvent from 'src/shared/services/OneSignalEvent';
 import {
   COLORS,
   SLIDEDOWN_CSS_CLASSES,
   SLIDEDOWN_CSS_IDS,
-} from '../../shared/slidedown/constants';
-import {
-  addCssClass,
-  addDomElement,
-  getDomElementOrStub,
-  getPlatformNotificationIcon,
-  once,
-  removeCssClass,
-  removeDomElement,
-} from '../../shared/utils/utils';
+} from 'src/shared/slidedown/constants';
+import { isMobileBrowser } from 'src/shared/useragent';
+import { getPlatformNotificationIcon, once } from 'src/shared/utils/utils';
 import {
   InvalidChannelInputField,
   type InvalidChannelInputFieldValue,
diff --git a/src/page/slidedown/SlidedownElement.ts b/src/page/slidedown/SlidedownElement.ts
@@ -1,10 +1,10 @@
+import { addCssClass } from 'src/shared/helpers/dom';
 import {
   DEFAULT_ICON,
   SLIDEDOWN_BUTTON_CLASSES,
   SLIDEDOWN_CSS_CLASSES,
   SLIDEDOWN_CSS_IDS,
-} from '../../shared/slidedown/constants';
-import { addCssClass } from '../../shared/utils/utils';
+} from 'src/shared/slidedown/constants';
 import type { SlidedownHtmlProps } from './types';
 
 export function getSlidedownElement(dialogProps: SlidedownHtmlProps): Element {
diff --git a/src/page/slidedown/TaggingContainer.ts b/src/page/slidedown/TaggingContainer.ts
@@ -1,4 +1,11 @@
 import type { TagCategory } from 'src/page/tags';
+import {
+  addCssClass,
+  addDomElement,
+  getDomElementOrStub,
+  removeCssClass,
+  removeDomElement,
+} from 'src/shared/helpers/dom';
 import {
   COLORS,
   SLIDEDOWN_CSS_CLASSES,
@@ -8,13 +15,6 @@ import {
   TAGGING_CONTAINER_STRINGS,
 } from '../../shared/slidedown/constants';
 import TagUtils from '../../shared/utils/TagUtils';
-import {
-  addCssClass,
-  addDomElement,
-  getDomElementOrStub,
-  removeCssClass,
-  removeDomElement,
-} from '../../shared/utils/utils';
 import type { TagsObjectWithBoolean } from '../tags';
 import { getLoadingIndicatorWithColor } from './LoadingIndicator';
 
diff --git a/src/shared/api/OneSignalApiBase.ts b/src/shared/api/OneSignalApiBase.ts
@@ -4,10 +4,9 @@ import {
   OneSignalApiErrorKind,
 } from '../errors/OneSignalApiError';
 import OneSignalError from '../errors/OneSignalError';
-import { isValidUuid } from '../helpers/general';
+import { delay, isValidUuid } from '../helpers/general';
 import Log from '../libraries/Log';
 import type { APIHeaders } from '../models/APIHeaders';
-import { awaitableTimeout } from '../utils/AwaitableTimeout';
 import { IS_SERVICE_WORKER, VERSION } from '../utils/EnvVariables';
 import type OneSignalApiBaseResponse from './OneSignalApiBaseResponse';
 import { RETRY_BACKOFF } from './RetryBackoff';
@@ -122,7 +121,7 @@ export class OneSignalApiBase {
       };
     } catch (e) {
       if (e instanceof Error && e.name === 'TypeError') {
-        await awaitableTimeout(RETRY_BACKOFF[retry]);
+        await delay(RETRY_BACKOFF[retry]);
         Log.error(
           `OneSignal: Network timed out while calling ${url}. Retrying...`,
         );
diff --git a/src/shared/helpers/dom.ts b/src/shared/helpers/dom.ts
diff --git a/src/shared/helpers/general.ts b/src/shared/helpers/general.ts
diff --git a/src/shared/managers/CustomLinkManager.ts b/src/shared/managers/CustomLinkManager.ts
diff --git a/src/shared/utils/AwaitableTimeout.ts b/src/shared/utils/AwaitableTimeout.ts
diff --git a/src/shared/utils/utils.ts b/src/shared/utils/utils.ts
diff --git a/src/sw/serviceWorker/ServiceWorker.test.ts b/src/sw/serviceWorker/ServiceWorker.test.ts
diff --git a/src/sw/serviceWorker/ServiceWorker.ts b/src/sw/serviceWorker/ServiceWorker.ts
