Skip to content

feat: add collapseSamePrefixes option to prevent duplication inside namespaced component name #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<script>
export default {
name: 'CollapseFolderAndComponentPrefixes',
}
</script>

<template>
<h3>CollapseFolderAndComponentPrefixes Component: <code>collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue</code></h3>
</template>
27 changes: 25 additions & 2 deletions src/core/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export function stringifyComponentImport({ as: name, from: path, name: importNam
}

export function getNameFromFilePath(filePath: string, options: ResolvedOptions): string {
const { resolvedDirs, directoryAsNamespace, globalNamespaces } = options
const { resolvedDirs, directoryAsNamespace, globalNamespaces, collapseSamePrefixes } = options

const parsedFilePath = parse(slash(filePath))

Expand Down Expand Up @@ -144,7 +144,30 @@ export function getNameFromFilePath(filePath: string, options: ResolvedOptions):

if (!isEmpty(folders)) {
// add folders to filename
filename = [...folders, filename].filter(Boolean).join('-')
let namespaced = [...folders, filename]

if (collapseSamePrefixes) {
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
}

collapsed.push(fileOrFolderName)
}

namespaced = collapsed
}

filename = namespaced.filter(Boolean).join('-')
}

return filename
Expand Down
12 changes: 11 additions & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,19 @@ export interface Options {
*/
directoryAsNamespace?: boolean

/**
* Collapse same prefixes (case-insensitive) of folders and components
* to prevent duplication inside namespaced component name
*
* Works when `directoryAsNamespace: true`
* @default false
*/
collapseSamePrefixes?: boolean

/**
* Subdirectory paths for ignoring namespace prefixes
* works when `directoryAsNamespace: true`
*
* Works when `directoryAsNamespace: true`
* @default "[]"
*/
globalNamespaces?: string[]
Expand Down
57 changes: 57 additions & 0 deletions test/__snapshots__/search.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,54 @@
// Vitest Snapshot v1

exports[`search > should with namespace & collapse 1`] = `
[
{
"as": "Avatar",
"from": "src/components/global/avatar.vue",
},
{
"as": "Book",
"from": "src/components/book/index.vue",
},
{
"as": "CollapseFolderAndComponentPrefixes",
"from": "src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue",
},
{
"as": "ComponentA",
"from": "src/components/ComponentA.vue",
},
{
"as": "ComponentAsync",
"from": "src/components/ComponentAsync.vue",
},
{
"as": "ComponentB",
"from": "src/components/ComponentB.vue",
},
{
"as": "ComponentC",
"from": "src/components/component-c.vue",
},
{
"as": "ComponentD",
"from": "src/components/ComponentD.vue",
},
{
"as": "Recursive",
"from": "src/components/Recursive.vue",
},
{
"as": "UiButton",
"from": "src/components/ui/button.vue",
},
{
"as": "UiNestedCheckbox",
"from": "src/components/ui/nested/checkbox.vue",
},
]
`;

exports[`search > should with namespace 1`] = `
[
{
Expand All @@ -10,6 +59,10 @@ exports[`search > should with namespace 1`] = `
"as": "Book",
"from": "src/components/book/index.vue",
},
{
"as": "CollapseCollapseFolderAndCollapseFolderAndComponentPrefixes",
"from": "src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue",
},
{
"as": "ComponentA",
"from": "src/components/ComponentA.vue",
Expand Down Expand Up @@ -63,6 +116,10 @@ exports[`search > should work 1`] = `
"as": "Checkbox",
"from": "src/components/ui/nested/checkbox.vue",
},
{
"as": "CollapseFolderAndComponentPrefixes",
"from": "src/components/collapse/collapseFolderAnd/CollapseFolderAndComponentPrefixes.vue",
},
{
"as": "ComponentA",
"from": "src/components/ComponentA.vue",
Expand Down
12 changes: 12 additions & 0 deletions test/search.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,16 @@ describe('search', () => {

expect(cleanup(ctx.componentNameMap)).toMatchSnapshot()
})

it('should with namespace & collapse', async () => {
const ctx = new Context({
directoryAsNamespace: true,
collapseSamePrefixes: true,
globalNamespaces: ['global'],
})
ctx.setRoot(root)
ctx.searchGlob()

expect(cleanup(ctx.componentNameMap)).toMatchSnapshot()
})
})