@opra/sqb 1.9.0 → 1.9.1

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.
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.default = parseFilter;
3
+ exports.default = prepareFilter;
4
4
  const tslib_1 = require("tslib");
5
5
  require("@opra/core");
6
6
  const common_1 = require("@opra/common");
@@ -13,7 +13,7 @@ const valgen_1 = require("valgen");
13
13
  *
14
14
  * @returns {Expression} - The prepared SQB Expression.
15
15
  */
16
- function parseFilter(filters) {
16
+ function prepareFilter(filters) {
17
17
  const filtersArray = Array.isArray(filters) ? filters : [filters];
18
18
  if (!filtersArray.length)
19
19
  return undefined;
@@ -60,6 +60,16 @@ function prepareFilterAst(ast) {
60
60
  if (ast instanceof common_1.OpraFilter.ComparisonExpression) {
61
61
  const left = String(ast.left);
62
62
  const right = prepareFilterAst(ast.right);
63
+ if (ast.prepare) {
64
+ const x = ast.prepare({
65
+ left,
66
+ right,
67
+ op: ast.op,
68
+ adapter: 'sqb',
69
+ });
70
+ if (x)
71
+ return x;
72
+ }
63
73
  switch (ast.op) {
64
74
  case '=':
65
75
  return sqb.Eq(left, right);
@@ -3,10 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SQBAdapter = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const connect_1 = require("@sqb/connect");
6
- const parse_filter_js_1 = tslib_1.__importDefault(require("./adapter-utils/parse-filter.js"));
6
+ const prepare_filter_js_1 = tslib_1.__importDefault(require("./adapter-utils/prepare-filter.js"));
7
7
  var SQBAdapter;
8
8
  (function (SQBAdapter) {
9
- SQBAdapter.parseFilter = parse_filter_js_1.default;
9
+ /**
10
+ * @deprecated Use prepareFilter instead
11
+ */
12
+ SQBAdapter.parseFilter = prepare_filter_js_1.default;
13
+ SQBAdapter.prepareFilter = prepare_filter_js_1.default;
10
14
  async function parseRequest(context) {
11
15
  if (context.protocol !== 'http') {
12
16
  throw new TypeError('SQBAdapter can parse only HttpContext');
@@ -9,7 +9,7 @@ import { isDate } from 'valgen';
9
9
  *
10
10
  * @returns {Expression} - The prepared SQB Expression.
11
11
  */
12
- export default function parseFilter(filters) {
12
+ export default function prepareFilter(filters) {
13
13
  const filtersArray = Array.isArray(filters) ? filters : [filters];
14
14
  if (!filtersArray.length)
15
15
  return undefined;
@@ -56,6 +56,16 @@ function prepareFilterAst(ast) {
56
56
  if (ast instanceof OpraFilter.ComparisonExpression) {
57
57
  const left = String(ast.left);
58
58
  const right = prepareFilterAst(ast.right);
59
+ if (ast.prepare) {
60
+ const x = ast.prepare({
61
+ left,
62
+ right,
63
+ op: ast.op,
64
+ adapter: 'sqb',
65
+ });
66
+ if (x)
67
+ return x;
68
+ }
59
69
  switch (ast.op) {
60
70
  case '=':
61
71
  return sqb.Eq(left, right);
@@ -1,8 +1,12 @@
1
1
  import { EntityMetadata } from '@sqb/connect';
2
- import _parseFilter from './adapter-utils/parse-filter.js';
2
+ import _prepareFilter from './adapter-utils/prepare-filter.js';
3
3
  export var SQBAdapter;
4
4
  (function (SQBAdapter) {
5
- SQBAdapter.parseFilter = _parseFilter;
5
+ /**
6
+ * @deprecated Use prepareFilter instead
7
+ */
8
+ SQBAdapter.parseFilter = _prepareFilter;
9
+ SQBAdapter.prepareFilter = _prepareFilter;
6
10
  async function parseRequest(context) {
7
11
  if (context.protocol !== 'http') {
8
12
  throw new TypeError('SQBAdapter can parse only HttpContext');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opra/sqb",
3
- "version": "1.9.0",
3
+ "version": "1.9.1",
4
4
  "description": "Opra SQB adapter package",
5
5
  "author": "Panates",
6
6
  "license": "MIT",
@@ -10,8 +10,8 @@
10
10
  "valgen": "^5.12.0"
11
11
  },
12
12
  "peerDependencies": {
13
- "@opra/core": "^1.9.0",
14
- "@opra/http": "^1.9.0",
13
+ "@opra/core": "^1.9.1",
14
+ "@opra/http": "^1.9.1",
15
15
  "@sqb/connect": ">= 4.19.1"
16
16
  },
17
17
  "type": "module",
@@ -7,4 +7,4 @@ import type { SQBAdapter } from '../sqb-adapter.js';
7
7
  *
8
8
  * @returns {Expression} - The prepared SQB Expression.
9
9
  */
10
- export default function parseFilter(filters: SQBAdapter.FilterInput | SQBAdapter.FilterInput[]): any;
10
+ export default function prepareFilter(filters: SQBAdapter.FilterInput | SQBAdapter.FilterInput[]): any;
@@ -1,12 +1,16 @@
1
1
  import type { OpraFilter } from '@opra/common';
2
2
  import type { ExecutionContext } from '@opra/core';
3
3
  import { type Repository } from '@sqb/connect';
4
- import _parseFilter from './adapter-utils/parse-filter.js';
4
+ import _prepareFilter from './adapter-utils/prepare-filter.js';
5
5
  export declare namespace SQBAdapter {
6
6
  type Id = string | number | boolean | Date;
7
7
  type IdOrIds = Id | Record<string, Id>;
8
8
  type FilterInput = OpraFilter.Expression | Repository.FindManyOptions['filter'] | string | undefined;
9
- const parseFilter: typeof _parseFilter;
9
+ /**
10
+ * @deprecated Use prepareFilter instead
11
+ */
12
+ const parseFilter: typeof _prepareFilter;
13
+ const prepareFilter: typeof _prepareFilter;
10
14
  interface TransformedRequest {
11
15
  method: 'create' | 'delete' | 'deleteMany' | 'get' | 'replace' | 'findMany' | 'update' | 'updateMany';
12
16
  key?: any;