Add Swift support

README.md

@@ -26,9 +26,9 @@ to build and run Objective-C and Java tests.
 
 ### Building and running the mobile example apps
 
-The Android example app can be build with bazel: `bazel build
-//examples:android-app`, and then install to a device with `adb install
-bazel-bin/examples/android-app.apk`
+You need to install the Android SDK 30.0.2 and the NDK 21.4.7075529. You need both `ANDROID_SDK_HOME` and `ANDROID_NDK_HOME` env variables set.
+The Android example app can be build with bazel: `bazel build //examples:android-app`, 
+and then install to a device with `adb install bazel-bin/examples/android-app.apk`
 
 The iOS example app are built with Xcode. Simply open the project in Xcode and
 it should work.
@@ -65,7 +65,7 @@ verify the build and binary from the command line.
  - Protobuf type support
  - Local flags with `@flag` directive
  - DataView for copy free data passing
- - DateRef for copy free data passing with ownership
+ - DataRef for copy free data passing with ownership
  - Generating string names for C++ enums
  - Omit optional parameters from record constructors
  - Records are default mutable across all platforms
@@ -141,7 +141,8 @@ outcome<RESULT, ERROR>
 Where RESULT and ERROR can be any Djinni types (primitives or records).
 
 
-In C++, the `outcome<>` type maps to the template class `djinni::expected<>`.
+In C++, the `outcome<>` type maps to the template `djinni::expected<>`,
+which is an alias of `std::expected<>` if supported or a drop-in replacement otherwise.
 In Java, it maps to the generic class `com.snapchat.djinni.Outcome<>`. In ObjC,
 it maps to the generic class `DJOutcome<>`.
 
@@ -303,9 +304,11 @@ Notable differences when comparing to the Java/ObjC support:
   easily add extension methods (by add functions to prototype) without having to
   derive from a base class.
 
-The command to run Wasm/TypeScript unit tests is `bazel run
-//test-suite:server-ts`. You will need the `tsc` compiler and the `browserify`
-tool to run these tests.
+Use `bazel run //test-suite:server-ts` to run the Wasm/TypeScript unit tests.
+You will need `npm` and run `npm install` in the `test-suite` folder.
+You need as well the `tsc` compiler and the `browserify` tool to run these tests.
+
+To run the examples server: `bazel run //examples:server`
 
 ## Async interface support
 

WORKSPACE

@@ -16,28 +16,25 @@ android_workspace()
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-build_bazel_rules_apple_version = "1.0.1"
+build_bazel_rules_apple_version = "1.1.3"
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "36072d4f3614d309d6a703da0dfe48684ec4c65a89611aeb9590b45af7a3e592",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/{0}/rules_apple.{0}.tar.gz"
-        .format(build_bazel_rules_apple_version),
+    sha256 = "f94e6dddf74739ef5cb30f000e13a2a613f6ebfa5e63588305a71fce8a8a9911",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/{0}/rules_apple.{0}.tar.gz" .format(build_bazel_rules_apple_version),
 )
 
-build_bazel_rules_swift_version = "1.0.0"
+build_bazel_rules_swift_version = "1.14.0"
 http_archive(
     name = "build_bazel_rules_swift",
-    sha256 = "12057b7aa904467284eee640de5e33853e51d8e31aae50b3fb25d2823d51c6b8",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/{0}/rules_swift.{0}.tar.gz"
-        .format(build_bazel_rules_swift_version),
+    sha256 = "9b0064197e3b6c123cf7cbd377ad5071ac020cbd208fcc23dbc9f3928baf4fa2",
+    url = "https://github.com/bazelbuild/rules_swift/releases/download/{0}/rules_swift.{0}.tar.gz" .format(build_bazel_rules_swift_version),
 )
 
-build_bazel_apple_support_version = "1.0.0"
+build_bazel_apple_support_version = "1.15.1"
 http_archive(
     name = "build_bazel_apple_support",
-    sha256 = "df317473b5894dd8eb432240d209271ebc83c76bb30c55481374b36ddf1e4fd1",
-    url = "https://github.com/bazelbuild/apple_support/releases/download/{0}/apple_support.{0}.tar.gz"
-        .format(build_bazel_apple_support_version),
+    sha256 = "c4bb2b7367c484382300aee75be598b92f847896fb31bbd22f3a2346adf66a80",
+    url = "https://github.com/bazelbuild/apple_support/releases/download/{0}/apple_support.{0}.tar.gz" .format(build_bazel_apple_support_version),
 )
 
 rules_kotlin_version = "legacy-1.3.0"
@@ -50,13 +47,15 @@ http_archive(
 )
 
 load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
-load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies")
 load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies")
+load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies")
+load("@build_bazel_rules_swift//swift:extras.bzl", "swift_rules_extra_dependencies",)
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
 
 apple_rules_dependencies()
-swift_rules_dependencies()
 apple_support_dependencies()
+swift_rules_dependencies()
+swift_rules_extra_dependencies()
 
 kotlin_repositories()
 kt_register_toolchains()

bzl/deps.bzl

@@ -47,3 +47,18 @@ def djinni_deps():
         url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(rules_jvm_external_tag),
         sha256 = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a",
     )
+    swiftprotobuf_version = "1.26.0"
+    maybe(
+        name = "apple_swift_protobuf",
+        repo_rule = http_archive,
+        url = "https://github.com/apple/swift-protobuf/archive/refs/tags/{}.tar.gz".format(swiftprotobuf_version),
+        strip_prefix = "swift-protobuf-{}".format(swiftprotobuf_version),
+        sha256 = "25224376205a54bb719fe7d97aeb9d8f5219c7ef668f426a5dab2da7db992842",
+        build_file_content = """
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+swift_library(
+    name = "swift-protobuf",
+    module_name = "SwiftProtobuf",
+    srcs = glob(["Sources/SwiftProtobuf/**/*.swift"]),
+    visibility = ["//visibility:public"],
+)""")

examples/BUILD

@@ -1,6 +1,7 @@
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
 cc_library(
     name = "textsort-common",
@@ -20,6 +21,7 @@ cc_library(
         "//support-lib:djinni-support-common",
     ],
     alwayslink = 1,
+    visibility = ["//visibility:public"],
 )
 
 # ------------------------------------------------------------------
@@ -53,7 +55,7 @@ android_library(
     srcs = glob(["handwritten-src/java/com/dropbox/textsort/*.java"]),
     custom_package = "com.dropbox.textsort",
     manifest = "android/app/src/main/AndroidManifest.xml",
-    resource_files = glob(["android/app/src/main/res/**"]),
+    resource_files = glob(["android/app/src/main/res/**"], exclude=["android/app/src/main/res/.DS_Store"]),
     deps = [":textsort-java",],
 )
 
@@ -99,3 +101,58 @@ sh_binary(
     srcs = ["ts/run.sh"],
     data = glob(["ts/*.html", "ts/*.ts", "ts/*.json", "generated-src/ts/*.ts"]) + [":wasm"]
 )
+
+# ------------------------------------------------------------------
+
+swift_private_files = "generated-src/swift/*+Private.swift"
+
+swift_library(
+    name = "textsort-swift",
+    module_name = "TextSort",
+    srcs = glob([
+        "generated-src/swift/*.swift",
+    ], exclude = [ swift_private_files ]),
+    copts = ["-cxx-interoperability-mode=default", "-Xcc", "-std=c++17",],
+    deps = [
+        "//support-lib:djinni-support-swift",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+swift_library(
+    name = "textsort-swift-bridge",
+    module_name = "TextSortBridge",
+    srcs = glob([swift_private_files,]),
+    copts = ["-cxx-interoperability-mode=default", "-Xcc", "-std=c++17",],
+    deps = [
+        ":textsort-common",
+        ":textsort-swift",
+        ":textsort-swiftxx",
+        "//support-lib:djinni-support-swift",
+        "//support-lib:djinni-support-swiftxx",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "textsort-swiftxx",
+    srcs = glob([
+        "generated-src/swiftxx/*.cpp",
+    ]),
+    hdrs = glob([
+        "generated-src/swiftxx/*.hpp",
+    ]),
+    includes = [
+        "generated-src/swiftxx",
+        ".",
+    ],
+    deps = [
+        ":textsort-common",
+        ":textsort-swift",
+        "//support-lib:djinni-support-common",
+        "//support-lib:djinni-support-swiftxx",
+    ],
+    copts = ["-std=c++17",],
+    tags = ["swift_module=TextSortCxx"],
+    visibility = ["//visibility:public"],
+)

examples/example.djinni

@@ -17,6 +17,6 @@ sort_items = interface +c {
     static run_sort(items: item_list): item_list;
 }
 
-textbox_listener = interface +j +o +w {
+textbox_listener = interface +nc {
     update(items: item_list);
 }

examples/generated-src/swift/ItemList+Private.swift

@@ -0,0 +1,23 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+import DjinniSupport
+import DjinniSupportCxx
+import Foundation
+import TextSort
+import TextSortCxx
+
+public enum ItemListMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TextSort.ItemList
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+        return withUnsafePointer(to: c) { p in
+            let items = ListMarshaller<StringMarshaller>.fromCpp(djinni.swift.getMember(p, 0))
+            return SwiftType(items: items)
+        }
+    }
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+        var ret = djinni.swift.makeCompositeValue()
+        djinni.swift.addMember(&ret, ListMarshaller<StringMarshaller>.toCpp(s.items))
+        return ret
+    }
+}

examples/generated-src/swift/ItemList.swift

@@ -0,0 +1,13 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+import Foundation
+
+public struct ItemList {
+    public var items: Array<String>
+
+    public init(items: Array<String>)
+    {
+        self.items = items
+    }
+}

examples/generated-src/swift/SortItems+Private.swift

@@ -0,0 +1,45 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+import DjinniSupport
+import DjinniSupportCxx
+import Foundation
+import TextSort
+import TextSortCxx
+
+final class SortItemsCppProxy: DjinniSupport.CppProxy, TextSort.SortItems {
+    init(_ inst: djinni.swift.AnyValue) { super.init(inst:inst) } 
+    func sort(_ order: TextSort.SortOrder, items: TextSort.ItemList) throws -> Void {
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(inst)
+        _params.addValue(SortOrderMarshaller.toCpp(order))
+        _params.addValue(ItemListMarshaller.toCpp(items))
+        var ret = djinni_generated.SortItems_sort(&_params)
+        try handleCppErrors(&ret)
+    }
+}
+public enum SortItemsMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TextSort.SortItems
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+        return cppInterfaceToSwift(c, { SortItemsCppProxy(c) as SwiftType })
+    }
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+        return swiftInterfaceToCpp(s, { fatalError("n/a") })
+    }
+}
+public class SortItems_statics {
+    public static func createWithListener(_ listener: TextSort.TextboxListener) throws -> TextSort.SortItems {
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(TextboxListenerMarshaller.toCpp(listener))
+        var ret = djinni_generated.SortItems_createWithListener(&_params)
+        try handleCppErrors(&ret)
+        return SortItemsMarshaller.fromCpp(ret)
+    }
+    public static func runSort(_ items: TextSort.ItemList) throws -> TextSort.ItemList {
+        var _params = djinni.swift.ParameterList()
+        _params.addValue(ItemListMarshaller.toCpp(items))
+        var ret = djinni_generated.SortItems_runSort(&_params)
+        try handleCppErrors(&ret)
+        return ItemListMarshaller.fromCpp(ret)
+    }
+}

examples/generated-src/swift/SortItems.swift

@@ -0,0 +1,9 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+import Foundation
+
+public protocol SortItems: AnyObject {
+    /** For the iOS / Android demo */
+    func sort(_ order: TextSort.SortOrder, items: TextSort.ItemList) throws -> Void
+}

examples/generated-src/swift/SortOrder+Private.swift

@@ -0,0 +1,7 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+import DjinniSupport
+import TextSort
+
+public typealias SortOrderMarshaller = DjinniSupport.EnumMarshaller<SortOrder>

examples/generated-src/swift/SortOrder.swift

@@ -0,0 +1,8 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+public enum SortOrder: Int32 {
+    case ascending = 0
+    case descending = 1
+    case random = 2
+}

examples/generated-src/swift/TextboxListener+Private.swift

@@ -0,0 +1,25 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+import DjinniSupport
+import DjinniSupportCxx
+import Foundation
+import TextSort
+import TextSortCxx
+
+let textboxListenerMethods: Vtbl<TextboxListener> = [
+    { inst, params, ret in
+        let _items = ItemListMarshaller.fromCpp(djinni.swift.getMember(params, 0))
+        try inst.update(_items)
+    },
+]
+
+public enum TextboxListenerMarshaller: DjinniSupport.Marshaller {
+    public typealias SwiftType = TextSort.TextboxListener
+    public static func fromCpp(_ c: djinni.swift.AnyValue) -> SwiftType {
+        return cppInterfaceToSwift(c, { fatalError("n/a") })
+    }
+    public static func toCpp(_ s: SwiftType) -> djinni.swift.AnyValue {
+        return swiftInterfaceToCpp(s, { djinni_generated.TextboxListenerSwiftProxy.make(ctxPtr(s, textboxListenerMethods), dispatcherProtocalCall)})
+    }
+}

examples/generated-src/swift/TextboxListener.swift

@@ -0,0 +1,8 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+import Foundation
+
+public protocol TextboxListener: AnyObject {
+    func update(_ items: TextSort.ItemList) throws -> Void
+}

examples/generated-src/swiftxx/SwiftItemList.cpp

@@ -0,0 +1,18 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+#include "SwiftItemList.hpp"  // my header
+
+namespace djinni_generated {
+
+djinni::swift::AnyValue SwiftItemList::fromCpp(const ::textsort::ItemList& c) {
+    auto ret = std::make_shared<djinni::swift::CompositeValue>();
+    ret->addValue(::djinni::swift::List<::djinni::swift::String>::fromCpp(c.items));
+    return {ret};
+}
+::textsort::ItemList SwiftItemList::toCpp(const djinni::swift::AnyValue& s) {
+    auto p = std::get<djinni::swift::CompositeValuePtr>(s);
+    return ::textsort::ItemList(::djinni::swift::List<::djinni::swift::String>::toCpp(p->getValue(0)));
+}
+
+} // namespace djinni_generated

examples/generated-src/swiftxx/SwiftItemList.hpp

@@ -0,0 +1,17 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from example.djinni
+
+#pragma once
+
+#include "djinni_support.hpp"
+#include "item_list.hpp"
+
+namespace djinni_generated {
+
+struct SwiftItemList {
+    using CppType = ::textsort::ItemList;
+    static djinni::swift::AnyValue fromCpp(const CppType& c);
+    static CppType toCpp(const djinni::swift::AnyValue& s);
+};
+
+} // namespace djinni_generated