@storecraft/database-sql-base 1.0.12 → 1.0.14

package/src/con.shared.js

@@ -3,6 +3,7 @@
  * @import { Database } from '../types.sql.tables.js'
  * @import { ExpressionBuilder, InsertObject } from 'kysely'
  * @import { SqlDialectType } from '../types.public.js'
+ * @import { QueryableTables } from './utils.types.js'
  */
 import { ExpressionWrapper, InsertQueryBuilder, Kysely, Transaction } from 'kysely'
 import { jsonArrayFrom, stringArrayFrom } from './con.helpers.json.js'
@@ -46,7 +47,7 @@ export const safe_trx = (k) => {
 
 /**
  * @param {SQL} driver 
- * @param {keyof Database} table_name 
+ * @param {QueryableTables} table_name 
  * 
  * @returns {db_crud["count"]}
  */
@@ -54,16 +55,16 @@ export const count_regular = (driver, table_name) => {
   return async (query) => {
 
     const result = await driver.client
-      .selectFrom(table_name)
-      .select(
-        (eb) => eb.fn.countAll().as('count')
-      )
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .executeTakeFirst();
+    .selectFrom(table_name)
+    .select(
+      (eb) => eb.fn.countAll().as('count')
+    )
+    .where(
+      (eb) => {
+        return query_to_eb(eb, query, table_name);
+      }
+    )
+    .executeTakeFirst();
 
     return Number(result.count);
   }
@@ -111,50 +112,102 @@ export const where_id_or_handle_table = (id_or_handle) => {
  */
 
 /**
- * helper to generate entity values delete
+ * helper to delete entity values from conjunction table.
+ * 
+ * Usually in entity tables, the (`value`, `reporter`) pair maps to 
+ * (`secondary_entity_id`, `secondary_entity_handle`).
+ * 
+ * 1. This is true for all entity tables except of `entity_to_tags_projections`, 
+ * `entity_to_search_terms`, `entity_to_media`.
+ * 2. In those other entity tables, usually:
+ *  - `value` identifies an entity
+ *  - `reporter` handle identifies an entity in tables `products_to_collections`, 
+ * `products_to_discounts`, `products_to_variants`, `products_to_related_products`
+ *  - `reporter` does not identify an entity in `storefronts_to_other` because it 
+ * hosts many resource types (for example, a post has the same handle as a product)
+ *    - `reporter` + `context` identifies a secondary identity in `storefronts_to_other`
+ * 
+ * Please consult the full documentation about interpretation of the entity 
+ * tables in `../types.sql.tables.jd.ts`.
+ * 
+ * Consult {@link '../types.sql.tables.jd.ts'} for the list of meaningful entity tables
+ * and their interpretations. and take a look at the database, it is actually
+ * quite simple
  * 
  * @param {EntityTableKeys} entity_table_name 
  */
-export const delete_entity_values_by_value_or_reporter = (entity_table_name) => {
+export const delete_entity_values_by_value_or_reporter_and_context = (
+  entity_table_name
+) => {
   /**
    * 
    * @param {Kysely<Database>} trx 
    * @param {string} value delete by entity value
    * @param {string} [reporter] delete by reporter
+   * @param {string} [context] delete by reporter + context
    */
-  return (trx, value, reporter=undefined) => {
+  return (trx, value, reporter, context) => {
 
     return trx.deleteFrom(entity_table_name).where(
       eb => eb.or(
         [
           value && eb('value', '=', value),
-          reporter && eb('reporter', '=', reporter),
+          reporter && context && eb.and(
+            [
+              eb('reporter', '=', reporter),
+              eb('context', '=', context),
+            ]
+          ),
+          reporter && !(context) && eb('reporter', '=', reporter),
         ].filter(Boolean)
       )
     ).executeTakeFirst();
   }
 }
 
+
 /**
- * helper to generate entity values delete
+ * helper to delete entity values
+ * 
+ * 1. either by `entity_id` which always identifies an entity.
+ * 2. or by `entity_handle` which identifies an entity for some entity tables 
+ * such as `products_to_collections`, `products_to_discounts`, `products_to_variants`, 
+ * `products_to_related_products`, `storefronts_to_other`
+ * 3. or by `entity_handle` + `context` which identifies an entity for some entity tables 
+ * such as `entity_to_tags_projections`, `entity_to_search_terms`, `entity_to_media`
+ * 
+ * - `entity_handle` by itself does not always identify an entity, 
+ * but `entity_handle` + `context` does.
+ * 
+ * for example, we may have a product and a collection with the same `entity_handle` 
+ * in the `entity_to_tags_projections` table, but they are different entities. 
+ * Therefore, if we naively delete by `entity_handle`, we may delete more entities than intended.
  * 
  * @param {EntityTableKeys} entity_table_name 
  */
-export const delete_entity_values_of_by_entity_id_or_handle = 
-(entity_table_name) => {
+export const delete_entity_values_of_by_entity_id_or_handle_and_context = (
+  entity_table_name
+) => {
   /**
    * 
    * @param {Kysely<Database>} trx 
    * @param {string} entity_id delete by id
-   * @param {string} [entity_handle=entity_id] delete by handle
+   * @param {string} [entity_handle] delete by handle
+   * @param {string} [context=undefined] the context (another segment technique)
    */
-  return (trx, entity_id, entity_handle=undefined) => {
+  return (trx, entity_id, entity_handle=undefined, context=undefined) => {
     return trx.deleteFrom(entity_table_name).where(
       eb => eb.or(
         [
-          eb('entity_id', '=', entity_id),
-          eb('entity_handle', '=', entity_handle ?? entity_id),
-        ]
+          entity_id && eb('entity_id', '=', entity_id),
+          entity_handle && context && eb.and(
+            [
+              eb('entity_handle', '=', entity_handle),
+              eb('context', '=', context)
+            ]
+          ),
+          entity_handle && !(context) && eb('entity_handle', '=', entity_handle),
+        ].filter(Boolean)
       )
     ).executeTakeFirst();
   }
@@ -173,23 +226,18 @@ export const insert_entity_array_values_of = (entity_table_name) => {
    * @param {string} [item_handle] whom the tags belong to
    * @param {boolean} [delete_previous=true] if true and `reporter`, 
    * then will delete by reporter, otherwise by `item_id/item_handle`
-   * @param {string} [reporter=undefined] the reporter of the batch values 
-   * (another segment technique)
    * @param {string} [context=undefined] the context (another segment technique)
    */
-  return async (trx, values, item_id, item_handle, delete_previous=true, 
-    reporter=undefined, context=undefined) => {
+  return async (
+    trx, values, item_id, item_handle, 
+    delete_previous=true, 
+    context=undefined
+  ) => {
 
     if(delete_previous) {
-      if(reporter) {
-        await delete_entity_values_by_value_or_reporter(entity_table_name)(
-          trx, undefined, reporter
-          );
-      } else {
-        await delete_entity_values_of_by_entity_id_or_handle(entity_table_name)(
-          trx, item_id, item_handle
-          );
-      }
+      await delete_entity_values_of_by_entity_id_or_handle_and_context(entity_table_name)(
+        trx, item_id, item_handle, context
+      );
     }
 
     if(!values?.length) return Promise.resolve();
@@ -199,7 +247,6 @@ export const insert_entity_array_values_of = (entity_table_name) => {
           entity_handle: item_handle,
           entity_id: item_id,
           value: t,
-          reporter,
           context
         })
       )
@@ -254,7 +301,7 @@ export const insert_entity_array_values_with_delete_of = (entity_table) => {
  */
 return (trx, values, item_id, item_handle, context) => {
     return insert_entity_array_values_of(entity_table)(
-      trx, values, item_id, item_handle, true, undefined, context
+      trx, values, item_id, item_handle, true, context
     )
   };
 }
@@ -263,9 +310,9 @@ export const insert_tags_of = insert_entity_array_values_with_delete_of('entity_
 export const insert_search_of = insert_entity_array_values_with_delete_of('entity_to_search_terms');
 export const insert_media_of = insert_entity_array_values_with_delete_of('entity_to_media');
 
-export const delete_tags_of = delete_entity_values_of_by_entity_id_or_handle('entity_to_tags_projections');
-export const delete_search_of = delete_entity_values_of_by_entity_id_or_handle('entity_to_search_terms');
-export const delete_media_of = delete_entity_values_of_by_entity_id_or_handle('entity_to_media');
+export const delete_tags_of = delete_entity_values_of_by_entity_id_or_handle_and_context('entity_to_tags_projections');
+export const delete_search_of = delete_entity_values_of_by_entity_id_or_handle_and_context('entity_to_search_terms');
+export const delete_media_of = delete_entity_values_of_by_entity_id_or_handle_and_context('entity_to_media');
 
 
 /**
@@ -679,25 +726,25 @@ export const select_values_of_entity_by_entity_id_or_handle =
   .orderBy(`${entity_junction_table}.id`);
 }
 
-/**
- * select the entity ids which are constrained by value or reporter
- * 
- * @param {ExpressionBuilder<Database>} eb 
- * @param {EntityTableKeys} entity_junction_table 
- * @param {string | ExpressionWrapper<Database>} value 
- * @param {string | ExpressionWrapper<Database>} [reporter] 
- */
-export const select_entity_ids_by_value_or_reporter = 
-(eb, entity_junction_table, value, reporter=undefined) => {
-  return eb
-    .selectFrom(entity_junction_table)
-    .select(`${entity_junction_table}.entity_id`)
-    .where(eb2 => eb2.or(
-        [
-          eb2(`${entity_junction_table}.value`, '=', value ?? reporter),
-          eb2(`${entity_junction_table}.reporter`, '=', reporter ?? value),
-        ]
-      )
-    )
-    .orderBy(`${entity_junction_table}.entity_id`);
-}
+// /**
+//  * select the entity ids which are constrained by value or reporter
+//  * 
+//  * @param {ExpressionBuilder<Database>} eb 
+//  * @param {EntityTableKeys} entity_junction_table 
+//  * @param {string | ExpressionWrapper<Database>} value 
+//  * @param {string | ExpressionWrapper<Database>} [reporter] 
+//  */
+// export const select_entity_ids_by_value_or_reporter = 
+// (eb, entity_junction_table, value, reporter=undefined) => {
+//   return eb
+//     .selectFrom(entity_junction_table)
+//     .select(`${entity_junction_table}.entity_id`)
+//     .where(eb2 => eb2.or(
+//         [
+//           eb2(`${entity_junction_table}.value`, '=', value ?? reporter),
+//           eb2(`${entity_junction_table}.reporter`, '=', reporter ?? value),
+//         ]
+//       )
+//     )
+//     .orderBy(`${entity_junction_table}.entity_id`);
+// }

package/src/con.shipping.js

@@ -3,7 +3,7 @@
  */
 import { SQL } from '../index.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, 
@@ -83,12 +83,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 => SHIPPING
-          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.storefronts.js

@@ -1,9 +1,11 @@
 /**
  * @import { db_storefronts as db_col } from '@storecraft/core/database'
+ * @import { Database } from '../types.sql.tables.js';
  */
 import { SQL } from '../index.js'
+import { jsonArrayFrom, stringArrayFrom } from './con.helpers.json.js'
 import { report_document_media } from './con.images.js'
-import { delete_entity_values_of_by_entity_id_or_handle, 
+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, storefront_with_collections, 
@@ -12,7 +14,11 @@ import { delete_entity_values_of_by_entity_id_or_handle,
   regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, 
   count_regular,
-  with_search} from './con.shared.js'
+  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, query_to_sort } from './utils.query.js'
 
@@ -35,8 +41,8 @@ const upsert = (driver) => {
           await report_document_media(driver)(item, trx);
           // Explicit STOREFRONTS => PRODUCTS / COLLECTIONS / DISCOUNTS / SHIPPING / POSTS
           // remove all the past connections of this storefront at once
-          await delete_entity_values_of_by_entity_id_or_handle('storefronts_to_other')(
-            trx, item.id, item.handle
+          await delete_entity_values_of_by_entity_id_or_handle_and_context('storefronts_to_other')(
+            trx, item.id
           );
           if(item.collections) { // add this storefront's new collections connections
             await insert_entity_values_of('storefronts_to_other')(
@@ -115,11 +121,21 @@ const get = (driver) => {
       with_media(eb, id_or_handle, driver.dialectType),
       with_tags(eb, id_or_handle, driver.dialectType),
       with_search(eb, id_or_handle, driver.dialectType),
-      expand_collections && storefront_with_collections(eb, id_or_handle, driver.dialectType),
-      expand_products && storefront_with_products(eb, id_or_handle, driver.dialectType),
-      expand_discounts && storefront_with_discounts(eb, id_or_handle, driver.dialectType),
-      expand_shipping && storefront_with_shipping(eb, id_or_handle, driver.dialectType),
-      expand_posts && storefront_with_posts(eb, id_or_handle, driver.dialectType),
+      expand_collections && storefront_with_collections(
+        eb, id_or_handle, driver.dialectType
+      ),
+      expand_products && storefront_with_products(
+        eb, id_or_handle, driver.dialectType
+      ),
+      expand_discounts && storefront_with_discounts(
+        eb, id_or_handle, driver.dialectType
+      ),
+      expand_shipping && storefront_with_shipping(
+        eb, id_or_handle, driver.dialectType
+      ),
+      expand_posts && storefront_with_posts(
+        eb, id_or_handle, driver.dialectType
+      ),
     ]
     .filter(Boolean))
     .where(where_id_or_handle_table(id_or_handle))
@@ -140,11 +156,12 @@ const remove = (driver) => {
         async (trx) => {
             
           // entities
-          await delete_search_of(trx, id_or_handle);
-          await delete_tags_of(trx, id_or_handle);
-          await delete_media_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 storefront => other
-          await delete_entity_values_of_by_entity_id_or_handle('storefronts_to_other')(
+          // this is correct, since `id` or `handle` are both unique for this table
+          await delete_entity_values_of_by_entity_id_or_handle_and_context('storefronts_to_other')(
             trx, id_or_handle, id_or_handle
           );
           // delete me
@@ -183,11 +200,21 @@ const list = (driver) => {
           with_media(eb, eb.ref('storefronts.id'), driver.dialectType),
           with_tags(eb, eb.ref('storefronts.id'), driver.dialectType),
           with_search(eb, eb.ref('storefronts.id'), driver.dialectType),
-          expand_collections && storefront_with_collections(eb, eb.ref('storefronts.id'), driver.dialectType),
-          expand_products && storefront_with_products(eb, eb.ref('storefronts.id'), driver.dialectType),
-          expand_discounts && storefront_with_discounts(eb, eb.ref('storefronts.id'), driver.dialectType),
-          expand_shipping && storefront_with_shipping(eb, eb.ref('storefronts.id'), driver.dialectType),
-          expand_posts && storefront_with_posts(eb, eb.ref('storefronts.id'), driver.dialectType),
+          expand_collections && storefront_with_collections(
+            eb, eb.ref('storefronts.id'), driver.dialectType
+          ),
+          expand_products && storefront_with_products(
+            eb, eb.ref('storefronts.id'), driver.dialectType
+          ),
+          expand_discounts && storefront_with_discounts(
+            eb, eb.ref('storefronts.id'), driver.dialectType
+          ),
+          expand_shipping && storefront_with_shipping(
+            eb, eb.ref('storefronts.id'), driver.dialectType
+          ),
+          expand_posts && storefront_with_posts(
+            eb, eb.ref('storefronts.id'), driver.dialectType
+          ),
         ].filter(Boolean)
       )
       .where(
@@ -206,82 +233,139 @@ const list = (driver) => {
 }
 
 /**
- * @param {SQL} driver 
- * @returns {db_col["list_storefront_products"]}
+ * @type {{[K in keyof Database]?: (keyof Database[K])[]}}
  */
-const list_storefront_products = (driver) => {
-  return async (product_id_or_handle) => {
-    // because we load everything (we don't expect storefronts to
-    // promote so many products), therefore we use the simple `get`
-    // method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['products'] }
-    );
-    return item?.products ?? []
+const resource_to_props = (
+  {
+    'collections': ['active', 'attributes', 'created_at', 'description', 'handle', 'id', 'published', 'title', 'updated_at'],
+    'discounts': ['active', 'application', 'attributes', 'created_at', 'description', 'handle', 'id', 'info', 'priority', 'published', 'title', 'updated_at'],
+    'products': ['active', 'attributes', 'compare_at_price', 'created_at', 'description', 'handle', 'id', 'isbn', 'parent_handle', 'parent_id', 'price', 'qty', 'title', 'updated_at', 'variant_hint', 'variants_options', 'video'],
+    'shipping_methods': ['active', 'attributes', 'created_at', 'description', 'handle', 'id', 'price', 'title', 'updated_at'],
+    'posts': ['active', 'attributes', 'created_at', 'description', 'handle', 'id', 'text', 'title', 'updated_at'],
   }
-}
+);
 
-/**
- * @param {SQL} driver 
- * @returns {db_col["list_storefront_collections"]}
- */
-const list_storefront_collections = (driver) => {
-  return async (product_id_or_handle) => {
-    // because we load everything (we don't expect storefronts to
-    // promote so many products), therefore we use the simple `get`
-    // method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['collections'] }
-    );
-    return item?.collections ?? []
-  }
-}
-
-/**
- * @param {SQL} driver 
- * @returns {db_col["list_storefront_discounts"]}
- */
-const list_storefront_discounts = (driver) => {
-  return async (product_id_or_handle) => {
-    // because we load everything (we don't expect storefronts to
-    // promote so many products), therefore we use the simple `get`
-    // method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['discounts'] }
-    );
-    return item?.discounts ?? []
-  }
-}
 
 /**
  * @param {SQL} driver 
- * @returns {db_col["list_storefront_posts"]}
+ * @returns {db_col["get_default_auto_generated_storefront"]}
  */
-const list_storefront_posts = (driver) => {
-  return async (product_id_or_handle) => {
-    // because we load everything (we don't expect storefronts to
-    // promote so many products), therefore we use the simple `get`
-    // method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['posts'] }
+const get_default_auto_generated_storefront = (driver) => {
+  return async () => {
+    const client = driver.client;
+    const dialectType = driver.dialectType;
+    const limit = -1;
+    const sf = await client.selectNoFrom(
+      eb => [
+        jsonArrayFrom(
+          eb
+          .selectFrom('collections')
+          .select(resource_to_props.collections)
+          .select(
+            eb => [
+              with_tags(eb, eb.ref('collections.id'), dialectType),
+              with_media(eb, eb.ref('collections.id'), dialectType),
+            ]
+          )
+          .where('active', '=', 1)
+          .orderBy(['updated_at desc']),
+          driver.dialectType
+        ).as('collections'),
+  
+        jsonArrayFrom(
+          eb
+          .selectFrom('products')
+          .select(resource_to_props.products)
+          .select(
+            eb => [
+              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 desc'])
+          .limit(10),
+          dialectType
+        ).as('products'),
+  
+        jsonArrayFrom(
+          eb
+          .selectFrom('discounts')
+          .select(resource_to_props.discounts)
+          .select(
+            eb => [
+              with_tags(eb, eb.ref('discounts.id'), dialectType),
+              with_media(eb, eb.ref('discounts.id'), dialectType),
+            ]
+          )
+          .where('active', '=', 1)
+          .orderBy(['updated_at desc']),
+          dialectType
+        ).as('discounts'),
+  
+        jsonArrayFrom(
+          eb
+          .selectFrom('shipping_methods')
+          .select(resource_to_props.shipping_methods)
+          .select(
+            eb => [
+              with_tags(eb, eb.ref('shipping_methods.id'), dialectType),
+              with_media(eb, eb.ref('shipping_methods.id'), dialectType),
+            ]
+          )
+          .where('active', '=', 1)
+          .orderBy(['updated_at desc']),
+          dialectType
+        ).as('shipping_methods'),
+  
+        jsonArrayFrom(
+          eb
+          .selectFrom('posts')
+          .select(resource_to_props.posts)
+          .select(
+            eb => [
+              with_tags(eb, eb.ref('posts.id'), dialectType),
+              with_media(eb, eb.ref('posts.id'), dialectType),
+            ]
+          )
+          .where('active', '=', 1)
+          .orderBy(['updated_at desc'])
+          .limit(3),
+          dialectType
+        ).as('posts'),
+  
+        stringArrayFrom(
+          eb.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'),
+          dialectType
+        ).as('all_used_products_tags')
+      ]
+    )
+    .executeTakeFirst();
+  
+    const sanitized = sanitize(
+      {
+        active: true,
+        created_at: new Date().toISOString(),
+        handle: 'default-auto-generated-storefront',
+        id: 'default',
+        title: 'Default Auto Generated Storefront',
+        description: 'Default Auto Generated Storefront',
+        ...sf
+      }
     );
-    return item?.posts ?? []
-  }
-}
 
-/**
- * @param {SQL} driver 
- * @returns {db_col["list_storefront_shipping_methods"]}
- */
-const list_storefront_shipping_methods = (driver) => {
-  return async (product_id_or_handle) => {
-    // because we load everything (we don't expect storefronts to
-    // promote so many products), therefore we use the simple `get`
-    // method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['shipping_methods'] }
-    );
-    return item?.shipping_methods ?? []
+    return sanitized;
   }
 }
 
@@ -296,12 +380,8 @@ export const impl = (driver) => {
     upsert: upsert(driver),
     remove: remove(driver),
     list: list(driver),
-    list_storefront_products: list_storefront_products(driver),
-    list_storefront_collections: list_storefront_collections(driver),
-    list_storefront_discounts: list_storefront_discounts(driver),
-    list_storefront_posts: list_storefront_posts(driver),
-    list_storefront_shipping_methods: list_storefront_shipping_methods(driver),
     count: count_regular(driver, table_name),
+    get_default_auto_generated_storefront: get_default_auto_generated_storefront(driver),
   }
 }
 

package/src/con.tags.js

@@ -2,10 +2,11 @@
  * @import { db_tags as db_col } from '@storecraft/core/database'
  */
 import { SQL } from '../index.js'
-import { count_regular, delete_me, delete_search_of, insert_search_of, 
+import { 
+  count_regular, delete_me, delete_search_of, insert_search_of, 
   regular_upsert_me, where_id_or_handle_table, 
-  with_media,
-  with_search} from './con.shared.js'
+  with_media, 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'
 
@@ -23,11 +24,14 @@ const upsert = (driver) => {
         async (trx) => {
           await insert_search_of(trx, search_terms, item.id, item.handle, table_name);
           await regular_upsert_me(trx, table_name, {
+            active: item.active ? 1 : 0,
+            description: item.description,
             created_at: item.created_at,
             updated_at: item.updated_at,
             id: item.id,
             handle: item.handle,
-            values: JSON.stringify(item.values)
+            attributes: JSON.stringify(item.attributes),
+            values: JSON.stringify(item.values),
           });
         }
       );
@@ -71,7 +75,7 @@ const remove = (driver) => {
         async (trx) => {
             
           // entities
-          await delete_search_of(trx, id_or_handle);
+          await delete_search_of(trx, id_or_handle, id_or_handle, table_name);
           // delete me
           await delete_me(trx, table_name, id_or_handle);
         }