update: 细节调整。

Author: Sven

SwiftJSONModeler For Xcode.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		C92A971E24E5150600C87CCD /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C92A971C24E514FB00C87CCD /* Constants.swift */; };
 		C935B49C24EA24BE00E48231 /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C935B49B24EA24BE00E48231 /* JSONHelper.swift */; };
 		C935B49E24EA56EF00E48231 /* JSONHelperTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C935B49D24EA56EF00E48231 /* JSONHelperTest.swift */; };
+		C935B49F24EA664A00E48231 /* JSONHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C935B49B24EA24BE00E48231 /* JSONHelper.swift */; };
 		C94AFC01241F4AE600389AF3 /* YApiHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C94AFC00241F4AE600389AF3 /* YApiHelper.swift */; };
 		C94AFC04241F4E8A00389AF3 /* YApiObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = C94AFC03241F4E8A00389AF3 /* YApiObject.swift */; };
 		C961C1DE23D82A8D008D0DE6 /* ConfigViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C961C1DD23D82A8D008D0DE6 /* ConfigViewController.swift */; };
@@ -387,6 +388,7 @@
 				C9ED9CE323D7F9D0004567A1 /* SourceEditorCommand.swift in Sources */,
 				C9CEE26D242B382900A04EA9 /* YApiCreator.swift in Sources */,
 				C92A971E24E5150600C87CCD /* Constants.swift in Sources */,
+				C935B49F24EA664A00E48231 /* JSONHelper.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

SwiftJSONModeler For Xcode/JSONHelper.swift

@@ -54,7 +54,7 @@ public struct JSONHelper {
             let arrObjct = YApiObject(parentKey: key, key: key, mock: "", type: type, typeRaw: "Array", des: nil, childs: [objct])
             return arrObjct
         }
-        let arrObjct = YApiObject(parentKey: nil, key: key, mock: "", type: type, typeRaw: "Array", des: nil, childs: [typeOf(nil, value: first)])
+        let arrObjct = YApiObject(parentKey: key, key: key, mock: "", type: type, typeRaw: "Array", des: nil, childs: [typeOf(key, value: first)])
         return arrObjct
     }
     /// 类型数据类型判断
@@ -63,7 +63,7 @@ public struct JSONHelper {
         if value is NSNull {
             print("存在null")
             let type = YApiType.undefined
-            let objct = YApiObject(parentKey: parentKey, key: key, mock: "", type: type, typeRaw: "<#NSNull#>", des: nil, childs: [])
+            let objct = YApiObject(parentKey: parentKey, key: key, mock: "", type: type, typeRaw: "NSNull", des: nil, childs: [])
             return objct
         } else if value is String {
             let type = YApiType.string

SwiftJSONModeler For Xcode/YApi/YApiCreator.swift

@@ -46,6 +46,14 @@ class YApiCreator {
         getPathObject()
     }
 
+    init(invocation: XCSourceEditorCommandInvocation, yapiObject: YApiObject) {
+        self.invocation = invocation
+        self.creatObjects.insert(yapiObject)
+        let buffer = invocation.buffer
+        lines = buffer.lines
+        lineObject(self.creatObjects.first!)
+    }
+    
     private func getPathObject() -> Void {
         objectHelper.aimPath = Config().yapiPath //设置获取data下数据
         guard let object = objectHelper.pathObject else {

SwiftJSONModeler/SourceEditorCommand.swift

@@ -39,7 +39,8 @@ class SourceEditorCommand: NSObject, XCSourceEditorCommand {
             handleInvocation(invocation, raw: pasteboardTest, completionHandler: completionHandler)
 
         } else if commandIdentifier == classFromJSONCommand || commandIdentifier == structFromJSONCommand {
-            handleInvocation(invocation, handler: completionHandler)
+            handleInvocation(invocation, json: pasteboardTest, completionHandler: completionHandler)
+            //handleInvocation(invocation, handler: completionHandler)
         } else if commandIdentifier == classFromYApiIdCommand || commandIdentifier == structFromYApiIdCommand {
             YApiRequest.data(id: pasteboardTest) { [weak self](raw) in
                 if let raw = raw {
@@ -60,7 +61,24 @@ class SourceEditorCommand: NSObject, XCSourceEditorCommand {
         completionHandler(nil)
     }
     /// 通过json 转模
+    private func handleInvocation(_ invocation: XCSourceEditorCommandInvocation, json: String, completionHandler: @escaping (Error?) -> Void) {
+        guard let transformObject = JSONHelper(paste: json).transform() else {
+            completionHandler(nil)
+            return
+        }
+        let yapiCreator = YApiCreator(invocation: invocation,
+                                      yapiObject: transformObject)
+        let models = yapiCreator.getModels()
+        var lines = invocation.buffer.lines
+        lines.addObjects(from: models)
+        importModel(lines: &lines)
+        completionHandler(nil)
+    }
+    
+    
     private func handleInvocation(_ invacation: XCSourceEditorCommandInvocation, handler: (Error?) -> Void) {
+       
+        
         let buffer = invacation.buffer
         var line = buffer.lines
         // importModel(lines: &line)