feat: added support for taxonomy

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: "Contentstack CI"
 
 on:
   push:
-    branches: [ master, development ]
+    branches: [ master, next ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, next ]
 
 jobs:
   macOS:

.github/workflows/sca-scan.yml

@@ -11,4 +11,4 @@ jobs:
       - name: Run Snyk to check for vulnerabilities
         run: snyk test --all-projects --fail-on=all
         env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.gitignore

@@ -73,4 +73,7 @@ fastlane/screenshots/**/*.png
 fastlane/test_output
 
 TestCase
-docs
+docs
+
+fastlane/
+Gemfile

.swiftpm/xcode/package.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<true/>
+</dict>
+</plist>

.swiftpm/xcode/xcshareddata/xcschemes/ContentstackTests.xcscheme

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "2.2">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <AutocreatedTestPlanReference>
+            </AutocreatedTestPlanReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ContentstackTests"
+               BuildableName = "ContentstackTests"
+               BlueprintName = "ContentstackTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "ContentstackTests"
+            BuildableName = "ContentstackTests"
+            BlueprintName = "ContentstackTests"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

.talismanrc

@@ -17,6 +17,11 @@ fileignoreconfig:
   checksum: a1c17f932d0b00df127851f50456923546ee912ba9b4d60d1f244768d61b858d
 - filename: Tests/DVRRecordings/SyncTest.json
   checksum: e5148d9f58da7689f249969c25a0c36d6d9f26be062a2c6bd9aaf389118f0039
+- filename: Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS.xcscheme
+  checksum: 10ca4b0b986ae6166f69d7f985ca5b06238ac70dac3dd378fbf3dbdfd966afff
+- filename: Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme
+  checksum: c439f6d268ae2ea0af023daeffdff2af5928d0610f90fa14c9e6e6ce7e4b3fad
+version: ""
 
 
 

Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0F4A75D2241BAC4300E3A024"
+               BuildableName = "Contentstack iOS Tests.xctest"
+               BlueprintName = "Contentstack iOS Tests"
+               ReferencedContainer = "container:Contentstack.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      consoleMode = "0"
+      structuredConsoleMode = "1">
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme

@@ -24,8 +24,8 @@
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>

Package.swift

@@ -7,10 +7,10 @@ import PackageDescription
 
 let package = Package(
     name: "ContentstackSwift",
-    platforms: [.macOS(.v10_13),
-                .iOS(.v11),
-                .tvOS(.v11),
-                .watchOS(.v4)],
+    platforms: [.macOS(.v10_15),
+                .iOS(.v13),
+                .tvOS(.v13),
+                .watchOS(.v6)],
 
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.

Sources/ContentstackResponse.swift

@@ -81,6 +81,15 @@ where ItemType: EndpointAccessible & Decodable {
                 }
                 self.items = [entry]
             }
+        case .taxnomies:
+            if let taxonomies = try container.decodeIfPresent([ItemType].self, forKey: .entries) {
+                let containerFields = try decoder.container(keyedBy: JSONCodingKeys.self)
+                let response = try containerFields.decode(Dictionary<String, Any>.self)
+                if let contentType = response["content_type"] as? ContentTypeModel {
+                    fields = ["content_type": contentType]
+                }
+                self.items = taxonomies
+            }
         default:
             print("sync")
         }

Sources/EndPoint.swift

@@ -20,6 +20,8 @@ public enum Endpoint: String {
     case assets
     /// The synchronization endpoint.
     case sync = "stacks/sync"
+
+    case taxnomies = "taxonomies"
     /// The path component string for the current endpoint.
     public var pathComponent: String {
         return rawValue

Sources/Query.swift

@@ -12,7 +12,7 @@ public class Query: BaseQuery, EntryQueryable {
 
     public typealias ResourceType = EntryModel
 
-    internal var contentTypeUid: String
+    internal var contentTypeUid: String?
     /// Stack instance for Entry to be fetched
     public var stack: Stack
     /// URI Parameters
@@ -23,11 +23,16 @@ public class Query: BaseQuery, EntryQueryable {
     public var cachePolicy: CachePolicy
 
 
-    internal required init(contentType: ContentType) {
-        self.stack = contentType.stack
-        self.contentTypeUid = contentType.uid!
-        self.cachePolicy = contentType.cachePolicy
-        self.parameters[QueryParameter.contentType] = contentTypeUid
+    internal required init(contentType: ContentType?, stack: Stack? = nil, cachePolicy: CachePolicy? = nil) {
+        if let contentType = contentType {
+            self.stack = contentType.stack
+            self.contentTypeUid = contentType.uid!
+            self.cachePolicy = contentType.cachePolicy
+            self.parameters[QueryParameter.contentType] = contentTypeUid
+        } else {
+            self.stack = stack!
+            self.cachePolicy = cachePolicy!
+        }
     }
 
     /// Use this method to do a search on `Entries` which enables

Sources/QueryOperation.swift

@@ -85,6 +85,10 @@ extension Query {
         case exists(Bool)
         /// Search on a field by Regex. <https://www.contentstack.com/docs/developers/apis/content-delivery-api/#search-by-regex>
         case matches(String)
+        case eqBelow(String)
+        case below(String)
+        case eqAbove(String)
+        case above(String)
 
         internal var string: String {
             switch self {
@@ -98,6 +102,10 @@ extension Query {
             case .isGreaterThanOrEqual:     return "$gte"
             case .exists:                   return "$exists"
             case .matches:                  return "$regex"
+            case .eqBelow:                  return "$eq_below"
+            case .below:                    return "$below"
+            case .eqAbove:                  return "$eq_above"
+            case .above:                    return "$above"
             }
         }
 
@@ -137,6 +145,10 @@ extension Query {
                 return value.stringValue
             case .exists(let value):                return value
             case .matches(let value):               return value
+            case .eqBelow(let value):               return value
+            case .below(let value):                 return value
+            case .eqAbove(let value):               return value
+            case .above(let value):                 return value
             }
         }
         internal var query: Any {

Sources/QueryParameter.swift

@@ -31,6 +31,8 @@ internal enum QueryParameter {
     internal static let tags             = "tags"
 
     internal static let contentType      = "content_type"
+
+    internal static let taxonomies       = "taxonomies"
 
     internal static let uid              = "uid"
 

Sources/QueryProtocols.swift

@@ -65,19 +65,20 @@ extension BaseQuery {
     ///    }
     /// }
     /// ```
+    /// 
     public func find<ResourceType>(_ completion: @escaping ResultsHandler<ContentstackResponse<ResourceType>>)
-        where ResourceType: Decodable & EndpointAccessible {
-            if self.queryParameter.count > 0,
-                let query = self.queryParameter.jsonString {
-                self.parameters[QueryParameter.query] = query
-            }
-            self.stack.fetch(endpoint: ResourceType.endpoint,
-                    cachePolicy: self.cachePolicy, parameters: parameters, headers: headers, then: completion)
+    where ResourceType: Decodable & EndpointAccessible {
+        if self.queryParameter.count > 0,
+            let query = self.queryParameter.jsonString {
+            self.parameters[QueryParameter.query] = query
+        }
+        self.stack.fetch(endpoint: ResourceType.endpoint,
+                cachePolicy: self.cachePolicy, parameters: parameters, headers: headers, then: completion)
     }
 }
 /// A concrete implementation of BaseQuery which serves as the base class for `Query`,
 /// `ContentTypeQuery` and `AssetQuery`.
-public protocol BaseQuery: QueryProtocol, Queryable {}
+public protocol BaseQuery: QueryProtocol {}
 extension BaseQuery {
     /// Method to adding Query.Operation to a Query/
     /// - Parameters: