This commit is contained in:
Benjamin Toby 2025-02-09 14:03:21 +01:00
parent 5e3476ad15
commit a2961d6b89
3 changed files with 26 additions and 31 deletions

View File

@ -20,7 +20,7 @@ const numberfy_1 = __importDefault(require("../numberfy"));
const crud_1 = __importDefault(require("./crud")); const crud_1 = __importDefault(require("./crud"));
function dsqlMethodCrud(_a) { function dsqlMethodCrud(_a) {
return __awaiter(this, arguments, void 0, function* ({ method, tableName, addUser, user, extraData, transformData, existingData, body, query, targetId, sanitize, transformQuery, debug, }) { return __awaiter(this, arguments, void 0, function* ({ method, tableName, addUser, user, extraData, transformData, existingData, body, query, targetId, sanitize, transformQuery, debug, }) {
var _b, _c, _d; var _b, _c;
let result = { let result = {
success: false, success: false,
}; };
@ -87,15 +87,13 @@ function dsqlMethodCrud(_a) {
const GET_RESULT = yield (0, crud_1.default)({ const GET_RESULT = yield (0, crud_1.default)({
action: "get", action: "get",
table: tableName, table: tableName,
query: finalQuery && Boolean((_b = Object.keys(finalQuery)) === null || _b === void 0 ? void 0 : _b[0]) query: Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery === null || finalQuery === void 0 ? void 0 : finalQuery.query), ((user === null || user === void 0 ? void 0 : user.id) && addUser
? Object.assign(Object.assign({}, finalQuery), { query: Object.assign(Object.assign({}, finalQuery.query), ((user === null || user === void 0 ? void 0 : user.id) && addUser ? {
? { [addUser.field]: {
[addUser.field]: { value: String(user.id),
value: String(user.id), },
}, }
} : undefined)), limit: LIMIT, offset: OFFSET }),
: undefined)), limit: LIMIT, offset: OFFSET })
: undefined,
sanitize, sanitize,
}); });
result = { result = {
@ -110,7 +108,7 @@ function dsqlMethodCrud(_a) {
const POST_RESULT = yield (0, crud_1.default)({ const POST_RESULT = yield (0, crud_1.default)({
action: "insert", action: "insert",
table: tableName, table: tableName,
data: finalData && ((_c = Object.keys(finalData)) === null || _c === void 0 ? void 0 : _c[0]) data: finalData && ((_b = Object.keys(finalData)) === null || _b === void 0 ? void 0 : _b[0])
? finalData ? finalData
: undefined, : undefined,
sanitize, sanitize,
@ -126,7 +124,7 @@ function dsqlMethodCrud(_a) {
const PUT_RESULT = yield (0, crud_1.default)({ const PUT_RESULT = yield (0, crud_1.default)({
action: "update", action: "update",
table: tableName, table: tableName,
data: finalData && ((_d = Object.keys(finalData)) === null || _d === void 0 ? void 0 : _d[0]) data: finalData && ((_c = Object.keys(finalData)) === null || _c === void 0 ? void 0 : _c[0])
? finalData ? finalData
: undefined, : undefined,
targetId, targetId,

View File

@ -127,24 +127,21 @@ export default async function dsqlMethodCrud<
const GET_RESULT = await dsqlCrud({ const GET_RESULT = await dsqlCrud({
action: "get", action: "get",
table: tableName, table: tableName,
query: query: {
finalQuery && Boolean(Object.keys(finalQuery)?.[0]) ...finalQuery,
? ({ query: {
...finalQuery, ...finalQuery?.query,
query: { ...(user?.id && addUser
...finalQuery.query, ? {
...(user?.id && addUser [addUser.field]: {
? { value: String(user.id),
[addUser.field]: { },
value: String(user.id), }
}, : undefined),
} },
: undefined), limit: LIMIT,
}, offset: OFFSET,
limit: LIMIT, } as any,
offset: OFFSET,
} as any)
: undefined,
sanitize, sanitize,
}); });

View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "4.0.3", "version": "4.0.4",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {