jsonbadger 0.5.0 → 0.6.0

package/src/migration/ensure-schema.js

@@ -1,16 +1,28 @@
-import ensure_index from '#src/migration/ensure-index.js';
-import resolve_schema_indexes from '#src/migration/schema-indexes-resolver.js';
-import ensure_table from '#src/migration/ensure-table.js';
-
-export default async function ensure_schema(table_name, data_column, collection_schema, id_strategy) {
-	await ensure_table(table_name, data_column, id_strategy);
-
-	const schema_indexes = resolve_schema_indexes(collection_schema);
-	let index_position = 0;
-
-	while(index_position < schema_indexes.length) {
-		const index_definition = schema_indexes[index_position];
-		await ensure_index(table_name, index_definition.index_spec, data_column, index_definition.index_options);
-		index_position += 1;
-	}
+import ensure_index from '#src/migration/ensure-index.js';
+import resolve_schema_indexes from '#src/migration/schema-indexes-resolver.js';
+import ensure_table from '#src/migration/ensure-table.js';
+
+async function ensure_schema(table_name, data_column, collection_schema, id_strategy, connection) {
+	await ensure_table({
+		table_name,
+		data_column,
+		id_strategy,
+		connection
+	});
+
+	const schema_indexes = resolve_schema_indexes(collection_schema);
+	let index_position = 0;
+
+	while(index_position < schema_indexes.length) {
+		const index_definition = schema_indexes[index_position];
+		await ensure_index({
+			table_name,
+			index_definition,
+			data_column,
+			connection
+		});
+		index_position += 1;
+	}
 }
+
+export default ensure_schema;

package/src/migration/ensure-table.js

@@ -1,31 +1,44 @@
-import {assert_identifier, quote_identifier} from '#src/utils/assert.js';
-import IdStrategies, {assert_valid_id_strategy} from '#src/constants/id-strategies.js';
-import sql_runner from '#src/sql/sql-runner.js';
-
-const ID_COLUMN_SQL_BY_STRATEGY = {
-	[IdStrategies.bigserial]: 'id BIGSERIAL PRIMARY KEY',
-	[IdStrategies.uuidv7]: 'id UUID PRIMARY KEY DEFAULT uuidv7()'
-};
-
-export default async function ensure_table(table_name, data_column, id_strategy) {
-	assert_identifier(table_name, 'table_name');
-	assert_identifier(data_column, 'data_column');
-	assert_valid_id_strategy(id_strategy);
-
-	const final_id_strategy = id_strategy;
-	const table_identifier = quote_identifier(table_name);
-	const data_identifier = quote_identifier(data_column);
-	const id_column_sql = resolve_id_column_sql(final_id_strategy);
-	const sql_text =
-		'CREATE TABLE IF NOT EXISTS ' + table_identifier + ' (' +
-		id_column_sql + ', ' + data_identifier + ' JSONB NOT NULL, ' +
-		'created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), ' +
-		'updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()' +
-		');';
-
-	await sql_runner(sql_text, []);
-}
-
-function resolve_id_column_sql(id_strategy) {
-	return ID_COLUMN_SQL_BY_STRATEGY[id_strategy];
-}
+/*
+ * MODULE RESPONSIBILITY
+ * Ensure the model backing table exists with the expected base columns.
+ */
+import {assert_identifier, quote_identifier} from '#src/utils/assert.js';
+import ID_STRATEGY, {assert_id_strategy} from '#src/constants/id-strategy.js';
+import run from '#src/sql/run.js';
+
+const ID_COLUMN_SQL_BY_STRATEGY = {
+	[ID_STRATEGY.bigserial]: 'id BIGSERIAL PRIMARY KEY',
+	[ID_STRATEGY.uuidv7]: 'id UUID PRIMARY KEY DEFAULT uuidv7()'
+};
+
+async function ensure_table(context) {
+	const {
+		table_name,
+		data_column,
+		id_strategy,
+		connection
+	} = context;
+
+	assert_identifier(table_name, 'table_name');
+	assert_identifier(data_column, 'data_column');
+	assert_id_strategy(id_strategy);
+
+	const final_id_strategy = id_strategy;
+	const table_identifier = quote_identifier(table_name);
+	const data_identifier = quote_identifier(data_column);
+	const id_column_sql = resolve_id_column_sql(final_id_strategy);
+	const sql_text =
+		`CREATE TABLE IF NOT EXISTS ` +
+		`${table_identifier} (${id_column_sql}, ${data_identifier} JSONB NOT NULL, ` +
+		`created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), ` +
+		`updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()` +
+		`);`;
+
+	await run(sql_text, [], connection);
+}
+
+function resolve_id_column_sql(id_strategy) {
+	return ID_COLUMN_SQL_BY_STRATEGY[id_strategy];
+}
+
+export default ensure_table;

package/src/migration/schema-indexes-resolver.js

@@ -1,6 +1,8 @@
-import {is_array} from '#src/utils/array.js';
-
-export default function resolve_schema_indexes(collection_schema) {
-	const schema_indexes = collection_schema?.get_indexes?.();
-	return is_array(schema_indexes) ? schema_indexes : [];
-}
+import {is_array} from '#src/utils/array.js';
+
+function resolve_schema_indexes(schema_instance) {
+	const schema_indexes = schema_instance.get_indexes();
+	return is_array(schema_indexes) ? schema_indexes : [];
+}
+
+export default resolve_schema_indexes;