devfab 2.1.0 → 2.2.1

package/lib/devfab.js

@@ -2372,7 +2372,12 @@
         domain = [];
       }
       if (Array.isArray(domain) && Array.isArray(deps)) {
-        domain = domain.join('/');
+        // domain = domain.join('/')
+        var domainList = domain;
+        domain = '';
+        domainList.forEach(function (item) {
+          domain += "".concat(item.substr(0, 1) === '/' ? '' : '/').concat(item);
+        });
       }
       var newdeps = domain ? [] : deps;
       if (typeof domain === 'string' && domain && Array.isArray(deps)) {
@@ -2397,7 +2402,12 @@
         domain = [];
       }
       if (Array.isArray(domain) && Array.isArray(deps)) {
-        domain = domain.join('/');
+        // domain = domain.join('/')
+        var domainList = domain;
+        domain = '';
+        domainList.forEach(function (item) {
+          domain += "".concat(item.substr(0, 1) === '/' ? '' : '/').concat(item);
+        });
       }
       var newdeps = domain ? [] : deps;
       if (typeof domain === 'string' && domain && Array.isArray(deps)) {
@@ -2734,127 +2744,6 @@
     }]);
   }();
 
-  /**
-   * 全局污染检测：加载前后 diff window 的 key 集合。
-   *
-   * 为什么需要：二开脚本直接跑在宿主 window 上，A 客户的脚本改了一个全局变量，
-   * B 客户就跟着崩，而且现场无法归因。真做 iframe / Proxy 沙箱成本极高，
-   * 但「加载完能告诉你动了哪些全局」只需要几十行，能挡住大半这类事故。
-   *
-   * 边界（这是观测，不是隔离）：
-   * - 事后告警，不阻止副作用——脚本已经执行过了；
-   * - 并发加载时窗口会重叠，归因以「最后完成的一批」结算，可能不准；
-   * - 只比较可枚举自有属性的**引用**，`window.foo.bar = 1` 这类深层改动检测不到。
-   */
-
-  /** 默认盯防的 key：出现即说明宿主的关键设施被动过 */
-  var DEFAULT_WATCH = ['$', 'jQuery', 'define', 'require', 'requirejs', 'devfab', '__devfab'];
-  var GlobalGuard = /*#__PURE__*/function () {
-    function GlobalGuard(options) {
-      _classCallCheck(this, GlobalGuard);
-      var o = options || {};
-      this.maxPollution = o.maxPollution === undefined ? 3 : Number(o.maxPollution);
-      this.watch = [].concat(o.watch || DEFAULT_WATCH);
-      this.target = o.target || (typeof window !== 'undefined' ? window : null);
-      this.enabled = o.enabled === undefined ? true : !!o.enabled;
-      this._pending = 0;
-      this._before = null;
-      this.lastWarnings = [];
-    }
-    return _createClass(GlobalGuard, [{
-      key: "_snapshot",
-      value: function _snapshot() {
-        var map = new Map();
-        var target = this.target;
-        if (!target) return map;
-        Object.keys(target).forEach(function (key) {
-          map.set(key, target[key]);
-        });
-        return map;
-      }
-    }, {
-      key: "_diff",
-      value: function _diff() {
-        var _this = this;
-        var before = this._before;
-        var after = this._snapshot();
-        var warnings = [];
-        if (!before) return warnings;
-        after.forEach(function (value, key) {
-          var watched = _this.watch.indexOf(key) !== -1;
-          if (!before.has(key)) {
-            warnings.push({
-              type: 'added',
-              key: key,
-              watched: watched
-            });
-            return;
-          }
-          if (before.get(key) !== value) {
-            warnings.push({
-              type: 'overwritten',
-              key: key,
-              watched: watched
-            });
-          }
-        });
-        // 命中盯防名单，或新增数量超过阈值，才认为「值得提醒」。
-        // 1~2 个自有全局是正常写法，全报会把信号淹掉。
-        var watchedCount = warnings.filter(function (item) {
-          return item.watched;
-        }).length;
-        var addedCount = warnings.filter(function (item) {
-          return item.type === 'added';
-        }).length;
-        if (!watchedCount && addedCount <= this.maxPollution) return [];
-        return warnings;
-      }
-
-      /**
-       * 开始观测。返回的 `end()` 幂等，重复调用只有第一次有效，
-       * 这样超时分支和 errback 分支可以都调，不会把计数搞负。
-       */
-    }, {
-      key: "begin",
-      value: function begin() {
-        var _this2 = this;
-        if (!this.enabled || !this.target) {
-          return {
-            end: function end() {
-              return [];
-            }
-          };
-        }
-        this._pending++;
-        if (this._pending === 1) this._before = this._snapshot();
-        var done = false;
-        return {
-          end: function end() {
-            if (done) return [];
-            done = true;
-            _this2._pending--;
-            // 还有并发批次没结束，交给最后结束的那一批结算
-            if (_this2._pending > 0) return [];
-            var warnings = _this2._diff();
-            _this2._before = null;
-            _this2.lastWarnings = warnings;
-            return warnings;
-          }
-        };
-      }
-    }, {
-      key: "configure",
-      value: function configure(options) {
-        var o = options || {};
-        if (o.enabled !== undefined) this.enabled = !!o.enabled;
-        if (o.maxPollution !== undefined) this.maxPollution = Number(o.maxPollution);
-        if (o.watch !== undefined) this.watch = [].concat(o.watch || []);
-        if (o.target !== undefined) this.target = o.target || null;
-        return this;
-      }
-    }]);
-  }();
-
   /** 加载超时：RequireJS 自己的 waitSeconds 默认 30s，这个定时器是更早的兜底 */
   var CODE_TIMEOUT = 504;
 
@@ -2877,10 +2766,8 @@
     var path = _path;
     var files = _files;
     var callback = _callback;
-    // 单参形式：(files, callback) 或 (files)。判据是「第一个是数组、第二个不是数组」，
-    // 放宽到非函数是因为 loadModules([url]) 这种不带回调的调用很常见。
     if (Array.isArray(_path) && !Array.isArray(_files)) {
-      path = params === null || params === void 0 ? void 0 : params.path;
+      path = undefined;
       files = _path;
       callback = typeof _files === 'function' ? _files : _callback;
     }
@@ -2889,8 +2776,7 @@
     var result = {
       code: 0,
       message: '',
-      data: [],
-      warnings: []
+      data: []
     };
     if (params.type === 'require' && typeof params.require !== 'function' || params.type === 'define' && typeof params.define !== 'function' //
     ) {
@@ -2930,64 +2816,44 @@
     version: '',
     timeout: 15000,
     retry: 0,
-    strict: false,
     baseUrl: ''
   };
   var BaseFileRequire = /*#__PURE__*/function () {
-    /**
-     * args 只接受**参数与策略**，不接受加载器覆盖：
-     * - 加载策略：`version` / `timeout` / `retry` / `strict` / `baseUrl` / `manifest`
-     *   / `origins` / `lockVersion` / `verifyHash` / `pollution` / `watch` / `maxPollution`
-     * - 通道与时钟：`importer`（ESM 通道用的 import 函数）、`setTimeout` / `clearTimeout`
-     *
-     * 刻意**不再接受** `define` / `require` / `undef` / `requireConfig`：
-     * 这四个是 AMD 加载器本体，AMD 通道只走内嵌的 RequireJS 2.3.2。以前允许覆盖的
-     * 后果是「宿主传了自己的 require，但 undef 仍取内嵌的那份」，两套注册表混用，
-     * 而且被覆盖时是静默的。要换通道请用 `loadModules()`，不要替换加载器。
-     *
-     * 其余配置一律走 `configure(options)` 在运行时改。
-     */
     function BaseFileRequire(args) {
-      var _this$__require;
       _classCallCheck(this, BaseFileRequire);
-      var o = args || {};
-      // 只有显式传参才写全局。模块加载时会 new 一次单例，若无条件写 false，
-      // 宿主在 import 之前设好的 `window.__devfab.debug` 会被抹掉。
-      if (o.debug !== undefined) this.debug = !!o.debug;
-      this.__rootPath = undefined;
-      this.__define = __requirejs.define;
-      this.__require = __requirejs.require;
-      this.__undef = typeof ((_this$__require = this.__require) === null || _this$__require === void 0 ? void 0 : _this$__require.undef) === 'function' ? this.__require.undef : null;
-      this.__requireConfig = this._pickRequireConfig(this.__require);
-      this.__import = o.importer || null;
-      this._setTimer = o.setTimeout || function (fn, ms) {
-        return setTimeout(fn, ms);
-      };
-      this._clearTimer = o.clearTimeout || function (id) {
-        return clearTimeout(id);
-      };
-      this.options = {
-        version: o.version ? String(o.version) : DEFAULT_OPTIONS.version,
-        timeout: o.timeout === undefined ? DEFAULT_OPTIONS.timeout : Math.max(0, toNumber(o.timeout, 0)),
-        retry: o.retry === undefined ? DEFAULT_OPTIONS.retry : Math.max(0, toNumber(o.retry, 0)),
-        strict: !!o.strict,
-        baseUrl: o.baseUrl || DEFAULT_OPTIONS.baseUrl
-      };
-      this.policy = new LoadPolicy(o);
-      this.guard = new GlobalGuard(this._guardOptions(o));
-      if (this.options.version) this._applyUrlArgs();
+      this.__init(args);
     }
-
-    /**
-     * 调试开关的**唯一来源**是 `window.__devfab.debug`。
-     *
-     * 为什么做成访问器：这个开关被三处读——加载器这里、`_utils/models/_extend.js` 的
-     * 扩展脚本装配、`_utils/string.js` 的 isDebug。以前各读各的（实例字段 /
-     * `window.__devfab.debug` / `window.devfab.debug`），宿主开了一个另两个不生效，
-     * 排查时看起来像「日志不打印」。统一读写同一个位置后，`FileRequire.configure({debug:true})`、
-     * `FileRequire.debug = true`、`window.__devfab.debug = true` 三句话效果完全一致。
-     */
     return _createClass(BaseFileRequire, [{
+      key: "__init",
+      value: function __init(args) {
+        var o = args || {};
+        if (o.debug !== undefined) this.debug = !!o.debug;
+        var require = __requirejs.require;
+        this.__data = {
+          /* --- 加载器句柄与通道：AMD 通道只走内嵌 RequireJS --- */
+          define: __requirejs.define,
+          require: require,
+          undef: typeof (require === null || require === void 0 ? void 0 : require.undef) === 'function' ? require.undef : null,
+          requireConfig: this._pickRequireConfig(require),
+          importImpl: o.importer || null,
+          setTimer: o.setTimeout || function (fn, ms) {
+            return setTimeout(fn, ms);
+          },
+          clearTimer: o.clearTimeout || function (id) {
+            return clearTimeout(id);
+          },
+          /* --- 配置与策略 --- */
+          options: {
+            version: o.version ? String(o.version) : DEFAULT_OPTIONS.version,
+            timeout: o.timeout === undefined ? DEFAULT_OPTIONS.timeout : Math.max(0, toNumber(o.timeout, 0)),
+            retry: o.retry === undefined ? DEFAULT_OPTIONS.retry : Math.max(0, toNumber(o.retry, 0)),
+            baseUrl: o.baseUrl || DEFAULT_OPTIONS.baseUrl
+          },
+          policy: new LoadPolicy(o)
+        };
+        if (this.__data.options.version) this._applyUrlArgs();
+      }
+    }, {
       key: "debug",
       get: function get() {
         var ns = typeof window !== 'undefined' ? window.__devfab : null;
@@ -3008,48 +2874,26 @@
       value: function _pickRequireConfig(loader) {
         return loader && typeof loader.config === 'function' ? loader.config.bind(loader) : null;
       }
-    }, {
-      key: "_guardOptions",
-      value: function _guardOptions(o) {
-        if (o.pollution === false) {
-          return {
-            enabled: false,
-            target: o.target
-          };
-        }
-        if (o.pollution && _typeof(o.pollution) === 'object') {
-          return Object.assign({
-            target: o.target
-          }, o.pollution);
-        }
-        return {
-          target: o.target,
-          watch: o.watch,
-          maxPollution: o.maxPollution,
-          enabled: o.pollution === undefined ? true : !!o.pollution
-        };
-      }
 
       /* ------------------------------ 配置 ------------------------------ */
 
       /** 运行时增量配置（宿主切版本、换清单、改重试次数都走这里）
-       *  加载策略：版本、超时、重试、清单、白名单、全局污染检测
+       *  加载策略：版本、超时、重试、清单、白名单
        */
     }, {
       key: "configure",
       value: function configure(options) {
         var o = options || {};
+        var _this$__data = this.__data,
+          config = _this$__data.options,
+          policy = _this$__data.policy;
         if (o.debug !== undefined) this.debug = !!o.debug;
         if (o.version !== undefined) this.setVersion(o.version);
-        if (o.timeout !== undefined) this.options.timeout = Math.max(0, toNumber(o.timeout, this.options.timeout));
-        if (o.retry !== undefined) this.options.retry = Math.max(0, toNumber(o.retry, this.options.retry));
-        if (o.strict !== undefined) this.options.strict = !!o.strict;
-        if (o.baseUrl !== undefined) this.options.baseUrl = o.baseUrl || '';
+        if (o.timeout !== undefined) config.timeout = Math.max(0, toNumber(o.timeout, config.timeout));
+        if (o.retry !== undefined) config.retry = Math.max(0, toNumber(o.retry, config.retry));
+        if (o.baseUrl !== undefined) config.baseUrl = o.baseUrl || '';
         if (o.manifest !== undefined || o.origins !== undefined || o.lockVersion !== undefined || o.verifyHash !== undefined || o.fetch !== undefined) {
-          this.policy.configure(o);
-        }
-        if (o.pollution !== undefined) this.guard.configure(this._guardOptions(o));else if (o.watch !== undefined || o.maxPollution !== undefined || o.target !== undefined) {
-          this.guard.configure(o);
+          policy.configure(o);
         }
         return this;
       }
@@ -3064,19 +2908,22 @@
     }, {
       key: "setVersion",
       value: function setVersion(version) {
-        this.options.version = version ? String(version) : '';
+        this.__data.options.version = version ? String(version) : '';
         this._applyUrlArgs();
         return this;
       }
     }, {
       key: "_applyUrlArgs",
       value: function _applyUrlArgs() {
-        if (typeof this.__requireConfig !== 'function') {
+        var _this$__data2 = this.__data,
+          requireConfig = _this$__data2.requireConfig,
+          options = _this$__data2.options;
+        if (typeof requireConfig !== 'function') {
           return false;
         }
         try {
-          this.__requireConfig({
-            urlArgs: this.options.version ? "v=".concat(encodeURIComponent(this.options.version)) : ''
+          requireConfig({
+            urlArgs: options.version ? "v=".concat(encodeURIComponent(options.version)) : ''
           });
           return true;
         } catch (err) {
@@ -3086,19 +2933,23 @@
     }, {
       key: "getVersion",
       value: function getVersion() {
-        return this.options.version;
+        return this.__data.options.version;
       }
 
       /** 策略 + 兜底配置摘要，宿主启动时打一行日志排查效率最高 */
     }, {
       key: "describe",
       value: function describe() {
-        return Object.assign({}, this.options, {
+        var _this$__data3 = this.__data,
+          options = _this$__data3.options,
+          policy = _this$__data3.policy,
+          undef = _this$__data3.undef,
+          importImpl = _this$__data3.importImpl;
+        return Object.assign({}, options, {
           debug: this.debug,
-          policy: this.policy.describe(),
-          pollutionGuard: this.guard.enabled,
-          canUndef: typeof this.__undef === 'function',
-          canNativeImport: typeof (this.__import || nativeImport) === 'function'
+          policy: policy.describe(),
+          canUndef: typeof undef === 'function',
+          canNativeImport: typeof (importImpl || nativeImport) === 'function'
         });
       }
 
@@ -3107,8 +2958,7 @@
       key: "_define",
       value: function _define(_path, _files, _callback) {
         var params = {
-          path: this.__rootPath,
-          define: this.__define,
+          define: this.__data.define,
           type: 'define'
         };
         var _parseArgs = parseArgs(_path, _files, _callback, params),
@@ -3120,28 +2970,16 @@
           callback === null || callback === void 0 || callback(result);
           return;
         }
-        this.__define(path, files, callback);
-      }
-    }, {
-      key: "_mergeWarnings",
-      value: function _mergeWarnings(prev, next) {
-        var list = (prev || []).slice();
-        (next || []).forEach(function (item) {
-          var exists = list.some(function (one) {
-            return one.type === item.type && one.key === item.key;
-          });
-          if (!exists) list.push(item);
-        });
-        return list;
+        this.__data.define(path, files, callback);
       }
     }, {
       key: "_undefModules",
       value: function _undefModules(moduleIds) {
-        var _this = this;
-        if (typeof this.__undef !== 'function') return;
+        var undef = this.__data.undef;
+        if (typeof undef !== 'function') return;
         moduleIds.forEach(function (id) {
           try {
-            _this.__undef(id);
+            undef(id);
           } catch (err) {
             // undef 只对曾经顶层 require 过的模块有效；抛错说明它还没进注册表，忽略即可
           }
@@ -3149,18 +2987,22 @@
       }
 
       /**
-       * 统一加载入口：策略校验 -> 观测 -> 计时 / 重试 -> 结算。
+       * 统一加载入口：策略校验 -> 计时 / 重试 -> 结算。
        * 默认配置（version 空、retry 0、timeout 15s）下的行为与原来一致，
-       * 只是多了一个「更早失败」的兜底和 warnings 字段。
+       * 只是多了一个「更早失败」的兜底。
        */
     }, {
       key: "_load",
       value: function _load(_path, _files, _callback) {
-        var _this2 = this;
-        var config = this.options;
+        var _this = this;
+        var _this$__data4 = this.__data,
+          config = _this$__data4.options,
+          policy = _this$__data4.policy,
+          require = _this$__data4.require,
+          setTimer = _this$__data4.setTimer,
+          clearTimer = _this$__data4.clearTimer;
         var params = {
-          path: this.__rootPath,
-          require: this.__require,
+          require: require,
           type: 'require'
         };
         var _parseArgs2 = parseArgs(_path, _files, _callback, params),
@@ -3174,7 +3016,7 @@
           return;
         }
         var moduleIds = toModuleIds(path, files);
-        var denied = this.policy.checkModules(moduleIds);
+        var denied = policy.checkModules(moduleIds);
         if (denied) {
           result.code = denied.code;
           result.message = denied.message;
@@ -3184,40 +3026,26 @@
         var settled = false;
         var attempt = 0;
         var timer = null;
-        var scoop = null;
-        var closeScoop = function closeScoop() {
-          if (!scoop) return;
-          result.warnings = _this2._mergeWarnings(result.warnings, scoop.end());
-          scoop = null;
-        };
         var finish = function finish() {
           if (settled) return;
           settled = true;
           if (timer !== null) {
-            _this2._clearTimer(timer);
+            clearTimer(timer);
             timer = null;
           }
-          closeScoop();
-          if (config.strict && result.warnings.length) {
-            result.code = 500;
-            result.message = "Global pollution detection failed\uFF1A".concat(result.warnings.map(function (item) {
-              return "".concat(item.type, ":").concat(item.key);
-            }).join(', '));
-          }
           callback === null || callback === void 0 || callback(result);
         };
         var start = function start() {
           attempt++;
-          scoop = _this2.guard.begin();
           if (config.timeout > 0) {
-            timer = _this2._setTimer(function () {
+            timer = setTimer(function () {
               if (settled) return;
               var err = new Error("load timeout after ".concat(config.timeout, "ms: ").concat(filesStr));
               err.__devfabTimeout = true;
               retryOrFail(err, "files load timeout after ".concat(config.timeout, "ms, the files: ").concat(filesStr));
             }, config.timeout);
           }
-          _this2.__require(path, files, function () {
+          require(path, files, function () {
             for (var _len = arguments.length, contents = new Array(_len), _key = 0; _key < _len; _key++) {
               contents[_key] = arguments[_key];
             }
@@ -3230,13 +3058,12 @@
         var retryOrFail = function retryOrFail(err, message) {
           if (settled) return;
           if (timer !== null) {
-            _this2._clearTimer(timer);
+            clearTimer(timer);
             timer = null;
           }
           if (attempt <= config.retry) {
-            closeScoop();
             // 不 undef 就会复用上一次的失败状态，重试形同虚设
-            _this2._undefModules(moduleIds);
+            _this._undefModules(moduleIds);
             start();
             return;
           }
@@ -3269,7 +3096,8 @@
       value: function resolveUrl(rel) {
         var raw = String(rel == null ? '' : rel);
         if (/^[a-z][a-z0-9+.-]*:/i.test(raw) || /^\/\//.test(raw)) return raw;
-        var base = this.options.baseUrl || (typeof document !== 'undefined' && document.baseURI ? document.baseURI : '');
+        var baseUrl = this.__data.options.baseUrl;
+        var base = baseUrl || (typeof document !== 'undefined' && document.baseURI ? document.baseURI : '');
         if (!base) return raw;
         try {
           return new URL(raw, base).href;
@@ -3280,9 +3108,11 @@
     }, {
       key: "_importOne",
       value: function _importOne(moduleId) {
-        var _this3 = this;
+        var _this$__data5 = this.__data,
+          policy = _this$__data5.policy,
+          importImpl = _this$__data5.importImpl;
         var url = this.resolveUrl(moduleId);
-        var originDenied = this.policy.checkOrigin(url);
+        var originDenied = policy.checkOrigin(url);
         if (originDenied) {
           return Promise.resolve({
             ok: false,
@@ -3290,10 +3120,10 @@
             message: originDenied.message
           });
         }
-        var entry = this.policy.entryOf(moduleId);
+        var entry = policy.entryOf(moduleId);
         var expected = entry && entry.sha256;
         var run = function run() {
-          var importer = _this3.__import || nativeImport;
+          var importer = importImpl || nativeImport;
           if (typeof importer !== 'function') {
             return Promise.resolve({
               ok: false,
@@ -3318,7 +3148,7 @@
           });
         };
         if (!expected) return run();
-        return this.policy.verify(url, expected).then(function (verified) {
+        return policy.verify(url, expected).then(function (verified) {
           if (!verified.ok) {
             return {
               ok: false,
@@ -3340,9 +3170,9 @@
     }, {
       key: "loadModules",
       value: function loadModules(_path, _files, _callback) {
-        var _this4 = this;
+        var _this2 = this;
+        var policy = this.__data.policy;
         var params = {
-          path: this.__rootPath,
           type: 'module'
         };
         var _parseArgs3 = parseArgs(_path, _files, _callback, params),
@@ -3356,7 +3186,7 @@
           callback === null || callback === void 0 || callback(r);
           return r;
         };
-        var denied = this.policy.checkModules(moduleIds);
+        var denied = policy.checkModules(moduleIds);
         if (denied) {
           result.code = denied.code;
           result.message = denied.message;
@@ -3365,11 +3195,9 @@
         if (!files.length) {
           return Promise.resolve(settle(result));
         }
-        var scoop = this.guard.begin();
         return Promise.all(moduleIds.map(function (id) {
-          return _this4._importOne(id);
+          return _this2._importOne(id);
         })).then(function (list) {
-          result.warnings = scoop.end();
           var failed = list.filter(function (item) {
             return !item.ok;
           });