@storecraft/database-sql-base 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-sql-base",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Official SQL Database driver for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",
@@ -33,6 +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"
   },
   "dependencies": {

package/src/con.auth_users.js

@@ -1,9 +1,9 @@
 import { SQL } from '../index.js'
-import { sanitize_array } from './utils.funcs.js'
-import { count_regular, delete_me, insert_search_of, insert_tags_of, regular_upsert_me, 
-  where_id_or_handle_table, 
-  with_media, 
-  with_tags} from './con.shared.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
+import { 
+  count_regular, delete_me, insert_search_of, insert_tags_of, regular_upsert_me, 
+  where_id_or_handle_table, with_media, with_tags
+} from './con.shared.js'
 import { query_to_eb, query_to_sort } from './utils.query.js';
 
 /**
@@ -60,7 +60,8 @@ const get = (driver) => {
       .selectFrom(table_name)
       .selectAll()
       .where(where_id_or_handle_table(id_or_email))
-      .executeTakeFirst();
+      .executeTakeFirst()
+      .then(sanitize);
   }
 }
 
@@ -70,11 +71,12 @@ const get = (driver) => {
  * @returns {db_col["getByEmail"]}
  */
 const getByEmail = (driver) => {
-  return (email) => {
+  return async (email) => {
     return driver.client
       .selectFrom('auth_users')
       .selectAll().where('email', '=', email)
-      .executeTakeFirst();
+      .executeTakeFirst()
+      .then(sanitize);
   }
 }
 
@@ -134,13 +136,13 @@ const list = (driver) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'auth_users'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
     if(query.limitToLast) items.reverse();
 
-    return items;
+    return sanitize_array(items);
   }
 }
 

package/src/con.collections.js

@@ -6,8 +6,9 @@ import { delete_entity_values_by_value_or_reporter, delete_me,
   select_entity_ids_by_value_or_reporter, 
   regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, 
-  count_regular} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  count_regular,
+  with_search} from './con.shared.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 
@@ -61,17 +62,17 @@ const upsert = (driver) => {
  */
 const get = (driver) => {
   return (id_or_handle, options) => {
-
     return driver.client
       .selectFrom(table_name)
       .selectAll('collections')
       .select(eb => [
         with_tags(eb, eb.ref('collections.id'), driver.dialectType),
-        with_media(eb, eb.ref('collections.id'), driver.dialectType)
+        with_media(eb, eb.ref('collections.id'), driver.dialectType),
+        with_search(eb, eb.ref('collections.id'), driver.dialectType)
       ])
       .where(where_id_or_handle_table(id_or_handle))
-    //  .compile()
-      .executeTakeFirst();
+      .executeTakeFirst()
+      .then(sanitize);
   }
 }
 
@@ -124,13 +125,14 @@ const list = (driver) => {
       .select(eb => [
         with_tags(eb, eb.ref('collections.id'), driver.dialectType),
         with_media(eb, eb.ref('collections.id'), driver.dialectType),
+        with_search(eb, eb.ref('collections.id'), driver.dialectType),
       ])
       .where(
         (eb) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'collections'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
@@ -166,7 +168,7 @@ const list_collection_products = (driver) => {
           ].filter(Boolean)
         )
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'products'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.customers.js

@@ -3,8 +3,8 @@ 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_tags} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  with_media, with_search, with_tags} from './con.shared.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
@@ -64,9 +64,11 @@ const get = (driver) => {
       .select(eb => [
         with_media(eb, id, driver.dialectType),
         with_tags(eb, id, driver.dialectType),
+        with_search(eb, id, driver.dialectType),
       ])
       .where(where_id_or_handle_table(id))
-      .executeTakeFirst();
+      .executeTakeFirst()
+      .then(sanitize);
   }
 }
 
@@ -129,13 +131,14 @@ const list = (driver) => {
       .select(eb => [
         with_media(eb, eb.ref('customers.id'), driver.dialectType),
         with_tags(eb, eb.ref('customers.id'), driver.dialectType),
+        with_search(eb, eb.ref('customers.id'), driver.dialectType),
       ].filter(Boolean))
       .where(
         (eb) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, table_name))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
@@ -174,7 +177,7 @@ const list_customer_orders = (driver) => {
           ].filter(Boolean)
         )
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'orders'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.discounts.js

@@ -6,8 +6,9 @@ import { delete_entity_values_by_value_or_reporter,
   delete_tags_of, insert_media_of, insert_search_of, 
   insert_tags_of, select_entity_ids_by_value_or_reporter, regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags,
-  count_regular} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  count_regular,
+  with_search} from './con.shared.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 import { report_document_media } from './con.images.js'
 
@@ -37,6 +38,12 @@ const upsert = (driver) => {
           // remove all products relation to this discount
           await delete_entity_values_by_value_or_reporter('products_to_discounts')(
             trx, item.id, item.handle);
+
+          await delete_entity_values_by_value_or_reporter('entity_to_search_terms')(
+            trx, `discount:${item.id}`);
+          await delete_entity_values_by_value_or_reporter('entity_to_search_terms')(
+            trx, `discount:${item.handle}`);
+
           if(item.active && item.application.id===enums.DiscountApplicationEnum.Auto.id) {
             // make connections
             await trx
@@ -56,6 +63,37 @@ const upsert = (driver) => {
                 )
             ).execute();
 
+            await trx
+            .insertInto('entity_to_search_terms')
+            .columns(['entity_handle', 'entity_id', 'value'])
+            .expression(eb => 
+              eb.selectFrom('products')
+                .select(eb => [
+                    'handle as entity_handle',
+                    'id as entity_id',
+                    eb.val(`discount:${item.id}`).as('value'),
+                  ]
+                )
+                .where(
+                  eb => eb.and(discount_to_conjunctions(eb, item))
+                )
+            ).execute();      
+
+            await trx
+            .insertInto('entity_to_search_terms')
+            .columns(['entity_handle', 'entity_id', 'value'])
+            .expression(eb => 
+              eb.selectFrom('products')
+                .select(eb => [
+                    'handle as entity_handle',
+                    'id as entity_id',
+                    eb.val(`discount:${item.handle}`).as('value'),
+                  ]
+                )
+                .where(
+                  eb => eb.and(discount_to_conjunctions(eb, item))
+                )
+            ).execute();                     
           }
 
           ///
@@ -100,9 +138,11 @@ const get = (driver) => {
       .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();
+      .executeTakeFirst()
+      .then(sanitize);
   }
 }
 
@@ -156,13 +196,14 @@ const list = (driver) => {
       .select(eb => [
         with_media(eb, eb.ref('discounts.id'), driver.dialectType),
         with_tags(eb, eb.ref('discounts.id'), driver.dialectType),
+        with_search(eb, eb.ref('discounts.id'), driver.dialectType),
       ].filter(Boolean))
       .where(
         (eb) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, table_name))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
@@ -179,6 +220,10 @@ const list = (driver) => {
 const list_discount_products = (driver) => {
   return async (handle_or_id, query={}) => {
 
+    // TODO: try to rewrite this with JOIN to products_to_discounts ON products.id=entity_id
+    // TODO: and then filter by value==handle_or_id_of_discount
+    // TODO: I think it will be better and more memory efficient for the database
+    // TODO: becausee right now it loads all the eligible products ids in advance
     const items = await driver.client
       .selectFrom('products')
       .selectAll()
@@ -198,7 +243,7 @@ const list_discount_products = (driver) => {
           ].filter(Boolean)
         )
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'products'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.discounts.utils.js

@@ -66,8 +66,10 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_products.op:
         {
-          /** @type {import("@storecraft/core/api").FilterValue_p_in_products} */
-          const cast = Array.isArray(filter?.value) ? filter.value : [];
+          
+          const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_products} */ (
+            Array.isArray(filter?.value) ? filter.value : []
+          );
 
           conjunctions.push(
             eb(
@@ -79,8 +81,10 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_not_in_products.op:
         {
-          /** @type {import("@storecraft/core/api").FilterValue_p_not_in_products} */
-          const cast = Array.isArray(filter?.value) ? filter.value : [];
+          
+          const cast = /** @type {import("@storecraft/core/api").FilterValue_p_not_in_products} */ (
+            Array.isArray(filter?.value) ? filter.value : []
+          );
 
           conjunctions.push(
             eb(
@@ -92,8 +96,10 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_tags.op:
         {
-          /** @type {import("@storecraft/core/api").FilterValue_p_in_tags} */
-          const cast = Array.isArray(filter?.value) ? filter.value : [];
+          
+          const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_tags} */(
+            Array.isArray(filter?.value) ? filter.value : []
+          );
           
           conjunctions.push(
             eb_in(
@@ -105,8 +111,9 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_not_in_tags.op:
         {
-          /** @type {import("@storecraft/core/api").FilterValue_p_not_in_tags} */
-          const cast = Array.isArray(filter?.value) ? filter.value : [];
+          const cast = /** @type {import("@storecraft/core/api").FilterValue_p_not_in_tags} */ (
+            Array.isArray(filter?.value) ? filter.value : []
+          );
 
           conjunctions.push(
             eb.not(
@@ -120,8 +127,9 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_collections.op:
         {
-          /** @type {import("@storecraft/core/api").FilterValue_p_in_collections} */
-          const cast = Array.isArray(filter?.value) ? filter.value : [];
+          const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_collections} */ (
+            Array.isArray(filter?.value) ? filter.value : []
+          );
 
           // PROBLEM: we only have ids, but use handles in the filters
           conjunctions.push(
@@ -134,8 +142,9 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_not_in_collections.op:
         {
-          /** @type {import("@storecraft/core/api").FilterValue_p_not_in_collections} */
-          const cast = Array.isArray(filter?.value) ? filter.value : [];
+          const cast = /** @type {import("@storecraft/core/api").FilterValue_p_not_in_collections} */ (
+            Array.isArray(filter?.value) ? filter.value : []
+          );
 
           conjunctions.push(
             eb.not(
@@ -149,12 +158,13 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_price_range.op:
         {
-          /** @type {import("@storecraft/core/api").FilterValue_p_in_price_range} */
-          const cast = {
-            from: 0,
-            to: Number.POSITIVE_INFINITY,
-            ...(filter?.value ?? {}),
-          };
+          const cast = /** @type {import("@storecraft/core/api").FilterValue_p_in_price_range} */ (
+            {
+              from: 0,
+              to: Number.POSITIVE_INFINITY,
+              ...(filter?.value ?? {}),
+            }
+          );
 
           const from = extract_abs_number(cast.from);
           const to = extract_abs_number(cast.to);

package/src/con.helpers.json.js

@@ -140,8 +140,8 @@ export function jsonArrayFrom(expr, sql_type) {
       return pg_jsonArrayFrom(expr);
     case 'MYSQL':
       return mysql_jsonArrayFrom(expr);
-    case 'MSSQL':
-      return mssql_jsonArrayFrom(expr);
+    // case 'MSSQL':
+    //   return mssql_jsonArrayFrom(expr);
     default:
       throw new Error(`sql_type=${sql_type} NOT SUPPORTED !`);
   }  
@@ -171,7 +171,6 @@ export function jsonArrayFrom(expr, sql_type) {
  * @template O
  * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
  * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O>[]>}
  */
 export function stringArrayFrom(expr, sql_type) {
   switch(sql_type) {
@@ -181,13 +180,14 @@ export function stringArrayFrom(expr, sql_type) {
       return pg_stringArrayFrom(expr);
     case 'MYSQL':
       return mysql_stringArrayFrom(expr);
-    case 'MSSQL':
-      return mssql_stringArrayFrom(expr);
+    // case 'MSSQL':
+    //   return mssql_stringArrayFrom(expr);
     default:
       throw new Error(`sql_type=${sql_type} NOT SUPPORTED !`);
   }  
 }
 
+
 /**
  * ### Examples
  *
@@ -223,8 +223,8 @@ export function jsonObjectFrom(expr, sql_type) {
       return pg_jsonObjectFrom(expr);
     case 'MYSQL':
       return mysql_jsonObjectFrom(expr);
-    case 'MSSQL':
-      return mssql_jsonObjectFrom(expr);
+    // case 'MSSQL':
+    //   return mssql_jsonObjectFrom(expr);
     default:
       throw new Error(`sql_type=${sql_type} NOT SUPPORTED !`);
   }

package/src/con.helpers.json.mysql.js

@@ -106,7 +106,7 @@ export function mysql_jsonArrayFrom(expr) {
  * ```
  * @template O
  * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O>[]>}
+ * @returns {import('kysely').RawBuilder<string[]>}
  */
 export function mysql_stringArrayFrom(expr) {
   const arg = extract_first_selection(expr, 'agg');

package/src/con.helpers.json.postgres.js

@@ -51,7 +51,7 @@ import { extract_first_selection } from './con.helpers.json.js';
  * ```
  * @template O
  * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O>[]>}
+ * @returns {import('kysely').RawBuilder<string[]>}
  */
 export function pg_stringArrayFrom(expr) {
   const arg = extract_first_selection(expr, 'agg');

package/src/con.helpers.json.sqlite.js

@@ -114,7 +114,7 @@ export function sqlite_jsonArrayFrom(expr) {
  * ```
  * @template O
  * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O>[]>}
+ * @returns {import('kysely').RawBuilder<string[]>}
  */
 export function sqlite_stringArrayFrom(expr) {
   const arg = extract_first_selection(expr, 'agg');

package/src/con.images.js

@@ -3,7 +3,7 @@ import { SQL } from '../index.js'
 import { count_regular, delete_me, delete_search_of, 
   insert_search_of, regular_upsert_me, where_id_or_handle_table 
 } from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 import { Transaction } from 'kysely'
 import { ID } from '@storecraft/core/api/utils.func.js'
@@ -58,7 +58,8 @@ const get = (driver) => {
     .selectFrom(table_name)
     .selectAll()
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -193,7 +194,6 @@ export const report_document_media = (driver) => {
  */
 const list = (driver) => {
   return async (query) => {
-
     const items = await driver.client
       .selectFrom(table_name)
       .selectAll()
@@ -202,7 +202,7 @@ const list = (driver) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'images')) // ts complains because `usage` field is absent
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.notifications.js

@@ -25,6 +25,7 @@ const upsert = (driver) => {
             item.id, item.id, table_name
             );
           await regular_upsert_me(trx, table_name, {
+            handle: null,
             created_at: item.created_at,
             updated_at: item.updated_at,
             message: item.message,
@@ -121,7 +122,7 @@ const list = (driver) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'notifications'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.orders.js

@@ -3,8 +3,8 @@ 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_tags} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  with_media, with_search, with_tags} from './con.shared.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
@@ -82,10 +82,12 @@ const get = (driver) => {
     .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();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -138,13 +140,14 @@ const list = (driver) => {
       .select(eb => [
         with_media(eb, eb.ref('orders.id'), driver.dialectType),
         with_tags(eb, eb.ref('orders.id'), driver.dialectType),
+        with_search(eb, eb.ref('orders.id'), driver.dialectType),
       ].filter(Boolean))
       .where(
         (eb) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, table_name))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.posts.js

@@ -1,11 +1,12 @@
 import { SQL } from '../index.js'
+import { stringArrayFrom } from './con.helpers.json.js'
 import { report_document_media } from './con.images.js'
 import { count_regular, delete_entity_values_by_value_or_reporter, 
   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_tags} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  with_media,  with_search,  with_tags} from './con.shared.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
@@ -54,17 +55,20 @@ const upsert = (driver) => {
  * @returns {db_col["get"]}
  */
 const get = (driver) => {
-  return (id_or_handle, options) => {
-    return driver.client
-    .selectFrom(table_name)
-    .selectAll()
-    .select(eb => [
-      with_media(eb, id_or_handle, driver.dialectType),
-      with_tags(eb, id_or_handle, driver.dialectType),
-    ]
-    .filter(Boolean))
-    .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+  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);
   }
 }
 
@@ -114,18 +118,20 @@ const list = (driver) => {
       .select(eb => [
         with_media(eb, eb.ref('posts.id'), driver.dialectType),
         with_tags(eb, eb.ref('posts.id'), driver.dialectType),
+        with_search(eb, eb.ref('posts.id'), driver.dialectType),
       ].filter(Boolean))
       .where(
         (eb) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'posts'))
+      // .orderBy()
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
     if(query.limitToLast) items.reverse();
-
+    
     return sanitize_array(items);
   }
 }