@opra/common 1.0.0-alpha.2 → 1.0.0-alpha.21

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 (178) hide show
  1. package/browser.js +5836 -5537
  2. package/cjs/document/api-document.js +28 -12
  3. package/cjs/document/common/data-type-map.js +1 -1
  4. package/cjs/document/common/document-element.js +5 -1
  5. package/cjs/document/constants.js +1 -1
  6. package/cjs/document/data-type/api-field.js +7 -2
  7. package/cjs/document/data-type/complex-type-base.js +6 -1
  8. package/cjs/document/data-type/complex-type.js +8 -5
  9. package/cjs/document/data-type/data-type.js +2 -1
  10. package/cjs/document/data-type/enum-type.js +5 -2
  11. package/cjs/document/data-type/extended-types/base64.type.js +6 -1
  12. package/cjs/document/data-type/extended-types/date-string.type.js +11 -4
  13. package/cjs/document/data-type/extended-types/date-time-string.type.js +11 -4
  14. package/cjs/document/data-type/extended-types/date-time.type.js +11 -4
  15. package/cjs/document/data-type/extended-types/date.type.js +11 -4
  16. package/cjs/document/data-type/extended-types/email.type.js +25 -11
  17. package/cjs/document/data-type/extended-types/field-path.type.js +13 -7
  18. package/cjs/document/data-type/extended-types/filter.type.js +25 -20
  19. package/cjs/document/data-type/extended-types/object-id.type.js +6 -1
  20. package/cjs/document/data-type/extended-types/operation-result.type.js +20 -10
  21. package/cjs/document/data-type/extended-types/time.type.js +11 -4
  22. package/cjs/document/data-type/extended-types/url.type.js +7 -2
  23. package/cjs/document/data-type/extended-types/uuid.type.js +8 -2
  24. package/cjs/document/data-type/mapped-type.js +12 -5
  25. package/cjs/document/data-type/mixin-type.js +5 -1
  26. package/cjs/document/data-type/omit-type.js +1 -2
  27. package/cjs/document/data-type/partial-type.js +1 -2
  28. package/cjs/document/data-type/pick-type.js +1 -2
  29. package/cjs/document/data-type/primitive-types/any.type.js +2 -1
  30. package/cjs/document/data-type/primitive-types/bigint.type.js +6 -1
  31. package/cjs/document/data-type/primitive-types/boolean.type.js +6 -1
  32. package/cjs/document/data-type/primitive-types/integer.type.js +6 -1
  33. package/cjs/document/data-type/primitive-types/null.type.js +6 -1
  34. package/cjs/document/data-type/primitive-types/number.type.js +10 -3
  35. package/cjs/document/data-type/primitive-types/object.type.js +2 -1
  36. package/cjs/document/data-type/primitive-types/string.type.js +14 -5
  37. package/cjs/document/data-type/required-type.js +1 -2
  38. package/cjs/document/data-type/simple-type.js +16 -10
  39. package/cjs/document/data-type/utils/create-mapped-class.js +3 -3
  40. package/cjs/document/data-type/utils/get-is-inherited-predicate-fn.js +1 -2
  41. package/cjs/document/decorators/api-field-decorator.js +1 -2
  42. package/cjs/document/decorators/complex-type.decorator.js +1 -2
  43. package/cjs/document/decorators/http-controller.decorator.js +26 -2
  44. package/cjs/document/decorators/http-operation-entity.decorator.js +59 -34
  45. package/cjs/document/decorators/http-operation.decorator.js +12 -6
  46. package/cjs/document/decorators/simple-type.decorator.js +2 -3
  47. package/cjs/document/factory/api-document.factory.js +14 -6
  48. package/cjs/document/factory/data-type.factory.js +98 -57
  49. package/cjs/document/factory/http-api.factory.js +4 -2
  50. package/cjs/document/http/http-api.js +2 -2
  51. package/cjs/document/http/http-controller.js +25 -13
  52. package/cjs/document/http/http-media-type.js +4 -2
  53. package/cjs/document/http/http-operation-response.js +2 -1
  54. package/cjs/document/http/http-operation.js +28 -4
  55. package/cjs/document/http/http-parameter.js +4 -0
  56. package/cjs/document/http/http-status-range.js +6 -4
  57. package/cjs/document/index.js +5 -5
  58. package/cjs/document/utils/parse-regexp.util.js +1 -2
  59. package/cjs/document/utils/string-compare.util.js +1 -2
  60. package/cjs/exception/index.js +5 -5
  61. package/cjs/filter/antlr/OpraFilterParser.js +28 -82
  62. package/cjs/filter/ast/index.js +1 -1
  63. package/cjs/filter/build.js +22 -25
  64. package/cjs/filter/filter-rules.js +4 -2
  65. package/cjs/filter/opra-filter.ns.js +2 -2
  66. package/cjs/filter/parse.js +2 -5
  67. package/cjs/filter/utils.js +2 -3
  68. package/cjs/helpers/function-utils.js +1 -2
  69. package/cjs/helpers/get-stack-filename.js +2 -3
  70. package/cjs/helpers/mixin-utils.js +4 -4
  71. package/cjs/helpers/monkey-patches.js +4 -2
  72. package/cjs/helpers/object-utils.js +3 -4
  73. package/cjs/helpers/parse-fields-projection.js +4 -6
  74. package/cjs/helpers/responsive-map.js +5 -4
  75. package/cjs/helpers/type-guards.js +10 -11
  76. package/cjs/i18n/i18n.js +4 -3
  77. package/cjs/i18n/index.js +1 -1
  78. package/cjs/i18n/string-utils.js +2 -3
  79. package/cjs/i18n/translate.js +1 -2
  80. package/cjs/index.js +1 -1
  81. package/cjs/schema/type-guards.js +7 -8
  82. package/esm/document/api-document.js +27 -12
  83. package/esm/document/common/data-type-map.js +1 -1
  84. package/esm/document/common/document-element.js +4 -1
  85. package/esm/document/constants.js +1 -1
  86. package/esm/document/data-type/api-field.js +7 -2
  87. package/esm/document/data-type/complex-type-base.js +6 -1
  88. package/esm/document/data-type/complex-type.js +8 -5
  89. package/esm/document/data-type/data-type.js +2 -1
  90. package/esm/document/data-type/enum-type.js +5 -2
  91. package/esm/document/data-type/extended-types/base64.type.js +7 -2
  92. package/esm/document/data-type/extended-types/date-string.type.js +12 -5
  93. package/esm/document/data-type/extended-types/date-time-string.type.js +12 -5
  94. package/esm/document/data-type/extended-types/date-time.type.js +12 -5
  95. package/esm/document/data-type/extended-types/date.type.js +12 -5
  96. package/esm/document/data-type/extended-types/email.type.js +26 -12
  97. package/esm/document/data-type/extended-types/field-path.type.js +14 -8
  98. package/esm/document/data-type/extended-types/filter.type.js +26 -21
  99. package/esm/document/data-type/extended-types/object-id.type.js +7 -2
  100. package/esm/document/data-type/extended-types/operation-result.type.js +21 -11
  101. package/esm/document/data-type/extended-types/time.type.js +12 -5
  102. package/esm/document/data-type/extended-types/url.type.js +8 -3
  103. package/esm/document/data-type/extended-types/uuid.type.js +9 -3
  104. package/esm/document/data-type/mapped-type.js +12 -5
  105. package/esm/document/data-type/mixin-type.js +5 -1
  106. package/esm/document/data-type/primitive-types/any.type.js +3 -2
  107. package/esm/document/data-type/primitive-types/bigint.type.js +7 -2
  108. package/esm/document/data-type/primitive-types/boolean.type.js +7 -2
  109. package/esm/document/data-type/primitive-types/integer.type.js +7 -2
  110. package/esm/document/data-type/primitive-types/null.type.js +7 -2
  111. package/esm/document/data-type/primitive-types/number.type.js +11 -4
  112. package/esm/document/data-type/primitive-types/object.type.js +3 -2
  113. package/esm/document/data-type/primitive-types/string.type.js +15 -6
  114. package/esm/document/data-type/simple-type.js +16 -10
  115. package/esm/document/data-type/utils/create-mapped-class.js +2 -1
  116. package/esm/document/decorators/http-controller.decorator.js +25 -0
  117. package/esm/document/decorators/http-operation-entity.decorator.js +59 -34
  118. package/esm/document/decorators/http-operation.decorator.js +11 -4
  119. package/esm/document/factory/api-document.factory.js +14 -6
  120. package/esm/document/factory/data-type.factory.js +98 -57
  121. package/esm/document/factory/http-api.factory.js +4 -2
  122. package/esm/document/http/http-api.js +2 -2
  123. package/esm/document/http/http-controller.js +24 -13
  124. package/esm/document/http/http-media-type.js +4 -2
  125. package/esm/document/http/http-operation-response.js +2 -1
  126. package/esm/document/http/http-operation.js +27 -4
  127. package/esm/document/http/http-parameter.js +4 -0
  128. package/esm/document/http/http-status-range.js +6 -4
  129. package/esm/document/index.js +5 -5
  130. package/esm/exception/index.js +5 -5
  131. package/esm/filter/antlr/OpraFilterParser.js +28 -82
  132. package/esm/filter/ast/index.js +1 -1
  133. package/esm/filter/build.js +1 -3
  134. package/esm/filter/filter-rules.js +4 -2
  135. package/esm/filter/opra-filter.ns.js +2 -2
  136. package/esm/filter/parse.js +1 -3
  137. package/esm/helpers/mixin-utils.js +2 -1
  138. package/esm/helpers/monkey-patches.js +4 -2
  139. package/esm/helpers/parse-fields-projection.js +1 -3
  140. package/esm/helpers/responsive-map.js +5 -4
  141. package/esm/i18n/i18n.js +4 -3
  142. package/esm/i18n/index.js +1 -1
  143. package/esm/index.js +1 -1
  144. package/package.json +9 -8
  145. package/types/document/api-document.d.ts +4 -6
  146. package/types/document/common/document-element.d.ts +1 -0
  147. package/types/document/data-type/api-field.d.ts +2 -0
  148. package/types/document/data-type/complex-type.d.ts +1 -1
  149. package/types/document/data-type/data-type.d.ts +4 -2
  150. package/types/document/data-type/enum-type.d.ts +2 -2
  151. package/types/document/data-type/mapped-type.d.ts +3 -3
  152. package/types/document/data-type/mixin-type.d.ts +2 -2
  153. package/types/document/data-type/simple-type.d.ts +4 -2
  154. package/types/document/decorators/http-controller.decorator.d.ts +1 -0
  155. package/types/document/factory/api-document.factory.d.ts +1 -1
  156. package/types/document/factory/data-type.factory.d.ts +5 -0
  157. package/types/document/http/http-controller.d.ts +1 -0
  158. package/types/document/http/http-operation.d.ts +4 -2
  159. package/types/document/http/http-parameter.d.ts +3 -2
  160. package/types/document/http/http-status-range.d.ts +2 -1
  161. package/types/document/index.d.ts +5 -5
  162. package/types/exception/index.d.ts +5 -5
  163. package/types/filter/ast/index.d.ts +1 -1
  164. package/types/filter/opra-filter.ns.d.ts +2 -2
  165. package/types/helpers/type-guards.d.ts +0 -2
  166. package/types/i18n/i18n.d.ts +21 -19
  167. package/types/index.d.ts +1 -1
  168. package/types/schema/data-type/data-type.interface.d.ts +1 -1
  169. package/types/schema/data-type/mapped-type.interface.d.ts +2 -2
  170. package/types/schema/data-type/simple-type.interface.d.ts +4 -0
  171. package/types/schema/data-type-container.interface.d.ts +1 -1
  172. package/types/schema/document.interface.d.ts +14 -2
  173. package/types/schema/http/http-controller.interface.d.ts +2 -2
  174. package/types/schema/http/http-media-type.interface.d.ts +1 -1
  175. package/types/schema/http/http-operation-response.interface.d.ts +2 -2
  176. package/types/schema/http/http-operation.interface.d.ts +8 -4
  177. package/types/schema/http/http-parameter.interface.d.ts +5 -1
  178. package/types/schema/index.d.ts +1 -0
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { isDateString, toString, vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -37,16 +37,23 @@ let DateType = class DateType {
37
37
  __decorate([
38
38
  SimpleType.Attribute({
39
39
  description: 'Minimum value',
40
- })
40
+ }),
41
+ __metadata("design:type", String)
41
42
  ], DateType.prototype, "minValue", void 0);
42
43
  __decorate([
43
44
  SimpleType.Attribute({
44
45
  description: 'Maximum value',
45
- })
46
+ }),
47
+ __metadata("design:type", String)
46
48
  ], DateType.prototype, "maxValue", void 0);
47
49
  DateType = __decorate([
48
- SimpleType({
50
+ (SimpleType({
49
51
  description: 'A date without time',
50
- }).Example('2021-04-18', 'Full date value')
52
+ nameMappings: {
53
+ js: 'Date',
54
+ json: 'string',
55
+ },
56
+ }).Example('2021-04-18', 'Full date value')),
57
+ __metadata("design:paramtypes", [Object])
51
58
  ], DateType);
52
59
  export { DateType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -18,60 +18,74 @@ __decorate([
18
18
  SimpleType.Attribute({
19
19
  description: 'If set to `true`, the validator will also match `Display Name <email-address>',
20
20
  default: false,
21
- })
21
+ }),
22
+ __metadata("design:type", Boolean)
22
23
  ], EmailType.prototype, "allowDisplayName", void 0);
23
24
  __decorate([
24
25
  SimpleType.Attribute({
25
26
  description: 'If set to `true`, the validator will reject strings without the format `Display Name <email-address>',
26
27
  default: false,
27
- })
28
+ }),
29
+ __metadata("design:type", Boolean)
28
30
  ], EmailType.prototype, "requireDisplayName", void 0);
29
31
  __decorate([
30
32
  SimpleType.Attribute({
31
33
  description: "If set to `false`, the validator will not allow any non-English UTF8 character in email address's local part",
32
34
  default: true,
33
- })
35
+ }),
36
+ __metadata("design:type", Boolean)
34
37
  ], EmailType.prototype, "utf8LocalPart", void 0);
35
38
  __decorate([
36
39
  SimpleType.Attribute({
37
40
  description: 'If set to `true`, the validator will not check for the standard max length of an email',
38
41
  default: false,
39
- })
42
+ }),
43
+ __metadata("design:type", Boolean)
40
44
  ], EmailType.prototype, "ignoreMaxLength", void 0);
41
45
  __decorate([
42
46
  SimpleType.Attribute({
43
47
  description: 'If set to `true`, the validator will allow IP addresses in the host part',
44
48
  default: false,
45
- })
49
+ }),
50
+ __metadata("design:type", Boolean)
46
51
  ], EmailType.prototype, "allowIpDomain", void 0);
47
52
  __decorate([
48
53
  SimpleType.Attribute({
49
54
  description: 'If set to `true`, some additional validation will be enabled, ' +
50
55
  'e.g. disallowing certain syntactically valid email addresses that are rejected by GMail.',
51
56
  default: false,
52
- })
57
+ }),
58
+ __metadata("design:type", Boolean)
53
59
  ], EmailType.prototype, "domainSpecificValidation", void 0);
54
60
  __decorate([
55
61
  SimpleType.Attribute({
56
62
  description: 'If set to an array of strings and the part of the email after the @ symbol ' +
57
63
  ' one of the strings defined in it, the validation fails.',
58
- })
64
+ }),
65
+ __metadata("design:type", Array)
59
66
  ], EmailType.prototype, "hostBlacklist", void 0);
60
67
  __decorate([
61
68
  SimpleType.Attribute({
62
69
  description: 'If set to an array of strings and the part of the email after the @ symbol ' +
63
70
  ' matches none of the strings defined in it, the validation fails.',
64
- })
71
+ }),
72
+ __metadata("design:type", Array)
65
73
  ], EmailType.prototype, "hostWhitelist", void 0);
66
74
  __decorate([
67
75
  SimpleType.Attribute({
68
76
  description: 'If set to a string, then the validator will reject emails that include ' +
69
77
  ' any of the characters in the string, in the name part.',
70
- })
78
+ }),
79
+ __metadata("design:type", String)
71
80
  ], EmailType.prototype, "blacklistedChars", void 0);
72
81
  EmailType = __decorate([
73
- SimpleType({
82
+ (SimpleType({
74
83
  description: 'An email value',
75
- }).Example('some.body@example.com')
84
+ nameMappings: {
85
+ js: 'string',
86
+ json: 'string',
87
+ },
88
+ }).Example('some.body@example.com')),
89
+ __metadata("design:paramtypes", [Object])
76
90
  ], EmailType);
77
91
  export { EmailType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { toString, validator, vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -12,9 +12,7 @@ let FieldPathType = class FieldPathType {
12
12
  ? element.node.getComplexType(properties.dataType)
13
13
  : element.node.getComplexType('object');
14
14
  const allowSigns = properties.allowSigns;
15
- const decodeFieldPath = validator('decodeFieldPath', function (input) {
16
- return dataType.normalizeFieldPath(input, { allowSigns });
17
- });
15
+ const decodeFieldPath = validator('decodeFieldPath', (input) => dataType.normalizeFieldPath(input, { allowSigns }));
18
16
  return vg.pipe([toString, decodeFieldPath]);
19
17
  }
20
18
  [ENCODER](properties, element) {
@@ -24,8 +22,9 @@ let FieldPathType = class FieldPathType {
24
22
  const dataType = properties.dataType
25
23
  ? element.node.getComplexType(properties.dataType)
26
24
  : element.node.getComplexType('object');
25
+ const typeName = dataType ? element.node.getDataTypeNameWithNs(dataType) : undefined;
27
26
  return {
28
- dataType: dataType.name ? dataType.name : dataType.toJSON(),
27
+ dataType: typeName ? typeName : dataType.toJSON(),
29
28
  allowSigns: properties.allowSigns,
30
29
  };
31
30
  }
@@ -33,18 +32,25 @@ let FieldPathType = class FieldPathType {
33
32
  __decorate([
34
33
  SimpleType.Attribute({
35
34
  description: 'Data type which field belong to',
36
- })
35
+ }),
36
+ __metadata("design:type", Object)
37
37
  ], FieldPathType.prototype, "dataType", void 0);
38
38
  __decorate([
39
39
  SimpleType.Attribute({
40
40
  description: 'Determines if signs (+,-) are allowed. ' +
41
41
  'If set "first" signs are allowed only beginning of the field path' +
42
42
  'If set "each" signs are allowed at each field in the path',
43
- })
43
+ }),
44
+ __metadata("design:type", String)
44
45
  ], FieldPathType.prototype, "allowSigns", void 0);
45
46
  FieldPathType = __decorate([
46
47
  SimpleType({
47
48
  description: 'Field path',
48
- })
49
+ nameMappings: {
50
+ js: 'string',
51
+ json: 'string',
52
+ },
53
+ }),
54
+ __metadata("design:paramtypes", [Object])
49
55
  ], FieldPathType);
50
56
  export { FieldPathType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { validator } from 'valgen';
3
3
  import { FilterRules } from '../../../filter/filter-rules.js';
4
4
  import { OpraFilter } from '../../../filter/index.js';
@@ -32,38 +32,43 @@ let FilterType = class FilterType {
32
32
  __decorate([
33
33
  SimpleType.Attribute({
34
34
  description: 'Data type which filtering fields belong to',
35
- })
35
+ }),
36
+ __metadata("design:type", Object)
36
37
  ], FilterType.prototype, "dataType", void 0);
37
38
  __decorate([
38
39
  SimpleType.Attribute({
39
40
  description: 'Stringified JSON object defines filtering rules',
40
41
  format: 'string',
41
- })
42
+ }),
43
+ __metadata("design:type", Object)
42
44
  ], FilterType.prototype, "rules", void 0);
43
45
  FilterType = __decorate([
44
46
  SimpleType({
45
47
  description: 'A query filter',
46
- })
48
+ nameMappings: {
49
+ js: 'object',
50
+ json: 'string',
51
+ },
52
+ }),
53
+ __metadata("design:paramtypes", [Object])
47
54
  ], FilterType);
48
55
  export { FilterType };
49
- const decodeFilter = (dataType, rules) => {
50
- return validator('decodeFilter', function (input, context, _this) {
51
- if (typeof input === 'string') {
52
- try {
53
- const filter = OpraFilter.parse(input);
54
- if (rules)
55
- return rules.normalizeFilter(filter, dataType);
56
- return filter;
57
- }
58
- catch (e) {
59
- context.fail(_this, `Not a valid filter expression. ${e.message}`, input, e.errors);
60
- return;
61
- }
56
+ const decodeFilter = (dataType, rules) => validator('decodeFilter', (input, context, _this) => {
57
+ if (typeof input === 'string') {
58
+ try {
59
+ const filter = OpraFilter.parse(input);
60
+ if (rules)
61
+ return rules.normalizeFilter(filter, dataType);
62
+ return filter;
62
63
  }
63
- context.fail(_this, `Nt a valid filter expression string`, input);
64
- });
65
- };
66
- const encodeFilter = validator('encodeFilter', function (input, context, _this) {
64
+ catch (e) {
65
+ context.fail(_this, `Not a valid filter expression. ${e.message}`, input, e.errors);
66
+ return;
67
+ }
68
+ }
69
+ context.fail(_this, `Nt a valid filter expression string`, input);
70
+ });
71
+ const encodeFilter = validator('encodeFilter', (input, context, _this) => {
67
72
  if (input instanceof OpraFilter.Ast) {
68
73
  return input.toString();
69
74
  }
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,11 @@ let ObjectIdType = class ObjectIdType {
17
17
  ObjectIdType = __decorate([
18
18
  SimpleType({
19
19
  description: 'A MongoDB ObjectID value',
20
- })
20
+ nameMappings: {
21
+ js: 'object',
22
+ json: 'string',
23
+ },
24
+ }),
25
+ __metadata("design:paramtypes", [Object])
21
26
  ], ObjectIdType);
22
27
  export { ObjectIdType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { ApiField } from '../api-field.js';
3
3
  import { ComplexType } from '../complex-type.js';
4
4
  let OperationResult = class OperationResult {
@@ -8,30 +8,38 @@ let OperationResult = class OperationResult {
8
8
  }
9
9
  };
10
10
  __decorate([
11
- ApiField()
11
+ ApiField(),
12
+ __metadata("design:type", Number)
12
13
  ], OperationResult.prototype, "affected", void 0);
13
14
  __decorate([
14
- ApiField()
15
+ ApiField(),
16
+ __metadata("design:type", Number)
15
17
  ], OperationResult.prototype, "totalMatches", void 0);
16
18
  __decorate([
17
- ApiField()
19
+ ApiField(),
20
+ __metadata("design:type", String)
18
21
  ], OperationResult.prototype, "context", void 0);
19
22
  __decorate([
20
- ApiField()
23
+ ApiField(),
24
+ __metadata("design:type", String)
21
25
  ], OperationResult.prototype, "type", void 0);
22
26
  __decorate([
23
- ApiField()
27
+ ApiField(),
28
+ __metadata("design:type", String)
24
29
  ], OperationResult.prototype, "message", void 0);
25
30
  __decorate([
26
- ApiField({ type: 'any' })
31
+ ApiField({ type: 'any' }),
32
+ __metadata("design:type", Object)
27
33
  ], OperationResult.prototype, "payload", void 0);
28
34
  __decorate([
29
- ApiField({ type: 'object' })
35
+ ApiField({ type: 'object' }),
36
+ __metadata("design:type", Array)
30
37
  ], OperationResult.prototype, "errors", void 0);
31
38
  OperationResult = __decorate([
32
39
  ComplexType({
33
40
  description: 'Operation result',
34
- })
41
+ }),
42
+ __metadata("design:paramtypes", [Object])
35
43
  ], OperationResult);
36
44
  export { OperationResult };
37
45
  (function (OperationResult) {
@@ -42,10 +50,12 @@ export { OperationResult };
42
50
  }
43
51
  };
44
52
  __decorate([
45
- ApiField({ type, required: true })
53
+ ApiField({ type, required: true }),
54
+ __metadata("design:type", Object)
46
55
  ], OperationResult_.prototype, "payload", void 0);
47
56
  OperationResult_ = __decorate([
48
- ComplexType({ embedded: true })
57
+ ComplexType({ embedded: true }),
58
+ __metadata("design:paramtypes", [Object])
49
59
  ], OperationResult_);
50
60
  return OperationResult_;
51
61
  }
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -27,18 +27,25 @@ let TimeType = class TimeType {
27
27
  __decorate([
28
28
  SimpleType.Attribute({
29
29
  description: 'Minimum value',
30
- })
30
+ }),
31
+ __metadata("design:type", String)
31
32
  ], TimeType.prototype, "minValue", void 0);
32
33
  __decorate([
33
34
  SimpleType.Attribute({
34
35
  description: 'Maximum value',
35
- })
36
+ }),
37
+ __metadata("design:type", String)
36
38
  ], TimeType.prototype, "maxValue", void 0);
37
39
  TimeType = __decorate([
38
- SimpleType({
40
+ (SimpleType({
39
41
  description: 'Time string in 24h format',
42
+ nameMappings: {
43
+ js: 'string',
44
+ json: 'string',
45
+ },
40
46
  })
41
47
  .Example('18:23:00', 'Full time value')
42
- .Example('18:23:00', 'Time value without seconds')
48
+ .Example('18:23:00', 'Time value without seconds')),
49
+ __metadata("design:paramtypes", [Object])
43
50
  ], TimeType);
44
51
  export { TimeType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -15,8 +15,13 @@ let UrlType = class UrlType {
15
15
  }
16
16
  };
17
17
  UrlType = __decorate([
18
- SimpleType({
18
+ (SimpleType({
19
19
  description: 'A Uniform Resource Identifier Reference (RFC 3986 icon) value',
20
- }).Example('http://tempuri.org')
20
+ nameMappings: {
21
+ js: 'string',
22
+ json: 'string',
23
+ },
24
+ }).Example('http://tempuri.org')),
25
+ __metadata("design:paramtypes", [Object])
21
26
  ], UrlType);
22
27
  export { UrlType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -17,11 +17,17 @@ let UuidType = class UuidType {
17
17
  __decorate([
18
18
  SimpleType.Attribute({
19
19
  description: 'Version of the UUID',
20
- })
20
+ }),
21
+ __metadata("design:type", Number)
21
22
  ], UuidType.prototype, "version", void 0);
22
23
  UuidType = __decorate([
23
24
  SimpleType({
24
25
  description: 'A Universal Unique Identifier (UUID) value',
25
- })
26
+ nameMappings: {
27
+ js: 'string',
28
+ json: 'string',
29
+ },
30
+ }),
31
+ __metadata("design:paramtypes", [Object])
26
32
  ], UuidType);
27
33
  export { UuidType };
@@ -4,6 +4,7 @@ import { omitUndefined } from '../../helpers/index.js';
4
4
  import { OpraSchema } from '../../schema/index.js';
5
5
  import { ApiField } from './api-field.js';
6
6
  import { ComplexTypeBase } from './complex-type-base.js';
7
+ import { DataType } from './data-type.js';
7
8
  import { getIsInheritedPredicateFn } from './utils/get-is-inherited-predicate-fn.js';
8
9
  /**
9
10
  * MappedType constructor
@@ -18,22 +19,25 @@ export const MappedType = function (...args) {
18
19
  _this.kind = OpraSchema.MappedType.Kind;
19
20
  if (initArgs.base) {
20
21
  // noinspection SuspiciousTypeOfGuard
21
- if (!(initArgs.base instanceof ComplexTypeBase))
22
+ if (!(initArgs.base instanceof ComplexTypeBase)) {
22
23
  throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${this.kind}"`);
24
+ }
23
25
  _this.base = initArgs.base;
24
26
  _this.ctor = initArgs.ctor || _this.base.ctor;
25
27
  if (initArgs.pick)
26
28
  _this.pick = initArgs.pick.map(f => _this.base.normalizeFieldPath(f));
27
29
  else if (initArgs.omit)
28
30
  _this.omit = initArgs.omit.map(f => _this.base.normalizeFieldPath(f));
29
- else if (initArgs.partial)
31
+ else if (initArgs.partial) {
30
32
  _this.partial = Array.isArray(initArgs.partial)
31
33
  ? initArgs.partial.map(f => _this.base.normalizeFieldPath(f))
32
34
  : initArgs.partial;
33
- else if (initArgs.required)
35
+ }
36
+ else if (initArgs.required) {
34
37
  _this.required = Array.isArray(initArgs.required)
35
38
  ? initArgs.required.map(f => _this.base.normalizeFieldPath(f))
36
39
  : initArgs.required;
40
+ }
37
41
  /** Copy fields from base */
38
42
  const isInheritedPredicate = getIsInheritedPredicateFn(_this.pick, _this.omit);
39
43
  const partial = Array.isArray(_this.partial) ? _this.partial.map(x => x.toLowerCase()) : _this.partial;
@@ -53,8 +57,9 @@ export const MappedType = function (...args) {
53
57
  }
54
58
  if (!_this.pick ||
55
59
  _this.base.additionalFields === false ||
56
- (Array.isArray(_this.base.additionalFields) && _this.base.additionalFields?.[0] === 'error'))
60
+ (Array.isArray(_this.base.additionalFields) && _this.base.additionalFields?.[0] === 'error')) {
57
61
  _this.additionalFields = _this.base.additionalFields;
62
+ }
58
63
  if (initArgs.base.keyField && isInheritedPredicate(initArgs.base.keyField))
59
64
  _this.keyField = initArgs.base.keyField;
60
65
  }
@@ -65,6 +70,8 @@ export const MappedType = function (...args) {
65
70
  */
66
71
  class MappedTypeClass extends ComplexTypeBase {
67
72
  extendsFrom(baseType) {
73
+ if (!(baseType instanceof DataType))
74
+ baseType = this.node.getDataType(baseType);
68
75
  if (!(baseType instanceof ComplexTypeBase))
69
76
  return false;
70
77
  if (baseType === this)
@@ -85,4 +92,4 @@ class MappedTypeClass extends ComplexTypeBase {
85
92
  }
86
93
  }
87
94
  MappedType.prototype = MappedTypeClass.prototype;
88
- MappedType._applyMixin = () => void 0;
95
+ MappedType._applyMixin = () => undefined;
@@ -5,6 +5,7 @@ import { OpraSchema } from '../../schema/index.js';
5
5
  import { DATATYPE_METADATA, DECORATOR } from '../constants.js';
6
6
  import { ApiField } from './api-field.js';
7
7
  import { ComplexTypeBase } from './complex-type-base.js';
8
+ import { DataType } from './data-type.js';
8
9
  /**
9
10
  * @class MixinType
10
11
  */
@@ -40,6 +41,8 @@ export const MixinType = function (...args) {
40
41
  */
41
42
  class MixinTypeClass extends ComplexTypeBase {
42
43
  extendsFrom(baseType) {
44
+ if (!(baseType instanceof DataType))
45
+ baseType = this.node.getDataType(baseType);
43
46
  if (!(baseType instanceof ComplexTypeBase))
44
47
  return false;
45
48
  if (baseType === this)
@@ -94,8 +97,9 @@ function MixinTypeFactory(...args) {
94
97
  if (!(itemMeta &&
95
98
  (itemMeta.kind === OpraSchema.ComplexType.Kind ||
96
99
  itemMeta.kind === OpraSchema.MixinType.Kind ||
97
- itemMeta.kind === OpraSchema.MappedType.Kind)))
100
+ itemMeta.kind === OpraSchema.MappedType.Kind))) {
98
101
  throw new TypeError(`Class "${c.name}" is not a ${OpraSchema.ComplexType.Kind}, ${OpraSchema.MixinType.Kind} or ${OpraSchema.MappedType.Kind}`);
102
+ }
99
103
  metadata.types.push(c);
100
104
  mergePrototype(MixinClass.prototype, c.prototype);
101
105
  }
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { isAny } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,7 @@ let AnyType = class AnyType {
17
17
  AnyType = __decorate([
18
18
  SimpleType({
19
19
  description: 'Represents any value',
20
- })
20
+ }),
21
+ __metadata("design:paramtypes", [Object])
21
22
  ], AnyType);
22
23
  export { AnyType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { toBigint, vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -22,6 +22,11 @@ let BigintType = class BigintType extends NumberType {
22
22
  BigintType = __decorate([
23
23
  SimpleType({
24
24
  description: 'BigInt number',
25
- })
25
+ nameMappings: {
26
+ js: 'bigint',
27
+ json: 'string',
28
+ },
29
+ }),
30
+ __metadata("design:paramtypes", [Object])
26
31
  ], BigintType);
27
32
  export { BigintType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { toBoolean } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,11 @@ let BooleanType = class BooleanType {
17
17
  BooleanType = __decorate([
18
18
  SimpleType({
19
19
  description: 'Simple true/false value',
20
- })
20
+ nameMappings: {
21
+ js: 'boolean',
22
+ json: 'boolean',
23
+ },
24
+ }),
25
+ __metadata("design:paramtypes", [Object])
21
26
  ], BooleanType);
22
27
  export { BooleanType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { toInteger, vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -22,6 +22,11 @@ let IntegerType = class IntegerType extends NumberType {
22
22
  IntegerType = __decorate([
23
23
  SimpleType({
24
24
  description: 'An integer number',
25
- })
25
+ nameMappings: {
26
+ js: 'number',
27
+ json: 'number',
28
+ },
29
+ }),
30
+ __metadata("design:paramtypes", [Object])
26
31
  ], IntegerType);
27
32
  export { IntegerType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { isNull } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,11 @@ let NullType = class NullType {
17
17
  NullType = __decorate([
18
18
  SimpleType({
19
19
  description: 'A Null value',
20
- })
20
+ nameMappings: {
21
+ js: 'null',
22
+ json: 'null',
23
+ },
24
+ }),
25
+ __metadata("design:paramtypes", [Object])
21
26
  ], NullType);
22
27
  export { NullType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { toNumber, vg } from 'valgen';
3
3
  import { DECODER, ENCODER } from '../../constants.js';
4
4
  import { SimpleType } from '../simple-type.js';
@@ -22,16 +22,23 @@ let NumberType = class NumberType {
22
22
  __decorate([
23
23
  SimpleType.Attribute({
24
24
  description: 'Determines the minimum value',
25
- })
25
+ }),
26
+ __metadata("design:type", Number)
26
27
  ], NumberType.prototype, "minValue", void 0);
27
28
  __decorate([
28
29
  SimpleType.Attribute({
29
30
  description: 'Determines the maximum value',
30
- })
31
+ }),
32
+ __metadata("design:type", Number)
31
33
  ], NumberType.prototype, "maxValue", void 0);
32
34
  NumberType = __decorate([
33
35
  SimpleType({
34
36
  description: 'Both Integer as well as Floating-Point numbers',
35
- })
37
+ nameMappings: {
38
+ js: 'number',
39
+ json: 'number',
40
+ },
41
+ }),
42
+ __metadata("design:paramtypes", [Object])
36
43
  ], NumberType);
37
44
  export { NumberType };
@@ -1,4 +1,4 @@
1
- import { __decorate } from "tslib";
1
+ import { __decorate, __metadata } from "tslib";
2
2
  import { DATATYPE_METADATA } from '../../constants.js';
3
3
  import { ComplexType } from '../complex-type.js';
4
4
  let ObjectType = class ObjectType {
@@ -12,7 +12,8 @@ ObjectType = __decorate([
12
12
  name: 'object',
13
13
  description: 'A non modelled object',
14
14
  additionalFields: true,
15
- })
15
+ }),
16
+ __metadata("design:paramtypes", [Object])
16
17
  ], ObjectType);
17
18
  export { ObjectType };
18
19
  const metadata = Reflect.getMetadata(DATATYPE_METADATA, ObjectType);