@next-core/brick-kit 2.94.0 → 2.95.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.95.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.94.0...@next-core/brick-kit@2.95.0) (2021-12-28)
+
+
+### Bug Fixes
+
+* refine globals display in devtools ([6f42a1a](https://github.com/easyops-cn/next-core/commit/6f42a1ad37979a2dd6cdaabea8a55518131b35a9))
+
+
+### Features
+
+* refine storyboard functions and expressions ([6626c61](https://github.com/easyops-cn/next-core/commit/6626c61bd910864daaa81be946f765630cfb8103))
+
+
+
+
+
 # [2.94.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.93.1...@next-core/brick-kit@2.94.0) (2021-12-24)
 
 

package/dist/index.bundle.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('history'), require('@babel/runtime/helpers/objectSpread2'), require('@babel/runtime/helpers/objectWithoutProperties'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('lodash'), require('@next-core/brick-utils'), require('@next-core/brick-http'), require('i18next'), require('moment'), require('@next-core/pipes'), require('@next-core/easyops-analytics'), require('js-yaml'), require('antd'), require('@ant-design/icons'), require('react-i18next'), require('@babel/runtime/helpers/esm/extends'), require('@next-core/illustrations'), require('@babel/runtime/helpers/decorate')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'history', '@babel/runtime/helpers/objectSpread2', '@babel/runtime/helpers/objectWithoutProperties', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/helpers/defineProperty', 'react', 'lodash', '@next-core/brick-utils', '@next-core/brick-http', 'i18next', 'moment', '@next-core/pipes', '@next-core/easyops-analytics', 'js-yaml', 'antd', '@ant-design/icons', 'react-i18next', '@babel/runtime/helpers/esm/extends', '@next-core/illustrations', '@babel/runtime/helpers/decorate'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BrickKit = {}, global.history$1, global._objectSpread, global._objectWithoutProperties, global._asyncToGenerator$4, global._defineProperty$1, global.React, global.lodash, global.brickUtils, global.brickHttp, global.i18next, global.moment, global.pipes, global.easyopsAnalytics, global.yaml, global.antd, global.icons, global.reactI18next, global._extends, global.illustrations, global._decorate));
-})(this, (function (exports, history$1, _objectSpread, _objectWithoutProperties, _asyncToGenerator$4, _defineProperty$1, React, lodash, brickUtils, brickHttp, i18next, moment, pipes, easyopsAnalytics, yaml, antd, icons, reactI18next, _extends, illustrations, _decorate) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('history'), require('@babel/runtime/helpers/objectSpread2'), require('@babel/runtime/helpers/objectWithoutProperties'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('lodash'), require('@next-core/brick-utils'), require('@next-core/brick-http'), require('moment'), require('@next-core/pipes'), require('i18next'), require('@next-core/easyops-analytics'), require('js-yaml'), require('antd'), require('@ant-design/icons'), require('react-i18next'), require('@babel/runtime/helpers/esm/extends'), require('@next-core/illustrations'), require('@babel/runtime/helpers/decorate')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'history', '@babel/runtime/helpers/objectSpread2', '@babel/runtime/helpers/objectWithoutProperties', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/helpers/defineProperty', 'react', 'lodash', '@next-core/brick-utils', '@next-core/brick-http', 'moment', '@next-core/pipes', 'i18next', '@next-core/easyops-analytics', 'js-yaml', 'antd', '@ant-design/icons', 'react-i18next', '@babel/runtime/helpers/esm/extends', '@next-core/illustrations', '@babel/runtime/helpers/decorate'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BrickKit = {}, global.history$1, global._objectSpread, global._objectWithoutProperties, global._asyncToGenerator$4, global._defineProperty$1, global.React, global.lodash, global.brickUtils, global.brickHttp, global.moment, global.pipes, global.i18next, global.easyopsAnalytics, global.yaml, global.antd, global.icons, global.reactI18next, global._extends, global.illustrations, global._decorate));
+})(this, (function (exports, history$1, _objectSpread, _objectWithoutProperties, _asyncToGenerator$4, _defineProperty$1, React, lodash, brickUtils, brickHttp, moment, pipes, i18next, easyopsAnalytics, yaml, antd, icons, reactI18next, _extends, illustrations, _decorate) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -12,8 +12,8 @@
   var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty$1);
   var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
   var lodash__default = /*#__PURE__*/_interopDefaultLegacy(lodash);
-  var i18next__default = /*#__PURE__*/_interopDefaultLegacy(i18next);
   var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
+  var i18next__default = /*#__PURE__*/_interopDefaultLegacy(i18next);
   var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
   var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
   var _decorate__default = /*#__PURE__*/_interopDefaultLegacy(_decorate);
@@ -1158,7 +1158,6 @@
       }
     });
   }
-
   function getDevHook() {
     return window.__BRICK_NEXT_DEVTOOLS_HOOK__;
   }
@@ -1169,6 +1168,90 @@
     return (_getDevHook$restoreDe = (_getDevHook2 = getDevHook()) === null || _getDevHook2 === void 0 ? void 0 : _getDevHook2.restoreDehydrated(value)) !== null && _getDevHook$restoreDe !== void 0 ? _getDevHook$restoreDe : value;
   }
 
+  function getItemFactory(storageType) {
+    return function (name) {
+      var storage = storageType === "local" ? localStorage : sessionStorage;
+      return JSON.parse(storage.getItem(name));
+    };
+  }
+
+  var locale$7 = {
+    [K.REQUEST_FAILED]: "Request Failed",
+    [K.MODAL_OK]: "Ok",
+    [K.MODAL_CANCEL]: "Cancel",
+    [K.SOMETHING_WENT_WRONG]: "Something went wrong!",
+    [K.LOGIN_TIMEOUT_MESSAGE]: "You haven't logged in or your login session has expired. Login right now?",
+    [K.NETWORK_ERROR]: "Network error, please check your network."
+  };
+  var en = locale$7;
+
+  var locale$6 = {
+    [K.REQUEST_FAILED]: "请求失败",
+    [K.MODAL_OK]: "确认",
+    [K.MODAL_CANCEL]: "取消",
+    [K.SOMETHING_WENT_WRONG]: "出现了一些问题！",
+    [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
+    [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。"
+  };
+  var zh = locale$6;
+
+  /** @internal */
+
+  var initI18n = () => {
+    i18next__default["default"].addResourceBundle("en", NS_BRICK_KIT, en);
+    i18next__default["default"].addResourceBundle("zh", NS_BRICK_KIT, zh);
+  };
+  /** @internal */
+
+  function getI18nNamespace(type, id) {
+    return "$".concat(type, "-").concat(id);
+  }
+
+  function registerWidgetI18n(widgetId, i18n) {
+    var ns = getI18nNamespace("widget", widgetId);
+    Object.entries(i18n).forEach(_ref => {
+      var [lang, resources] = _ref;
+      i18next__default["default"].addResourceBundle(lang, ns, resources);
+    });
+  }
+  function widgetI18nFactory(widgetId) {
+    return i18next.getFixedT(null, getI18nNamespace("widget", widgetId));
+  }
+
+  function i18nText(data) {
+    var _i18next$language;
+
+    if (!data) {
+      return;
+    }
+
+    var language = (_i18next$language = i18next__default["default"].language) !== null && _i18next$language !== void 0 ? _i18next$language : "zh-CN"; // First, make a perfect match.
+
+    if (brickUtils.hasOwnProperty(data, language)) {
+      return data[language];
+    } // https://en.wikipedia.org/wiki/IETF_language_tag
+
+
+    var primaryLanguage = language.split("-")[0];
+
+    if (primaryLanguage !== language) {
+      // Then, match the primary language (which omits other subtags).
+      // E.g., match `zh` if the current language is `zh-CN`.
+      return brickUtils.hasOwnProperty(data, primaryLanguage) ? data[primaryLanguage] : undefined;
+    } // At last, match the first key which starts with the primary language,
+    // if the current language contains primary subtag only.
+    // E.g., match `zh-CN` if the current language is `zh`.
+
+
+    var prefix = "".concat(primaryLanguage, "-");
+
+    for (var key of Object.keys(data)) {
+      if (key.startsWith(prefix)) {
+        return data[key];
+      }
+    }
+  }
+
   function asyncGeneratorStep$2(gen, resolve, reject, _next, _throw, key, arg) {
     try {
       var info = gen[key](arg);
@@ -1381,88 +1464,68 @@
     permissionMap.clear();
   }
 
-  function getItemFactory(storageType) {
-    return function (name) {
-      var storage = storageType === "local" ? localStorage : sessionStorage;
-      return JSON.parse(storage.getItem(name));
-    };
-  }
+  // `GeneralGlobals` are globals which are page-state-agnostic,
+  // thus they can be used both in storyboard expressions and functions.
+  function getGeneralGlobals(attemptToVisitGlobals, options) {
+    var globalVariables = {};
 
-  function i18nText(data) {
-    var _i18next$language;
+    for (var variableName of attemptToVisitGlobals) {
+      var variable = getIndividualGlobal(variableName, options);
 
-    if (!data) {
-      return;
+      if (variable !== undefined) {
+        globalVariables[variableName] = variable;
+      }
     }
 
-    var language = (_i18next$language = i18next__default["default"].language) !== null && _i18next$language !== void 0 ? _i18next$language : "zh-CN"; // First, make a perfect match.
+    return globalVariables;
+  }
 
-    if (brickUtils.hasOwnProperty(data, language)) {
-      return data[language];
-    } // https://en.wikipedia.org/wiki/IETF_language_tag
+  function getIndividualGlobal(variableName, _ref) {
+    var {
+      collectCoverage,
+      widgetId,
+      app,
+      storyboardFunctions
+    } = _ref;
 
+    switch (variableName) {
+      case "BASE_URL":
+        return collectCoverage ? "/next" : getBasePath().replace(/\/$/, "");
 
-    var primaryLanguage = language.split("-")[0];
+      case "FN":
+        return storyboardFunctions;
 
-    if (primaryLanguage !== language) {
-      // Then, match the primary language (which omits other subtags).
-      // E.g., match `zh` if the current language is `zh-CN`.
-      return brickUtils.hasOwnProperty(data, primaryLanguage) ? data[primaryLanguage] : undefined;
-    } // At last, match the first key which starts with the primary language,
-    // if the current language contains primary subtag only.
-    // E.g., match `zh-CN` if the current language is `zh`.
+      case "IMG":
+        return collectCoverage ? fakeImageFactory() : widgetId ? widgetImagesFactory(widgetId) : imagesFactory(app.id, app.isBuildPush);
 
+      case "I18N":
+        return collectCoverage ? lodash.identity : widgetId ? widgetI18nFactory(widgetId) : i18next.getFixedT(null, getI18nNamespace("app", app.id));
 
-    var prefix = "".concat(primaryLanguage, "-");
+      case "I18N_TEXT":
+        return collectCoverage ? fakeI18nText : i18nText;
 
-    for (var key of Object.keys(data)) {
-      if (key.startsWith(prefix)) {
-        return data[key];
-      }
+      case "PERMISSIONS":
+        return {
+          check: collectCoverage ? fakeCheckPermissions : checkPermissions
+        };
     }
   }
 
-  var locale$7 = {
-    [K.REQUEST_FAILED]: "Request Failed",
-    [K.MODAL_OK]: "Ok",
-    [K.MODAL_CANCEL]: "Cancel",
-    [K.SOMETHING_WENT_WRONG]: "Something went wrong!",
-    [K.LOGIN_TIMEOUT_MESSAGE]: "You haven't logged in or your login session has expired. Login right now?",
-    [K.NETWORK_ERROR]: "Network error, please check your network."
-  };
-  var en = locale$7;
-
-  var locale$6 = {
-    [K.REQUEST_FAILED]: "请求失败",
-    [K.MODAL_OK]: "确认",
-    [K.MODAL_CANCEL]: "取消",
-    [K.SOMETHING_WENT_WRONG]: "出现了一些问题！",
-    [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
-    [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。"
-  };
-  var zh = locale$6;
-
-  /** @internal */
+  function fakeI18nText(data) {
+    return data === null || data === void 0 ? void 0 : data.en;
+  }
 
-  var initI18n = () => {
-    i18next__default["default"].addResourceBundle("en", NS_BRICK_KIT, en);
-    i18next__default["default"].addResourceBundle("zh", NS_BRICK_KIT, zh);
-  };
-  /** @internal */
+  function fakeImageFactory() {
+    return {
+      get(name) {
+        return "mock/images/".concat(name);
+      }
 
-  function getI18nNamespace(type, id) {
-    return "$".concat(type, "-").concat(id);
+    };
   }
 
-  function registerWidgetI18n(widgetId, i18n) {
-    var ns = getI18nNamespace("widget", widgetId);
-    Object.entries(i18n).forEach(_ref => {
-      var [lang, resources] = _ref;
-      i18next__default["default"].addResourceBundle(lang, ns, resources);
-    });
-  }
-  function widgetI18nFactory(widgetId) {
-    return i18next.getFixedT(null, getI18nNamespace("widget", widgetId));
+  function fakeCheckPermissions() {
+    return true;
   }
 
   /** @internal */
@@ -1481,29 +1544,11 @@
       }
 
     });
-
-    var builtinSupply = _objectSpread__default["default"]({
-      // Functions can call other functions.
-      FN: storyboardFunctions
-    }, collectCoverage ? {
-      // Fake builtin methods for tests.
-      I18N: lodash.identity,
-      I18N_TEXT: fakeI18nText,
-      IMG: fakeImageFactory()
-    } : widgetId ? {
-      I18N: widgetI18nFactory(widgetId),
-      I18N_TEXT: i18nText,
-      IMG: widgetImagesFactory(widgetId)
-    } : {
-      I18N_TEXT: i18nText
-    });
+    var currentApp;
 
     function registerStoryboardFunctions(functions, app) {
       if (app) {
-        Object.assign(builtinSupply, {
-          I18N: i18next.getFixedT(null, getI18nNamespace("app", app.id)),
-          IMG: imagesFactory(app.id, app.isBuildPush)
-        });
+        currentApp = app;
       }
 
       registeredFunctions.clear();
@@ -1545,7 +1590,12 @@
         rules: {
           noVar: true
         },
-        globalVariables: supply(precooked.attemptToVisitGlobals, builtinSupply),
+        globalVariables: supply(precooked.attemptToVisitGlobals, getGeneralGlobals(precooked.attemptToVisitGlobals, {
+          collectCoverage,
+          widgetId,
+          app: currentApp,
+          storyboardFunctions
+        })),
         hooks: collector && {
           beforeEvaluate: collector.beforeEvaluate,
           beforeCall: collector.beforeCall,
@@ -1570,19 +1620,6 @@
     };
   }
 
-  function fakeI18nText(data) {
-    return data === null || data === void 0 ? void 0 : data.en;
-  }
-
-  function fakeImageFactory() {
-    return {
-      get(name) {
-        return "mock/images/".concat(name);
-      }
-
-    };
-  }
-
   var {
     storyboardFunctions,
     registerStoryboardFunctions
@@ -1611,6 +1648,39 @@
     registerStoryboardFunctions(functions);
   }
 
+  var THROW = () => {
+    throw new Error("Can't modify read-only proxy object");
+  };
+
+  var readOnlyHandler = {
+    set: THROW,
+    defineProperty: THROW,
+    deleteProperty: THROW,
+    setPrototypeOf: THROW
+  };
+  function getReadOnlyProxy(object) {
+    return new Proxy(object, readOnlyHandler);
+  } // First, we want to make accessing property of globals lazy,
+  // So we use *Proxy* to make a dynamic accessor for each of these globals.
+  // But we also want to keep them working in devtools.
+
+  function getDynamicReadOnlyProxy(_ref) {
+    var {
+      get,
+      ownKeys
+    } = _ref;
+
+    if (getDevHook()) {
+      // In devtools, we extract them at beginning.
+      var target = Object.fromEntries(ownKeys(null).map(key => [key, get(null, key, null)]));
+      return getReadOnlyProxy(target);
+    }
+
+    return new Proxy(Object.freeze({}), {
+      get
+    });
+  }
+
   var symbolForRaw = Symbol.for("pre.evaluated.raw");
   var symbolForContext = Symbol.for("pre.evaluated.context");
   function isPreEvaluated(raw) {
@@ -1728,130 +1798,142 @@
 
     var app = (_runtimeContext$overr = runtimeContext.overrideApp) !== null && _runtimeContext$overr !== void 0 ? _runtimeContext$overr : currentApp;
 
-    if (attemptToVisitGlobals.has("QUERY")) {
-      globalVariables.QUERY = Object.fromEntries(Array.from(query.keys()).map(key => [key, query.get(key)]));
-    }
+    function getIndividualGlobal(variableName) {
+      switch (variableName) {
+        case "ALIAS":
+          return {
+            getUrl: getUrlByAliasFactory(app)
+          };
 
-    if (attemptToVisitGlobals.has("QUERY_ARRAY")) {
-      globalVariables.QUERY_ARRAY = Object.fromEntries(Array.from(query.keys()).map(key => [key, query.getAll(key)]));
-    }
+        case "ANCHOR":
+          return hash ? hash.substr(1) : null;
 
-    if (attemptToVisitGlobals.has("PARAMS")) {
-      globalVariables.PARAMS = new URLSearchParams(query);
-    }
+        case "APP":
+          return lodash.cloneDeep(app);
 
-    if (attemptToVisitGlobals.has("APP")) {
-      globalVariables.APP = lodash.cloneDeep(app);
-    }
+        case "CTX":
+          return getDynamicReadOnlyProxy({
+            get(target, key) {
+              var _item$brick$element;
 
-    if (attemptToVisitGlobals.has("PATH")) {
-      globalVariables.PATH = lodash.cloneDeep(match.params);
-    }
+              var item = storyboardContext.get(key);
+              return !item ? item : item.type === "brick-property" ? (_item$brick$element = item.brick.element) === null || _item$brick$element === void 0 ? void 0 : _item$brick$element[item.prop] : item.value;
+            },
 
-    if (attemptToVisitGlobals.has("SYS")) {
-      globalVariables.SYS = lodash.cloneDeep(sys);
-    }
+            ownKeys() {
+              return Array.from(storyboardContext.keys());
+            }
 
-    if (attemptToVisitGlobals.has("FLAGS")) {
-      globalVariables.FLAGS = lodash.cloneDeep(flags);
-    }
+          });
 
-    if (attemptToVisitGlobals.has("HASH")) {
-      globalVariables.HASH = hash;
-    }
+        case "FLAGS":
+          return getReadOnlyProxy(flags);
 
-    if (attemptToVisitGlobals.has("ANCHOR")) {
-      globalVariables.ANCHOR = hash ? hash.substr(1) : null;
-    }
+        case "HASH":
+          return hash;
 
-    if (attemptToVisitGlobals.has("SEGUE")) {
-      globalVariables.SEGUE = {
-        getUrl: getUrlBySegueFactory(app, segues)
-      };
-    }
+        case "INSTALLED_APPS":
+          return {
+            has: (appId, matchVersion) => getRuntime().hasInstalledApp(appId, matchVersion)
+          };
 
-    if (attemptToVisitGlobals.has("ALIAS")) {
-      globalVariables.ALIAS = {
-        getUrl: getUrlByAliasFactory(app)
-      };
-    }
+        case "LOCAL_STORAGE":
+          return {
+            getItem: getItemFactory("local")
+          };
 
-    if (attemptToVisitGlobals.has("IMG")) {
-      globalVariables.IMG = imagesFactory(app.id, app.isBuildPush);
-    }
+        case "MISC":
+          return getRuntime().getMiscSettings();
 
-    if (attemptToVisitGlobals.has("__WIDGET_IMG__")) {
-      globalVariables.__WIDGET_IMG__ = widgetImagesFactory;
-    }
+        case "PARAMS":
+          return new URLSearchParams(query);
 
-    if (attemptToVisitGlobals.has("I18N")) {
-      globalVariables.I18N = i18next__default["default"].getFixedT(null, getI18nNamespace("app", app.id));
-    }
+        case "PATH":
+          return getReadOnlyProxy(match.params);
 
-    if (attemptToVisitGlobals.has("__WIDGET_I18N__")) {
-      globalVariables.__WIDGET_I18N__ = widgetI18nFactory;
-    }
+        case "PROCESSORS":
+          return getDynamicReadOnlyProxy({
+            get(target, key) {
+              var pkg = customProcessorRegistry.get(key);
+              return pkg ? getDynamicReadOnlyProxy({
+                get(t, k) {
+                  return pkg.get(k);
+                },
 
-    if (attemptToVisitGlobals.has("I18N_TEXT")) {
-      globalVariables.I18N_TEXT = i18nText;
-    }
+                ownKeys() {
+                  return Array.from(pkg.keys());
+                }
 
-    if (attemptToVisitGlobals.has("CTX")) {
-      globalVariables.CTX = Object.fromEntries(Array.from(storyboardContext.entries()).map(_ref => {
-        var _item$brick$element;
+              }) : pkg;
+            },
 
-        var [name, item] = _ref;
-        return [name, item.type === "brick-property" ? (_item$brick$element = item.brick.element) === null || _item$brick$element === void 0 ? void 0 : _item$brick$element[item.prop] : item.value];
-      }));
-    }
+            ownKeys() {
+              return Array.from(customProcessorRegistry.keys());
+            }
 
-    if (attemptToVisitGlobals.has("PROCESSORS")) {
-      globalVariables.PROCESSORS = Object.fromEntries(Array.from(customProcessorRegistry.entries()).map(_ref2 => {
-        var [namespace, registry] = _ref2;
-        return [namespace, Object.fromEntries(registry.entries())];
-      }));
-    }
+          });
 
-    if (attemptToVisitGlobals.has("PERMISSIONS")) {
-      globalVariables.PERMISSIONS = {
-        check: checkPermissions
-      };
-    }
+        case "QUERY":
+          return getDynamicReadOnlyProxy({
+            get(target, key) {
+              return query.get(key);
+            },
 
-    if (attemptToVisitGlobals.has("LOCAL_STORAGE")) {
-      globalVariables.LOCAL_STORAGE = {
-        getItem: getItemFactory("local")
-      };
-    }
+            ownKeys() {
+              return Array.from(query.keys());
+            }
 
-    if (attemptToVisitGlobals.has("SESSION_STORAGE")) {
-      globalVariables.SESSION_STORAGE = {
-        getItem: getItemFactory("session")
-      };
-    }
+          });
 
-    if (attemptToVisitGlobals.has("INSTALLED_APPS")) {
-      globalVariables.INSTALLED_APPS = {
-        has: (appId, matchVersion) => getRuntime().hasInstalledApp(appId, matchVersion)
-      };
-    }
+        case "QUERY_ARRAY":
+          return getDynamicReadOnlyProxy({
+            get(target, key) {
+              return query.getAll(key);
+            },
 
-    if (attemptToVisitGlobals.has("FN")) {
-      globalVariables.FN = storyboardFunctions;
-    }
+            ownKeys() {
+              return Array.from(query.keys());
+            }
 
-    if (attemptToVisitGlobals.has("__WIDGET_FN__")) {
-      globalVariables.__WIDGET_FN__ = widgetFunctions;
-    }
+          });
+
+        case "SEGUE":
+          return {
+            getUrl: getUrlBySegueFactory(app, segues)
+          };
+
+        case "SESSION_STORAGE":
+          return {
+            getItem: getItemFactory("session")
+          };
+
+        case "SYS":
+          return getReadOnlyProxy(sys);
+
+        case "__WIDGET_FN__":
+          return widgetFunctions;
 
-    if (attemptToVisitGlobals.has("MISC")) {
-      globalVariables.MISC = getRuntime().getMiscSettings();
+        case "__WIDGET_IMG__":
+          return widgetImagesFactory;
+
+        case "__WIDGET_I18N__":
+          return widgetI18nFactory;
+      }
     }
 
-    if (attemptToVisitGlobals.has("BASE_URL")) {
-      globalVariables.BASE_URL = getBasePath().replace(/\/$/, "");
+    for (var variableName of attemptToVisitGlobals) {
+      var variable = getIndividualGlobal(variableName);
+
+      if (variable !== undefined) {
+        globalVariables[variableName] = variable;
+      }
     }
 
+    Object.assign(globalVariables, getGeneralGlobals(precooked.attemptToVisitGlobals, {
+      storyboardFunctions,
+      app
+    }));
+
     try {
       var result = brickUtils.cook(precooked.expression, precooked.source, {
         globalVariables: supply(precooked.attemptToVisitGlobals, globalVariables)