Skip to content

Commit 450ce08

Browse files
committed
fix import type usage
1 parent a66415b commit 450ce08

10 files changed

Lines changed: 24 additions & 26 deletions

File tree

src/core/controllers/CustomEventController.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
import MainHelper from '../../shared/helpers/MainHelper';
22
import { IdentityModelStore } from '../modelStores/IdentityModelStore';
33
import { TrackEventOperation } from '../operations/TrackEventOperation';
4-
import { ICustomEvent, ICustomEventController } from '../types/customEvents';
5-
import { IOperationRepo } from '../types/operation';
4+
import type {
5+
ICustomEvent,
6+
ICustomEventController,
7+
} from '../types/customEvents';
8+
import type { IOperationRepo } from '../types/operation';
69

710
/**
811
* Implements custom event tracking functionality.
912
* This class handles sending custom events by creating TrackEventOperation instances
1013
* and enqueueing them for execution via the operation repository.
1114
*/
1215
export class CustomEventController implements ICustomEventController {
13-
constructor(
14-
private readonly _identityModelStore: IdentityModelStore,
15-
private readonly _opRepo: IOperationRepo,
16-
) {}
16+
private readonly _identityModelStore: IdentityModelStore;
17+
private readonly _opRepo: IOperationRepo;
18+
19+
constructor(identityModelStore: IdentityModelStore, opRepo: IOperationRepo) {
20+
this._identityModelStore = identityModelStore;
21+
this._opRepo = opRepo;
22+
}
1723

1824
sendCustomEvent(event: ICustomEvent): void {
1925
const appId = MainHelper.getAppId();

src/core/executors/CustomEventOperationExecutor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { ExecutionResponse } from '../operations/ExecutionResponse';
1010
import { Operation } from '../operations/Operation';
1111
import { TrackEventOperation } from '../operations/TrackEventOperation';
1212
import { RequestService } from '../requestService/RequestService';
13-
import { ICustomEventMetadata } from '../types/customEvents';
14-
import { ExecutionResult, IOperationExecutor } from '../types/operation';
13+
import type { ICustomEventMetadata } from '../types/customEvents';
14+
import { ExecutionResult, type IOperationExecutor } from '../types/operation';
1515

1616
// Implements logic similar to Android SDK's CustomEventOperationExecutor
1717
// Reference: https://github.com/OneSignal/OneSignal-Android-SDK/blob/main/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/CustomEventOperationExecutor.kt

src/core/modelRepo/ModelStore.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Reference: https://github.com/OneSignal/OneSignal-Android-SDK/blob/5.1.31/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt
33
import {
44
type DatabaseModel,
5+
type IEventNotifier,
56
type IModelStore,
67
type IModelStoreChangeHandler,
78
ModelChangeTags,

src/core/models/SubscriptionModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Environment from 'src/shared/helpers/Environment';
2-
import { ISubscription } from '../types/api';
2+
import type { ISubscription } from '../types/api';
33
import {
44
type NotificationTypeValue,
55
type SubscriptionTypeValue,

src/core/operations/BaseFullSubscriptionOperation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Environment from 'src/shared/helpers/Environment';
2-
import { ICreateUserSubscription } from '../types/api';
2+
import type { ICreateUserSubscription } from '../types/api';
33
import {
44
type NotificationTypeValue,
55
type SubscriptionTypeValue,

src/core/requestService/RequestService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
type RequestMetadata,
1818
type UserData,
1919
} from '../types/api';
20-
import { ICreateEvent } from '../types/customEvents';
20+
import type { ICreateEvent } from '../types/customEvents';
2121
import AliasPair from './AliasPair';
2222

2323
export class RequestService {

src/core/types/customEvents.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SubscriptionTypeValue } from './subscription';
1+
import type { SubscriptionTypeValue } from './subscription';
22

33
export interface ICustomEvent {
44
name: string;

src/page/userModel/FuturePushSubscriptionRecord.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@ import type {
22
NotificationTypeValue,
33
SubscriptionTypeValue,
44
} from 'src/core/types/subscription';
5-
import {
6-
NotificationType,
7-
NotificationTypeValue,
8-
SubscriptionTypeValue,
9-
} from 'src/core/types/subscription';
10-
import {
11-
useSafariLegacyPush,
12-
useSafariVapidPush,
13-
} from 'src/shared/environment';
5+
import { NotificationType } from 'src/core/types/subscription';
146
import { RawPushSubscription } from 'src/shared/models/RawPushSubscription';
157
import Environment from '../../shared/helpers/Environment';
16-
import { Serializable } from '../models/Serializable';
8+
import type { Serializable } from '../models/Serializable';
179

1810
export default class FuturePushSubscriptionRecord implements Serializable {
1911
readonly type: SubscriptionTypeValue;

src/shared/api/OneSignalApiSW.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ import type { IUpdateUser } from 'src/core/types/api';
22
import { NotificationType } from 'src/core/types/subscription';
33
import AliasPair from '../../core/requestService/AliasPair';
44
import { RequestService } from '../../core/requestService/RequestService';
5-
import { OutcomeRequestData } from '../../page/models/OutcomeRequestData';
5+
import type { OutcomeRequestData } from '../../page/models/OutcomeRequestData';
66
import Utils from '../context/Utils';
77
import Environment from '../helpers/Environment';
88
import Log from '../libraries/Log';
9+
import type { ServerAppConfig } from '../models/AppConfig';
910
import type { DeliveryPlatformKindValue } from '../models/DeliveryPlatformKind';
1011
import {
1112
OutcomeAttributionType,

src/sw/serviceWorker/ServiceWorker.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
import { RawPushSubscription } from '../../../src/shared/models/RawPushSubscription';
99
import { Utils } from '../../shared/context/Utils';
1010
import ServiceWorkerHelper from '../../shared/helpers/ServiceWorkerHelper';
11-
import ContextSW from '../../shared/models/ContextSW';
1211
import {
1312
type NotificationClickEventInternal,
1413
type NotificationForegroundWillDisplayEventSerializable,
@@ -41,9 +40,8 @@ import {
4140
NotificationType,
4241
type NotificationTypeValue,
4342
} from 'src/core/types/subscription';
44-
import { type AppConfig, getServerAppConfig } from 'src/shared/config';
43+
import type { AppConfig } from 'src/shared/models/AppConfig';
4544
import type { DeliveryPlatformKindValue } from 'src/shared/models/DeliveryPlatformKind';
46-
import { VERSION } from 'src/shared/utils/EnvVariables';
4745
import { bowserCastle } from '../../shared/utils/bowserCastle';
4846
import { ModelCacheDirectAccess } from '../helpers/ModelCacheDirectAccess';
4947
import { OSNotificationButtonsConverter } from '../models/OSNotificationButtonsConverter';

0 commit comments

Comments
 (0)