Refactor individual extensions into traits

Package.swift

@@ -109,6 +109,7 @@ let package = Package(
 			name: "CSQLite",
 			targets: [
 				"CSQLite",
+				"CSQLiteExtensions",
 			]),
 	],
 	traits: [
@@ -249,6 +250,35 @@ let package = Package(
 			name: "ENABLE_STAT4",
 			description: "Enables the sqlite_stat4 table"
 		),
+		// Statically linked extensions
+		.trait(
+			name: "CSQLITE_ENABLE_CARRAY_EXTENSION",
+			description: "Enables the statically linked carray extension"
+		),
+		.trait(
+			name: "CSQLITE_ENABLE_DECIMAL_EXTENSION",
+			description: "Enables the statically linked decimal extension"
+		),
+		.trait(
+			name: "CSQLITE_ENABLE_IEEE754_EXTENSION",
+			description: "Enables the statically linked ieee754 extension"
+		),
+		.trait(
+			name: "CSQLITE_ENABLE_PERCENTILE_EXTENSION",
+			description: "Enables the statically linked percentile extension"
+		),
+		.trait(
+			name: "CSQLITE_ENABLE_SERIES_EXTENSION",
+			description: "Enables the statically linked series extension"
+		),
+		.trait(
+			name: "CSQLITE_ENABLE_SHA3_EXTENSION",
+			description: "Enables the statically linked sha3 extension"
+		),
+		.trait(
+			name: "CSQLITE_ENABLE_UUID_EXTENSION",
+			description: "Enables the statically linked uuid extension"
+		),
 		// Default traits
 		.default(enabledTraits: [
 			"DQS_0",
@@ -270,26 +300,122 @@ let package = Package(
 			"ENABLE_SNAPSHOT",
 			"ENABLE_STMTVTAB",
 			"ENABLE_STAT4",
+			"CSQLITE_ENABLE_CARRAY_EXTENSION",
+			"CSQLITE_ENABLE_DECIMAL_EXTENSION",
+			"CSQLITE_ENABLE_IEEE754_EXTENSION",
+			"CSQLITE_ENABLE_PERCENTILE_EXTENSION",
+			"CSQLITE_ENABLE_SERIES_EXTENSION",
+			"CSQLITE_ENABLE_SHA3_EXTENSION",
+			"CSQLITE_ENABLE_UUID_EXTENSION",
 		]),
 	],
 	targets: [
 		// Targets are the basic building blocks of a package, defining a module or a test suite.
 		// Targets can depend on other targets in this package and products from dependencies.
 		.target(
 			name: "CSQLite",
-			cSettings: compileTimeOptions + platformConfiguration + features + [
+			cSettings: compileTimeOptions + platformConfiguration + features,
+			linkerSettings: [
+				.linkedLibrary("m"),
+			]),
+		.target(
+			name: "CSQLiteExtensions",
+			dependencies: [
+				.targetItem(name: "CSQLiteCArrayExtension", condition: .when(traits: ["CSQLITE_ENABLE_CARRAY_EXTENSION"])),
+				.targetItem(name: "CSQLiteDecimalExtension", condition: .when(traits: ["CSQLITE_ENABLE_DECIMAL_EXTENSION"])),
+				.targetItem(name: "CSQLiteIEEE754Extension", condition: .when(traits: ["CSQLITE_ENABLE_IEEE754_EXTENSION"])),
+				.targetItem(name: "CSQLitePercentileExtension", condition: .when(traits: ["CSQLITE_ENABLE_PERCENTILE_EXTENSION"])),
+				.targetItem(name: "CSQLiteSeriesExtension", condition: .when(traits: ["CSQLITE_ENABLE_SERIES_EXTENSION"])),
+				.targetItem(name: "CSQLiteSHA3Extension", condition: .when(traits: ["CSQLITE_ENABLE_SHA3_EXTENSION"])),
+				.targetItem(name: "CSQLiteUUIDExtension", condition: .when(traits: ["CSQLITE_ENABLE_UUID_EXTENSION"])),
+			]),
+		.target(
+			name: "CSQLiteCArrayExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/carray",
+			cSettings: [
 				// For statically linking extensions
 				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
 				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteDecimalExtension",
+			dependencies: [
+				"CSQLite",
 			],
-			linkerSettings: [
-				.linkedLibrary("m"),
+			path: "Sources/extensions/decimal",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteIEEE754Extension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/ieee754",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLitePercentileExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/percentile",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteSeriesExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/series",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteSHA3Extension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/sha3",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteUUIDExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/uuid",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
 			]),
 		.testTarget(
 			name: "CSQLiteTests",
 			dependencies: [
 				"CSQLite",
-			])
+			]),
+		.testTarget(
+			name: "CSQLiteExtensionsTests",
+			dependencies: [
+				"CSQLiteExtensions",
+			]),
 	],
 	cLanguageStandard: .gnu11
 )

Package@swift-5.3.swift

@@ -92,26 +92,116 @@ let package = Package(
 			name: "CSQLite",
 			targets: [
 				"CSQLite",
+				"CSQLiteExtensions",
 			]),
 	],
 	targets: [
 		// Targets are the basic building blocks of a package, defining a module or a test suite.
 		// Targets can depend on other targets in this package and products from dependencies.
 		.target(
 			name: "CSQLite",
-			cSettings: compileTimeOptions + platformConfiguration + features + [
+			cSettings: compileTimeOptions + platformConfiguration + features,
+			linkerSettings: [
+				.linkedLibrary("m"),
+			]),
+		.target(
+			name: "CSQLiteExtensions",
+			dependencies: [
+				"CSQLiteCArrayExtension",
+				"CSQLiteDecimalExtension",
+				"CSQLiteIEEE754Extension",
+				"CSQLitePercentileExtension",
+				"CSQLiteSeriesExtension",
+				"CSQLiteSHA3Extension",
+				"CSQLiteUUIDExtension",
+			]),
+		.target(
+			name: "CSQLiteCArrayExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/carray",
+			cSettings: [
 				// For statically linking extensions
 				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
 				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteDecimalExtension",
+			dependencies: [
+				"CSQLite",
 			],
-			linkerSettings: [
-				.linkedLibrary("m"),
+			path: "Sources/extensions/decimal",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteIEEE754Extension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/ieee754",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLitePercentileExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/percentile",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteSeriesExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/series",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteSHA3Extension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/sha3",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
+			]),
+		.target(
+			name: "CSQLiteUUIDExtension",
+			dependencies: [
+				"CSQLite",
+			],
+			path: "Sources/extensions/uuid",
+			cSettings: [
+				// For statically linking extensions
+				// https://sqlite.org/loadext.html#statically_linking_a_run_time_loadable_extension
+				.define("SQLITE_CORE", to: "1"),
 			]),
 		.testTarget(
 			name: "CSQLiteTests",
 			dependencies: [
 				"CSQLite",
-			])
+			]),
+		.testTarget(
+			name: "CSQLiteExtensionsTests",
+			dependencies: [
+				"CSQLiteExtensions",
+			]),
 	],
 	cLanguageStandard: .gnu11
 )

README.md

@@ -81,6 +81,20 @@ The following traits enable commonly-used SQLite features:
 > [!NOTE]
 > The `ENABLE_SESSION` trait also sets the `ENABLE_PREUPDATE_HOOK` trait.
 
+### Statically Linked Extensions
+
+The following traits enable statically linked SQLite extensions and helper functions for automatic extension registration:
+
+| Package Trait | Default | SQLite Extension |
+| --- | :---: | --- |
+| CSQLITE_ENABLE_CARRAY_EXTENSION | Y | [carray](https://sqlite.org/carray.html) |
+| CSQLITE_ENABLE_DECIMAL_EXTENSION | Y | [decimal](https://sqlite.org/floatingpoint.html#the_decimal_c_extension) |
+| CSQLITE_ENABLE_IEEE754_EXTENSION | Y | [ieee754](https://sqlite.org/floatingpoint.html#the_ieee754_c_extension) |
+| CSQLITE_ENABLE_PERCENTILE_EXTENSION | Y | [percentile](https://www.sqlite.org/src/file/ext/misc/percentile.c) |
+| CSQLITE_ENABLE_SERIES_EXTENSION | Y | [series](https://www.sqlite.org/src/file/ext/misc/series.c) |
+| CSQLITE_ENABLE_SHA3_EXTENSION | Y | [sha3](https://www.sqlite.org/src/file/ext/misc/shathree.c) |
+| CSQLITE_ENABLE_UUID_EXTENSION | Y | [uuid](https://www.sqlite.org/src/file/ext/misc/uuid.c) |
+
 ## License
 
 SQLite is in the [public domain](https://sqlite.org/copyright.html).

Sources/CSQLite/csqlite_shims.c

@@ -290,82 +290,3 @@ int csqlite_sqlite3_vtab_uses_all_schemas(sqlite3 *db)
 {
 	return sqlite3_vtab_config(db, SQLITE_VTAB_USES_ALL_SCHEMAS);
 }
-
-// MARK: - Database extensions
-
-void sqlite3_carray_init(void);
-int csqlite_sqlite3_auto_extension_carray()
-{
-	return sqlite3_auto_extension(sqlite3_carray_init);
-}
-
-int csqlite_sqlite3_cancel_auto_extension_carray()
-{
-	return sqlite3_cancel_auto_extension(sqlite3_carray_init);
-}
-
-void sqlite3_decimal_init(void);
-int csqlite_sqlite3_auto_extension_decimal()
-{
-	return sqlite3_auto_extension(sqlite3_decimal_init);
-}
-
-int csqlite_sqlite3_cancel_auto_extension_decimal()
-{
-	return sqlite3_cancel_auto_extension(sqlite3_decimal_init);
-}
-
-void sqlite3_ieee_init(void);
-int csqlite_sqlite3_auto_extension_ieee754()
-{
-	return sqlite3_auto_extension(sqlite3_ieee_init);
-}
-
-int csqlite_sqlite3_cancel_auto_extension_ieee754()
-{
-	return sqlite3_cancel_auto_extension(sqlite3_ieee_init);
-}
-
-void sqlite3_percentile_init(void);
-int csqlite_sqlite3_auto_extension_percentile()
-{
-	return sqlite3_auto_extension(sqlite3_percentile_init);
-}
-
-int csqlite_sqlite3_cancel_auto_extension_percentile()
-{
-	return sqlite3_cancel_auto_extension(sqlite3_percentile_init);
-}
-
-void sqlite3_series_init(void);
-int csqlite_sqlite3_auto_extension_series()
-{
-	return sqlite3_auto_extension(sqlite3_series_init);
-}
-
-int csqlite_sqlite3_cancel_auto_extension_series()
-{
-	return sqlite3_cancel_auto_extension(sqlite3_series_init);
-}
-
-void sqlite3_shathree_init(void);
-int csqlite_sqlite3_auto_extension_sha3()
-{
-	return sqlite3_auto_extension(sqlite3_shathree_init);
-}
-
-int csqlite_sqlite3_cancel_auto_extension_sha3()
-{
-	return sqlite3_cancel_auto_extension(sqlite3_shathree_init);
-}
-
-void sqlite3_uuid_init(void);
-int csqlite_sqlite3_auto_extension_uuid()
-{
-	return sqlite3_auto_extension(sqlite3_uuid_init);
-}
-
-int csqlite_sqlite3_cancel_auto_extension_uuid()
-{
-	return sqlite3_cancel_auto_extension(sqlite3_uuid_init);
-}