Skip to content

Commit b1eaaf7

Browse files
refactor: migrate mp convert js to objc (#537)
* refactor: migrate MPConvertJS to objc * fix import issues result of call with @denischilik * remove unused var * add import to tests * fix run analyzer error * code cleanup + address @jamesnrokt comments
1 parent 57f3cb5 commit b1eaaf7

File tree

11 files changed

+427
-290
lines changed

11 files changed

+427
-290
lines changed

UnitTests/ObjCTests/MPConvertJSTests.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#import <XCTest/XCTest.h>
2+
#import "MPConvertJS.h"
23
#import "mParticle.h"
34
#import "MPBaseTestCase.h"
45
#import "MParticleSwift.h"

mParticle-Apple-SDK.xcodeproj/project.pbxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@
277277
D34286102D419CB800FEC2C8 /* MPUploadSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D342860E2D419CA700FEC2C8 /* MPUploadSettings.swift */; };
278278
D356E0252CFE08ED0020898D /* MPResponseConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = D356E0232CFE08ED0020898D /* MPResponseConfig.swift */; };
279279
D3724C192AE02AF60074CD67 /* mParticle_Apple_SDK_NoLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = D3724C182AE02AF60074CD67 /* mParticle_Apple_SDK_NoLocation.h */; settings = {ATTRIBUTES = (Public, ); }; };
280-
D3CEDACC2CB027E1001B32DF /* MPConvertJS.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3CEDACA2CB027E1001B32DF /* MPConvertJS.swift */; };
280+
D3CEDACB2CB027E1001B32DE /* MPConvertJS.h in Headers */ = {isa = PBXBuildFile; fileRef = D3CEDAC92CB027E1001B32DE /* MPConvertJS.h */; };
281+
D3CEDACC2CB027E1001B32DF /* MPConvertJS.m in Sources */ = {isa = PBXBuildFile; fileRef = D3CEDACA2CB027E1001B32DF /* MPConvertJS.m */; };
281282
/* End PBXBuildFile section */
282283

283284
/* Begin PBXContainerItemProxy section */
@@ -605,7 +606,8 @@
605606
D3724C182AE02AF60074CD67 /* mParticle_Apple_SDK_NoLocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mParticle_Apple_SDK_NoLocation.h; sourceTree = "<group>"; };
606607
D3B3E2062AE028EC001AB58C /* mParticle_Apple_SDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mParticle_Apple_SDK.h; sourceTree = "<group>"; };
607608
D3BA75152B614E3D008C3C65 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
608-
D3CEDACA2CB027E1001B32DF /* MPConvertJS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPConvertJS.swift; sourceTree = "<group>"; };
609+
D3CEDAC92CB027E1001B32DE /* MPConvertJS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPConvertJS.h; sourceTree = "<group>"; };
610+
D3CEDACA2CB027E1001B32DF /* MPConvertJS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPConvertJS.m; sourceTree = "<group>"; };
609611
/* End PBXFileReference section */
610612

611613
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -891,7 +893,8 @@
891893
D34286082D3806CF00FEC2C8 /* MPUserDefaults.swift */,
892894
D342860E2D419CA700FEC2C8 /* MPUploadSettings.swift */,
893895
53A79B0229CDFB1F00E7489F /* MPMessageBuilder.m */,
894-
D3CEDACA2CB027E1001B32DF /* MPConvertJS.swift */,
896+
D3CEDACA2CB027E1001B32DF /* MPConvertJS.m */,
897+
D3CEDAC92CB027E1001B32DE /* MPConvertJS.h */,
895898
53A79B0929CDFB1F00E7489F /* NSDictionary+MPCaseInsensitive.m */,
896899
D356E0232CFE08ED0020898D /* MPResponseConfig.swift */,
897900
53A79B0D29CDFB1F00E7489F /* MPApplication.m */,
@@ -1279,6 +1282,7 @@
12791282
53A79D5529CE23F700E7489F /* MPPersistenceController.h in Headers */,
12801283
53A79D5829CE23F700E7489F /* MPIdentityDTO.h in Headers */,
12811284
53A79D5929CE23F700E7489F /* MPMessageBuilder.h in Headers */,
1285+
D3CEDACB2CB027E1001B32DE /* MPConvertJS.h in Headers */,
12821286
53A79D5A29CE23F700E7489F /* MPURLRequestBuilder.h in Headers */,
12831287
D3724C192AE02AF60074CD67 /* mParticle_Apple_SDK_NoLocation.h in Headers */,
12841288
53A79D5B29CE23F700E7489F /* MPKitContainer.h in Headers */,
@@ -1584,7 +1588,7 @@
15841588
53A79D7729CE23F700E7489F /* MPKitConfiguration.m in Sources */,
15851589
35C3DE702F2919B40077C0FD /* MPCCPAConsent.m in Sources */,
15861590
53A79D7829CE23F700E7489F /* MPConsentState.m in Sources */,
1587-
D3CEDACC2CB027E1001B32DF /* MPConvertJS.swift in Sources */,
1591+
D3CEDACC2CB027E1001B32DF /* MPConvertJS.m in Sources */,
15881592
53A79D7929CE23F700E7489F /* MPBracket.m in Sources */,
15891593
53A79D7A29CE23F700E7489F /* MParticleUserNotification.m in Sources */,
15901594
531BCF372B28A23400F5C573 /* MPIdentityCaching.m in Sources */,

mParticle-Apple-SDK/Ecommerce/MPPromotion.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#import "MPPromotion.h"
22
#import "MPIConstants.h"
33
#import "NSDictionary+MPCaseInsensitive.h"
4+
#import "mParticle.h"
45
#import "MParticleSwift.h"
56
@import mParticle_Apple_SDK_Swift;
67

mParticle-Apple-SDK/Kits/MPEventProjection.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#import "MPEventProjection.h"
22
#import "MPAttributeProjection.h"
3+
#import "mParticle.h"
34
#import "MParticleSwift.h"
45
@import mParticle_Apple_SDK_Swift;
56

mParticle-Apple-SDK/MPBackendController.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#import "MPKitContainer.h"
2323
#import "MPURLRequestBuilder.h"
2424
#import "MPIdentityCaching.h"
25+
#import "mParticle.h"
2526
#import "MParticleSwift.h"
2627
#import "MPNetworkCommunication.h"
2728
#if TARGET_OS_IOS == 1

mParticle-Apple-SDK/MParticleSession+MParticlePrivate.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#import <Foundation/Foundation.h>
2+
#import "mParticle.h"
3+
14
@interface MParticleSession ()
25

36
- (instancetype)initWithUUID:(NSString *)uuid;

mParticle-Apple-SDK/MParticleSession+MParticlePrivate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#import "MParticleSwift.h"
1+
#import "mParticle.h"
22
#import "MParticleSession+MParticlePrivate.h"
33
@import mParticle_Apple_SDK_Swift;
44

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#import <Foundation/Foundation.h>
2+
#import "MPCommerceEvent.h"
3+
#import "MPPromotion.h"
4+
#import "MPTransactionAttributes.h"
5+
#import "MPProduct.h"
6+
#import "MPIdentityApiRequest.h"
7+
8+
typedef NS_ENUM(NSUInteger, MPJSCommerceEventAction) {
9+
MPJSCommerceEventActionUnknown = 0,
10+
MPJSCommerceEventActionAddToCart,
11+
MPJSCommerceEventActionRemoveFromCart,
12+
MPJSCommerceEventActionCheckout,
13+
MPJSCommerceEventActionCheckoutOptions,
14+
MPJSCommerceEventActionClick,
15+
MPJSCommerceEventActionViewDetail,
16+
MPJSCommerceEventActionPurchase,
17+
MPJSCommerceEventActionRefund,
18+
MPJSCommerceEventActionAddToWishList,
19+
MPJSCommerceEventActionRemoveFromWishlist
20+
};
21+
22+
@interface MPConvertJS_PRIVATE : NSObject
23+
24+
+ (MPCommerceEvent *)commerceEvent:(NSDictionary *)json;
25+
+ (MPPromotionContainer *)promotionContainer:(NSDictionary *)json;
26+
+ (MPPromotion *)promotion:(NSDictionary *)json;
27+
+ (MPTransactionAttributes *)transactionAttributes:(NSDictionary *)json;
28+
+ (MPProduct *)product:(NSDictionary *)json;
29+
+ (MPIdentityApiRequest *)identityApiRequest:(NSDictionary *)json;
30+
31+
@end

0 commit comments

Comments
 (0)