fix(collapseSamePrefixes): missing collapse when prefix did not match…

… from beginning (#563) Fixes #546
unplugin · Dec 21, 2022 · a6e700c · a6e700c
1 parent a495847
commit a6e700c
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 29 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "prettier.enable": false
 }
diff --git a/README.md b/README.md
@@ -338,7 +338,12 @@ Components({
 
   // Allow subdirectories as namespace prefix for components.
   directoryAsNamespace: false,
-  // Subdirectory paths for ignoring namespace prefixes
+
+  // Collapse same prefixes (camel-sensitive) of folders and components
+  // to prevent duplication inside namespaced component name.
+  // works when `directoryAsNamespace: true`
+  collapseSamePrefixes: false,
+  // Subdirectory paths for ignoring namespace prefixes.
   // works when `directoryAsNamespace: true`
   globalNamespaces: [],
 

diff --git a/...s/vite-vue3/src/components/collapse/collapseFolder/CollapseFolderAndComponentFromRoot.vue b/...s/vite-vue3/src/components/collapse/collapseFolder/CollapseFolderAndComponentFromRoot.vue
@@ -0,0 +1,9 @@
+<script>
+export default {
+  name: 'CollapseFolderAndComponentFromRoot',
+}
+</script>
+
+<template>
+  <h3>CollapseFolderAndComponentFromRoot Component: <code>collapse/collapseFolder/CollapseFolderAndComponentFromRoot.vue</code></h3>
+</template>
diff --git a/examples/vite-vue3/src/components/collapse/collapseFolder/FolderAndComponentPartially.vue b/examples/vite-vue3/src/components/collapse/collapseFolder/FolderAndComponentPartially.vue
@@ -0,0 +1,9 @@
+<script>
+export default {
+  name: 'FolderAndComponentPartially',
+}
+</script>
+
+<template>
+  <h3>FolderAndComponentPartially Component: <code>collapse/collapseFolder/FolderAndComponentPartially.vue</code></h3>
+</template>
diff --git a/...ite-vue3/src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue b/...ite-vue3/src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue
diff --git a/src/core/utils.ts b/src/core/utils.ts
@@ -156,18 +156,24 @@ export function getNameFromFilePath(filePath: string, options: ResolvedOptions):
         const collapsed: string[] = []
 
         for (const fileOrFolderName of namespaced) {
-          const collapsedFilename = collapsed.join('')
-          if (
-            collapsedFilename
-            && fileOrFolderName.toLowerCase().startsWith(collapsedFilename.toLowerCase())
-          ) {
-            const collapseSamePrefix = fileOrFolderName.slice(collapsedFilename.length)
-
-            collapsed.push(collapseSamePrefix)
-            continue
+          let cumulativePrefix = ''
+          let didCollapse = false
+
+          for (const parentFolder of [...collapsed].reverse()) {
+            cumulativePrefix = `${capitalize(parentFolder)}${cumulativePrefix}`
+
+            if (pascalCase(fileOrFolderName).startsWith(pascalCase(cumulativePrefix))) {
+              const collapseSamePrefix = fileOrFolderName.slice(cumulativePrefix.length)
+
+              collapsed.push(collapseSamePrefix)
+
+              didCollapse = true
+              break
+            }
           }
 
-          collapsed.push(fileOrFolderName)
+          if (!didCollapse)
+            collapsed.push(fileOrFolderName)
         }
 
         namespaced = collapsed

diff --git a/src/types.ts b/src/types.ts
@@ -103,8 +103,8 @@ export interface Options {
   directoryAsNamespace?: boolean
 
   /**
-   * Collapse same prefixes (case-insensitive) of folders and components
-   * to prevent duplication inside namespaced component name
+   * Collapse same prefixes (camel-sensitive) of folders and components
+   * to prevent duplication inside namespaced component name.
    *
    * Works when `directoryAsNamespace: true`
    * @default false

diff --git a/test/__snapshots__/search.test.ts.snap b/test/__snapshots__/search.test.ts.snap
@@ -11,8 +11,12 @@ exports[`search > should with namespace & collapse 1`] = `
     "from": "src/components/book/index.vue",
   },
   {
-    "as": "CollapseFolderAndComponentPrefixes",
-    "from": "src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue",
+    "as": "CollapseFolderAndComponentFromRoot",
+    "from": "src/components/collapse/collapseFolder/CollapseFolderAndComponentFromRoot.vue",
+  },
+  {
+    "as": "CollapseFolderAndComponentPartially",
+    "from": "src/components/collapse/collapseFolder/FolderAndComponentPartially.vue",
   },
   {
     "as": "ComponentA",
@@ -60,8 +64,12 @@ exports[`search > should with namespace 1`] = `
     "from": "src/components/book/index.vue",
   },
   {
-    "as": "CollapseCollapseFolderAndCollapseFolderAndComponentPrefixes",
-    "from": "src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue",
+    "as": "CollapseCollapseFolderCollapseFolderAndComponentFromRoot",
+    "from": "src/components/collapse/collapseFolder/CollapseFolderAndComponentFromRoot.vue",
+  },
+  {
+    "as": "CollapseCollapseFolderFolderAndComponentPartially",
+    "from": "src/components/collapse/collapseFolder/FolderAndComponentPartially.vue",
   },
   {
     "as": "ComponentA",
@@ -117,8 +125,8 @@ exports[`search > should work 1`] = `
     "from": "src/components/ui/nested/checkbox.vue",
   },
   {
-    "as": "CollapseFolderAndComponentPrefixes",
-    "from": "src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue",
+    "as": "CollapseFolderAndComponentFromRoot",
+    "from": "src/components/collapse/collapseFolder/CollapseFolderAndComponentFromRoot.vue",
   },
   {
     "as": "ComponentA",
@@ -140,6 +148,10 @@ exports[`search > should work 1`] = `
     "as": "ComponentD",
     "from": "src/components/ComponentD.vue",
   },
+  {
+    "as": "FolderAndComponentPartially",
+    "from": "src/components/collapse/collapseFolder/FolderAndComponentPartially.vue",
+  },
   {
     "as": "Recursive",
     "from": "src/components/Recursive.vue",