leoric 2.12.0 → 2.12.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.
@@ -2,7 +2,7 @@ import {
2
2
  Attributes, Literal, WhereConditions,
3
3
  BoneOptions, ResultSet, Raw,
4
4
  SetOptions, BeforeHooksType, AfterHooksType,
5
- QueryOptions, OrderOptions, QueryResult, Values as CommonValues, BoneColumns, InstanceColumns, BoneCreateValues,
5
+ QueryOptions, OrderOptions, QueryResult, Values as CommonValues, BoneColumns, InstanceColumns, BoneCreateValues, Collection,
6
6
  } from '../types/common';
7
7
  import { AbstractBone } from '../types/abstract_bone';
8
8
  import { Spell } from '../spell';
@@ -54,11 +54,6 @@ type ScopeOptions = {
54
54
 
55
55
  type aggregators = 'count' | 'COUNT' | 'average' | 'AVERAGE' | 'minimum' | 'MINIMUM' | 'maximum' | 'MAXIMUM' | 'sum' | 'SUM';
56
56
 
57
- export class Collection<T extends SequelizeBone> extends Array<T> {
58
- save(): Promise<void>;
59
- toJSON(): object[];
60
- toObject(): object[];
61
- }
62
57
 
63
58
  export class SequelizeBone extends AbstractBone {
64
59
 
package/dist/bone.d.ts CHANGED
@@ -13,7 +13,7 @@ export default class Bone extends AbstractBone {
13
13
  static find<T extends typeof Bone>(this: T, whereConditions: WhereConditions<T>): Spell<T, Collection<InstanceType<T>>>;
14
14
  static find<T extends typeof Bone>(this: T, whereConditions: string, ...values: Literal[]): Spell<T, Collection<InstanceType<T>>>;
15
15
  static find<T extends typeof Bone>(this: T, primaryKey: number | number[] | bigint): Spell<T, Collection<InstanceType<T>>>;
16
- static find<T extends typeof Bone>(this: T, ): Spell<T, Collection<InstanceType<T>>>;
16
+ static find<T extends typeof Bone>(this: T): Spell<T, Collection<InstanceType<T>>>;
17
17
 
18
18
  /**
19
19
  * SELECT rows LIMIT 1. Besides limiting the results to one rows, the type of the return value is different from {@link Bone.find} too. If no results were found, {@link Bone.findOne} returns null. If results were found, it returns the found record instead of wrapping them as a collection.
@@ -24,7 +24,7 @@ export default class Bone extends AbstractBone {
24
24
  static findOne<T extends typeof Bone>(this: T, whereConditions: WhereConditions<T>): Spell<T, InstanceType<T> | null>;
25
25
  static findOne<T extends typeof Bone>(this: T, whereConditions: string, ...values: Literal[]): Spell<T, InstanceType<T> | null>;
26
26
  static findOne<T extends typeof Bone>(this: T, primaryKey: number | number[] | bigint): Spell<T, InstanceType<T> | null>;
27
- static findOne<T extends typeof Bone>(this: T, ): Spell<T, InstanceType<T> | null>;
27
+ static findOne<T extends typeof Bone>(this: T): Spell<T, InstanceType<T> | null>;
28
28
 
29
29
  static sum<T extends typeof Bone>(this: T, name?: BoneColumns<T>): Spell<T, ResultSet<T> | number>;
30
30
  static sum<T extends typeof Bone>(this: T, name?: Raw): Spell<T, ResultSet<T> | number>;
@@ -1 +1 @@
1
- {"version":3,"file":"sqljs-connection.js","sourceRoot":"","sources":["../../../src/drivers/sqljs/sqljs-connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sqljs-connection.js","sourceRoot":"","sources":["../../../src/drivers/sqljs/sqljs-connection.ts"],"names":[],"mappings":"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"}
package/dist/expr.js CHANGED
@@ -131,6 +131,19 @@ var PRECEDENCES = [
131
131
  ['xor'],
132
132
  ['or']
133
133
  ];
134
+ var RETURNING_TYPES = [
135
+ 'float',
136
+ 'double',
137
+ 'decimal',
138
+ 'signed',
139
+ 'unsigned',
140
+ 'date',
141
+ 'time',
142
+ 'datetime',
143
+ 'year',
144
+ 'char',
145
+ 'json',
146
+ ];
134
147
  /**
135
148
  * Compare the precedence of two operators. Operators with lower indices have higher priorities.
136
149
  * @example
@@ -210,7 +223,57 @@ function parseExprList(str) {
210
223
  next();
211
224
  return { type: 'literal', value: value };
212
225
  }
226
+ function dataType() {
227
+ var value = '';
228
+ while (chr && /[a-z0-9$_.]/i.test(chr)) {
229
+ value += chr;
230
+ next();
231
+ }
232
+ value = value.toLowerCase();
233
+ if (!RETURNING_TYPES.includes(value)) {
234
+ throw new Error("Unexpected RETURNING type of JSON_VALUE(): ".concat(value));
235
+ }
236
+ if (chr === '(') {
237
+ var length = '';
238
+ next();
239
+ while (chr && chr !== ')') {
240
+ length += chr;
241
+ next();
242
+ }
243
+ next();
244
+ return { type: 'dataType', value: value, length: length };
245
+ }
246
+ return { type: 'dataType', value: value };
247
+ }
248
+ // JSON_VALUE(json_doc, path [RETURNING type] [on_empty] [on_error])\
249
+ // JSON_VALUE(j, '$.id' RETURNING UNSIGNED)
250
+ function jsonValue(name) {
251
+ var args = [];
252
+ next();
253
+ args.push(expr());
254
+ next();
255
+ space();
256
+ args.push(string());
257
+ space();
258
+ var result = { type: 'func', name: name, args: args };
259
+ while (chr && chr !== ')') {
260
+ var value = '';
261
+ while (chr && /[a-z0-9$_.]/i.test(chr)) {
262
+ value += chr;
263
+ next();
264
+ }
265
+ if (value.toLowerCase() === 'returning') {
266
+ space();
267
+ result.dataType = dataType();
268
+ }
269
+ }
270
+ // the trailing ')'
271
+ next();
272
+ return result;
273
+ }
213
274
  function func(name) {
275
+ if (name === 'json_value')
276
+ return jsonValue(name);
214
277
  var args = [];
215
278
  do {
216
279
  next();
package/dist/expr.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expr.js","sourceRoot":"","sources":["../src/expr.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expr.js","sourceRoot":"","sources":["../src/expr.js"],"names":[],"mappings":"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"}
@@ -70,14 +70,25 @@ function formatIdentifier(spell, ast) {
70
70
  }
71
71
  return escapeId(column);
72
72
  }
73
+ function formatDataType(spell, ast) {
74
+ var value = ast.value, length = ast.length;
75
+ if (length)
76
+ return "".concat(value.toUpperCase(), "(").concat(length, ")");
77
+ return value.toUpperCase();
78
+ }
73
79
  var extractFieldNames = ['year', 'month', 'day'];
74
80
  function formatFuncExpr(spell, ast) {
75
- var name = ast.name, args = ast.args;
81
+ var name = ast.name, args = ast.args, dataType = ast.dataType;
76
82
  var type = spell.Model.driver.type;
77
83
  // https://www.postgresql.org/docs/9.1/static/functions-datetime.html
78
84
  if (type === 'postgres' && extractFieldNames.includes(name)) {
79
85
  return "EXTRACT(".concat(name.toUpperCase(), " FROM ").concat(args.map(function (arg) { return formatExpr(spell, arg); }).join(', '), ")");
80
86
  }
87
+ // https://dev.mysql.com/doc/refman/8.0/en/json-search-functions.html#function_json-value
88
+ // https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-21.html#mysqld-8-0-21-json
89
+ if (name === 'json_value' && dataType) {
90
+ return "".concat(name.toUpperCase(), "(").concat(args.map(function (arg) { return formatExpr(spell, arg); }).join(', '), " RETURNING ").concat(formatDataType(spell, dataType), ")");
91
+ }
81
92
  return "".concat(name.toUpperCase(), "(").concat(args.map(function (arg) { return formatExpr(spell, arg); }).join(', '), ")");
82
93
  }
83
94
  function formatLiteral(spell, ast) {
@@ -1 +1 @@
1
- {"version":3,"file":"expr_formatter.js","sourceRoot":"","sources":["../src/expr_formatter.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEP,IAAA,KAAyB,OAAO,CAAC,QAAQ,CAAC,EAAxC,QAAQ,cAAA,EAAE,QAAQ,cAAsB,CAAC;AACzC,IAAA,WAAW,GAAK,OAAO,CAAC,aAAa,CAAC,YAA3B,CAA4B;AAE/C;;;;;;;;GAQG;AACH,SAAS,SAAS,CAAC,KAAK,EAAE,UAAU;IAClC,IAAM,SAAS,GAAG,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9C,IAAM,KAAK,GAAG,SAAS,IAAI,SAAS,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU;QAC5D,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/E,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IAChB,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAyB,UAAU,CAAE,CAAC,CAAC;IACnE,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,KAAK,EAAE,GAAG;IAC1B,IAAA,KAAK,GAAiB,GAAG,MAApB,EAAE,UAAU,GAAK,GAAG,WAAR,CAAS;IAClC,IAAM,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC3C,IAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5B,IAAA,QAAQ,GAAK,KAAK,CAAC,KAAK,CAAC,MAAM,SAAvB,CAAwB;IAExC,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACvC,OAAO,UAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,cAAI,QAAQ,CAAC,MAAM,CAAC,CAAE,CAAC;KACpE;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC;AAED,IAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AAEnD,SAAS,cAAc,CAAC,KAAK,EAAE,GAAG;IACxB,IAAA,IAAI,GAAW,GAAG,KAAd,EAAE,IAAI,GAAK,GAAG,KAAR,CAAS;IACnB,IAAA,IAAI,GAAK,KAAK,CAAC,KAAK,CAAC,MAAM,KAAvB,CAAwB;IAEpC,qEAAqE;IACrE,IAAI,IAAI,KAAK,UAAU,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC3D,OAAO,kBAAW,IAAI,CAAC,WAAW,EAAE,mBAAS,IAAI,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,EAAtB,CAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC;KACpG;IAED,OAAO,UAAG,IAAI,CAAC,WAAW,EAAE,cAAI,IAAI,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,EAAtB,CAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC;AACxF,CAAC;AAED,SAAS,aAAa,CAAC,KAAK,EAAE,GAAG;IACvB,IAAA,KAAK,GAAK,GAAG,MAAR,CAAS;IAEtB,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,MAAM,CAAC;IAEjC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,WAAI,KAAK,CAAC,GAAG,CAAC,cAAM,OAAA,GAAG,EAAH,CAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC;QAChE,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,KAAK,EAAE,GAAG;IAC1B,IAAA,IAAI,GAAiB,GAAG,KAApB,EAAE,IAAI,GAAW,GAAG,KAAd,EAAE,IAAI,GAAK,GAAG,KAAR,CAAS;IACjC,QAAQ,IAAI,EAAE;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,UAAU,CAAC;QAChB,KAAK,KAAK,CAAC;QACX,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,IAAI;YACP,OAAO,KAAK,CAAC;QACf,KAAK,OAAO;YACV,OAAO,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,KAAK,MAAM;YACT,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC;YACE,MAAM,IAAI,KAAK,CAAC,0BAAmB,IAAI,CAAE,CAAC,CAAC;KAC9C;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,UAAU,CAAC,KAAK,EAAE,GAAG;IACpB,IAAA,IAAI,GAAwB,GAAG,KAA3B,EAAE,IAAI,GAAkB,GAAG,KAArB,EAAE,KAAK,GAAW,GAAG,MAAd,EAAE,IAAI,GAAK,GAAG,KAAR,CAAS;IACxC,QAAQ,IAAI,EAAE;QACZ,KAAK,SAAS;YACZ,OAAO,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACnC,KAAK,UAAU;YACb,OAAO,WAAI,KAAK,CAAC,WAAW,EAAE,MAAG,CAAC;QACpC,KAAK,UAAU;YACb,OAAO,GAAG,CAAC;QACb,KAAK,OAAO;YACV,OAAO,UAAG,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAO,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAE,CAAC;QAC5E,KAAK,KAAK;YACR,OAAO,UAAG,IAAI,CAAC,WAAW,EAAE,cAAI,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;QAC/D,KAAK,IAAI;YACP,OAAO,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACtC,KAAK,IAAI;YACP,OAAO,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClC,KAAK,MAAM;YACT,OAAO,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACpC,KAAK,KAAK;YACR,wBAAwB;YACxB,OAAO,KAAK,CAAC;QACf;YACE,MAAM,IAAI,KAAK,CAAC,0BAAmB,IAAI,CAAE,CAAC,CAAC;KAC9C;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,EAAc;QAAZ,IAAI,UAAA,EAAE,IAAI,UAAA;IAC/B,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC7D,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,KAAK,EAAE,GAAG;IACtB,IAAA,IAAI,GAAW,GAAG,KAAd,EAAE,IAAI,GAAK,GAAG,KAAR,CAAS;IAC3B,IAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,UAAA,GAAG;QACzB,OAAO,WAAW,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;YACzE,CAAC,CAAC,WAAI,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,MAAG;YAC/B,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,IAAI,IAAI,IAAI,SAAS,IAAI,IAAI,IAAI,aAAa,EAAE;QAC9C,OAAO,UAAG,MAAM,CAAC,CAAC,CAAC,cAAI,IAAI,CAAC,WAAW,EAAE,cAAI,MAAM,CAAC,CAAC,CAAC,kBAAQ,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC;KAC3E;IAED,IAAI,IAAI,IAAI,KAAK;QAAE,OAAO,cAAO,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC;IAE7C,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,UAAG,IAAI,cAAI,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC;IAE9E,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;QAC3E,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,2BAAoB,IAAI,kBAAe,CAAC,CAAC;SAC1D;QACD,OAAO,UAAG,MAAM,CAAC,CAAC,CAAC,cAAI,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,UAAO,CAAC;KAC9D;IAED,eAAe;IACf,uCAAuC;IACvC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,UAAU,EAAE;QAC7F,IAAI,EAAE,GAAG,IAAI,CAAC;QACd,IAAI,IAAI,IAAI,GAAG,EAAE;YACf,EAAE,GAAG,IAAI,CAAC;SACX;aAAM,IAAI,IAAI,IAAI,IAAI,EAAE;YACvB,EAAE,GAAG,QAAQ,CAAC;SACf;QACD,IAAI,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,2BAAoB,IAAI,sBAAY,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAE,CAAC,CAAC;SACtE;QACD,OAAO,UAAG,MAAM,CAAC,CAAC,CAAC,cAAI,EAAE,CAAC,WAAW,EAAE,cAAI,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC;KACxD;IAED,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;QACpB,OAAO,UAAG,MAAM,CAAC,CAAC,CAAC,cAAI,IAAI,CAAC,WAAW,EAAE,cAAI,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC;KAC1D;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,KAAK,EAAE,UAAU;IACzC,OAAO,UAAU;SACd,GAAG,CAAC,UAAA,SAAS;QACZ,OAAO,WAAW,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;YAC9E,CAAC,CAAC,WAAI,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,MAAG;YACrC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACnC,CAAC,CAAC;QACF,yBAAyB;SACxB,MAAM,CAAC,UAAC,SAAS,IAAK,OAAA,CAAC,CAAC,SAAS,EAAX,CAAW,CAAC;SAClC,IAAI,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM;IACxC,QAAQ,CAAC,GAAG,EAAE,UAAS,GAAG;QAChB,IAAA,IAAI,GAAY,GAAG,KAAf,EAAE,KAAK,GAAK,GAAG,MAAR,CAAS;QAE5B,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YACtC,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SAC3B;aAAM,IAAI,IAAI,IAAI,SAAS,IAAI,KAAK,IAAI,IAAI,EAAE;YAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,MAAM,CAAC,IAAI,OAAX,MAAM,2BAAS,KAAK,WAAE;aACvB;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACpB;SACF;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,KAAK,EAAE,GAAG;;IACvB,IAAA,IAAI,GAAK,GAAG,KAAR,CAAS;IACrB,IAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAEzB,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO;IAEnC,IAAM,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IACpD,IAAM,SAAS,GAAG,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5D,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,IAAI,SAAS,CAAC,OAAO,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,0CAAmC,SAAS,CAAC,IAAI,uBAAa,KAAK,CAAC,IAAI,CAAE,CAAC,CAAC;KAC7F;;QAED,KAAkB,IAAA,KAAA,SAAA,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA,gBAAA,4BAAE;YAA5B,IAAM,GAAG,WAAA;YACZ,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC1B,iCAAiC;gBACjC,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;oBAAE,SAAS;gBACzE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;aAChD;SACF;;;;;;;;;AACH,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,UAAU,YAAA,EAAE,gBAAgB,kBAAA,EAAE,cAAc,gBAAA,EAAE,gBAAgB,kBAAA,EAAE,CAAC"}
1
+ {"version":3,"file":"expr_formatter.js","sourceRoot":"","sources":["../src/expr_formatter.js"],"names":[],"mappings":"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"}
package/dist/hint.d.ts CHANGED
@@ -68,7 +68,7 @@ export class IndexHint {
68
68
  * })
69
69
  */
70
70
  static build(hint: string | Array<string> | HintInterface, type?: INDEX_HINT_TYPE, scope?: INDEX_HINT_SCOPE): IndexHint;
71
-
71
+
72
72
  /**
73
73
  * Creates an instance of IndexHint.
74
74
  * @param {Array<string> | string} index
@@ -77,7 +77,7 @@ export class IndexHint {
77
77
  * @memberof IndexHint
78
78
  */
79
79
  constructor(index: string, type?: INDEX_HINT_TYPE, scope?: INDEX_HINT_SCOPE);
80
-
80
+
81
81
  set index(values: string | Array<string>);
82
82
 
83
83
  get index(): Array<string>;
@@ -110,5 +110,5 @@ export class IndexHint {
110
110
  }
111
111
 
112
112
  export type CommonHintsArgs = string | HintInterface | Hint | IndexHint | {
113
- [key in INDEX_HINT_SCOPE_TYPE]?: string | Array<string>
113
+ [key in INDEX_HINT_SCOPE_TYPE]?: string | Array<string>
114
114
  };
package/dist/index.d.ts CHANGED
@@ -1,30 +1,21 @@
1
1
  import DataTypes, { DataType, AbstractDataType, LENGTH_VARIANTS } from './data_types';
2
- import {
3
- Hint, IndexHint, HintInterface,
4
- INDEX_HINT_SCOPE_TYPE, INDEX_HINT_SCOPE, INDEX_HINT_TYPE
5
- } from './hint';
6
- import {
7
- Literal, Validator,
8
- Connection, QueryOptions, WhereConditions,
9
- Raw, ColumnMeta, AttributeMeta,
10
- BeforeHooksType, AfterHooksType, Collection,
11
- GeneratorReturnType, Values, BoneCreateValues, BoneInstanceValues,
12
- } from './types/common';
13
- import { SpellMeta, Spell, SpellBookFormatResult } from './spell';
14
2
  import Bone from './bone';
15
3
  import { ConnectOptions, AbstractDriver } from './drivers';
4
+ import { QueryOptions, GeneratorReturnType, AttributeMeta, Connection, Literal, ColumnMeta, AfterHooksType, BeforeHooksType } from './types/common';
5
+ import Raw from './raw';
16
6
 
17
7
  export {
18
8
  LENGTH_VARIANTS as LENGTH_VARIANTS,
19
- DataTypes, Literal, Validator, Connection, WhereConditions,
20
- Hint, IndexHint, HintInterface, INDEX_HINT_SCOPE_TYPE, INDEX_HINT_SCOPE, INDEX_HINT_TYPE,
21
- Bone, Raw, Collection,
22
- SpellMeta, Spell, ColumnMeta, AttributeMeta, SpellBookFormatResult, Values, BoneCreateValues, BoneInstanceValues,
9
+ DataTypes, Bone
23
10
  };
24
11
 
25
12
  export * from './decorators';
26
13
  export * from './drivers';
27
14
  export * from './adapters/sequelize';
15
+ export * from './hint';
16
+ export * from './types/common';
17
+ export * from './spell';
18
+ export { hookNames } from './setup_hooks';
28
19
 
29
20
  interface InitOptions {
30
21
  underscored?: boolean;
package/dist/index.js CHANGED
@@ -85,6 +85,7 @@ var Decorators = require('./decorators');
85
85
  var Raw = require('./raw').default;
86
86
  var _b = require('./drivers'), MysqlDriver = _b.MysqlDriver, PostgresDriver = _b.PostgresDriver, SqliteDriver = _b.SqliteDriver, SqljsDriver = _b.SqljsDriver, AbstractDriver = _b.AbstractDriver;
87
87
  var isBone = require('./utils').isBone;
88
+ var hookNames = require('./setup_hooks').hookNames;
88
89
  /**
89
90
  * @typedef {Object} RawSql
90
91
  * @property {boolean} __raw
@@ -135,6 +136,6 @@ var disconnect = function disconnect(realm) {
135
136
  });
136
137
  };
137
138
  Object.assign(Realm.prototype, migrations, { DataTypes: DataTypes });
138
- Object.assign(Realm, __assign(__assign(__assign({ default: Realm, connect: connect, disconnect: disconnect, Bone: Bone, Collection: Collection, DataTypes: DataTypes, Logger: Logger, Spell: Spell, sequelize: sequelize, heresql: heresql }, Hint), Decorators), { MysqlDriver: MysqlDriver, PostgresDriver: PostgresDriver, SqliteDriver: SqliteDriver, SqljsDriver: SqljsDriver, AbstractDriver: AbstractDriver, Raw: Raw, LENGTH_VARIANTS: LENGTH_VARIANTS, isBone: isBone }));
139
+ Object.assign(Realm, __assign(__assign(__assign({ default: Realm, connect: connect, disconnect: disconnect, Bone: Bone, Collection: Collection, DataTypes: DataTypes, Logger: Logger, Spell: Spell, sequelize: sequelize, heresql: heresql }, Hint), Decorators), { MysqlDriver: MysqlDriver, PostgresDriver: PostgresDriver, SqliteDriver: SqliteDriver, SqljsDriver: SqljsDriver, AbstractDriver: AbstractDriver, Raw: Raw, LENGTH_VARIANTS: LENGTH_VARIANTS, isBone: isBone, hookNames: hookNames }));
139
140
  module.exports = Realm;
140
141
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGb,IAAM,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACpD,IAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,IAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,IAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACrC,IAAA,KAA4C,OAAO,CAAC,cAAc,CAAC,EAAtD,SAAS,eAAA,EAAE,eAAe,qBAA4B,CAAC;AAC1E,IAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,IAAM,SAAS,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAC1C,IAAA,OAAO,GAAK,OAAO,CAAC,gBAAgB,CAAC,QAA9B,CAA+B;AAC9C,IAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,IAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,IAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,IAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AAC/B,IAAA,KAA6E,OAAO,CAAC,WAAW,CAAC,EAA/F,WAAW,iBAAA,EAAE,cAAc,oBAAA,EAAE,YAAY,kBAAA,EAAE,WAAW,iBAAA,EAAE,cAAc,oBAAyB,CAAC;AAChG,IAAA,MAAM,GAAK,OAAO,CAAC,SAAS,CAAC,OAAvB,CAAwB;AAEtC;;;;;GAKG;AAGH;;;;;;;GAOG;AACH,IAAM,OAAO,GAAG,SAAe,OAAO,CAAC,IAAI;;;;;;oBACzC,IAAI,cAAK,IAAI,MAAA,IAAK,IAAI,CAAE,CAAC;oBACzB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;wBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;oBACrD,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9B,qBAAM,KAAK,CAAC,OAAO,EAAE,EAAA;;oBAArB,SAAqB,CAAC;oBACtB,sBAAO,KAAK,EAAC;;;;CACd,CAAC;AAEF,IAAM,UAAU,GAAG,SAAe,UAAU,CAAC,KAAK;IAAE,cAAO;SAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;QAAP,6BAAO;;;;;;yBACrD,CAAA,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,SAAS,CAAA,EAAzC,wBAAyC;oBACpC,qBAAM,KAAK,CAAC,UAAU,OAAhB,KAAK,2BAAe,IAAI,YAAC;wBAAtC,sBAAO,SAA+B,EAAC;;;;;CAE1C,CAAC;AAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,SAAS,WAAA,EAAE,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,+BACjB,OAAO,EAAE,KAAK,EACd,OAAO,SAAA,EACP,UAAU,YAAA,EACV,IAAI,MAAA,EACJ,UAAU,YAAA,EACV,SAAS,WAAA,EACT,MAAM,QAAA,EACN,KAAK,OAAA,EACL,SAAS,WAAA,EACT,OAAO,SAAA,IACJ,IAAI,GACJ,UAAU,KACb,WAAW,aAAA,EACX,cAAc,gBAAA,EACd,YAAY,cAAA,EACZ,WAAW,aAAA,EACX,cAAc,gBAAA,EACd,GAAG,KAAA,EACH,eAAe,iBAAA,EACf,MAAM,QAAA,IACN,CAAC;AAEH,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGb,IAAM,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACpD,IAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,IAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,IAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AACrC,IAAA,KAA4C,OAAO,CAAC,cAAc,CAAC,EAAtD,SAAS,eAAA,EAAE,eAAe,qBAA4B,CAAC;AAC1E,IAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,IAAM,SAAS,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAC1C,IAAA,OAAO,GAAK,OAAO,CAAC,gBAAgB,CAAC,QAA9B,CAA+B;AAC9C,IAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,IAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,IAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,IAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AAC/B,IAAA,KAA6E,OAAO,CAAC,WAAW,CAAC,EAA/F,WAAW,iBAAA,EAAE,cAAc,oBAAA,EAAE,YAAY,kBAAA,EAAE,WAAW,iBAAA,EAAE,cAAc,oBAAyB,CAAC;AAChG,IAAA,MAAM,GAAK,OAAO,CAAC,SAAS,CAAC,OAAvB,CAAwB;AAC9B,IAAA,SAAS,GAAK,OAAO,CAAC,eAAe,CAAC,UAA7B,CAA8B;AAE/C;;;;;GAKG;AAGH;;;;;;;GAOG;AACH,IAAM,OAAO,GAAG,SAAe,OAAO,CAAC,IAAI;;;;;;oBACzC,IAAI,cAAK,IAAI,MAAA,IAAK,IAAI,CAAE,CAAC;oBACzB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;wBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;oBACrD,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9B,qBAAM,KAAK,CAAC,OAAO,EAAE,EAAA;;oBAArB,SAAqB,CAAC;oBACtB,sBAAO,KAAK,EAAC;;;;CACd,CAAC;AAEF,IAAM,UAAU,GAAG,SAAe,UAAU,CAAC,KAAK;IAAE,cAAO;SAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;QAAP,6BAAO;;;;;;yBACrD,CAAA,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,SAAS,CAAA,EAAzC,wBAAyC;oBACpC,qBAAM,KAAK,CAAC,UAAU,OAAhB,KAAK,2BAAe,IAAI,YAAC;wBAAtC,sBAAO,SAA+B,EAAC;;;;;CAE1C,CAAC;AAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,SAAS,WAAA,EAAE,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,+BACjB,OAAO,EAAE,KAAK,EACd,OAAO,SAAA,EACP,UAAU,YAAA,EACV,IAAI,MAAA,EACJ,UAAU,YAAA,EACV,SAAS,WAAA,EACT,MAAM,QAAA,EACN,KAAK,OAAA,EACL,SAAS,WAAA,EACT,OAAO,SAAA,IACJ,IAAI,GACJ,UAAU,KACb,WAAW,aAAA,EACX,cAAc,gBAAA,EACd,YAAY,cAAA,EACZ,WAAW,aAAA,EACX,cAAc,gBAAA,EACd,GAAG,KAAA,EACH,eAAe,iBAAA,EACf,MAAM,QAAA,EACN,SAAS,WAAA,IACT,CAAC;AAEH,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC"}
package/dist/raw.js CHANGED
@@ -16,5 +16,4 @@ var Raw = /** @class */ (function () {
16
16
  return Raw;
17
17
  }());
18
18
  export default Raw;
19
- ;
20
19
  //# sourceMappingURL=raw.js.map
package/dist/raw.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"raw.js","sourceRoot":"","sources":["../src/raw.ts"],"names":[],"mappings":"AAAA;IAME,aAAY,KAAa;QAHzB,gCAAgC;QAChC,SAAI,GAAW,KAAK,CAAC;QAGnB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,sBAAQ,GAAR;QACE,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,SAAK,GAAZ,UAAa,KAAa;QACxB,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IACH,UAAC;AAAD,CAAC,AApBD,IAoBC;;AAAA,CAAC"}
1
+ {"version":3,"file":"raw.js","sourceRoot":"","sources":["../src/raw.ts"],"names":[],"mappings":"AAAA;IAME,aAAY,KAAa;QAHzB,gCAAgC;QAChC,SAAI,GAAG,KAAK,CAAC;QAGX,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,sBAAQ,GAAR;QACE,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,SAAK,GAAZ,UAAa,KAAa;QACxB,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IACH,UAAC;AAAD,CAAC,AApBD,IAoBC"}
@@ -6,7 +6,7 @@ import { AbstractBone } from './abstract_bone';
6
6
  export type Literal = null | undefined | boolean | number | bigint | string | Date | Record<string, any> | ArrayBuffer;
7
7
 
8
8
  // eslint-disable-next-line @typescript-eslint/ban-types
9
- type BaseValidateArgs = boolean | RegExp | Function | Array<Array<Literal>> | string | Array<Literal>;
9
+ type BaseValidateArgs = boolean | RegExp | Function | Array<Array<Literal>> | string | Array<Literal> | number;
10
10
 
11
11
  export type Validator = BaseValidateArgs | {
12
12
  args?: BaseValidateArgs,
@@ -2,7 +2,7 @@ import {
2
2
  Attributes, Literal, WhereConditions,
3
3
  BoneOptions, ResultSet, Raw,
4
4
  SetOptions, BeforeHooksType, AfterHooksType,
5
- QueryOptions, OrderOptions, QueryResult, Values as CommonValues, BoneColumns, InstanceColumns, BoneCreateValues,
5
+ QueryOptions, OrderOptions, QueryResult, Values as CommonValues, BoneColumns, InstanceColumns, BoneCreateValues, Collection,
6
6
  } from '../types/common';
7
7
  import { AbstractBone } from '../types/abstract_bone';
8
8
  import { Spell } from '../spell';
@@ -54,11 +54,6 @@ type ScopeOptions = {
54
54
 
55
55
  type aggregators = 'count' | 'COUNT' | 'average' | 'AVERAGE' | 'minimum' | 'MINIMUM' | 'maximum' | 'MAXIMUM' | 'sum' | 'SUM';
56
56
 
57
- export class Collection<T extends SequelizeBone> extends Array<T> {
58
- save(): Promise<void>;
59
- toJSON(): object[];
60
- toObject(): object[];
61
- }
62
57
 
63
58
  export class SequelizeBone extends AbstractBone {
64
59
 
package/lib/bone.d.ts CHANGED
@@ -13,7 +13,7 @@ export default class Bone extends AbstractBone {
13
13
  static find<T extends typeof Bone>(this: T, whereConditions: WhereConditions<T>): Spell<T, Collection<InstanceType<T>>>;
14
14
  static find<T extends typeof Bone>(this: T, whereConditions: string, ...values: Literal[]): Spell<T, Collection<InstanceType<T>>>;
15
15
  static find<T extends typeof Bone>(this: T, primaryKey: number | number[] | bigint): Spell<T, Collection<InstanceType<T>>>;
16
- static find<T extends typeof Bone>(this: T, ): Spell<T, Collection<InstanceType<T>>>;
16
+ static find<T extends typeof Bone>(this: T): Spell<T, Collection<InstanceType<T>>>;
17
17
 
18
18
  /**
19
19
  * SELECT rows LIMIT 1. Besides limiting the results to one rows, the type of the return value is different from {@link Bone.find} too. If no results were found, {@link Bone.findOne} returns null. If results were found, it returns the found record instead of wrapping them as a collection.
@@ -24,7 +24,7 @@ export default class Bone extends AbstractBone {
24
24
  static findOne<T extends typeof Bone>(this: T, whereConditions: WhereConditions<T>): Spell<T, InstanceType<T> | null>;
25
25
  static findOne<T extends typeof Bone>(this: T, whereConditions: string, ...values: Literal[]): Spell<T, InstanceType<T> | null>;
26
26
  static findOne<T extends typeof Bone>(this: T, primaryKey: number | number[] | bigint): Spell<T, InstanceType<T> | null>;
27
- static findOne<T extends typeof Bone>(this: T, ): Spell<T, InstanceType<T> | null>;
27
+ static findOne<T extends typeof Bone>(this: T): Spell<T, InstanceType<T> | null>;
28
28
 
29
29
  static sum<T extends typeof Bone>(this: T, name?: BoneColumns<T>): Spell<T, ResultSet<T> | number>;
30
30
  static sum<T extends typeof Bone>(this: T, name?: Raw): Spell<T, ResultSet<T> | number>;
@@ -74,6 +74,7 @@ function nest(rows, fields, spell) {
74
74
  return { rows: results, fields };
75
75
  }
76
76
  async function defaultInitSqlJs(options) {
77
+ // sql.js don't compatible with nodejs 14
77
78
  const { default: initSqlJs } = await Promise.resolve().then(() => __importStar(require('sql.js')));
78
79
  const SQL = await initSqlJs();
79
80
  const { data = null } = options;
@@ -1 +1 @@
1
- {"version":3,"file":"sqljs-connection.js","sourceRoot":"","sources":["../../../src/drivers/sqljs/sqljs-connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sqljs-connection.js","sourceRoot":"","sources":["../../../src/drivers/sqljs/sqljs-connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAMA;;GAEG;AACH,SAAS,WAAW,CAAC,MAAuB;IAC1C,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAE3B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAEnC,OAAO;QACL,MAAM,EAAE,OAAO;QACf,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAA6B,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;gBAClE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC,CAAC;KACH,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,GAAsB;IAC7C,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE;QACZ,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,OAAO,YAAY,CAAC;KACrB;IACD,MAAM;IACN,OAAO;QACL,IAAI,EAAE,EAAE;QACR,MAAM,EAAE,EAAE;KACX,CAAC;AACJ,CAAC;AAED,qCAAqC;AACrC,gCAAgC;AAChC,SAAS,IAAI,CAAC,IAA+B,EAAE,MAAgB,EAAE,KAAgB;IAC/E,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACxB,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,OAAO,GAAU,EAAE,CAAC;IAE1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,MAAM,GAA4C,EAAE,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACrB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,SAAS;gBACnC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YACpE,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1D,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;SACxB;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACtB;IAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AACnC,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,OAA+B;IAC7D,yCAAyC;IACzC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,wDAAa,QAAQ,GAAC,CAAC;IACtD,MAAM,GAAG,GAAG,MAAM,SAAS,EAAE,CAAC;IAE9B,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAExC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAa,eAAe;IAC1B,YAAoB,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;QAE3C,aAAQ,GAAyB,SAAS,CAAC;IAFG,CAAC;IAIvD,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,SAAS,GAAG,gBAAgB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEtD,oBAAoB;QACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,OAAO;IACT,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YACxC,OAAO,IAAI,CAAC;SACb;QAED,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAoD,EAAE,MAAyB,EAAE,KAAiB;QAC5G,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,OAAO,KAAK,KAAK,QAAQ;YACnD,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE;YACnC,CAAC,CAAC,KAAK,CAAC;QAEV,IAAI,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACnD,IAAI,UAAU,IAAI,KAAK;gBAAE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACxE,OAAO,MAAM,CAAC;SACf;QAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAsB,EAAE,MAAyB;QAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEjC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;QAErD,sBAAsB;QACtB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAC7C,uCAAuC,CACxC,CAAC;QACF,MAAM,MAAM,GAAG,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;QACnD,OAAO;YACL,QAAQ,EAAE,MAAM;YAChB,YAAY;SACb,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAsB,EAAE,MAAyB;QACjE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;CACF;AAzED,0CAyEC"}
package/lib/expr.js CHANGED
@@ -84,6 +84,19 @@ const PRECEDENCES = [
84
84
  ['xor'],
85
85
  ['or']
86
86
  ];
87
+ const RETURNING_TYPES = [
88
+ 'float',
89
+ 'double',
90
+ 'decimal',
91
+ 'signed',
92
+ 'unsigned',
93
+ 'date',
94
+ 'time',
95
+ 'datetime',
96
+ 'year',
97
+ 'char',
98
+ 'json',
99
+ ];
87
100
  /**
88
101
  * Compare the precedence of two operators. Operators with lower indices have higher priorities.
89
102
  * @example
@@ -148,7 +161,57 @@ function parseExprList(str, ...values) {
148
161
  next();
149
162
  return { type: 'literal', value };
150
163
  }
164
+ function dataType() {
165
+ let value = '';
166
+ while (chr && /[a-z0-9$_.]/i.test(chr)) {
167
+ value += chr;
168
+ next();
169
+ }
170
+ value = value.toLowerCase();
171
+ if (!RETURNING_TYPES.includes(value)) {
172
+ throw new Error(`Unexpected RETURNING type of JSON_VALUE(): ${value}`);
173
+ }
174
+ if (chr === '(') {
175
+ let length = '';
176
+ next();
177
+ while (chr && chr !== ')') {
178
+ length += chr;
179
+ next();
180
+ }
181
+ next();
182
+ return { type: 'dataType', value, length };
183
+ }
184
+ return { type: 'dataType', value };
185
+ }
186
+ // JSON_VALUE(json_doc, path [RETURNING type] [on_empty] [on_error])\
187
+ // JSON_VALUE(j, '$.id' RETURNING UNSIGNED)
188
+ function jsonValue(name) {
189
+ const args = [];
190
+ next();
191
+ args.push(expr());
192
+ next();
193
+ space();
194
+ args.push(string());
195
+ space();
196
+ const result = { type: 'func', name, args };
197
+ while (chr && chr !== ')') {
198
+ let value = '';
199
+ while (chr && /[a-z0-9$_.]/i.test(chr)) {
200
+ value += chr;
201
+ next();
202
+ }
203
+ if (value.toLowerCase() === 'returning') {
204
+ space();
205
+ result.dataType = dataType();
206
+ }
207
+ }
208
+ // the trailing ')'
209
+ next();
210
+ return result;
211
+ }
151
212
  function func(name) {
213
+ if (name === 'json_value')
214
+ return jsonValue(name);
152
215
  const args = [];
153
216
  do {
154
217
  next();
package/lib/expr.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"expr.js","sourceRoot":"","sources":["../src/expr.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AAErC;;;;;;;GAOG;AAEH;;;GAGG;AACH,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;CACrB,CAAC;AAEF;;;GAGG;AACH,MAAM,gBAAgB,GAAG;IACvB,KAAK,EAAE,IAAI;IACX,IAAI;IACJ,GAAG;IACH,GAAG;IACH,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,QAAQ;IACR,GAAG;IACH,IAAI;IACJ,MAAM;IACN,GAAG;IACH,GAAG;IACH,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,IAAI;IACV,QAAQ;IACR,UAAU;IACV,IAAI,EAAE,IAAI;IACV,KAAK;IACL,GAAG;IACH,GAAG;IACH,GAAG;CACJ,CAAC;AAEF;;;GAGG;AACH,MAAM,iBAAiB,GAAG;IACxB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK;CAC1B,CAAC;AAEF,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,eAAe,EAAE,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CACxG,CAAC;AAEF;;;GAGG;AACH,MAAM,kBAAkB,GAAG;IACzB,IAAI,EAAE,GAAG;IACT,QAAQ,EAAE,IAAI;IACd,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,GAAG;CACX,CAAC;AAEF;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,CAAC;AAE/B;;;;GAIG;AACH,MAAM,WAAW,GAAG;IAClB,CAAC,GAAG,CAAC;IACL,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC;IAC7B,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC;IACrD,CAAC,KAAK,CAAC;IACP,CAAC,KAAK,CAAC;IACP,CAAC,KAAK,CAAC;IACP,CAAC,IAAI,CAAC;CACP,CAAC;AAEF;;;;;;;;GAQG;AACH,SAAS,QAAQ,CAAC,IAAI,EAAE,KAAK;IAC3B,IAAI,IAAI,IAAI,KAAK;QAAE,OAAO,CAAC,CAAC;IAE5B,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC;IACnB,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC;IAEpB,KAAK,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE;QAClC,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,SAAS,GAAG,CAAC,CAAC;QAC5C,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,UAAU,GAAG,CAAC,CAAC;KAC/C;IAED,OAAO,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,UAAU,CAAC,KAAK;IACvB,IAAI,KAAK,YAAY,GAAG,EAAE;QACxB,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC1B;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,GAAG,EAAE,GAAG,MAAM;IACnC,IAAI,GAAG,YAAY,GAAG;QAAE,OAAO,CAAE,GAAG,CAAE,CAAC;IACvC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACjB,IAAI,UAAU,GAAG,CAAC,CAAC;IAEnB,SAAS,IAAI;QACX,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACjB,CAAC;IAED,SAAS,KAAK;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,SAAS,MAAM;QACb,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,GAAG,CAAC;QAClB,IAAI,EAAE,CAAC;QACP,OAAO,GAAG,IAAI,GAAG,KAAK,KAAK,EAAE;YAC3B,KAAK,IAAI,GAAG,CAAC;YACb,IAAI,EAAE,CAAC;SACR;QACD,IAAI,GAAG,KAAK,KAAK,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,6BAA6B,KAAK,EAAE,CAAC,CAAC;SACvD;QACD,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC;IAED,SAAS,IAAI,CAAC,IAAI;QAChB,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,GAAG;YACD,IAAI,EAAE,CAAC;YACP,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC;YACnB,IAAI,GAAG;gBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,KAAK,EAAE,CAAC;SACT,QAAQ,GAAG,KAAK,GAAG,EAAE;QACtB,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAED,SAAS,QAAQ;QACf,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC9B,CAAC;IAED,SAAS,WAAW;QAClB,IAAI,EAAE,CAAC;QACP,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;QACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC;IACtE,CAAC;IAED,SAAS,KAAK;QACZ,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,EAAE,CAAC;QACP,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE;YACzB,KAAK,EAAE,CAAC;YACR,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC3B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACxB;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;aAClD;YACD,IAAI,EAAE,CAAC;SACR;QACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC3C,CAAC;IAED,SAAS,UAAU,CAAC,KAAK;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC;YACrB,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;YACvD,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,SAAS,KAAK;QACZ,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,MAAM,EAAE,CAAC;QACtC,IAAI,GAAG,KAAK,GAAG;YAAE,OAAO,WAAW,EAAE,CAAC;QACtC,IAAI,GAAG,KAAK,GAAG;YAAE,OAAO,KAAK,EAAE,CAAC;QAEhC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9B,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;gBAC5E,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC;gBACjB,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACb,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;aACzE;SACF;QAED,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,OAAO,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACtC,KAAK,IAAI,GAAG,CAAC;YACb,IAAI,EAAE,CAAC;SACR;QACD,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAEtC,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;SAC5C;aACI,IAAI,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACtC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;SACnD;aACI,IAAI,GAAG,KAAK,GAAG,EAAE;YACpB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;SACxB;aACI,IAAI,SAAS,IAAI,MAAM,EAAE;YAC5B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACzC;aACI,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;YACvC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;SAClD;aACI;YACH,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC;IAED,SAAS,OAAO,CAAC,EAAE,EAAE,CAAC;QACpB,KAAK,EAAE,CAAC;QACR,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;QACtB,KAAK,EAAE,CAAC;QACR,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;QACpE,KAAK,EAAE,CAAC;QACR,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC;QACpB,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAE,CAAC,EAAE,KAAK,EAAE,GAAG,CAAE,EAAE,CAAC;IAC5C,CAAC;IAED,SAAS,KAAK,CAAC,CAAC;QACd,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAE,CAAC,CAAE,EAAC,CAAC;IAC7D,CAAC;IAED,SAAS,KAAK,CAAC,EAAE;QACf,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAI,EAAE,CAAC,IAAI,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC3E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;SAC/C;aAAM;YACL,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;SAC/B;IACH,CAAC;IAED,SAAS,QAAQ,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,EAAE,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YAChD,OAAO,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACvB;QACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YACtC,KAAK,EAAE,CAAC;YACR,MAAM,OAAO,GAAG,GAAG,KAAK,GAAG,CAAC;YAC5B,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACvE,sBAAsB;YACtB,IAAI,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;gBACtE,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;aAC7C;iBACI,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzD,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;aACrD;YACD,uCAAuC;iBAClC,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAClF,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;gBACzB,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxD,OAAO,OAAO,CAAC;aAChB;YACD,yBAAyB;iBACpB,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAClF,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;gBAClD,OAAO,CAAC,CAAC;aACV;iBACI;gBACH,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;aACtC;SACF;aACI;YACH,MAAM,IAAI,KAAK,CAAC,oBAAoB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;SAChD;IACH,CAAC;IAED,SAAS,IAAI;QACX,IAAI,IAAI,CAAC;QACT,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE;YACxC,KAAK,EAAE,CAAC;YACR,IAAI,IAAI,EAAE;gBACR,uEAAuE;gBACvE,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;oBACjE,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;iBACpB;qBACI,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACtC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC;iBACxB;qBACI;oBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;iBACvB;aACF;iBACI,IAAI,GAAG,KAAK,GAAG,EAAE;gBACpB,IAAI,EAAE,CAAC;gBACP,IAAI,GAAG,IAAI,EAAE,CAAC;gBACd,IAAI,EAAE,CAAC;aACR;iBACI,IAAI,GAAG,KAAK,GAAG,EAAE;gBACpB,IAAI,GAAG,QAAQ,EAAE,CAAC;aACnB;iBACI;gBACH,IAAI,GAAG,KAAK,EAAE,CAAC;aAChB;YACD,KAAK,EAAE,CAAC;SACT;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACrB,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;QACnE,IAAI,EAAE,CAAC;KACR;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,MAAM;IAC/B,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,GAAG,EAAE,IAAI;IACzB,IAAI,KAAK,CAAC;IACV,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE;QACnB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;YACvB,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC;gBAAE,OAAO;SACvC;QACD,KAAK,GAAG,IAAI,CAAC;IACf,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,GAAG,EAAE,EAAE;IACvB,EAAE,CAAC,GAAG,CAAC,CAAC;IACR,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI;YAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;KAC/C;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,QAAQ,CAAC,GAAG,EAAE,EAAE;IACvB,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;IACrB,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;KACnD;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IACf,SAAS,EAAE,aAAa;IACxB,QAAQ;IACR,QAAQ,EAAE,QAAQ,EAAE,QAAQ;CAC7B,CAAC"}
1
+ {"version":3,"file":"expr.js","sourceRoot":"","sources":["../src/expr.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AAErC;;;;;;;GAOG;AAEH;;;GAGG;AACH,MAAM,eAAe,GAAG;IACtB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;CACrB,CAAC;AAEF;;;GAGG;AACH,MAAM,gBAAgB,GAAG;IACvB,KAAK,EAAE,IAAI;IACX,IAAI;IACJ,GAAG;IACH,GAAG;IACH,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,QAAQ;IACR,GAAG;IACH,IAAI;IACJ,MAAM;IACN,GAAG;IACH,GAAG;IACH,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,IAAI;IACV,QAAQ;IACR,UAAU;IACV,IAAI,EAAE,IAAI;IACV,KAAK;IACL,GAAG;IACH,GAAG;IACH,GAAG;CACJ,CAAC;AAEF;;;GAGG;AACH,MAAM,iBAAiB,GAAG;IACxB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK;CAC1B,CAAC;AAEF,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,eAAe,EAAE,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CACxG,CAAC;AAEF;;;GAGG;AACH,MAAM,kBAAkB,GAAG;IACzB,IAAI,EAAE,GAAG;IACT,QAAQ,EAAE,IAAI;IACd,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,GAAG;CACX,CAAC;AAEF;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,CAAC;AAE/B;;;;GAIG;AACH,MAAM,WAAW,GAAG;IAClB,CAAC,GAAG,CAAC;IACL,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC;IAC7B,CAAC,GAAG,EAAE,GAAG,CAAC;IACV,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC;IACrD,CAAC,KAAK,CAAC;IACP,CAAC,KAAK,CAAC;IACP,CAAC,KAAK,CAAC;IACP,CAAC,IAAI,CAAC;CACP,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,OAAO;IACP,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,UAAU;IACV,MAAM;IACN,MAAM;IACN,UAAU;IACV,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC;AAEF;;;;;;;;GAQG;AACH,SAAS,QAAQ,CAAC,IAAI,EAAE,KAAK;IAC3B,IAAI,IAAI,IAAI,KAAK;QAAE,OAAO,CAAC,CAAC;IAE5B,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC;IACnB,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC;IAEpB,KAAK,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE;QAClC,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,SAAS,GAAG,CAAC,CAAC;QAC5C,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,UAAU,GAAG,CAAC,CAAC;KAC/C;IAED,OAAO,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,UAAU,CAAC,KAAK;IACvB,IAAI,KAAK,YAAY,GAAG,EAAE;QACxB,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC1B;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,GAAG,EAAE,GAAG,MAAM;IACnC,IAAI,GAAG,YAAY,GAAG;QAAE,OAAO,CAAE,GAAG,CAAE,CAAC;IACvC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACjB,IAAI,UAAU,GAAG,CAAC,CAAC;IAEnB,SAAS,IAAI;QACX,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACjB,CAAC;IAED,SAAS,KAAK;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,SAAS,MAAM;QACb,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,MAAM,KAAK,GAAG,GAAG,CAAC;QAClB,IAAI,EAAE,CAAC;QACP,OAAO,GAAG,IAAI,GAAG,KAAK,KAAK,EAAE;YAC3B,KAAK,IAAI,GAAG,CAAC;YACb,IAAI,EAAE,CAAC;SACR;QACD,IAAI,GAAG,KAAK,KAAK,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,6BAA6B,KAAK,EAAE,CAAC,CAAC;SACvD;QACD,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACpC,CAAC;IAED,SAAS,QAAQ;QACf,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,OAAO,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACtC,KAAK,IAAI,GAAG,CAAC;YACb,IAAI,EAAE,CAAC;SACR;QACD,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,8CAA8C,KAAK,EAAE,CAAC,CAAC;SACxE;QACD,IAAI,GAAG,KAAK,GAAG,EAAE;YACf,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,EAAE,CAAC;YACP,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE;gBACzB,MAAM,IAAI,GAAG,CAAC;gBACd,IAAI,EAAE,CAAC;aACR;YACD,IAAI,EAAE,CAAC;YACP,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;SAC5C;QACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACrC,CAAC;IAED,qEAAqE;IACrE,2CAA2C;IAC3C,SAAS,SAAS,CAAC,IAAI;QACrB,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,IAAI,EAAE,CAAC;QACP,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAClB,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACpB,KAAK,EAAE,CAAC;QACR,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC5C,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE;YACzB,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,OAAO,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACtC,KAAK,IAAI,GAAG,CAAC;gBACb,IAAI,EAAE,CAAC;aACR;YACD,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,WAAW,EAAE;gBACvC,KAAK,EAAE,CAAC;gBACR,MAAM,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC;aAC9B;SACF;QACD,mBAAmB;QACnB,IAAI,EAAE,CAAC;QACP,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,SAAS,IAAI,CAAC,IAAI;QAChB,IAAI,IAAI,KAAK,YAAY;YAAE,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,GAAG;YACD,IAAI,EAAE,CAAC;YACP,MAAM,GAAG,GAAG,IAAI,EAAE,CAAC;YACnB,IAAI,GAAG;gBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,KAAK,EAAE,CAAC;SACT,QAAQ,GAAG,KAAK,GAAG,EAAE;QACtB,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAED,SAAS,QAAQ;QACf,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC9B,CAAC;IAED,SAAS,WAAW;QAClB,IAAI,EAAE,CAAC;QACP,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;QACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC;IACtE,CAAC;IAED,SAAS,KAAK;QACZ,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,EAAE,CAAC;QACP,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE;YACzB,KAAK,EAAE,CAAC;YACR,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC3B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACxB;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;aAClD;YACD,IAAI,EAAE,CAAC;SACR;QACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC3C,CAAC;IAED,SAAS,UAAU,CAAC,KAAK;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC;YACrB,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE;YACvD,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,SAAS,KAAK;QACZ,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,MAAM,EAAE,CAAC;QACtC,IAAI,GAAG,KAAK,GAAG;YAAE,OAAO,WAAW,EAAE,CAAC;QACtC,IAAI,GAAG,KAAK,GAAG;YAAE,OAAO,KAAK,EAAE,CAAC;QAEhC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;YAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9B,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;gBAC5E,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC;gBACjB,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACb,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;aACzE;SACF;QAED,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,OAAO,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACtC,KAAK,IAAI,GAAG,CAAC;YACb,IAAI,EAAE,CAAC;SACR;QACD,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAEtC,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;SAC5C;aACI,IAAI,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACtC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;SACnD;aACI,IAAI,GAAG,KAAK,GAAG,EAAE;YACpB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;SACxB;aACI,IAAI,SAAS,IAAI,MAAM,EAAE;YAC5B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACzC;aACI,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;YACvC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;SAClD;aACI;YACH,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC;IAED,SAAS,OAAO,CAAC,EAAE,EAAE,CAAC;QACpB,KAAK,EAAE,CAAC;QACR,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC;QACtB,KAAK,EAAE,CAAC;QACR,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;QACpE,KAAK,EAAE,CAAC;QACR,MAAM,GAAG,GAAG,KAAK,EAAE,CAAC;QACpB,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAE,CAAC,EAAE,KAAK,EAAE,GAAG,CAAE,EAAE,CAAC;IAC5C,CAAC;IAED,SAAS,KAAK,CAAC,CAAC;QACd,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAE,CAAC,CAAE,EAAC,CAAC;IAC7D,CAAC;IAED,SAAS,KAAK,CAAC,EAAE;QACf,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAI,EAAE,CAAC,IAAI,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC3E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;SAC/C;aAAM;YACL,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;SAC/B;IACH,CAAC;IAED,SAAS,QAAQ,CAAC,CAAC;QACjB,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,EAAE,CAAC,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YAChD,OAAO,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACvB;QACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;YACtC,KAAK,EAAE,CAAC;YACR,MAAM,OAAO,GAAG,GAAG,KAAK,GAAG,CAAC;YAC5B,MAAM,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACvE,sBAAsB;YACtB,IAAI,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;gBACtE,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;aAC7C;iBACI,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzD,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;aACrD;YACD,uCAAuC;iBAClC,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAClF,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;gBACzB,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxD,OAAO,OAAO,CAAC;aAChB;YACD,yBAAyB;iBACpB,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAClF,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;gBAClD,OAAO,CAAC,CAAC;aACV;iBACI;gBACH,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC;aACtC;SACF;aACI;YACH,MAAM,IAAI,KAAK,CAAC,oBAAoB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;SAChD;IACH,CAAC;IAED,SAAS,IAAI;QACX,IAAI,IAAI,CAAC;QACT,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,EAAE;YACxC,KAAK,EAAE,CAAC;YACR,IAAI,IAAI,EAAE;gBACR,uEAAuE;gBACvE,IAAI,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;oBACjE,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;iBACpB;qBACI,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACtC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC;iBACxB;qBACI;oBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;iBACvB;aACF;iBACI,IAAI,GAAG,KAAK,GAAG,EAAE;gBACpB,IAAI,EAAE,CAAC;gBACP,IAAI,GAAG,IAAI,EAAE,CAAC;gBACd,IAAI,EAAE,CAAC;aACR;iBACI,IAAI,GAAG,KAAK,GAAG,EAAE;gBACpB,IAAI,GAAG,QAAQ,EAAE,CAAC;aACnB;iBACI;gBACH,IAAI,GAAG,KAAK,EAAE,CAAC;aAChB;YACD,KAAK,EAAE,CAAC;SACT;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACrB,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;QACnE,IAAI,EAAE,CAAC;KACR;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,MAAM;IAC/B,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,GAAG,EAAE,IAAI;IACzB,IAAI,KAAK,CAAC;IACV,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE;QACnB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;YACvB,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC;gBAAE,OAAO;SACvC;QACD,KAAK,GAAG,IAAI,CAAC;IACf,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,SAAS,QAAQ,CAAC,GAAG,EAAE,EAAE;IACvB,EAAE,CAAC,GAAG,CAAC,CAAC;IACR,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI;YAAE,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;KAC/C;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,QAAQ,CAAC,GAAG,EAAE,EAAE;IACvB,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;IACrB,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;KACnD;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IACf,SAAS,EAAE,aAAa;IACxB,QAAQ;IACR,QAAQ,EAAE,QAAQ,EAAE,QAAQ;CAC7B,CAAC"}
@@ -34,14 +34,25 @@ function formatIdentifier(spell, ast) {
34
34
  }
35
35
  return escapeId(column);
36
36
  }
37
+ function formatDataType(spell, ast) {
38
+ const { value, length } = ast;
39
+ if (length)
40
+ return `${value.toUpperCase()}(${length})`;
41
+ return value.toUpperCase();
42
+ }
37
43
  const extractFieldNames = ['year', 'month', 'day'];
38
44
  function formatFuncExpr(spell, ast) {
39
- const { name, args } = ast;
45
+ const { name, args, dataType } = ast;
40
46
  const { type } = spell.Model.driver;
41
47
  // https://www.postgresql.org/docs/9.1/static/functions-datetime.html
42
48
  if (type === 'postgres' && extractFieldNames.includes(name)) {
43
49
  return `EXTRACT(${name.toUpperCase()} FROM ${args.map(arg => formatExpr(spell, arg)).join(', ')})`;
44
50
  }
51
+ // https://dev.mysql.com/doc/refman/8.0/en/json-search-functions.html#function_json-value
52
+ // https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-21.html#mysqld-8-0-21-json
53
+ if (name === 'json_value' && dataType) {
54
+ return `${name.toUpperCase()}(${args.map(arg => formatExpr(spell, arg)).join(', ')} RETURNING ${formatDataType(spell, dataType)})`;
55
+ }
45
56
  return `${name.toUpperCase()}(${args.map(arg => formatExpr(spell, arg)).join(', ')})`;
46
57
  }
47
58
  function formatLiteral(spell, ast) {
@@ -1 +1 @@
1
- {"version":3,"file":"expr_formatter.js","sourceRoot":"","sources":["../src/expr_formatter.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expr_formatter.js","sourceRoot":"","sources":["../src/expr_formatter.js"],"names":[],"mappings":"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"}
package/lib/hint.d.ts CHANGED
@@ -68,7 +68,7 @@ export class IndexHint {
68
68
  * })
69
69
  */
70
70
  static build(hint: string | Array<string> | HintInterface, type?: INDEX_HINT_TYPE, scope?: INDEX_HINT_SCOPE): IndexHint;
71
-
71
+
72
72
  /**
73
73
  * Creates an instance of IndexHint.
74
74
  * @param {Array<string> | string} index
@@ -77,7 +77,7 @@ export class IndexHint {
77
77
  * @memberof IndexHint
78
78
  */
79
79
  constructor(index: string, type?: INDEX_HINT_TYPE, scope?: INDEX_HINT_SCOPE);
80
-
80
+
81
81
  set index(values: string | Array<string>);
82
82
 
83
83
  get index(): Array<string>;
@@ -110,5 +110,5 @@ export class IndexHint {
110
110
  }
111
111
 
112
112
  export type CommonHintsArgs = string | HintInterface | Hint | IndexHint | {
113
- [key in INDEX_HINT_SCOPE_TYPE]?: string | Array<string>
113
+ [key in INDEX_HINT_SCOPE_TYPE]?: string | Array<string>
114
114
  };
package/lib/index.d.ts CHANGED
@@ -1,30 +1,21 @@
1
1
  import DataTypes, { DataType, AbstractDataType, LENGTH_VARIANTS } from './data_types';
2
- import {
3
- Hint, IndexHint, HintInterface,
4
- INDEX_HINT_SCOPE_TYPE, INDEX_HINT_SCOPE, INDEX_HINT_TYPE
5
- } from './hint';
6
- import {
7
- Literal, Validator,
8
- Connection, QueryOptions, WhereConditions,
9
- Raw, ColumnMeta, AttributeMeta,
10
- BeforeHooksType, AfterHooksType, Collection,
11
- GeneratorReturnType, Values, BoneCreateValues, BoneInstanceValues,
12
- } from './types/common';
13
- import { SpellMeta, Spell, SpellBookFormatResult } from './spell';
14
2
  import Bone from './bone';
15
3
  import { ConnectOptions, AbstractDriver } from './drivers';
4
+ import { QueryOptions, GeneratorReturnType, AttributeMeta, Connection, Literal, ColumnMeta, AfterHooksType, BeforeHooksType } from './types/common';
5
+ import Raw from './raw';
16
6
 
17
7
  export {
18
8
  LENGTH_VARIANTS as LENGTH_VARIANTS,
19
- DataTypes, Literal, Validator, Connection, WhereConditions,
20
- Hint, IndexHint, HintInterface, INDEX_HINT_SCOPE_TYPE, INDEX_HINT_SCOPE, INDEX_HINT_TYPE,
21
- Bone, Raw, Collection,
22
- SpellMeta, Spell, ColumnMeta, AttributeMeta, SpellBookFormatResult, Values, BoneCreateValues, BoneInstanceValues,
9
+ DataTypes, Bone
23
10
  };
24
11
 
25
12
  export * from './decorators';
26
13
  export * from './drivers';
27
14
  export * from './adapters/sequelize';
15
+ export * from './hint';
16
+ export * from './types/common';
17
+ export * from './spell';
18
+ export { hookNames } from './setup_hooks';
28
19
 
29
20
  interface InitOptions {
30
21
  underscored?: boolean;
package/lib/index.js CHANGED
@@ -13,6 +13,7 @@ const Decorators = require('./decorators');
13
13
  const Raw = require('./raw').default;
14
14
  const { MysqlDriver, PostgresDriver, SqliteDriver, SqljsDriver, AbstractDriver } = require('./drivers');
15
15
  const { isBone } = require('./utils');
16
+ const { hookNames } = require('./setup_hooks');
16
17
  /**
17
18
  * @typedef {Object} RawSql
18
19
  * @property {boolean} __raw
@@ -62,6 +63,7 @@ Object.assign(Realm, {
62
63
  Raw,
63
64
  LENGTH_VARIANTS,
64
65
  isBone,
66
+ hookNames,
65
67
  });
66
68
  module.exports = Realm;
67
69
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,MAAM,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACpD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1E,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,SAAS,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAClD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AACrC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACxG,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEtC;;;;;GAKG;AAGH;;;;;;;GAOG;AACH,MAAM,OAAO,GAAG,KAAK,UAAU,OAAO,CAAC,IAAI;IACzC,IAAI,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;IACzB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACtB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,UAAU,UAAU,CAAC,KAAK,EAAE,GAAG,IAAI;IACzD,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE;QAC7C,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC;KACxC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;IACnB,OAAO,EAAE,KAAK;IACd,OAAO;IACP,UAAU;IACV,IAAI;IACJ,UAAU;IACV,SAAS;IACT,MAAM;IACN,KAAK;IACL,SAAS;IACT,OAAO;IACP,GAAG,IAAI;IACP,GAAG,UAAU;IACb,WAAW;IACX,cAAc;IACd,YAAY;IACZ,WAAW;IACX,cAAc;IACd,GAAG;IACH,eAAe;IACf,MAAM;CACP,CAAC,CAAC;AAEH,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,MAAM,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACpD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1E,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,SAAS,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAClD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACjC,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;AACrC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACxG,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACtC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAE/C;;;;;GAKG;AAGH;;;;;;;GAOG;AACH,MAAM,OAAO,GAAG,KAAK,UAAU,OAAO,CAAC,IAAI;IACzC,IAAI,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;IACzB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACtB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,UAAU,UAAU,CAAC,KAAK,EAAE,GAAG,IAAI;IACzD,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE;QAC7C,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC;KACxC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE;IACnB,OAAO,EAAE,KAAK;IACd,OAAO;IACP,UAAU;IACV,IAAI;IACJ,UAAU;IACV,SAAS;IACT,MAAM;IACN,KAAK;IACL,SAAS;IACT,OAAO;IACP,GAAG,IAAI;IACP,GAAG,UAAU;IACb,WAAW;IACX,cAAc;IACd,YAAY;IACZ,WAAW;IACX,cAAc;IACd,GAAG;IACH,eAAe;IACf,MAAM;IACN,SAAS;CACV,CAAC,CAAC;AAEH,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC"}
package/lib/raw.js CHANGED
@@ -17,5 +17,4 @@ class Raw {
17
17
  }
18
18
  }
19
19
  exports.default = Raw;
20
- ;
21
20
  //# sourceMappingURL=raw.js.map
package/lib/raw.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"raw.js","sourceRoot":"","sources":["../src/raw.ts"],"names":[],"mappings":";;AAAA,MAAqB,GAAG;IAMtB,YAAY,KAAa;QAHzB,gCAAgC;QAChC,SAAI,GAAW,KAAK,CAAC;QAGnB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAa;QACxB,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACF;AApBD,sBAoBC;AAAA,CAAC"}
1
+ {"version":3,"file":"raw.js","sourceRoot":"","sources":["../src/raw.ts"],"names":[],"mappings":";;AAAA,MAAqB,GAAG;IAMtB,YAAY,KAAa;QAHzB,gCAAgC;QAChC,SAAI,GAAG,KAAK,CAAC;QAGX,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAa;QACxB,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACF;AApBD,sBAoBC"}
@@ -6,7 +6,7 @@ import { AbstractBone } from './abstract_bone';
6
6
  export type Literal = null | undefined | boolean | number | bigint | string | Date | Record<string, any> | ArrayBuffer;
7
7
 
8
8
  // eslint-disable-next-line @typescript-eslint/ban-types
9
- type BaseValidateArgs = boolean | RegExp | Function | Array<Array<Literal>> | string | Array<Literal>;
9
+ type BaseValidateArgs = boolean | RegExp | Function | Array<Array<Literal>> | string | Array<Literal> | number;
10
10
 
11
11
  export type Validator = BaseValidateArgs | {
12
12
  args?: BaseValidateArgs,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "leoric",
3
- "version": "2.12.0",
3
+ "version": "2.12.2",
4
4
  "description": "JavaScript Object-relational mapping alchemy",
5
5
  "browser": "dist/browser.js",
6
6
  "main": "lib/index.js",
@@ -131,6 +131,6 @@
131
131
  "sql.js": "^1.8.0",
132
132
  "sqlite3": "^5.0.2",
133
133
  "ts-node": "^10.9.1",
134
- "typescript": "^4.6.2"
134
+ "typescript": "^4.9.5"
135
135
  }
136
136
  }