@storecraft/database-sql-base 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-sql-base",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Official SQL Database driver for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/store-craft/storecraft.git",
-    "directory": "packages/database-sql-base"
+    "directory": "packages/databases/database-sql-base"
   },
   "keywords": [
     "commerce",
@@ -20,19 +20,17 @@
   "main": "index.js",
   "types": "./types.public.d.ts",
   "scripts": {
-    "test": "uvu -c",
     "database-sql-base:test:sqlite": "node ./tests/runner.sqlite-local.test.js",
     "database-sql-base:test:postgres": "node ./tests/runner.postgres-local.test.js",
     "database-sql-base:test:mysql": "node ./tests/runner.mysql-local.test.js",
-    "database-sql-base:publish": "npm publish --access public"
+    "test": "npm run database-sql-base:test:sqlite && npm run database-sql-base:test:postgres && npm run database-sql-base:test:mysql",
+    "prepublishOnly": "npm version patch --force"
   },
   "dependencies": {
     "@storecraft/core": "^1.0.0",
     "kysely": "^0.27.2"
   },
   "devDependencies": {
-    "@storecraft/platforms": "^1.0.0",
-    "@storecraft/test-runner": "^1.0.0",
     "@types/better-sqlite3": "^7.6.9",
     "@types/node": "^20.11.0",
     "@types/pg": "^8.11.2",

package/src/con.auth_users.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+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, 
@@ -7,7 +7,7 @@ import { count_regular, delete_me, insert_search_of, insert_tags_of, regular_ups
 import { query_to_eb, query_to_sort } from './utils.query.js';
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_auth_users} db_col
+ * @typedef {import('@storecraft/core/database').db_auth_users} db_col
  */
 
 export const table_name = 'auth_users';
@@ -36,6 +36,8 @@ const upsert = (driver) => {
             updated_at: item.updated_at,
             id: item.id,
             roles: JSON.stringify(item.roles),
+            firstname: item.firstname,
+            lastname: item.lastname
           });
         }
       );

package/src/con.collections.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+import { SQL } from '../index.js'
 import { report_document_media } from './con.images.js'
 import { delete_entity_values_by_value_or_reporter, delete_me, 
   delete_media_of, delete_search_of, delete_tags_of, 
@@ -12,7 +12,7 @@ import { query_to_eb, query_to_sort } from './utils.query.js'
 
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_collections} db_col
+ * @typedef {import('@storecraft/core/database').db_collections} db_col
  */
 export const table_name = 'collections'
 

package/src/con.customers.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+import { SQL } from '../index.js'
 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, 
@@ -8,7 +8,7 @@ import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_customers} db_col
+ * @typedef {import('@storecraft/core/database').db_customers} db_col
  */
 export const table_name = 'customers'
 

package/src/con.discounts.js

@@ -1,5 +1,5 @@
-import { enums } from '@storecraft/core/v-api'
-import { SQL } from '../driver.js'
+import { enums } from '@storecraft/core/api'
+import { SQL } from '../index.js'
 import { discount_to_conjunctions } from './con.discounts.utils.js'
 import { delete_entity_values_by_value_or_reporter, 
   delete_me, delete_media_of, delete_search_of, 
@@ -12,7 +12,7 @@ import { query_to_eb, query_to_sort } from './utils.query.js'
 import { report_document_media } from './con.images.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_discounts} db_col
+ * @typedef {import('@storecraft/core/database').db_discounts} db_col
  */
 export const table_name = 'discounts'
 

package/src/con.discounts.utils.js

@@ -1,11 +1,11 @@
-import { enums } from "@storecraft/core/v-api";
+import { enums } from "@storecraft/core/api";
 
-/** @param {import("@storecraft/core/v-api").DiscountType} d */
+/** @param {import("@storecraft/core/api").DiscountType} d */
 const is_order_discount = d => {
   return (d.info.details.meta.id===enums.DiscountMetaEnum.order.id);
 }
 
-/** @param {import("@storecraft/core/v-api").DiscountType} d */
+/** @param {import("@storecraft/core/api").DiscountType} d */
 const is_automatic_discount = d => {
   return (d.application.id===enums.DiscountApplicationEnum.Auto.id);
 }
@@ -43,7 +43,7 @@ const eb_in = (eb, table, op, value) => {
  * create a mongodb conjunctions clauses from discount, intended
  * for filtering.
  * @param {import("kysely").ExpressionBuilder<Database, 'products'>} eb 
- * @param {import("@storecraft/core/v-api").DiscountType} d 
+ * @param {import("@storecraft/core/api").DiscountType} d 
  */
 export const discount_to_conjunctions = (eb, d) => {
   // discount has to be product discount + automatic + active + has filters
@@ -66,7 +66,7 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_products.op:
         {
-          /** @type {import("@storecraft/core/v-api").FilterValue_p_in_products} */
+          /** @type {import("@storecraft/core/api").FilterValue_p_in_products} */
           const cast = Array.isArray(filter?.value) ? filter.value : [];
 
           conjunctions.push(
@@ -79,7 +79,7 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_not_in_products.op:
         {
-          /** @type {import("@storecraft/core/v-api").FilterValue_p_not_in_products} */
+          /** @type {import("@storecraft/core/api").FilterValue_p_not_in_products} */
           const cast = Array.isArray(filter?.value) ? filter.value : [];
 
           conjunctions.push(
@@ -92,7 +92,7 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_tags.op:
         {
-          /** @type {import("@storecraft/core/v-api").FilterValue_p_in_tags} */
+          /** @type {import("@storecraft/core/api").FilterValue_p_in_tags} */
           const cast = Array.isArray(filter?.value) ? filter.value : [];
           
           conjunctions.push(
@@ -105,7 +105,7 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_not_in_tags.op:
         {
-          /** @type {import("@storecraft/core/v-api").FilterValue_p_not_in_tags} */
+          /** @type {import("@storecraft/core/api").FilterValue_p_not_in_tags} */
           const cast = Array.isArray(filter?.value) ? filter.value : [];
 
           conjunctions.push(
@@ -120,7 +120,7 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_collections.op:
         {
-          /** @type {import("@storecraft/core/v-api").FilterValue_p_in_collections} */
+          /** @type {import("@storecraft/core/api").FilterValue_p_in_collections} */
           const cast = Array.isArray(filter?.value) ? filter.value : [];
 
           // PROBLEM: we only have ids, but use handles in the filters
@@ -134,7 +134,7 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_not_in_collections.op:
         {
-          /** @type {import("@storecraft/core/v-api").FilterValue_p_not_in_collections} */
+          /** @type {import("@storecraft/core/api").FilterValue_p_not_in_collections} */
           const cast = Array.isArray(filter?.value) ? filter.value : [];
 
           conjunctions.push(
@@ -149,7 +149,7 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_price_range.op:
         {
-          /** @type {import("@storecraft/core/v-api").FilterValue_p_in_price_range} */
+          /** @type {import("@storecraft/core/api").FilterValue_p_in_price_range} */
           const cast = {
             from: 0,
             to: Number.POSITIVE_INFINITY,

package/src/con.images.js

@@ -1,18 +1,18 @@
-import { func } from '@storecraft/core/v-api'
-import { SQL } from '../driver.js'
+import { func } from '@storecraft/core/api'
+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 { query_to_eb, query_to_sort } from './utils.query.js'
 import { Transaction } from 'kysely'
-import { ID } from '@storecraft/core/v-api/utils.func.js'
+import { ID } from '@storecraft/core/api/utils.func.js'
 import { 
   image_url_to_handle, image_url_to_name 
-} from '@storecraft/core/v-api/con.images.logic.js'
+} from '@storecraft/core/api/con.images.logic.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_images} db_col
+ * @typedef {import('@storecraft/core/database').db_images} db_col
  */
 export const table_name = 'images'
 

package/src/con.notifications.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+import { SQL } from '../index.js'
 import { count_regular, delete_me, delete_search_of, 
   insert_search_of, regular_upsert_me, where_id_or_handle_table, 
   with_search } from './con.shared.js'
@@ -6,7 +6,7 @@ import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_notifications} db_col
+ * @typedef {import('@storecraft/core/database').db_notifications} db_col
  */
 export const table_name = 'notifications'
 

package/src/con.orders.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+import { SQL } from '../index.js'
 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, 
@@ -8,7 +8,7 @@ import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_orders} db_col
+ * @typedef {import('@storecraft/core/database').db_orders} db_col
  */
 export const table_name = 'orders'
 

package/src/con.posts.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+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, 
@@ -9,7 +9,7 @@ import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_posts} db_col
+ * @typedef {import('@storecraft/core/database').db_posts} db_col
  */
 export const table_name = 'posts'
 

package/src/con.products.js

@@ -1,5 +1,5 @@
-import { enums } from '@storecraft/core/v-api'
-import { SQL } from '../driver.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, 
   delete_search_of, delete_tags_of, 
   insert_entity_values_of, insert_media_of, insert_search_of, 
@@ -18,7 +18,7 @@ import { report_document_media } from './con.images.js'
 
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_products} db_col
+ * @typedef {import('@storecraft/core/database').db_products} db_col
  */
 export const table_name = 'products'
 
@@ -247,8 +247,8 @@ const getBulk = (driver) => {
  */
 const remove_internal = (driver) => {
   /**
-   * @param {import('@storecraft/core/v-api').ProductType | 
-   *  import('@storecraft/core/v-api').VariantType
+   * @param {import('@storecraft/core/api').ProductType | 
+   *  import('@storecraft/core/api').VariantType
    * } product
    * @param {Transaction<import('../index.js').Database>} trx
    */

package/src/con.search.js

@@ -1,15 +1,15 @@
-import { SQL } from '../driver.js'
+import { SQL } from '../index.js'
 import { jsonArrayFrom } from './con.helpers.json.js';
 import { query_to_eb, query_to_sort } from './utils.query.js';
 
 /**
- * @typedef {import('@storecraft/core/v-database').search} db_col
+ * @typedef {import('@storecraft/core/database').search} db_col
  */
 
 
 
 /**
- * @type {(keyof import('@storecraft/core/v-database').db_driver["resources"])[]}
+ * @type {(keyof import('@storecraft/core/database').db_driver["resources"])[]}
  */
 const tables = [
   'tags',
@@ -27,7 +27,7 @@ const tables = [
 ]
 
 /**
- * @type {Record<string, keyof import('@storecraft/core/v-database').db_driver["resources"]>}
+ * @type {Record<string, keyof import('@storecraft/core/database').db_driver["resources"]>}
  */
 const prefix_to_resource = {
   'au': 'auth_users',
@@ -47,7 +47,7 @@ const prefix_to_resource = {
 }
 
 /**
- * @type {Record<keyof import('@storecraft/core/v-database').db_driver["resources"], string[]>}
+ * @type {Record<keyof import('@storecraft/core/database').db_driver["resources"], string[]>}
  */
 const resource_to_props = {
   'auth_users': ['id', 'handle'],
@@ -68,7 +68,7 @@ const resource_to_props = {
  * 
  * @param {string} id 
  * 
- * @returns {keyof import('@storecraft/core/v-database').db_driver["resources"]}
+ * @returns {keyof import('@storecraft/core/database').db_driver["resources"]}
  */
 export const id_to_resource = id => {
   let result = undefined;
@@ -119,7 +119,7 @@ export const quicksearch = (driver) => {
         )
     )
     
-    /** @type {import('@storecraft/core/v-api').QuickSearchResult} */
+    /** @type {import('@storecraft/core/api').QuickSearchResult} */
     const items = await sts.executeTakeFirst();
 
     const sanitized = Object.fromEntries(

package/src/con.shared.experiment.js

@@ -83,7 +83,7 @@ const trans_or_batch = (driver) => {
  * @param {SQL} driver 
  * @param {keyof Database} table_name 
  * 
- * @returns {import('@storecraft/core/v-database').db_crud["count"]}
+ * @returns {import('@storecraft/core/database').db_crud["count"]}
  */
 export const count_regular = (driver, table_name) => {
   return async (query) => {

package/src/con.shared.js

@@ -1,14 +1,48 @@
-import { ExpressionWrapper, InsertQueryBuilder, Transaction } from 'kysely'
+import { ExpressionWrapper, InsertQueryBuilder, Kysely, Transaction } from 'kysely'
 import { jsonArrayFrom, stringArrayFrom } from './con.helpers.json.js'
 import { SQL } from '../index.js';
 import { query_to_eb } from './utils.query.js';
 
+/**
+ * @template K
+ * @typedef {K extends Kysely<infer D> ? D : unknown} KDB
+ * 
+ */
+
+/**
+ * @description Use the current kysely connection as transaction if
+ * it already a transaction, otherwise eecute a new transaction.
+ * 
+ * @param {Kysely<Database>} k 
+ * 
+ */
+export const safe_trx = (k) => {
+  if(k.isTransaction) {
+    return {
+      /**
+       * 
+       * @param {(k: Kysely<Database>) => Promise<any>} cb 
+       */
+      execute: (cb) => {
+        return cb(k);
+      }
+    }
+  }
+
+  return {
+    /**
+     * @param {(k: Transaction<Database>) => Promise<any>} cb 
+     */
+    execute: (cb) => k.transaction().execute(cb)
+  }
+}
+
 
 /**
  * @param {SQL} driver 
  * @param {keyof Database} table_name 
  * 
- * @returns {import('@storecraft/core/v-database').db_crud["count"]}
+ * @returns {import('@storecraft/core/database').db_crud["count"]}
  */
 export const count_regular = (driver, table_name) => {
   return async (query) => {
@@ -78,7 +112,7 @@ export const where_id_or_handle_table = (id_or_handle) => {
 export const delete_entity_values_by_value_or_reporter = (entity_table_name) => {
   /**
    * 
-   * @param {Transaction<Database>} trx 
+   * @param {Kysely<Database>} trx 
    * @param {string} value delete by entity value
    * @param {string} [reporter] delete by reporter
    */
@@ -104,7 +138,7 @@ export const delete_entity_values_of_by_entity_id_or_handle =
 (entity_table_name) => {
   /**
    * 
-   * @param {Transaction<import('../index.js').Database>} trx 
+   * @param {Kysely<import('../index.js').Database>} trx 
    * @param {string} entity_id delete by id
    * @param {string} [entity_handle=entity_id] delete by handle
    */
@@ -127,7 +161,7 @@ export const delete_entity_values_of_by_entity_id_or_handle =
 export const insert_entity_array_values_of = (entity_table_name) => {
   /**
    * 
-   * @param {Transaction<Database>} trx 
+   * @param {Kysely<Database>} trx 
    * @param {string[]} values values of the entity
    * @param {string} item_id whom the tags belong to
    * @param {string} [item_handle] whom the tags belong to
@@ -175,7 +209,7 @@ export const insert_entity_array_values_of = (entity_table_name) => {
 export const insert_entity_values_of = (entity_table_name) => {
   /**
    * 
-   * @param {Transaction<Database>} trx 
+   * @param {Kysely<Database>} trx 
    * @param {{value: string, reporter: string}[]} values values of the entity
    * @param {string} item_id whom the tags belong to
    * @param {string} [item_handle] whom the tags belong to
@@ -206,7 +240,7 @@ export const insert_entity_values_of = (entity_table_name) => {
  */
 export const insert_entity_array_values_with_delete_of = (entity_table) => {
 /**
- * @param {Transaction<Database>} trx 
+ * @param {Kysely<Database>} trx 
  * @param {string[]} values values of the entity
  * @param {string} item_id entity id
  * @param {string} [item_handle] entity handle
@@ -235,7 +269,7 @@ export const delete_media_of = delete_entity_values_of_by_entity_id_or_handle('e
 /**
  * @template {keyof Database} T
  * 
- * @param {Transaction<Database>} trx 
+ * @param {Kysely<Database>} trx 
  * @param {T} table_name 
  * @param {import('kysely').InsertObject<Database, T>} item values of the entity
  * 
@@ -258,7 +292,7 @@ export const regular_upsert_me = async (trx, table_name, item) => {
 
 /**
  * 
- * @param {Transaction<Database>} trx 
+ * @param {Kysely<Database>} trx 
  * @param {keyof Database} table_name 
  * @param {string} id_or_handle 
  */

package/src/con.shipping.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+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, 
@@ -9,7 +9,7 @@ import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_shipping} db_col
+ * @typedef {import('@storecraft/core/database').db_shipping} db_col
  */
 export const table_name = 'shipping_methods'
 

package/src/con.storefronts.js

@@ -1,4 +1,4 @@
-import { SQL } from '../driver.js'
+import { SQL } from '../index.js'
 import { report_document_media } from './con.images.js'
 import { delete_entity_values_of_by_entity_id_or_handle, 
   delete_me, delete_media_of, delete_search_of, 
@@ -13,7 +13,7 @@ import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_storefronts} db_col
+ * @typedef {import('@storecraft/core/database').db_storefronts} db_col
  */
 export const table_name = 'storefronts'
 

package/src/con.tags.js

@@ -1,11 +1,11 @@
-import { SQL } from '../driver.js'
+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 { query_to_eb, query_to_sort } from './utils.query.js'
 
 /**
- * @typedef {import('@storecraft/core/v-database').db_tags} db_col
+ * @typedef {import('@storecraft/core/database').db_tags} db_col
  */
 export const table_name = 'tags'
 

package/src/con.templates.js

@@ -1,15 +1,28 @@
 import { Kysely } from 'kysely'
-import { SQL } from '../driver.js'
+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'
+  regular_upsert_me, safe_trx, where_id_or_handle_table } from './con.shared.js'
 import { 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/v-database').db_templates} db_col
+ * @typedef {import('@storecraft/core/database').db_templates} db_col
  */
 export const table_name = 'templates'
 
+/**
+ * @description if `base64_` prefixed then decode the postfix and return it,
+ * otherwise, just return the original value.
+ * @param {string} val 
+ */
+const decode_if_base64 = val => {
+  if(!val.startsWith('base64_'))
+    return val;
+
+  const b64 = val.split('base64_').at(1) ?? '';
+  return base64.decode(b64);
+}
 
 /**
  * @param {Kysely<import('../index.js').Database>} client 
@@ -20,8 +33,9 @@ export const table_name = 'templates'
 export const upsert = (client) => {
   return async (item, search_terms) => {
     try {
-      const t = await client.transaction().execute(
+      const t2 = await safe_trx(client).execute(
         async (trx) => {
+          
           await insert_search_of(trx, search_terms, item.id, item.handle, table_name);
           await regular_upsert_me(trx, table_name, {
             created_at: item.created_at,
@@ -29,12 +43,13 @@ export const upsert = (client) => {
             id: item.id,
             title: item.title,
             handle: item.handle,
-            template_html: item.template_html,
-            template_text: item.template_text,
+            template_html: decode_if_base64(item.template_html),
+            template_text: decode_if_base64(item.template_text),
             reference_example_input: JSON.stringify(item.reference_example_input ?? {})
           });
         }
-      );
+      )
+      
     } catch(e) {
       console.log(e);
       return false;

package/src/utils.query.js

@@ -2,7 +2,7 @@
  * @typedef {import("../index.js").Database} Database
  */
 
-import { parse } from "@storecraft/core/v-ql";
+import { parse } from "@storecraft/core/vql";
 
 /**
  * Convert an API Query cursor into mongo dialect, also sanitize.
@@ -13,7 +13,7 @@ import { parse } from "@storecraft/core/v-ql";
  * 4. (a1, a2, a3) >= (b1, b2, b3) ==> (a1 > b1) || (a1=b1 & a2>b2) || (a1=b1 & a2=b2 & a3>=b3)
  * 
  * @param {import("kysely").ExpressionBuilder<Database>} eb 
- * @param {import("@storecraft/core/v-api").Cursor} c 
+ * @param {import("@storecraft/core/api").Cursor} c 
  * @param {'>' | '>=' | '<' | '<='} relation 
  * @param {(x: [k: string, v: any]) => [k: string, v: any]} transformer Your chance to change key and value
  */
@@ -73,7 +73,7 @@ export const query_cursor_to_eb = (eb, c, relation, transformer=(x)=>x) => {
 
 /**
  * @param {import("kysely").ExpressionBuilder<Database>} eb 
- * @param {import("@storecraft/core/v-ql").VQL.Node} node 
+ * @param {import("@storecraft/core/vql").VQL.Node} node 
  * @param {keyof Database} table_name 
  */
 export const query_vql_node_to_eb = (eb, node, table_name) => {
@@ -120,7 +120,7 @@ export const query_vql_node_to_eb = (eb, node, table_name) => {
 
 /**
  * @param {import("kysely").ExpressionBuilder<Database>} eb 
- * @param {import("@storecraft/core/v-ql").VQL.Node} root 
+ * @param {import("@storecraft/core/vql").VQL.Node} root 
  * @param {keyof Database} table_name 
  */
 export const query_vql_to_eb = (eb, root, table_name) => {
@@ -133,7 +133,7 @@ export const query_vql_to_eb = (eb, root, table_name) => {
  * 
  * 
  * @param {import("kysely").ExpressionBuilder<Database>} eb 
- * @param {import("@storecraft/core/v-api").ApiQuery} q 
+ * @param {import("@storecraft/core/api").ApiQuery} q 
  * @param {keyof Database} table_name 
  * 
  */
@@ -177,7 +177,7 @@ const SIGN = {
 /**
  * Convert an API Query into mongo dialect, also sanitize.
  * 
- * @param {import("@storecraft/core/v-api").ApiQuery} q 
+ * @param {import("@storecraft/core/api").ApiQuery} q 
  */
 export const query_to_sort = (q={}) => {
   // const sort_sign = q.order === 'asc' ? 'asc' : 'desc';