axe-api 0.31.3 → 0.31.5

package/build/src/Builders/RouterBuilder.js

@@ -101,7 +101,8 @@ class RouterBuilder {
             const relation = model.relations.find((relation) => relation.model === model.name &&
                 relation.type === Enums_1.Relationships.HAS_MANY);
             if (relation) {
-                yield this.createRouteByModel(model, `${urlPrefix}${resource}/:${(0, change_case_1.camelCase)(relation.foreignKey)}/`, model, relation, false);
+                const paramName = (0, change_case_1.camelCase)(`${model.name}-${relation.primaryKey}`);
+                yield this.createRouteByModel(model, `${urlPrefix}${resource}/:${paramName}/`, model, relation, false);
             }
         });
     }
@@ -116,7 +117,8 @@ class RouterBuilder {
                 const child = model.children.find((item) => item.name === relation.model);
                 // It should be recursive
                 if (child) {
-                    yield this.createRouteByModel(child, `${urlPrefix}${resource}/:${(0, change_case_1.camelCase)(relation.foreignKey)}/`, model, relation);
+                    const paramName = (0, change_case_1.camelCase)(`${model.name}-${relation.primaryKey}`);
+                    yield this.createRouteByModel(child, `${urlPrefix}${resource}/:${paramName}/`, model, relation);
                 }
             }
         });

package/build/src/Handlers/AllHandler.js

@@ -24,7 +24,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
     // Users should be able to select some fields to show.
     queryParser.applyFields(query, conditions.fields);
     // Binding parent id if there is.
-    (0, Helpers_1.addForeignKeyQuery)(req, query, relation, parentModel);
+    (0, Helpers_1.addForeignKeyQuery)(req, query, model, relation, parentModel);
     // Users should be able to filter records
     queryParser.applyWheres(query, conditions.q);
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onBeforeAll, Object.assign(Object.assign({}, pack), { conditions,

package/build/src/Handlers/DestroyHandler.js

@@ -27,7 +27,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
     // If there is a deletedAtColumn, it means that this table support soft-delete
     (0, Helpers_1.addSoftDeleteQuery)(model, null, query);
     // If there is a relation, we should bind it
-    (0, Helpers_1.addForeignKeyQuery)(req, query, relation, parentModel);
+    (0, Helpers_1.addForeignKeyQuery)(req, query, model, relation, parentModel);
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onBeforeDeleteQuery, Object.assign(Object.assign({}, pack), { query }));
     const item = yield query.first();
     if (!item) {
@@ -47,5 +47,5 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
         yield query.delete();
     }
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onAfterDelete, Object.assign(Object.assign({}, pack), { item }));
-    return res.json();
+    return res.status(204).json();
 });

package/build/src/Handlers/ForceDestroyHandler.js

@@ -29,7 +29,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
         throw new ApiError_1.default("You can use force delete only soft-delete supported models.", Enums_1.StatusCodes.NOT_FOUND);
     }
     // If there is a relation, we should bind it
-    (0, Helpers_1.addForeignKeyQuery)(req, query, relation, parentModel);
+    (0, Helpers_1.addForeignKeyQuery)(req, query, model, relation, parentModel);
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onBeforeForceDeleteQuery, Object.assign(Object.assign({}, pack), { query }));
     const item = yield query.first();
     if (!item) {
@@ -41,5 +41,5 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
         item }));
     yield query.delete();
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onAfterForceDelete, Object.assign(Object.assign({}, pack), { item }));
-    return res.json();
+    return res.status(204).json();
 });

package/build/src/Handlers/Helpers.d.ts

@@ -7,9 +7,9 @@ import { SerializationFunction } from "../Types";
 export declare const bindTimestampValues: (formData: Record<string, any>, model: IModelService, columnTypes?: TimestampColumns[]) => void;
 export declare const getMergedFormData: (req: Request, fillables: string[]) => Record<string, any>;
 export declare const callHooks: (model: IModelService, type: HookFunctionTypes, params: IHookParameter) => Promise<void>;
-export declare const getParentColumn: (relation: IRelation | null) => string | null;
+export declare const getParentColumn: (model: IModelService, relation: IRelation | null) => string | null;
 export declare const checkPrimaryKeyValueType: (model: IModelService, value: any) => void;
-export declare const addForeignKeyQuery: (request: Request, query: Knex.QueryBuilder, relation: IRelation | null, parentModel: IModelService | null) => void;
+export declare const addForeignKeyQuery: (request: Request, query: Knex.QueryBuilder, model: IModelService, relation: IRelation | null, parentModel: IModelService | null) => void;
 export declare const serializeData: (version: IVersion, itemArray: any, modelSerializer: SerializationFunction | null, handler: HandlerTypes, request: Request) => Promise<any[]>;
 export declare const filterHiddenFields: (itemArray: any[], hiddens: string[] | null) => void;
 export declare const addSoftDeleteQuery: (model: IModelService, conditions: IQuery | null, query: Knex.QueryBuilder) => void;

package/build/src/Handlers/Helpers.js

@@ -57,24 +57,25 @@ const callHooks = (model, type, params) => __awaiter(void 0, void 0, void 0, fun
     }
 });
 exports.callHooks = callHooks;
-const getParentColumn = (relation) => {
+const getParentColumn = (model, relation) => {
     if (!relation) {
         return null;
     }
-    return (0, change_case_1.camelCase)(relation.foreignKey);
+    return (0, change_case_1.camelCase)(`${model.name}-${relation.primaryKey}`);
 };
 exports.getParentColumn = getParentColumn;
 const checkPrimaryKeyValueType = (model, value) => {
     // We should check the parameter type
     const primaryColumn = model.columns.find((column) => column.name === model.instance.primaryKey);
-    if ((primaryColumn === null || primaryColumn === void 0 ? void 0 : primaryColumn.data_type) === "integer" && isNaN(parseInt(value))) {
+    if (constants_1.NUMERIC_PRIMARY_KEY_TYPES.includes((primaryColumn === null || primaryColumn === void 0 ? void 0 : primaryColumn.data_type) || "") &&
+        isNaN(parseInt(value))) {
         throw new ApiError_1.default(`Unacceptable parameter: ${value}`);
     }
 };
 exports.checkPrimaryKeyValueType = checkPrimaryKeyValueType;
-const addForeignKeyQuery = (request, query, relation, parentModel) => {
+const addForeignKeyQuery = (request, query, model, relation, parentModel) => {
     if (relation && parentModel) {
-        const parentColumn = (0, exports.getParentColumn)(relation);
+        const parentColumn = (0, exports.getParentColumn)(parentModel, relation);
         if (parentColumn) {
             query.where(relation.foreignKey, request.params[parentColumn]);
         }

package/build/src/Handlers/PaginateHandler.js

@@ -24,7 +24,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
     // Users should be able to select some fields to show.
     queryParser.applyFields(query, conditions.fields);
     // Binding parent id if there is.
-    (0, Helpers_1.addForeignKeyQuery)(req, query, relation, parentModel);
+    (0, Helpers_1.addForeignKeyQuery)(req, query, model, relation, parentModel);
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onBeforePaginate, Object.assign(Object.assign({}, pack), { conditions,
         query }));
     // Users should be able to filter records

package/build/src/Handlers/PatchHandler.js

@@ -20,7 +20,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
     const { version, model, req, res, database, relation, parentModel } = pack;
     const query = database.from(model.instance.table);
     // If there is a relation, we should bind it
-    (0, Helpers_1.addForeignKeyQuery)(req, query, relation, parentModel);
+    (0, Helpers_1.addForeignKeyQuery)(req, query, model, relation, parentModel);
     // If there is a deletedAtColumn, it means that this table support soft-delete
     (0, Helpers_1.addSoftDeleteQuery)(model, null, query);
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onBeforeUpdateQuery, Object.assign(Object.assign({}, pack), { query }));

package/build/src/Handlers/ShowHandler.js

@@ -28,7 +28,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
     // Users should be able to select some fields to show.
     queryParser.applyFields(query, conditions.fields);
     // If there is a relation, we should bind it
-    (0, Helpers_1.addForeignKeyQuery)(req, query, relation, parentModel);
+    (0, Helpers_1.addForeignKeyQuery)(req, query, model, relation, parentModel);
     // We should check the parameter type
     const value = req.params[model.instance.primaryKey];
     (0, Helpers_1.checkPrimaryKeyValueType)(model, value);

package/build/src/Handlers/StoreHandler.js

@@ -31,7 +31,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
     if (relation && parentModel) {
-        const parentColumn = (0, Helpers_1.getParentColumn)(relation);
+        const parentColumn = (0, Helpers_1.getParentColumn)(parentModel, relation);
         if (parentColumn) {
             formData[relation.foreignKey] = req.params[parentColumn];
         }

package/build/src/Handlers/UpdateHandler.js

@@ -20,7 +20,7 @@ exports.default = (pack) => __awaiter(void 0, void 0, void 0, function* () {
     const { version, model, req, res, database, relation, parentModel } = pack;
     const query = database.from(model.instance.table);
     // If there is a relation, we should bind it
-    (0, Helpers_1.addForeignKeyQuery)(req, query, relation, parentModel);
+    (0, Helpers_1.addForeignKeyQuery)(req, query, model, relation, parentModel);
     // If there is a deletedAtColumn, it means that this table support soft-delete
     (0, Helpers_1.addSoftDeleteQuery)(model, null, query);
     yield (0, Helpers_1.callHooks)(model, Enums_1.HookFunctionTypes.onBeforeUpdateQuery, Object.assign(Object.assign({}, pack), { query }));

package/build/src/Services/QueryService.js

@@ -326,16 +326,13 @@ class QueryService {
             this.applySpecialCondition(where, "$between", Enums_1.ConditionTypes.Between);
             this.applySpecialCondition(where, "$notBetween", Enums_1.ConditionTypes.NotBetween);
         }
-        if (where.condition === Enums_1.ConditionTypes.In ||
-            where.condition === Enums_1.ConditionTypes.NotIn) {
-            where.value = where.value.split(",");
-        }
-        if (where.condition === Enums_1.ConditionTypes.Between ||
-            where.condition === Enums_1.ConditionTypes.NotBetween) {
-            where.value = where.value.split(":");
-        }
         if (where.condition === Enums_1.ConditionTypes.LIKE ||
             where.condition === Enums_1.ConditionTypes["NOT LIKE"]) {
+            const queryColumn = where.model.columns.find((column) => column.name === where.field);
+            if (queryColumn &&
+                !constants_1.STRING_COLUMN_TYPES.includes(queryColumn.data_type.toLowerCase())) {
+                throw new ApiError_1.default(`Query field need to be string. Unacceptable query field: ${where.field}`);
+            }
             where.value = where.value.replace(/\*/g, "%");
         }
         // This means that the condition is related with another table

package/build/src/constants.d.ts

@@ -27,3 +27,5 @@ export declare const API_ROUTE_TEMPLATES: {
 export declare const ConditionQueryFeatureMap: Record<ConditionTypes, QueryFeature>;
 export declare const RelationQueryFeatureMap: Record<Relationships, QueryFeature>;
 export declare const DEFAULT_VERSION_CONFIG: IVersionConfig;
+export declare const NUMERIC_PRIMARY_KEY_TYPES: string[];
+export declare const STRING_COLUMN_TYPES: string[];

package/build/src/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_VERSION_CONFIG = exports.RelationQueryFeatureMap = exports.ConditionQueryFeatureMap = exports.API_ROUTE_TEMPLATES = exports.DEFAULT_METHODS_OF_MODELS = exports.DEFAULT_HANDLERS = exports.RESERVED_KEYWORDS = exports.LOG_COLORS = void 0;
+exports.STRING_COLUMN_TYPES = exports.NUMERIC_PRIMARY_KEY_TYPES = exports.DEFAULT_VERSION_CONFIG = exports.RelationQueryFeatureMap = exports.ConditionQueryFeatureMap = exports.API_ROUTE_TEMPLATES = exports.DEFAULT_METHODS_OF_MODELS = exports.DEFAULT_HANDLERS = exports.RESERVED_KEYWORDS = exports.LOG_COLORS = void 0;
 const Enums_1 = require("./Enums");
 const LimitService_1 = require("./Services/LimitService");
 exports.LOG_COLORS = {
@@ -115,3 +115,14 @@ exports.DEFAULT_VERSION_CONFIG = {
         },
     },
 };
+exports.NUMERIC_PRIMARY_KEY_TYPES = ["integer", "bigint"];
+exports.STRING_COLUMN_TYPES = [
+    "CHAR",
+    "VARCHAR",
+    "BINARY",
+    "VARBINARY",
+    "BLOB",
+    "TEXT",
+    "ENUM",
+    "SET",
+].map((item) => item.toLowerCase());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-api",
-  "version": "0.31.3",
+  "version": "0.31.5",
   "description": "AXE API is a simple tool which has been created based on Express and Knex.js to create Rest APIs quickly.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -39,8 +39,11 @@
     "lint:watch": "esw --watch --color",
     "prepare:integration": "nodemon --ignore \"./tests/**\" ./scripts/run-integration-test.js",
     "test:postgres": "sh ./scripts/test-postgres.sh",
+    "test:cockroach": "sh ./scripts/test-cockroach.sh",
     "test:mysql57": "sh ./scripts/test-mysql57.sh",
     "test:mysql8": "sh ./scripts/test-mysql8.sh",
+    "test:mariadb": "sh ./scripts/test-mariadb.sh",
+    "test:sqlite": "sh ./scripts/test-sqlite.sh",
     "prettier:check": "prettier --check .",
     "prepare": "husky install"
   },