Skip to content

Feature: adding rules for migrating ionic theme utilities #180

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
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
99 changes: 99 additions & 0 deletions src/helpers/directiveToClass.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import * as ast from '@angular/compiler';
import { NgWalker } from 'codelyzer/angular/ngWalker';
import { BasicTemplateAstVisitor } from 'codelyzer/angular/templates/basicTemplateAstVisitor';
import * as Lint from 'tslint';
import * as ts from 'typescript';

export function generateDescription(directiveCategory?: string, resultantClass?: string) {
return `All directives of ${directiveCategory} category are now replaces with respective classes ${resultantClass}`;
}
export type ReplacementLevel = 'parent' | 'same' | 'child';

export function createDirectiveToClassTemplateVisitorClass(
transformations: Map<string, string>,
directiveCategory: string,
className: string
) {
return class extends BasicTemplateAstVisitor {
visitElement(element: ast.ElementAst, context: any): any {
let errors = [];
for (let [directive, resultantClass] of transformations) {
const foundAttr = element.attrs.find(attr => attr.name === directive);

if (foundAttr) {
errors.push({
attr: foundAttr,
resultantClass: resultantClass
});
}
}
if (errors.length) {
let fixes = [];
let classStartPosition,
classEndPosition,
existingClasses = '',
newClasses = '';
let elementStart = element.sourceSpan.start.offset;
let elementEnd = element.sourceSpan.end.offset;

for (let item of errors) {
const attributePosition: number = this.getSourcePosition(item.attr.sourceSpan.start.offset);
const attributeEndPosition = this.getSourcePosition(item.attr.sourceSpan.end.offset);
fixes.push(Lint.Replacement.deleteFromTo(attributePosition - 1, attributeEndPosition));
newClasses += item.resultantClass + ' ';
}
const foundClassAttr = element.attrs.find(attr => attr.name === 'class');

if (foundClassAttr) {
classStartPosition = this.getSourcePosition(foundClassAttr.sourceSpan.start.offset);
classEndPosition = this.getSourcePosition(foundClassAttr.sourceSpan.end.offset);
existingClasses = foundClassAttr.value;
if (!existingClasses.length) newClasses = newClasses.slice(0, -1);
fixes.push(Lint.Replacement.replaceFromTo(classStartPosition, classEndPosition, `class="${newClasses}${existingClasses}"`));
} else {
if (element.attrs.length) {
const lastAttribute = element.attrs[element.attrs.length - 1];
classStartPosition = this.getSourcePosition(lastAttribute.sourceSpan.end.offset);
} else {
classStartPosition = this.getSourcePosition(element.sourceSpan.end.offset) - 1;
}

classEndPosition = classStartPosition;
if (!existingClasses.length) newClasses = newClasses.slice(0, -1);
fixes.push(Lint.Replacement.replaceFromTo(classStartPosition, classEndPosition, ` class="${newClasses}${existingClasses}"`));
}

this.addFailureAt(elementStart, elementEnd, generateDescription(directiveCategory, className), fixes);
}

super.visitElement(element, context);
}
};
}

export function createDirectiveToClassRuleClass(
ruleName: string,
transformations: Map<string, string>,
directiveCategory: string,
className: string
) {
return class extends Lint.Rules.AbstractRule {
public static metadata: Lint.IRuleMetadata = {
ruleName: ruleName,
type: 'functionality',
description: generateDescription(directiveCategory, className),
options: null,
optionsDescription: 'Not configurable.',
typescriptOnly: false,
hasFix: true
};

public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
return this.applyWithWalker(
new NgWalker(sourceFile, this.getOptions(), {
templateVisitorCtrl: createDirectiveToClassTemplateVisitorClass(transformations, directiveCategory, className)
})
);
}
};
}
5 changes: 4 additions & 1 deletion src/ionActionSheetMethodCreateParametersRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { createParametersRenamedClass } from './helpers/parametersRenamed';

export const ruleName = 'ion-action-sheet-method-create-parameters-renamed';

const parameterMap = new Map([['title', 'header'], ['subTitle', 'subHeader']]);
const parameterMap = new Map([
['title', 'header'],
['subTitle', 'subHeader']
]);
const Walker = createParametersRenamedClass('create', 'ActionSheetController', parameterMap);

export class Rule extends Lint.Rules.AbstractRule {
Expand Down
5 changes: 4 additions & 1 deletion src/ionAlertMethodCreateParametersRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { createParametersRenamedClass } from './helpers/parametersRenamed';

export const ruleName = 'ion-alert-method-create-parameters-renamed';

const parameterMap = new Map([['title', 'header'], ['subTitle', 'subHeader']]);
const parameterMap = new Map([
['title', 'header'],
['subTitle', 'subHeader']
]);
const Walker = createParametersRenamedClass('create', 'AlertController', parameterMap);

export class Rule extends Lint.Rules.AbstractRule {
Expand Down
7 changes: 6 additions & 1 deletion src/ionColAttributesRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ const formatOldAttr = (prefix: string, breakpoint: string | undefined, value: st
const formatNewAttr = (prefix: string, breakpoint: string | undefined, value: string) =>
`${prefix}${typeof breakpoint === 'undefined' ? '' : `-${breakpoint}`}="${value}"`;

const attrPrefixMap = new Map([['col', 'size'], ['offset', 'offset'], ['push', 'push'], ['pull', 'pull']]);
const attrPrefixMap = new Map([
['col', 'size'],
['offset', 'offset'],
['push', 'push'],
['pull', 'pull']
]);
const breakpoints = [undefined, 'xs', 'sm', 'md', 'lg', 'xl'];
const values = ['auto', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];

Expand Down
10 changes: 9 additions & 1 deletion src/ionItemOptionsAttributeValuesRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ import { createAttributeValuesRenamedTemplateVisitorClass } from './helpers/attr

export const ruleName = 'ion-item-options-attribute-values-renamed';

const replacementMap = new Map([['side', new Map([['left', 'start'], ['right', 'end']])]]);
const replacementMap = new Map([
[
'side',
new Map([
['left', 'start'],
['right', 'end']
])
]
]);

const TemplateVisitor = createAttributeValuesRenamedTemplateVisitorClass(['ion-item-options'], replacementMap);

Expand Down
6 changes: 5 additions & 1 deletion src/ionLabelAttributesRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import { createAttributesRenamedTemplateVisitorClass } from './helpers/attribute

export const ruleName = 'ion-label-attributes-renamed';

const replacementMap = new Map([['fixed', 'position="fixed"'], ['floating', 'position="floating"'], ['stacked', 'position="stacked"']]);
const replacementMap = new Map([
['fixed', 'position="fixed"'],
['floating', 'position="floating"'],
['stacked', 'position="stacked"']
]);

const IonButtonAttributesAreRenamedTemplateVisitor = createAttributesRenamedTemplateVisitorClass(['ion-label'], replacementMap);

Expand Down
16 changes: 16 additions & 0 deletions src/ionMarginUtilIsNowAClassRule.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { createDirectiveToClassRuleClass } from './helpers/directiveToClass';

const transformations = new Map([
['margin', 'ion-margin'],
['no-margin', 'ion-no-margin'],
['margin-bottom', 'ion-margin-bottom'],
['margin-top', 'ion-margin-top'],
['margin-left', 'ion-margin-start'],
['margin-right', 'ion-margin-end'],
['margin-horizontal', 'ion-margin-horizontal'],
['margin-vertical', 'ion-margin-vertical']
]);
const directiveCategory = 'margin';
const className = 'ion-margin';
export const ruleName = 'ion-margin-util-is-now-a-class';
export const Rule = createDirectiveToClassRuleClass(ruleName, transformations, directiveCategory, className);
5 changes: 4 additions & 1 deletion src/ionMenuEventsRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import { createAttributesRenamedTemplateVisitorClass } from './helpers/attribute

export const ruleName = 'ion-menu-events-renamed';

const replacementMap = new Map([['ionOpen', 'ionDidOpen'], ['ionClose', 'ionDidClose']]);
const replacementMap = new Map([
['ionOpen', 'ionDidOpen'],
['ionClose', 'ionDidClose']
]);

const TemplateVisitor = createAttributesRenamedTemplateVisitorClass(undefined, replacementMap);

Expand Down
17 changes: 17 additions & 0 deletions src/ionPaddingUtilIsNowAClassRule.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { createDirectiveToClassRuleClass } from './helpers/directiveToClass';

const transformations = new Map([
['padding', 'ion-padding'],
['no-padding', 'ion-no-padding'],
['padding-bottom', 'ion-padding-bottom'],
['padding-top', 'ion-padding-top'],
['padding-left', 'ion-padding-start'],
['padding-right', 'ion-padding-end'],
['padding-horizontal', 'ion-padding-horizontal'],
['padding-vertical', 'ion-padding-vertical']
]);

const directiveCategory = 'padding';
const className = 'ion-padding';
export const ruleName = 'ion-padding-util-is-now-a-class';
export const Rule = createDirectiveToClassRuleClass(ruleName, transformations, directiveCategory, className);
5 changes: 4 additions & 1 deletion src/ionRadioAttributesRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import { createAttributesRenamedTemplateVisitorClass } from './helpers/attribute

export const ruleName = 'ion-radio-attributes-renamed';

const replacementMap = new Map([['item-left', 'slot="start"'], ['item-right', 'slot="end"']]);
const replacementMap = new Map([
['item-left', 'slot="start"'],
['item-right', 'slot="end"']
]);

const IonFabAttributesRenamedTemplateVisitor = createAttributesRenamedTemplateVisitorClass(['ion-radio'], replacementMap);

Expand Down
10 changes: 9 additions & 1 deletion src/ionSpinnerAttributeValuesRenamedRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ import { createAttributeValuesRenamedTemplateVisitorClass } from './helpers/attr

export const ruleName = 'ion-spinner-attribute-values-renamed';

const replacementMap = new Map([['name', new Map([['ios', 'lines'], ['ios-small', 'lines-small']])]]);
const replacementMap = new Map([
[
'name',
new Map([
['ios', 'lines'],
['ios-small', 'lines-small']
])
]
]);
const affectedElements = ['ion-spinner', 'ion-loading', 'ion-infinite-scroll', 'ion-refresher'];

const TemplateVisitor = createAttributeValuesRenamedTemplateVisitorClass(affectedElements, replacementMap);
Expand Down
16 changes: 16 additions & 0 deletions src/ionTextUtilIsNowAClassRule.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { createDirectiveToClassRuleClass } from './helpers/directiveToClass';

const transformations = new Map([
['text-left', 'ion-text-left'],
['text-right', 'ion-text-right'],
['text-start', 'ion-text-start'],
['text-end', 'ion-text-end'],
['text-center', 'ion-text-center'],
['text-justify', 'ion-text-justify'],
['text-wrap', 'ion-text-wrap'],
['text-nowrap', 'ion-text-nowrap']
]);
const directiveCategory = 'text';
const className = 'ion-text';
export const ruleName = 'ion-text-util-is-now-a-class';
export const Rule = createDirectiveToClassRuleClass(ruleName, transformations, directiveCategory, className);
5 changes: 4 additions & 1 deletion test/testHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ function lint(ruleName: string, source: string | ts.SourceFile, options: any): t
linter.lint('file.ts', source, configuration);
} else {
const rules = loadRules(convertRuleOptions(configuration.rules), linterOptions.rulesDirectory, false);
const res = [].concat.apply([], rules.map(r => r.apply(source))) as tslint.RuleFailure[];
const res = [].concat.apply(
[],
rules.map(r => r.apply(source))
) as tslint.RuleFailure[];
const errCount = res.filter(r => !r.getRuleSeverity || r.getRuleSeverity() === 'error').length;
return {
errorCount: errCount,
Expand Down