Squashed commit of the following:

commit de0920ec06e003973392482a434e4dfd9a1c235e Author: liyao.ryan <[email protected]> Date: Fri Aug 20 19:40:29 2021 +0800 [Fixed] debug-ios didn't work when using ark
MBoxPlus · Aug 24, 2021 · 9cde8c3 · 9cde8c3
1 parent 35db1c6
commit 9cde8c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Native/MBoxWorkspace/CLI/Exec.swift b/Native/MBoxWorkspace/CLI/Exec.swift
@@ -90,7 +90,10 @@ extension MBCommander {
 
         dynamic
         open func reposToRun() -> [MBConfig.Repo] {
-            let repos = self.config.currentFeature.repos
+            return self.filterRepos(repos: self.config.currentFeature.repos)
+        }
+
+        open func filterRepos(repos: [MBConfig.Repo]) -> [MBConfig.Repo] {
             if self.inRepos == nil && self.noRepos == nil { return repos }
             return repos.filter { repo -> Bool in
                 return (self.inRepos?.any(matching: { repo.isName($0) }) ?? true) &&

diff --git a/Native/MBoxWorkspace/CLI/Feature/import.swift b/Native/MBoxWorkspace/CLI/Feature/import.swift
@@ -68,10 +68,15 @@ extension MBCommander.Feature {
         dynamic
         open override func validate() throws {
             try super.validate()
-            self.feature = try MBConfig.Feature.load(fromString: self.json, coder: .json)
+            self.feature = try self.buildFeature(fromString: self.json)
             try self.validateBranch()
         }
 
+        dynamic
+        open func buildFeature(fromString string: String) throws -> MBConfig.Feature {
+            return try MBConfig.Feature.load(fromString: string, coder: .json)
+        }
+
         open func setupName() throws {
             if let name = self.name {
                 self.feature.name = name

diff --git a/Native/MBoxWorkspaceCore/Model/MBConfig.Feature+Repo.swift b/Native/MBoxWorkspaceCore/Model/MBConfig.Feature+Repo.swift
@@ -50,6 +50,7 @@ extension MBConfig.Feature {
     }
 
     @discardableResult
+    dynamic
     open func merge(feature: MBConfig.Feature) -> [MBConfig.Repo] {
         var addedRepos = [MBConfig.Repo]()
         feature.repos.forEach { repo in