v3.0.0

Author: yunbookf

dist/index.js

@@ -12,10 +12,12 @@ const loader = {
     isReady: false,
     readys: [],
     scriptPath: '',
+    head: undefined,
     init: function () {
         let run = () => __awaiter(this, void 0, void 0, function* () {
+            this.head = document.getElementsByTagName('head')[0];
             if (typeof fetch !== 'function') {
-                yield this.loadScript(document.getElementsByTagName('head')[0], 'https://cdn.jsdelivr.net/npm/[email protected]/fetch.min.js');
+                yield this.loadScript('https://cdn.jsdelivr.net/npm/[email protected]/fetch.min.js');
             }
             this.isReady = true;
             for (let func of this.readys) {
@@ -480,8 +482,17 @@ const loader = {
             return list;
         });
     },
-    loadScript: function (el, url) {
-        return new Promise(function (resolve) {
+    loadScript: function (url, el) {
+        return new Promise((resolve) => {
+            if (!el) {
+                if (this.head) {
+                    el = this.head;
+                }
+                else {
+                    el = document.getElementsByTagName('head')[0];
+                    this.head = el;
+                }
+            }
             let script = document.createElement('script');
             script.addEventListener('load', function () {
                 resolve(true);
@@ -493,11 +504,11 @@ const loader = {
             el.appendChild(script);
         });
     },
-    loadScripts: function (el, urls, opt = {}) {
+    loadScripts: function (urls, opt = {}) {
         return new Promise((resolve) => {
             let count = 0;
             for (let url of urls) {
-                this.loadScript(el, url).then(function (res) {
+                this.loadScript(url, opt.el).then(function (res) {
                     var _a, _b;
                     ++count;
                     if (res) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litert/loader",
-  "version": "2.1.5",
+  "version": "3.0.0",
   "description": "Simple browser module loader.",
   "keywords": [
     "litert",
@@ -26,11 +26,11 @@
   "dependencies": {},
   "devDependencies": {
     "@litert/typeguard": "^1.1.0",
-    "@types/node": "^12.20.15",
+    "@types/node": "^12.20.33",
     "@typescript-eslint/eslint-plugin": "^3.10.1",
     "@typescript-eslint/parser": "^3.10.1",
     "electron": "^10.4.7",
-    "eslint": "^7.28.0",
-    "typescript": "^4.3.2"
+    "eslint": "^7.32.0",
+    "typescript": "^4.4.4"
   }
 }

sources/index.ts

@@ -12,13 +12,15 @@ const loader: ILoader = {
     isReady: false,
     readys: [],
     scriptPath: '',
+    head: undefined,
 
     init: function() {
         /** --- 文档装载完毕后需要执行的函数 --- */
         let run = async (): Promise<void> => {
+            this.head = document.getElementsByTagName('head')[0];
             // --- 判断 fetch 是否存在 ---
             if (typeof fetch !== 'function') {
-                await this.loadScript(document.getElementsByTagName('head')[0], 'https://cdn.jsdelivr.net/npm/[email protected]/fetch.min.js');
+                await this.loadScript('https://cdn.jsdelivr.net/npm/[email protected]/fetch.min.js');
             }
             this.isReady = true;
             for (let func of this.readys) {
@@ -541,8 +543,17 @@ const loader: ILoader = {
         return list;
     },
 
-    loadScript: function(el: HTMLElement, url: string): Promise<boolean> {
-        return new Promise(function(resolve) {
+    loadScript: function(url: string, el?: HTMLElement): Promise<boolean> {
+        return new Promise((resolve) => {
+            if (!el) {
+                if (this.head) {
+                    el = this.head;
+                }
+                else {
+                    el = document.getElementsByTagName('head')[0];
+                    this.head = el;
+                }
+            }
             let script = document.createElement('script');
             script.addEventListener('load', function() {
                 resolve(true);
@@ -555,13 +566,14 @@ const loader: ILoader = {
         });
     },
 
-    loadScripts: function(el: HTMLElement, urls: string[], opt: {
+    loadScripts: function(urls: string[], opt: {
         'loaded'?: (url: string, state: number) => void;
+        'el'?: HTMLElement;
     } = {}): Promise<void> {
         return new Promise((resolve) => {
             let count = 0;
             for (let url of urls) {
-                this.loadScript(el, url).then(function(res) {
+                this.loadScript(url, opt.el).then(function(res) {
                     ++count;
                     if (res) {
                         opt.loaded?.(url, 1);

types/loader.d.ts

@@ -5,6 +5,8 @@ interface ILoader {
     readys: Array<() => void | Promise<void>>;
     /** --- 当前 js 加载的基路径，一般为当前 JS 的路径 --- */
     scriptPath: string;
+    /** --- head element --- */
+    head?: HTMLElement;
     /**
      * --- 初始化函数 ---
      */
@@ -65,18 +67,19 @@ interface ILoader {
     }): Promise<Record<string, Blob | string>>;
     /**
      * --- 加载 script 标签 ---
-     * @param el 在此标签中增加
      * @param url 增加的 js 文件地址
+     * @param el 在此标签中增加
      */
-    loadScript(el: HTMLElement, url: string): Promise<boolean>;
+    loadScript(url: string, el?: HTMLElement): Promise<boolean>;
     /**
      * --- 加载多个 script 标签 ---
      * @param el 在此标签中增加
      * @param urls 增加的 js 文件地址列表
      * @param opt loaded 回调函数
      */
-    loadScripts(el: HTMLElement, urls: string[], opt?: {
+    loadScripts(urls: string[], opt?: {
         'loaded'?: (url: string, state: number) => void;
+        'el'?: HTMLElement;
     }): Promise<void>;
     /**
      * --- 代码中异步加载文件 ---