Updated namespace generation

Author: Vladimir Belov

src/tools/build.js

@@ -2,11 +2,11 @@
 
 import {resolve, basename} from 'path';
 import Logger from '@bitrix/logger';
+import colors from 'colors/safe';
 import Directory from '../entities/directory';
 import concat from './concat';
 import report from './report';
 import test from './test';
-import colors from 'colors/safe';
 import rollupBundle from './build/rollup';
 import adjustExtension from './build/adjust-extension';
 import adjustEncoding from './build/adjust-encoding';

src/utils/build-namespace-name.js

@@ -1,16 +1,32 @@
-export default function buildNamespaceName({root = '', extensionName} = {}) {
+// @flow
+interface BuildNamespaceOptions {
+	root: string,
+	extensionName: string,
+}
+
+function buildNamespaceName({root = '', extensionName}: BuildNamespaceOptions = {}) {
 	if (typeof extensionName === 'string') {
-		const fragments = extensionName.split('.')
-			.filter((item, index, arr) => index + 1 < arr.length)
-			.map(item => `${item.charAt(0).toUpperCase()}${item.slice(1)}`);
-		const namespace = fragments.join('.');
+		const namespace = extensionName
+			.split('.')
+			.slice(0, -1)
+			.map((item) => {
+				if (item.length === 2) {
+					return item.toUpperCase();
+				}
+
+				return `${item.charAt(0).toUpperCase()}${item.slice(1)}`;
+			})
+			.join('.');
 
-		if (typeof root === 'string' && root !== '') {
+		if (typeof root === 'string' && root !== '')
+		{
 			return `${root}.${namespace}`;
 		}
 
 		return namespace;
 	}
 
 	return root;
-}
+}
+
+export default buildNamespaceName;

test/utils/build-namespace-name/build-namespace-name.test.js

@@ -39,4 +39,11 @@ describe('utils/build-extension-name', () => {
 	it('Should return empty string if params doesn\'t passed', () => {
 		assert(buildNamespaceName() === '');
 	});
+
+	it('Should return valid namespace', () => {
+		const extensionName = 'ui.fonts.opensans.condensed';
+		const result = 'BX.UI.Fonts.Opensans';
+
+		assert.deepStrictEqual(buildNamespaceName({root: 'BX', extensionName}), result);
+	});
 });