Attempt to port D2SUI to current ZeeQL

This was using a special index based GID for
sparse arrays somehow.
But the current ZeeQL doesn't support arbitrary
GIDs anymore, essentially just KeyGlobalIDs.

Author: helje5

DirectToSwiftUI.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -1528,7 +1528,7 @@
 			repositoryURL = "https://github.com/ZeeQL/ZeeQL3.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.8.20;
+				minimumVersion = 0.6.16;
 			};
 		};
 		E8F4DF4E233255ED0077B171 /* XCRemoteSwiftPackageReference "ZeeQL3Combine" */ = {

Package.swift

@@ -18,9 +18,9 @@ let package = Package(
     .package(url: "https://github.com/DirectToSwift/SwiftUIRules.git",
              from: "0.2.0"),
     .package(url: "https://github.com/ZeeQL/ZeeQL3.git",
-             from: "0.9.4"),
+             from: "0.9.16"),
     .package(url: "https://github.com/ZeeQL/ZeeQL3Combine.git",
-             from: "0.1.5")
+             from: "0.2.0")
   ],
 
   targets: [

Sources/DirectToSwiftUI/Support/ZeeQL/EntityExtras.swift

@@ -2,7 +2,7 @@
 //  ZeeQLExtras.swift
 //  ApacheExpressAdmin
 //
-//  Copyright © 2017-2019 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2017-2024 ZeeZide GmbH. All rights reserved.
 //
 
 import protocol ZeeQL.Entity
@@ -192,14 +192,13 @@ extension Entity {
    * the property keys.
    */
   func prefetchPathesForPropertyKeys<S: Sequence>(_ propertyKeys: S)
-    -> [ String ]? where S.Element == String
+    -> [ String ] where S.Element == String
   {
     var pathes = Set<String>()
     for propertyKey in propertyKeys {
       insertPrefetchPathesForPropertyKey(propertyKey, into: &pathes)
     }
-    if pathes.isEmpty { return nil }
-    return Array(pathes)
+    return pathes.sorted()
   }
 
   private func insertPrefetchPathesForPropertyKey(_ propertyKey: String,

Sources/DirectToSwiftUI/ViewModel/SparseFaultArray.swift

@@ -62,7 +62,8 @@ public struct SparseFaultArray<Object: AnyObject, Resolver: D2SFaultResolver> {
     assert(knownObjects.count <= count)
     assert(knownObjects.count > position)
   }
-  
+
+  #if false // no index GIDs anymore
   @inline(__always)
   fileprivate func makeGlobalID(for index: Int) -> GlobalID {
     IndexGlobalID.make(index)
@@ -71,6 +72,7 @@ public struct SparseFaultArray<Object: AnyObject, Resolver: D2SFaultResolver> {
   fileprivate func makeFault(for index: Int) -> Element {
     return D2SFault(makeGlobalID(for: index), resolver!)
   }
+  #endif
 
   public subscript(globalID: GlobalID) -> Object? {
     return objects[globalID]
@@ -128,37 +130,3 @@ extension SparseFaultArray {
     }
   }
 }
-
-internal final class IndexGlobalID : GlobalID {
-  
-  private static let sharedIndexGIDs : [ IndexGlobalID ] = { // prealloc some
-    (0...50).map(IndexGlobalID.init)
-  }()
-  
-  // TBD: we _could_ scope by something.
-  public let index : Int
-  
-  @inlinable
-  public static func make(_ index: Int) -> IndexGlobalID {
-    return index < IndexGlobalID.sharedIndexGIDs.count
-      ? IndexGlobalID.sharedIndexGIDs[index]
-      : IndexGlobalID(index)
-  }
-  
-  private init(_ index: Int) {
-    self.index = index
-  }
-  
-  override func isEqual(to object: Any?) -> Bool {
-    guard let gid = object as? IndexGlobalID else { return false }
-    return gid == self
-  }
-  
-  override func hash(into hasher: inout Hasher) {
-    index.hash(into: &hasher)
-  }
-  
-  public static func ==(lhs: IndexGlobalID, rhs: IndexGlobalID) -> Bool {
-    return lhs.index == rhs.index
-  }
-}