@opra/sqb 0.1.1 → 0.2.0

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 (6) hide show
  1. package/cjs/base-entity-service.js +9 -9
  2. package/cjs/sqb-adapter.js +17 -15
  3. package/esm/base-entity-service.js +1 -1
  4. package/esm/sqb-adapter.d.ts +2 -2
  5. package/esm/sqb-adapter.js +17 -15
  6. package/package.json +5 -4
package/cjs/base-entity-service.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.BaseEntityService = void 0;
4
- const core_1 = require("@opra/core");
4
+ const exception_1 = require("@opra/exception");
5
5
  const connect_1 = require("@sqb/connect");
6
6
  const sqb_adapter_js_1 = require("./sqb-adapter.js");
7
7
  class BaseEntityService {
@@ -44,7 +44,7 @@ class BaseEntityService {
44
44
  }
45
45
  catch (e) {
46
46
  await this._onError(e);
47
- throw new core_1.BadRequestError(e);
47
+ throw new exception_1.BadRequestError(e);
48
48
  }
49
49
  if (out && this.onTransformRow)
50
50
  out = this.onTransformRow(out, userContext, 'findByPk');
@@ -58,7 +58,7 @@ class BaseEntityService {
58
58
  }
59
59
  catch (e) {
60
60
  await this._onError(e);
61
- throw new core_1.BadRequestError(e);
61
+ throw new exception_1.BadRequestError(e);
62
62
  }
63
63
  }
64
64
  async search(options, userContext) {
@@ -70,7 +70,7 @@ class BaseEntityService {
70
70
  }
71
71
  catch (e) {
72
72
  await this._onError(e);
73
- throw new core_1.BadRequestError(e);
73
+ throw new exception_1.BadRequestError(e);
74
74
  }
75
75
  if (items.length && this.onTransformRow) {
76
76
  const newItems = [];
@@ -92,7 +92,7 @@ class BaseEntityService {
92
92
  }
93
93
  catch (e) {
94
94
  await this._onError(e);
95
- throw new core_1.BadRequestError(e);
95
+ throw new exception_1.BadRequestError(e);
96
96
  }
97
97
  if (out && this.onTransformRow)
98
98
  out = this.onTransformRow(out, userContext, 'create');
@@ -107,7 +107,7 @@ class BaseEntityService {
107
107
  }
108
108
  catch (e) {
109
109
  await this._onError(e);
110
- throw new core_1.BadRequestError(e);
110
+ throw new exception_1.BadRequestError(e);
111
111
  }
112
112
  if (out && this.onTransformRow)
113
113
  out = this.onTransformRow(out, userContext, 'create');
@@ -121,7 +121,7 @@ class BaseEntityService {
121
121
  }
122
122
  catch (e) {
123
123
  await this._onError(e);
124
- throw new core_1.BadRequestError(e);
124
+ throw new exception_1.BadRequestError(e);
125
125
  }
126
126
  }
127
127
  async delete(keyValue, options, userContext) {
@@ -132,7 +132,7 @@ class BaseEntityService {
132
132
  }
133
133
  catch (e) {
134
134
  await this._onError(e);
135
- throw new core_1.BadRequestError(e);
135
+ throw new exception_1.BadRequestError(e);
136
136
  }
137
137
  }
138
138
  async deleteMany(options, userContext) {
@@ -143,7 +143,7 @@ class BaseEntityService {
143
143
  }
144
144
  catch (e) {
145
145
  await this._onError(e);
146
- throw new core_1.BadRequestError(e);
146
+ throw new exception_1.BadRequestError(e);
147
147
  }
148
148
  }
149
149
  async _onError(e) {
package/cjs/sqb-adapter.js CHANGED
@@ -7,7 +7,7 @@ const convert_filter_js_1 = require("./convert-filter.js");
7
7
  var SQBAdapter;
8
8
  (function (SQBAdapter) {
9
9
  function prepare(query) {
10
- switch (query.queryType) {
10
+ switch (query.method) {
11
11
  case 'create': {
12
12
  const options = lodash_1.default.omitBy({
13
13
  pick: query.pick?.length ? query.pick : undefined,
@@ -23,18 +23,21 @@ var SQBAdapter;
23
23
  };
24
24
  }
25
25
  case 'get': {
26
- const options = lodash_1.default.omitBy({
27
- pick: query.pick?.length ? query.pick : undefined,
28
- omit: query.omit?.length ? query.omit : undefined,
29
- include: query.include?.length ? query.include : undefined,
30
- }, lodash_1.default.isNil);
31
- const keyValue = query.keyValue;
32
- return {
33
- method: 'findByPk',
34
- keyValue,
35
- options,
36
- args: [keyValue, options]
37
- };
26
+ if (query.kind === 'GetInstanceQuery') {
27
+ const options = lodash_1.default.omitBy({
28
+ pick: query.pick?.length ? query.pick : undefined,
29
+ omit: query.omit?.length ? query.omit : undefined,
30
+ include: query.include?.length ? query.include : undefined,
31
+ }, lodash_1.default.isNil);
32
+ const keyValue = query.keyValue;
33
+ return {
34
+ method: 'findByPk',
35
+ keyValue,
36
+ options,
37
+ args: [keyValue, options]
38
+ };
39
+ }
40
+ break;
38
41
  }
39
42
  case 'search': {
40
43
  const options = lodash_1.default.omitBy({
@@ -101,9 +104,8 @@ var SQBAdapter;
101
104
  args: [options]
102
105
  };
103
106
  }
104
- default:
105
- throw new Error(`Unimplemented query type "${query.queryType}"`);
106
107
  }
108
+ throw new Error(`Unimplemented query method "${query.method}"`);
107
109
  }
108
110
  SQBAdapter.prepare = prepare;
109
111
  })(SQBAdapter = exports.SQBAdapter || (exports.SQBAdapter = {}));
package/esm/base-entity-service.js CHANGED
@@ -1,4 +1,4 @@
1
- import { BadRequestError } from '@opra/core';
1
+ import { BadRequestError } from '@opra/exception';
2
2
  import { EntityMetadata } from '@sqb/connect';
3
3
  import { SQBAdapter } from './sqb-adapter.js';
4
4
  export class BaseEntityService {
package/esm/sqb-adapter.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { OpraQuery } from '@opra/core';
1
+ import { OpraAnyQuery } from '@opra/schema';
2
2
  export declare namespace SQBAdapter {
3
- function prepare(query: OpraQuery): {
3
+ function prepare(query: OpraAnyQuery): {
4
4
  method: 'create' | 'findByPk' | 'findAll' | 'update' | 'updateAll' | 'destroy' | 'destroyAll';
5
5
  options: any;
6
6
  keyValue?: any;
package/esm/sqb-adapter.js CHANGED
@@ -3,7 +3,7 @@ import { convertFilter } from './convert-filter.js';
3
3
  export var SQBAdapter;
4
4
  (function (SQBAdapter) {
5
5
  function prepare(query) {
6
- switch (query.queryType) {
6
+ switch (query.method) {
7
7
  case 'create': {
8
8
  const options = _.omitBy({
9
9
  pick: query.pick?.length ? query.pick : undefined,
@@ -19,18 +19,21 @@ export var SQBAdapter;
19
19
  };
20
20
  }
21
21
  case 'get': {
22
- const options = _.omitBy({
23
- pick: query.pick?.length ? query.pick : undefined,
24
- omit: query.omit?.length ? query.omit : undefined,
25
- include: query.include?.length ? query.include : undefined,
26
- }, _.isNil);
27
- const keyValue = query.keyValue;
28
- return {
29
- method: 'findByPk',
30
- keyValue,
31
- options,
32
- args: [keyValue, options]
33
- };
22
+ if (query.kind === 'GetInstanceQuery') {
23
+ const options = _.omitBy({
24
+ pick: query.pick?.length ? query.pick : undefined,
25
+ omit: query.omit?.length ? query.omit : undefined,
26
+ include: query.include?.length ? query.include : undefined,
27
+ }, _.isNil);
28
+ const keyValue = query.keyValue;
29
+ return {
30
+ method: 'findByPk',
31
+ keyValue,
32
+ options,
33
+ args: [keyValue, options]
34
+ };
35
+ }
36
+ break;
34
37
  }
35
38
  case 'search': {
36
39
  const options = _.omitBy({
@@ -97,9 +100,8 @@ export var SQBAdapter;
97
100
  args: [options]
98
101
  };
99
102
  }
100
- default:
101
- throw new Error(`Unimplemented query type "${query.queryType}"`);
102
103
  }
104
+ throw new Error(`Unimplemented query method "${query.method}"`);
103
105
  }
104
106
  SQBAdapter.prepare = prepare;
105
107
  })(SQBAdapter || (SQBAdapter = {}));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opra/sqb",
3
- "version": "0.1.1",
3
+ "version": "0.2.0",
4
4
  "description": "Opra SQB adapter package",
5
5
  "author": "Panates",
6
6
  "license": "MIT",
@@ -32,9 +32,10 @@
32
32
  "@sqb/connect": "^4.5.1"
33
33
  },
34
34
  "peerDependencies": {
35
- "@opra/core": "^0.1.1",
36
- "@opra/optionals": "^0.1.1",
37
- "@opra/url": "^0.1.1",
35
+ "@opra/core": "^0.2.0",
36
+ "@opra/exception": "^0.2.0",
37
+ "@opra/optionals": "^0.2.0",
38
+ "@opra/url": "^0.2.0",
38
39
  "@sqb/connect": ">= 4.5.0",
39
40
  "@sqb/sqljs": "^4.5.1"
40
41
  },