Skip to content

Commit 1da50cd

Browse files
authored
refactor(connections): extract DatabaseType into a dependency-free TableProCoreTypes module (#1519)
1 parent ea49e48 commit 1da50cd

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

Packages/TableProCore/Package.swift

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ let package = Package(
99
.iOS(.v17)
1010
],
1111
products: [
12+
.library(name: "TableProCoreTypes", targets: ["TableProCoreTypes"]),
1213
.library(name: "TableProPluginKit", targets: ["TableProPluginKit"]),
1314
.library(name: "TableProModels", targets: ["TableProModels"]),
1415
.library(name: "TableProDatabase", targets: ["TableProDatabase"]),
@@ -18,29 +19,34 @@ let package = Package(
1819
.library(name: "TableProMSSQLCore", targets: ["TableProMSSQLCore"])
1920
],
2021
targets: [
22+
.target(
23+
name: "TableProCoreTypes",
24+
dependencies: [],
25+
path: "Sources/TableProCoreTypes"
26+
),
2127
.target(
2228
name: "TableProPluginKit",
2329
dependencies: [],
2430
path: "Sources/TableProPluginKit"
2531
),
2632
.target(
2733
name: "TableProModels",
28-
dependencies: ["TableProPluginKit"],
34+
dependencies: ["TableProPluginKit", "TableProCoreTypes"],
2935
path: "Sources/TableProModels"
3036
),
3137
.target(
3238
name: "TableProDatabase",
33-
dependencies: ["TableProModels"],
39+
dependencies: ["TableProModels", "TableProCoreTypes"],
3440
path: "Sources/TableProDatabase"
3541
),
3642
.target(
3743
name: "TableProQuery",
38-
dependencies: ["TableProModels", "TableProPluginKit"],
44+
dependencies: ["TableProModels", "TableProPluginKit", "TableProCoreTypes"],
3945
path: "Sources/TableProQuery"
4046
),
4147
.target(
4248
name: "TableProSync",
43-
dependencies: ["TableProModels"],
49+
dependencies: ["TableProModels", "TableProCoreTypes"],
4450
path: "Sources/TableProSync"
4551
),
4652
.target(

Packages/TableProCore/Sources/TableProModels/DatabaseType.swift renamed to Packages/TableProCore/Sources/TableProCoreTypes/DatabaseType.swift

File renamed without changes.

Packages/TableProCore/Sources/TableProModels/DatabaseConnection.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Foundation
2+
@_exported import TableProCoreTypes
23

34
public struct DatabaseConnection: Identifiable, Hashable, Sendable {
45
public var id: UUID

scripts/audit-refactor-health.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ count_swift_matches() {
6767
BASELINE_FILE=".github/duplicate-contract-baseline.txt"
6868
PLUGINKIT_A="Plugins/TableProPluginKit"
6969
PLUGINKIT_B="Packages/TableProCore/Sources/TableProPluginKit"
70-
DATABASETYPE_AUTHORITATIVE="Packages/TableProCore/Sources/TableProModels/DatabaseType.swift"
70+
DATABASETYPE_AUTHORITATIVE="Packages/TableProCore/Sources/TableProCoreTypes/DatabaseType.swift"
7171

7272
baseline_keys() {
7373
[ -f "$BASELINE_FILE" ] || return 0

0 commit comments

Comments
 (0)