Merge pull request #26 from easyops-cn/fix-scope-prefix

fix(generator): scope is prefixed with `@`
easyops-cn · Dec 3, 2018 · f548fa7 · f548fa7
2 parents 02bf682 + 3566418
commit f548fa7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/__tests__/app.js b/__tests__/app.js
@@ -414,11 +414,11 @@ describe('generator-console-package:app:@console-plugin', () => {
 
 describe('flattenModuleId', () => {
   const testcases = [
-    ['foo', 'bar', 'foo-bar'],
+    ['@foo', 'bar', 'foo-bar'],
     [undefined, 'bar/qux', 'bar-qux'],
-    ['foo', 'bar/qux', 'foo-bar-qux']
+    ['@foo', 'bar/qux', 'foo-bar-qux']
   ];
   it.each(testcases)("flattenModuleId(%s, %s) should return %s", (scope, packageName, expected) => {
     expect(Generator.flattenModuleId(scope, packageName)).toBe(expected);
   })
-});
+});
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -242,10 +242,16 @@ module.exports = class extends Generator {
   }
 };
 
+/**
+ * compute flatten module id from scope and package name
+ * @param scope {string} a scope is prefixed by `@`
+ * @param packageName {string}
+ * @returns {string}
+ */
 Generator.flattenModuleId = function (scope, packageName) {
   const separator = "-";
   if (scope !== undefined) {
-    return [scope].concat(packageName.split("/")).join(separator);
+    return [scope.substring(1)].concat(packageName.split("/")).join(separator);
   }
   return packageName.split("/").join(separator);
 }