@entity-access/server-pages 1.1.348 → 1.1.350

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.
Files changed (83) hide show
  1. package/dist/Content.d.ts +17 -31
  2. package/dist/Content.d.ts.map +1 -1
  3. package/dist/Content.js +117 -97
  4. package/dist/Content.js.map +1 -1
  5. package/dist/Page.d.ts +2 -4
  6. package/dist/Page.d.ts.map +1 -1
  7. package/dist/Page.js +32 -24
  8. package/dist/Page.js.map +1 -1
  9. package/dist/ServerPages.d.ts.map +1 -1
  10. package/dist/ServerPages.js +9 -3
  11. package/dist/ServerPages.js.map +1 -1
  12. package/dist/core/Compression.d.ts +5 -2
  13. package/dist/core/Compression.d.ts.map +1 -1
  14. package/dist/core/Compression.js +11 -3
  15. package/dist/core/Compression.js.map +1 -1
  16. package/dist/core/Executor.d.ts +1 -1
  17. package/dist/core/RouteTree.js +1 -2
  18. package/dist/core/RouteTree.js.map +1 -1
  19. package/dist/core/Utf8Readable.d.ts +6 -0
  20. package/dist/core/Utf8Readable.d.ts.map +1 -0
  21. package/dist/core/Utf8Readable.js +12 -0
  22. package/dist/core/Utf8Readable.js.map +1 -0
  23. package/dist/core/Wrapped.d.ts +2 -4
  24. package/dist/core/Wrapped.d.ts.map +1 -1
  25. package/dist/core/Wrapped.js +115 -108
  26. package/dist/core/Wrapped.js.map +1 -1
  27. package/dist/html/HtmlComment.d.ts +1 -0
  28. package/dist/html/HtmlComment.d.ts.map +1 -1
  29. package/dist/html/HtmlComment.js +9 -0
  30. package/dist/html/HtmlComment.js.map +1 -1
  31. package/dist/html/HtmlDocument.d.ts.map +1 -1
  32. package/dist/html/HtmlDocument.js +4 -0
  33. package/dist/html/HtmlDocument.js.map +1 -1
  34. package/dist/html/XNode.d.ts +1 -0
  35. package/dist/html/XNode.d.ts.map +1 -1
  36. package/dist/html/XNode.js +38 -0
  37. package/dist/html/XNode.js.map +1 -1
  38. package/dist/routes/api/entity/expand/[entity]/[property]/[keys]/get.js +2 -2
  39. package/dist/routes/api/entity/expand/[entity]/[property]/[keys]/get.js.map +1 -1
  40. package/dist/routes/api/entity/index.d.ts +1 -1
  41. package/dist/routes/api/entity/invoke/[entityName]/[methodName]/post.d.ts +2 -2
  42. package/dist/routes/api/entity/invoke/[entityName]/[methodName]/post.d.ts.map +1 -1
  43. package/dist/routes/api/entity/invoke/[entityName]/[methodName]/post.js +9 -3
  44. package/dist/routes/api/entity/invoke/[entityName]/[methodName]/post.js.map +1 -1
  45. package/dist/routes/api/entity/model.ts/get.d.ts +2 -1
  46. package/dist/routes/api/entity/model.ts/get.d.ts.map +1 -1
  47. package/dist/routes/api/entity/model.ts/get.js +6 -1
  48. package/dist/routes/api/entity/model.ts/get.js.map +1 -1
  49. package/dist/routes/api/entity/query/[entity]/get.js +2 -2
  50. package/dist/routes/api/entity/query/[entity]/get.js.map +1 -1
  51. package/dist/routes/api/entity/run/[entity]/[methodName]/index.d.ts +2 -2
  52. package/dist/routes/api/entity/run/[entity]/[methodName]/index.d.ts.map +1 -1
  53. package/dist/routes/api/entity/run/[entity]/[methodName]/index.js +7 -3
  54. package/dist/routes/api/entity/run/[entity]/[methodName]/index.js.map +1 -1
  55. package/dist/services/DbJsonService.d.ts +5 -5
  56. package/dist/services/DbJsonService.d.ts.map +1 -1
  57. package/dist/services/DbJsonService.js +13 -7
  58. package/dist/services/DbJsonService.js.map +1 -1
  59. package/dist/services/EntityAccessServer.d.ts +1 -2
  60. package/dist/services/EntityAccessServer.d.ts.map +1 -1
  61. package/dist/services/EntityAccessServer.js +1 -8
  62. package/dist/services/EntityAccessServer.js.map +1 -1
  63. package/dist/tests/logger/index.js +1 -1
  64. package/dist/tsconfig.tsbuildinfo +1 -1
  65. package/package.json +2 -2
  66. package/src/Content.tsx +149 -120
  67. package/src/Page.tsx +34 -24
  68. package/src/ServerPages.ts +15 -6
  69. package/src/core/Compression.ts +14 -3
  70. package/src/core/RouteTree.ts +1 -1
  71. package/src/core/Utf8Readable.ts +15 -0
  72. package/src/core/Wrapped.ts +121 -111
  73. package/src/html/HtmlComment.ts +10 -0
  74. package/src/html/HtmlDocument.tsx +5 -0
  75. package/src/html/XNode.ts +58 -0
  76. package/src/routes/api/entity/expand/[entity]/[property]/[keys]/get.ts +2 -2
  77. package/src/routes/api/entity/invoke/[entityName]/[methodName]/post.tsx +9 -3
  78. package/src/routes/api/entity/model.ts/get.tsx +7 -1
  79. package/src/routes/api/entity/query/[entity]/get.ts +2 -2
  80. package/src/routes/api/entity/run/[entity]/[methodName]/index.ts +7 -5
  81. package/src/services/DbJsonService.ts +13 -8
  82. package/src/services/EntityAccessServer.ts +1 -10
  83. package/src/tests/logger/index.tsx +1 -1
@@ -2,7 +2,7 @@ import Page, { IRouteCheck } from "../../../Page.js";
2
2
  export default class extends Page {
3
3
  static canHandle(pageContext: IRouteCheck): boolean;
4
4
  private db;
5
- run(): Promise<import("../../../Content.js").JsonReaderResult>;
5
+ run(): Promise<import("../../../Content.js").default>;
6
6
  private save;
7
7
  private saveMultiple;
8
8
  private delete;
@@ -1,9 +1,9 @@
1
1
  import Page from "../../../../../../Page.js";
2
- import { PageResult } from "../../../../../../Content.js";
2
+ import Content from "../../../../../../Content.js";
3
3
  export default class extends Page {
4
4
  private db;
5
5
  entityName: string;
6
6
  methodName: string;
7
- run(): Promise<PageResult>;
7
+ run(): Promise<Content>;
8
8
  }
9
9
  //# sourceMappingURL=post.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/invoke/[entityName]/[methodName]/post.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAO7C,OAAgB,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAgB;IAG1B,UAAU,EAAE,MAAM,CAAC;IAGnB,UAAU,EAAE,MAAM,CAAC;IAEb,GAAG;CAyDZ"}
1
+ {"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/invoke/[entityName]/[methodName]/post.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAO7C,OAAO,OAAO,MAAM,8BAA8B,CAAC;AAGnD,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAgB;IAG1B,UAAU,EAAE,MAAM,CAAC;IAGnB,UAAU,EAAE,MAAM,CAAC;IAEb,GAAG;CA8DZ"}
@@ -15,7 +15,8 @@ import SchemaRegistry from "@entity-access/entity-access/dist/decorators/SchemaR
15
15
  import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
16
16
  import ExternalInvoke from "../../../../../../decorators/ExternalInvoke.js";
17
17
  import { Route } from "../../../../../../core/Route.js";
18
- import { PageResult } from "../../../../../../Content.js";
18
+ import Content from "../../../../../../Content.js";
19
+ import DbJsonReadable from "../../../../../../services/DbJsonService.js";
19
20
  export default class default_1 extends Page {
20
21
  async run() {
21
22
  const { entityName, methodName } = this;
@@ -47,7 +48,7 @@ export default class default_1 extends Page {
47
48
  .firstOrFail();
48
49
  // now execute external method
49
50
  const result = await events[methodName](e, ...args);
50
- if (result instanceof PageResult) {
51
+ if (result instanceof Content) {
51
52
  return result;
52
53
  }
53
54
  // return this.json(
@@ -55,8 +56,13 @@ export default class default_1 extends Page {
55
56
  // ? GraphService.prepareGraph(result, this.sessionUser)
56
57
  // : {});
57
58
  if (!result) {
58
- return this.content({ body: "{}", contentType: "application/json" });
59
+ return Content.text("{}", {
60
+ headers: {
61
+ "content-type": "application/json; charset=utf8"
62
+ }
63
+ });
59
64
  }
65
+ return DbJsonReadable.toJson(this.db, result);
60
66
  }
61
67
  }
62
68
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/invoke/[entityName]/[methodName]/post.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/invoke/[entityName]/[methodName]/post.tsx"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
2
2
  import Page from "../../../../Page.js";
3
+ import Content from "../../../../Content.js";
3
4
  export default class extends Page {
4
5
  db: EntityContext;
5
- run(): import("../../../../Content.js").default;
6
+ run(): Content;
6
7
  }
7
8
  //# sourceMappingURL=get.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../src/routes/api/entity/model.ts/get.tsx"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,qBAAqB,CAAC;AAGvC,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,aAAa,CAAC;IAElB,GAAG;CAKN"}
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../src/routes/api/entity/model.ts/get.tsx"],"names":[],"mappings":"AACA,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,qBAAqB,CAAC;AAEvC,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAE7C,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,aAAa,CAAC;IAElB,GAAG;CAUN"}
@@ -11,9 +11,14 @@ import Inject from "@entity-access/entity-access/dist/di/di.js";
11
11
  import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
12
12
  import Page from "../../../../Page.js";
13
13
  import ModelService from "../../../../services/ModelService.js";
14
+ import Content from "../../../../Content.js";
14
15
  export default class default_1 extends Page {
15
16
  run() {
16
- return this.content(ModelService.getModelDeclaration(this.db), 200, "text/typescript");
17
+ return Content.text(ModelService.getModelDeclaration(this.db), {
18
+ headers: {
19
+ "content-type": "text/typescript; charset=utf8"
20
+ }
21
+ });
17
22
  }
18
23
  }
19
24
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../src/routes/api/entity/model.ts/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAEhE,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAK7B,GAAG;QAEC,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAC3F,CAAC;CAEJ;AAPG;IADC,MAAM;8BACH,aAAa;qCAAC"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../src/routes/api/entity/model.ts/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,qBAAqB,CAAC;AACvC,OAAO,YAAY,MAAM,sCAAsC,CAAC;AAChE,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAE7C,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAK7B,GAAG;QAEC,OAAO,OAAO,CAAC,IAAI,CACf,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACvC,OAAO,EAAE;gBACL,cAAc,EAAE,+BAA+B;aAClD;SACJ,CAAC,CAAC;IACX,CAAC;CAEJ;AAZG;IADC,MAAM;8BACH,aAAa;qCAAC"}
@@ -21,11 +21,11 @@ let default_1 = class extends Page {
21
21
  if (cv && cache) {
22
22
  this.cacheControl = `public, max-age=${cache}`;
23
23
  }
24
- return this.json(await EntityAccessServer.query(this.db, {
24
+ return await EntityAccessServer.query(this.db, {
25
25
  entity,
26
26
  ...this.query,
27
27
  ...this.body
28
- }, this.sessionUser));
28
+ });
29
29
  }
30
30
  };
31
31
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/routes/api/entity/query/[entity]/get.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,wBAAwB,CAAC;AAC1C,OAAO,kBAAkB,MAAM,+CAA+C,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAItC,gBAAA,KAAM,SAAQ,IAAI;IAQ7B,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAExB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAE/B,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,YAAY,GAAG,mBAAmB,KAAK,EAAE,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE;YACrD,MAAM;YACN,GAAI,IAAI,CAAC,KAAK;YACd,GAAI,IAAI,CAAC,IAAI;SAChB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1B,CAAC;CAEJ,CAAA;AAtBW;IADP,MAAM;8BACK,aAAa;qCAAC;AAG1B;IADC,KAAK;;yCACS;AANJ;IAFd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;aA0BrB"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/routes/api/entity/query/[entity]/get.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,wBAAwB,CAAC;AAC1C,OAAO,kBAAkB,MAAM,+CAA+C,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAItC,gBAAA,KAAM,SAAQ,IAAI;IAQ7B,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAExB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAE/B,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,YAAY,GAAG,mBAAmB,KAAK,EAAE,CAAC;QACnD,CAAC;QAED,OAAO,MAAM,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE;YAC3C,MAAM;YACN,GAAI,IAAI,CAAC,KAAK;YACd,GAAI,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;AAtBW;IADP,MAAM;8BACK,aAAa;qCAAC;AAG1B;IADC,KAAK;;yCACS;AANJ;IAFd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;aA0BrB"}
@@ -1,11 +1,11 @@
1
1
  import Page from "../../../../../../Page.js";
2
- import { PageResult } from "../../../../../../Content.js";
3
2
  import SessionSecurity from "../../../../../../services/SessionSecurity.js";
3
+ import Content from "../../../../../../Content.js";
4
4
  export default class extends Page {
5
5
  private db;
6
6
  entity: string;
7
7
  methodName: string;
8
8
  sessionSecurity: SessionSecurity;
9
- run(): Promise<PageResult>;
9
+ run(): Promise<Content>;
10
10
  }
11
11
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/run/[entity]/[methodName]/index.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAO7C,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAI5E,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAgB;IAG1B,MAAM,EAAE,MAAM,CAAC;IAGf,UAAU,EAAE,MAAM,CAAC;IAGnB,eAAe,EAAE,eAAe,CAAC;IAE3B,GAAG;CA8CZ"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/run/[entity]/[methodName]/index.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAO7C,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAC5E,OAAO,OAAO,MAAM,8BAA8B,CAAC;AAInD,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAgB;IAG1B,MAAM,EAAE,MAAM,CAAC;IAGf,UAAU,EAAE,MAAM,CAAC;IAGnB,eAAe,EAAE,eAAe,CAAC;IAE3B,GAAG;CAkDZ"}
@@ -14,10 +14,10 @@ import { Route } from "../../../../../../core/Route.js";
14
14
  import { Prepare } from "../../../../../../decorators/Prepare.js";
15
15
  import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
16
16
  import SchemaRegistry from "@entity-access/entity-access/dist/decorators/SchemaRegistry.js";
17
- import { PageResult } from "../../../../../../Content.js";
18
17
  import ExternalInvoke from "../../../../../../decorators/ExternalInvoke.js";
19
18
  import JsonService from "../../../../../../services/DbJsonService.js";
20
19
  import SessionSecurity from "../../../../../../services/SessionSecurity.js";
20
+ import Content from "../../../../../../Content.js";
21
21
  let default_1 = class extends Page {
22
22
  async run() {
23
23
  const { entity: entityName } = this;
@@ -41,11 +41,15 @@ let default_1 = class extends Page {
41
41
  const entity = await this.db.model.register(entityClass).statements.select({}, keys);
42
42
  // now execute external method
43
43
  const result = await events[methodName](entity, ...args);
44
- if (result instanceof PageResult) {
44
+ if (result instanceof Content) {
45
45
  return result;
46
46
  }
47
47
  if (!result) {
48
- return this.content({ body: "{}", contentType: "application/json" });
48
+ return Content.text("{}", {
49
+ headers: {
50
+ "content-type": "application/json; charset=utf8"
51
+ }
52
+ });
49
53
  }
50
54
  return JsonService.toJson(this.db, result);
51
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/run/[entity]/[methodName]/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAGlE,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,cAAc,MAAM,gEAAgE,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,cAAc,MAAM,gDAAgD,CAAC;AAC5E,OAAO,WAAW,MAAM,6CAA6C,CAAC;AACtE,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAI7D,gBAAA,KAAM,SAAQ,IAAI;IAc7B,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEpC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE7D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAE/B,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,YAAY,GAAG,mBAAmB,KAAK,EAAE,CAAC;QACnD,CAAC;QAED,MAAM,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC;QAE3B,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE5D,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QAED,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,SAAS,CAAS,WAAW,EAAE,IAAI,CAAC,CAAC;QAE5D,IAAG,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,iBAAiB,CAAC,GAAG,UAAU,kDAAkD,CAAC,CAAC;QACjG,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAErF,8BAA8B;QAC9B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,GAAI,IAAI,CAAC,CAAC;QAE1D,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,kBAAkB,EAAC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;CAEJ,CAAA;AAzDW;IADP,MAAM;8BACK,aAAa;qCAAC;AAG1B;IADC,KAAK;;yCACS;AAGf;IADC,KAAK;;6CACa;AAGnB;IADC,MAAM;8BACU,eAAe;kDAAC;AAZtB;IAFd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;aA6DrB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/routes/api/entity/run/[entity]/[methodName]/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,IAAI,MAAM,2BAA2B,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAClE,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,cAAc,MAAM,gEAAgE,CAAC;AAC5F,OAAO,cAAc,MAAM,gDAAgD,CAAC;AAC5E,OAAO,WAAW,MAAM,6CAA6C,CAAC;AACtE,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAC5E,OAAO,OAAO,MAAM,8BAA8B,CAAC;AAIpC,gBAAA,KAAM,SAAQ,IAAI;IAc7B,KAAK,CAAC,GAAG;QACL,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEpC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE7D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAE/B,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,YAAY,GAAG,mBAAmB,KAAK,EAAE,CAAC;QACnD,CAAC;QAED,MAAM,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC;QAE3B,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QAE5D,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QAED,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,SAAS,CAAS,WAAW,EAAE,IAAI,CAAC,CAAC;QAE5D,IAAG,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,iBAAiB,CAAC,GAAG,UAAU,kDAAkD,CAAC,CAAC;QACjG,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAErF,8BAA8B;QAC9B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,GAAI,IAAI,CAAC,CAAC;QAE1D,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;gBACtB,OAAO,EAAE;oBACL,cAAc,EAAE,gCAAgC;iBACnD;aACJ,CAAC,CAAC;QACP,CAAC;QAED,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;CAEJ,CAAA;AA7DW;IADP,MAAM;8BACK,aAAa;qCAAC;AAG1B;IADC,KAAK;;yCACS;AAGf;IADC,KAAK;;6CACa;AAGnB;IADC,MAAM;8BACU,eAAe;kDAAC;AAZtB;IAFd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;aAiErB"}
@@ -1,10 +1,10 @@
1
- import JsonReadable from "@entity-access/entity-access/dist/common/JsonReadable.js";
2
- import { JsonReaderResult } from "../Content.js";
1
+ import JsonGenerator from "@entity-access/entity-access/dist/common/JsonGenerator.js";
3
2
  import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
4
- export default class DbJsonReadable extends JsonReadable {
3
+ import Content from "../Content.js";
4
+ export default class DbJsonReadable extends JsonGenerator {
5
5
  private readonly db;
6
- static toJson(db: EntityContext, item: any): JsonReaderResult;
7
- constructor(db: EntityContext, model: any);
6
+ static toJson(db: EntityContext, item: any): Content;
7
+ constructor(db: EntityContext);
8
8
  preJSON(item: any): any;
9
9
  }
10
10
  //# sourceMappingURL=DbJsonService.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DbJsonService.d.ts","sourceRoot":"","sources":["../../src/services/DbJsonService.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0DAA0D,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,aAAa,MAAM,0DAA0D,CAAC;AAErF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,YAAY;IAQhD,OAAO,CAAC,QAAQ,CAAC,EAAE;IANvB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG;gBAMrB,EAAE,EAAE,aAAa,EAClC,KAAK,EAAE,GAAG;IAId,OAAO,CAAC,IAAI,EAAE,GAAG;CAYpB"}
1
+ {"version":3,"file":"DbJsonService.d.ts","sourceRoot":"","sources":["../../src/services/DbJsonService.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,2DAA2D,CAAC;AACtF,OAAO,aAAa,MAAM,0DAA0D,CAAC;AACrF,OAAO,OAAO,MAAM,eAAe,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,aAAa;IAcjD,OAAO,CAAC,QAAQ,CAAC,EAAE;IAZvB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG;gBAYrB,EAAE,EAAE,aAAa;IAItC,OAAO,CAAC,IAAI,EAAE,GAAG;CAYpB"}
@@ -1,12 +1,18 @@
1
- import JsonReadable from "@entity-access/entity-access/dist/common/JsonReadable.js";
2
- import { JsonReaderResult } from "../Content.js";
3
- export default class DbJsonReadable extends JsonReadable {
1
+ import JsonGenerator from "@entity-access/entity-access/dist/common/JsonGenerator.js";
2
+ import Content from "../Content.js";
3
+ export default class DbJsonReadable extends JsonGenerator {
4
4
  static toJson(db, item) {
5
- const js = new DbJsonReadable(db, item);
6
- return new JsonReaderResult(js);
5
+ const js = new DbJsonReadable(db);
6
+ const reader = js.reader(item);
7
+ return new Content({
8
+ reader,
9
+ headers: {
10
+ "content-type": "application/json; charset=utf8"
11
+ }
12
+ });
7
13
  }
8
- constructor(db, model) {
9
- super(model, db);
14
+ constructor(db) {
15
+ super(db);
10
16
  this.db = db;
11
17
  }
12
18
  preJSON(item) {
@@ -1 +1 @@
1
- {"version":3,"file":"DbJsonService.js","sourceRoot":"","sources":["../../src/services/DbJsonService.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,0DAA0D,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,YAAY;IAEpD,MAAM,CAAC,MAAM,CAAC,EAAiB,EAAE,IAAS;QACtC,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACxC,OAAQ,IAAI,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,YACqB,EAAiB,EAClC,KAAU;QACV,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAFC,OAAE,GAAF,EAAE,CAAe;IAGtC,CAAC;IAED,OAAO,CAAC,IAAS;QACb,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;QAC5D,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YACpD,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;YACxC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CAEJ"}
1
+ {"version":3,"file":"DbJsonService.js","sourceRoot":"","sources":["../../src/services/DbJsonService.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,2DAA2D,CAAC;AAEtF,OAAO,OAAO,MAAM,eAAe,CAAC;AAEpC,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,aAAa;IAErD,MAAM,CAAC,MAAM,CAAC,EAAiB,EAAE,IAAS;QACtC,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAQ,IAAI,OAAO,CAAC;YAChB,MAAM;YACN,OAAO,EAAE;gBACL,cAAc,EAAE,gCAAgC;aACnD;SACJ,CAAC,CAAC;IACP,CAAC;IAED,YACqB,EAAiB;QAClC,KAAK,CAAC,EAAE,CAAC,CAAA;QADQ,OAAE,GAAF,EAAE,CAAe;IAEtC,CAAC;IAED,OAAO,CAAC,IAAS;QACb,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC;QAC/B,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;QAC5D,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YACpD,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;YACxC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CAEJ"}
@@ -1,5 +1,4 @@
1
1
  import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
2
- import { SessionUser } from "../core/SessionUser.js";
3
2
  export type IQueryMethod = [string, string, ...any[]];
4
3
  export interface IEntityQueryOptions {
5
4
  entity: string;
@@ -18,6 +17,6 @@ export interface IEntityQueryOptions {
18
17
  traceFunc?(text: string): any;
19
18
  }
20
19
  export default class EntityAccessServer {
21
- static query(db: EntityContext, options: IEntityQueryOptions, user: SessionUser): Promise<import("../Content.js").JsonReaderResult>;
20
+ static query(db: EntityContext, options: IEntityQueryOptions): Promise<import("../Content.js").default>;
22
21
  }
23
22
  //# sourceMappingURL=EntityAccessServer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"EntityAccessServer.d.ts","sourceRoot":"","sources":["../../src/services/EntityAccessServer.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,0DAA0D,CAAC;AAMrF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAI,GAAG,EAAE,CAAC,CAAC;AAavD,MAAM,WAAW,mBAAmB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE,CAAC;IACrB,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,OAAE;CAC5B;AAED,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEf,KAAK,CACrB,EAAE,EAAE,aAAa,EACjB,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,WAAW;CAyHxB"}
1
+ {"version":3,"file":"EntityAccessServer.d.ts","sourceRoot":"","sources":["../../src/services/EntityAccessServer.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,0DAA0D,CAAC;AASrF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAI,GAAG,EAAE,CAAC,CAAC;AAavD,MAAM,WAAW,mBAAmB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE,CAAC;IACrB,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,OAAE;CAC5B;AAED,MAAM,CAAC,OAAO,OAAO,kBAAkB;WAEf,KAAK,CACrB,EAAE,EAAE,aAAa,EACjB,OAAO,EAAE,mBAAmB;CAiHnC"}
@@ -17,7 +17,7 @@ const replaceArgs = (code, p, args) => {
17
17
  };
18
18
  ;
19
19
  export default class EntityAccessServer {
20
- static async query(db, options, user) {
20
+ static async query(db, options) {
21
21
  db.verifyFilters = true;
22
22
  db.raiseEvents = true;
23
23
  const { entity: name, start = 0, size = 100, trace, function: queryFunction, expand, expandKeys, expandable } = options;
@@ -80,16 +80,12 @@ export default class EntityAccessServer {
80
80
  q = q.limit(size);
81
81
  }
82
82
  let items;
83
- const beforeSerialize = events.beforeSerialize;
84
83
  if (count) {
85
84
  const total = await oq.count();
86
85
  if (trace) {
87
86
  q = q.trace(console.log);
88
87
  }
89
88
  items = await q.toArray();
90
- if (beforeSerialize) {
91
- await beforeSerialize.call(events, items);
92
- }
93
89
  return DbJsonService.toJson(db, {
94
90
  total,
95
91
  items
@@ -99,9 +95,6 @@ export default class EntityAccessServer {
99
95
  q = q.trace(console.log);
100
96
  }
101
97
  items = await q.toArray();
102
- if (beforeSerialize) {
103
- await beforeSerialize.call(events, items);
104
- }
105
98
  return DbJsonService.toJson(db, {
106
99
  total: 0,
107
100
  items
@@ -1 +1 @@
1
- {"version":3,"file":"EntityAccessServer.js","sourceRoot":"","sources":["../../src/services/EntityAccessServer.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,cAAc,MAAM,gEAAgE,CAAC;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sEAAsE,CAAC;AAG1G,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,CAAM,EAAE,IAAW,EAAE,EAAE;IACtD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC;QACzB,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC,CAAC;QAC/D,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACnB,KAAK,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;AAC7D,CAAC,CAAC;AAiBD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAE5B,MAAM,CAAC,KAAK,CAAC,KAAK,CACrB,EAAiB,EACjB,OAA4B,EAC5B,IAAiB;QAEjB,EAAE,CAAC,aAAa,GAAG,IAAI,CAAC;QACxB,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC;QAEtB,MAAM,EACF,MAAM,EAAE,IAAI,EACZ,KAAK,GAAG,CAAC,EACT,IAAI,GAAG,GAAG,EACV,KAAK,EACL,QAAQ,EAAE,aAAa,EACvB,MAAM,EACN,UAAU,EACV,UAAU,EACb,GAAG,OAAO,CAAC;QACZ,IAAI,EACA,KAAK,GAAG,KAAK,EACb,OAAO,EACP,IAAI,GAAG,IAAI,EACd,GAAG,OAAO,CAAC;QACZ,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,KAAK,GAAG,KAAK,KAAK,MAAM,CAAC;QAC7B,CAAC;QAED,MAAM,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAE/C,IAAI,aAAa,EAAE,CAAC;YAChB,IAAG,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC;gBAClD,MAAM,IAAI,iBAAiB,CAAC,GAAG,aAAa,wCAAwC,CAAC,CAAC;YAC1F,CAAC;QACL,CAAC;QAED,IAAI,CAAoB,CAAC;QAEzB,IAAI,aAAa,EAAE,CAAC;YAChB,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,GAAI,IAAI,CAAC,CAAC;YACpC,IAAK,CAAS,CAAC,IAAI,EAAE,CAAC;gBAClB,CAAC,GAAG,MAAM,CAAC,CAAC;YAChB,CAAC;YACD,CAAC,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACJ,IAAI,MAAM,EAAE,CAAC;gBACT,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,UAAU,EAAE,MAAa,CAAC,CAAC;YAC1D,CAAC;iBAAM,CAAC;gBACJ,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;gBACzC,IAAK,CAAS,CAAC,IAAI,EAAE,CAAC;oBAClB,CAAC,GAAG,MAAM,CAAC,CAAC;gBAChB,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACV,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,GAAI,UAAU,CAAC,IAAI,OAAO,EAAE,CAAC;gBACnD,MAAM,CAAC,GAAG,EAAE,CAAC;gBACb,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBACvB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;oBACpB,SAAS;gBACb,CAAC;gBACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC/C,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YACxC,CAAC;QACL,CAAC;QAED,MAAM,EAAE,GAAG,CAAC,CAAC;QAEb,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACZ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACpB,KAAK,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACX,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;QAED,IAAI,KAAK,CAAC;QAEV,MAAM,eAAe,GAAI,MAAc,CAAC,eAA2B,CAAC;QAGpE,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,KAAK,EAAE,CAAC;gBACR,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC7B,CAAC;YACD,KAAK,GAAG,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,eAAe,EAAE,CAAC;gBAClB,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC9C,CAAC;YACD,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE;gBAC5B,KAAK;gBACL,KAAK;aACR,CAAC,CAAC;QACP,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACR,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;QACD,KAAK,GAAG,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1B,IAAI,eAAe,EAAE,CAAC;YAClB,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE;YAC5B,KAAK,EAAE,CAAC;YACR,KAAK;SACR,CAAC,CAAC;IAEP,CAAC;CAEJ"}
1
+ {"version":3,"file":"EntityAccessServer.js","sourceRoot":"","sources":["../../src/services/EntityAccessServer.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ export default function () {
8
8
  return this.notFound();
9
9
  }
10
10
  }
11
- return Content.html(XNode.create(HtmlDocument, null,
11
+ return Content.text(XNode.create(HtmlDocument, null,
12
12
  XNode.create("body", null, "Test 1")));
13
13
  }
14
14
  //# sourceMappingURL=index.js.map