@e22m4u/js-trie-router 0.5.4 → 0.5.5

package/dist/cjs/index.cjs

@@ -1968,7 +1968,7 @@ var _RouterBranch = class _RouterBranch extends DebuggableService {
    *
    * @type {TrieRouter}
    */
-  getRouter() {
+  get router() {
     return this._router;
   }
   /**
@@ -1982,8 +1982,8 @@ var _RouterBranch = class _RouterBranch extends DebuggableService {
    *
    * @type {RouterBranchDefinition}
    */
-  getDefinition() {
-    return { ...this._definition };
+  get definition() {
+    return this._definition;
   }
   /**
    * Parent branch.
@@ -1996,7 +1996,7 @@ var _RouterBranch = class _RouterBranch extends DebuggableService {
    *
    * @returns {RouterBranch|undefined}
    */
-  getParentBranch() {
+  get parentBranch() {
     return this._parentBranch;
   }
   /**
@@ -2023,13 +2023,14 @@ var _RouterBranch = class _RouterBranch extends DebuggableService {
     }
     this._parentBranch = parentBranch;
     if (parentBranch) {
-      this._definition = mergeRouterBranchDefinitions(
-        parentBranch.getDefinition(),
+      const mergedDef = mergeRouterBranchDefinitions(
+        parentBranch.definition,
         branchDef
       );
+      this._definition = cloneDeep(mergedDef);
     } else {
       validateRouterBranchDefinition(branchDef);
-      this._definition = branchDef;
+      this._definition = cloneDeep(branchDef);
     }
     this.ctorDebug("Branch %v created.", normalizePath(branchDef.path, true));
     this.ctorDebug("Branch path was %v.", this._definition.path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-trie-router",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "HTTP маршрутизатор для Node.js на основе префиксного дерева",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",

package/src/branch/router-branch.d.ts

@@ -13,12 +13,12 @@ import {
 /**
  * Router branch definition.
  */
-export type RouterBranchDefinition = {
+export interface RouterBranchDefinition {
   path: string;
   preHandler?: RoutePreHandler | RoutePreHandler[];
   postHandler?: RoutePostHandler | RoutePostHandler[];
   meta?: RouteMeta;
-};
+}
 
 /**
  * Router branch.
@@ -27,28 +27,26 @@ export declare class RouterBranch extends DebuggableService {
   /**
    * Get router.
    */
-  getRouter(): TrieRouter;
+  get router(): TrieRouter;
 
   /**
-   * Get parent branch.
+   * Get definition.
    */
-  getParentBranch(): RouterBranch | undefined;
+  get definition(): RouterBranchDefinition;
 
   /**
-   * Get definition.
+   * Get parent branch.
    */
-  getDefinition(): RouterBranchDefinition;
+  get parentBranch(): RouterBranch | undefined;
 
   /**
    * Constructor.
    *
-   * @param container
    * @param router
    * @param branchDef
    * @param parentBranch
    */
   constructor(
-    container: ServiceContainer,
     router: TrieRouter,
     branchDef: RouterBranchDefinition,
     parentBranch?: RouterBranch,

package/src/branch/router-branch.js

@@ -1,4 +1,5 @@
 import {Route} from '../route/index.js';
+import {cloneDeep} from '../utils/index.js';
 import {TrieRouter} from '../trie-router.js';
 import {InvalidArgumentError} from '@e22m4u/js-format';
 import {normalizePath} from '../utils/normalize-path.js';
@@ -35,7 +36,7 @@ export class RouterBranch extends DebuggableService {
    *
    * @type {TrieRouter}
    */
-  getRouter() {
+  get router() {
     return this._router;
   }
 
@@ -51,8 +52,8 @@ export class RouterBranch extends DebuggableService {
    *
    * @type {RouterBranchDefinition}
    */
-  getDefinition() {
-    return {...this._definition};
+  get definition() {
+    return this._definition;
   }
 
   /**
@@ -67,7 +68,7 @@ export class RouterBranch extends DebuggableService {
    *
    * @returns {RouterBranch|undefined}
    */
-  getParentBranch() {
+  get parentBranch() {
     return this._parentBranch;
   }
 
@@ -96,13 +97,14 @@ export class RouterBranch extends DebuggableService {
     }
     this._parentBranch = parentBranch;
     if (parentBranch) {
-      this._definition = mergeRouterBranchDefinitions(
-        parentBranch.getDefinition(),
+      const mergedDef = mergeRouterBranchDefinitions(
+        parentBranch.definition,
         branchDef,
       );
+      this._definition = cloneDeep(mergedDef);
     } else {
       validateRouterBranchDefinition(branchDef);
-      this._definition = branchDef;
+      this._definition = cloneDeep(branchDef);
     }
     this.ctorDebug('Branch %v created.', normalizePath(branchDef.path, true));
     this.ctorDebug('Branch path was %v.', this._definition.path);

package/src/branch/router-branch.spec.js

@@ -16,33 +16,28 @@ describe('RouterBranch', function () {
       const router = new TrieRouter();
       const parent = router.createBranch({path: 'foo'});
       const S = new RouterBranch(router, {path: 'bar'}, parent);
-      expect(S.getDefinition().path).to.be.eq('/foo/bar');
+      expect(S.definition.path).to.be.eq('/foo/bar');
     });
-  });
 
-  describe('getRouter', function () {
-    it('should return the router instance that was provided to the constructor', function () {
+    it('should set a given router to the "router" property', function () {
       const router = new TrieRouter();
       const S = new RouterBranch(router, {path: ROOT_PATH});
-      expect(S.getRouter()).to.be.eq(router);
+      expect(S.router).to.be.eq(router);
     });
-  });
 
-  describe('getDefinition', function () {
-    it('should return the branch definition that was provided to the constructor', function () {
+    it('should set a given definition to the "definition" property as a copy', function () {
       const router = new TrieRouter();
       const branchDef = {path: ROOT_PATH};
       const S = new RouterBranch(router, branchDef);
-      expect(S.getDefinition()).to.be.eql(branchDef);
+      expect(S.definition).to.be.eql(branchDef);
+      expect(S.definition).to.be.not.eq(branchDef);
     });
-  });
 
-  describe('getParentBranch', function () {
-    it('should return the parent branch that was provided to the constructor', function () {
+    it('should set a parent branch to the "parentBranch" property', function () {
       const router = new TrieRouter();
       const parent = router.createBranch({path: ROOT_PATH});
       const S = new RouterBranch(router, {path: ROOT_PATH}, parent);
-      expect(S.getParentBranch()).to.be.eq(parent);
+      expect(S.parentBranch).to.be.eq(parent);
     });
   });
 
@@ -82,7 +77,7 @@ describe('RouterBranch', function () {
       const router = new TrieRouter();
       const S = new RouterBranch(router, {path: 'foo'});
       const res = S.createBranch({path: 'bar'});
-      expect(res.getDefinition().path).to.be.eq('/foo/bar');
+      expect(res.definition.path).to.be.eq('/foo/bar');
     });
   });
 });

package/src/route/route.d.ts

@@ -46,14 +46,14 @@ export type RouteMeta = {
 /**
  * Route definition.
  */
-export type RouteDefinition = {
+export interface RouteDefinition {
   method: string;
   path: string;
   handler: RouteHandler;
   preHandler?: RoutePreHandler | RoutePreHandler[];
   postHandler?: RoutePostHandler | RoutePostHandler[];
   meta?: RouteMeta;
-};
+}
 
 /**
  * Route.

package/src/trie-router.spec.js

@@ -34,7 +34,7 @@ describe('TrieRouter', function () {
       const router = new TrieRouter();
       const branchDef = {path: 'foo'};
       const res = router.createBranch(branchDef);
-      expect(res.getDefinition().path).to.be.eq(branchDef.path);
+      expect(res.definition.path).to.be.eq(branchDef.path);
     });
   });