more prefix renames

Author: fadi-george

__test__/constants/constants.ts

@@ -28,6 +28,6 @@ export const BASE_SUB = {
  device_model: '',
  device_os: '56',
  enabled: true,
- notification_types: NotificationType.Subscribed,
+ notification_types: NotificationType._Subscribed,
  sdk: __VERSION__,
 };

__test__/setupTests.ts

@@ -53,7 +53,7 @@ Object.defineProperty(navigator, 'userAgent', {
 let downloadSpy: MockInstance;
 export const mockJsonp = () => {
  const serverConfig = TestContext.getFakeServerAppConfig(
- ConfigIntegrationKind.Custom,
+ ConfigIntegrationKind._Custom,
  );
 
  if (!downloadSpy)

__test__/support/environment/TestContext.ts

@@ -23,7 +23,7 @@ export default class TestContext {
  appId: string = APP_ID,
  ): ServerAppConfig {
  let remoteConfigMockDefaults: ServerAppConfig;
- if (configIntegrationKind === ConfigIntegrationKind.Custom) {
+ if (configIntegrationKind === ConfigIntegrationKind._Custom) {
  remoteConfigMockDefaults = {
  success: true,
  version: 2,
@@ -49,7 +49,7 @@ export default class TestContext {
  proxyOriginEnabled: true,
  },
  integration: {
- kind: ConfigIntegrationKind.Custom,
+ kind: ConfigIntegrationKind._Custom,
  },
  staticPrompts: {
  native: {
@@ -311,8 +311,8 @@ export default class TestContext {
  },
  notificationBehavior: {
  click: {
- match: NotificationClickMatchBehavior.Exact,
- action: NotificationClickActionBehavior.Navigate,
+ match: NotificationClickMatchBehavior._Exact,
+ action: NotificationClickActionBehavior._Navigate,
  },
  display: {
  persist: false,
@@ -453,15 +453,15 @@ export default class TestContext {
  'notification.dismissed':
  'https://fake-config.com/notification-dismissed',
  },
- notificationClickHandlerMatch: NotificationClickMatchBehavior.Origin,
- notificationClickHandlerAction: NotificationClickActionBehavior.Focus,
+ notificationClickHandlerMatch: NotificationClickMatchBehavior._Origin,
+ notificationClickHandlerAction: NotificationClickActionBehavior._Focus,
  };
  }
 
  static getFakeMergedConfig(config: TestEnvironmentConfig = {}): AppConfig {
  const fakeUserConfig = config.userConfig || this.getFakeAppUserConfig();
  const fakeServerConfig = this.getFakeServerAppConfig(
- config.integration || ConfigIntegrationKind.Custom,
+ config.integration || ConfigIntegrationKind._Custom,
  config.overrideServerConfig,
  );
  const fakeMergedConfig = getMergedConfig(fakeUserConfig, fakeServerConfig);

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -65,7 +65,7 @@ export const createPushSub = ({
  id,
  onesignalId,
  token,
- type: SubscriptionType.ChromePush,
+ type: SubscriptionType._ChromePush,
  });
  return pushSubscription;
 };

__test__/support/helpers/configHelper.ts

@@ -14,7 +14,7 @@ export async function getFinalAppConfig(
  fakeUserConfig: any,
 ): Promise<AppConfig> {
  const fakeServerConfig = TestContext.getFakeServerAppConfig(
- ConfigIntegrationKind.Custom,
+ ConfigIntegrationKind._Custom,
  );
  fakeUserConfig.appId = fakeServerConfig.app_id;
  const getFakeServerConfig = () =>

__test__/support/helpers/core.ts

@@ -7,7 +7,7 @@ export function generateNewSubscription(modelId = '0000000000') {
  const model = new SubscriptionModel();
  model._modelId = modelId;
  model._mergeData({
- type: SubscriptionType.Email,
+ type: SubscriptionType._Email,
  id: '123', // subscription id
  token: 'myToken',
  });

__test__/support/helpers/setup.ts

@@ -139,7 +139,7 @@ export const setupLoadStylesheet = async () => {
  vi.spyOn(
  OneSignal._context._dynamicResourceLoader,
  '_loadSdkStylesheet',
- ).mockResolvedValue(ResourceLoadState.Loaded);
+ ).mockResolvedValue(ResourceLoadState._Loaded);
 };
 
 export const getRawPushSubscription = () => {

package.json

@@ -84,7 +84,7 @@
  },
  {
  "path": "./build/releases/OneSignalSDK.page.es6.js",
- "limit": "46.501 kB",
+ "limit": "46.489 kB",
  "gzip": true
  },
  {

src/core/CoreModuleDirector.ts

@@ -83,7 +83,7 @@ export class CoreModuleDirector {
  public _getEmailSubscriptionModels(): SubscriptionModel[] {
  logMethodCall('CoreModuleDirector.getEmailSubscriptionModels');
  const subscriptions = this._core._subscriptionModelStore.list();
- return subscriptions.filter((s) => s.type === SubscriptionType.Email);
+ return subscriptions.filter((s) => s.type === SubscriptionType._Email);
  }
 
  public async _hasEmail(): Promise<boolean> {
@@ -94,7 +94,7 @@ export class CoreModuleDirector {
  public _getSmsSubscriptionModels(): SubscriptionModel[] {
  logMethodCall('CoreModuleDirector.getSmsSubscriptionModels');
  const subscriptions = this._core._subscriptionModelStore.list();
- return subscriptions.filter((s) => s.type === SubscriptionType.SMS);
+ return subscriptions.filter((s) => s.type === SubscriptionType._SMS);
  }
 
  public async _hasSms(): Promise<boolean> {
@@ -118,7 +118,7 @@ export class CoreModuleDirector {
  const pushToken = await getCurrentPushToken();
  if (pushToken) {
  return this._getSubscriptionOfTypeWithToken(
- SubscriptionChannel.Push,
+ SubscriptionChannel._Push,
  pushToken,
  );
  }
@@ -136,7 +136,7 @@ export class CoreModuleDirector {
  const lastKnownPushToken = await getPushToken();
  if (lastKnownPushToken) {
  return this._getSubscriptionOfTypeWithToken(
- SubscriptionChannel.Push,
+ SubscriptionChannel._Push,
  lastKnownPushToken,
  );
  }
@@ -192,13 +192,13 @@ export class CoreModuleDirector {
  let subscriptions: SubscriptionModel[];
 
  switch (type) {
- case SubscriptionChannel.Email:
+ case SubscriptionChannel._Email:
  subscriptions = this._getEmailSubscriptionModels();
  break;
- case SubscriptionChannel.SMS:
+ case SubscriptionChannel._SMS:
  subscriptions = this._getSmsSubscriptionModels();
  break;
- case SubscriptionChannel.Push:
+ case SubscriptionChannel._Push:
  subscriptions = this._getAllPushSubscriptionModels();
  break;
  default:

src/core/executors/CustomEventOperationExecutor.ts

@@ -69,7 +69,7 @@ export class CustomEventsOperationExecutor implements IOperationExecutor {
  if (ok) return new ExecutionResponse(ExecutionResult._Success);
 
  switch (responseType) {
- case ResponseStatusType.RETRYABLE:
+ case ResponseStatusType._Retryable:
  return new ExecutionResponse(ExecutionResult._FailRetry);
  default:
  return new ExecutionResponse(ExecutionResult._FailNoretry);