@baasix/baasix 0.1.41 → 0.1.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/utils/aggregationUtils.d.ts.map +1 -1
- package/dist/utils/aggregationUtils.js +9 -7
- package/dist/utils/aggregationUtils.js.map +1 -1
- package/dist/utils/dynamicVariableResolver.d.ts +4 -1
- package/dist/utils/dynamicVariableResolver.d.ts.map +1 -1
- package/dist/utils/dynamicVariableResolver.js +48 -6
- package/dist/utils/dynamicVariableResolver.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregationUtils.d.ts","sourceRoot":"","sources":["../../baasix/utils/aggregationUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"aggregationUtils.d.ts","sourceRoot":"","sources":["../../baasix/utils/aggregationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* - GROUP BY support
|
|
13
13
|
* - Aggregate with relations
|
|
14
14
|
*/
|
|
15
|
-
import { sql, count
|
|
15
|
+
import { sql, count } from 'drizzle-orm';
|
|
16
16
|
/**
|
|
17
17
|
* Simple API Error class
|
|
18
18
|
*/
|
|
@@ -31,15 +31,17 @@ class APIError extends Error {
|
|
|
31
31
|
export function createAggregateFunction(func, column, ctx) {
|
|
32
32
|
switch (func.toLowerCase()) {
|
|
33
33
|
case 'max':
|
|
34
|
-
|
|
34
|
+
// max() returns string for decimal/numeric columns, cast and mapWith for consistent number return
|
|
35
|
+
return sql `max((${column})::numeric)`.mapWith(Number);
|
|
35
36
|
case 'min':
|
|
36
|
-
|
|
37
|
+
// min() returns string for decimal/numeric columns, cast and mapWith for consistent number return
|
|
38
|
+
return sql `min((${column})::numeric)`.mapWith(Number);
|
|
37
39
|
case 'avg':
|
|
38
|
-
// avg() returns string by default in PostgreSQL,
|
|
39
|
-
return sql `avg(${column})`.mapWith(Number);
|
|
40
|
+
// avg() returns string by default in PostgreSQL, cast and mapWith for number
|
|
41
|
+
return sql `avg((${column})::numeric)`.mapWith(Number);
|
|
40
42
|
case 'sum':
|
|
41
|
-
// sum() returns string by default in PostgreSQL,
|
|
42
|
-
return sql `sum(${column})`.mapWith(Number);
|
|
43
|
+
// sum() returns string by default in PostgreSQL (especially for decimal columns), cast and mapWith for number
|
|
44
|
+
return sql `sum((${column})::numeric)`.mapWith(Number);
|
|
43
45
|
case 'count':
|
|
44
46
|
return count(column);
|
|
45
47
|
case 'distinct':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregationUtils.js","sourceRoot":"","sources":["../../baasix/utils/aggregationUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"aggregationUtils.js","sourceRoot":"","sources":["../../baasix/utils/aggregationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,9 @@
|
|
|
4
4
|
* Resolves dynamic variables in filter objects:
|
|
5
5
|
* - $CURRENT_USER.field -> actual user field value
|
|
6
6
|
* - $CURRENT_ROLE.field -> actual role field value
|
|
7
|
+
* - $CURRENT_TENANT -> current tenant ID
|
|
8
|
+
* - $CURRENT_TENANT.field -> actual tenant field value
|
|
9
|
+
* - $CURRENT_SETTINGS.field -> settings field (tenant-aware, merged with global)
|
|
7
10
|
* - $NOW -> current timestamp
|
|
8
11
|
* - $NOW+DAYS_7, $NOW-HOURS_2 -> relative date calculations
|
|
9
12
|
*/
|
|
@@ -11,7 +14,7 @@ import type { Accountability } from '../types/index.js';
|
|
|
11
14
|
export type { Accountability };
|
|
12
15
|
/**
|
|
13
16
|
* Main function to resolve dynamic variables in an object
|
|
14
|
-
* Supports: $CURRENT_USER.field, $CURRENT_ROLE.field, $NOW, $NOW+DAYS_7, etc.
|
|
17
|
+
* Supports: $CURRENT_USER.field, $CURRENT_ROLE.field, $CURRENT_TENANT, $CURRENT_TENANT.field, $CURRENT_SETTINGS.field, $NOW, $NOW+DAYS_7, etc.
|
|
15
18
|
*/
|
|
16
19
|
export declare function resolveDynamicVariables(obj: any, accountability: Accountability): Promise<any>;
|
|
17
20
|
//# sourceMappingURL=dynamicVariableResolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamicVariableResolver.d.ts","sourceRoot":"","sources":["../../baasix/utils/dynamicVariableResolver.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"dynamicVariableResolver.d.ts","sourceRoot":"","sources":["../../baasix/utils/dynamicVariableResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AASH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGxD,YAAY,EAAE,cAAc,EAAE,CAAC;AA4R/B;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,GAAG,CAAC,CAiBd"}
|
|
@@ -4,6 +4,9 @@
|
|
|
4
4
|
* Resolves dynamic variables in filter objects:
|
|
5
5
|
* - $CURRENT_USER.field -> actual user field value
|
|
6
6
|
* - $CURRENT_ROLE.field -> actual role field value
|
|
7
|
+
* - $CURRENT_TENANT -> current tenant ID
|
|
8
|
+
* - $CURRENT_TENANT.field -> actual tenant field value
|
|
9
|
+
* - $CURRENT_SETTINGS.field -> settings field (tenant-aware, merged with global)
|
|
7
10
|
* - $NOW -> current timestamp
|
|
8
11
|
* - $NOW+DAYS_7, $NOW-HOURS_2 -> relative date calculations
|
|
9
12
|
*/
|
|
@@ -69,7 +72,7 @@ function resolveNowVariable(variable) {
|
|
|
69
72
|
function collectVariables(obj, variablesToResolve) {
|
|
70
73
|
if (typeof obj === "string" && obj.startsWith("$")) {
|
|
71
74
|
const [target, ...parts] = obj.slice(1).split(".");
|
|
72
|
-
if (target === "CURRENT_USER" || target === "CURRENT_ROLE") {
|
|
75
|
+
if (target === "CURRENT_USER" || target === "CURRENT_ROLE" || target === "CURRENT_TENANT" || target === "CURRENT_SETTINGS") {
|
|
73
76
|
const field = parts.length > 0 ? parts.join(".") : "id";
|
|
74
77
|
variablesToResolve[target].add(field);
|
|
75
78
|
}
|
|
@@ -85,7 +88,7 @@ function collectVariables(obj, variablesToResolve) {
|
|
|
85
88
|
obj.forEach(item => {
|
|
86
89
|
if (typeof item === "string" && item.startsWith("$")) {
|
|
87
90
|
const [target, ...parts] = item.slice(1).split(".");
|
|
88
|
-
if (target === "CURRENT_USER" || target === "CURRENT_ROLE") {
|
|
91
|
+
if (target === "CURRENT_USER" || target === "CURRENT_ROLE" || target === "CURRENT_TENANT" || target === "CURRENT_SETTINGS") {
|
|
89
92
|
const field = parts.length > 0 ? parts.join(".") : "id";
|
|
90
93
|
variablesToResolve[target].add(field);
|
|
91
94
|
}
|
|
@@ -107,7 +110,7 @@ function collectVariables(obj, variablesToResolve) {
|
|
|
107
110
|
// Check keys for variables
|
|
108
111
|
if (key.startsWith("$")) {
|
|
109
112
|
const [target, ...parts] = key.slice(1).split(".");
|
|
110
|
-
if (target === "CURRENT_USER" || target === "CURRENT_ROLE") {
|
|
113
|
+
if (target === "CURRENT_USER" || target === "CURRENT_ROLE" || target === "CURRENT_TENANT" || target === "CURRENT_SETTINGS") {
|
|
111
114
|
const field = parts.length > 0 ? parts.join(".") : "id";
|
|
112
115
|
variablesToResolve[target].add(field);
|
|
113
116
|
}
|
|
@@ -130,6 +133,8 @@ async function resolveCollectedVariables(variablesToResolve, accountability) {
|
|
|
130
133
|
const resolved = {
|
|
131
134
|
CURRENT_USER: {},
|
|
132
135
|
CURRENT_ROLE: {},
|
|
136
|
+
CURRENT_TENANT: {},
|
|
137
|
+
CURRENT_SETTINGS: {},
|
|
133
138
|
NOW: {},
|
|
134
139
|
};
|
|
135
140
|
// Resolve NOW variables first (including relative dates) - these don't require accountability
|
|
@@ -138,6 +143,41 @@ async function resolveCollectedVariables(variablesToResolve, accountability) {
|
|
|
138
143
|
resolved[nowVariable] = { value: resolveNowVariable(nowVariable) };
|
|
139
144
|
}
|
|
140
145
|
}
|
|
146
|
+
// Resolve CURRENT_SETTINGS - uses SettingsService with tenant-aware merging
|
|
147
|
+
// getTenantSettings already falls back to global settings when no tenantId is provided
|
|
148
|
+
if (variablesToResolve.CURRENT_SETTINGS.size > 0) {
|
|
149
|
+
try {
|
|
150
|
+
// Lazy import to avoid circular dependencies (same pattern as auth.ts)
|
|
151
|
+
const module = await import('../services/SettingsService.js');
|
|
152
|
+
const settingsService = module.default;
|
|
153
|
+
resolved.CURRENT_SETTINGS = await settingsService.getTenantSettings(accountability?.tenant);
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
console.error(`Error resolving settings data: ${error.message}`);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
// Resolve CURRENT_TENANT - uses accountability.tenant directly
|
|
160
|
+
if (variablesToResolve.CURRENT_TENANT.size > 0 && accountability?.tenant) {
|
|
161
|
+
const tenantFields = Array.from(variablesToResolve.CURRENT_TENANT);
|
|
162
|
+
if (tenantFields.length === 1 && tenantFields[0] === 'id') {
|
|
163
|
+
// Simple case: just need the tenant ID
|
|
164
|
+
resolved.CURRENT_TENANT = { id: accountability.tenant };
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
// Need additional tenant fields - query the database
|
|
168
|
+
try {
|
|
169
|
+
const tenantItemsService = new ItemsService("baasix_Tenant", { accountability: undefined });
|
|
170
|
+
resolved.CURRENT_TENANT = await tenantItemsService.readOne(accountability.tenant, {
|
|
171
|
+
fields: tenantFields
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
catch (error) {
|
|
175
|
+
console.error(`Error resolving tenant data: ${error.message}`);
|
|
176
|
+
// Fallback: at minimum provide the ID
|
|
177
|
+
resolved.CURRENT_TENANT = { id: accountability.tenant };
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
141
181
|
// Early return if no accountability - CURRENT_USER and CURRENT_ROLE need user context
|
|
142
182
|
if (!accountability?.user?.id) {
|
|
143
183
|
return resolved;
|
|
@@ -208,7 +248,7 @@ function getNestedValue(obj, path) {
|
|
|
208
248
|
function replaceVariables(obj, resolvedVariables) {
|
|
209
249
|
if (typeof obj === "string" && obj.startsWith("$")) {
|
|
210
250
|
const [target, ...parts] = obj.slice(1).split(".");
|
|
211
|
-
if (target === "CURRENT_USER" || target === "CURRENT_ROLE") {
|
|
251
|
+
if (target === "CURRENT_USER" || target === "CURRENT_ROLE" || target === "CURRENT_TENANT" || target === "CURRENT_SETTINGS") {
|
|
212
252
|
const field = parts.length > 0 ? parts.join(".") : "id";
|
|
213
253
|
const value = getNestedValue(resolvedVariables[target], field.split("."));
|
|
214
254
|
return value;
|
|
@@ -228,7 +268,7 @@ function replaceVariables(obj, resolvedVariables) {
|
|
|
228
268
|
let newKey = key;
|
|
229
269
|
if (key.startsWith("$")) {
|
|
230
270
|
const [target, ...parts] = key.slice(1).split(".");
|
|
231
|
-
if (target === "CURRENT_USER" || target === "CURRENT_ROLE") {
|
|
271
|
+
if (target === "CURRENT_USER" || target === "CURRENT_ROLE" || target === "CURRENT_TENANT" || target === "CURRENT_SETTINGS") {
|
|
232
272
|
// For key replacements, we typically want to keep the path structure
|
|
233
273
|
newKey = parts.join(".");
|
|
234
274
|
}
|
|
@@ -245,12 +285,14 @@ function replaceVariables(obj, resolvedVariables) {
|
|
|
245
285
|
}
|
|
246
286
|
/**
|
|
247
287
|
* Main function to resolve dynamic variables in an object
|
|
248
|
-
* Supports: $CURRENT_USER.field, $CURRENT_ROLE.field, $NOW, $NOW+DAYS_7, etc.
|
|
288
|
+
* Supports: $CURRENT_USER.field, $CURRENT_ROLE.field, $CURRENT_TENANT, $CURRENT_TENANT.field, $CURRENT_SETTINGS.field, $NOW, $NOW+DAYS_7, etc.
|
|
249
289
|
*/
|
|
250
290
|
export async function resolveDynamicVariables(obj, accountability) {
|
|
251
291
|
const variablesToResolve = {
|
|
252
292
|
CURRENT_USER: new Set(),
|
|
253
293
|
CURRENT_ROLE: new Set(),
|
|
294
|
+
CURRENT_TENANT: new Set(),
|
|
295
|
+
CURRENT_SETTINGS: new Set(),
|
|
254
296
|
NOW: new Set(),
|
|
255
297
|
};
|
|
256
298
|
// First pass: collect all variables that need to be resolved
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamicVariableResolver.js","sourceRoot":"","sources":["../../baasix/utils/dynamicVariableResolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dynamicVariableResolver.js","sourceRoot":"","sources":["../../baasix/utils/dynamicVariableResolver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@baasix/baasix",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.43",
|
|
4
4
|
"description": "Baasix - Backend-as-a-Service with 40+ tools for schema management, CRUD operations with 50+ filter operators, relationships, permissions, files, workflows, and more",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|