@juadz/knex 0.5.0 → 0.5.1

package/build/basic.d.ts

@@ -1,3 +1,3 @@
-import { IDataRecord, IDataRepositoryProvider } from "@juadz/core";
+import { IDataRecord, IDataRepositoryProvider, Schema } from "@juadz/core";
 import { Knex } from "knex";
-export declare function KnexProvider<T extends IDataRecord>(connection: Knex, dataTableName?: string): IDataRepositoryProvider<T>;
+export declare function KnexProvider<T extends IDataRecord>(schema: Schema<T>, connection: Knex, dataTableName?: string): IDataRepositoryProvider<T>;

package/build/basic.js

@@ -58,47 +58,18 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KnexProvider = KnexProvider;
 var list_1 = require("./list");
-function KnexProvider(connection, dataTableName) {
+function KnexProvider(schema, connection, dataTableName) {
     var _this = this;
-    var tableName = dataTableName || null;
-    var searchableFields = [];
-    var filterableFields = [];
-    var sortableFields = [];
-    var init = function (sch) { return __awaiter(_this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            if (!tableName) {
-                tableName = sch.name;
-            }
-            searchableFields = Object.entries(sch.flags)
-                .filter(function (_a) {
-                var _ = _a[0], v = _a[1];
-                return v.$search == true;
-            })
-                .map(function (_a) {
-                var k = _a[0], _ = _a[1];
-                return k;
-            });
-            filterableFields = Object.entries(sch.flags)
-                .filter(function (_a) {
-                var _ = _a[0], v = _a[1];
-                return v.$filter == true;
-            })
-                .map(function (_a) {
-                var k = _a[0], _ = _a[1];
-                return k;
-            });
-            sortableFields = Object.entries(sch.flags)
-                .filter(function (_a) {
-                var _ = _a[0], v = _a[1];
-                return v.$sort == true;
-            })
-                .map(function (_a) {
-                var k = _a[0], _ = _a[1];
-                return k;
-            });
-            return [2 /*return*/];
-        });
-    }); };
+    var tableName = dataTableName || schema.name;
+    var searchableFields = Object.entries(schema.flags)
+        .filter(function (v) { return v[1].$search == true; })
+        .map(function (k) { return k[0]; });
+    var filterableFields = Object.entries(schema.flags)
+        .filter(function (v) { return v[1].$filter == true; })
+        .map(function (k) { return k[0]; });
+    var sortableFields = Object.entries(schema.flags)
+        .filter(function (v) { return v[1].$sort == true; })
+        .map(function (k) { return k[0]; });
     var get = function (id) { return __awaiter(_this, void 0, void 0, function () {
         var c;
         return __generator(this, function (_a) {
@@ -189,7 +160,7 @@ function KnexProvider(connection, dataTableName) {
     }); };
     var list = (0, list_1.KnexQueryList)(connection, tableName, searchableFields, filterableFields, sortableFields);
     return {
-        init: init,
+        schema: schema,
         get: get,
         replace: replace,
         update: update,

package/build/list.js

@@ -67,10 +67,10 @@ function KnexQueryList(knex, tableName, searchableFields, filterableFields, sort
                         query.where(function (query) {
                             params.filter.forEach(function (f) {
                                 var field = f.field, op = f.op, value = f.value;
-                                if ((field === "_search") && op === "=") {
+                                if (field === "_search" && op === "=") {
                                     query.andWhere(function (query) {
                                         (searchableFields || []).forEach(function (k) {
-                                            query.orWhere(k, 'LIKE', "%".concat("".concat(value).replace(/(["'$%]+)/g, ''), "%"));
+                                            query.orWhere(k, "LIKE", "%".concat("".concat(value).replace(/(["'$%]+)/g, ""), "%"));
                                         });
                                     });
                                     return;
@@ -144,13 +144,14 @@ function KnexQueryList(knex, tableName, searchableFields, filterableFields, sort
                         debug("No filters applied");
                     }
                     sql = null;
-                    sorter = params.sort.filter((function (s) {
+                    sorter = params.sort
+                        .filter(function (s) {
                         var pass = sortableFields.includes(s.field);
                         if (!pass) {
                             debug("Field \"".concat(s.field, "\" is not sortable"));
                         }
                         return pass;
-                    }))
+                    })
                         .map(function (s) { return ({
                         column: s.field,
                         order: s.direction,

package/build/list.test.js

@@ -84,7 +84,7 @@ test("KnexQueryList", function () { return __awaiter(void 0, void 0, void 0, fun
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                func = (0, list_1.KnexQueryList)(knex, "users", ['name', 'lastname'], ['age', 'tool'], ['age']);
+                func = (0, list_1.KnexQueryList)(knex, "users", ["name", "lastname"], ["age", "tool"], ["age"]);
                 return [4 /*yield*/, func({
                         resource: "users",
                         range: { offset: 0, limit: 10 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juadz/knex",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Juadz: Rapid restful API development",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -27,6 +27,7 @@
     "@babel/core": "^7.26.7",
     "@babel/preset-env": "^7.26.7",
     "@babel/preset-typescript": "^7.26.0",
+    "@juadz/core": "^0.5.0",
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.7.5",
@@ -44,13 +45,12 @@
     "sqlite": "^5.1.1",
     "tsc": "^2.0.4",
     "typescript": "^5.6.3",
-    "zod": "^4",
-    "@juadz/core": "^0.5.0"
+    "zod": "^4"
   },
   "peerDependencies": {
+    "@juadz/core": "^0.5.0",
     "debug": "^4.4.0",
-    "zod": "^4",
-    "@juadz/core": "^0.5.0"
+    "zod": "^4"
   },
   "dependencies": {}
 }

package/src/basic.ts

@@ -3,30 +3,21 @@ import { Knex } from "knex";
 import { KnexQueryList } from "./list";
 
 export function KnexProvider<T extends IDataRecord>(
+    schema: Schema<T>,
     connection: Knex,
     dataTableName?: string,
 ): IDataRepositoryProvider<T> {
-
-    let tableName = dataTableName || null;
-    let searchableFields: Array<string> = [];
-    let filterableFields: Array<string> = [];
-    let sortableFields: Array<string> = [];
-
-    const init = async (sch: Schema<T>) => {
-        if (!tableName) {
-            tableName = sch.name;
-        }
-
-        searchableFields = Object.entries(sch.flags)
-            .filter(([_, v]) => v.$search == true)
-            .map(([k, _]) => k);
-        filterableFields = Object.entries(sch.flags)
-            .filter(([_, v]) => v.$filter == true)
-            .map(([k, _]) => k);
-        sortableFields = Object.entries(sch.flags)
-            .filter(([_, v]) => v.$sort == true)
-            .map(([k, _]) => k);
-    }
+    const tableName = dataTableName || schema.name;
+
+    const searchableFields = Object.entries(schema.flags)
+        .filter((v) => v[1].$search == true)
+        .map((k) => k[0]);
+    const filterableFields = Object.entries(schema.flags)
+        .filter((v) => v[1].$filter == true)
+        .map((k) => k[0]);
+    const sortableFields = Object.entries(schema.flags)
+        .filter((v) => v[1].$sort == true)
+        .map((k) => k[0]);
 
     const get = async (id: string | number) => {
         const c = await connection(tableName)
@@ -59,7 +50,7 @@ export function KnexProvider<T extends IDataRecord>(
                 });
 
             insertedId = (inserted[0] as unknown as { id: string | number }).id;
-         } else {
+        } else {
             // For other SQL clients that support `.returning('id')`
             const inserted = await connection(tableName)
                 .returning("id")
@@ -106,10 +97,16 @@ export function KnexProvider<T extends IDataRecord>(
         return result;
     };
 
-    const list = KnexQueryList(connection, tableName, searchableFields, filterableFields, sortableFields);
+    const list = KnexQueryList(
+        connection,
+        tableName,
+        searchableFields,
+        filterableFields,
+        sortableFields,
+    );
 
     return {
-        init,
+        schema,
         get,
         replace,
         update,

package/src/list.test.ts

@@ -39,7 +39,13 @@ afterAll(() => {
 });
 
 test("KnexQueryList", async () => {
-    const func = KnexQueryList(knex, "users", ['name', 'lastname'], ['age', 'tool'], ['age']);
+    const func = KnexQueryList(
+        knex,
+        "users",
+        ["name", "lastname"],
+        ["age", "tool"],
+        ["age"],
+    );
 
     const result: QueryListResults<unknown> = await func({
         resource: "users",

package/src/list.ts

@@ -18,7 +18,7 @@ export function KnexQueryList<T>(
     knex: Knex,
     tableName: string,
     searchableFields: string[],
-    filterableFields: string[], 
+    filterableFields: string[],
     sortableFields: string[],
 ): QueryListFunction<T> {
     return async (params: QueryListParam) => {
@@ -29,16 +29,15 @@ export function KnexQueryList<T>(
             query.where((query: Knex) => {
                 params.filter.forEach((f: QueryFilter) => {
                     const { field, op, value } = f;
-                    if ((field === "_search") && op === "=") {
+                    if (field === "_search" && op === "=") {
                         query.andWhere((query: Knex) => {
-                        
-                          (searchableFields || []).forEach(k => {
-                            query.orWhere(
-                              k as string,
-                              'LIKE',
-                              `%${`${value}`.replace(/(["'$%]+)/g, '')}%`
-                            );
-                          });
+                            (searchableFields || []).forEach((k) => {
+                                query.orWhere(
+                                    k as string,
+                                    "LIKE",
+                                    `%${`${value}`.replace(/(["'$%]+)/g, "")}%`,
+                                );
+                            });
                         });
                         return;
                     }
@@ -119,18 +118,18 @@ export function KnexQueryList<T>(
 
         let sql = null;
 
-        const sorter = params.sort.filter((s => {
-            const pass = sortableFields.includes(s.field);
-            if (!pass) {
-                debug(`Field "${s.field}" is not sortable`);
-            }
-            return pass;
-        }))
-          .map((s) => ({
-            column: s.field,
-            order: s.direction,
-        }));
-
+        const sorter = params.sort
+            .filter((s) => {
+                const pass = sortableFields.includes(s.field);
+                if (!pass) {
+                    debug(`Field "${s.field}" is not sortable`);
+                }
+                return pass;
+            })
+            .map((s) => ({
+                column: s.field,
+                order: s.direction,
+            }));
 
         if (process.env.NODE_ENV !== "production") {
             sql = query
@@ -142,7 +141,6 @@ export function KnexQueryList<T>(
             debug("SQL Query:", sql);
         }
 
-
         const data = await query
             .clone()
             .offset(params.range.offset)