devfab 2.0.0 → 2.1.0

package/lib/devfab.js

@@ -326,8 +326,6 @@
     }
   }
 
-  var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
   // ======================================================
   /** vim: et:ts=4:sw=4:sts=4
    * @license RequireJS 2.3.2 Copyright jQuery Foundation and other contributors.
@@ -337,8 +335,7 @@
   // problems with requirejs.exec()/transpiler plugins that may not be strict.
   /* jslint regexp: true, nomen: true, sloppy: true */
   /* global window, navigator, document, importScripts, setTimeout, opera */
-  var __devfab_requirejs = {};
-  window.__devfab_requirejs = __devfab_requirejs;
+  var __requirejs = {};
   (function (global, setTimeout) {
     var requirejs, require, define;
     var req;
@@ -2343,22 +2340,22 @@
       // eslint-disable-next-line no-eval
       return eval(text);
     };
-    __devfab_requirejs.require = require;
-    __devfab_requirejs.define = define;
+    __requirejs.require = require;
+    __requirejs.define = define;
     // Set up with config info.
     req(cfg);
-  })(commonjsGlobal, typeof setTimeout === 'undefined' ? undefined : setTimeout)
+  })(typeof window !== 'undefined' ? window : globalThis, typeof setTimeout === 'undefined' ? undefined : setTimeout)
 
   /* ----------------------------------------------------------------------------
    * 以下为本地适配层，不属于 RequireJS 原始文件内容。
    * -------------------------------------------------------------------------- */;
   (function (global) {
-    if (__devfab_requirejs.__requirejsAdapterApplied) {
+    if (__requirejs.__requirejsAdapterApplied) {
       return;
     }
-    __devfab_requirejs.__requirejsAdapterApplied = true;
-    var rawRequire = __devfab_requirejs.require;
-    var rawDefine = __devfab_requirejs.define;
+    __requirejs.__requirejsAdapterApplied = true;
+    var rawRequire = __requirejs.require;
+    var rawDefine = __requirejs.define;
     var require = function require(_domain, _deps, _callback, _errback) {
       var domain = _domain;
       var deps = _deps;
@@ -2420,10 +2417,15 @@
         require[prop] = rawRequire[prop];
       }
     }
-    __devfab_requirejs._require = rawRequire;
-    __devfab_requirejs._define = rawDefine;
-    __devfab_requirejs.require = require;
-    __devfab_requirejs.define = define;
+
+    // 标记本身是为了让人能**验证**适配层究竟有没有生效（测试与现场排查都用它），
+    // 不然「域前缀到底拼没拼」只能靠猜。
+    require.__devfabAdapterApplied = true;
+    define.__devfabAdapterApplied = true;
+    __requirejs._require = rawRequire;
+    __requirejs._define = rawDefine;
+    __requirejs.require = require;
+    __requirejs.define = define;
   })();
 
   /**
@@ -2746,7 +2748,7 @@
    */
 
   /** 默认盯防的 key：出现即说明宿主的关键设施被动过 */
-  var DEFAULT_WATCH = ['$', 'jQuery', 'define', 'require', 'requirejs', 'devfab', '__devfab', '__devfab_requirejs'];
+  var DEFAULT_WATCH = ['$', 'jQuery', 'define', 'require', 'requirejs', 'devfab', '__devfab'];
   var GlobalGuard = /*#__PURE__*/function () {
     function GlobalGuard(options) {
       _classCallCheck(this, GlobalGuard);
@@ -2933,22 +2935,30 @@
   };
   var BaseFileRequire = /*#__PURE__*/function () {
     /**
-     * args 同时承担两件事，分区明确：
-     * - 底层加载器覆盖：`define` / `require` / `undef` / `requireConfig` / `importer`
+     * args 只接受**参数与策略**，不接受加载器覆盖：
      * - 加载策略：`version` / `timeout` / `retry` / `strict` / `baseUrl` / `manifest`
      *   / `origins` / `lockVersion` / `verifyHash` / `pollution` / `watch` / `maxPollution`
-     * 其余一律走 `configure(options)` 在运行时改。
+     * - 通道与时钟：`importer`（ESM 通道用的 import 函数）、`setTimeout` / `clearTimeout`
+     *
+     * 刻意**不再接受** `define` / `require` / `undef` / `requireConfig`：
+     * 这四个是 AMD 加载器本体，AMD 通道只走内嵌的 RequireJS 2.3.2。以前允许覆盖的
+     * 后果是「宿主传了自己的 require，但 undef 仍取内嵌的那份」，两套注册表混用，
+     * 而且被覆盖时是静默的。要换通道请用 `loadModules()`，不要替换加载器。
+     *
+     * 其余配置一律走 `configure(options)` 在运行时改。
      */
     function BaseFileRequire(args) {
-      var _o$__debug, _window$__devfab_requ, _window$__devfab_requ2, _this$__require;
+      var _this$__require;
       _classCallCheck(this, BaseFileRequire);
       var o = args || {};
-      this.__debug = (_o$__debug = o.__debug) !== null && _o$__debug !== void 0 ? _o$__debug : false;
+      // 只有显式传参才写全局。模块加载时会 new 一次单例，若无条件写 false，
+      // 宿主在 import 之前设好的 `window.__devfab.debug` 会被抹掉。
+      if (o.debug !== undefined) this.debug = !!o.debug;
       this.__rootPath = undefined;
-      this.__define = o.define || ((_window$__devfab_requ = window.__devfab_requirejs) === null || _window$__devfab_requ === void 0 ? void 0 : _window$__devfab_requ.define);
-      this.__require = o.require || ((_window$__devfab_requ2 = window.__devfab_requirejs) === null || _window$__devfab_requ2 === void 0 ? void 0 : _window$__devfab_requ2.require);
-      this.__undef = o.undef || (typeof ((_this$__require = this.__require) === null || _this$__require === void 0 ? void 0 : _this$__require.undef) === 'function' ? this.__require.undef : null);
-      this.__requireConfig = o.requireConfig || this._pickRequireConfig(this.__require);
+      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);
@@ -2969,15 +2979,34 @@
     }
 
     /**
-     * urlArgs 只能配在真正在用的那个 require 上。
-     * 传了自定义加载器（stub / 多 context）就取它的 config，否则取内嵌 RequireJS 的。
+     * 调试开关的**唯一来源**是 `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: "debug",
+      get: function get() {
+        var ns = typeof window !== 'undefined' ? window.__devfab : null;
+        return !!(ns && ns.debug);
+      },
+      set: function set(value) {
+        if (typeof window === 'undefined') return;
+        window.__devfab = window.__devfab || {};
+        window.__devfab.debug = !!value;
+      }
+
+      /**
+       * urlArgs 只能配在真正在用的那个 require 上。AMD 通道固定用内嵌 RequireJS，
+       * 所以这里只从传入的加载器上取 config，不再回落到任何全局。
+       */
+    }, {
       key: "_pickRequireConfig",
       value: function _pickRequireConfig(loader) {
-        var _window$__devfab_requ3;
-        var req = loader && typeof loader.config === 'function' ? loader : (_window$__devfab_requ3 = window.__devfab_requirejs) === null || _window$__devfab_requ3 === void 0 ? void 0 : _window$__devfab_requ3.require;
-        return req && typeof req.config === 'function' ? req.config.bind(req) : null;
+        return loader && typeof loader.config === 'function' ? loader.config.bind(loader) : null;
       }
     }, {
       key: "_guardOptions",
@@ -3010,7 +3039,7 @@
       key: "configure",
       value: function configure(options) {
         var o = options || {};
-        if (o.debug !== undefined) this.__debug = !!o.debug;
+        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));
@@ -3060,47 +3089,12 @@
         return this.options.version;
       }
 
-      /**
-       * 导出本实例的配置快照，供 `create()` 派生新实例时继承。
-       *
-       * 为什么需要：`create()` 原先是彻底干净的实例，于是宿主在单例上
-       * `configure({ manifest, lockVersion })` 之后，`_utils/models/_extend.js` 里那句
-       * `FileRequire.create({ require }).require(...)` 完全不受约束 —— 扩展脚本主链路上
-       * 登记制与版本锁等于没开。派生时继承配置，这个缺口才闭合。
-       *
-       * 刻意**不包含加载器**（`define` / `require` / `undef` / `requireConfig` / `importer`）：
-       * 构造函数会按当前 `window.__devfab_requirejs` 重新取，派生实例拿到的是「此刻真正
-       * 在用的那个加载器」，而不是父实例构造时捕获的旧引用。要指定加载器请显式传，
-       * `create({ require })` 会覆盖。
-       */
-    }, {
-      key: "_snapshotConfig",
-      value: function _snapshotConfig() {
-        return {
-          __debug: this.__debug,
-          version: this.options.version,
-          timeout: this.options.timeout,
-          retry: this.options.retry,
-          strict: this.options.strict,
-          baseUrl: this.options.baseUrl,
-          manifest: this.policy.manifest,
-          origins: this.policy.origins,
-          lockVersion: this.policy.lockVersion,
-          verifyHash: this.policy.verifyHash,
-          fetch: this.policy.fetch,
-          pollution: this.guard.enabled,
-          watch: this.guard.watch,
-          maxPollution: this.guard.maxPollution,
-          target: this.guard.target
-        };
-      }
-
       /** 策略 + 兜底配置摘要，宿主启动时打一行日志排查效率最高 */
     }, {
       key: "describe",
       value: function describe() {
         return Object.assign({}, this.options, {
-          debug: this.__debug,
+          debug: this.debug,
           policy: this.policy.describe(),
           pollutionGuard: this.guard.enabled,
           canUndef: typeof this.__undef === 'function',
@@ -3408,15 +3402,10 @@
     }
     _inherits(FileRequireClass, _BaseFileRequire);
     return _createClass(FileRequireClass, [{
-      key: "define",
-      value: function define(path, files, callback) {
+      key: "provide",
+      value: function provide(path, files, callback) {
         this._define(path, files, callback);
       }
-    }, {
-      key: "defineScript",
-      value: function defineScript(o) {
-        this.provideScript(o);
-      }
     }, {
       key: "provideScript",
       value: function provideScript(o) {
@@ -3426,11 +3415,11 @@
             return o;
           };
         }
-        this.define([], callback);
+        this.provide([], callback);
       }
     }, {
-      key: "require",
-      value: function require(path, files, callback) {
+      key: "inject",
+      value: function inject(path, files, callback) {
         this._load(path, files, callback);
       }
     }, {
@@ -3458,35 +3447,24 @@
             if (typeof error === 'function') {
               error(result);
             } else {
-              self.__debug && console.error('[devfab][FileRequire][injectScript] error: ', result);
+              self.debug && console.error('[devfab][FileRequire][injectScript] error: ', result);
             }
           }
         }
-        this._load(path, files, onCallback);
-      }
-    }, {
-      key: "requireScript",
-      value: function requireScript(_path, _files, _callback) {
-        this.injectScript(_path, _files, _callback);
+        this.inject(path, files, onCallback);
       }
     }]);
   }(BaseFileRequire);
+  /**
+   * 全局唯一的加载器实例。
+   *
+   * 加载策略（清单 / 白名单 / 版本锁）、全局污染观测、超时重试
+   * 都是**部署级**约定，一个页面只应该有一套。
+   */
   var FileRequire = new FileRequireClass();
-  FileRequire.create = function (args) {
-    return new FileRequireClass(_objectSpread2(_objectSpread2({}, this._snapshotConfig()), args));
-  };
-
-  window.__devfab = Object.assign({}, window.__devfab);
-  window.__devfab.FileRequire = FileRequire;
-  window.__devfab.filePolicy = {
-    LoadPolicy: LoadPolicy,
-    GlobalGuard: GlobalGuard,
-    CODE_POLICY: CODE_POLICY,
-    CODE_TIMEOUT: CODE_TIMEOUT
-  };
 
   function isDebug(debug) {
-    return debug || window.devfab && window.devfab.debug;
+    return debug || !!(typeof window !== 'undefined' && window.__devfab && window.__devfab.debug);
   }
   function QueryString(_url) {
     this.pathname = '';
@@ -3553,12 +3531,12 @@
     };
     this.init();
   }
-  String.prototype['equalsIgnoreCase'] = function (str) {
-    if (str == null) {
+  function equalsIgnoreCase(str1, str2) {
+    if (!str1 || !str2) {
       return false;
     }
-    return this.toLowerCase() === str.toLowerCase();
-  };
+    return str1.toLowerCase() === str2.toLowerCase();
+  }
   function _appendUrl(restUrl, params) {
     if (!params) {
       return restUrl;
@@ -3805,9 +3783,9 @@
         isDebug() && console.log('[devfab][ajax]: [doRequest]: options.params["requestHeaders"] ERR : ', e);
       }
       var queryJson = null;
-      if (method.equalsIgnoreCase('get') || method.equalsIgnoreCase('delete')) {
+      if (equalsIgnoreCase(method, 'get') || equalsIgnoreCase(method, 'delete')) {
         url = _appendUrl(url, options.params);
-      } else if (method.equalsIgnoreCase('post') || method.equalsIgnoreCase('put')) {
+      } else if (equalsIgnoreCase(method, 'post') || equalsIgnoreCase(method, 'put')) {
         queryJson = JSON.stringify(options.params);
       }
       if (options.jsonp) {
@@ -4831,7 +4809,7 @@
               config[attr].options.requestHeaders = requestHeaders;
             }
             if ((_this$getProxy = this.getProxy()) !== null && _this$getProxy !== void 0 && _this$getProxy[attr]) {
-              window.devfab.debug && console.warn("[devfab][baseModel.prototype.setProxy]: Proxy ".concat(attr, " already exists on the model. Please change the name of ").concat(attr, " and try again"));
+              isDebug() && console.warn("[devfab][baseModel.prototype.setProxy]: Proxy ".concat(attr, " already exists on the model. Please change the name of ").concat(attr, " and try again"));
             }
           }
           this._set_data('proxy', DynamicProxy.create(_objectSpread2(_objectSpread2({}, ((_this$getProxy2 = this.getProxy()) === null || _this$getProxy2 === void 0 ? void 0 : _this$getProxy2.config) || {}), config)));
@@ -5443,7 +5421,15 @@
     }]);
   }(BaseModel$1);
 
-  function loadScripts(_require, _path, _files, _callback, _params) {
+  function missingLoaderResult(filesStr) {
+    return {
+      code: 404,
+      message: "params.fileRequire is required, the files: ".concat(filesStr),
+      data: [],
+      warnings: []
+    };
+  }
+  function loadScripts(_fileRequire, _path, _files, _callback, _params) {
     var _params2;
     var path = _path;
     var files = _files;
@@ -5458,10 +5444,17 @@
     var viewModel = ((_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.viewModel) || this;
     files = Array.isArray(files) ? files : [];
     var filesStr = files.join(',');
-    return FileRequire.create({
-      require: _require
-    }).require(path, files, function (result) {
+    if (!_fileRequire || typeof _fileRequire.inject !== 'function') {
       var _callback2;
+      var result = missingLoaderResult(filesStr);
+      if (isDebug()) {
+        console.error("[devfab][models][extend][loadScripts] ".concat(result.message));
+      }
+      (_callback2 = callback) === null || _callback2 === void 0 || _callback2(result);
+      return result;
+    }
+    return _fileRequire.inject(path, files, function (result) {
+      var _callback3;
       if (result.code == 0 && Array.isArray(result.data)) {
         for (var i = 0, len = result.data.length; i < len; i++) {
           var content = result.data[i];
@@ -5488,10 +5481,10 @@
           }
         }
       }
-      if (result.code != 0 && window.__devfab.debug) {
+      if (result.code != 0 && isDebug()) {
         console.info("[devfab][models][extend][loadScripts] ".concat(filesStr, " \n    [message]: ").concat(result.message, " \n").concat(result.error ? ' \n    [error]: ' : ''), result.error);
       }
-      (_callback2 = callback) === null || _callback2 === void 0 || _callback2(result);
+      (_callback3 = callback) === null || _callback3 === void 0 || _callback3(result);
     });
   }
   function initExtendScripts(params) {
@@ -5500,7 +5493,7 @@
       // eslint-disable-next-line no-debugger
       debugger;
     }
-    var requirejs = params.requirejs,
+    var fileRequire = params.fileRequire,
       extendScriptParams = params.extendScriptParams,
       _params$readyEventNam = params.readyEventName,
       readyEventName = _params$readyEventNam === void 0 ? 'extendReady' : _params$readyEventNam;
@@ -5510,12 +5503,12 @@
       filepath = _ref.filepath,
       scriptUrl = _ref.scriptUrl;
     if (!enableJs) {
-      window.__devfab.debug && console.info("[devfab][extend][js] not enable extend script");
+      isDebug() && console.info("[devfab][extend][js] not enable extend script");
       self.execute(readyEventName, self);
       return;
     }
     if (!scriptUrl) {
-      window.__devfab.debug && console.info("[devfab][extend][js] extend script is not defined");
+      isDebug() && console.info("[devfab][extend][js] extend script is not defined");
       self.execute(readyEventName, self);
       return;
     }
@@ -5525,14 +5518,14 @@
     if (self.getEnv && self.getEnv('everyCommonExtend')) {
       extendFiles.push(self.getEnv('everyCommonExtend'));
     }
-    loadScripts.call(self, requirejs === null || requirejs === void 0 ? void 0 : requirejs.require, extendFilePath, extendFiles, function (result) {
+    loadScripts.call(self, fileRequire, extendFilePath, extendFiles, function (result) {
       self.execute(readyEventName, self, result);
     });
   }
   var initExtScripts = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(data, viewModel, params) {
       var _viewModel$getParams, _exturls;
-      var requirejs, extendScriptParams, _ref3, _ref3$enableExtJs, enableExtJs, _ref3$exturlsField, exturlsField, extscripturls, exturls;
+      var fileRequire, extendScriptParams, _ref3, _ref3$enableExtJs, enableExtJs, _ref3$exturlsField, exturlsField, extscripturls, exturls;
       return _regenerator().w(function (_context2) {
         while (1) switch (_context2.n) {
           case 0:
@@ -5540,20 +5533,20 @@
               // eslint-disable-next-line no-debugger
               debugger;
             }
-            requirejs = params.requirejs, extendScriptParams = params.extendScriptParams;
+            fileRequire = params.fileRequire, extendScriptParams = params.extendScriptParams;
             _ref3 = extendScriptParams || {}, _ref3$enableExtJs = _ref3.enableExtJs, enableExtJs = _ref3$enableExtJs === void 0 ? false : _ref3$enableExtJs, _ref3$exturlsField = _ref3.exturlsField, exturlsField = _ref3$exturlsField === void 0 ? 'extscripturls' : _ref3$exturlsField;
             if (enableExtJs) {
               _context2.n = 1;
               break;
             }
-            window.__devfab.debug && console.info("[devfab][extend][exturls] ext script is not enable");
+            isDebug() && console.info("[devfab][extend][exturls] ext script is not enable");
             return _context2.a(2, Promise.resolve(true));
           case 1:
             if (data) {
               _context2.n = 2;
               break;
             }
-            window.__devfab.debug && console.info("[devfab][extend][exturls] script data is null");
+            isDebug() && console.info("[devfab][extend][exturls] script data is null");
             return _context2.a(2, Promise.resolve(true));
           case 2:
             extscripturls = data === null || data === void 0 ? void 0 : data[exturlsField];
@@ -5593,7 +5586,7 @@
           case 4:
             data[exturlsField] = exturls;
             return _context2.a(2, new Promise(function (resolve, reject) {
-              loadScripts.call(viewModel, requirejs === null || requirejs === void 0 ? void 0 : requirejs.require, exturls, function (result) {
+              loadScripts.call(viewModel, fileRequire, exturls, function (result) {
                 resolve(result);
               });
             }));
@@ -5696,7 +5689,7 @@
       var _vm, _vm$destroyVM;
       (_vm = vm) === null || _vm === void 0 || (_vm$destroyVM = _vm.destroyVM) === null || _vm$destroyVM === void 0 || _vm$destroyVM.call(_vm);
       vm = null;
-      window.devfab.debug && console.info("[devfab][models][initVM]: destory vm ".concat(new Date().toString()));
+      isDebug() && console.info("[devfab][models][initVM]: destory vm ".concat(new Date().toString()));
     });
     vm.on('extendReady', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var promises;
@@ -5708,7 +5701,7 @@
             _context.n = 1;
             return Promise.all(promises);
           case 1:
-            window.devfab.debug && console.info("[devfab][models][initVM]: after vm init ".concat(new Date().toString()));
+            isDebug() && console.info("[devfab][models][initVM]: after vm init ".concat(new Date().toString()));
             callback === null || callback === void 0 || callback(vm, meta);
           case 2:
             return _context.a(2);
@@ -5738,13 +5731,24 @@
   };
 
   var devfab = {
-    debug: false,
-    FileRequire: FileRequire,
+    get debug() {
+      return !!(window.__devfab && window.__devfab.debug);
+    },
+    set debug(value) {
+      window.__devfab = window.__devfab || {};
+      window.__devfab.debug = !!value;
+    },
     define: function define() {
-      FileRequire.define.apply(FileRequire, arguments);
+      FileRequire.provide.apply(FileRequire, arguments);
     },
     require: function require() {
-      FileRequire.require.apply(FileRequire, arguments);
+      FileRequire.inject.apply(FileRequire, arguments);
+    },
+    provide: function provide() {
+      FileRequire.provide.apply(FileRequire, arguments);
+    },
+    inject: function inject() {
+      FileRequire.inject.apply(FileRequire, arguments);
     },
     provideScript: function provideScript() {
       FileRequire.provideScript.apply(FileRequire, arguments);
@@ -5752,6 +5756,7 @@
     injectScript: function injectScript() {
       FileRequire.injectScript.apply(FileRequire, arguments);
     },
+    FileRequire: FileRequire,
     utils: _objectSpread2(_objectSpread2({}, utils), {}, {
       builder: utils.Builder.create(),
       cache: utils.Cache.create(),