@storecraft/database-sql-base 1.0.24 → 1.3.0

package/README.md

@@ -37,14 +37,15 @@ const app = new App(
   })
 )
 .withStorage(new NodeLocalStorage('storage'))
+.init();
 
-await app.init();
-await migrateToLatest(app.db, false);
- 
-const server = http.createServer(app.handler).listen(
+await migrateToLatest(app.__show_me_everything.db, false);
+await app.__show_me_everything.vector_store.createVectorIndex();
+
+http.createServer(app.handler).listen(
   8000,
   () => {
-    console.log(`Server is running on http://localhost:8000`);
+    app.print_banner('http://localhost:8000');
   }
 ); 
 

package/index.js

@@ -18,6 +18,7 @@ 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 chats } from './src/con.chats.js';
 import { impl as templates } from './src/con.templates.js';
 import { impl as search } from './src/con.search.js';
 import { Kysely, ParseJSONResultsPlugin } from 'kysely'
@@ -101,6 +102,7 @@ export class SQL {
       products: products(this),
       storefronts: storefronts(this),
       tags: tags(this),
+      chats: chats(this),
       shipping_methods: shipping(this),
       templates: templates(this),
       search: search(this),

package/migrations.mysql/00000_init_tables.js

@@ -8,7 +8,7 @@ import { CreateTableBuilder, Kysely } from 'kysely'
  * @template {string} B
  * @param {CreateTableBuilder<TB, B>} tb 
  */
-const add_base_columns = tb => {
+export const add_base_columns = tb => {
   return tb
     .addColumn('id', 'varchar(255)', (col) =>
       col.primaryKey()
@@ -26,7 +26,7 @@ const add_base_columns = tb => {
  * @param {Kysely<Database>} db
  * @param {keyof Database} table_name
  */
-const create_entity_to_value_table = (db, table_name) => {
+export const create_entity_to_value_table = (db, table_name) => {
 
   return db.schema
     .createTable(table_name).ifNotExists()
@@ -45,7 +45,7 @@ const create_entity_to_value_table = (db, table_name) => {
  * @param {Kysely<Database>} db 
  * @param {keyof Database} table_name 
  */
-const create_safe_table = (db, table_name) => {
+export const create_safe_table = (db, table_name) => {
   return db.schema.createTable(table_name).ifNotExists();
 }
 
@@ -54,7 +54,7 @@ const create_safe_table = (db, table_name) => {
  * @param {Kysely<Database>} db 
  * @param {keyof Database} table_name 
  */
-const drop_safe_table = (db, table_name) => {
+export const drop_safe_table = (db, table_name) => {
   return db.schema.dropTable(table_name).ifExists().execute();
 }
 
@@ -64,7 +64,7 @@ const drop_safe_table = (db, table_name) => {
  * @param {boolean} [include_id=true] 
  * @param {boolean} [include_handle=true] 
  */
-const create_base_indexes = async (db, table_name, include_id=true, include_handle=true) => {
+export const create_base_indexes = async (db, table_name, include_id=true, include_handle=true) => {
   if(include_id) {
     await db.schema.createIndex(`index_${table_name}_id_updated_at_asc`)
             .on(table_name)
@@ -95,7 +95,7 @@ const create_base_indexes = async (db, table_name, include_id=true, include_hand
  * 'products_to_collections' | 'products_to_discounts' | 
  * 'products_to_variants' | 'storefronts_to_other' | 'products_to_related_products'>} table_name 
  */
-const create_entity_table_indexes = async (db, table_name) => {
+export const create_entity_table_indexes = async (db, table_name) => {
   await db.schema.createIndex(`index_${table_name}_entity_id`)
            .on(table_name)
            .column('entity_id')
@@ -123,7 +123,6 @@ const create_entity_table_indexes = async (db, table_name) => {
  * @param {Kysely<Database>} db 
  */
 export async function up(db) {
-  // await drop_tables(db);
 
   { // auth_users
     let tb = create_safe_table(db, 'auth_users');
@@ -273,7 +272,7 @@ export async function up(db) {
   }
 
   { // storefronts_to_other
-    let tb = create_entity_to_value_table(db, 'storefronts_to_other').execute();
+    await create_entity_to_value_table(db, 'storefronts_to_other').execute();
     await create_entity_table_indexes(db, 'storefronts_to_other');
   }
 
@@ -314,17 +313,17 @@ export async function up(db) {
   } 
 
   { // entity_to_tags_projections
-    let tb = create_entity_to_value_table(db, 'entity_to_tags_projections').execute();
+    await create_entity_to_value_table(db, 'entity_to_tags_projections').execute();
     await create_entity_table_indexes(db, 'entity_to_tags_projections');
   }
 
   { // entity_to_search_terms
-    let tb = create_entity_to_value_table(db, 'entity_to_search_terms').execute();
+    await create_entity_to_value_table(db, 'entity_to_search_terms').execute();
     await create_entity_table_indexes(db, 'entity_to_search_terms');
   }
 
   { // entity_to_media
-    let tb = create_entity_to_value_table(db, 'entity_to_media').execute();
+    await create_entity_to_value_table(db, 'entity_to_media').execute();
     await create_entity_table_indexes(db, 'entity_to_media');
   }
 

package/migrations.mysql/00005_add_chats_table.js

@@ -0,0 +1,30 @@
+/**
+ * @import { Database } from '../types.sql.tables.js'
+ */
+import { Kysely } from 'kysely'
+import { 
+  add_base_columns, create_base_indexes, 
+  create_safe_table, drop_safe_table
+} from './00000_init_tables.js';
+
+/**
+ * @param {Kysely<Database>} db 
+ */
+export async function up(db) {
+
+  let tb = create_safe_table(db, 'chats');
+  tb = add_base_columns(tb);
+  tb = tb
+    .addColumn('customer_id', 'text')
+    .addColumn('customer_email', 'text')
+    .addColumn('extra', 'json')
+  await tb.execute();
+  await create_base_indexes(db, 'chats');
+}
+
+/**
+ * @param {Kysely<Database>} db 
+ */
+export async function down(db) {
+  await drop_safe_table(db, 'chats');
+}

package/migrations.postgres/00000_init_tables.js

@@ -8,7 +8,7 @@ import { CreateTableBuilder, Kysely } from 'kysely'
  * @template {string} B
  * @param {CreateTableBuilder<TB, B>} tb 
  */
-const add_base_columns = tb => {
+export const add_base_columns = tb => {
   return tb
     .addColumn('id', 'text', (col) =>
       col.primaryKey()
@@ -25,7 +25,7 @@ const add_base_columns = tb => {
  * @param {Kysely<Database>} db
  * @param {keyof Database} table_name
  */
-const create_entity_to_value_table = (db, table_name) => {
+export const create_entity_to_value_table = (db, table_name) => {
 
   return db.schema
     .createTable(table_name).ifNotExists()
@@ -44,7 +44,7 @@ const create_entity_to_value_table = (db, table_name) => {
  * @param {Kysely<Database>} db 
  * @param {keyof Database} table_name 
  */
-const create_safe_table = (db, table_name) => {
+export const create_safe_table = (db, table_name) => {
   return db.schema.createTable(table_name).ifNotExists();
 }
 
@@ -53,7 +53,7 @@ const create_safe_table = (db, table_name) => {
  * @param {Kysely<Database>} db 
  * @param {keyof Database} table_name 
  */
-const drop_safe_table = (db, table_name) => {
+export const drop_safe_table = (db, table_name) => {
   return db.schema.dropTable(table_name).ifExists().execute();
 }
 
@@ -63,7 +63,7 @@ const drop_safe_table = (db, table_name) => {
  * @param {boolean} [include_id=true] 
  * @param {boolean} [include_handle=true] 
  */
-const create_base_indexes = async (db, table_name, include_id=true, include_handle=true) => {
+export const create_base_indexes = async (db, table_name, include_id=true, include_handle=true) => {
   if(include_id) {
     await db.schema.createIndex(`index_${table_name}_id_updated_at_asc`).ifNotExists()
             .on(table_name)
@@ -95,7 +95,7 @@ const create_base_indexes = async (db, table_name, include_id=true, include_hand
  * 'products_to_collections' | 'products_to_discounts' | 
  * 'products_to_variants' | 'storefronts_to_other' | 'products_to_related_products'>} table_name 
  */
-const create_entity_table_indexes = async (db, table_name) => {
+export const create_entity_table_indexes = async (db, table_name) => {
   await db.schema.createIndex(`index_${table_name}_entity_id`).ifNotExists()
            .on(table_name)
            .column('entity_id')
@@ -272,7 +272,7 @@ export async function up(db) {
   }
 
   { // storefronts_to_other
-    let tb = create_entity_to_value_table(db, 'storefronts_to_other').execute();
+    await create_entity_to_value_table(db, 'storefronts_to_other').execute();
     await create_entity_table_indexes(db, 'storefronts_to_other');
   }
 
@@ -313,17 +313,17 @@ export async function up(db) {
   } 
 
   { // entity_to_tags_projections
-    let tb = create_entity_to_value_table(db, 'entity_to_tags_projections').execute();
+    await create_entity_to_value_table(db, 'entity_to_tags_projections').execute();
     await create_entity_table_indexes(db, 'entity_to_tags_projections');
   }
 
   { // entity_to_search_terms
-    let tb = create_entity_to_value_table(db, 'entity_to_search_terms').execute();
+    await create_entity_to_value_table(db, 'entity_to_search_terms').execute();
     await create_entity_table_indexes(db, 'entity_to_search_terms');
   }
 
   { // entity_to_media
-    let tb = create_entity_to_value_table(db, 'entity_to_media').execute();
+    await create_entity_to_value_table(db, 'entity_to_media').execute();
     await create_entity_table_indexes(db, 'entity_to_media');
   }
 

package/migrations.postgres/00005_add_chats_table.js

@@ -0,0 +1,31 @@
+/**
+ * @import { Database } from '../types.sql.tables.js'
+ */
+import { Kysely } from 'kysely'
+import { 
+  add_base_columns, create_base_indexes, 
+  create_safe_table, drop_safe_table
+} from './00000_init_tables.js';
+
+/**
+ * @param {Kysely<Database>} db 
+ */
+export async function up(db) {
+
+  let tb = create_safe_table(db, 'chats');
+  tb = add_base_columns(tb);
+  tb = tb
+    .addColumn('customer_id', 'text')
+    .addColumn('customer_email', 'text')
+    .addColumn('extra', 'json')
+  await tb.execute();
+  await create_base_indexes(db, 'chats');
+
+}
+
+/**
+ * @param {Kysely<Database>} db 
+ */
+export async function down(db) {
+  await drop_safe_table(db, 'chats');
+}

package/migrations.sqlite/00000_init_tables.js

@@ -8,7 +8,7 @@ import { CreateTableBuilder, Kysely } from 'kysely'
  * @template {string} B
  * @param {CreateTableBuilder<TB, B>} tb 
  */
-const add_base_columns = tb => {
+export const add_base_columns = tb => {
   return tb
     .addColumn('id', 'text', (col) =>
       col.primaryKey()
@@ -25,7 +25,7 @@ const add_base_columns = tb => {
  * @param {Kysely<Database>} db
  * @param {keyof Database} table_name
  */
-const create_entity_to_value_table = (db, table_name) => {
+export const create_entity_to_value_table = (db, table_name) => {
   return db.schema
     .createTable(table_name).ifNotExists()
     .addColumn('id', 'integer', 
@@ -43,7 +43,7 @@ const create_entity_to_value_table = (db, table_name) => {
  * @param {Kysely<Database>} db 
  * @param {keyof Database} table_name 
  */
-const create_safe_table = (db, table_name) => {
+export const create_safe_table = (db, table_name) => {
   return db.schema.createTable(table_name).ifNotExists();
 }
 
@@ -51,7 +51,7 @@ const create_safe_table = (db, table_name) => {
  * @param {Kysely<Database>} db 
  * @param {keyof Database} table_name 
  */
-const drop_safe_table = (db, table_name) => {
+export const drop_safe_table = (db, table_name) => {
   return db.schema.dropTable(table_name).ifExists().execute();
 }
 
@@ -61,7 +61,7 @@ const drop_safe_table = (db, table_name) => {
  * @param {boolean} [include_id=true] 
  * @param {boolean} [include_handle=true] 
  */
-const create_base_indexes = async (db, table_name, include_id=true, include_handle=true) => {
+export const create_base_indexes = async (db, table_name, include_id=true, include_handle=true) => {
   if(include_id) {
     await db.schema.createIndex(`index_${table_name}_id_updated_at_asc`).ifNotExists()
             .on(table_name)
@@ -93,7 +93,7 @@ const create_base_indexes = async (db, table_name, include_id=true, include_hand
  * 'products_to_collections' | 'products_to_discounts' | 
  * 'products_to_variants' | 'products_to_related_products' | 'storefronts_to_other'>} table_name 
  */
-const create_entity_table_indexes = async (db, table_name) => {
+export const create_entity_table_indexes = async (db, table_name) => {
   await db.schema.createIndex(`index_${table_name}_entity_id`).ifNotExists()
            .on(table_name)
            .column('entity_id')

package/migrations.sqlite/00005_add_chats_table.js

@@ -0,0 +1,31 @@
+/**
+ * @import { Database } from '../types.sql.tables.js'
+ */
+import { Kysely } from 'kysely'
+import { 
+  add_base_columns, create_base_indexes, 
+  create_safe_table, drop_safe_table
+} from './00000_init_tables.js';
+
+/**
+ * @param {Kysely<Database>} db 
+ */
+export async function up(db) {
+
+  let tb = create_safe_table(db, 'chats');
+  tb = add_base_columns(tb);
+  tb = tb
+    .addColumn('customer_id', 'text')
+    .addColumn('customer_email', 'text')
+    .addColumn('extra', 'json')
+  await tb.execute();
+  await create_base_indexes(db, 'chats');
+
+}
+
+/**
+ * @param {Kysely<Database>} db 
+ */
+export async function down(db) {
+  await drop_safe_table(db, 'chats');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-sql-base",
-  "version": "1.0.24",
+  "version": "1.3.0",
   "description": "Official SQL Database driver for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",
@@ -33,8 +33,7 @@
     "database-sql-base:test:postgres": "node ./tests/runner.postgres-local.test.js",
     "database-sql-base:test:mysql": "node ./tests/runner.mysql-local.test.js",
     "test": "npm run database-sql-base:test:sqlite && npm run database-sql-base:test:postgres && npm run database-sql-base:test:mysql",
-    "sc-publish": "npm publish",
-    "prepublishOnly": "npm version patch --force"
+    "sc-publish": "npm publish"
   },
   "dependencies": {
     "@storecraft/core": "^1.0.0",

package/src/con.auth_users.js

@@ -134,13 +134,6 @@ const list = (driver) => {
         with_media(eb, eb.ref('auth_users.id'), driver.dialectType),
       ]),
       query, table_name
-      // .where(
-      //   (eb) => {
-      //     return query_to_eb(eb, query, table_name);
-      //   }
-      // )
-      // .orderBy(query_to_sort(query, 'auth_users'))
-      // .limit(query.limitToLast ?? query.limit ?? 10)
     )
     .execute();
 

package/src/con.chats.js

@@ -0,0 +1,151 @@
+/**
+ * @import { db_chats as db_col } from '@storecraft/core/database'
+ */
+import { SQL } from '../index.js'
+import { report_document_media } from './con.images.js'
+import { 
+  count_regular, 
+  delete_me, delete_media_of, delete_search_of, delete_tags_of, 
+  insert_media_of, insert_search_of, insert_tags_of, 
+  regular_upsert_me, where_id_or_handle_table, 
+  with_media,  with_search,  with_tags
+} from './con.shared.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
+import { withQuery } from './utils.query.js'
+
+export const table_name = 'chats'
+
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["upsert"]}
+ */
+const upsert = (driver) => {
+  return async (item, search_terms) => {
+    const c = driver.client;
+    try {
+      const t = await c.transaction().execute(
+        async (trx) => {
+          await insert_search_of(trx, search_terms, item.id, item.handle, table_name);
+          await insert_media_of(trx, item.media, item.id, item.handle, table_name);
+          await insert_tags_of(trx, item.tags, item.id, item.handle, table_name);
+          await report_document_media(driver)(item, trx);
+          await regular_upsert_me(trx, table_name, {
+            active: item.active ? 1 : 0,
+            attributes: JSON.stringify(item.attributes),
+            description: item.description,
+            created_at: item.created_at,
+            updated_at: item.updated_at,
+            id: item.id,
+            handle: item.id,
+            customer_email: item.customer_email,
+            customer_id: item.customer_id,
+            extra: JSON.stringify(item.extra),
+          });
+        }
+      );
+    } catch(e) {
+      console.log(e);
+      return false;
+    }
+    return true;
+  }
+}
+
+
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["get"]}
+ */
+const get = (driver) => {
+  return async (id_or_handle, options) => {
+    const result = await driver.client
+      .selectFrom(table_name)
+      .selectAll()
+      .select(
+        eb => [
+          with_media(eb, id_or_handle, driver.dialectType),
+          with_tags(eb, id_or_handle, driver.dialectType),
+          with_search(eb, id_or_handle, driver.dialectType),
+        ].filter(Boolean)
+      )
+      .where(where_id_or_handle_table(id_or_handle))
+      .executeTakeFirst();
+
+    return sanitize(result);
+  }
+}
+
+
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["remove"]}
+ */
+const remove = (driver) => {
+  return async (id_or_handle) => {
+    try {
+      await driver.client.transaction().execute(
+        async (trx) => {
+            
+          // entities
+          await delete_tags_of(trx, id_or_handle, id_or_handle, table_name);
+          await delete_search_of(trx, id_or_handle, id_or_handle, table_name);
+          await delete_media_of(trx, id_or_handle, id_or_handle, table_name);
+          // delete me
+          await delete_me(trx, table_name, id_or_handle);
+        }
+      );
+
+    } catch(e) {
+      console.log(e);
+      return false;
+    }
+    return true;
+  }
+}
+
+
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["list"]}
+ */
+const list = (driver) => {
+  return async (query) => {
+
+    const items = await withQuery(
+      driver.client
+      .selectFrom(table_name)
+      .selectAll()
+      .select(
+        eb => [
+          with_media(eb, eb.ref('chats.id'), driver.dialectType),
+          with_tags(eb, eb.ref('chats.id'), driver.dialectType),
+          with_search(eb, eb.ref('chats.id'), driver.dialectType),
+        ].filter(Boolean)
+      ),
+      query, table_name
+    )
+    .execute();
+    // console.log({items})
+
+    if(query.limitToLast) 
+      items.reverse();
+    
+    return sanitize_array(items);
+  }
+}
+
+
+/** 
+ * @param {SQL} driver
+ * @return {db_col}}
+ * */
+export const impl = (driver) => {
+
+  return {
+    get: get(driver),
+    upsert: upsert(driver),
+    remove: remove(driver),
+    list: list(driver),
+    count: count_regular(driver, table_name),
+  }
+}

package/src/con.collections.js

@@ -10,7 +10,11 @@ import {
   regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, 
   count_regular,
-  with_search
+  with_search,
+  products_with_collections,
+  products_with_discounts,
+  products_with_variants,
+  products_with_related_products
 } from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, withQuery, withSort } from './utils.query.js'
@@ -132,15 +136,6 @@ const list = (driver) => {
       query, table_name
     ).execute();
 
-      // .where(
-      //   (eb) => {
-      //     return query_to_eb(eb, query, table_name);
-      //   }
-      // )
-      // .orderBy(query_to_sort(query, 'collections'))
-      // .limit(query.limitToLast ?? query.limit ?? 10)
-      // .execute();
-
     if(query.limitToLast) items.reverse();
 
     return sanitize_array(items);
@@ -154,6 +149,17 @@ const list = (driver) => {
 const list_collection_products = (driver) => {
   return async (handle_or_id, query={}) => {
 
+    const expand = query.expand ?? ['*'];
+    const expand_collections = expand.includes('*') || 
+      expand.includes('collections');
+    const expand_discounts = expand.includes('*') || 
+      expand.includes('discounts');
+    // @ts-ignore
+    const expand_variants = expand.includes('*') || 
+      expand.includes('variants');
+    const expand_related_products = expand.includes('*') || 
+      expand.includes('related_products');
+
     const items = await withSort(
       driver.client
       .selectFrom('products')
@@ -167,7 +173,27 @@ const list_collection_products = (driver) => {
         eb => [
           with_media(eb, eb.ref('products.id'), driver.dialectType),
           with_tags(eb, eb.ref('products.id'), driver.dialectType),
-        ]
+
+          expand_collections && 
+          products_with_collections(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
+
+          expand_discounts && 
+          products_with_discounts(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
+
+          expand_variants && 
+          products_with_variants(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
+
+          expand_related_products && 
+          products_with_related_products(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),        
+        ].filter(Boolean)
       )
       .where(
         (eb) => eb.and(
@@ -185,11 +211,6 @@ const list_collection_products = (driver) => {
       .limit(query.limitToLast ?? query.limit ?? 10),
       query, 'products'
     ).execute()
-      // .orderBy(query_to_sort(query, 'products'))
-      // .execute();
-
-      // .compile();
-      // console.log(items[0])
 
     if(query.limitToLast) 
       items.reverse();

package/src/con.customers.js

@@ -140,16 +140,8 @@ const list = (driver) => {
         with_search(eb, eb.ref('customers.id'), driver.dialectType),
       ].filter(Boolean)), 
       query, table_name
-  ).execute();
+    ).execute();
   
-    // .where(
-    //   (eb) => {
-    //     return query_to_eb(eb, query, table_name);
-    //   }
-  // .orderBy(query_to_sort(query, table_name))
-      // .limit(query.limitToLast ?? query.limit ?? 10)
-      // .execute();
-
     if(query.limitToLast) items.reverse();
 
     return sanitize_array(items);
@@ -163,6 +155,8 @@ const list = (driver) => {
 const list_customer_orders = (driver) => {
   return async (id, query) => {
 
+    console.dir({ id, query }, { depth: 5 });
+
     const items = await withSort(
       driver.client
       .selectFrom('orders')
@@ -174,7 +168,7 @@ const list_customer_orders = (driver) => {
       .where(
         (eb) => eb.and(
           [
-            query_to_eb(eb, query, table_name),
+            query_to_eb(eb, query, 'orders'),
             eb.or(
               [
                 eb('_customer_id', '=', id),
@@ -187,8 +181,6 @@ const list_customer_orders = (driver) => {
       .limit(query.limitToLast ?? query.limit ?? 10),
       query, 'orders'
     ).execute();
-      // .orderBy(query_to_sort(query, 'orders'))
-      // .execute();
 
     if(query.limitToLast) 
       items.reverse();