@objectql/server 4.0.0 → 4.0.2
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/CHANGELOG.md +33 -3
- package/README.md +6 -3
- package/dist/adapters/graphql.js +9 -5
- package/dist/adapters/graphql.js.map +1 -1
- package/dist/adapters/rest.js +11 -1
- package/dist/adapters/rest.js.map +1 -1
- package/dist/server.js +22 -15
- package/dist/server.js.map +1 -1
- package/package.json +3 -3
- package/src/adapters/graphql.ts +9 -5
- package/src/adapters/rest.ts +12 -1
- package/src/server.ts +20 -15
- package/test/graphql.test.ts +5 -3
- package/test/node.test.ts +7 -3
- package/test/rest-advanced.test.ts +17 -8
- package/test/rest.test.ts +100 -28
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,38 @@
|
|
|
1
1
|
# @objectql/server
|
|
2
2
|
|
|
3
|
+
## 4.0.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- **Patch Release v4.0.2**
|
|
8
|
+
|
|
9
|
+
This patch release includes:
|
|
10
|
+
- Infrastructure improvements and maintenance updates
|
|
11
|
+
- Enhanced stability and reliability
|
|
12
|
+
- Bug fixes and performance optimizations
|
|
13
|
+
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
- @objectql/core@4.0.2
|
|
16
|
+
- @objectql/types@4.0.2
|
|
17
|
+
|
|
18
|
+
## 4.0.1
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- **Release Version 4.0.1**
|
|
23
|
+
|
|
24
|
+
This patch release includes the latest repository improvements and infrastructure updates:
|
|
25
|
+
- Added comprehensive GitHub workflows for CI/CD, testing, and quality assurance
|
|
26
|
+
- Enhanced documentation and developer experience
|
|
27
|
+
- Improved build and release processes with Changesets
|
|
28
|
+
- Added Excel driver for reading/writing Excel files as data sources
|
|
29
|
+
- Repository structure and tooling improvements
|
|
30
|
+
- Bug fixes and stability enhancements
|
|
31
|
+
|
|
32
|
+
- Updated dependencies
|
|
33
|
+
- @objectql/core@4.0.1
|
|
34
|
+
- @objectql/types@4.0.1
|
|
35
|
+
|
|
3
36
|
## 3.0.1
|
|
4
37
|
|
|
5
38
|
### Patch Changes
|
|
@@ -7,7 +40,6 @@
|
|
|
7
40
|
- 79d04e1: Patch release for January 2026 updates
|
|
8
41
|
|
|
9
42
|
This patch includes minor improvements and maintenance updates:
|
|
10
|
-
|
|
11
43
|
- Enhanced type safety across core packages
|
|
12
44
|
- Improved error handling in drivers
|
|
13
45
|
- Documentation updates
|
|
@@ -31,7 +63,6 @@
|
|
|
31
63
|
This is a coordinated major release that unifies all ObjectQL packages to version 2.0.0, establishing a synchronized versioning strategy across the entire ecosystem.
|
|
32
64
|
|
|
33
65
|
### 🎯 Key Changes
|
|
34
|
-
|
|
35
66
|
- **Unified Versioning**: All core packages now share the same version number (2.0.0)
|
|
36
67
|
- **Fixed Group Management**: Updated changeset configuration to include all @objectql packages in the fixed versioning group
|
|
37
68
|
- **Simplified Maintenance**: Future releases will automatically maintain version consistency across the entire monorepo
|
|
@@ -39,7 +70,6 @@
|
|
|
39
70
|
### 📦 Packages Included
|
|
40
71
|
|
|
41
72
|
All ObjectQL packages are now synchronized at version 2.0.0:
|
|
42
|
-
|
|
43
73
|
- Foundation: `@objectql/types`, `@objectql/core`, `@objectql/platform-node`
|
|
44
74
|
- Drivers: `@objectql/driver-sql`, `@objectql/driver-mongo`, `@objectql/driver-redis`, `@objectql/driver-fs`, `@objectql/driver-memory`, `@objectql/driver-localstorage`, `@objectql/driver-excel`, `@objectql/sdk`
|
|
45
75
|
- Runtime: `@objectql/server`
|
package/README.md
CHANGED
|
@@ -93,18 +93,21 @@ List operations return data in an `items` array with optional pagination metadat
|
|
|
93
93
|
|
|
94
94
|
### Single Item Operations (findOne, create, update, delete)
|
|
95
95
|
|
|
96
|
-
Single item operations return data in a `data` field:
|
|
96
|
+
Single item operations return data in a `data` field with an `@type` identifier:
|
|
97
97
|
|
|
98
98
|
```json
|
|
99
99
|
{
|
|
100
100
|
"data": {
|
|
101
|
-
"
|
|
101
|
+
"_id": "1001",
|
|
102
102
|
"name": "Contract A",
|
|
103
|
-
"amount": 5000
|
|
103
|
+
"amount": 5000,
|
|
104
|
+
"@type": "contract"
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
107
|
```
|
|
107
108
|
|
|
109
|
+
**Note:** The `@type` field indicates the object type, and `_id` is the unique identifier.
|
|
110
|
+
|
|
108
111
|
### Error Responses
|
|
109
112
|
|
|
110
113
|
All errors follow a consistent format:
|
package/dist/adapters/graphql.js
CHANGED
|
@@ -210,7 +210,8 @@ function generateGraphQLSchema(app) {
|
|
|
210
210
|
if (result.error) {
|
|
211
211
|
throw new Error(result.error.message);
|
|
212
212
|
}
|
|
213
|
-
|
|
213
|
+
// Extract data from the response wrapper
|
|
214
|
+
return normalizeId(result.data);
|
|
214
215
|
}
|
|
215
216
|
};
|
|
216
217
|
// Query list of records
|
|
@@ -229,7 +230,7 @@ function generateGraphQLSchema(app) {
|
|
|
229
230
|
if (args.limit)
|
|
230
231
|
queryArgs.limit = args.limit;
|
|
231
232
|
if (args.skip)
|
|
232
|
-
queryArgs.
|
|
233
|
+
queryArgs.offset = args.skip;
|
|
233
234
|
if (args.fields)
|
|
234
235
|
queryArgs.fields = args.fields;
|
|
235
236
|
if (args.filters) {
|
|
@@ -286,7 +287,8 @@ function generateGraphQLSchema(app) {
|
|
|
286
287
|
if (result.error) {
|
|
287
288
|
throw new Error(result.error.message);
|
|
288
289
|
}
|
|
289
|
-
|
|
290
|
+
// Extract data from the response wrapper
|
|
291
|
+
return normalizeId(result.data);
|
|
290
292
|
}
|
|
291
293
|
};
|
|
292
294
|
// Update mutation
|
|
@@ -308,7 +310,8 @@ function generateGraphQLSchema(app) {
|
|
|
308
310
|
if (result.error) {
|
|
309
311
|
throw new Error(result.error.message);
|
|
310
312
|
}
|
|
311
|
-
|
|
313
|
+
// Extract data from the response wrapper
|
|
314
|
+
return normalizeId(result.data);
|
|
312
315
|
}
|
|
313
316
|
};
|
|
314
317
|
// Delete mutation - use shared delete result type
|
|
@@ -326,7 +329,8 @@ function generateGraphQLSchema(app) {
|
|
|
326
329
|
if (result.error) {
|
|
327
330
|
throw new Error(result.error.message);
|
|
328
331
|
}
|
|
329
|
-
|
|
332
|
+
// Extract data from the response wrapper for delete
|
|
333
|
+
return result.data;
|
|
330
334
|
}
|
|
331
335
|
};
|
|
332
336
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/adapters/graphql.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA2HH,sDA+PC;AAqCD,oDAyIC;AAriBD,sCAA2C;AAC3C,oCAAqC;AAErC,qCAA8O;AAE9O,MAAM,mBAAmB,GAAG;;;;;;;;;;;;;;QAcpB,CAAC;AAET;;GAEG;AACH,SAAS,WAAW,CAAC,IAAa;IAC9B,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,EAAE,GAAG,IAA+B,EAAE,CAAC;QAE1D,2BAA2B;QAC3B,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;YACtB,UAAU,CAAC,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC;YAC/B,OAAO,UAAU,CAAC,GAAG,CAAC;QAC1B,CAAC;QAED,qDAAqD;QACrD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC;QAE3B,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,KAAkB,EAAE,UAAmB,KAAK;IACvE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAExB,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU,CAAC;QAChB,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,KAAK,CAAC;QACX,KAAK,OAAO,CAAC;QACb,KAAK,UAAU;YACX,OAAO,uBAAa,CAAC;QACzB,KAAK,QAAQ,CAAC;QACd,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS;YACV,OAAO,sBAAY,CAAC;QACxB,KAAK,YAAY;YACb,OAAO,oBAAU,CAAC;QACtB,KAAK,SAAS;YACV,OAAO,wBAAc,CAAC;QAC1B,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM;YACP,OAAO,uBAAa,CAAC,CAAC,yBAAyB;QACnD,KAAK,QAAQ;YACT,iFAAiF;YACjF,OAAO,uBAAa,CAAC;QACzB,KAAK,QAAQ,CAAC;QACd,KAAK,eAAe;YAChB,yCAAyC;YACzC,OAAO,uBAAa,CAAC;QACzB,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACR,oEAAoE;YACpE,OAAO,uBAAa,CAAC;QACzB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,MAAM;YACP,wBAAwB;YACxB,OAAO,uBAAa,CAAC;QACzB;YACI,OAAO,uBAAa,CAAC;IAC7B,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,IAAY;IACrC,8CAA8C;IAC9C,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;IAEpD,+CAA+C;IAC/C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC;IAChC,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,GAAc;IAChD,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAe,QAAQ,CAAC,CAAC;IAE1D,0DAA0D;IAC1D,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,oEAAoE;QACpE,OAAO,IAAI,uBAAa,CAAC;YACrB,KAAK,EAAE,IAAI,2BAAiB,CAAC;gBACzB,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE;oBACJ,OAAO,EAAE;wBACL,IAAI,EAAE,uBAAa;wBACnB,WAAW,EAAE,kCAAkC;wBAC/C,OAAO,EAAE,GAAG,EAAE,CAAC,4CAA4C;qBAC9D;iBACJ;aACJ,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,MAAM,OAAO,GAAsC,EAAE,CAAC;IACtD,MAAM,YAAY,GAA2C,EAAE,CAAC;IAChE,MAAM,mBAAmB,GAAsC,EAAE,CAAC;IAElE,qEAAqE;IACrE,0FAA0F;IAC1F,2DAA2D;IAC3D,MAAM,MAAM,GAAG,IAAI,uBAAc,CAAC,GAAG,CAAC,CAAC;IAEvC,sCAAsC;IACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAE/B,oCAAoC;QACpC,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3E,SAAS;QACb,CAAC;QAED,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAExG,qBAAqB;QACrB,MAAM,MAAM,GAAoC;YAC5C,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,uBAAa,CAAC,EAAE;SAClD,CAAC;QAEF,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,qBAAqB,CAAC,WAAW,EAAE,KAAK,CAAsB,CAAC;YAC/E,MAAM,CAAC,kBAAkB,CAAC,GAAG;gBACzB,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,wBAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO;gBAClE,WAAW,EAAE,WAAW,CAAC,KAAK,IAAI,SAAS;aAC9C,CAAC;QACN,CAAC;QAED,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,2BAAiB,CAAC;YACxC,IAAI,EAAE,iBAAiB;YACvB,WAAW,EAAE,MAAM,CAAC,KAAK,IAAI,UAAU;YACvC,MAAM;SACT,CAAC,CAAC;QAEH,kCAAkC;QAClC,MAAM,WAAW,GAAwB,EAAE,CAAC;QAE5C,KAAK,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAqB,CAAC;YAC7E,WAAW,CAAC,kBAAkB,CAAC,GAAG;gBAC9B,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,WAAW,CAAC,KAAK,IAAI,SAAS;aAC9C,CAAC;QACN,CAAC;QAED,YAAY,CAAC,UAAU,CAAC,GAAG,IAAI,gCAAsB,CAAC;YAClD,IAAI,EAAE,iBAAiB,GAAG,OAAO;YACjC,WAAW,EAAE,kBAAkB,MAAM,CAAC,KAAK,IAAI,UAAU,EAAE;YAC3D,MAAM,EAAE,WAAW;SACtB,CAAC,CAAC;QAEH,iFAAiF;QACjF,mBAAmB,CAAC,UAAU,CAAC,GAAG,IAAI,2BAAiB,CAAC;YACpD,IAAI,EAAE,QAAQ,GAAG,iBAAiB,GAAG,QAAQ;YAC7C,MAAM,EAAE;gBACJ,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,uBAAa,CAAC,EAAE;gBAC/C,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,wBAAc,CAAC,EAAE;aACxD;SACJ,CAAC,CAAC;IACP,CAAC;IAED,mBAAmB;IACnB,MAAM,WAAW,GAAoC,EAAE,CAAC;IAExD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAE/B,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAAE,SAAS;QAElD,4BAA4B;QAC5B,WAAW,CAAC,UAAU,CAAC,GAAG;YACtB,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;YACzB,IAAI,EAAE;gBACF,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,uBAAa,CAAC,EAAE;aAClD;YACD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;oBAC/B,EAAE,EAAE,SAAS;oBACb,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE,IAAI,CAAC,EAAE;iBAChB,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1C,CAAC;gBAED,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;YAC/B,CAAC;SACJ,CAAC;QAEF,wBAAwB;QACxB,6EAA6E;QAC7E,WAAW,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG;YAC/B,IAAI,EAAE,IAAI,qBAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC1C,IAAI,EAAE;gBACF,KAAK,EAAE,EAAE,IAAI,EAAE,oBAAU,EAAE;gBAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,oBAAU,EAAE;gBAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,uBAAa,EAAE,EAAE,cAAc;gBAChD,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,qBAAW,CAAC,uBAAa,CAAC,EAAE;gBAChD,IAAI,EAAE,EAAE,IAAI,EAAE,uBAAa,EAAE,CAAC,cAAc;aAC/C;YACD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;gBACvB,MAAM,SAAS,GAAQ,EAAE,CAAC;gBAC1B,IAAI,IAAI,CAAC,KAAK;oBAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC7C,IAAI,IAAI,CAAC,IAAI;oBAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBAC1C,IAAI,IAAI,CAAC,MAAM;oBAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAChD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACf,IAAI,CAAC;wBACD,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACjD,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;oBAC5C,CAAC;gBACL,CAAC;gBACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACZ,IAAI,CAAC;wBACD,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC3C,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;oBACzC,CAAC;gBACL,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;oBAC/B,EAAE,EAAE,MAAM;oBACV,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE,SAAS;iBAClB,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1C,CAAC;gBAED,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAC3C,CAAC;SACJ,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,2BAAiB,CAAC;QACpC,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,WAAW;KACtB,CAAC,CAAC;IAEH,sBAAsB;IACtB,MAAM,cAAc,GAAoC,EAAE,CAAC;IAE3D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAE/B,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;YAAE,SAAS;QAE/E,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtG,kBAAkB;QAClB,cAAc,CAAC,QAAQ,GAAG,eAAe,CAAC,GAAG;YACzC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;YACzB,IAAI,EAAE;gBACF,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE;aAChE;YACD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;oBAC/B,EAAE,EAAE,QAAQ;oBACZ,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE,IAAI,CAAC,KAAK;iBACnB,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1C,CAAC;gBAED,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;YAC/B,CAAC;SACJ,CAAC;QAEF,kBAAkB;QAClB,cAAc,CAAC,QAAQ,GAAG,eAAe,CAAC,GAAG;YACzC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;YACzB,IAAI,EAAE;gBACF,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,uBAAa,CAAC,EAAE;gBAC/C,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE;aAChE;YACD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;oBAC/B,EAAE,EAAE,QAAQ;oBACZ,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE;wBACF,EAAE,EAAE,IAAI,CAAC,EAAE;wBACX,IAAI,EAAE,IAAI,CAAC,KAAK;qBACnB;iBACJ,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1C,CAAC;gBAED,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;YAC/B,CAAC;SACJ,CAAC;QAEF,kDAAkD;QAClD,cAAc,CAAC,QAAQ,GAAG,eAAe,CAAC,GAAG;YACzC,IAAI,EAAE,mBAAmB,CAAC,UAAU,CAAC;YACrC,IAAI,EAAE;gBACF,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,wBAAc,CAAC,uBAAa,CAAC,EAAE;aAClD;YACD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;oBAC/B,EAAE,EAAE,QAAQ;oBACZ,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;iBACxB,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1C,CAAC;gBAED,OAAO,MAAM,CAAC;YAClB,CAAC;SACJ,CAAC;IACN,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,2BAAiB,CAAC;QACvC,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,cAAc;KACzB,CAAC,CAAC;IAEH,OAAO,IAAI,uBAAa,CAAC;QACrB,KAAK,EAAE,SAAS;QAChB,QAAQ,EAAE,YAAY;KACzB,CAAC,CAAC;AACP,CAAC;AAED;;GAEG;AACH,SAAS,QAAQ,CAAC,GAAoB;IAClC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACf,IAAI,CAAC,IAAI;gBAAE,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,MAAM,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;YACtC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;GAEG;AACH,SAAS,QAAQ,CAAC,GAAmB,EAAE,UAAkB,EAAE,IAAS;IAChE,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAClD,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC;IAC5B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAClC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,GAAc;IAC/C,wEAAwE;IACxE,iFAAiF;IACjF,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAE1C,OAAO,KAAK,EAAE,GAAqC,EAAE,GAAmB,EAAE,EAAE;QACxE,IAAI,CAAC;YACD,eAAe;YACf,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YACzC,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;YAC1D,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;YAE3D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,gBAAgB,IAAI,GAAG,CAAC,CAAC;YAC1E,CAAC;iBAAM,IAAI,gBAAgB,IAAI,CAAC,CAAC,aAAa,IAAI,aAAa,KAAK,gBAAgB,CAAC,EAAE,CAAC;gBACpF,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,gBAAgB,CAAC,CAAC;YACnE,CAAC;YACD,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,oBAAoB,CAAC,CAAC;YACpE,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,6BAA6B,CAAC,CAAC;YAE7E,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC3B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBACrB,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO;YACX,CAAC;YAED,2CAA2C;YAC3C,0EAA0E;YAC1E,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE,UAAU,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC,CAAC;YACnF,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAExD,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBAChF,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;gBACpD,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAC7B,OAAO;YACX,CAAC;YAED,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC;YAEpC,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACxC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE;oBACf,MAAM,EAAE,CAAC;4BACL,OAAO,EAAE,sCAAsC;yBAClD,CAAC;iBACL,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,IAAI,KAAK,GAAW,EAAE,CAAC;YACvB,IAAI,SAAS,GAAQ,IAAI,CAAC;YAC1B,IAAI,aAAa,GAAkB,IAAI,CAAC;YAExC,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;gBACnB,sCAAsC;gBACtC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC,CAAC;gBACzE,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBACvD,IAAI,SAAS,EAAE,CAAC;oBACZ,IAAI,CAAC;wBACD,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBACtC,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE;4BACf,MAAM,EAAE,CAAC;oCACL,OAAO,EAAE,wBAAwB;iCACpC,CAAC;yBACL,CAAC,CAAC;wBACH,OAAO;oBACX,CAAC;gBACL,CAAC;gBACD,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACJ,+BAA+B;gBAC/B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC7C,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACzB,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC;gBACnC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC;YAC/C,CAAC;YAED,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE;oBACf,MAAM,EAAE,CAAC;4BACL,OAAO,EAAE,2BAA2B;yBACvC,CAAC;iBACL,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YAED,wBAAwB;YACxB,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAO,EAAC;gBACzB,MAAM;gBACN,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,SAAS;gBACzB,aAAa;gBACb,YAAY,EAAE,EAAE,GAAG,EAAE;aACxB,CAAC,CAAC;YAEH,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAE/B,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;YAE7C,MAAM,aAAa,GAWf;gBACA,MAAM,EAAE,CAAC;wBACL,OAAO,EAAE,uBAAuB;wBAChC,UAAU,EAAE;4BACR,IAAI,EAAE,iBAAS,CAAC,cAAc;yBACjC;qBACJ,CAAC;aACL,CAAC;YAEF,oFAAoF;YACpF,IAAI,OAAO,OAAO,KAAK,WAAW;gBAC9B,OAAO,CAAC,GAAG;gBACX,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;gBACxC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC3C,UAAU,CAAC,UAAU,CAAC,KAAK,GAAG;oBAC1B,OAAO,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;oBACnE,KAAK,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;iBAChE,CAAC;YACN,CAAC;YAED,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QACtC,CAAC;IACL,CAAC,CAAC;AACN,CAAC"}
|
|
1
|
+
{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../src/adapters/graphql.ts"],"names":[],"mappings":"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"}
|
package/dist/adapters/rest.js
CHANGED
|
@@ -152,7 +152,7 @@ function createRESTHandler(app, options) {
|
|
|
152
152
|
args.limit = queryParams.top || queryParams.limit;
|
|
153
153
|
}
|
|
154
154
|
if (queryParams.skip || queryParams.offset) {
|
|
155
|
-
args.
|
|
155
|
+
args.offset = queryParams.skip || queryParams.offset;
|
|
156
156
|
}
|
|
157
157
|
if (queryParams.expand) {
|
|
158
158
|
args.expand = queryParams.expand;
|
|
@@ -264,6 +264,16 @@ function createRESTHandler(app, options) {
|
|
|
264
264
|
});
|
|
265
265
|
return;
|
|
266
266
|
}
|
|
267
|
+
// Check if single item operations returned null data
|
|
268
|
+
if (qlRequest.op === 'findOne' && result.data === null) {
|
|
269
|
+
sendJSON(res, 404, {
|
|
270
|
+
error: {
|
|
271
|
+
code: types_2.ErrorCode.NOT_FOUND,
|
|
272
|
+
message: 'Resource not found'
|
|
273
|
+
}
|
|
274
|
+
});
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
267
277
|
// Determine HTTP status code
|
|
268
278
|
let statusCode = 200;
|
|
269
279
|
if (result.error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/adapters/rest.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAwFH,
|
|
1
|
+
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../../src/adapters/rest.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -61,31 +61,33 @@ class ObjectQLServer {
|
|
|
61
61
|
// Support both string ID and query object
|
|
62
62
|
result = await repo.findOne(req.args);
|
|
63
63
|
if (result) {
|
|
64
|
-
return { ...result, '@type': req.object };
|
|
64
|
+
return { data: { ...result, '@type': req.object } };
|
|
65
65
|
}
|
|
66
|
-
return
|
|
66
|
+
return { data: null };
|
|
67
67
|
case 'create':
|
|
68
68
|
result = await repo.create(req.args);
|
|
69
69
|
if (result) {
|
|
70
|
-
return { ...result, '@type': req.object };
|
|
70
|
+
return { data: { ...result, '@type': req.object } };
|
|
71
71
|
}
|
|
72
|
-
return
|
|
72
|
+
return { data: null };
|
|
73
73
|
case 'update':
|
|
74
74
|
result = await repo.update(req.args.id, req.args.data);
|
|
75
75
|
if (result) {
|
|
76
|
-
return { ...result, '@type': req.object };
|
|
76
|
+
return { data: { ...result, '@type': req.object } };
|
|
77
77
|
}
|
|
78
|
-
return
|
|
78
|
+
return { data: null };
|
|
79
79
|
case 'delete':
|
|
80
80
|
result = await repo.delete(req.args.id);
|
|
81
81
|
if (!result) {
|
|
82
82
|
return this.errorResponse(types_1.ErrorCode.NOT_FOUND, `Record with id '${req.args.id}' not found for delete`);
|
|
83
83
|
}
|
|
84
|
-
// Return standardized delete response with
|
|
84
|
+
// Return standardized delete response with data wrapper
|
|
85
85
|
return {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
data: {
|
|
87
|
+
id: req.args.id,
|
|
88
|
+
deleted: true,
|
|
89
|
+
'@type': req.object
|
|
90
|
+
}
|
|
89
91
|
};
|
|
90
92
|
case 'count':
|
|
91
93
|
result = await repo.count(req.args);
|
|
@@ -149,12 +151,17 @@ class ObjectQLServer {
|
|
|
149
151
|
const response = {
|
|
150
152
|
items
|
|
151
153
|
};
|
|
152
|
-
// Calculate pagination metadata if limit/skip are present
|
|
153
|
-
if (args && (args.limit || args.skip)) {
|
|
154
|
-
const skip = args.skip || 0;
|
|
154
|
+
// Calculate pagination metadata if limit/skip/offset are present
|
|
155
|
+
if (args && (args.limit || args.skip || args.offset)) {
|
|
156
|
+
const skip = args.offset || args.skip || 0;
|
|
155
157
|
const limit = args.limit || items.length;
|
|
156
|
-
// Get total count -
|
|
157
|
-
const
|
|
158
|
+
// Get total count - exclude limit/skip to count all matching records
|
|
159
|
+
const countArgs = {};
|
|
160
|
+
if (args.filters)
|
|
161
|
+
countArgs.filters = args.filters;
|
|
162
|
+
if (args.expand)
|
|
163
|
+
countArgs.expand = args.expand;
|
|
164
|
+
const total = await repo.count(countArgs);
|
|
158
165
|
const size = limit;
|
|
159
166
|
const page = limit > 0 ? Math.floor(skip / limit) + 1 : 1;
|
|
160
167
|
const pages = limit > 0 ? Math.ceil(total / limit) : 1;
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,mCAAuE;AAEvE,MAAa,cAAc;IACvB,YAAoB,GAAc;QAAd,QAAG,GAAH,GAAG,CAAW;IAAG,CAAC;IAEtC;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,GAAoB;;QAC7B,IAAI,CAAC;YACD,6BAA6B;YAC7B,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;oBACjC,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,EAAE,EAAE,GAAG,CAAC,EAAE;oBACV,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM;oBAC7B,gBAAgB,EAAE,GAAG,CAAC,UAAU,CAAC,gBAAgB;oBACjD,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ;iBACpC,CAAC,CAAC;YACP,CAAC;YAED,mBAAmB;YACnB,yCAAyC;YACzC,MAAM,cAAc,GAAG;gBACnB,MAAM,EAAE,MAAA,GAAG,CAAC,IAAI,0CAAE,EAAE;gBACpB,KAAK,EAAE,CAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,KAAK,KAAI,EAAE;gBAC5B,gBAAgB;aACnB,CAAC;YAEF,wEAAwE;YACxE,uGAAuG;YACvG,oFAAoF;YACpF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAU,CAAC;YAC5B,IAAI,OAAO,GAAG,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC,aAAa,CACrB,iBAAS,CAAC,cAAc,EACxB,gEAAgE,CACnE,CAAC;YACN,CAAC;YAED,MAAM,GAAG,GAAoB,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YAE/D,yBAAyB;YACzB,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,OAAO,IAAI,CAAC,aAAa,CACrB,iBAAS,CAAC,SAAS,EACnB,WAAW,GAAG,CAAC,MAAM,aAAa,CACrC,CAAC;YACN,CAAC;YAED,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAEpC,IAAI,MAAW,CAAC;YAEhB,QAAQ,GAAG,CAAC,EAAE,EAAE,CAAC;gBACb,KAAK,MAAM;oBACP,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACnC,mEAAmE;oBACnE,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC1D,KAAK,SAAS;oBACV,0CAA0C;oBAC1C,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACtC,IAAI,MAAM,EAAE,CAAC;wBACT,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@objectql/server",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.2",
|
|
4
4
|
"description": "HTTP server adapter for ObjectQL - Express/NestJS compatible with GraphQL and REST API support",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"objectql",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"graphql": "^16.8.1",
|
|
22
22
|
"@graphql-tools/schema": "^10.0.2",
|
|
23
23
|
"js-yaml": "^4.1.1",
|
|
24
|
-
"@objectql/core": "4.0.
|
|
25
|
-
"@objectql/types": "4.0.
|
|
24
|
+
"@objectql/core": "4.0.2",
|
|
25
|
+
"@objectql/types": "4.0.2"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@types/js-yaml": "^4.0.9",
|
package/src/adapters/graphql.ts
CHANGED
|
@@ -240,7 +240,8 @@ export function generateGraphQLSchema(app: IObjectQL): GraphQLSchema {
|
|
|
240
240
|
throw new Error(result.error.message);
|
|
241
241
|
}
|
|
242
242
|
|
|
243
|
-
|
|
243
|
+
// Extract data from the response wrapper
|
|
244
|
+
return normalizeId(result.data);
|
|
244
245
|
}
|
|
245
246
|
};
|
|
246
247
|
|
|
@@ -258,7 +259,7 @@ export function generateGraphQLSchema(app: IObjectQL): GraphQLSchema {
|
|
|
258
259
|
resolve: async (_, args) => {
|
|
259
260
|
const queryArgs: any = {};
|
|
260
261
|
if (args.limit) queryArgs.limit = args.limit;
|
|
261
|
-
if (args.skip) queryArgs.
|
|
262
|
+
if (args.skip) queryArgs.offset = args.skip;
|
|
262
263
|
if (args.fields) queryArgs.fields = args.fields;
|
|
263
264
|
if (args.filters) {
|
|
264
265
|
try {
|
|
@@ -322,7 +323,8 @@ export function generateGraphQLSchema(app: IObjectQL): GraphQLSchema {
|
|
|
322
323
|
throw new Error(result.error.message);
|
|
323
324
|
}
|
|
324
325
|
|
|
325
|
-
|
|
326
|
+
// Extract data from the response wrapper
|
|
327
|
+
return normalizeId(result.data);
|
|
326
328
|
}
|
|
327
329
|
};
|
|
328
330
|
|
|
@@ -347,7 +349,8 @@ export function generateGraphQLSchema(app: IObjectQL): GraphQLSchema {
|
|
|
347
349
|
throw new Error(result.error.message);
|
|
348
350
|
}
|
|
349
351
|
|
|
350
|
-
|
|
352
|
+
// Extract data from the response wrapper
|
|
353
|
+
return normalizeId(result.data);
|
|
351
354
|
}
|
|
352
355
|
};
|
|
353
356
|
|
|
@@ -368,7 +371,8 @@ export function generateGraphQLSchema(app: IObjectQL): GraphQLSchema {
|
|
|
368
371
|
throw new Error(result.error.message);
|
|
369
372
|
}
|
|
370
373
|
|
|
371
|
-
|
|
374
|
+
// Extract data from the response wrapper for delete
|
|
375
|
+
return result.data;
|
|
372
376
|
}
|
|
373
377
|
};
|
|
374
378
|
}
|
package/src/adapters/rest.ts
CHANGED
|
@@ -171,7 +171,7 @@ export function createRESTHandler(app: IObjectQL, options?: RESTHandlerOptions)
|
|
|
171
171
|
args.limit = queryParams.top || queryParams.limit;
|
|
172
172
|
}
|
|
173
173
|
if (queryParams.skip || queryParams.offset) {
|
|
174
|
-
args.
|
|
174
|
+
args.offset = queryParams.skip || queryParams.offset;
|
|
175
175
|
}
|
|
176
176
|
if (queryParams.expand) {
|
|
177
177
|
args.expand = queryParams.expand;
|
|
@@ -291,6 +291,17 @@ export function createRESTHandler(app: IObjectQL, options?: RESTHandlerOptions)
|
|
|
291
291
|
return;
|
|
292
292
|
}
|
|
293
293
|
|
|
294
|
+
// Check if single item operations returned null data
|
|
295
|
+
if (qlRequest.op === 'findOne' && result.data === null) {
|
|
296
|
+
sendJSON(res, 404, {
|
|
297
|
+
error: {
|
|
298
|
+
code: ErrorCode.NOT_FOUND,
|
|
299
|
+
message: 'Resource not found'
|
|
300
|
+
}
|
|
301
|
+
});
|
|
302
|
+
return;
|
|
303
|
+
}
|
|
304
|
+
|
|
294
305
|
// Determine HTTP status code
|
|
295
306
|
let statusCode = 200;
|
|
296
307
|
if (result.error) {
|
package/src/server.ts
CHANGED
|
@@ -72,21 +72,21 @@ export class ObjectQLServer {
|
|
|
72
72
|
// Support both string ID and query object
|
|
73
73
|
result = await repo.findOne(req.args);
|
|
74
74
|
if (result) {
|
|
75
|
-
return { ...result, '@type': req.object };
|
|
75
|
+
return { data: { ...result, '@type': req.object } };
|
|
76
76
|
}
|
|
77
|
-
return
|
|
77
|
+
return { data: null };
|
|
78
78
|
case 'create':
|
|
79
79
|
result = await repo.create(req.args);
|
|
80
80
|
if (result) {
|
|
81
|
-
return { ...result, '@type': req.object };
|
|
81
|
+
return { data: { ...result, '@type': req.object } };
|
|
82
82
|
}
|
|
83
|
-
return
|
|
83
|
+
return { data: null };
|
|
84
84
|
case 'update':
|
|
85
85
|
result = await repo.update(req.args.id, req.args.data);
|
|
86
86
|
if (result) {
|
|
87
|
-
return { ...result, '@type': req.object };
|
|
87
|
+
return { data: { ...result, '@type': req.object } };
|
|
88
88
|
}
|
|
89
|
-
return
|
|
89
|
+
return { data: null };
|
|
90
90
|
case 'delete':
|
|
91
91
|
result = await repo.delete(req.args.id);
|
|
92
92
|
if (!result) {
|
|
@@ -95,11 +95,13 @@ export class ObjectQLServer {
|
|
|
95
95
|
`Record with id '${req.args.id}' not found for delete`
|
|
96
96
|
);
|
|
97
97
|
}
|
|
98
|
-
// Return standardized delete response with
|
|
98
|
+
// Return standardized delete response with data wrapper
|
|
99
99
|
return {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
100
|
+
data: {
|
|
101
|
+
id: req.args.id,
|
|
102
|
+
deleted: true,
|
|
103
|
+
'@type': req.object
|
|
104
|
+
}
|
|
103
105
|
};
|
|
104
106
|
case 'count':
|
|
105
107
|
result = await repo.count(req.args);
|
|
@@ -177,13 +179,16 @@ export class ObjectQLServer {
|
|
|
177
179
|
items
|
|
178
180
|
};
|
|
179
181
|
|
|
180
|
-
// Calculate pagination metadata if limit/skip are present
|
|
181
|
-
if (args && (args.limit || args.skip)) {
|
|
182
|
-
const skip = args.skip || 0;
|
|
182
|
+
// Calculate pagination metadata if limit/skip/offset are present
|
|
183
|
+
if (args && (args.limit || args.skip || args.offset)) {
|
|
184
|
+
const skip = args.offset || args.skip || 0;
|
|
183
185
|
const limit = args.limit || items.length;
|
|
184
186
|
|
|
185
|
-
// Get total count -
|
|
186
|
-
const
|
|
187
|
+
// Get total count - exclude limit/skip to count all matching records
|
|
188
|
+
const countArgs: any = {};
|
|
189
|
+
if (args.filters) countArgs.filters = args.filters;
|
|
190
|
+
if (args.expand) countArgs.expand = args.expand;
|
|
191
|
+
const total = await repo.count(countArgs);
|
|
187
192
|
|
|
188
193
|
const size = limit;
|
|
189
194
|
const page = limit > 0 ? Math.floor(skip / limit) + 1 : 1;
|
package/test/graphql.test.ts
CHANGED
|
@@ -43,10 +43,10 @@ class MockDriver implements Driver {
|
|
|
43
43
|
async find(objectName: string, query: any) {
|
|
44
44
|
let items = this.data[objectName] || [];
|
|
45
45
|
|
|
46
|
-
// Apply
|
|
46
|
+
// Apply offset and limit if provided (QueryAST uses 'offset', not 'skip')
|
|
47
47
|
if (query) {
|
|
48
|
-
if (query.
|
|
49
|
-
items = items.slice(query.
|
|
48
|
+
if (query.offset) {
|
|
49
|
+
items = items.slice(query.offset);
|
|
50
50
|
}
|
|
51
51
|
if (query.limit) {
|
|
52
52
|
items = items.slice(0, query.limit);
|
|
@@ -146,6 +146,8 @@ describe('GraphQL API Adapter', () => {
|
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
148
|
});
|
|
149
|
+
|
|
150
|
+
await app.init();
|
|
149
151
|
|
|
150
152
|
// Create handler and server once for all tests
|
|
151
153
|
handler = createGraphQLHandler(app);
|
package/test/node.test.ts
CHANGED
|
@@ -51,6 +51,8 @@ describe('Node Adapter', () => {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
|
+
|
|
55
|
+
await app.init();
|
|
54
56
|
});
|
|
55
57
|
|
|
56
58
|
it('should handle find request', async () => {
|
|
@@ -86,9 +88,11 @@ describe('Node Adapter', () => {
|
|
|
86
88
|
|
|
87
89
|
expect(response.status).toBe(200);
|
|
88
90
|
expect(response.body).toEqual({
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
91
|
+
data: {
|
|
92
|
+
id: 2,
|
|
93
|
+
name: 'Bob',
|
|
94
|
+
'@type': 'user'
|
|
95
|
+
}
|
|
92
96
|
});
|
|
93
97
|
});
|
|
94
98
|
|
|
@@ -41,12 +41,12 @@ class MockDriver implements Driver {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
// Apply
|
|
45
|
-
if (query?.
|
|
46
|
-
items = items.slice(query.
|
|
44
|
+
// Apply offset and limit (QueryAST uses 'offset' for skip)
|
|
45
|
+
if (query?.offset) {
|
|
46
|
+
items = items.slice(query.offset);
|
|
47
47
|
}
|
|
48
|
-
if (query?.limit) {
|
|
49
|
-
items = items.slice(0, query.limit);
|
|
48
|
+
if (query?.top || query?.limit) {
|
|
49
|
+
items = items.slice(0, query.top || query.limit);
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
return items;
|
|
@@ -87,7 +87,12 @@ class MockDriver implements Driver {
|
|
|
87
87
|
}
|
|
88
88
|
|
|
89
89
|
async count(objectName: string, query: any) {
|
|
90
|
-
|
|
90
|
+
// Count should not apply offset/limit, only filters
|
|
91
|
+
const countQuery = { ...query };
|
|
92
|
+
delete countQuery.offset;
|
|
93
|
+
delete countQuery.top;
|
|
94
|
+
delete countQuery.limit;
|
|
95
|
+
const items = await this.find(objectName, countQuery);
|
|
91
96
|
return items.length;
|
|
92
97
|
}
|
|
93
98
|
|
|
@@ -133,6 +138,8 @@ describe('REST API Error Handling & Edge Cases', () => {
|
|
|
133
138
|
}
|
|
134
139
|
}
|
|
135
140
|
});
|
|
141
|
+
|
|
142
|
+
await app.init();
|
|
136
143
|
|
|
137
144
|
handler = createRESTHandler(app);
|
|
138
145
|
server = createServer(handler);
|
|
@@ -284,7 +291,8 @@ describe('REST API Error Handling & Edge Cases', () => {
|
|
|
284
291
|
.set('Accept', 'application/json');
|
|
285
292
|
|
|
286
293
|
expect(response.status).toBe(200);
|
|
287
|
-
expect(response.body
|
|
294
|
+
expect(response.body.data).toBeDefined();
|
|
295
|
+
expect(response.body.data['@type']).toBe('task');
|
|
288
296
|
});
|
|
289
297
|
|
|
290
298
|
it('should include @type in created record response', async () => {
|
|
@@ -294,7 +302,8 @@ describe('REST API Error Handling & Edge Cases', () => {
|
|
|
294
302
|
.set('Accept', 'application/json');
|
|
295
303
|
|
|
296
304
|
expect(response.status).toBe(201);
|
|
297
|
-
expect(response.body
|
|
305
|
+
expect(response.body.data).toBeDefined();
|
|
306
|
+
expect(response.body.data['@type']).toBe('task');
|
|
298
307
|
});
|
|
299
308
|
|
|
300
309
|
it('should return items array for list endpoint', async () => {
|