@storecraft/database-sql-base 1.0.0 → 1.0.2

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

@@ -1,7 +1,8 @@
 import { App } from '@storecraft/core';
 import { SQL } from '@storecraft/database-sql-base';
-import { NodePlatform } from '@storecraft/platform-node';
-import  { api_index } from '@storecraft/test-runner'
+import { migrateToLatest } from '@storecraft/database-sql-base/migrate.js';
+import { NodePlatform } from '@storecraft/core/platform/node';
+import { api } from '@storecraft/core/test-runner'
 import SQLite from 'better-sqlite3'
 import { SqliteDialect } from 'kysely';
 import { homedir } from 'node:os';
@@ -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;
 }
@@ -35,65 +37,14 @@ export const create_app = async () => {
 async function test() {
   const app = await create_app();
 
-  Object.entries(api_index).slice(0, -1).forEach(
+  Object.entries(api).slice(0, -1).forEach(
     ([name, runner]) => {
       runner.create(app).run();
     }
   );
-  const last_test = Object.values(api_index).at(-1).create(app);
+  const last_test = Object.values(api).at(-1).create(app);
   last_test.after(async () => { await app.db.disconnect() });
   last_test.run();
 }
 
 test();
-
-async function test2() {
-  const app = await create_app();
-
-  // api_index.api_auth_test.create(app).run();
-
-  api_index.api_checkout_test.create(app).run();
-
-  // api_index.api_tags_crud_test.create(app).run();
-  // api_index.api_tags_list_test.create(app).run();
-
-  // api_index.api_collections_crud_test.create(app).run();
-  // api_index.api_collections_list_test.create(app).run();
-  // api_index.api_collections_products_test.create(app).run();
-
-  // api_index.api_products_crud_test.create(app).run();
-  // api_index.api_products_collections_test.create(app).run();
-  // api_index.api_products_list_test.create(app).run();
-  // api_index.api_products_discounts_test.create(app).run();
-  // api_index.api_products_variants_test.create(app).run();
-
-  // api_index.api_shipping_crud_test.create(app).run();
-  // api_index.api_shipping_list_test.create(app).run();
-
-  // api_index.api_posts_crud_test.create(app).run();
-  // api_index.api_posts_list_test.create(app).run();
-
-  // api_index.api_customers_crud_test.create(app).run();
-  // api_index.api_customers_list_test.create(app).run();
-
-  // api_index.api_orders_crud_test.create(app).run();
-  // api_index.api_orders_list_test.create(app).run();
-
-  // api_index.api_storefronts_crud_test.create(app).run();
-  // api_index.api_storefronts_list_test.create(app).run();
-  // api_index.api_storefronts_all_connections_test.create(app).run();
-
-  // api_index.api_notifications_crud_test.create(app).run();
-  // api_index.api_notifications_list_test.create(app).run();
-
-  // api_index.api_images_crud_test.create(app).run();
-  // api_index.api_images_list_test.create(app).run();
-
-  // api_index.api_discounts_crud_test.create(app).run();
-  // api_index.api_discounts_list_test.create(app).run();
-  // api_index.api_discounts_products_test.create(app).run();
-
-
-}
-
-// test2();

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/core/platform/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;
 }

package/types.sql.tables.d.ts

@@ -11,7 +11,7 @@ import { AttributeType, AuthUserType, Role, TagType,
   OrderPaymentGatewayData, NotificationType,
   NotificationAction,
   DiscountInfo,
-  DiscountApplicationEnum} from '@storecraft/core/v-api'
+  DiscountApplicationEnum} from '@storecraft/core/api'
 import {
   ColumnType,
   Generated,
@@ -120,8 +120,10 @@ export interface Base {
 export interface AuthUserTypeTable extends Base {
   email: string;
   password: string;
-  confirmed_mail: number
+  confirmed_mail: number;
   roles: JSONColumnType<Role[]>;
+  firstname: string;
+  lastname: string;
 }
 
 export interface TagsTable extends Base {

package/driver.js

@@ -1,190 +0,0 @@
-import { App } from '@storecraft/core';
-import { impl as auth_users } from './src/con.auth_users.js';
-import { impl as collections } from './src/con.collections.js';
-import { impl as customers } from './src/con.customers.js';
-import { impl as discounts } from './src/con.discounts.js';
-import { impl as images } from './src/con.images.js';
-import { impl as notifications } from './src/con.notifications.js';
-import { impl as orders } from './src/con.orders.js';
-import { impl as posts } from './src/con.posts.js';
-import { impl as products } from './src/con.products.js';
-import { impl as shipping } from './src/con.shipping.js';
-import { impl as storefronts } from './src/con.storefronts.js';
-import { impl as tags } from './src/con.tags.js';
-import { impl as templates } from './src/con.templates.js';
-import { impl as search } from './src/con.search.js';
-import { Kysely, ParseJSONResultsPlugin } from 'kysely'
-import { SanitizePlugin } from './src/kysely.sanitize.plugin.js';
-
-
-/**
- * @param {any} b 
- * @param {string} msg 
- */
-const assert = (b, msg) => {
-  if(!Boolean(b)) throw new Error(msg);
-}
-
-/**
- * @typedef {import('./types.public.js').Config} Config
- * @typedef {import('./types.sql.tables.js').Database} Database
- * @typedef {import('kysely').Dialect} Dialect
- * @typedef {import('@storecraft/core/v-database').db_driver} db_driver
-*/
-
-/**
- * @implements {db_driver}
- */
-export class SQL {
-
-  /** @type {boolean} */ 
-  #_is_ready;
-
-  /** @type {App<any, any, any>} */ 
-  #_app;
-
-  /** @type {Config} */ 
-  #_config;
-
-  /** @type {Kysely<Database>} */ 
-  #_client;
-  
-  /** @type {db_driver["resources"]} */ 
-  #_resources;
-
-  /**
-   * 
-   * @param {Config} [config] config 
-   */
-  constructor(config) {
-    this.#_is_ready = false;
-    this.#_config = config;
-
-    assert(
-      this.#_config.dialect, 
-      'No Dialect found !'
-    );
-
-    assert(
-      this.#_config.dialect_type, 
-      'No Dialect Type specified !'
-    );
-
-    this.#_client = new Kysely(
-      {
-        dialect: this.#_config.dialect, 
-        plugins: [
-          new ParseJSONResultsPlugin(),
-          new SanitizePlugin()
-        ]
-      }
-    );
-  }
-
-  throwIfNotReady() {
-    assert(
-      this.isReady,
-      'Database not ready !!! you need to `.init()` it'
-    );
-  }
-
-  /**
-   * 
-   * @param {boolean} [destroy_db_upon_completion=false] 
-   */
-  async migrateToLatest(destroy_db_upon_completion=false) {
-    this.throwIfNotReady();
-
-    const { migrateToLatest } = await import('./migrate.js');
-
-    await migrateToLatest(this, destroy_db_upon_completion);
-  };
-
-  /**
-   * 
-   * @param {App<any, any, any>} app 
-   * 
-   * 
-   * @returns {Promise<this>}
-   */
-  async init(app) {
-    if(this.isReady)
-      return this;
-
-    this.#_app = app;
-    
-    this.#_resources = {
-      auth_users: auth_users(this),
-      collections: collections(this),
-      customers: customers(this),
-      discounts: discounts(this),
-      images: images(this),
-      notifications: notifications(this),
-      orders: orders(this),
-      posts: posts(this),
-      products: products(this),
-      storefronts: storefronts(this),
-      tags: tags(this),
-      shipping_methods: shipping(this),
-      templates: templates(this),
-      search: search(this),
-    }
-    
-    this.#_is_ready = true; 
-
-    return this;
-  }
-
-  async disconnect() {
-    await this.client.destroy();
-    return true;
-  }
-
-  /**
-   * `database` resources
-   */
-  get resources () {
-    return this.#_resources;
-  }
-  
-  get name () { 
-    return 'main'; 
-  }
-
-  get app() { 
-    return this.#_app; 
-  }
-
-  get client() { 
-    return this.#_client; 
-  }
-
-  get config() { 
-    return this.#_config; 
-  }
-
-  get isReady() { 
-    return this.#_is_ready; 
-  }
-
-  get dialectType() { 
-    return this.#_config.dialect_type; 
-  }
-
-  get isSqlite() { 
-    return this.dialectType==='SQLITE'; 
-  }
-
-  get isPostgres() { 
-    return this.dialectType==='POSTGRES'; 
-  }
-
-  get isMysql() { 
-    return this.dialectType==='MYSQL'; 
-  }
-
-  get isMssql() { 
-    return this.dialectType==='MSSQL'; 
-  }
-
-}