@storecraft/database-sql-base 1.0.12 → 1.0.14

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

@@ -1,3 +1,9 @@
+/**
+ * @import { AliasableExpression, Expression} from 'kysely'
+ * @import { SelectQueryBuilderExpression } from './con.helpers.json.js'
+ * @import { SqlDialectType } from '../types.public.js'
+ * @import { RawBuilder, Simplify } from 'kysely'
+ */
 import { sql} from 'kysely'
 import { extract_first_selection } from './con.helpers.json.js';
 
@@ -50,8 +56,8 @@ import { extract_first_selection } from './con.helpers.json.js';
  * from "person"
  * ```
  * @template O
- * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
- * @returns {import('kysely').RawBuilder<string[]>}
+ * @param {SelectQueryBuilderExpression<O>} expr 
+ * @returns {RawBuilder<string[]>}
  */
 export function pg_stringArrayFrom(expr) {
   const arg = extract_first_selection(expr, 'agg');
@@ -107,8 +113,8 @@ export function pg_stringArrayFrom(expr) {
  * from "person"
  * ```
  * @template O
- * @param {import('kysely').Expression<O>} expr 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O>[]>}
+ * @param {Expression<O>} expr 
+ * @returns {RawBuilder<Simplify<O>[]>}
  */
 export function pg_jsonArrayFrom(expr) {
   return sql`(select coalesce(json_agg(agg), '[]') from ${expr} as agg)`
@@ -165,8 +171,8 @@ export function pg_jsonArrayFrom(expr) {
  * from "person"
  * ```
  * @template O
- * @param {import('kysely').Expression<O>} expr 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O> | null>}
+ * @param {Expression<O>} expr 
+ * @returns {RawBuilder<Simplify<O> | null>}
  */
 export function pg_jsonObjectFrom(expr) {
   return sql`(select to_json(obj) from ${expr} as obj)`
@@ -211,9 +217,9 @@ export function pg_jsonObjectFrom(expr) {
  * ) as "name"
  * from "person"
  * ```
- * @template {Record<string, import('kysely').Expression<unknown>>} O
+ * @template {Record<string, Expression<unknown>>} O
  * @param {O} obj 
- * @returns { import('kysely').RawBuilder<import('kysely').Simplify<{[K in keyof O]: O[K] extends Expression<infer V> ? V : never}>>}
+ * @returns {RawBuilder<Simplify<{[K in keyof O]: O[K] extends Expression<infer V> ? V : never}>>}
 >}
  */
 export function pg_jsonBuildObject(obj) {

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

@@ -1,5 +1,13 @@
+/**
+ * @import { AliasableExpression, Expression} from 'kysely'
+ * @import { SelectQueryBuilderExpression } from './con.helpers.json.js'
+ * @import { SqlDialectType } from '../types.public.js'
+ * @import { RawBuilder, Simplify } from 'kysely'
+ */
 import { SelectQueryNode, sql} from 'kysely'
-import { extract_first_selection, getJsonObjectArgs } from './con.helpers.json.js';
+import { 
+  extract_first_selection, getJsonObjectArgs 
+} from './con.helpers.json.js';
 
 /**
  * A SQLite helper for aggregating a subquery into a JSON array.
@@ -54,14 +62,19 @@ import { extract_first_selection, getJsonObjectArgs } from './con.helpers.json.j
  * from "person"
  * ```
  * @template O
- * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O>[]>}
+ * @param {SelectQueryBuilderExpression<O>} expr 
+ * @returns {RawBuilder<Simplify<O>[]>}
  */
 export function sqlite_jsonArrayFrom(expr) {
 
-  return sql`(select coalesce(json_group_array(json_object(${sql.join(
-    getSqliteJsonObjectArgs(expr.toOperationNode(), 'agg')
-  )})), '[]') from ${expr} as agg)`
+  return sql`(select coalesce(json_group_array(json_object(${
+    sql.join(
+      getSqliteJsonObjectArgs(
+        /** @type {SelectQueryNode} */(expr.toOperationNode()), 
+        'agg'
+      )
+    )
+  })), '[]') from ${expr} as agg)`
 }
 
 
@@ -113,12 +126,14 @@ export function sqlite_jsonArrayFrom(expr) {
  * from "person"
  * ```
  * @template O
- * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
- * @returns {import('kysely').RawBuilder<string[]>}
+ * @param {SelectQueryBuilderExpression<O>} expr 
+ * @returns {RawBuilder<string[]>}
  */
 export function sqlite_stringArrayFrom(expr) {
   const arg = extract_first_selection(expr, 'agg');
-  return sql`(select coalesce(json_group_array(${sql.join([arg])}), '[]') from ${expr} as agg)`
+  return sql`(select coalesce(json_group_array(${
+    sql.join([arg])
+  }), '[]') from ${expr} as agg)`
 }
 
 /**
@@ -177,13 +192,18 @@ export function sqlite_stringArrayFrom(expr) {
  * ```
  * 
  * @template O
- * @param {import('./con.helpers.json.js').SelectQueryBuilderExpression<O>} expr 
- * @returns {import('kysely').RawBuilder<import('kysely').Simplify<O> | null>}
+ * @param {SelectQueryBuilderExpression<O>} expr 
+ * @returns {RawBuilder<Simplify<O> | null>}
  */
 export function sqlite_jsonObjectFrom(expr) {
-  return sql`(select json_object(${sql.join(
-    getSqliteJsonObjectArgs(expr.toOperationNode(), 'obj'),
-  )}) from ${expr} as obj)`
+  return sql`(select json_object(${
+    sql.join(
+      getSqliteJsonObjectArgs(
+        /** @type {SelectQueryNode} */(expr.toOperationNode()), 
+        'obj'
+      ),
+    )
+  }) from ${expr} as obj)`
 }
 
 /**
@@ -250,7 +270,7 @@ export function sqlite_jsonObjectFrom(expr) {
  * 
  * @param {SelectQueryNode} node 
  * @param {string} table 
- * @returns {import('kysely').Expression<unknown>[]}
+ * @returns {Expression<unknown>[]}
  */
 function getSqliteJsonObjectArgs(node, table) {
   try {

package/src/con.notifications.js

@@ -21,9 +21,10 @@ const upsert = (driver) => {
       const t = await c.transaction().execute(
         async (trx) => {
           await insert_search_of(
-            trx, [...item.search, ...search_terms], 
+            trx, 
+            [...item.search, ...search_terms], 
             item.id, item.id, table_name
-            );
+          );
           await regular_upsert_me(trx, table_name, {
             handle: null,
             created_at: item.created_at,
@@ -51,10 +52,13 @@ const upsertBulk = (driver) => {
   return async (items, search_terms) => {
     const results = [];
     // for (const it of items)
-    for(let ix = 0; ix < items.length; ix++)
-      results.push(await upsert(driver)(
-        items[ix], search_terms?.[ix])
-        );
+    for(let ix = 0; ix < items.length; ix++) {
+      results.push(
+        await upsert(driver)(
+          items[ix], search_terms?.[ix]
+        )
+      );
+    }
 
     return results.every(b => b);
   }

package/src/con.orders.js

@@ -30,6 +30,7 @@ const upsert = (driver) => {
           await insert_tags_of(trx, item.tags, item.id, item.id, table_name);
           await report_document_media(driver)(item, trx);
           await regular_upsert_me(trx, table_name, {
+            active: 1,
             attributes: JSON.stringify(item.attributes),
             description: item.description,
             created_at: item.created_at,
@@ -104,9 +105,9 @@ const remove = (driver) => {
         async (trx) => {
             
           // entities
-          await delete_search_of(trx, id_or_handle);
-          await delete_media_of(trx, id_or_handle);
-          await delete_tags_of(trx, id_or_handle);
+          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);
         }

package/src/con.posts.js

@@ -5,7 +5,7 @@
 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, 
+import { count_regular, delete_entity_values_by_value_or_reporter_and_context, 
   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, 
@@ -85,12 +85,12 @@ const remove = (driver) => {
         async (trx) => {
             
           // entities
-          await delete_search_of(trx, id_or_handle);
-          await delete_media_of(trx, id_or_handle);
-          await delete_tags_of(trx, id_or_handle);
+          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);
           // STOREFRONT => POSTS
-          await delete_entity_values_by_value_or_reporter('storefronts_to_other')(
-            trx, id_or_handle, id_or_handle
+          await delete_entity_values_by_value_or_reporter_and_context('storefronts_to_other')(
+            trx, id_or_handle, id_or_handle, table_name
           );
           // delete me
           await delete_me(trx, table_name, id_or_handle);

package/src/con.products.js

@@ -1,18 +1,20 @@
 /**
  * @import { ProductType, VariantType } from '@storecraft/core/api'
- * @import { db_products as db_col } from '@storecraft/core/database'
+ * @import { db_products as db_col, RegularGetOptions } from '@storecraft/core/database'
  * @import { Database } from '../types.sql.tables.js'
  */
 
 import { enums } from '@storecraft/core/api'
 import { SQL } from '../index.js'
-import { delete_entity_values_of_by_entity_id_or_handle, delete_me, delete_media_of, 
+import { 
+  delete_entity_values_of_by_entity_id_or_handle_and_context, 
+  delete_me, delete_media_of, 
   delete_search_of, delete_tags_of, 
   insert_entity_values_of, insert_media_of, insert_search_of, 
   insert_tags_of, regular_upsert_me, 
   where_id_or_handle_table, products_with_collections, 
   with_tags, with_media, 
-  delete_entity_values_by_value_or_reporter,
+  delete_entity_values_by_value_or_reporter_and_context,
   products_with_discounts,
   products_with_variants,
   count_regular,
@@ -23,6 +25,10 @@ import { query_to_eb, query_to_sort } from './utils.query.js'
 import { Transaction } from 'kysely'
 import { report_document_media } from './con.images.js'
 import { union } from '@storecraft/core/api/utils.func.js'
+import { 
+  helper_compute_product_extra_tags_because_of_discount_side_effect_for_db,
+  helper_compute_product_extra_search_keywords_because_of_discount_side_effect_for_db
+ } from '@storecraft/core/database'
 
 
 export const table_name = 'products'
@@ -65,14 +71,28 @@ const upsert = (driver) => {
       ).execute();
 
       const eligible_discounts = discounts.filter(
-        d => driver.app.api.pricing.test_product_filters_against_product(d.info.filters, item)
+        d => driver.app.api.pricing.test_product_filters_against_product(
+          d.info.filters, item
+        )
+      );
+      
+      item.tags = union(
+        [
+          // remove old discount tags
+          item.tags?.filter(t => !t.startsWith('discount_')),
+          // add new discount tags
+          eligible_discounts.map(
+            helper_compute_product_extra_tags_because_of_discount_side_effect_for_db
+          ),
+        ]
       );
 
       search_terms = union(
         [
           search_terms, 
-          eligible_discounts.map(d => `discount:${d.handle}`),
-          eligible_discounts.map(d => `discount:${d.id}`),
+          eligible_discounts.map(
+            helper_compute_product_extra_search_keywords_because_of_discount_side_effect_for_db
+          ),
         ]
       );
 
@@ -109,7 +129,7 @@ const upsert = (driver) => {
           // PRODUCTS => VARIANTS
           if(item && ('variant_hint' in item) && is_variant(item)) {
             // remove previous
-            await delete_entity_values_by_value_or_reporter('products_to_variants')(
+            await delete_entity_values_by_value_or_reporter_and_context('products_to_variants')(
               trx, item.id, item.handle
             );
             // add 
@@ -123,8 +143,8 @@ const upsert = (driver) => {
           // Explicit PRODUCTS => COLLECTIONS
           //
           // remove this product's old collections connections
-          await delete_entity_values_of_by_entity_id_or_handle('products_to_collections')(
-            trx, item.id, item.handle
+          await delete_entity_values_of_by_entity_id_or_handle_and_context('products_to_collections')(
+            trx, item.id
           );
           if(item.collections) {
             // add this product's new collections connections
@@ -138,8 +158,8 @@ const upsert = (driver) => {
           // Explicit PRODUCTS => Related Products
           //
           // remove this product's old collections connections
-          await delete_entity_values_of_by_entity_id_or_handle('products_to_related_products')(
-            trx, item.id, item.handle
+          await delete_entity_values_of_by_entity_id_or_handle_and_context('products_to_related_products')(
+            trx, item.id
           );
           if(item.related_products) {
             // add this product's new `related_products` connections
@@ -152,8 +172,8 @@ const upsert = (driver) => {
 
           // PRODUCTS => DISCOUNTS
           // remove this product's older connections to discounts
-          await delete_entity_values_of_by_entity_id_or_handle('products_to_discounts')(
-            trx, item.id, item.handle, 
+          await delete_entity_values_of_by_entity_id_or_handle_and_context('products_to_discounts')(
+            trx, item.id
           );
           if(eligible_discounts) {
             // insert new connections to discounts
@@ -186,7 +206,8 @@ const get = (driver) => {
     const expand = options?.expand ?? ['*'];
     const expand_collections = expand.includes('*') || expand.includes('collections');
     const expand_discounts = expand.includes('*') || expand.includes('discounts');
-    const expand_variants = expand.includes('*') || expand.includes('variants');
+    const expand_variants = expand.includes('*') || 
+      (/** @type {RegularGetOptions<ProductType>["expand"]} */(expand)).includes('variants');
     const expand_related_products = expand.includes('*') || expand.includes('related_products');
     const dtype = driver.config.dialect_type;
 
@@ -224,7 +245,8 @@ const getBulk = (driver) => {
     const expand = options?.expand ?? ['*'];
     const expand_collections = expand.includes('*') || expand.includes('collections');
     const expand_discounts = expand.includes('*') || expand.includes('discounts');
-    const expand_variants = expand.includes('*') || expand.includes('variants');
+    const expand_variants = expand.includes('*') || 
+      (/** @type {RegularGetOptions<ProductType>["expand"]} */(expand)).includes('variants');
     const expand_related_products = expand.includes('*') || expand.includes('related_products');
     const dtype = driver.config.dialect_type;
 
@@ -275,19 +297,20 @@ const remove_internal = (driver) => {
     await delete_search_of(trx, product.id);
     await delete_media_of(trx, product.id);
     // PRODUCTS => COLLECTIONS
-    await delete_entity_values_of_by_entity_id_or_handle('products_to_collections')(
-      trx, product.id, product.handle
+    await delete_entity_values_of_by_entity_id_or_handle_and_context('products_to_collections')(
+      trx, product.id
     );
     // PRODUCTS => DISCOUNTS
-    await delete_entity_values_of_by_entity_id_or_handle('products_to_discounts')(
-      trx, product.id, product.handle
+    await delete_entity_values_of_by_entity_id_or_handle_and_context('products_to_discounts')(
+      trx, product.id
     );
     // STOREFRONT => PRODUCT
-    await delete_entity_values_by_value_or_reporter('storefronts_to_other')(
-      trx, product.id, product.handle
+    // TODO: this is problematic
+    await delete_entity_values_by_value_or_reporter_and_context('storefronts_to_other')(
+      trx, product.id, product.handle, table_name
     );
     // PRODUCTS => RELATED PRODUCT
-    await delete_entity_values_by_value_or_reporter('products_to_related_products')(
+    await delete_entity_values_by_value_or_reporter_and_context('products_to_related_products')(
       trx, product.id, product.handle
     );
     // PRODUCT => VARIANTS
@@ -295,7 +318,7 @@ const remove_internal = (driver) => {
     {
       if(is_variant(product)) {
         // delete my reported connections
-        await delete_entity_values_by_value_or_reporter('products_to_variants')(
+        await delete_entity_values_by_value_or_reporter_and_context('products_to_variants')(
           trx, product.id, product.handle
         );
       } else if(product && 'variants' in product) { // parent
@@ -303,8 +326,8 @@ const remove_internal = (driver) => {
           (product.variants ?? []).map(v => remove_internal(driver)(v, trx))
         );
         // if I am a parent product, delete my relations to all previous variants
-        await delete_entity_values_of_by_entity_id_or_handle('products_to_variants')(
-          trx, product.id, product.handle
+        await delete_entity_values_of_by_entity_id_or_handle_and_context('products_to_variants')(
+          trx, product.id
         );
       }
     }
@@ -399,7 +422,7 @@ const list = (driver) => {
 
 /**
  * @param {SQL} driver 
- * @returns {db_col["list_product_collections"]}
+ * @returns {db_col["list_all_product_collections"]}
  */
 const list_product_collections = (driver) => {
   return async (product_id_or_handle) => {
@@ -414,7 +437,7 @@ const list_product_collections = (driver) => {
 
 /**
  * @param {SQL} driver 
- * @returns {db_col["list_product_discounts"]}
+ * @returns {db_col["list_all_product_discounts"]}
  */
 const list_product_discounts = (driver) => {
   return async (product_id_or_handle) => {
@@ -430,7 +453,7 @@ const list_product_discounts = (driver) => {
 /**
  * @param {SQL} driver 
  * 
- * @returns {db_col["list_product_variants"]}
+ * @returns {db_col["list_all_product_variants"]}
  */
 const list_product_variants = (driver) => {
   return async (product_id_or_handle) => {
@@ -450,7 +473,7 @@ const list_product_variants = (driver) => {
 /**
  * @param {SQL} driver 
  * 
- * @returns {db_col["list_related_products"]}
+ * @returns {db_col["list_all_related_products"]}
  */
 const list_related_products = (driver) => {
   return async (product_id_or_handle) => {
@@ -464,6 +487,31 @@ const list_related_products = (driver) => {
   }
 }
 
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["list_used_products_tags"]}
+ */
+const list_used_products_tags = (driver) => {
+  return async () => {
+
+    const items = await driver.client
+      .selectFrom('products')
+      .innerJoin(
+        'entity_to_tags_projections', 
+        'entity_to_tags_projections.entity_id', 
+        'products.id'
+      )
+      .select('entity_to_tags_projections.value as tag')
+      .groupBy('tag')
+      .execute();
+
+      // .compile();
+      // console.log(items[0])
+
+    return items.map(e => e.tag);
+  }
+}
+
 
 /**
  * @param {SQL} driver 
@@ -516,10 +564,11 @@ export const impl = (driver) => {
     upsert: upsert(driver),
     remove: remove(driver),
     list: list(driver),
-    list_product_collections: list_product_collections(driver),
-    list_product_discounts: list_product_discounts(driver),
-    list_product_variants: list_product_variants(driver),
-    list_related_products: list_related_products(driver),
+    list_all_product_collections: list_product_collections(driver),
+    list_all_product_discounts: list_product_discounts(driver),
+    list_all_product_variants: list_product_variants(driver),
+    list_all_related_products: list_related_products(driver),
+    list_used_products_tags: list_used_products_tags(driver),
     count: count_regular(driver, table_name),
   }
 }

package/src/con.search.js

@@ -61,9 +61,7 @@ const resource_to_props = {
 }
 
 /**
- * 
  * @param {string} id 
- * 
  * @returns {keyof db_driver["resources"]}
  */
 export const id_to_resource = id => {
@@ -80,8 +78,6 @@ export const id_to_resource = id => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["quicksearch"]}
  */
 export const quicksearch = (driver) => {
@@ -138,10 +134,8 @@ export const quicksearch = (driver) => {
 
 /** 
  * @param {SQL} driver
- * 
- * 
  * @return {db_col}
- * */
+ */
 export const impl = (driver) => {
 
   return {

package/src/con.shared.experiment.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { ExpressionWrapper, Kysely } from 'kysely'
 import { jsonArrayFrom, stringArrayFrom } from './con.helpers.json.js'
 import { SQL } from '../index.js';