@storecraft/database-sql-base 1.0.0 → 1.0.1

package/src/con.shared.js

@@ -273,7 +273,7 @@ export const delete_me = async (trx, table_name, id_or_handle) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const with_tags = (eb, id_or_handle, sql_type) => {
   return stringArrayFrom(
@@ -287,7 +287,7 @@ export const with_tags = (eb, id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const with_search = (eb, id_or_handle, sql_type) => {
   return stringArrayFrom(
@@ -301,7 +301,7 @@ export const with_search = (eb, id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const with_media = (eb, id_or_handle, sql_type) => {
   return stringArrayFrom(
@@ -331,7 +331,7 @@ const select_base_from = (eb, table) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const products_with_collections = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -355,7 +355,7 @@ export const products_with_collections = (eb, product_id_or_handle, sql_type) =>
  * 
  * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const products_with_discounts = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -382,7 +382,7 @@ export const products_with_discounts = (eb, product_id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const products_with_variants = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -413,7 +413,7 @@ export const products_with_variants = (eb, product_id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const products_with_related_products = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -445,7 +445,7 @@ export const products_with_related_products = (eb, product_id_or_handle, sql_typ
  * 
  * @param {import('kysely').ExpressionBuilder<Database, 'storefronts'>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const storefront_with_collections = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -469,7 +469,7 @@ export const storefront_with_collections = (eb, sf_id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const storefront_with_products = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -500,7 +500,7 @@ export const storefront_with_products = (eb, sf_id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const storefront_with_discounts = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -527,7 +527,7 @@ export const storefront_with_discounts = (eb, sf_id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const storefront_with_posts = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
@@ -551,7 +551,7 @@ export const storefront_with_posts = (eb, sf_id_or_handle, sql_type) => {
  * 
  * @param {import('kysely').ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.js').SqlDialectType} sql_type 
+ * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
  */
 export const storefront_with_shipping = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(

package/tests/runner.mssql-local.test.js

@@ -1,6 +1,7 @@
 import { App } from '@storecraft/core';
 import { SQL } from '@storecraft/database-sql-base';
-import { NodePlatform } from '@storecraft/platform-node';
+import { migrateToLatest } from '@storecraft/database-sql-base/migrate.js';
+import { NodePlatform } from '@storecraft/platforms/node';
 import  { api_index } from '@storecraft/test-runner'
 import { MssqlDialect } from 'kysely';
 import * as Tedious from 'tedious';
@@ -42,14 +43,13 @@ export const create_app = async () => {
     }),
     null, null, {
       auth_admins_emails: ['admin@sc.com'],
-      auth_password_hash_rounds: 100,
       auth_secret_access_token: 'auth_secret_access_token',
       auth_secret_refresh_token: 'auth_secret_refresh_token'
     }
   );
 
   await app.init();
-  await app.db.migrateToLatest();
+  await migrateToLatest(app.db, false);
   return app;
 }
 

package/tests/runner.mysql-local.test.js

@@ -1,6 +1,7 @@
 import { App } from '@storecraft/core';
 import { SQL } from '@storecraft/database-sql-base';
-import { NodePlatform } from '@storecraft/platform-node';
+import { migrateToLatest } from '@storecraft/database-sql-base/migrate.js';
+import { NodePlatform } from '@storecraft/platforms/node';
 import  { api_index } from '@storecraft/test-runner'
 import { MysqlDialect } from 'kysely';
 import { createPool } from 'mysql2'
@@ -16,22 +17,23 @@ export const dialect = new MysqlDialect({
 });
 
 export const create_app = async () => {
-  let app = new App(
-    new NodePlatform(),
-    new SQL({
-      dialect: dialect, 
-      dialect_type: 'MYSQL'
-    }),
-    null, null, {
+  const app = new App(
+    {
       auth_admins_emails: ['admin@sc.com'],
-      auth_password_hash_rounds: 100,
       auth_secret_access_token: 'auth_secret_access_token',
       auth_secret_refresh_token: 'auth_secret_refresh_token'
     }
-  );
+  )
+  .withPlatform(new NodePlatform())
+  .withDatabase(
+    new SQL({
+      dialect: dialect, 
+      dialect_type: 'MYSQL'
+    })
+  )
 
   await app.init();
-  await app.db.migrateToLatest();
+  await migrateToLatest(app.db, false);
   
   return app;
 }

package/tests/runner.postgres-local.test.js

@@ -1,6 +1,7 @@
 import { App } from '@storecraft/core';
 import { SQL } from '@storecraft/database-sql-base';
-import { NodePlatform } from '@storecraft/platform-node';
+import { migrateToLatest } from '@storecraft/database-sql-base/migrate.js';
+import { NodePlatform } from '@storecraft/platforms/node';
 import  { api_index } from '@storecraft/test-runner'
 import { PostgresDialect } from 'kysely';
 import pg from 'pg'
@@ -15,22 +16,25 @@ const pg_dialect = new PostgresDialect({
 });
 
 export const create_app = async () => {
-  let app = new App(
-    new NodePlatform(),
-    new SQL({
-      dialect: pg_dialect, 
-      dialect_type: 'POSTGRES'
-    }),
-    null, null, {
+
+  const app = new App(
+    {
       auth_admins_emails: ['admin@sc.com'],
-      auth_password_hash_rounds: 100,
       auth_secret_access_token: 'auth_secret_access_token',
       auth_secret_refresh_token: 'auth_secret_refresh_token'
     }
+  )
+  .withPlatform(new NodePlatform())
+  .withDatabase(
+    new SQL({
+      dialect: pg_dialect, 
+      dialect_type: 'POSTGRES'
+    })
   );
   
   await app.init();
-  await app.db.migrateToLatest();
+  await migrateToLatest(app.db, false);
+
   return app;
 }
 

package/tests/runner.sqlite-local.test.js

@@ -1,6 +1,7 @@
 import { App } from '@storecraft/core';
 import { SQL } from '@storecraft/database-sql-base';
-import { NodePlatform } from '@storecraft/platform-node';
+import { migrateToLatest } from '@storecraft/database-sql-base/migrate.js';
+import { NodePlatform } from '@storecraft/platforms/node';
 import  { api_index } from '@storecraft/test-runner'
 import SQLite from 'better-sqlite3'
 import { SqliteDialect } from 'kysely';
@@ -12,22 +13,23 @@ export const sqlite_dialect = new SqliteDialect({
 });
 
 export const create_app = async () => {
-  let app = new App(
-    new NodePlatform(),
-    new SQL({
-      dialect: sqlite_dialect, 
-      dialect_type: 'SQLITE'
-    }),
-    null, null, {
+  const app = new App(
+    {
       auth_admins_emails: ['admin@sc.com'],
-      auth_password_hash_rounds: 100,
       auth_secret_access_token: 'auth_secret_access_token',
       auth_secret_refresh_token: 'auth_secret_refresh_token'
     }
+  )
+  .withPlatform(new NodePlatform())
+  .withDatabase(
+    new SQL({
+      dialect: sqlite_dialect, 
+      dialect_type: 'SQLITE'
+    })
   );
  
   await app.init();
-  await app.db.migrateToLatest();
+  await migrateToLatest(app.db, false);
   
   return app;
 }

package/tests/sandbox.test.js

@@ -1,33 +1,35 @@
 import { App } from '@storecraft/core';
-import { MongoDB } from '@storecraft/database-mongodb-node';
-import { NodePlatform } from '@storecraft/platform-node';
+import { NodePlatform } from '@storecraft/platforms/node';
 import { SqliteDialect } from 'kysely';
 import { homedir } from 'os';
 import { join } from 'path';
 import SQLite from 'better-sqlite3'
 import { SQL } from '../index.js';
+import { migrateToLatest } from '../migrate.js';
 
 export const sqlite_dialect = new SqliteDialect({
   database: async () => new SQLite(join(homedir(), 'db.sqlite')),
 });
 
 export const create_app = async () => {
-  let app = new App(
-    new NodePlatform(),
-    new SQL({
-      dialect: sqlite_dialect, 
-      dialect_type: 'SQLITE'
-    }),
-    null, null, {
+
+  const app = new App(
+    {
       auth_admins_emails: ['admin@sc.com'],
-      auth_password_hash_rounds: 100,
       auth_secret_access_token: 'auth_secret_access_token',
       auth_secret_refresh_token: 'auth_secret_refresh_token'
     }
-  );
+  )
+  .withPlatform(new NodePlatform())
+  .withDatabase(
+    new SQL({
+      dialect: sqlite_dialect, 
+      dialect_type: 'SQLITE'
+    })
+  )
  
   await app.init();
-  await app.db.migrateToLatest();
+  await migrateToLatest(app.db, false);
   
   return app;
 }
@@ -49,7 +51,7 @@ const withTime = async (fn) => {
 async function test() {
   const app = await withTime(create_app);
 
-  await app.db.migrateToLatest(false);
+  await migrateToLatest(app.db, false);
 
 
   const doit = async () => {

package/types.public.d.ts

@@ -1,6 +1,6 @@
-import type { Dialect } from 'kysely'
+import type { Dialect } from 'kysely';
 
-export * from './index.js'
+export { SQL } from './index.js';
 
 export type SqlDialectType = 'SQLITE' | 'POSTGRES' | 'MYSQL';
 
@@ -9,11 +9,19 @@ export type SqlDialectType = 'SQLITE' | 'POSTGRES' | 'MYSQL';
  */
 export type Config = {
   /**
-   * The Kysely dialect
+   * @description Database name
+   * 
+   * @default main
+   */
+  db_name?: string,
+
+  /**
+   * @description The `Kysely` dialect
    */
   dialect: Dialect,
+
   /**
-   * The type of the sql dialect `SQLITE`, `POSTGRES`, `MYSQL`, `MSSQL`
+   * @description The type of the sql dialect `SQLITE`, `POSTGRES`, `MYSQL`
    */
   dialect_type: SqlDialectType;
 }