spike(codegen): Smithy → OpenAPI → swift-openapi-generator pipeline for Storage + Functions

.gitignore

@@ -115,3 +115,4 @@ yarn-debug.log*
 yarn-error.log*
 .jj/
 .treq/
+smithy/build/

Brewfile

@@ -0,0 +1,2 @@
+brew "smithy-language-server"  # provides smithy CLI, pin via brew pin if needed
+brew "swift-openapi-generator" # or install via mint/artifact

Makefile

@@ -90,3 +90,56 @@ coverage:
 define udid_for
 $(shell xcrun simctl list --json devices available '$(1)' | jq -r '[.devices|to_entries|sort_by(.key)|reverse|.[].value|select(length > 0)|.[0]][0].udid')
 endef
+
+# ── Code generation ────────────────────────────────────────────────────────────
+
+.PHONY: sync-models generate-smithy generate-swift-storage generate-swift-functions generate-swift-postgrest generate check-generate check-swift-openapi-generator
+
+# Path to a local checkout of supabase/sdk (override with SDK_REPO=/path/to/sdk)
+SDK_REPO ?= $(shell git rev-parse --show-toplevel)/../../sdk
+
+check-swift-openapi-generator:
+	@which swift-openapi-generator > /dev/null 2>&1 || \
+	  (echo "Error: swift-openapi-generator not found in PATH. Build from source: https://github.com/apple/swift-openapi-generator" && exit 1)
+
+# Copy pre-generated OpenAPI artifacts from supabase/sdk (no Smithy install needed)
+sync-models:
+	@test -d "$(SDK_REPO)/smithy/openapi" || \
+	  (echo "Error: supabase/sdk repo not found at $(SDK_REPO). Clone it or set SDK_REPO=/path/to/sdk" && exit 1)
+	cp "$(SDK_REPO)/smithy/openapi/StorageService.openapi.json" smithy/output/openapi/StorageService.openapi.json
+	cp "$(SDK_REPO)/smithy/openapi/FunctionsService.openapi.json" smithy/output/openapi/FunctionsService.openapi.json
+	cp "$(SDK_REPO)/smithy/openapi/DatabaseService.openapi.json" smithy/output/openapi/DatabaseService.openapi.json
+	python3 smithy/patch-openapi.py smithy/output/openapi/StorageService.openapi.json
+	@echo "Models synced from $(SDK_REPO)"
+
+# Build Smithy models locally (requires Smithy CLI; use sync-models instead if not installed)
+generate-smithy:
+	cd "$(SDK_REPO)/smithy" && smithy build
+	cp "$(SDK_REPO)/smithy/build/smithy/storage-openapi/openapi/StorageService.openapi.json" smithy/output/openapi/StorageService.openapi.json
+	cp "$(SDK_REPO)/smithy/build/smithy/functions-openapi/openapi/FunctionsService.openapi.json" smithy/output/openapi/FunctionsService.openapi.json
+	cp "$(SDK_REPO)/smithy/build/smithy/database-openapi/openapi/DatabaseService.openapi.json" smithy/output/openapi/DatabaseService.openapi.json
+	python3 smithy/patch-openapi.py smithy/output/openapi/StorageService.openapi.json
+
+generate-swift-storage: check-swift-openapi-generator
+	swift-openapi-generator generate \
+	  --config Sources/Storage/openapi-generator-config.yaml \
+	  --output-directory Sources/Storage/Generated \
+	  smithy/output/openapi/StorageService.openapi.json
+
+generate-swift-functions: check-swift-openapi-generator
+	swift-openapi-generator generate \
+	  --config Sources/Functions/openapi-generator-config.yaml \
+	  --output-directory Sources/Functions/Generated \
+	  smithy/output/openapi/FunctionsService.openapi.json
+
+generate-swift-postgrest: check-swift-openapi-generator
+	swift-openapi-generator generate \
+	  --config Sources/PostgREST/openapi-generator-config.yaml \
+	  --output-directory Sources/PostgREST/Generated \
+	  smithy/output/openapi/DatabaseService.openapi.json
+
+generate: sync-models generate-swift-storage generate-swift-functions generate-swift-postgrest
+
+check-generate:
+	$(MAKE) generate
+	git diff --exit-code || (echo "Generated artifacts are out of date. Run 'make generate' and commit." && exit 1)

Package.swift

@@ -31,6 +31,8 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.2.2"),
     .package(url: "https://github.com/WeTransfer/Mocker", from: "3.0.0"),
     .package(url: "https://github.com/mattt/Replay.git", from: "0.4.0"),
+    .package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
+    .package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0"),
   ],
   targets: [
     .target(
@@ -41,11 +43,13 @@ let package = Package(
         .product(name: "Clocks", package: "swift-clocks"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
         .product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
+        .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
       ]
     ),
     .testTarget(
       name: "HelpersTests",
       dependencies: [
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "CustomDump", package: "swift-custom-dump"),
         "Helpers",
       ]
@@ -79,10 +83,11 @@ let package = Package(
     .target(
       name: "Functions",
       dependencies: [
-        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
-        .product(name: "HTTPTypes", package: "swift-http-types"),
         "Helpers",
-      ]
+        .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
+        .product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"),
+      ],
+      exclude: ["openapi-generator-config.yaml"]
     ),
     .testTarget(
       name: "FunctionsTests",
@@ -91,6 +96,8 @@ let package = Package(
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "Replay", package: "Replay"),
         .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
+        .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
+        .product(name: "HTTPTypes", package: "swift-http-types"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
         "Functions",
         "Mocker",
@@ -162,17 +169,19 @@ let package = Package(
     .target(
       name: "Storage",
       dependencies: [
-        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
-        .product(name: "HTTPTypes", package: "swift-http-types"),
         "Helpers",
-      ]
+        .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
+        .product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"),
+      ],
+      exclude: ["openapi-generator-config.yaml"]
     ),
     .testTarget(
       name: "StorageTests",
       dependencies: [
         .product(name: "CustomDump", package: "swift-custom-dump"),
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
+        .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
         "Mocker",
         "TestHelpers",
         "Storage",