Merge branch 'develop'

Package@swift-5.10.swift

@@ -2,6 +2,12 @@
 
 import PackageDescription
 
+#if swift(>=5.10)
+let settings = [ SwiftSetting.enableExperimentalFeature("StrictConcurrency") ]
+#else
+let settings = [ SwiftSetting ]()
+#endif
+
 var package = Package(
   name: "Lighter",
 
@@ -28,7 +34,7 @@ var package = Package(
     // generated models and such.
     // Note that Lighter isn't that useful w/o code generation (i.e. as a
     // standalone lib).
-    .target(name: "Lighter"),
+    .target(name: "Lighter", swiftSettings: settings),
 
 
     // MARK: - Plugin Support
@@ -37,14 +43,15 @@ var package = Package(
     // Swift source code.
     .target(name    : "LighterCodeGenAST",
             path    : "Plugins/Libraries/LighterCodeGenAST",
-            exclude : [ "README.md" ]),
+            exclude : [ "README.md" ], swiftSettings: settings),
 
     // This library contains all the code generation, to be used by different
     // clients.
     .target(name         : "LighterGeneration",
             dependencies : [ "LighterCodeGenAST", "SQLite3Schema" ],
             path         : "Plugins/Libraries/LighterGeneration",
-            exclude      : [ "README.md", "LighterConfiguration/README.md" ]),
+            exclude      : [ "README.md", "LighterConfiguration/README.md" ],
+            swiftSettings: settings),
 
 
     // MARK: - Tests

Plugins/Libraries/LighterCodeGenAST/Generation/CodeGenerator.swift

@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 // Yes, this isn't particularily nice, but does the job. Keep in mind that
@@ -14,10 +14,10 @@
 public final class CodeGenerator {
 
   /// The configuration of the CodeGenerator.
-  public struct Configuration: Equatable {
+  public struct Configuration: Equatable, Sendable {
 
     /// How comments should be rendered.
-    public enum CommentStyle: String {
+    public enum CommentStyle: String, Sendable {
       case dashes = "//", tripleDashes = "///"
       case stars  = "*",  doubleStars  = "**"
       case noComments = ""

Plugins/Libraries/LighterCodeGenAST/Generation/GenStructures.swift

@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 public extension CodeGenerator {
@@ -12,31 +12,69 @@ public extension CodeGenerator {
                                 omitPublic : Bool = false)
   {
     assert(value.type != nil || value.value != nil)
+
+    func writeBody() {
+      if value.public && !omitPublic { append("public ") }
+      if `static` { append("static ") }
+      append(value.let ? "let " : "var ")
+      append(tickedWhenReserved(value.name))
+      if let type = value.type {
+        append(configuration.propertyTypeSeparator) // " : "
+        append(string(for: type))
+      }
+      if let value = value.value {
+        append(configuration.propertyValueSeparator) // " = "
+        append(string(for: value))
+      }
+      appendEOL()
+    }
+
+    func writePlain() {
+      if let ( major, minor ) = value.minimumSwiftVersion {
+        assert(major >= 5)
+        writeln("#if swift(>=\(major).\(minor))")
+      }
+
+      writePropertyComment(value.comment)
+      appendIndent()
+      writeBody()
 
-    if let ( major, minor ) = value.minimumSwiftVersion {
-      assert(major >= 5)
-      writeln("#if swift(>=\(major).\(minor))")
+      if let ( major, minor ) = value.minimumSwiftVersion {
+        assert(major >= 5)
+        writeln("#endif // swift(>=\(major).\(minor))")
+      }
     }
 
-    writePropertyComment(value.comment)
-    appendIndent()
-    if value.public && !omitPublic { append("public ") }
-    if `static` { append("static ") }
-    append(value.let ? "let " : "var ")
-    append(tickedWhenReserved(value.name))
-    if let type = value.type {
-      append(configuration.propertyTypeSeparator) // " : "
-      append(string(for: type))
-    }
-    if let value = value.value {
-      append(configuration.propertyValueSeparator) // " = "
-      append(string(for: value))
-    }
-    appendEOL()
+    if value.nonIsolatedUnsafe {
+      if let ( major, minor ) = value.minimumSwiftVersion,
+         (major > 5) || (major >= 5 && minor >= 10)
+      {
+        writePlain()
+      }
+      else {
+        writeln("#if swift(>=5.10)")
 
-    if let ( major, minor ) = value.minimumSwiftVersion {
-      assert(major >= 5)
-      writeln("#endif // swift(>=\(major).\(minor))")
+        writePropertyComment(value.comment)
+        appendIndent()
+        append("nonisolated(unsafe) ")
+        writeBody()
+
+        if let ( major, minor ) = value.minimumSwiftVersion {
+          assert(major >= 5)
+          writeln("#elseif swift(>=\(major).\(minor))")
+        }
+        else {
+          writeln("#else")
+        }
+
+        writePropertyComment(value.comment)
+        appendIndent()
+        writeBody()
+        writeln("#endif")
+      }
+    }
+    else {
+      writePlain()
     }
   }
 

Plugins/Libraries/LighterCodeGenAST/Nodes/Expression.swift

@@ -1,15 +1,15 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
  * An AST node for various Swift expressions.
  */
-public indirect enum Expression: Equatable {
+public indirect enum Expression: Equatable, Sendable {
 
   /// The operators for ``compare(lhs:operator:rhs:)`` expressions.
-  public enum Operator: String {
+  public enum Operator: String, Sendable {
     case equal              = "=="
     case notEqual           = "!="
     case greaterThanOrEqual = ">="
@@ -82,12 +82,12 @@ public indirect enum Expression: Equatable {
  *
  * Used as the value for ``Expression/functionCall(_:)``.
  */
-public struct FunctionCall: Equatable {
+public struct FunctionCall: Equatable, Sendable {
 
   /**
    * A parameter passed as part of the function call.
    */
-  public struct Parameter: Equatable {
+  public struct Parameter: Equatable, Sendable {
 
     /// The keyword/label of the parameter, can be `nil` if it is a wildcard
     /// (unlabled) parameter.
@@ -105,7 +105,7 @@ public struct FunctionCall: Equatable {
   /**
    * A trailing closure attached to a function call.
    */
-  public struct TrailingClosure: Equatable {
+  public struct TrailingClosure: Equatable, Sendable {
 
     /// The parameter list of the trailing closure (e.g. `( a, b ) in`).
     public let parameters: [ String    ]

Plugins/Libraries/LighterCodeGenAST/Nodes/FunctionComment.swift

@@ -1,17 +1,17 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
  * A comment for a function.
  *
  * Has all the function specific things, like parameters and such.
  */
-public struct FunctionComment: Equatable {
+public struct FunctionComment: Equatable, Sendable {
 
   /// A comment for a function parameter.
-  public struct Parameter: Equatable {
+  public struct Parameter: Equatable, Sendable {
 
     /// The name of the function parameter being documented.
     public var name : String

Plugins/Libraries/LighterCodeGenAST/Nodes/FunctionDeclaration.swift

@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
@@ -19,7 +19,7 @@
  * where C1: SQLColumn, C2: SQLColumn, T == C1.T, T == C2.T
  * ```
  */
-public struct FunctionDeclaration: Equatable {
+public struct FunctionDeclaration: Equatable, Sendable {
 
   /// Is the function public?
   public let `public`              : Bool

Plugins/Libraries/LighterCodeGenAST/Nodes/FunctionDefinition.swift

@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
@@ -9,7 +9,7 @@
  *
  * Plus extra annotations like ``inlinable`` and the ``comment``.
  */
-public struct FunctionDefinition: Equatable {
+public struct FunctionDefinition: Equatable, Sendable {
 
   /// Whether the definition is `@inlinable` (included in the module header).
   public var inlinable    : Bool

Plugins/Libraries/LighterCodeGenAST/Nodes/FunctionParameter.swift

@@ -1,13 +1,13 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 public extension FunctionDeclaration {
 
   /// A parameter, like `from table: KeyPath<Self.RecordTypes, T.Type>`
   /// Or: `limit: Int? = nil`
-  struct Parameter: Equatable {
+  struct Parameter: Equatable, Sendable {
 
     /// The "label" of the parameter, e.g. the `from` in `select(from table:)`.
     /// Can be `nil` for a wildcard (`_`).

Plugins/Libraries/LighterCodeGenAST/Nodes/GenericConstraint.swift

@@ -1,13 +1,13 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
  * A generic constraint attached to a ``FunctionDeclaration`` generic parameter
  * or an ``Extension``.
  */
-public enum GenericConstraint: Equatable {
+public enum GenericConstraint: Equatable, Sendable {
 
   /// `C1: SQLColumn`
   case conformance(name: String, type: TypeReference)

Plugins/Libraries/LighterCodeGenAST/Nodes/Literal.swift

@@ -1,14 +1,14 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
  * A Swift literal
  *
  * E.g. as used in default values like: `limit: Int? = nil` (the `nil`).
  */
-public enum Literal: Equatable {
+public enum Literal: Equatable, Sendable {
 
   /// `nil`
   case `nil`

Plugins/Libraries/LighterCodeGenAST/Nodes/Statement.swift

@@ -1,18 +1,18 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
  * An AST node for a Swift statement.
  */
-public enum Statement: Equatable {
+public enum Statement: Equatable, Sendable {
 
   /**
    * A pair for an `if`, `else if` statement, consisting of a condition and the
    * associated ``Statement``s.
    */
-  public struct ConditionStatementPair: Equatable {
+  public struct ConditionStatementPair: Equatable, Sendable {
 
     /// The condition that must be true to have the ``statements`` executed.
     public var condition  : Expression

Plugins/Libraries/LighterCodeGenAST/Nodes/Struct.swift

@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
@@ -11,8 +11,10 @@ public struct Struct {
   /**
    * An instance variable of a ``Struct``.
    */
-  public struct InstanceVariable {
+  public struct InstanceVariable: Sendable {
 
+    /// Whether the definition is `nonisolated(unsafe)`, requires Swift 5.10+
+    public var nonIsolatedUnsafe      : Bool
     /// Is the property public?
     public var `public` : Bool
     /// Is the property readonly.
@@ -31,7 +33,9 @@ public struct Struct {
     public var minimumSwiftVersion : ( major: Int, minor: Int )?
 
     /// Initialize a new instance variable node.
-    public init(public: Bool = true, `let`: Bool = true, _ name: String,
+    public init(nonIsolatedUnsafe: Bool = false,
+                public: Bool = true, `let`: Bool = true,
+                _ name: String,
                 type: TypeReference? = nil, value: Expression? = nil,
                 minimumSwiftVersion : ( major: Int, minor: Int )? = nil,
                 comment: String? = nil)
@@ -43,6 +47,7 @@ public struct Struct {
       self.value               = value
       self.minimumSwiftVersion = minimumSwiftVersion
       self.comment             = comment
+      self.nonIsolatedUnsafe   = nonIsolatedUnsafe
     }
   }
 
@@ -159,11 +164,13 @@ public extension Struct.InstanceVariable {
   }
 
   /// Initialize a new instance variable node for a `var`.
-  static func `var`(public: Bool = true, _ name: String, _ type: TypeReference,
+  static func `var`(nonIsolatedUnsafe: Bool = false,
+                    public: Bool = true, _ name: String, _ type: TypeReference,
                     comment: String? = nil)
               -> Self
   {
-    .init(public: `public`, let: false, name, type: type, value: nil,
+    .init(nonIsolatedUnsafe: nonIsolatedUnsafe, public: `public`,
+          let: false, name, type: type, value: nil,
           comment: comment)
   }
 }

Plugins/Libraries/LighterCodeGenAST/Nodes/TypeReference.swift

@@ -1,12 +1,12 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 /**
  * A reference to some type, e.g. `Void` or `Person` or `Int`.
  */
-public indirect enum TypeReference: Equatable {
+public indirect enum TypeReference: Equatable, Sendable {
 
   /// `Void`
   case void