Skip to content

Commit

Permalink
refactor: rename generated classes fields in ClassesGenerator
Browse files Browse the repository at this point in the history
  • Loading branch information
muhammadsammy committed Jul 3, 2020
1 parent 6106f44 commit 63d6351
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/generation/ClassesGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export class ClassesGenerator implements IGenerator {
private readonly separator: string;
private readonly theme: IThemeConfig;
private readonly configScanner: ConfigScanner;
private allGeneratedClasses: typeof defaultClasses;
private allPseudoClasses: string[];
private generatedRegularClasses: typeof defaultClasses;
private generatedPseudoClasses: string[];

constructor(tailwindConfig: TailwindConfig) {
const configScanner = new ConfigScanner(tailwindConfig);
Expand All @@ -20,7 +20,7 @@ export class ClassesGenerator implements IGenerator {
this.theme = configScanner.getTheme();
this.configScanner = configScanner;

this.allGeneratedClasses = {
this.generatedRegularClasses = {
Accessibility: this.accessibility(),
Backgrounds: this.backgrounds(),
Borders: this.borders(),
Expand All @@ -38,20 +38,20 @@ export class ClassesGenerator implements IGenerator {
Typography: this.typography(),
};

this.allPseudoClasses = this.pseudoClasses();
this.generatedPseudoClasses = this.pseudoClasses();
}

// TODO: check if value are nested objects e.g., colors
// this checking is only implemented on colors property
// but better to be done on all other properties

public generate = (): string => {
const allClassesTemplates = Object.keys(this.allGeneratedClasses)
const allClassesTemplates = Object.keys(this.generatedRegularClasses)
.map(classGroup => {
return new ClassesGroupTemplateGenerator(
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
this.allGeneratedClasses[classGroup],
this.generatedRegularClasses[classGroup],
classGroup,
this.prefix,
).generate();
Expand All @@ -62,7 +62,7 @@ export class ClassesGenerator implements IGenerator {
allClassesTemplates +
'\n\n' +
'export type TPseudoClasses =' +
generateTypes(this.allPseudoClasses)
generateTypes(this.generatedPseudoClasses)
);
};

Expand Down Expand Up @@ -386,10 +386,10 @@ export class ClassesGenerator implements IGenerator {
const pseudoClasses: string[] = [];

for (const [variantsKey, variantsForKey] of Object.entries(this.configScanner.getVariants())) {
Object.keys(this.allGeneratedClasses).map(key => {
if (_.has(this.allGeneratedClasses[key as keyof typeof defaultClasses], variantsKey)) {
Object.keys(this.generatedRegularClasses).map(key => {
if (_.has(this.generatedRegularClasses[key as keyof typeof defaultClasses], variantsKey)) {
const generatedClass = _.get(
this.allGeneratedClasses,
this.generatedRegularClasses,
`${key}.${variantsKey}`,
) as string[];
generatedClass.map(classname => {
Expand Down

0 comments on commit 63d6351

Please sign in to comment.