Skip to content

Commit 67b7e57

Browse files
CoderMJLeeCoderMJLee
committed
change 'kk' to 'kj'
1 parent 90f137d commit 67b7e57

35 files changed

+646
-625
lines changed

‎KakaJSON.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
/* Begin PBXBuildFile section */
1010
2D0575832308F41400810526 /* CompareWithCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D0575822308F41400810526 /* CompareWithCodable.swift */; };
11-
2D0AC2B523099A4B00992F29 /* Data+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D0AC2B423099A4B00992F29 /* Data+KK.swift */; };
11+
2D0AC2B523099A4B00992F29 /* Data+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D0AC2B423099A4B00992F29 /* Data+KJ.swift */; };
1212
2D0DD8682306785E00937EF2 /* JTM_02_DataType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D0DD8672306785E00937EF2 /* JTM_02_DataType.swift */; };
13-
2D5253AE2305461300F854D9 /* NSObject+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5253AD2305461300F854D9 /* NSObject+KK.swift */; };
13+
2D5253AE2305461300F854D9 /* NSObject+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5253AD2305461300F854D9 /* NSObject+KJ.swift */; };
1414
2D5875C82301B6E4001A809B /* MTJ_02_NestedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5875C72301B6E4001A809B /* MTJ_02_NestedModel.swift */; };
1515
2D5875CA2301C2C4001A809B /* MTJ_03_ModelArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5875C92301C2C4001A809B /* MTJ_03_ModelArray.swift */; };
1616
2D5875CC2301C49D001A809B /* MTJ_04_KeyMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5875CB2301C49D001A809B /* MTJ_04_KeyMapping.swift */; };
@@ -30,13 +30,13 @@
3030
2D92DDAE230126BD00A96858 /* JTM_06_CustomValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDA7230126BD00A96858 /* JTM_06_CustomValue.swift */; };
3131
2D92DDDE2301279E00A96858 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB02301279E00A96858 /* Logger.swift */; };
3232
2D92DDDF2301279E00A96858 /* Convertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB12301279E00A96858 /* Convertible.swift */; };
33-
2D92DDE02301279E00A96858 /* KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB22301279E00A96858 /* KK.swift */; };
33+
2D92DDE02301279E00A96858 /* KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB22301279E00A96858 /* KJ.swift */; };
3434
2D92DDE42301279E00A96858 /* KakaJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB62301279E00A96858 /* KakaJSON.swift */; };
35-
2D92DDE52301279E00A96858 /* Pointer+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB82301279E00A96858 /* Pointer+KK.swift */; };
36-
2D92DDE62301279E00A96858 /* Dictionary+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB92301279E00A96858 /* Dictionary+KK.swift */; };
37-
2D92DDE72301279E00A96858 /* String+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBA2301279E00A96858 /* String+KK.swift */; };
38-
2D92DDE82301279E00A96858 /* Optional+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBB2301279E00A96858 /* Optional+KK.swift */; };
39-
2D92DDE92301279E00A96858 /* JSONSerialization+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBC2301279E00A96858 /* JSONSerialization+KK.swift */; };
35+
2D92DDE52301279E00A96858 /* Pointer+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB82301279E00A96858 /* Pointer+KJ.swift */; };
36+
2D92DDE62301279E00A96858 /* Dictionary+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDB92301279E00A96858 /* Dictionary+KJ.swift */; };
37+
2D92DDE72301279E00A96858 /* String+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBA2301279E00A96858 /* String+KJ.swift */; };
38+
2D92DDE82301279E00A96858 /* Optional+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBB2301279E00A96858 /* Optional+KJ.swift */; };
39+
2D92DDE92301279E00A96858 /* JSONSerialization+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBC2301279E00A96858 /* JSONSerialization+KJ.swift */; };
4040
2D92DDEA2301279E00A96858 /* Metadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBE2301279E00A96858 /* Metadata.swift */; };
4141
2D92DDEB2301279E00A96858 /* Property.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDBF2301279E00A96858 /* Property.swift */; };
4242
2D92DDEC2301279E00A96858 /* FieldList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDC12301279E00A96858 /* FieldList.swift */; };
@@ -67,7 +67,7 @@
6767
2D92DE052301279E00A96858 /* EnumDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDDC2301279E00A96858 /* EnumDescriptor.swift */; };
6868
2D92DE062301279E00A96858 /* StructDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D92DDDD2301279E00A96858 /* StructDescriptor.swift */; };
6969
2D9BB49523012CEA00E04DB9 /* JTM_07_DynamicModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D9BB49423012CEA00E04DB9 /* JTM_07_DynamicModel.swift */; };
70-
2DCEB38D230175AC0030701B /* Array+KK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DCEB38C230175AC0030701B /* Array+KK.swift */; };
70+
2DCEB38D230175AC0030701B /* Array+KJ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DCEB38C230175AC0030701B /* Array+KJ.swift */; };
7171
/* End PBXBuildFile section */
7272

7373
/* Begin PBXContainerItemProxy section */
@@ -82,10 +82,10 @@
8282

8383
/* Begin PBXFileReference section */
8484
2D0575822308F41400810526 /* CompareWithCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompareWithCodable.swift; sourceTree = "<group>"; };
85-
2D0AC2B423099A4B00992F29 /* Data+KK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+KK.swift"; sourceTree = "<group>"; };
85+
2D0AC2B423099A4B00992F29 /* Data+KJ.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+KJ.swift"; sourceTree = "<group>"; };
8686
2D0DD8672306785E00937EF2 /* JTM_02_DataType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JTM_02_DataType.swift; sourceTree = "<group>"; };
8787
2D0EAA0E2303C0EB000691AC /* DevGuidline.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DevGuidline.h; sourceTree = "<group>"; };
88-
2D5253AD2305461300F854D9 /* NSObject+KK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+KK.swift"; sourceTree = "<group>"; };
88+
2D5253AD2305461300F854D9 /* NSObject+KJ.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+KJ.swift"; sourceTree = "<group>"; };
8989
2D5875C72301B6E4001A809B /* MTJ_02_NestedModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MTJ_02_NestedModel.swift; sourceTree = "<group>"; };
9090
2D5875C92301C2C4001A809B /* MTJ_03_ModelArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MTJ_03_ModelArray.swift; sourceTree = "<group>"; };
9191
2D5875CB2301C49D001A809B /* MTJ_04_KeyMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MTJ_04_KeyMapping.swift; sourceTree = "<group>"; };
@@ -110,13 +110,13 @@
110110
2D92DDA7230126BD00A96858 /* JTM_06_CustomValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JTM_06_CustomValue.swift; sourceTree = "<group>"; };
111111
2D92DDB02301279E00A96858 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
112112
2D92DDB12301279E00A96858 /* Convertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Convertible.swift; sourceTree = "<group>"; };
113-
2D92DDB22301279E00A96858 /* KK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KK.swift; sourceTree = "<group>"; };
113+
2D92DDB22301279E00A96858 /* KJ.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KJ.swift; sourceTree = "<group>"; };
114114
2D92DDB62301279E00A96858 /* KakaJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KakaJSON.swift; sourceTree = "<group>"; };
115-
2D92DDB82301279E00A96858 /* Pointer+KK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Pointer+KK.swift"; sourceTree = "<group>"; };
116-
2D92DDB92301279E00A96858 /* Dictionary+KK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+KK.swift"; sourceTree = "<group>"; };
117-
2D92DDBA2301279E00A96858 /* String+KK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+KK.swift"; sourceTree = "<group>"; };
118-
2D92DDBB2301279E00A96858 /* Optional+KK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Optional+KK.swift"; sourceTree = "<group>"; };
119-
2D92DDBC2301279E00A96858 /* JSONSerialization+KK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JSONSerialization+KK.swift"; sourceTree = "<group>"; };
115+
2D92DDB82301279E00A96858 /* Pointer+KJ.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Pointer+KJ.swift"; sourceTree = "<group>"; };
116+
2D92DDB92301279E00A96858 /* Dictionary+KJ.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+KJ.swift"; sourceTree = "<group>"; };
117+
2D92DDBA2301279E00A96858 /* String+KJ.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+KJ.swift"; sourceTree = "<group>"; };
118+
2D92DDBB2301279E00A96858 /* Optional+KJ.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Optional+KJ.swift"; sourceTree = "<group>"; };
119+
2D92DDBC2301279E00A96858 /* JSONSerialization+KJ.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "JSONSerialization+KJ.swift"; sourceTree = "<group>"; };
120120
2D92DDBE2301279E00A96858 /* Metadata.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metadata.swift; sourceTree = "<group>"; };
121121
2D92DDBF2301279E00A96858 /* Property.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Property.swift; sourceTree = "<group>"; };
122122
2D92DDC12301279E00A96858 /* FieldList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FieldList.swift; sourceTree = "<group>"; };
@@ -147,7 +147,7 @@
147147
2D92DDDC2301279E00A96858 /* EnumDescriptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumDescriptor.swift; sourceTree = "<group>"; };
148148
2D92DDDD2301279E00A96858 /* StructDescriptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StructDescriptor.swift; sourceTree = "<group>"; };
149149
2D9BB49423012CEA00E04DB9 /* JTM_07_DynamicModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JTM_07_DynamicModel.swift; sourceTree = "<group>"; };
150-
2DCEB38C230175AC0030701B /* Array+KK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+KK.swift"; sourceTree = "<group>"; };
150+
2DCEB38C230175AC0030701B /* Array+KJ.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+KJ.swift"; sourceTree = "<group>"; };
151151
/* End PBXFileReference section */
152152

153153
/* Begin PBXFrameworksBuildPhase section */
@@ -247,7 +247,7 @@
247247
2D92DDB12301279E00A96858 /* Convertible.swift */,
248248
2D645D3E23058B2500046636 /* ConvertibleConfig.swift */,
249249
2D645BA223029A0400075A9E /* ConvertibleEnum.swift */,
250-
2D92DDB22301279E00A96858 /* KK.swift */,
250+
2D92DDB22301279E00A96858 /* KJ.swift */,
251251
2D645BA02302995100075A9E /* TypeProxy.swift */,
252252
);
253253
path = JSON;
@@ -256,14 +256,14 @@
256256
2D92DDB72301279E00A96858 /* Extension */ = {
257257
isa = PBXGroup;
258258
children = (
259-
2D92DDB82301279E00A96858 /* Pointer+KK.swift */,
260-
2D92DDB92301279E00A96858 /* Dictionary+KK.swift */,
261-
2D92DDBA2301279E00A96858 /* String+KK.swift */,
262-
2D92DDBB2301279E00A96858 /* Optional+KK.swift */,
263-
2D92DDBC2301279E00A96858 /* JSONSerialization+KK.swift */,
264-
2DCEB38C230175AC0030701B /* Array+KK.swift */,
265-
2D5253AD2305461300F854D9 /* NSObject+KK.swift */,
266-
2D0AC2B423099A4B00992F29 /* Data+KK.swift */,
259+
2D92DDB82301279E00A96858 /* Pointer+KJ.swift */,
260+
2D92DDB92301279E00A96858 /* Dictionary+KJ.swift */,
261+
2D92DDBA2301279E00A96858 /* String+KJ.swift */,
262+
2D92DDBB2301279E00A96858 /* Optional+KJ.swift */,
263+
2D92DDBC2301279E00A96858 /* JSONSerialization+KJ.swift */,
264+
2DCEB38C230175AC0030701B /* Array+KJ.swift */,
265+
2D5253AD2305461300F854D9 /* NSObject+KJ.swift */,
266+
2D0AC2B423099A4B00992F29 /* Data+KJ.swift */,
267267
);
268268
path = Extension;
269269
sourceTree = "<group>";
@@ -450,21 +450,21 @@
450450
2D92DE012301279E00A96858 /* ObjCClassType.swift in Sources */,
451451
2D92DDFB2301279E00A96858 /* StructType.swift in Sources */,
452452
2D92DDEB2301279E00A96858 /* Property.swift in Sources */,
453-
2D92DDE92301279E00A96858 /* JSONSerialization+KK.swift in Sources */,
453+
2D92DDE92301279E00A96858 /* JSONSerialization+KJ.swift in Sources */,
454454
2D92DDF52301279E00A96858 /* TupleType.swift in Sources */,
455455
2D92DE032301279E00A96858 /* Descriptor.swift in Sources */,
456456
2D92DDDE2301279E00A96858 /* Logger.swift in Sources */,
457-
2DCEB38D230175AC0030701B /* Array+KK.swift in Sources */,
457+
2DCEB38D230175AC0030701B /* Array+KJ.swift in Sources */,
458458
2D645BA323029A0400075A9E /* ConvertibleEnum.swift in Sources */,
459459
2D92DDDF2301279E00A96858 /* Convertible.swift in Sources */,
460460
2D92DDFD2301279E00A96858 /* Kind.swift in Sources */,
461461
2D92DDFE2301279E00A96858 /* OptionalType.swift in Sources */,
462462
2D92DDFC2301279E00A96858 /* MetaType.swift in Sources */,
463-
2D92DDE82301279E00A96858 /* Optional+KK.swift in Sources */,
463+
2D92DDE82301279E00A96858 /* Optional+KJ.swift in Sources */,
464464
2D92DDF42301279E00A96858 /* StructLayout.swift in Sources */,
465-
2D0AC2B523099A4B00992F29 /* Data+KK.swift in Sources */,
466-
2D5253AE2305461300F854D9 /* NSObject+KK.swift in Sources */,
467-
2D92DDE62301279E00A96858 /* Dictionary+KK.swift in Sources */,
465+
2D0AC2B523099A4B00992F29 /* Data+KJ.swift in Sources */,
466+
2D5253AE2305461300F854D9 /* NSObject+KJ.swift in Sources */,
467+
2D92DDE62301279E00A96858 /* Dictionary+KJ.swift in Sources */,
468468
2D92DDEA2301279E00A96858 /* Metadata.swift in Sources */,
469469
2D645D3F23058B2500046636 /* ConvertibleConfig.swift in Sources */,
470470
2D645BA12302995100075A9E /* TypeProxy.swift in Sources */,
@@ -475,14 +475,14 @@
475475
2D92DDF72301279E00A96858 /* FunctionType.swift in Sources */,
476476
2D92DE002301279E00A96858 /* EnumType.swift in Sources */,
477477
2D92DDFF2301279E00A96858 /* BaseType.swift in Sources */,
478-
2D92DDE72301279E00A96858 /* String+KK.swift in Sources */,
478+
2D92DDE72301279E00A96858 /* String+KJ.swift in Sources */,
479479
2D92DDE42301279E00A96858 /* KakaJSON.swift in Sources */,
480480
2D92DDF92301279E00A96858 /* ProtocolType.swift in Sources */,
481-
2D92DDE02301279E00A96858 /* KK.swift in Sources */,
481+
2D92DDE02301279E00A96858 /* KJ.swift in Sources */,
482482
2D92DDEC2301279E00A96858 /* FieldList.swift in Sources */,
483483
2D92DDF12301279E00A96858 /* Layout.swift in Sources */,
484484
2D92DDFA2301279E00A96858 /* ClassType.swift in Sources */,
485-
2D92DDE52301279E00A96858 /* Pointer+KK.swift in Sources */,
485+
2D92DDE52301279E00A96858 /* Pointer+KJ.swift in Sources */,
486486
2D92DE062301279E00A96858 /* StructDescriptor.swift in Sources */,
487487
2D92DDF02301279E00A96858 /* TupleLayout.swift in Sources */,
488488
2D92DDF82301279E00A96858 /* Type.swift in Sources */,

‎KakaJSON.xcodeproj/xcshareddata/xcschemes/KakaJSON.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26-
buildConfiguration = "Debug"
26+
buildConfiguration = "Release"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">

‎KakaJSON/DevGuidline.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
2. NamingConvention
1212
① public extension for system types、model types
13-
- obj.kk.memberName
14-
- e.g. "123".kk.numberCount, model.kk.JSON()
13+
- obj.kj.memberName
14+
- e.g. "123".kj.numberCount, model.kj.JSON()
1515

1616
② internal extension for system types、model types
17-
- obj.kk_memberName
18-
- e.g. "123".kk_numberCount, model.kk_JSON()
17+
- obj.kj_memberName
18+
- e.g. "123".kj_numberCount, model.kj_JSON()
1919

2020
③ private\fileprivate
2121
- obj._memberName
@@ -31,12 +31,12 @@
3131

3232
2. 命名规范
3333
① 给模型类型、系统自带类型，扩展public的成员
34-
- obj.kk.成员名称
35-
- 比如 "123".kk.numberCount, model.kk.JSON()
34+
- obj.kj.成员名称
35+
- 比如 "123".kj.numberCount, model.kj.JSON()
3636

3737
② 给模型类型、系统自带类型，扩展internal的成员
38-
- obj.kk_成员名称
39-
- 比如 "123".kk_numberCount, model.kk_JSON()
38+
- obj.kj_成员名称
39+
- 比如 "123".kj_numberCount, model.kj_JSON()
4040

4141
③ private\fileprivate的成员
4242
- obj._成员名称

‎KakaJSON/Extension/Array+KK.swift‎ renamed to ‎KakaJSON/Extension/Array+KJ.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Array+KK.swift
2+
// Array+KJ.swift
33
// KakaJSON
44
//
55
// Created by MJ Lee on 2019/8/12.
@@ -8,12 +8,12 @@
88

99
import Foundation
1010

11-
extension NSArray: KKCompatible {}
12-
extension Array: KKCompatible {}
13-
extension Set: KKCompatible {}
14-
extension NSSet: KKCompatible {}
11+
extension NSArray: KJCompatible {}
12+
extension Array: KJCompatible {}
13+
extension Set: KJCompatible {}
14+
extension NSSet: KJCompatible {}
1515

16-
public extension KK where Base: ExpressibleByArrayLiteral & Sequence {
16+
public extension KJ where Base: ExpressibleByArrayLiteral & Sequence {
1717
/// JSONObjectArray -> ModelArray
1818
func modelArray<M: Convertible>(_ type: M.Type) -> [M]? {
1919
return modelArray(anyType: type) as? [M]
@@ -27,9 +27,9 @@ public extension KK where Base: ExpressibleByArrayLiteral & Sequence {
2727
else { return nil }
2828
let arr = base.compactMap { element -> Any? in
2929
switch element {
30-
case let dict as [String: Any]: return dict.kk_fastModel(t)
31-
case let dict as Data: return dict.kk_fastModel(t)
32-
case let dict as String: return dict.kk_fastModel(t)
30+
case let dict as [String: Any]: return dict.kj_fastModel(t)
31+
case let dict as Data: return dict.kj_fastModel(t)
32+
case let dict as String: return dict.kj_fastModel(t)
3333
default: return nil
3434
}
3535
}
@@ -39,19 +39,19 @@ public extension KK where Base: ExpressibleByArrayLiteral & Sequence {
3939
/// ModelArray -> JSONObjectArray
4040
func JSONObjectArray() -> [[String: Any]]? {
4141
let arr = base.compactMap { element -> [String: Any]? in
42-
(element~! as? Convertible)?.kk_JSONObject()
42+
(element~! as? Convertible)?.kj_JSONObject()
4343
}
4444
return arr.isEmpty ? nil : arr
4545
}
4646

4747
/// Array -> JSONArray
4848
func JSONArray() -> [Any]? {
49-
return base~?.kk_JSON() as? [Any]
49+
return base~?.kj_JSON() as? [Any]
5050
}
5151

5252
/// Array -> JSONArray
5353
func JSONString(prettyPrinted: Bool = false) -> String? {
54-
if let str = JSONSerialization.kk_string(JSONArray(),
54+
if let str = JSONSerialization.kj_string(JSONArray(),
5555
prettyPrinted: prettyPrinted) {
5656
return str
5757
}

0 commit comments

Comments
 (0)