Merge branch 'develop' into master

helje5 · helje5 · commit 164da346abdc · 2020-10-21T13:49:34.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -71,4 +71,5 @@ fastlane/test_output
 .DS_Store
 Package.resolved
 .docker.build
+.swiftpm
 
diff --git a/.travis.yml b/.travis.yml
@@ -20,5 +20,6 @@ script:
     - export PATH="$HOME/usr/bin:$PATH"
     - swift build -c release
     - swift build -c debug
+    - set -o pipefail
     - xcodebuild -scheme DirectToSwiftUI-All -configuration Debug   -target DirectToSwiftUI-All | xcpretty
     - xcodebuild -scheme DirectToSwiftUI-All -configuration Release -target DirectToSwiftUI-All | xcpretty
diff --git a/DirectToSwiftUI.xcodeproj/project.pbxproj b/DirectToSwiftUI.xcodeproj/project.pbxproj
@@ -945,7 +945,7 @@
 		E8F4DF332332510C0077B171 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "ZeeZide GmbH";
 				TargetAttributes = {
 					E8F4DF3A2332510C0077B171 = {
@@ -1346,6 +1346,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_TESTABILITY = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1366,10 +1367,12 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = "";
+				SWIFT_COMPILATION_MODE = wholemodule;
 			};
 			name = Release;
 		};
diff --git a/DirectToSwiftUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/DirectToSwiftUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/DirectToSwiftUI.xcodeproj/xcshareddata/xcschemes/DirectToSwiftUI-Mac.xcscheme b/DirectToSwiftUI.xcodeproj/xcshareddata/xcschemes/DirectToSwiftUI-Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/DirectToSwiftUI.xcodeproj/xcshareddata/xcschemes/DirectToSwiftUI-Mobile.xcscheme b/DirectToSwiftUI.xcodeproj/xcshareddata/xcschemes/DirectToSwiftUI-Mobile.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/DirectToSwiftUI.xcodeproj/xcshareddata/xcschemes/DirectToSwiftUI-Watch.xcscheme b/DirectToSwiftUI.xcodeproj/xcshareddata/xcschemes/DirectToSwiftUI-Watch.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/README.md b/README.md
@@ -11,6 +11,29 @@
 
 _Going fully declarative_: Direct to SwiftUI.
 
+**Direct to SwiftUI**
+is an adaption of an old 
+[WebObjects](https://en.wikipedia.org/wiki/WebObjects) 
+technology called 
+[Direct to Web](https://developer.apple.com/library/archive/documentation/WebObjects/Developing_With_D2W/WalkThrough/WalkThrough.html#//apple_ref/doc/uid/TP30001015-DontLinkChapterID_5-TPXREF101).
+This time for Apple's new framework:
+[SwiftUI](https://developer.apple.com/xcode/swiftui/).
+Instant 
+[CRUD](https://en.wikipedia.org/wiki/Create,_read,_update_and_delete)
+apps, configurable using 
+[a declarative rule system](http://www.alwaysrightinstitute.com/swiftuirules/),
+yet fully integrated with SwiftUI.
+
+There is a blog entry explaining how to use this:
+[Introducing Direct to SwiftUI](http://www.alwaysrightinstitute.com/directtoswiftui/).
+
+A Direct to SwiftUI variant using 
+[CoreData](https://developer.apple.com/documentation/coredata)
+instead of
+[ZeeQL](http://zeeql.io)
+can be found over here:
+[CoreDataToSwiftUI](https://github.com/DirectToSwift/CoreDataToSwiftUI).
+
 ## Requirements
 
 Direct to SwiftUI requires an environment capable to run SwiftUI.
@@ -37,6 +60,30 @@ The package URL is:
 - [Views](Sources/DirectToSwiftUI/Views/README.md)
 - [Database Setup](Sources/DirectToSwiftUI/DatabaseSetup.md)
 
+## What it looks like
+
+A demo application using the Sakila database is provided:
+[DVDRental](https://github.com/DirectToSwift/DVDRental).
+
+### Watch
+
+<p float="left" valign="top">
+<img width="200" src="http://www.alwaysrightinstitute.com/images/d2s/watchos-screenshots/01-homepage.png?v=2">
+<img width="200" src="http://www.alwaysrightinstitute.com/images/d2s/watchos-screenshots/02-customers.png?v=2">
+<img width="200" src="http://www.alwaysrightinstitute.com/images/d2s/watchos-screenshots/03-customer.png?v=2">
+<img width="200" src="http://www.alwaysrightinstitute.com/images/d2s/watchos-screenshots/04-movies.png?v=2">
+</p>
+
+### Phone
+
+<p float="left" valign="top">
+<img width="320" src="http://www.alwaysrightinstitute.com/images/d2s/limited-entities.png">
+<img width="320" src="http://www.alwaysrightinstitute.com/images/d2s/list-customer-default.png">
+</p>
+
+### macOS
+
+Still too ugly to show, but works in a very restricted way ;-) 
 
 ## Who
 
diff --git a/Sources/DirectToSwiftUI/Environment/EnvironmentKeys.swift b/Sources/DirectToSwiftUI/Environment/EnvironmentKeys.swift
@@ -27,14 +27,14 @@ public extension D2SKeys {
 
   struct debug: DynamicEnvironmentKey {
     #if DEBUG
-      public static var defaultValue = true
+      public static let defaultValue = true
     #else
-      public static var defaultValue = false
+      public static let defaultValue = false
     #endif
   }
 
   struct database: DynamicEnvironmentKey {
-    public static var defaultValue : Database = D2SDummyDatabase()
+    public static let defaultValue : Database = D2SDummyDatabase()
   }
   
   struct firstTask: DynamicEnvironmentKey {
@@ -51,7 +51,7 @@ public extension D2SKeys {
   struct object: DynamicEnvironmentKey {
     // TBD: This one should really be an EnvironmentObject, but how
     //      would we do this? More in the keypath \.object.
-    public static var defaultValue : OActiveRecord = .init()
+    public static let defaultValue : OActiveRecord = .init()
   }
 
   struct propertyKey: DynamicEnvironmentKey {
@@ -65,11 +65,11 @@ public extension D2SKeys {
   // MARK: - Model
   
   struct model: DynamicEnvironmentKey {
-    public static var defaultValue : Model = D2SDefaultModel()
+    public static let defaultValue : Model = D2SDefaultModel()
   }
 
   struct entity: DynamicEnvironmentKey {
-    public static var defaultValue : Entity = D2SDefaultEntity.shared
+    public static let defaultValue : Entity = D2SDefaultEntity.shared
   }
   
   /**
@@ -80,7 +80,7 @@ public extension D2SKeys {
    * If that also fails, the default dummy attribute is returned.
    */
   struct attribute: DynamicEnvironmentKey {
-    public static var  defaultValue : Attribute = D2SDefaultAttribute()
+    public static let defaultValue : Attribute = D2SDefaultAttribute()
   }
   
   /**
@@ -91,7 +91,7 @@ public extension D2SKeys {
    * If that also fails, the default dummy relationship is returned.
    */
   struct relationship: DynamicEnvironmentKey {
-    public static var  defaultValue : Relationship = D2SDefaultRelationship()
+    public static let defaultValue : Relationship = D2SDefaultRelationship()
   }
 
   // MARK: - Derived
@@ -143,6 +143,12 @@ public extension D2SKeys {
   struct initialPropertyValues: DynamicEnvironmentKey {
     public static let defaultValue : [ String : Any? ] = [:]
   }
+  struct creationTimestampPropertyKey: DynamicEnvironmentKey {
+    public static let defaultValue : String? = nil
+  }
+  struct updateTimestampPropertyKey: DynamicEnvironmentKey {
+    public static let defaultValue : String? = nil
+  }
 
   /**
    * The entities which are being displayed on a page.
diff --git a/Sources/DirectToSwiftUI/Environment/EnvironmentPathes.swift b/Sources/DirectToSwiftUI/Environment/EnvironmentPathes.swift
@@ -414,7 +414,16 @@ public extension DynamicEnvironmentPathes {
     set { self[dynamic: D2SKeys.initialPropertyValues.self] = newValue }
     get { self[dynamic: D2SKeys.initialPropertyValues.self] }
   }
-  
+
+  var creationTimestampPropertyKey : String? {
+    set { self[dynamic: D2SKeys.creationTimestampPropertyKey.self] = newValue }
+    get { self[dynamic: D2SKeys.creationTimestampPropertyKey.self] }
+  }
+  var updateTimestampPropertyKey : String? {
+    set { self[dynamic: D2SKeys.updateTimestampPropertyKey.self] = newValue }
+    get { self[dynamic: D2SKeys.updateTimestampPropertyKey.self] }
+  }
+
   /**
    * If you implement a login page, you can assign a value to the `user`
    * environment. And then adjust other environments based on that,
diff --git a/Sources/DirectToSwiftUI/Environment/README.md b/Sources/DirectToSwiftUI/Environment/README.md
@@ -63,6 +63,8 @@ D2S has quiet a set of builtin environment keys, including:
   - `platform`
   - `debug`
   - `initialPropertyValues`
+  - `creationTimestampPropertyKey`
+  - `updateTimestampPropertyKey`
 
 Checkout the `D2SKeys` for the full set.
 
diff --git a/Sources/DirectToSwiftUI/Support/FoundationExtras.swift b/Sources/DirectToSwiftUI/Support/FoundationExtras.swift
@@ -86,7 +86,6 @@ extension String {
       return needle.range(of: needle)
     }
 
-    let len  = count
     let slen = needle.count
     let sc   = needle.first!
 
diff --git a/Sources/DirectToSwiftUI/Support/SwiftUI/FormatterBinding.swift b/Sources/DirectToSwiftUI/Support/SwiftUI/FormatterBinding.swift
@@ -12,7 +12,7 @@ import struct SwiftUI.Binding
 public extension Binding {
   
   /**
-   * Creates a String binding form an arbitrary value binding which pipes the
+   * Creates a String binding from an arbitrary value binding which pipes the
    * value binding through a formatter.
    *
    * This is a workaround to fix the `TextField` not doing the same when a
diff --git a/Sources/DirectToSwiftUI/ViewModel/D2SDisplayGroup.swift b/Sources/DirectToSwiftUI/ViewModel/D2SDisplayGroup.swift
@@ -120,7 +120,8 @@ public final class D2SDisplayGroup<Object: OActiveRecord>
   
   private func integrateCount(_ count: Int) {
     assert(_dispatchPreconditionTest(.onQueue(.main)))
-    
+    self.countFetchToken = nil
+
     #if false // nope, a fetch count means we rebuild!
       if count == results.count { return } // all good already
     #endif
@@ -138,11 +139,14 @@ public final class D2SDisplayGroup<Object: OActiveRecord>
     results.clearOrderAndApplyNewCount(count)
   }
   
+  private var countFetchToken : AnyCancellable?
+  
   private func fetchCount(_ fetchSpecification: FetchSpecification) {
     let fs = fetchSpecification // has to be done, can't use inside fetchCount?
-    _ = dataSource.fetchCount(fs, on: D2SFetchQueue)
+    countFetchToken = dataSource.fetchCount(fs, on: D2SFetchQueue)
       .receive(on: RunLoop.main)
       .catch { ( error : Swift.Error ) -> Just<Int> in
+        self.countFetchToken = nil
         self.handleError(error)
         return Just(0)
       }
@@ -196,8 +200,13 @@ public final class D2SDisplayGroup<Object: OActiveRecord>
     self.results = newResults
   }
   
-  private struct Query: Equatable {
+  private final class Query: Equatable {
     let range : Range<Int>
+    var token : AnyCancellable?
+    init(range: Range<Int>) { self.range = range }
+    static func ==(lhs: Query, rhs: Query) -> Bool {
+      return lhs.range == rhs.range
+    }
   }
   private var activeQueries = [ Query ]()
   
@@ -242,7 +251,7 @@ public final class D2SDisplayGroup<Object: OActiveRecord>
     let query = Query(range: fetchRange)
     activeQueries.append(query) // keep it alive
     
-    _ = dataSource.fetchGlobalIDs(fs, on: D2SFetchQueue)
+    query.token = dataSource.fetchGlobalIDs(fs, on: D2SFetchQueue)
       .receive(on: RunLoop.main)
       .flatMap { ( globalIDs ) -> AnyPublisher<[ Object ], Error> in
         var missingGIDs = Set<GlobalID>()
@@ -317,7 +326,13 @@ fileprivate func buildInitialFetchSpec<Object: ActiveRecordType>
   if (fs.sortOrderings?.count ?? 0) == 0 {
     fs.sortOrderings = dataSource.entity?.d2s.defaultSortOrderings ?? []
   }
-  assert(fs.sortOrderings != nil && !(fs.sortOrderings?.isEmpty ?? true))
+  #if os(macOS)
+    if !(fs.sortOrderings != nil && !(fs.sortOrderings?.isEmpty ?? true)) {
+      globalD2SLogger.error("got no sort orderings for fetchspec:", fs)
+    }
+  #else
+    assert(fs.sortOrderings != nil && !(fs.sortOrderings?.isEmpty ?? true))
+  #endif
   
   if let aux = auxiliaryQualifier {
     fs.qualifier = aux.and(fs.qualifier)
diff --git a/Sources/DirectToSwiftUI/ViewModel/D2SRuleEnvironment.swift b/Sources/DirectToSwiftUI/ViewModel/D2SRuleEnvironment.swift
@@ -43,18 +43,21 @@ public final class D2SRuleEnvironment: ObservableObject {
     ruleContext[D2SKeys.model] = model
   }
   
+  private var modelFetch : AnyCancellable?
+  
   public func resume() {
     guard databaseModel == nil else { return }
     
     // TODO: setup timer to refetch and compare model tag
-    _ = adaptor.fetchModel(on: D2SFetchQueue)
+    modelFetch = adaptor.fetchModel(on: D2SFetchQueue)
       .map { ( model, tag ) in
         FancyModelMaker(model: model).fancyfyModel()
       }
       .receive(on: RunLoop.main)
       .catch { ( error : Swift.Error ) -> Just<Model> in
         self.error = error
         globalD2SLogger.error("failed to fetch model:", error)
+        self.modelFetch = nil
         return Just(Model(entities: [
           ModelEntity(name: "Could not load model.")
         ]))
@@ -64,6 +67,7 @@ public final class D2SRuleEnvironment: ObservableObject {
           self.adaptor.model = model
         }
         self.setupWithModel(model)
+        self.modelFetch = nil
       }
   }
 }
diff --git a/Sources/DirectToSwiftUI/Views/BasicLook/PageWrapper/EntityMasterDetailPage.swift b/Sources/DirectToSwiftUI/Views/BasicLook/PageWrapper/EntityMasterDetailPage.swift
@@ -23,7 +23,13 @@ public extension BasicLook.PageWrapper.MasterDetail {
     private var selectedEntity: Entity? {
       guard let entityName = selectedEntityName else { return nil }
       guard let entity = model[entity: entityName] else {
-        fatalError("did not find entity: \(entityName) in \(model)")
+        #if os(macOS)
+          globalD2SLogger.error("did not find entity:", entityName,
+                                "in:", model)
+          return nil
+        #else
+          fatalError("did not find entity: \(entityName) in \(model)")
+        #endif
       }
       return entity
     }
@@ -71,7 +77,8 @@ public extension BasicLook.PageWrapper.MasterDetail {
           }
           else {
             EntityContent()
-              .environment(\.entity, selectedEntity!)
+              .environment(\.entity,
+                           selectedEntity ?? D2SKeys.entity.defaultValue)
           }
         }
         .frame(minWidth: 400 as CGFloat, idealWidth: 600 as CGFloat,
diff --git a/Sources/DirectToSwiftUI/Views/BasicLook/PageWrapper/EntitySidebar.swift b/Sources/DirectToSwiftUI/Views/BasicLook/PageWrapper/EntitySidebar.swift
@@ -68,7 +68,9 @@ public extension BasicLook.PageWrapper.MasterDetail.EntityMasterDetailPage {
                 EntityName()
                 Spacer()
               }
-              .environment(\.entity, { self.model[entity: name]! }())
+              .environment(\.entity, {
+                self.model[entity: name] ?? D2SKeys.entity.defaultValue
+              }())
               .frame(maxWidth: .infinity, maxHeight: .infinity)
               .foregroundColor(self.colorForEntityName(name))
               .onTapGesture {
diff --git a/Sources/DirectToSwiftUI/Views/BasicLook/Pages/Edit.swift b/Sources/DirectToSwiftUI/Views/BasicLook/Pages/Edit.swift
diff --git a/Sources/DirectToSwiftUI/Views/BasicLook/Pages/Login.swift b/Sources/DirectToSwiftUI/Views/BasicLook/Pages/Login.swift
diff --git a/Sources/DirectToSwiftUI/Views/BasicLook/Pages/UIKit/MobileQueryList.swift b/Sources/DirectToSwiftUI/Views/BasicLook/Pages/UIKit/MobileQueryList.swift
