fix: 修复 componet 多引入场景下导致的 bug

TaleLin · Dec 18, 2020 · d978ccc · d978ccc
1 parent 96cb64e
commit d978ccc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -28,7 +28,8 @@ exports.findJson = findJson;
  * @returns {(string | null)}
  */
 function getStr(str, start, end) {
-    let res = str.match(new RegExp(`${start}(.*?)${end}`));
+    const reg = new RegExp(`${start}(.*?)${end}`);
+    let res = str.match(reg);
     return res ? res[1] : null;
 }
 exports.getStr = getStr;
@@ -75,10 +76,21 @@ function getComponentsName(pagesJson, isNodeModules = false, linUiDir, miniProgr
         }
     }
     componentsPath.forEach((item) => {
-        const component = getStr(item, path, '/index');
+        // 当为 /miniprogram_npm/lin-ui/button/index 时
+        const componentWithIndex = getStr(item, path, '/index');
+        if (componentWithIndex) {
+            names.add(componentWithIndex);
+            return;
+        }
+        // 当为 /miniprogram_npm/lin-ui/button/ 时
+        const component = getStr(item, path, '/');
         if (component) {
             names.add(component);
+            return;
         }
+        // 当为 /miniprogram_npm/lin-ui/button 时
+        let arr = item.split(path);
+        names.add(arr[arr.length - 1]);
     });
     return names;
 }

diff --git a/src/utils.ts b/src/utils.ts
@@ -27,7 +27,8 @@ export function findJson(pathArr: Set<string>): Set<string> {
  * @returns {(string | null)}
  */
 export function getStr(str: string, start: string, end: string): string | null {
-    let res = str.match(new RegExp(`${start}(.*?)${end}`))
+    const reg = new RegExp(`${start}(.*?)${end}`)
+    let res = str.match(reg)
     return res ? res[1] : null
 }
 
@@ -75,10 +76,21 @@ export function getComponentsName(pagesJson: Array<PageJson> | PageJson, isNodeM
         }
     }
     componentsPath.forEach((item: string) => {
-        const component = getStr(item, path, '/index')
+        // 当为 /miniprogram_npm/lin-ui/button/index 时
+        const componentWithIndex = getStr(item, path, '/index')
+        if (componentWithIndex) {
+            names.add(componentWithIndex)
+            return
+        }
+        // 当为 /miniprogram_npm/lin-ui/button/ 时
+        const component = getStr(item, path, '/')
         if (component) {
             names.add(component)
+            return
         }
+        // 当为 /miniprogram_npm/lin-ui/button 时
+        let arr = item.split(path)
+        names.add(arr[arr.length - 1])
     })
     return names
 }