refactor(loader): improve script filter

Author: WittBulter

src/core/loader.ts

@@ -1,19 +1,13 @@
 import { EventHub } from './event'
 import { LoaderEvent } from '../types'
-import { $fetch, isRelativeURL } from '../utils/tools'
+import { $fetch, filterResources } from '../utils/tools'
 
 
 export class Loader {
 
   hub: EventHub
   readonly baseEvent: LoaderEvent = { source: '', type: 'none', success: true, insertScripts: () => {} }
 
-  static resourceReg(str: string): RegExp {
-    return {
-      script: /\<script\s+\S?src\=\"([^"]*)\"/g,
-    }[str]
-  }
-  
   constructor(hub: EventHub) {
     this.hub = hub
   }
@@ -30,26 +24,15 @@ export class Loader {
     urls.forEach(url => {
       $fetch(url, { mode: 'cors' })
       .then(html => {
-        console.log(html)
-        this.scripts(this.filterResources(html, 'script'))
+        this.scripts(filterResources(html, 'script'))
+        this.styles(filterResources(html, 'style'))
       })
       .catch((e) => {
         console.log(e)
       })
     })
   }
 
-  private filterResources(source: string, type: string): string[] {
-    const reg: RegExp = Loader.resourceReg(type), arr: string[] = []
-    let result: string[], num = 10
-    while ((result = reg.exec(source)) && num --) {
-      if (result[1] && !isRelativeURL(result[1])) {
-        arr.push(result[1])
-      }
-    }
-    return arr
-  }
-  
   private loadURL(urls: string[], type: string): void {
     urls.forEach(url => {
       const scriptEvent = Object.assign({}, this.baseEvent, {

src/utils/tools.ts

@@ -1,5 +1,4 @@
 
-
 export const $fetch = (url: string, init: RequestInit = {}) => {
   return fetch(url, Object.assign({ mode: 'no-cors' }, init))
   .then(r => {
@@ -11,3 +10,20 @@ export const $fetch = (url: string, init: RequestInit = {}) => {
 export const isRelativeURL = (path: string) => {
   return path.startsWith('./') || path.startsWith('..')
 }
+
+export const makeResourceReg = (str: string): RegExp => {
+  return {
+    script: /\<script\s+\S?src\=\"([^"]*)\"/g,
+    style: /\<link\s+\S?\s?href\=\"([^"]*.css)\"/,
+  }[str]
+}
+export const filterResources = (source: string, type: string): string[] => {
+  const reg: RegExp = makeResourceReg(type), arr: string[] = []
+  let result: string[], num = 10
+  while ((result = reg.exec(source)) && num --) {
+    if (result[1] && !isRelativeURL(result[1])) {
+      arr.push(result[1])
+    }
+  }
+  return arr
+}