Skip to content

Commit

Permalink
fix(test): duplicates
Browse files Browse the repository at this point in the history
  • Loading branch information
@vogloblinsky
vogloblinsky committed Jul 9, 2021
1 parent a1f2c4b commit 13546c0
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 47 deletions.
49 changes: 16 additions & 33 deletions src/templates/partials/menu.hbs
View file
Expand Up @@ -96,17 +96,15 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse" ${ isNormalMode ? 'id="additional-page-{{id}}"' : 'id="xs-additional-page-{{id}}"' }>
{{#each children}}
<li class="link {{#compare depth ">" 1 }}for-chapter{{depth}}{{/compare}}">
<a href="{{path}}/{{filename}}.html" data-type="entity-link" data-context="sub-entity" data-context-id="additional">{{ name
}}</a>
<a href="{{path}}/{{filename}}.html" data-type="entity-link" data-context="sub-entity" data-context-id="additional">{{ name }}</a>
</li>
{{/each}}
</ul>
</li>
{{/compare}}
{{else}}
<li class="link {{#compare depth ">" 1 }}for-chapter{{depth}}{{/compare}}">
<a href="{{path}}/{{filename}}.html" data-type="entity-link" data-context-id="additional">{{ name
}}</a>
<a href="{{path}}/{{filename}}.html" data-type="entity-link" data-context-id="additional">{{ name }}</a>
</li>
{{/compare}}
{{/each}}
Expand Down Expand Up @@ -139,8 +137,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
'id="xs-components-links-{{id}}"' }>
{{#each compodocLinks.components}}
<li class="link">
<a href="components/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
<a href="components/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -158,8 +155,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
'id="xs-controllers-links-{{id}}"' }>
{{#each compodocLinks.controllers}}
<li class="link">
<a href="controllers/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
<a href="controllers/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -177,8 +173,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
'id="xs-directives-links-{{id}}"' }>
{{#each compodocLinks.directives}}
<li class="link">
<a href="directives/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
<a href="directives/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -196,9 +191,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
'id="xs-injectables-links-{{id}}"' }>
{{#each compodocLinks.injectables}}
<li class="link">
<a href="injectables/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name
}}</a>
<a href="injectables/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -216,8 +209,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
'id="xs-pipes-links-{{id}}"' }>
{{#each compodocLinks.pipes}}
<li class="link">
<a href="pipes/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html"
data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
<a href="pipes/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -240,8 +232,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'components'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="components-links"' : 'id="xs-components-links"' }>
{{#each components}}
<li class="link">
<a href="components/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="components/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -260,8 +251,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'controllers'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="controllers-links"' : 'id="xs-controllers-links"' }>
{{#each controllers}}
<li class="link">
<a href="controllers/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="controllers/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -280,8 +270,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'directives'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="directives-links"' : 'id="xs-directives-links"' }>
{{#each directives}}
<li class="link">
<a href="directives/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="directives/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -299,8 +288,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'classes'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="classes-links"' : 'id="xs-classes-links"' }>
{{#each classes}}
<li class="link">
<a href="classes/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="classes/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -318,8 +306,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'injectables'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="injectables-links"' : 'id="xs-injectables-links"' }>
{{#each injectables}}
<li class="link">
<a href="injectables/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="injectables/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -337,8 +324,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'interceptors'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="interceptors-links"' : 'id="xs-interceptors-links"' }>
{{#each interceptors}}
<li class="link">
<a href="interceptors/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="interceptors/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -355,8 +341,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'guards'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="guards-links"' : 'id="xs-guards-links"' }>
{{#each guards}}
<li class="link">
<a href="guards/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="guards/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -373,8 +358,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'interfaces'}}in{{/isNotToggle}}" ${ isNormalMode ? ' id="interfaces-links"' : 'id="xs-interfaces-links"' }>
{{#each interfaces}}
<li class="link">
<a href="interfaces/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="interfaces/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand All @@ -392,8 +376,7 @@ customElements.define('compodoc-menu', class extends HTMLElement {
<ul class="links collapse {{#isNotToggle 'pipes'}}in{{/isNotToggle}}" ${ isNormalMode ? 'id="pipes-links"' : 'id="xs-pipes-links"' }>
{{#each pipes}}
<li class="link">
<a href="pipes/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{
name }}</a>
<a href="pipes/{{#if duplicateName}}{{duplicateName}}{{else}}{{name}}{{/if}}.html" data-type="entity-link" {{#if deprecated}}class="deprecated-name"{{/if}}>{{ name }}</a>
</li>
{{/each}}
</ul>
Expand Down
19 changes: 5 additions & 14 deletions test/src/cli/cli-duplicates.spec.ts
View file
Expand Up @@ -97,28 +97,19 @@ describe('CLI duplicates support', () => {
});

it('should support component inside module', () => {
let file = read(distFolder + '/js/menu-wc.js');
file = file.replace(
/components-links-module-ValidationDemoModule-([a-zA-Z0-9-])+/g,
'components-links-module-ValidationDemoModule'
);
const file = read(distFolder + '/js/menu-wc.js');
expect(file).to.contain(
`id="xs-components-links-module-ValidationDemoModule"\' }>${eol} <li class="link">${eol} <a href="components/ValidationDemo.html"${eol} data-type="entity-link" data-context="sub-entity" data-context-id="modules" >ValidationDemo</a>`
`<a href="components/ValidationDemo.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" >ValidationDemo</a>`
);
});

it('should support component inside module with duplicate', () => {
let file = read(distFolder + '/js/menu-wc.js');
file = file.replace(
/components-links-module-FooterModule-([a-zA-Z0-9-])+/g,
'components-links-module-FooterModule'
);
// tslint:disable-next-line:max-line-length
const file = read(distFolder + '/js/menu-wc.js');
expect(file).to.contain(
`id="xs-components-links-module-FooterModule"\' }>${eol} <li class="link">${eol} <a href="components/FooterComponent-1.html"${eol} data-type="entity-link" data-context="sub-entity" data-context-id="modules" >FooterComponent</a>`
`<a href="components/FooterComponent-1.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" >FooterComponent</a>`
);
expect(file).to.contain(
`<li class="link">${eol} <a href="components/FooterComponent.html" data-type="entity-link" >FooterComponent</a>`
`<a href="components/FooterComponent.html" data-type="entity-link" data-context="sub-entity" data-context-id="modules" >FooterComponent</a>`
);
});

Expand Down

0 comments on commit 13546c0

Please sign in to comment.