@storecraft/database-sql-base 1.0.10 → 1.0.12

package/src/con.shared.js

@@ -1,3 +1,9 @@
+/**
+ * @import { db_crud } from '@storecraft/core/database'
+ * @import { Database } from '../types.sql.tables.js'
+ * @import { ExpressionBuilder, InsertObject } from 'kysely'
+ * @import { SqlDialectType } from '../types.public.js'
+ */
 import { ExpressionWrapper, InsertQueryBuilder, Kysely, Transaction } from 'kysely'
 import { jsonArrayFrom, stringArrayFrom } from './con.helpers.json.js'
 import { SQL } from '../index.js';
@@ -42,7 +48,7 @@ export const safe_trx = (k) => {
  * @param {SQL} driver 
  * @param {keyof Database} table_name 
  * 
- * @returns {import('@storecraft/core/database').db_crud["count"]}
+ * @returns {db_crud["count"]}
  */
 export const count_regular = (driver, table_name) => {
   return async (query) => {
@@ -69,7 +75,7 @@ export const count_regular = (driver, table_name) => {
  */
 export const where_id_or_handle_entity = (id_or_handle) => {
   /**
-   * @param {import('kysely').ExpressionBuilder<Database>} eb 
+   * @param {ExpressionBuilder<Database>} eb 
    */
   return (eb) => eb.or(
     [
@@ -85,7 +91,7 @@ export const where_id_or_handle_entity = (id_or_handle) => {
  */
 export const where_id_or_handle_table = (id_or_handle) => {
   /**
-   * @param {import('kysely').ExpressionBuilder<Database>} eb 
+   * @param {ExpressionBuilder<Database>} eb 
    */
   return (eb) => eb.or(
     [
@@ -138,7 +144,7 @@ export const delete_entity_values_of_by_entity_id_or_handle =
 (entity_table_name) => {
   /**
    * 
-   * @param {Kysely<import('../index.js').Database>} trx 
+   * @param {Kysely<Database>} trx 
    * @param {string} entity_id delete by id
    * @param {string} [entity_handle=entity_id] delete by handle
    */
@@ -261,17 +267,13 @@ export const delete_tags_of = delete_entity_values_of_by_entity_id_or_handle('en
 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');
 
-/**
- * @typedef {import('../index.js').Database} Database
- */
-
 
 /**
  * @template {keyof Database} T
  * 
  * @param {Kysely<Database>} trx 
  * @param {T} table_name 
- * @param {import('kysely').InsertObject<Database, T>} item values of the entity
+ * @param {InsertObject<Database, T> & {id: string, handle: string}} item values of the entity
  * 
  */
 export const regular_upsert_me = async (trx, table_name, item) => {
@@ -280,8 +282,10 @@ export const regular_upsert_me = async (trx, table_name, item) => {
   await trx.deleteFrom(table_name).where(
     eb => eb.or(
       [
-        item.id && eb('id', '=', item.id),
-        item.handle && eb('handle', '=', item.handle),
+        // @ts-ignore
+        item?.id && eb('id', '=', item.id),
+        // @ts-ignore
+        item?.handle && eb('handle', '=', item.handle),
       ].filter(Boolean)
     )
   ).execute();
@@ -305,9 +309,9 @@ export const delete_me = async (trx, table_name, id_or_handle) => {
 
 /**
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const with_tags = (eb, id_or_handle, sql_type) => {
   return stringArrayFrom(
@@ -319,9 +323,9 @@ export const with_tags = (eb, id_or_handle, sql_type) => {
 
 /**
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const with_search = (eb, id_or_handle, sql_type) => {
   return stringArrayFrom(
@@ -333,9 +337,9 @@ export const with_search = (eb, id_or_handle, sql_type) => {
 
 /**
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const with_media = (eb, id_or_handle, sql_type) => {
   return stringArrayFrom(
@@ -345,31 +349,24 @@ export const with_media = (eb, id_or_handle, sql_type) => {
   ).as('media');
 }
 
-/**
- * helper to select base attributes
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
- * @param {keyof Database} table 
- * @return {import('kysely').SelectQueryBuilder<Database, table>}
- */
-const select_base_from = (eb, table) => {
-  return [ 
-    'active', 'attributes', 'created_at', 'updated_at',
-    'description', 'handle', 'id'
-  ].map(k => `${table}.${k}`).reduce(
-    (p, c) => p.select(c), eb.selectFrom(table)
-  );
-}
 
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
+ * @param {ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const products_with_collections = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'collections')
+    eb.selectFrom('collections')
+      .select('collections.active')
+      .select('collections.attributes')
+      .select('collections.created_at')
+      .select('collections.updated_at')
+      .select('collections.description')
+      .select('collections.handle')
+      .select('collections.id')
       .select('collections.title')
       .select('collections.published')
       .select(eb => [
@@ -387,13 +384,20 @@ export const products_with_collections = (eb, product_id_or_handle, sql_type) =>
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
+ * @param {ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const products_with_discounts = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'discounts')
+    eb.selectFrom('discounts')
+      .select('discounts.active')
+      .select('discounts.attributes')
+      .select('discounts.created_at')
+      .select('discounts.updated_at')
+      .select('discounts.description')
+      .select('discounts.handle')
+      .select('discounts.id')
       .select('discounts.title')
       .select('discounts.published')
       .select('discounts.application')
@@ -414,13 +418,20 @@ export const products_with_discounts = (eb, product_id_or_handle, sql_type) => {
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
+ * @param {ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const products_with_variants = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'products')
+    eb.selectFrom('products')
+      .select('products.active')
+      .select('products.attributes')
+      .select('products.created_at')
+      .select('products.updated_at')
+      .select('products.description')
+      .select('products.handle')
+      .select('products.id')
       .select('products.compare_at_price')
       .select('products.parent_handle')
       .select('products.parent_id')
@@ -445,13 +456,20 @@ export const products_with_variants = (eb, product_id_or_handle, sql_type) => {
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database, 'products'>} eb 
+ * @param {ExpressionBuilder<Database, 'products'>} eb 
  * @param {string | ExpressionWrapper<Database>} product_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const products_with_related_products = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'products')
+    eb.selectFrom('products')
+      .select('products.active')
+      .select('products.attributes')
+      .select('products.created_at')
+      .select('products.updated_at')
+      .select('products.description')
+      .select('products.handle')
+      .select('products.id')
       .select('products.compare_at_price')
       .select('products.parent_handle')
       .select('products.parent_id')
@@ -477,16 +495,23 @@ export const products_with_related_products = (eb, product_id_or_handle, sql_typ
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database, 'storefronts'>} eb 
+ * @param {ExpressionBuilder<Database, 'storefronts'>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const storefront_with_collections = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'collections')
-    .select('collections.title')
-    .select('collections.published')
-    .select(eb => [
+    eb.selectFrom('collections')
+      .select('collections.active')
+      .select('collections.attributes')
+      .select('collections.created_at')
+      .select('collections.updated_at')
+      .select('collections.description')
+      .select('collections.handle')
+      .select('collections.id')
+      .select('collections.title')
+      .select('collections.published')
+      .select(eb => [
       with_tags(eb, eb.ref('collections.id'), sql_type),
       with_media(eb, eb.ref('collections.id'), sql_type),
     ])
@@ -501,13 +526,20 @@ export const storefront_with_collections = (eb, sf_id_or_handle, sql_type) => {
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const storefront_with_products = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'products')
+    eb.selectFrom('products')
+    .select('products.active')
+    .select('products.attributes')
+    .select('products.created_at')
+    .select('products.updated_at')
+    .select('products.description')
+    .select('products.handle')
+    .select('products.id')
     .select('products.title')
     .select('products.compare_at_price')
     .select('products.parent_handle')
@@ -532,13 +564,20 @@ export const storefront_with_products = (eb, sf_id_or_handle, sql_type) => {
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const storefront_with_discounts = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'discounts')
+    eb.selectFrom('discounts')
+    .select('discounts.active')
+    .select('discounts.attributes')
+    .select('discounts.created_at')
+    .select('discounts.updated_at')
+    .select('discounts.description')
+    .select('discounts.handle')
+    .select('discounts.id')
     .select('discounts.application')
     .select('discounts.info')
     .select('discounts.priority')
@@ -559,13 +598,20 @@ export const storefront_with_discounts = (eb, sf_id_or_handle, sql_type) => {
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const storefront_with_posts = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'posts')
+    eb.selectFrom('posts')
+    .select('posts.active')
+    .select('posts.attributes')
+    .select('posts.created_at')
+    .select('posts.updated_at')
+    .select('posts.description')
+    .select('posts.handle')
+    .select('posts.id')
     .select('posts.text')
     .select('posts.title')
     .select(eb => [
@@ -583,13 +629,20 @@ export const storefront_with_posts = (eb, sf_id_or_handle, sql_type) => {
 /**
  * select as json array collections of a product
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {string | ExpressionWrapper<Database>} sf_id_or_handle 
- * @param {import('../types.public.d.ts').SqlDialectType} sql_type 
+ * @param {SqlDialectType} sql_type 
  */
 export const storefront_with_shipping = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'shipping_methods')
+    eb.selectFrom('shipping_methods')
+    .select('shipping_methods.active')
+    .select('shipping_methods.attributes')
+    .select('shipping_methods.created_at')
+    .select('shipping_methods.updated_at')
+    .select('shipping_methods.description')
+    .select('shipping_methods.handle')
+    .select('shipping_methods.id')
     .select('shipping_methods.price')
     .select('shipping_methods.title')
     .select(eb => [
@@ -607,7 +660,7 @@ export const storefront_with_shipping = (eb, sf_id_or_handle, sql_type) => {
 /**
  * select all the entity values by entity id or handle
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {EntityTableKeys} entity_junction_table 
  * @param {string | ExpressionWrapper<Database>} entity_id_or_handle 
  */
@@ -629,7 +682,7 @@ export const select_values_of_entity_by_entity_id_or_handle =
 /**
  * select the entity ids which are constrained by value or reporter
  * 
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
+ * @param {ExpressionBuilder<Database>} eb 
  * @param {EntityTableKeys} entity_junction_table 
  * @param {string | ExpressionWrapper<Database>} value 
  * @param {string | ExpressionWrapper<Database>} [reporter] 

package/src/con.shipping.js

@@ -1,16 +1,16 @@
+/**
+ * @import { db_shipping as db_col } from '@storecraft/core/database'
+ */
 import { SQL } from '../index.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'
 
-/**
- * @typedef {import('@storecraft/core/database').db_shipping} db_col
- */
 export const table_name = 'shipping_methods'
 
 /**
@@ -54,17 +54,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 +117,19 @@ const list = (driver) => {
       .select(eb => [
         with_media(eb, eb.ref('shipping_methods.id'), driver.dialectType),
         with_tags(eb, eb.ref('shipping_methods.id'), driver.dialectType),
+        with_search(eb, eb.ref('shipping_methods.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, 'shipping_methods'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
     if(query.limitToLast) items.reverse();
-
+    
     return sanitize_array(items);
   }
 }

package/src/con.storefronts.js

@@ -1,3 +1,6 @@
+/**
+ * @import { db_storefronts as db_col } from '@storecraft/core/database'
+ */
 import { SQL } from '../index.js'
 import { report_document_media } from './con.images.js'
 import { delete_entity_values_of_by_entity_id_or_handle, 
@@ -8,13 +11,11 @@ import { delete_entity_values_of_by_entity_id_or_handle,
   storefront_with_products, storefront_with_shipping, 
   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'
 
-/**
- * @typedef {import('@storecraft/core/database').db_storefronts} db_col
- */
 export const table_name = 'storefronts'
 
 /**
@@ -97,6 +98,7 @@ const upsert = (driver) => {
  * @returns {db_col["get"]}
  */
 const get = (driver) => {
+  // @ts-ignore
   return (id_or_handle, options) => {
     const expand = options?.expand ?? ['*'];
     const expand_all = expand.includes('*');
@@ -112,6 +114,7 @@ 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),
       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),
@@ -120,7 +123,8 @@ const get = (driver) => {
     ]
     .filter(Boolean))
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -162,6 +166,7 @@ const remove = (driver) => {
  * @returns {db_col["list"]}
  */
 const list = (driver) => {
+  // @ts-ignore
   return async (query) => {
     const expand = query?.expand ?? ['*'];
     const expand_all = expand.includes('*');
@@ -177,6 +182,7 @@ const list = (driver) => {
       .select(eb => [
           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),
@@ -189,7 +195,7 @@ const list = (driver) => {
           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.tags.js

@@ -1,12 +1,14 @@
+/**
+ * @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, 
-  regular_upsert_me, where_id_or_handle_table } from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  regular_upsert_me, where_id_or_handle_table, 
+  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'
 
-/**
- * @typedef {import('@storecraft/core/database').db_tags} db_col
- */
 export const table_name = 'tags'
 
 /**
@@ -47,8 +49,13 @@ const get = (driver) => {
     return driver.client
     .selectFrom(table_name)
     .selectAll()
+    .select(eb => [
+        with_search(eb, id_or_handle, driver.dialectType),
+      ].filter(Boolean)
+    )
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -89,12 +96,15 @@ const list = (driver) => {
     const items = await driver.client
       .selectFrom(table_name)
       .selectAll()
+      .select(eb => [
+        with_search(eb, eb.ref('tags.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.templates.js

@@ -1,14 +1,16 @@
+/**
+ * @import { db_templates as db_col } from '@storecraft/core/database'
+ * @import { Database } from '../types.sql.tables.js'
+ */
 import { Kysely } from 'kysely'
 import { SQL } from '../index.js'
 import { count_regular, delete_me, delete_search_of, insert_search_of, 
-  regular_upsert_me, safe_trx, where_id_or_handle_table } from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  regular_upsert_me, safe_trx, where_id_or_handle_table, 
+  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 { base64 } from '@storecraft/core/crypto';
 
-/**
- * @typedef {import('@storecraft/core/database').db_templates} db_col
- */
 export const table_name = 'templates'
 
 /**
@@ -25,8 +27,7 @@ const decode_if_base64 = val => {
 }
 
 /**
- * @param {Kysely<import('../index.js').Database>} client 
- * 
+ * @param {Kysely<Database>} client 
  * 
  * @returns {db_col["upsert"]}
  */
@@ -70,8 +71,13 @@ const get = (driver) => {
     return driver.client
     .selectFrom(table_name)
     .selectAll()
+    .select(eb => [
+        with_search(eb, id_or_handle, driver.dialectType),
+      ].filter(Boolean)
+    )
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -114,12 +120,17 @@ const list = (driver) => {
     const items = await driver.client
       .selectFrom(table_name)
       .selectAll()
+      .select(
+        eb => [
+          with_search(eb, eb.ref('templates.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/kysely.sanitize.plugin.js

@@ -1,3 +1,9 @@
+/**
+ * @import { 
+ *  KyselyPlugin, PluginTransformQueryArgs, RootOperationNode, 
+ *  PluginTransformResultArgs, QueryResult, UnknownRow 
+ * } from 'kysely'
+ */
 import { sanitize } from './utils.funcs.js';
 
 /**
@@ -6,20 +12,16 @@ import { sanitize } from './utils.funcs.js';
  * - sanitize `undefined` and `null` values
  * - `active` keys will be transformed to `boolean`
  * 
- * 
- * @typedef {import('kysely').KyselyPlugin} KyselyPlugin
- * 
- * 
  * @implements {KyselyPlugin}
  */
 export class SanitizePlugin {
 
   /**
    * 
-   * @param {import('kysely').PluginTransformQueryArgs} args 
+   * @param {PluginTransformQueryArgs} args 
    * 
    * 
-   * @returns {import('kysely').RootOperationNode}
+   * @returns {RootOperationNode}
    */
   transformQuery(args) {
     return args.node;
@@ -27,10 +29,10 @@ export class SanitizePlugin {
 
   /**
    * 
-   * @param {import('kysely').PluginTransformResultArgs} args 
+   * @param {PluginTransformResultArgs} args 
    * 
    * 
-   * @returns {Promise<import('kysely').QueryResult<import('kysely').UnknownRow>>}
+   * @returns {Promise<QueryResult<UnknownRow>>}
    */
   transformResult(args){
     sanitize(args.result.rows);