@e22m4u/ts-rest-router 0.6.8 → 0.6.10

package/README.md

@@ -407,7 +407,7 @@ class SystemController {
 ## Валидация данных
 
 Модуль интегрирован с
-[@e22m4u/js-data-schema](https://www.npmjs.com/package/@e22m4u/js-data-schema)
+[@e22m4u/ts-data-schema](https://www.npmjs.com/package/@e22m4u/ts-data-schema)
 для гибкой проверки данных. Это дает возможность определять типы данных
 и сложные правила.
 

package/dist/cjs/index.cjs

@@ -93,8 +93,8 @@ var import_js_trie_router3 = require("@e22m4u/js-trie-router");
 // dist/esm/controller-registry.js
 var import_js_format2 = require("@e22m4u/js-format");
 var import_js_trie_router2 = require("@e22m4u/js-trie-router");
-var import_js_data_schema2 = require("@e22m4u/js-data-schema");
-var import_js_data_schema3 = require("@e22m4u/js-data-schema");
+var import_ts_data_schema2 = require("@e22m4u/ts-data-schema");
+var import_ts_data_schema3 = require("@e22m4u/ts-data-schema");
 
 // dist/esm/errors/not-a-controller-error.js
 var import_js_format = require("@e22m4u/js-format");
@@ -211,7 +211,7 @@ var RequestDataSource;
 var REQUEST_DATA_METADATA_KEY = new import_ts_reflector5.MetadataKey("requestDataMetadataKey");
 
 // dist/esm/decorators/request-data/request-data-decorator.js
-var import_js_data_schema = require("@e22m4u/js-data-schema");
+var import_ts_data_schema = require("@e22m4u/ts-data-schema");
 var import_ts_reflector7 = require("@e22m4u/ts-reflector");
 var import_ts_reflector8 = require("@e22m4u/ts-reflector");
 
@@ -264,7 +264,7 @@ function createRequestDataDecoratorWithSource(source) {
     } else if (typeof schemaInput === "string") {
       schema = { type: schemaInput };
     } else {
-      schema = { type: import_js_data_schema.DataType.ANY };
+      schema = { type: import_ts_data_schema.DataType.ANY };
     }
     return requestData({ schema, source });
   };
@@ -272,7 +272,7 @@ function createRequestDataDecoratorWithSource(source) {
 __name(createRequestDataDecoratorWithSource, "createRequestDataDecoratorWithSource");
 function createRequestDataPropertyDecoratorWithSource(source) {
   return function(propertyKey, schemaInput) {
-    const rootSchema = { type: import_js_data_schema.DataType.OBJECT };
+    const rootSchema = { type: import_ts_data_schema.DataType.OBJECT };
     const properties = {};
     let schemaOrFactory = rootSchema;
     if (typeof schemaInput === "function") {
@@ -288,7 +288,7 @@ function createRequestDataPropertyDecoratorWithSource(source) {
       properties[propertyKey] = { type: schemaInput };
       rootSchema.properties = properties;
     } else {
-      properties[propertyKey] = { type: import_js_data_schema.DataType.ANY };
+      properties[propertyKey] = { type: import_ts_data_schema.DataType.ANY };
       rootSchema.properties = properties;
     }
     return requestData({
@@ -566,11 +566,11 @@ function requestContext(propertyName) {
 }
 __name(requestContext, "requestContext");
 function httpRequest() {
-  return requestContext("req");
+  return requestContext("request");
 }
 __name(httpRequest, "httpRequest");
 function httpResponse() {
-  return requestContext("res");
+  return requestContext("response");
 }
 __name(httpResponse, "httpResponse");
 function requestContainer() {
@@ -579,7 +579,7 @@ function requestContainer() {
 __name(requestContainer, "requestContainer");
 
 // dist/esm/controller-registry.js
-var import_js_data_schema4 = require("@e22m4u/js-data-schema");
+var import_ts_data_schema4 = require("@e22m4u/ts-data-schema");
 var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
   /**
    * Controller map.
@@ -860,9 +860,9 @@ var _ControllerRegistry = class _ControllerRegistry extends DebuggableService {
     const requestContextMetadataMap = RequestContextReflector.getMetadata(controllerCtor, actionName);
     const requestDataMetadataMap = RequestDataReflector.getMetadata(controllerCtor, actionName);
     const argsNumber = controllerCtor.prototype[actionName].length;
-    const defaultsApplier = this.getService(import_js_data_schema4.DefaultValuesApplier);
-    const dataTypeCaster = this.getService(import_js_data_schema3.DataTypeCaster);
-    const dataValidator = this.getService(import_js_data_schema2.DataValidator);
+    const defaultsApplier = this.getService(import_ts_data_schema4.DefaultValuesApplier);
+    const dataTypeCaster = this.getService(import_ts_data_schema3.DataTypeCaster);
+    const dataValidator = this.getService(import_ts_data_schema2.DataValidator);
     return (requestContext2) => {
       debug("Executing route handler for %s.%s.", controllerCtor.name, actionName);
       const args = Array(argsNumber).fill(void 0).map((_, index) => {

package/dist/esm/controller-registry.js

@@ -1,14 +1,14 @@
 import { Errorf } from '@e22m4u/js-format';
 import { TrieRouter } from '@e22m4u/js-trie-router';
-import { DataValidator } from '@e22m4u/js-data-schema';
-import { DataTypeCaster } from '@e22m4u/js-data-schema';
+import { DataValidator } from '@e22m4u/ts-data-schema';
+import { DataTypeCaster } from '@e22m4u/ts-data-schema';
 import { NotAControllerError } from './errors/index.js';
 import { RequestDataSource } from './decorators/index.js';
 import { DebuggableService } from './debuggable-service.js';
 import { RestActionReflector } from './decorators/index.js';
 import { RequestDataReflector } from './decorators/index.js';
 import { AfterActionReflector } from './decorators/index.js';
-import { DefaultValuesApplier } from '@e22m4u/js-data-schema';
+import { DefaultValuesApplier } from '@e22m4u/ts-data-schema';
 import { BeforeActionReflector } from './decorators/index.js';
 import { RestControllerReflector } from './decorators/index.js';
 import { RequestContextReflector } from './decorators/index.js';

package/dist/esm/data-schema-types.d.ts

@@ -1,5 +1,5 @@
-import { DataType } from '@e22m4u/js-data-schema';
-import { DataSchema } from '@e22m4u/js-data-schema';
+import { DataType } from '@e22m4u/ts-data-schema';
+import { DataSchema } from '@e22m4u/ts-data-schema';
 import { ServiceContainer } from '@e22m4u/js-service';
 /**
  * Data schema factory.

package/dist/esm/decorators/request-context/request-context-decorator.js

@@ -19,13 +19,13 @@ export function requestContext(propertyName) {
  * HttpRequest decorator.
  */
 export function httpRequest() {
-    return requestContext('req');
+    return requestContext('request');
 }
 /**
  * HttpResponse decorator.
  */
 export function httpResponse() {
-    return requestContext('res');
+    return requestContext('response');
 }
 /**
  * RequestContainer decorator.

package/dist/esm/decorators/request-context/request-context-decorator.spec.js

@@ -36,16 +36,16 @@ describe('requestContext', function () {
             method(prop) { }
         }
         __decorate([
-            __param(0, requestContext('res')),
+            __param(0, requestContext('response')),
             __metadata("design:type", Function),
             __metadata("design:paramtypes", [Object]),
             __metadata("design:returntype", void 0)
         ], Target.prototype, "method", null);
         const res = RequestContextReflector.getMetadata(Target, 'method');
-        expect(res.get(0)).to.be.eql({ property: 'res' });
+        expect(res.get(0)).to.be.eql({ property: 'response' });
     });
     describe('httpRequest', function () {
-        it('should set the "req" property to target metadata', function () {
+        it('should set the "request" property to target metadata', function () {
             class Target {
                 method(prop) { }
             }
@@ -56,11 +56,11 @@ describe('requestContext', function () {
                 __metadata("design:returntype", void 0)
             ], Target.prototype, "method", null);
             const res = RequestContextReflector.getMetadata(Target, 'method');
-            expect(res.get(0)).to.be.eql({ property: 'req' });
+            expect(res.get(0)).to.be.eql({ property: 'request' });
         });
     });
     describe('httpResponse', function () {
-        it('should set the "res" property to target metadata', function () {
+        it('should set the "response" property to target metadata', function () {
             class Target {
                 method(prop) { }
             }
@@ -71,7 +71,7 @@ describe('requestContext', function () {
                 __metadata("design:returntype", void 0)
             ], Target.prototype, "method", null);
             const res = RequestContextReflector.getMetadata(Target, 'method');
-            expect(res.get(0)).to.be.eql({ property: 'res' });
+            expect(res.get(0)).to.be.eql({ property: 'response' });
         });
     });
     describe('requestContainer', function () {

package/dist/esm/decorators/request-context/request-context-reflector.spec.js

@@ -7,8 +7,8 @@ describe('RequestContextReflector', function () {
         it('sets a given value as target metadata', function () {
             class Target {
             }
-            const md1 = { property: 'req' };
-            const md2 = { property: 'res' };
+            const md1 = { property: 'request' };
+            const md2 = { property: 'response' };
             RequestContextReflector.setMetadata(md1, Target, 0, 'propertyKey');
             RequestContextReflector.setMetadata(md2, Target, 1, 'propertyKey');
             const res = Reflector.getOwnMetadata(REQUEST_CONTEXT_METADATA_KEY, Target, 'propertyKey');
@@ -19,8 +19,8 @@ describe('RequestContextReflector', function () {
         it('overrides existing metadata', function () {
             class Target {
             }
-            const md1 = { property: 'req' };
-            const md2 = { property: 'res' };
+            const md1 = { property: 'request' };
+            const md2 = { property: 'response' };
             RequestContextReflector.setMetadata(md1, Target, 0, 'propertyKey');
             const res1 = Reflector.getOwnMetadata(REQUEST_CONTEXT_METADATA_KEY, Target, 'propertyKey');
             expect(res1).to.be.instanceof(Map);
@@ -35,8 +35,8 @@ describe('RequestContextReflector', function () {
         it('returns an existing metadata of the target', function () {
             class Target {
             }
-            const md1 = { property: 'req' };
-            const md2 = { property: 'res' };
+            const md1 = { property: 'request' };
+            const md2 = { property: 'response' };
             const mdMap = new Map([
                 [0, md1],
                 [1, md2],

package/dist/esm/decorators/request-data/request-data-decorator.js

@@ -1,4 +1,4 @@
-import { DataType } from '@e22m4u/js-data-schema';
+import { DataType } from '@e22m4u/ts-data-schema';
 import { DecoratorTargetType } from '@e22m4u/ts-reflector';
 import { getDecoratorTargetType } from '@e22m4u/ts-reflector';
 import { RequestDataSource } from './request-data-metadata.js';

package/dist/esm/decorators/request-data/request-data-decorator.spec.js

@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { expect } from 'chai';
-import { DataType } from '@e22m4u/js-data-schema';
+import { DataType } from '@e22m4u/ts-data-schema';
 import { requestData } from './request-data-decorator.js';
 import { requestBody } from './request-data-decorator.js';
 import { requestField } from './request-data-decorator.js';

package/dist/esm/decorators/response-body/response-body-decorator.spec.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { expect } from 'chai';
-import { DataType } from '@e22m4u/js-data-schema';
+import { DataType } from '@e22m4u/ts-data-schema';
 import { responseBody } from './response-body-decorator.js';
 import { ResponseBodyReflector } from './response-body-reflector.js';
 describe('responseBody', function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/ts-rest-router",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "description": "Декларативный REST-маршрутизатор на основе контроллеров для TypeScript",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -41,11 +41,11 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-data-schema": "~0.4.6",
-    "@e22m4u/js-debug": "~0.3.2",
-    "@e22m4u/js-format": "~0.2.0",
-    "@e22m4u/js-service": "~0.4.5",
-    "@e22m4u/js-trie-router": "~0.3.4",
+    "@e22m4u/ts-data-schema": "~0.4.9",
+    "@e22m4u/js-debug": "~0.3.3",
+    "@e22m4u/js-format": "~0.2.1",
+    "@e22m4u/js-service": "~0.4.6",
+    "@e22m4u/js-trie-router": "~0.4.1",
     "@e22m4u/ts-reflector": "~0.1.8",
     "http-errors": "~2.0.0"
   },
@@ -57,10 +57,10 @@
     "@types/debug": "~4.1.12",
     "@types/http-errors": "~2.0.5",
     "@types/mocha": "~10.0.10",
-    "@types/node": "~24.10.0",
+    "@types/node": "~24.10.1",
     "c8": "~10.1.3",
-    "chai": "~6.2.0",
-    "esbuild": "~0.25.12",
+    "chai": "~6.2.1",
+    "esbuild": "~0.27.0",
     "eslint": "~9.39.1",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
@@ -71,6 +71,6 @@
     "rimraf": "~6.1.0",
     "tsx": "~4.20.6",
     "typescript": "~5.9.3",
-    "typescript-eslint": "~8.46.3"
+    "typescript-eslint": "~8.46.4"
   }
 }

package/src/controller-registry.spec.ts

@@ -34,7 +34,7 @@ import {
 
 import {expect} from 'chai';
 import {Service} from '@e22m4u/js-service';
-import {DataType} from '@e22m4u/js-data-schema';
+import {DataType} from '@e22m4u/ts-data-schema';
 import {ServiceContainer} from '@e22m4u/js-service';
 import {DataSchemaFactory} from './data-schema-types.js';
 import {ControllerRegistry} from './controller-registry.js';

package/src/controller-registry.ts

@@ -2,10 +2,10 @@ import {AnyObject} from './types.js';
 import {Constructor} from './types.js';
 import {Errorf} from '@e22m4u/js-format';
 import {TrieRouter} from '@e22m4u/js-trie-router';
-import {DataSchema} from '@e22m4u/js-data-schema';
+import {DataSchema} from '@e22m4u/ts-data-schema';
 import {RouteHandler} from '@e22m4u/js-trie-router';
-import {DataValidator} from '@e22m4u/js-data-schema';
-import {DataTypeCaster} from '@e22m4u/js-data-schema';
+import {DataValidator} from '@e22m4u/ts-data-schema';
+import {DataTypeCaster} from '@e22m4u/ts-data-schema';
 import {NotAControllerError} from './errors/index.js';
 import {RequestContext} from '@e22m4u/js-trie-router';
 import {RoutePreHandler} from '@e22m4u/js-trie-router';
@@ -15,7 +15,7 @@ import {DebuggableService} from './debuggable-service.js';
 import {RestActionReflector} from './decorators/index.js';
 import {RequestDataReflector} from './decorators/index.js';
 import {AfterActionReflector} from './decorators/index.js';
-import {DefaultValuesApplier} from '@e22m4u/js-data-schema';
+import {DefaultValuesApplier} from '@e22m4u/ts-data-schema';
 import {BeforeActionReflector} from './decorators/index.js';
 import {RestControllerReflector} from './decorators/index.js';
 import {RequestContextReflector} from './decorators/index.js';

package/src/data-schema-types.ts

@@ -1,5 +1,5 @@
-import {DataType} from '@e22m4u/js-data-schema';
-import {DataSchema} from '@e22m4u/js-data-schema';
+import {DataType} from '@e22m4u/ts-data-schema';
+import {DataSchema} from '@e22m4u/ts-data-schema';
 import {ServiceContainer} from '@e22m4u/js-service';
 
 /**

package/src/decorators/request-context/request-context-decorator.spec.ts

@@ -21,16 +21,16 @@ describe('requestContext', function () {
   it('should set the given property to target metadata', function () {
     class Target {
       method(
-        @requestContext('res')
+        @requestContext('response')
         prop: unknown,
       ) {}
     }
     const res = RequestContextReflector.getMetadata(Target, 'method');
-    expect(res.get(0)).to.be.eql({property: 'res'});
+    expect(res.get(0)).to.be.eql({property: 'response'});
   });
 
   describe('httpRequest', function () {
-    it('should set the "req" property to target metadata', function () {
+    it('should set the "request" property to target metadata', function () {
       class Target {
         method(
           @httpRequest()
@@ -38,12 +38,12 @@ describe('requestContext', function () {
         ) {}
       }
       const res = RequestContextReflector.getMetadata(Target, 'method');
-      expect(res.get(0)).to.be.eql({property: 'req'});
+      expect(res.get(0)).to.be.eql({property: 'request'});
     });
   });
 
   describe('httpResponse', function () {
-    it('should set the "res" property to target metadata', function () {
+    it('should set the "response" property to target metadata', function () {
       class Target {
         method(
           @httpResponse()
@@ -51,7 +51,7 @@ describe('requestContext', function () {
         ) {}
       }
       const res = RequestContextReflector.getMetadata(Target, 'method');
-      expect(res.get(0)).to.be.eql({property: 'res'});
+      expect(res.get(0)).to.be.eql({property: 'response'});
     });
   });
 

package/src/decorators/request-context/request-context-decorator.ts

@@ -41,14 +41,14 @@ export function requestContext<T extends object>(
  * HttpRequest decorator.
  */
 export function httpRequest() {
-  return requestContext('req');
+  return requestContext('request');
 }
 
 /**
  * HttpResponse decorator.
  */
 export function httpResponse() {
-  return requestContext('res');
+  return requestContext('response');
 }
 
 /**

package/src/decorators/request-context/request-context-reflector.spec.ts

@@ -8,8 +8,8 @@ describe('RequestContextReflector', function () {
   describe('setMetadata', function () {
     it('sets a given value as target metadata', function () {
       class Target {}
-      const md1 = {property: 'req' as const};
-      const md2 = {property: 'res' as const};
+      const md1 = {property: 'request' as const};
+      const md2 = {property: 'response' as const};
       RequestContextReflector.setMetadata(md1, Target, 0, 'propertyKey');
       RequestContextReflector.setMetadata(md2, Target, 1, 'propertyKey');
       const res = Reflector.getOwnMetadata(
@@ -24,8 +24,8 @@ describe('RequestContextReflector', function () {
 
     it('overrides existing metadata', function () {
       class Target {}
-      const md1 = {property: 'req' as const};
-      const md2 = {property: 'res' as const};
+      const md1 = {property: 'request' as const};
+      const md2 = {property: 'response' as const};
       RequestContextReflector.setMetadata(md1, Target, 0, 'propertyKey');
       const res1 = Reflector.getOwnMetadata(
         REQUEST_CONTEXT_METADATA_KEY,
@@ -48,8 +48,8 @@ describe('RequestContextReflector', function () {
   describe('getMetadata', function () {
     it('returns an existing metadata of the target', function () {
       class Target {}
-      const md1 = {property: 'req' as const};
-      const md2 = {property: 'res' as const};
+      const md1 = {property: 'request' as const};
+      const md2 = {property: 'response' as const};
       const mdMap = new Map<number, RequestContextMetadata>([
         [0, md1],
         [1, md2],

package/src/decorators/request-data/request-data-decorator.spec.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import {expect} from 'chai';
-import {DataType} from '@e22m4u/js-data-schema';
+import {DataType} from '@e22m4u/ts-data-schema';
 import {ServiceContainer} from '@e22m4u/js-service';
 import {requestData} from './request-data-decorator.js';
 import {requestBody} from './request-data-decorator.js';

package/src/decorators/request-data/request-data-decorator.ts

@@ -1,8 +1,8 @@
 import {NoUndef} from '../../types.js';
 import {Prototype} from '../../types.js';
 import {Constructor} from '../../types.js';
-import {DataType} from '@e22m4u/js-data-schema';
-import {DataSchema} from '@e22m4u/js-data-schema';
+import {DataType} from '@e22m4u/ts-data-schema';
+import {DataSchema} from '@e22m4u/ts-data-schema';
 import {DecoratorTargetType} from '@e22m4u/ts-reflector';
 import {getDecoratorTargetType} from '@e22m4u/ts-reflector';
 import {RequestDataSource} from './request-data-metadata.js';

package/src/decorators/response-body/response-body-decorator.spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {DataType} from '@e22m4u/js-data-schema';
+import {DataType} from '@e22m4u/ts-data-schema';
 import {responseBody} from './response-body-decorator.js';
 import {ResponseBodyReflector} from './response-body-reflector.js';