addressed PR comments - created function to get attributes

hamidbjss · hamidbjss · commit 2ddf496bd970 · 2019-11-21T09:48:23.000Z
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ interface Config {
     position?: 'before' | 'after'
     removeTarget?: boolean
   }
-  attributes?: any
+  attributes?: { [name: string]: string }
 }
 ```
 
diff --git a/src/core/base-plugin.ts b/src/core/base-plugin.ts
@@ -66,6 +66,27 @@ export class BasePlugin {
     }
   }
 
+  protected getAttributesString(config: Config): string {
+    if (config.attributes && typeof config.attributes === 'object') {
+      return (
+        ' ' +
+        Object.keys(config.attributes)
+          .map((key) => `${key}="${config.attributes![key] || ''}"`)
+          .join(' ')
+      )
+    }
+
+    if (config.attributes === undefined && config.attributes === null) {
+      throw new Error(
+        `Please provide a key/value object if intending to use the attributes option, not ${
+          config.attributes
+        }`,
+      )
+    }
+
+    return ''
+  }
+
   protected addStyle({
     html,
     htmlFileName,
@@ -75,25 +96,9 @@ export class BasePlugin {
     htmlFileName: string
     style: string
   }) {
-    let attributesString = ''
-
-    if (this.config.attributes) {
-      if (
-        typeof this.config.attributes !== 'object' &&
-        this.config.attributes === null
-      ) {
-        throw new Error(
-          `Please provide a key/value object if intending to use the attributes option`,
-        )
-      }
-
-      Object.keys(this.config.attributes).map((key) => {
-        const value = this.config.attributes[key] || ''
-        attributesString += ` ${key}="${value}"`
-      })
-    }
-
-    const styleString = `<style${attributesString}>${style}</style>`
+    const styleString = `<style${this.getAttributesString(
+      this.config,
+    )}>${style}</style>`
 
     const replaceValues = [styleString, this.replaceConfig.target]
 
diff --git a/src/types.ts b/src/types.ts
@@ -14,7 +14,7 @@ export interface Config {
   filter?(fileName: string): boolean
   leaveCSSFile?: boolean
   replace?: ReplaceConfig
-  attributes?: any
+  attributes?: { [name: string]: string }
 }
 
 export interface FileCache {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ interface Config {`
`66`	`66`	`position?: 'before' \| 'after'`
`67`	`67`	`removeTarget?: boolean`
`68`	`68`	`}`
`69`		`- attributes?: any`
	`69`	`+ attributes?: { [name: string]: string }`
`70`	`70`	`}`
`71`	`71`	```
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export interface Config {`
`14`	`14`	`filter?(fileName: string): boolean`
`15`	`15`	`leaveCSSFile?: boolean`
`16`	`16`	`replace?: ReplaceConfig`
`17`		`- attributes?: any`
	`17`	`+ attributes?: { [name: string]: string }`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`export interface FileCache {`