Fixed #455

Make namespace max depth configurable in idGenerator

Author: rg911

src/core/format/IdGenerator.ts

@@ -15,6 +15,7 @@
  */
 import {sha3_256} from 'js-sha3';
 import * as utilities from './Utilities';
+import { idGeneratorConst } from './Utilities';
 
 export class IdGenerator {
     /**
@@ -34,20 +35,21 @@ export class IdGenerator {
     /**
      * Parses a unified namespace name into a path.
      * @param {string} name The unified namespace name.
+     * @param {number} maxDepth The max namespace depth (network configuration, default: 3)
      * @returns {array<module:coders/uint64~uint64>} The namespace path.
      */
-    public static generateNamespacePath = (name: string) => {
+    public static generateNamespacePath = (name: string, maxDepth: number = idGeneratorConst.default_namespace_max_depth) => {
         if (0 >= name.length) {
             utilities.throwInvalidFqn('having zero length', name);
         }
         let namespaceId = utilities.idGeneratorConst.namespace_base_id;
         const path = [];
         const start = utilities.split(name, (substringStart, size) => {
             namespaceId = utilities.generateNamespaceId(namespaceId, utilities.extractPartName(name, substringStart, size));
-            utilities.append(path, namespaceId, name);
+            utilities.append(path, namespaceId, name, maxDepth);
         });
         namespaceId = utilities.generateNamespaceId(namespaceId, utilities.extractPartName(name, start, name.length - start));
-        utilities.append(path, namespaceId, name);
+        utilities.append(path, namespaceId, name, maxDepth);
         return path;
     }
 }

src/core/format/Utilities.ts

@@ -94,7 +94,7 @@ export const tryParseUint = (str) => {
 
 export const idGeneratorConst = {
     namespace_base_id: [0, 0],
-    namespace_max_depth: 3,
+    default_namespace_max_depth: 3,
     name_pattern: /^[a-z0-9][a-z0-9-_]*$/,
 };
 
@@ -113,8 +113,8 @@ export const extractPartName = (name, start, size) => {
     return partName;
 };
 
-export const append = (path, id, name) => {
-    if (idGeneratorConst.namespace_max_depth === path.length) {
+export const append = (path, id, name, maxDepth) => {
+    if (maxDepth === path.length) {
         this.throwInvalidFqn('too many parts', name);
     }
     path.push(id);

test/core/format/IdGenerator.spec.ts

@@ -246,6 +246,9 @@ describe('id generator', () => {
                 expect(() => idGenerator.generateNamespacePath(name), `name ${name}`).to.throw('invalid part name'));
         });
 
+        it('rejects names depth exceeds maxDepth', () => {
+            expect(() => idGenerator.generateNamespacePath('nem.xem', 1)).to.throw(Error, 'too many parts');
+        });
         addBasicTests(idGenerator.generateNamespacePath);
     });
 });