@e22m4u/ts-rest-router 0.2.5 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/cjs/index.cjs +14 -14
  2. package/dist/esm/decorators/request-data/request-data-decorator.js +16 -14
  3. package/dist/esm/decorators/request-data/request-data-decorator.spec.js +9 -9
  4. package/package.json +1 -1
  5. package/src/decorators/request-data/request-data-decorator.spec.ts +9 -9
  6. package/src/decorators/request-data/request-data-decorator.ts +19 -3
package/dist/cjs/index.cjs CHANGED
@@ -292,7 +292,7 @@ function requestData(options) {
292
292
  };
293
293
  }
294
294
  __name(requestData, "requestData");
295
- function createRequestDataDecoratorWithSource(source) {
295
+ function createRequestDataDecoratorWithSource(source, defaultType) {
296
296
  return function(schemaOrType) {
297
297
  let schema;
298
298
  if (typeof schemaOrType === "object") {
@@ -300,13 +300,13 @@ function createRequestDataDecoratorWithSource(source) {
300
300
  } else if (typeof schemaOrType === "string") {
301
301
  schema = { type: schemaOrType };
302
302
  } else {
303
- schema = { type: import_ts_data_schema.DataType.ANY };
303
+ schema = { type: defaultType };
304
304
  }
305
305
  return requestData({ schema, source });
306
306
  };
307
307
  }
308
308
  __name(createRequestDataDecoratorWithSource, "createRequestDataDecoratorWithSource");
309
- function createRequestDataPropertyDecoratorWithSource(source) {
309
+ function createRequestDataPropertyDecoratorWithSource(source, defaultType) {
310
310
  return function(propertyKey, schemaOrType) {
311
311
  const properties = {};
312
312
  const rootSchema = { type: import_ts_data_schema.DataType.OBJECT };
@@ -317,7 +317,7 @@ function createRequestDataPropertyDecoratorWithSource(source) {
317
317
  properties[propertyKey] = { type: schemaOrType };
318
318
  rootSchema.properties = properties;
319
319
  } else {
320
- properties[propertyKey] = { type: import_ts_data_schema.DataType.ANY };
320
+ properties[propertyKey] = { type: defaultType };
321
321
  rootSchema.properties = properties;
322
322
  }
323
323
  return requestData({
@@ -328,16 +328,16 @@ function createRequestDataPropertyDecoratorWithSource(source) {
328
328
  };
329
329
  }
330
330
  __name(createRequestDataPropertyDecoratorWithSource, "createRequestDataPropertyDecoratorWithSource");
331
- var requestParams = createRequestDataDecoratorWithSource(RequestDataSource.PARAMS);
332
- var requestParam = createRequestDataPropertyDecoratorWithSource(RequestDataSource.PARAMS);
333
- var requestQueries = createRequestDataDecoratorWithSource(RequestDataSource.QUERY);
334
- var requestQuery = createRequestDataPropertyDecoratorWithSource(RequestDataSource.QUERY);
335
- var requestHeaders = createRequestDataDecoratorWithSource(RequestDataSource.HEADERS);
336
- var requestHeader = createRequestDataPropertyDecoratorWithSource(RequestDataSource.HEADERS);
337
- var requestCookies = createRequestDataDecoratorWithSource(RequestDataSource.COOKIE);
338
- var requestCookie = createRequestDataPropertyDecoratorWithSource(RequestDataSource.COOKIE);
339
- var requestBody = createRequestDataDecoratorWithSource(RequestDataSource.BODY);
340
- var requestField = createRequestDataPropertyDecoratorWithSource(RequestDataSource.BODY);
331
+ var requestParams = createRequestDataDecoratorWithSource(RequestDataSource.PARAMS, import_ts_data_schema.DataType.OBJECT);
332
+ var requestParam = createRequestDataPropertyDecoratorWithSource(RequestDataSource.PARAMS, import_ts_data_schema.DataType.STRING);
333
+ var requestQueries = createRequestDataDecoratorWithSource(RequestDataSource.QUERY, import_ts_data_schema.DataType.OBJECT);
334
+ var requestQuery = createRequestDataPropertyDecoratorWithSource(RequestDataSource.QUERY, import_ts_data_schema.DataType.STRING);
335
+ var requestHeaders = createRequestDataDecoratorWithSource(RequestDataSource.HEADERS, import_ts_data_schema.DataType.OBJECT);
336
+ var requestHeader = createRequestDataPropertyDecoratorWithSource(RequestDataSource.HEADERS, import_ts_data_schema.DataType.STRING);
337
+ var requestCookies = createRequestDataDecoratorWithSource(RequestDataSource.COOKIE, import_ts_data_schema.DataType.OBJECT);
338
+ var requestCookie = createRequestDataPropertyDecoratorWithSource(RequestDataSource.COOKIE, import_ts_data_schema.DataType.STRING);
339
+ var requestBody = createRequestDataDecoratorWithSource(RequestDataSource.BODY, import_ts_data_schema.DataType.OBJECT);
340
+ var requestField = createRequestDataPropertyDecoratorWithSource(RequestDataSource.BODY, import_ts_data_schema.DataType.ANY);
341
341
 
342
342
  // dist/esm/decorators/after-action/after-action-metadata.js
343
343
  var import_ts_reflector9 = require("@e22m4u/ts-reflector");
package/dist/esm/decorators/request-data/request-data-decorator.js CHANGED
@@ -21,8 +21,9 @@ export function requestData(options) {
21
21
  * Create request data decorator with source.
22
22
  *
23
23
  * @param source
24
+ * @param defaultType
24
25
  */
25
- function createRequestDataDecoratorWithSource(source) {
26
+ function createRequestDataDecoratorWithSource(source, defaultType) {
26
27
  return function (schemaOrType) {
27
28
  let schema;
28
29
  if (typeof schemaOrType === 'object') {
@@ -32,7 +33,7 @@ function createRequestDataDecoratorWithSource(source) {
32
33
  schema = { type: schemaOrType };
33
34
  }
34
35
  else {
35
- schema = { type: DataType.ANY };
36
+ schema = { type: defaultType };
36
37
  }
37
38
  return requestData({ schema, source });
38
39
  };
@@ -41,8 +42,9 @@ function createRequestDataDecoratorWithSource(source) {
41
42
  * Create request data property decorator with source.
42
43
  *
43
44
  * @param source
45
+ * @param defaultType
44
46
  */
45
- function createRequestDataPropertyDecoratorWithSource(source) {
47
+ function createRequestDataPropertyDecoratorWithSource(source, defaultType) {
46
48
  return function (propertyKey, schemaOrType) {
47
49
  const properties = {};
48
50
  const rootSchema = { type: DataType.OBJECT };
@@ -55,7 +57,7 @@ function createRequestDataPropertyDecoratorWithSource(source) {
55
57
  rootSchema.properties = properties;
56
58
  }
57
59
  else {
58
- properties[propertyKey] = { type: DataType.ANY };
60
+ properties[propertyKey] = { type: defaultType };
59
61
  rootSchema.properties = properties;
60
62
  }
61
63
  return requestData({
@@ -68,13 +70,13 @@ function createRequestDataPropertyDecoratorWithSource(source) {
68
70
  /**
69
71
  * Decorator aliases.
70
72
  */
71
- export const requestParams = createRequestDataDecoratorWithSource(RequestDataSource.PARAMS);
72
- export const requestParam = createRequestDataPropertyDecoratorWithSource(RequestDataSource.PARAMS);
73
- export const requestQueries = createRequestDataDecoratorWithSource(RequestDataSource.QUERY);
74
- export const requestQuery = createRequestDataPropertyDecoratorWithSource(RequestDataSource.QUERY);
75
- export const requestHeaders = createRequestDataDecoratorWithSource(RequestDataSource.HEADERS);
76
- export const requestHeader = createRequestDataPropertyDecoratorWithSource(RequestDataSource.HEADERS);
77
- export const requestCookies = createRequestDataDecoratorWithSource(RequestDataSource.COOKIE);
78
- export const requestCookie = createRequestDataPropertyDecoratorWithSource(RequestDataSource.COOKIE);
79
- export const requestBody = createRequestDataDecoratorWithSource(RequestDataSource.BODY);
80
- export const requestField = createRequestDataPropertyDecoratorWithSource(RequestDataSource.BODY);
73
+ export const requestParams = createRequestDataDecoratorWithSource(RequestDataSource.PARAMS, DataType.OBJECT);
74
+ export const requestParam = createRequestDataPropertyDecoratorWithSource(RequestDataSource.PARAMS, DataType.STRING);
75
+ export const requestQueries = createRequestDataDecoratorWithSource(RequestDataSource.QUERY, DataType.OBJECT);
76
+ export const requestQuery = createRequestDataPropertyDecoratorWithSource(RequestDataSource.QUERY, DataType.STRING);
77
+ export const requestHeaders = createRequestDataDecoratorWithSource(RequestDataSource.HEADERS, DataType.OBJECT);
78
+ export const requestHeader = createRequestDataPropertyDecoratorWithSource(RequestDataSource.HEADERS, DataType.STRING);
79
+ export const requestCookies = createRequestDataDecoratorWithSource(RequestDataSource.COOKIE, DataType.OBJECT);
80
+ export const requestCookie = createRequestDataPropertyDecoratorWithSource(RequestDataSource.COOKIE, DataType.STRING);
81
+ export const requestBody = createRequestDataDecoratorWithSource(RequestDataSource.BODY, DataType.OBJECT);
82
+ export const requestField = createRequestDataPropertyDecoratorWithSource(RequestDataSource.BODY, DataType.ANY);
package/dist/esm/decorators/request-data/request-data-decorator.spec.js CHANGED
@@ -73,7 +73,7 @@ describe('requestData', function () {
73
73
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
74
74
  expect(res.get(0)).to.be.eql({
75
75
  source: RequestDataSource.PARAMS,
76
- schema: { type: DataType.ANY },
76
+ schema: { type: DataType.OBJECT },
77
77
  });
78
78
  });
79
79
  });
@@ -91,7 +91,7 @@ describe('requestData', function () {
91
91
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
92
92
  expect(res.get(0)).to.be.eql({
93
93
  source: RequestDataSource.QUERY,
94
- schema: { type: DataType.ANY },
94
+ schema: { type: DataType.OBJECT },
95
95
  });
96
96
  });
97
97
  });
@@ -109,7 +109,7 @@ describe('requestData', function () {
109
109
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
110
110
  expect(res.get(0)).to.be.eql({
111
111
  source: RequestDataSource.HEADERS,
112
- schema: { type: DataType.ANY },
112
+ schema: { type: DataType.OBJECT },
113
113
  });
114
114
  });
115
115
  });
@@ -127,7 +127,7 @@ describe('requestData', function () {
127
127
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
128
128
  expect(res.get(0)).to.be.eql({
129
129
  source: RequestDataSource.COOKIE,
130
- schema: { type: DataType.ANY },
130
+ schema: { type: DataType.OBJECT },
131
131
  });
132
132
  });
133
133
  });
@@ -145,7 +145,7 @@ describe('requestData', function () {
145
145
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
146
146
  expect(res.get(0)).to.be.eql({
147
147
  source: RequestDataSource.BODY,
148
- schema: { type: DataType.ANY },
148
+ schema: { type: DataType.OBJECT },
149
149
  });
150
150
  });
151
151
  it('sets a given DataType to the target metadata', function () {
@@ -203,7 +203,7 @@ describe('requestData', function () {
203
203
  type: DataType.OBJECT,
204
204
  properties: {
205
205
  [propertyKey]: {
206
- type: DataType.ANY,
206
+ type: DataType.STRING,
207
207
  },
208
208
  },
209
209
  },
@@ -283,7 +283,7 @@ describe('requestData', function () {
283
283
  type: DataType.OBJECT,
284
284
  properties: {
285
285
  [propertyKey]: {
286
- type: DataType.ANY,
286
+ type: DataType.STRING,
287
287
  },
288
288
  },
289
289
  },
@@ -363,7 +363,7 @@ describe('requestData', function () {
363
363
  type: DataType.OBJECT,
364
364
  properties: {
365
365
  [propertyKey]: {
366
- type: DataType.ANY,
366
+ type: DataType.STRING,
367
367
  },
368
368
  },
369
369
  },
@@ -443,7 +443,7 @@ describe('requestData', function () {
443
443
  type: DataType.OBJECT,
444
444
  properties: {
445
445
  [propertyKey]: {
446
- type: DataType.ANY,
446
+ type: DataType.STRING,
447
447
  },
448
448
  },
449
449
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@e22m4u/ts-rest-router",
3
- "version": "0.2.5",
3
+ "version": "0.2.7",
4
4
  "description": "REST маршрутизатор на основе контроллеров для TypeScript",
5
5
  "author": "e22m4u <e22m4u@yandex.ru>",
6
6
  "license": "MIT",
package/src/decorators/request-data/request-data-decorator.spec.ts CHANGED
@@ -58,7 +58,7 @@ describe('requestData', function () {
58
58
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
59
59
  expect(res.get(0)).to.be.eql({
60
60
  source: RequestDataSource.PARAMS,
61
- schema: {type: DataType.ANY},
61
+ schema: {type: DataType.OBJECT},
62
62
  });
63
63
  });
64
64
  });
@@ -74,7 +74,7 @@ describe('requestData', function () {
74
74
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
75
75
  expect(res.get(0)).to.be.eql({
76
76
  source: RequestDataSource.QUERY,
77
- schema: {type: DataType.ANY},
77
+ schema: {type: DataType.OBJECT},
78
78
  });
79
79
  });
80
80
  });
@@ -90,7 +90,7 @@ describe('requestData', function () {
90
90
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
91
91
  expect(res.get(0)).to.be.eql({
92
92
  source: RequestDataSource.HEADERS,
93
- schema: {type: DataType.ANY},
93
+ schema: {type: DataType.OBJECT},
94
94
  });
95
95
  });
96
96
  });
@@ -106,7 +106,7 @@ describe('requestData', function () {
106
106
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
107
107
  expect(res.get(0)).to.be.eql({
108
108
  source: RequestDataSource.COOKIE,
109
- schema: {type: DataType.ANY},
109
+ schema: {type: DataType.OBJECT},
110
110
  });
111
111
  });
112
112
  });
@@ -122,7 +122,7 @@ describe('requestData', function () {
122
122
  const res = RequestDataReflector.getMetadata(Target, 'myMethod');
123
123
  expect(res.get(0)).to.be.eql({
124
124
  source: RequestDataSource.BODY,
125
- schema: {type: DataType.ANY},
125
+ schema: {type: DataType.OBJECT},
126
126
  });
127
127
  });
128
128
 
@@ -174,7 +174,7 @@ describe('requestData', function () {
174
174
  type: DataType.OBJECT,
175
175
  properties: {
176
176
  [propertyKey]: {
177
- type: DataType.ANY,
177
+ type: DataType.STRING,
178
178
  },
179
179
  },
180
180
  },
@@ -248,7 +248,7 @@ describe('requestData', function () {
248
248
  type: DataType.OBJECT,
249
249
  properties: {
250
250
  [propertyKey]: {
251
- type: DataType.ANY,
251
+ type: DataType.STRING,
252
252
  },
253
253
  },
254
254
  },
@@ -322,7 +322,7 @@ describe('requestData', function () {
322
322
  type: DataType.OBJECT,
323
323
  properties: {
324
324
  [propertyKey]: {
325
- type: DataType.ANY,
325
+ type: DataType.STRING,
326
326
  },
327
327
  },
328
328
  },
@@ -396,7 +396,7 @@ describe('requestData', function () {
396
396
  type: DataType.OBJECT,
397
397
  properties: {
398
398
  [propertyKey]: {
399
- type: DataType.ANY,
399
+ type: DataType.STRING,
400
400
  },
401
401
  },
402
402
  },
package/src/decorators/request-data/request-data-decorator.ts CHANGED
@@ -40,8 +40,12 @@ export function requestData<T extends object>(options: RequestDataOptions) {
40
40
  * Create request data decorator with source.
41
41
  *
42
42
  * @param source
43
+ * @param defaultType
43
44
  */
44
- function createRequestDataDecoratorWithSource(source: RequestDataSource) {
45
+ function createRequestDataDecoratorWithSource(
46
+ source: RequestDataSource,
47
+ defaultType: DataType,
48
+ ) {
45
49
  return function (schemaOrType?: DataSchema | DataType) {
46
50
  let schema: DataSchema;
47
51
  if (typeof schemaOrType === 'object') {
@@ -49,7 +53,7 @@ function createRequestDataDecoratorWithSource(source: RequestDataSource) {
49
53
  } else if (typeof schemaOrType === 'string') {
50
54
  schema = {type: schemaOrType};
51
55
  } else {
52
- schema = {type: DataType.ANY};
56
+ schema = {type: defaultType};
53
57
  }
54
58
  return requestData({schema, source});
55
59
  };
@@ -59,9 +63,11 @@ function createRequestDataDecoratorWithSource(source: RequestDataSource) {
59
63
  * Create request data property decorator with source.
60
64
  *
61
65
  * @param source
66
+ * @param defaultType
62
67
  */
63
68
  function createRequestDataPropertyDecoratorWithSource(
64
69
  source: RequestDataSource,
70
+ defaultType: DataType,
65
71
  ) {
66
72
  return function (propertyKey: string, schemaOrType?: DataSchema | DataType) {
67
73
  const properties = {} as NoUndef<DataSchema['properties']>;
@@ -73,7 +79,7 @@ function createRequestDataPropertyDecoratorWithSource(
73
79
  properties[propertyKey] = {type: schemaOrType};
74
80
  rootSchema.properties = properties;
75
81
  } else {
76
- properties[propertyKey] = {type: DataType.ANY};
82
+ properties[propertyKey] = {type: defaultType};
77
83
  rootSchema.properties = properties;
78
84
  }
79
85
  return requestData({
@@ -89,31 +95,41 @@ function createRequestDataPropertyDecoratorWithSource(
89
95
  */
90
96
  export const requestParams = createRequestDataDecoratorWithSource(
91
97
  RequestDataSource.PARAMS,
98
+ DataType.OBJECT,
92
99
  );
93
100
  export const requestParam = createRequestDataPropertyDecoratorWithSource(
94
101
  RequestDataSource.PARAMS,
102
+ DataType.STRING,
95
103
  );
96
104
  export const requestQueries = createRequestDataDecoratorWithSource(
97
105
  RequestDataSource.QUERY,
106
+ DataType.OBJECT,
98
107
  );
99
108
  export const requestQuery = createRequestDataPropertyDecoratorWithSource(
100
109
  RequestDataSource.QUERY,
110
+ DataType.STRING,
101
111
  );
102
112
  export const requestHeaders = createRequestDataDecoratorWithSource(
103
113
  RequestDataSource.HEADERS,
114
+ DataType.OBJECT,
104
115
  );
105
116
  export const requestHeader = createRequestDataPropertyDecoratorWithSource(
106
117
  RequestDataSource.HEADERS,
118
+ DataType.STRING,
107
119
  );
108
120
  export const requestCookies = createRequestDataDecoratorWithSource(
109
121
  RequestDataSource.COOKIE,
122
+ DataType.OBJECT,
110
123
  );
111
124
  export const requestCookie = createRequestDataPropertyDecoratorWithSource(
112
125
  RequestDataSource.COOKIE,
126
+ DataType.STRING,
113
127
  );
114
128
  export const requestBody = createRequestDataDecoratorWithSource(
115
129
  RequestDataSource.BODY,
130
+ DataType.OBJECT,
116
131
  );
117
132
  export const requestField = createRequestDataPropertyDecoratorWithSource(
118
133
  RequestDataSource.BODY,
134
+ DataType.ANY,
119
135
  );