@storecraft/database-sql-base 1.0.24 → 1.3.0

package/src/con.shipping.js

@@ -58,7 +58,8 @@ const get = (driver) => {
     const result = await driver.client
       .selectFrom(table_name)
       .selectAll()
-      .select(eb => [
+      .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),
@@ -125,15 +126,6 @@ const list = (driver) => {
       query, table_name
     ).execute();
 
-      // .where(
-      //   (eb) => {
-      //     return query_to_eb(eb, query, table_name);
-      //   }
-      // )
-      // .orderBy(query_to_sort(query, 'shipping_methods'))
-      // .limit(query.limitToLast ?? query.limit ?? 10)
-      // .execute();
-
     if(query.limitToLast) 
       items.reverse();
     

package/src/con.storefronts.js

@@ -221,16 +221,6 @@ const list = (driver) => {
       query, table_name
     ).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();
 
@@ -345,7 +335,8 @@ const get_default_auto_generated_storefront = (driver) => {
         ).as('posts'),
   
         stringArrayFrom(
-          eb.selectFrom('products')
+          eb
+          .selectFrom('products')
           .innerJoin(
             'entity_to_tags_projections', 
             'entity_to_tags_projections.entity_id', 

package/src/con.tags.js

@@ -109,15 +109,6 @@ const list = (driver) => {
       query, table_name
     ).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();
 

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

@@ -33,10 +33,9 @@ export const create_app = async () => {
       dialect: dialect, 
       dialect_type: 'MYSQL'
     })
-  )
+  ).init();
 
-  await app.init();
-  await migrateToLatest(app.db, false);
+  await migrateToLatest(app._.db, false);
   
   return app;
 }
@@ -46,11 +45,11 @@ async function test() {
 
   Object.entries(api).slice(0, -1).forEach(
     ([name, runner]) => {
-      runner.create(app).run();
+      runner.create(app._.app).run();
     }
   );
-  const last_test = Object.values(api).at(-1).create(app);
-  last_test.after(async () => { await app.db.disconnect() });
+  const last_test = Object.values(api).at(-1).create(app._.app);
+  last_test.after(async () => { await app._.disconnect() });
   last_test.run();
 }
 

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

@@ -33,10 +33,9 @@ export const create_app = async () => {
       dialect: pg_dialect, 
       dialect_type: 'POSTGRES'
     })
-  );
+  ).init();
   
-  await app.init();
-  await migrateToLatest(app.db, false);
+  await migrateToLatest(app._.db, false);
 
   return app;
 }
@@ -46,11 +45,11 @@ async function test() {
 
   Object.entries(api).slice(0, -1).forEach(
     ([name, runner]) => {
-      runner.create(app).run();
+      runner.create(app._.app).run();
     }
   );
-  const last_test = Object.values(api).at(-1).create(app);
-  last_test.after(async () => { await app.db.disconnect() });
+  const last_test = Object.values(api).at(-1).create(app._.app);
+  last_test.after(async () => { await app._.disconnect() });
   last_test.run();
 }
 

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

@@ -29,10 +29,9 @@ export const create_app = async () => {
       dialect: sqlite_dialect, 
       dialect_type: 'SQLITE'
     })
-  );
+  ).init();
  
-  await app.init();
-  await migrateToLatest(app.db, false);
+  await migrateToLatest(app._.db, false);
   
   return app;
 }
@@ -42,11 +41,11 @@ async function test() {
 
   Object.entries(api).slice(0, -1).forEach(
     ([name, runner]) => {
-      runner.create(app).run();
+      runner.create(app._.app).run();
     }
   );
-  const last_test = Object.values(api).at(-1).create(app);
-  last_test.after(async () => { await app.db.disconnect() });
+  const last_test = Object.values(api).at(-1).create(app._.app);
+  last_test.after(async () => { await app._.disconnect() });
   last_test.run();
 }
 

package/tests/sandbox.js

@@ -32,10 +32,9 @@ export const create_app = async () => {
       dialect: sqlite_dialect, 
       dialect_type: 'SQLITE'
     })
-  );
+  ).init();
  
-  await app.init();
-  await migrateToLatest(app.db, false);
+  await migrateToLatest(app._.db, false);
   
   return app;
 }
@@ -65,7 +64,8 @@ const resource_to_props = (
 
 async function test() {
   const app = await create_app();
-  const client = app.db.client;
+  const client = app._.db.client;
+  const dialectType = app._.db.dialectType;
   const limit = 0;
   const items = await client.selectNoFrom(
     eb => [
@@ -75,14 +75,14 @@ async function test() {
         .select(resource_to_props.collections)
         .select(
           eb => [
-            with_tags(eb, eb.ref('collections.id'), app.db.dialectType),
-            with_media(eb, eb.ref('collections.id'), app.db.dialectType),
+            with_tags(eb, eb.ref('collections.id'), dialectType),
+            with_media(eb, eb.ref('collections.id'), dialectType),
           ]
         )
         .where('active', '=', 1)
         .orderBy('updated_at', 'asc')
         .limit(limit),
-        app.db.dialectType
+        dialectType
       ).as('collections'),
 
       jsonArrayFrom(
@@ -91,18 +91,18 @@ async function test() {
         .select(resource_to_props.products)
         .select(
           eb => [
-            with_tags(eb, eb.ref('products.id'), app.db.dialectType),
-            with_media(eb, eb.ref('products.id'), app.db.dialectType),
-            products_with_collections(eb, eb.ref('products.id'), app.db.dialectType),
-            products_with_discounts(eb, eb.ref('products.id'), app.db.dialectType),
-            products_with_variants(eb, eb.ref('products.id'), app.db.dialectType),
-            products_with_related_products(eb, eb.ref('products.id'), app.db.dialectType),
+            with_tags(eb, eb.ref('products.id'), dialectType),
+            with_media(eb, eb.ref('products.id'), dialectType),
+            products_with_collections(eb, eb.ref('products.id'), dialectType),
+            products_with_discounts(eb, eb.ref('products.id'), dialectType),
+            products_with_variants(eb, eb.ref('products.id'), dialectType),
+            products_with_related_products(eb, eb.ref('products.id'), dialectType),
           ]
         )
         .where('active', '=', 1)
         .orderBy('updated_at', 'asc')
         .limit(limit),
-        app.db.dialectType
+        dialectType
       ).as('products'),
 
       jsonArrayFrom(
@@ -111,14 +111,14 @@ async function test() {
         .select(resource_to_props.discounts)
         .select(
           eb => [
-            with_tags(eb, eb.ref('discounts.id'), app.db.dialectType),
-            with_media(eb, eb.ref('discounts.id'), app.db.dialectType),
+            with_tags(eb, eb.ref('discounts.id'), dialectType),
+            with_media(eb, eb.ref('discounts.id'), dialectType),
           ]
         )
         .where('active', '=', 1)
         .orderBy('updated_at', 'asc')
         .limit(limit),
-        app.db.dialectType
+        dialectType
       ).as('discounts'),
 
       jsonArrayFrom(
@@ -127,14 +127,14 @@ async function test() {
         .select(resource_to_props.shipping_methods)
         .select(
           eb => [
-            with_tags(eb, eb.ref('shipping_methods.id'), app.db.dialectType),
-            with_media(eb, eb.ref('shipping_methods.id'), app.db.dialectType),
+            with_tags(eb, eb.ref('shipping_methods.id'), dialectType),
+            with_media(eb, eb.ref('shipping_methods.id'), dialectType),
           ]
         )
         .where('active', '=', 1)
         .orderBy('updated_at', 'asc')
         .limit(limit),
-        app.db.dialectType
+        dialectType
       ).as('shipping_methods'),
 
       jsonArrayFrom(
@@ -143,14 +143,14 @@ async function test() {
         .select(resource_to_props.posts)
         .select(
           eb => [
-            with_tags(eb, eb.ref('posts.id'), app.db.dialectType),
-            with_media(eb, eb.ref('posts.id'), app.db.dialectType),
+            with_tags(eb, eb.ref('posts.id'), dialectType),
+            with_media(eb, eb.ref('posts.id'), dialectType),
           ]
         )
         .where('active', '=', 1)
         .orderBy('updated_at', 'asc')
         .limit(limit),
-        app.db.dialectType
+        dialectType
       ).as('posts'),
 
       stringArrayFrom(
@@ -167,7 +167,7 @@ async function test() {
         )
         .select('entity_to_tags_projections.value as tag')
         .groupBy('tag'),
-        app.db.dialectType
+        dialectType
       ).as('all_products_tags')
     ]
   )
@@ -178,7 +178,7 @@ async function test() {
 
 async function test2() {
   const app = await create_app();
-  const client = app.db.client;
+  const client = app._.db.client;
   const items = await client.selectNoFrom(
     eb => Object
     .entries(resource_to_props)
@@ -193,9 +193,9 @@ async function test2() {
           eb
           .selectFrom(table_name)
           .select(props)
-          .orderBy(['updated_at asc'])
+          .orderBy('updated_at', 'asc')
           .limit(0),
-          app.db.dialectType
+          app._.db.dialectType
         ).as(table_name)
       }
     )

package/types.sql.tables.d.ts

@@ -19,6 +19,7 @@ import {
 export interface Database {
   auth_users: AuthUserTypeTable,
   tags: TagsTable
+  chats: ChatsTable
   collections: CollectionsTable,
   shipping_methods: ShippingMethodsTable;
   posts: PostsTable;
@@ -184,6 +185,12 @@ export interface TagsTable extends Base {
   values: JSONColumnType<string[]>;
 }
 
+export interface ChatsTable extends Base {
+  customer_id: string;
+  customer_email: string;
+  extra: JSONColumnType<object>;
+}
+
 export interface CollectionsTable extends Base {
   title: string;
   published: string | undefined;