@noah-libjs/utils 0.0.7 → 0.0.8

package/dist/es.js

@@ -1418,10 +1418,13 @@ function cloneDeep(value) {
     return null;
   }
 }
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
 function safe_json_parse(str) {
   var retOnErr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   if (!str) return retOnErr;
-  if (_typeof(str) === 'object') return str;
+  if (isObject(str) || isArray(str)) return str;
   if (!isString(str)) return retOnErr;
   try {
     var v = JSON.parse(str);
@@ -1743,35 +1746,55 @@ function safe_async_call(cb) {
     }, _callee8);
   }));
 }
-get_global().safe_async_call = safe_async_call;
 var global_cache_map = {};
-function cache_fetch(key, cb) {
-  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+function cache_fetch(key_1, cb_1) {
+  return __awaiter(this, arguments, void 0, function (key, cb) {
+    var deep = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    return /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var raw;
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            _context9.next = 2;
+            return cache_fetch_inner(key, cb);
+          case 2:
+            raw = _context9.sent;
+            return _context9.abrupt("return", deep ? cloneDeep(raw) : raw);
+          case 4:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9);
+    })();
+  });
+}
+function cache_fetch_inner(key, cb) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
     var _a, conf;
-    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
           conf = global_cache_map[key] = (_a = global_cache_map[key]) !== null && _a !== void 0 ? _a : {};
           if (!conf.cache) {
-            _context9.next = 3;
+            _context10.next = 3;
             break;
           }
-          return _context9.abrupt("return", conf.cache);
+          return _context10.abrupt("return", conf.cache);
         case 3:
           if (!conf.cache_promise) {
-            _context9.next = 5;
+            _context10.next = 5;
             break;
           }
-          return _context9.abrupt("return", conf.cache_promise);
+          return _context10.abrupt("return", conf.cache_promise);
         case 5:
-          return _context9.abrupt("return", conf.cache_promise = cb().then(function (r) {
+          return _context10.abrupt("return", conf.cache_promise = cb().then(function (r) {
             return conf.cache = r;
           }));
         case 6:
         case "end":
-          return _context9.stop();
+          return _context10.stop();
       }
-    }, _callee9);
+    }, _callee10);
   }));
 }
 function speculate_on_display(value) {
@@ -1836,19 +1859,29 @@ function simple_decrypt(code) {
   }).join('');
   return safe_json_parse(str);
 }
+var SP = '@@';
 function simple_encrypt_str(data) {
+  var sp = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SP;
   if (!data || !isString(data)) return null;
   return data.split('').map(function (_, idx) {
     return ~_.charCodeAt(0) + idx * 119;
-  }).join('@@');
+  }).join(sp);
 }
 function simple_decrypt_str(code) {
-  if (!code || !isString(code)) return null;
-  var str = code.split('@@').map(function (_, idx) {
+  var sp = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SP;
+  if (!code || !isString(code) || !code.includes(sp)) return null;
+  var str = code.split(sp).map(function (_, idx) {
     return String.fromCharCode(~(+_ - idx * 119));
   }).join('');
   return str;
 }
+Object.assign(get_global(), {
+  safe_async_call: safe_async_call,
+  simple_decrypt_str: simple_decrypt_str,
+  simple_encrypt_str: simple_encrypt_str
+});
+// safe_check()
+
 function getFn(format) {
   function f(s) {
     if (isFunction(s === null || s === void 0 ? void 0 : s.format)) {
@@ -1891,7 +1924,8 @@ function getMomentRange() {
     // 这月: [start(m).startOf('month'), end(m).endOf('month')] as DT,
     近一月: [start(m).add(-1, 'month').add(1, 'day'), end(m)],
     下月: [start(m).add(1, 'month').startOf('month'), end(m).add(1, 'month').endOf('month')],
-    近一年: [start(m).add(-1, 'year').add(1, 'day'), end(m)]
+    近一年: [start(m).add(-1, 'year').add(1, 'day'), end(m)],
+    年初至今: [start(m).startOf('year'), end(m)]
   };
 }
 function presets_date() {
@@ -2379,24 +2413,6 @@ function presetInput(_label) {
     label: _label
   };
 }
-function safe_fetch_options(cb) {
-  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-    var arr;
-    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
-        case 0:
-          _context10.next = 2;
-          return safe_async_call(cb);
-        case 2:
-          arr = _context10.sent;
-          return _context10.abrupt("return", expect_array(arr));
-        case 4:
-        case "end":
-          return _context10.stop();
-      }
-    }, _callee10);
-  }));
-}
 function getPresetOptions(key) {
   var pure = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var _a, _b;
@@ -2480,4 +2496,153 @@ function getDictionaryValue(type, label) {
 function merge_dict(ops) {
   Object.assign(dic_map, ops);
 }
-export { ARG_URS1_KEY, ARG_URS2_KEY, EMPTY_PLACEHOLDER, EventEmitter, MyLog, ROMAN_NUMERALS, TOKEN_KEY, all, alphabetical, _assign as assign, base64ToBinary, base64_to_image, boil, cache_fetch, callable, camel, capitalize, chain, charToUTF8, charToUnicode, clone, cloneDeep, cluster, compose, confirm_operation, construct, copyText, counting, crush, dash, dayjs_quarter, debounce, defer, diff, diff_between, downloadFile, draw, expect_array, filter_obj_to_url_search, first, flat, fork, formatDate, formatDateTime, formatDateTimeNoSecond, formatTime, gen_encoded_char_svg, get, getDictionaries, getDictionariesEnumerations, getDictionaryLabel, getDictionaryValue, getDualModeOptions, getFilledArray, getFuckTimeInterval, getFutureDate, getMomentObj, getMomentRange, getOptionLabel, getOptionValue, getPresetOptions, getSameOptions, getSearchParamsAll, getSearchParamsValue, getSimpleOptions, get_global, group, guard, identity, image_to_base64, inRange, intersects, invert, isArray, isBoolean, isDate, isEmpty, _isEqual as isEqual, isFloat, isFunction, isInt, isMoment, isNil, isNull, isNumber, isObject, isObjectLike, isPrimitive, isPromise, isString, isSymbol, iterate, keys, last, list, listify, lowerize, map, mapEntries, mapKeys, mapValues, max, memo, merge, merge_dict, merge_preset_options, min, noop, numberLikeCompare, objectify, omit, optionKey不详, optionKey其他, optionKey否, parallel, partial, partob, pascal, pick, presets_date, proxied, random, randomHex, random_word, range, reduce, replace, replaceOrAppend, retry, safeExec, safeGetFromFuncOrData, safe_async_call, safe_fetch_options, safe_json_parse, safe_json_parse_arr, safe_json_stringify, safe_number_parse, scrollIntoView, select, series, set, setSearchParamsAll, setSearchParamsValue, shake, shift, shuffle, sift, simple_decrypt, simple_decrypt_str, simple_encrypt, simple_encrypt_str, size, sleep, snake, sort, speculate_on_display, sum, template, throttle, title, toFloat, toInt, toString, toggle, trim, tryit as try, tryit, uid, unicodeToChar, unicode_to_UTF8, unique, upperize, uuid, warpBase64Type, zip, zipToObject };
+function create_load_src() {
+  var cache = {};
+  var head_el = document.getElementsByTagName("head")[0] || document.documentElement;
+  function exec(options, node) {
+    var opt;
+    if (typeof options === "string") {
+      opt = {
+        url: options,
+        debug: false
+      };
+    } else {
+      opt = options;
+    }
+    var cacheId = opt.id || opt.url;
+    var cacheEntry = cache[cacheId];
+    if (cacheEntry) {
+      if (!!opt.debug) {
+        console.log("load-js: cache hit", cacheId);
+      }
+      return cacheEntry;
+    } else if (opt.allowExternal !== false) {
+      var el = getScriptById(opt.id) || getScriptByUrl(opt.url);
+      if (el) {
+        var promise = Promise.resolve(el);
+        if (cacheId) {
+          cache[cacheId] = promise;
+        }
+        return promise;
+      }
+    }
+    if (!opt.url && !opt.text) {
+      throw new Error("load-js: must provide a url or text to load");
+    }
+    var pending = (opt.url ? loadScript : runScript)(node, createEl(opt));
+    if (cacheId && opt.cache !== false) {
+      cache[cacheId] = pending;
+    }
+    return pending;
+  }
+  function runScript(head, el) {
+    head.appendChild(el);
+    return Promise.resolve(el);
+  }
+  function loadScript(head, el) {
+    return new Promise(function (resolve, reject) {
+      // Handle Script loading
+      var done = false;
+      // Attach handlers for all browsers.
+      //
+      // References:
+      // http://stackoverflow.com/questions/4845762/onload-handler-for-script-tag-in-internet-explorer
+      // http://stevesouders.com/efws/script-onload.php
+      // https://www.html5rocks.com/en/tutorials/speed/script-loading/
+      //
+      //@ts-ignore
+      el.onload = el.onreadystatechange = function () {
+        //@ts-ignore
+        if (!done && (!el.readyState || el.readyState === "loaded" || el.readyState === "complete")) {
+          done = true;
+          // Handle memory leak in IE
+          //@ts-ignore
+          el.onload = el.onreadystatechange = null;
+          resolve(el);
+        }
+      };
+      el.onerror = reject;
+      head.appendChild(el);
+    });
+  }
+  function createEl(opt) {
+    var _a;
+    if ((_a = opt.url) === null || _a === void 0 ? void 0 : _a.endsWith('css')) {
+      return createLink(opt);
+    }
+    if (opt.type === 'text/css') {
+      return createStyle(opt);
+    }
+    return createScript(opt);
+  }
+  function createScript(options) {
+    var el = document.createElement("script");
+    el.charset = options.charset || "utf-8";
+    el.type = options.type || "text/javascript";
+    el.async = !!options.async;
+    el.id = options.id || options.url;
+    //@ts-ignore
+    el.loadJS = "watermark";
+    if (options.url) {
+      el.src = options.url;
+    }
+    if (options.text) {
+      el.text = options.text;
+    }
+    return el;
+  }
+  function createLink(options) {
+    var el = document.createElement("link");
+    el.charset = options.charset || "utf-8";
+    el.type = options.type || "text/css";
+    el.id = options.id || options.url;
+    el.rel = 'stylesheet';
+    //@ts-ignore
+    el.loadJS = "watermark";
+    if (options.url) {
+      el.href = options.url;
+    }
+    console.log('createLink', {
+      options: options,
+      el: el
+    });
+    return el;
+  }
+  function createStyle(options) {
+    var el = document.createElement("style");
+    el.id = options.id || options.text;
+    //@ts-ignore
+    el.loadJS = "watermark";
+    if (options.text) {
+      el.textContent = options.text;
+    }
+    return el;
+  }
+  function getScriptById(id) {
+    var el = id && document.getElementById(id);
+    //@ts-ignore
+    if (el && el.loadJS !== "watermark") {
+      console.warn("load-js: duplicate script with id:", id);
+      return el;
+    }
+  }
+  function getScriptByUrl(url) {
+    var el = url && document.querySelector("script[src='" + url + "']");
+    //@ts-ignore
+    if (el && el.loadJS !== "watermark") {
+      console.warn("load-js: duplicate script with url:", url);
+      return el;
+    }
+  }
+  return function load(items) {
+    var node = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : head_el;
+    return items instanceof Array ? Promise.all(items.map(function (_) {
+      return exec(_, node);
+    })) : exec(items, node);
+  };
+}
+var load_src_ = create_load_src();
+function load_src(items, node) {
+  return load_src_(items, node);
+}
+export { ARG_URS1_KEY, ARG_URS2_KEY, EMPTY_PLACEHOLDER, EventEmitter, MyLog, ROMAN_NUMERALS, TOKEN_KEY, all, alphabetical, _assign as assign, base64ToBinary, base64_to_image, boil, cache_fetch, callable, camel, capitalize, chain, charToUTF8, charToUnicode, clone, cloneDeep, cluster, compose, confirm_operation, construct, copyText, counting, create_load_src, crush, dash, dayjs_quarter, debounce, defer, diff, diff_between, downloadFile, draw, expect_array, filter_obj_to_url_search, first, flat, fork, formatDate, formatDateTime, formatDateTimeNoSecond, formatTime, gen_encoded_char_svg, get, getDictionaries, getDictionariesEnumerations, getDictionaryLabel, getDictionaryValue, getDualModeOptions, getFilledArray, getFuckTimeInterval, getFutureDate, getMomentObj, getMomentRange, getOptionLabel, getOptionValue, getPresetOptions, getSameOptions, getSearchParamsAll, getSearchParamsValue, getSimpleOptions, get_global, group, guard, hasOwn, identity, image_to_base64, inRange, intersects, invert, isArray, isBoolean, isDate, isEmpty, _isEqual as isEqual, isFloat, isFunction, isInt, isMoment, isNil, isNull, isNumber, isObject, isObjectLike, isPrimitive, isPromise, isString, isSymbol, iterate, keys, last, list, listify, load_src, lowerize, map, mapEntries, mapKeys, mapValues, max, memo, merge, merge_dict, merge_preset_options, min, noop, numberLikeCompare, objectify, omit, optionKey不详, optionKey其他, optionKey否, parallel, partial, partob, pascal, pick, presets_date, proxied, random, randomHex, random_word, range, reduce, replace, replaceOrAppend, retry, safeExec, safeGetFromFuncOrData, safe_async_call, safe_json_parse, safe_json_parse_arr, safe_json_stringify, safe_number_parse, scrollIntoView, select, series, set, setSearchParamsAll, setSearchParamsValue, shake, shift, shuffle, sift, simple_decrypt, simple_decrypt_str, simple_encrypt, simple_encrypt_str, size, sleep, snake, sort, speculate_on_display, sum, template, throttle, title, toFloat, toInt, toString, toggle, trim, tryit as try, tryit, uid, unicodeToChar, unicode_to_UTF8, unique, upperize, uuid, warpBase64Type, zip, zipToObject };

package/dist/helper.d.ts

@@ -1,3 +1,4 @@
+import { AnyObject } from "./type-utils";
 export * from "radash";
 export declare function get<T = any>(value: T, path: string, defaultValue?: T | undefined): T;
 export declare function identity<T>(value: T): T;
@@ -8,3 +9,4 @@ export declare function size(value: any): number;
 export declare function isNil(value: any): value is null | undefined;
 export declare function toString(value: any): string;
 export declare function cloneDeep<T>(value: T): T | null;
+export declare function hasOwn(obj: AnyObject, key: PropertyKey): boolean;

package/dist/index.d.ts

@@ -9,3 +9,4 @@ export * from './constant';
 export * from './moment-help';
 export * from './option-help';
 export * from './dic-helper';
+export * from './load-src';

package/dist/lib.js

@@ -1428,10 +1428,13 @@ function cloneDeep(value) {
     return null;
   }
 }
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
 function safe_json_parse(str) {
   var retOnErr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   if (!str) return retOnErr;
-  if (_typeof(str) === 'object') return str;
+  if (isObject(str) || isArray(str)) return str;
   if (!isString(str)) return retOnErr;
   try {
     var v = JSON.parse(str);
@@ -1753,35 +1756,55 @@ function safe_async_call(cb) {
     }, _callee8);
   }));
 }
-get_global().safe_async_call = safe_async_call;
 var global_cache_map = {};
-function cache_fetch(key, cb) {
-  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+function cache_fetch(key_1, cb_1) {
+  return __awaiter(this, arguments, void 0, function (key, cb) {
+    var deep = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    return /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var raw;
+      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
+          case 0:
+            _context9.next = 2;
+            return cache_fetch_inner(key, cb);
+          case 2:
+            raw = _context9.sent;
+            return _context9.abrupt("return", deep ? cloneDeep(raw) : raw);
+          case 4:
+          case "end":
+            return _context9.stop();
+        }
+      }, _callee9);
+    })();
+  });
+}
+function cache_fetch_inner(key, cb) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
     var _a, conf;
-    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
           conf = global_cache_map[key] = (_a = global_cache_map[key]) !== null && _a !== void 0 ? _a : {};
           if (!conf.cache) {
-            _context9.next = 3;
+            _context10.next = 3;
             break;
           }
-          return _context9.abrupt("return", conf.cache);
+          return _context10.abrupt("return", conf.cache);
         case 3:
           if (!conf.cache_promise) {
-            _context9.next = 5;
+            _context10.next = 5;
             break;
           }
-          return _context9.abrupt("return", conf.cache_promise);
+          return _context10.abrupt("return", conf.cache_promise);
         case 5:
-          return _context9.abrupt("return", conf.cache_promise = cb().then(function (r) {
+          return _context10.abrupt("return", conf.cache_promise = cb().then(function (r) {
             return conf.cache = r;
           }));
         case 6:
         case "end":
-          return _context9.stop();
+          return _context10.stop();
       }
-    }, _callee9);
+    }, _callee10);
   }));
 }
 function speculate_on_display(value) {
@@ -1846,19 +1869,29 @@ function simple_decrypt(code) {
   }).join('');
   return safe_json_parse(str);
 }
+var SP = '@@';
 function simple_encrypt_str(data) {
+  var sp = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SP;
   if (!data || !isString(data)) return null;
   return data.split('').map(function (_, idx) {
     return ~_.charCodeAt(0) + idx * 119;
-  }).join('@@');
+  }).join(sp);
 }
 function simple_decrypt_str(code) {
-  if (!code || !isString(code)) return null;
-  var str = code.split('@@').map(function (_, idx) {
+  var sp = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SP;
+  if (!code || !isString(code) || !code.includes(sp)) return null;
+  var str = code.split(sp).map(function (_, idx) {
     return String.fromCharCode(~(+_ - idx * 119));
   }).join('');
   return str;
 }
+Object.assign(get_global(), {
+  safe_async_call: safe_async_call,
+  simple_decrypt_str: simple_decrypt_str,
+  simple_encrypt_str: simple_encrypt_str
+});
+// safe_check()
+
 function getFn(format) {
   function f(s) {
     if (isFunction(s === null || s === void 0 ? void 0 : s.format)) {
@@ -1901,7 +1934,8 @@ function getMomentRange() {
     // 这月: [start(m).startOf('month'), end(m).endOf('month')] as DT,
     近一月: [start(m).add(-1, 'month').add(1, 'day'), end(m)],
     下月: [start(m).add(1, 'month').startOf('month'), end(m).add(1, 'month').endOf('month')],
-    近一年: [start(m).add(-1, 'year').add(1, 'day'), end(m)]
+    近一年: [start(m).add(-1, 'year').add(1, 'day'), end(m)],
+    年初至今: [start(m).startOf('year'), end(m)]
   };
 }
 function presets_date() {
@@ -2389,24 +2423,6 @@ function presetInput(_label) {
     label: _label
   };
 }
-function safe_fetch_options(cb) {
-  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-    var arr;
-    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
-        case 0:
-          _context10.next = 2;
-          return safe_async_call(cb);
-        case 2:
-          arr = _context10.sent;
-          return _context10.abrupt("return", expect_array(arr));
-        case 4:
-        case "end":
-          return _context10.stop();
-      }
-    }, _callee10);
-  }));
-}
 function getPresetOptions(key) {
   var pure = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var _a, _b;
@@ -2490,6 +2506,155 @@ function getDictionaryValue(type, label) {
 function merge_dict(ops) {
   Object.assign(dic_map, ops);
 }
+function create_load_src() {
+  var cache = {};
+  var head_el = document.getElementsByTagName("head")[0] || document.documentElement;
+  function exec(options, node) {
+    var opt;
+    if (typeof options === "string") {
+      opt = {
+        url: options,
+        debug: false
+      };
+    } else {
+      opt = options;
+    }
+    var cacheId = opt.id || opt.url;
+    var cacheEntry = cache[cacheId];
+    if (cacheEntry) {
+      if (!!opt.debug) {
+        console.log("load-js: cache hit", cacheId);
+      }
+      return cacheEntry;
+    } else if (opt.allowExternal !== false) {
+      var el = getScriptById(opt.id) || getScriptByUrl(opt.url);
+      if (el) {
+        var promise = Promise.resolve(el);
+        if (cacheId) {
+          cache[cacheId] = promise;
+        }
+        return promise;
+      }
+    }
+    if (!opt.url && !opt.text) {
+      throw new Error("load-js: must provide a url or text to load");
+    }
+    var pending = (opt.url ? loadScript : runScript)(node, createEl(opt));
+    if (cacheId && opt.cache !== false) {
+      cache[cacheId] = pending;
+    }
+    return pending;
+  }
+  function runScript(head, el) {
+    head.appendChild(el);
+    return Promise.resolve(el);
+  }
+  function loadScript(head, el) {
+    return new Promise(function (resolve, reject) {
+      // Handle Script loading
+      var done = false;
+      // Attach handlers for all browsers.
+      //
+      // References:
+      // http://stackoverflow.com/questions/4845762/onload-handler-for-script-tag-in-internet-explorer
+      // http://stevesouders.com/efws/script-onload.php
+      // https://www.html5rocks.com/en/tutorials/speed/script-loading/
+      //
+      //@ts-ignore
+      el.onload = el.onreadystatechange = function () {
+        //@ts-ignore
+        if (!done && (!el.readyState || el.readyState === "loaded" || el.readyState === "complete")) {
+          done = true;
+          // Handle memory leak in IE
+          //@ts-ignore
+          el.onload = el.onreadystatechange = null;
+          resolve(el);
+        }
+      };
+      el.onerror = reject;
+      head.appendChild(el);
+    });
+  }
+  function createEl(opt) {
+    var _a;
+    if ((_a = opt.url) === null || _a === void 0 ? void 0 : _a.endsWith('css')) {
+      return createLink(opt);
+    }
+    if (opt.type === 'text/css') {
+      return createStyle(opt);
+    }
+    return createScript(opt);
+  }
+  function createScript(options) {
+    var el = document.createElement("script");
+    el.charset = options.charset || "utf-8";
+    el.type = options.type || "text/javascript";
+    el.async = !!options.async;
+    el.id = options.id || options.url;
+    //@ts-ignore
+    el.loadJS = "watermark";
+    if (options.url) {
+      el.src = options.url;
+    }
+    if (options.text) {
+      el.text = options.text;
+    }
+    return el;
+  }
+  function createLink(options) {
+    var el = document.createElement("link");
+    el.charset = options.charset || "utf-8";
+    el.type = options.type || "text/css";
+    el.id = options.id || options.url;
+    el.rel = 'stylesheet';
+    //@ts-ignore
+    el.loadJS = "watermark";
+    if (options.url) {
+      el.href = options.url;
+    }
+    console.log('createLink', {
+      options: options,
+      el: el
+    });
+    return el;
+  }
+  function createStyle(options) {
+    var el = document.createElement("style");
+    el.id = options.id || options.text;
+    //@ts-ignore
+    el.loadJS = "watermark";
+    if (options.text) {
+      el.textContent = options.text;
+    }
+    return el;
+  }
+  function getScriptById(id) {
+    var el = id && document.getElementById(id);
+    //@ts-ignore
+    if (el && el.loadJS !== "watermark") {
+      console.warn("load-js: duplicate script with id:", id);
+      return el;
+    }
+  }
+  function getScriptByUrl(url) {
+    var el = url && document.querySelector("script[src='" + url + "']");
+    //@ts-ignore
+    if (el && el.loadJS !== "watermark") {
+      console.warn("load-js: duplicate script with url:", url);
+      return el;
+    }
+  }
+  return function load(items) {
+    var node = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : head_el;
+    return items instanceof Array ? Promise.all(items.map(function (_) {
+      return exec(_, node);
+    })) : exec(items, node);
+  };
+}
+var load_src_ = create_load_src();
+function load_src(items, node) {
+  return load_src_(items, node);
+}
 Object.defineProperty(exports, 'dayjs', {
   enumerable: true,
   get: function get() {
@@ -2524,6 +2689,7 @@ exports.confirm_operation = confirm_operation;
 exports.construct = construct;
 exports.copyText = copyText;
 exports.counting = counting;
+exports.create_load_src = create_load_src;
 exports.crush = crush;
 exports.dash = dash;
 exports.dayjs_quarter = dayjs_quarter;
@@ -2564,6 +2730,7 @@ exports.getSimpleOptions = getSimpleOptions;
 exports.get_global = get_global;
 exports.group = group;
 exports.guard = guard;
+exports.hasOwn = hasOwn;
 exports.identity = identity;
 exports.image_to_base64 = image_to_base64;
 exports.inRange = inRange;
@@ -2592,6 +2759,7 @@ exports.keys = keys;
 exports.last = last;
 exports.list = list;
 exports.listify = listify;
+exports.load_src = load_src;
 exports.lowerize = lowerize;
 exports.map = map;
 exports.mapEntries = mapEntries;
@@ -2628,7 +2796,6 @@ exports.retry = retry;
 exports.safeExec = safeExec;
 exports.safeGetFromFuncOrData = safeGetFromFuncOrData;
 exports.safe_async_call = safe_async_call;
-exports.safe_fetch_options = safe_fetch_options;
 exports.safe_json_parse = safe_json_parse;
 exports.safe_json_parse_arr = safe_json_parse_arr;
 exports.safe_json_stringify = safe_json_stringify;

package/dist/load-src.d.ts

@@ -0,0 +1,16 @@
+interface IOpt {
+    id?: string;
+    text?: string;
+    url?: string;
+    debug?: boolean;
+    allowExternal?: boolean;
+    cache?: boolean;
+    async?: boolean;
+    type?: 'text/css' | 'text/javascript';
+    charset?: string;
+}
+type TMixOpt = IOpt | string;
+export declare function create_load_src(): (items: TMixOpt | TMixOpt[], node?: HTMLHeadElement) => Promise<Element> | Promise<Element[]>;
+export declare function load_src(items: TMixOpt, node?: HTMLHeadElement): Promise<Element>;
+export declare function load_src(items: TMixOpt[], node?: HTMLHeadElement): Promise<Element[]>;
+export {};

package/dist/moment-help.d.ts

@@ -25,6 +25,7 @@ export declare function getMomentRange(m?: any): {
     近一月: [dayjs.Dayjs, dayjs.Dayjs];
     下月: [dayjs.Dayjs, dayjs.Dayjs];
     近一年: [dayjs.Dayjs, dayjs.Dayjs];
+    年初至今: [dayjs.Dayjs, dayjs.Dayjs];
 };
 export declare function presets_date(): {
     label: string;

package/dist/option-help.d.ts

@@ -15,8 +15,6 @@ type TOptions<T extends TOptionKey | TGetOptionKey> = T extends TOptionKey ? ICo
 export declare function getSimpleOptions<T extends TOptionKey | TGetOptionKey>(_arr: T, options?: ISpectialOption): TOptions<T>;
 export declare function getSameOptions<T extends TOptionKey | TGetOptionKey>(_arr: T): TOptions<T>;
 export declare function getDualModeOptions<T extends TOptionKey | TGetOptionKey>(arr: T, options?: ISpectialOption): readonly [TOptions<T>, TOptions<T>];
-export type T_FETCH_OPTIONS = () => (Promise<ICommonOption[]> | ICommonOption[]);
-export declare function safe_fetch_options(cb: T_FETCH_OPTIONS): Promise<ICommonOption[]>;
 export declare function getPresetOptions(key: string, pure?: boolean): ICommonOption[];
 export declare function getOptionLabel(k: string, value: any, defaultLabel?: string): string;
 export declare function getOptionValue(k: string, label: any): any;

package/dist/small-fn.d.ts

@@ -18,7 +18,7 @@ export declare function getFilledArray(n: number): any[];
 export declare function copyText(text: string): boolean;
 export declare function safeExec<T extends (...args: any) => any>(fn?: T, ...args: Parameters<T>): any;
 export declare function safeGetFromFuncOrData(fn: any): any;
-export declare function numberLikeCompare(a: number | string | boolean, b: number | string | boolean): boolean;
+export declare function numberLikeCompare(a: number | string | boolean | null, b: number | string | boolean | null): boolean;
 export declare function warpBase64Type(str: string, type: 'img' | 'pdf'): string;
 export declare function safe_number_parse(value: any, defaultValue?: number): number;
 export declare function expect_array<T>(value?: T[] | null, default_v?: T[]): T[];
@@ -30,13 +30,13 @@ export declare function gen_encoded_char_svg(props: {
 export declare function base64_to_image(base64img: string): Promise<HTMLImageElement | null>;
 export declare function image_to_base64(img_el: HTMLImageElement): string | null;
 export declare function filter_obj_to_url_search(obj: Object | any[]): any;
-export declare function safe_async_call<T extends (...args: any) => any>(cb: T, ...args: Parameters<T>): Promise<ReturnType<T> | null>;
-export declare function cache_fetch<T = any>(key: string, cb: () => Promise<T>): Promise<T>;
+export declare function safe_async_call<T extends (...args: any) => any>(cb?: T, ...args: Parameters<T>): Promise<ReturnType<T> | null>;
+export declare function cache_fetch<T = any>(key: string, cb: () => Promise<T>, deep?: boolean): Promise<T>;
 export declare function speculate_on_display(value?: any): string;
 export declare function getFuckTimeInterval(star_hour?: number, end_hour?: number, min_interval?: 1 | 2 | 3 | 4 | 5 | 6 | 10 | 15 | 20 | 30): string[];
 export declare function random_word(): string[];
 export declare function confirm_operation(): boolean;
 export declare function simple_encrypt(data: AnyObject | any[]): number[] | null;
 export declare function simple_decrypt(code: number[]): AnyObject | null;
-export declare function simple_encrypt_str(data: string): string | null;
-export declare function simple_decrypt_str(code: string): string | null;
+export declare function simple_encrypt_str(data: string, sp?: string): string | null;
+export declare function simple_decrypt_str(code: string, sp?: string): string | null;

package/dist/type-utils.d.ts

@@ -1,3 +1,4 @@
+export type PropertyKey = string | number | symbol;
 export type PartialAll<T> = {
     [P in keyof T]?: T[P] extends Array<any> ? Partial<T[P][number]>[] : Partial<T[P]>;
 };

package/dist/typing.d.ts

@@ -17,6 +17,17 @@ interface ICommonOption {
     code?: any;
 }
 
+type PropertyKey$1 = string | number | symbol;
+type PartialAll<T> = {
+    [P in keyof T]?: T[P] extends Array<any> ? Partial<T[P][number]>[] : Partial<T[P]>;
+};
+type PartialSome<T, K extends keyof T> = {
+    [P in K]?: T[P];
+} & Pick<T, Exclude<keyof T, K>>;
+type AnyObject<T = any> = {
+    [x: string]: T;
+};
+
 /**
  * Sorts an array of items into groups. The return value is a map where the keys are
  * the group ids the given getGroupId function produced and the value is an array of
@@ -700,21 +711,12 @@ declare function size(value: any): number;
 declare function isNil(value: any): value is null | undefined;
 declare function toString(value: any): string;
 declare function cloneDeep<T>(value: T): T | null;
+declare function hasOwn(obj: AnyObject, key: PropertyKey): boolean;
 
 declare function safe_json_parse<T = any>(str?: any, retOnErr?: T | null): T | null;
 declare function safe_json_stringify(obj?: any): string;
 declare function safe_json_parse_arr<T = any>(str?: any, retOnErr?: T[]): T[];
 
-type PartialAll<T> = {
-    [P in keyof T]?: T[P] extends Array<any> ? Partial<T[P][number]>[] : Partial<T[P]>;
-};
-type PartialSome<T, K extends keyof T> = {
-    [P in K]?: T[P];
-} & Pick<T, Exclude<keyof T, K>>;
-type AnyObject<T = any> = {
-    [x: string]: T;
-};
-
 type TCommonFileType = 'application/vnd.ms-excel' | 'text/csv;charset=utf-8' | 'application/msword';
 declare function get_global(): typeof globalThis;
 declare function getSearchParamsValue(key: string): string | null;
@@ -734,7 +736,7 @@ declare function getFilledArray(n: number): any[];
 declare function copyText(text: string): boolean;
 declare function safeExec<T extends (...args: any) => any>(fn?: T, ...args: Parameters<T>): any;
 declare function safeGetFromFuncOrData(fn: any): any;
-declare function numberLikeCompare(a: number | string | boolean, b: number | string | boolean): boolean;
+declare function numberLikeCompare(a: number | string | boolean | null, b: number | string | boolean | null): boolean;
 declare function warpBase64Type(str: string, type: 'img' | 'pdf'): string;
 declare function safe_number_parse(value: any, defaultValue?: number): number;
 declare function expect_array<T>(value?: T[] | null, default_v?: T[]): T[];
@@ -746,16 +748,16 @@ declare function gen_encoded_char_svg(props: {
 declare function base64_to_image(base64img: string): Promise<HTMLImageElement | null>;
 declare function image_to_base64(img_el: HTMLImageElement): string | null;
 declare function filter_obj_to_url_search(obj: Object | any[]): any;
-declare function safe_async_call<T extends (...args: any) => any>(cb: T, ...args: Parameters<T>): Promise<ReturnType<T> | null>;
-declare function cache_fetch<T = any>(key: string, cb: () => Promise<T>): Promise<T>;
+declare function safe_async_call<T extends (...args: any) => any>(cb?: T, ...args: Parameters<T>): Promise<ReturnType<T> | null>;
+declare function cache_fetch<T = any>(key: string, cb: () => Promise<T>, deep?: boolean): Promise<T>;
 declare function speculate_on_display(value?: any): string;
 declare function getFuckTimeInterval(star_hour?: number, end_hour?: number, min_interval?: 1 | 2 | 3 | 4 | 5 | 6 | 10 | 15 | 20 | 30): string[];
 declare function random_word(): string[];
 declare function confirm_operation(): boolean;
 declare function simple_encrypt(data: AnyObject | any[]): number[] | null;
 declare function simple_decrypt(code: number[]): AnyObject | null;
-declare function simple_encrypt_str(data: string): string | null;
-declare function simple_decrypt_str(code: string): string | null;
+declare function simple_encrypt_str(data: string, sp?: string): string | null;
+declare function simple_decrypt_str(code: string, sp?: string): string | null;
 
 interface ILL {
     log?(...optionalParams: any[]): void;
@@ -845,6 +847,7 @@ declare function getMomentRange(m?: any): {
     近一月: [dayjs.Dayjs, dayjs.Dayjs];
     下月: [dayjs.Dayjs, dayjs.Dayjs];
     近一年: [dayjs.Dayjs, dayjs.Dayjs];
+    年初至今: [dayjs.Dayjs, dayjs.Dayjs];
 };
 declare function presets_date(): {
     label: string;
@@ -873,8 +876,6 @@ type TOptions<T extends TOptionKey | TGetOptionKey> = T extends TOptionKey ? ICo
 declare function getSimpleOptions<T extends TOptionKey | TGetOptionKey>(_arr: T, options?: ISpectialOption): TOptions<T>;
 declare function getSameOptions<T extends TOptionKey | TGetOptionKey>(_arr: T): TOptions<T>;
 declare function getDualModeOptions<T extends TOptionKey | TGetOptionKey>(arr: T, options?: ISpectialOption): readonly [TOptions<T>, TOptions<T>];
-type T_FETCH_OPTIONS = () => (Promise<ICommonOption[]> | ICommonOption[]);
-declare function safe_fetch_options(cb: T_FETCH_OPTIONS): Promise<ICommonOption[]>;
 declare function getPresetOptions(key: string, pure?: boolean): ICommonOption[];
 declare function getOptionLabel(k: string, value: any, defaultLabel?: string): string;
 declare function getOptionValue(k: string, label: any): any;
@@ -916,5 +917,21 @@ declare function getDictionaryLabel(type: string, value: string | number): strin
 declare function getDictionaryValue(type: string, label: string): number | null | undefined;
 declare function merge_dict(ops: AnyObject<IDictionary>): void;
 
-export { ARG_URS1_KEY, ARG_URS2_KEY, AggregateError, EMPTY_PLACEHOLDER, EventEmitter, MyLog, ROMAN_NUMERALS, TOKEN_KEY, all, alphabetical, assign, base64ToBinary, base64_to_image, boil, cache_fetch, callable, camel, capitalize, chain, charToUTF8, charToUnicode, clone, cloneDeep, cluster, compose, confirm_operation, construct, copyText, counting, crush, dash, dayjs_quarter, debounce, defer, diff, diff_between, downloadFile, draw, expect_array, filter_obj_to_url_search, first, flat, fork, formatDate, formatDateTime, formatDateTimeNoSecond, formatTime, gen_encoded_char_svg, get, getDictionaries, getDictionariesEnumerations, getDictionaryLabel, getDictionaryValue, getDualModeOptions, getFilledArray, getFuckTimeInterval, getFutureDate, getMomentObj, getMomentRange, getOptionLabel, getOptionValue, getPresetOptions, getSameOptions, getSearchParamsAll, getSearchParamsValue, getSimpleOptions, get_global, group, guard, identity, image_to_base64, inRange, intersects, invert, isArray, isBoolean, isDate, isEmpty, isEqual, isFloat, isFunction, isInt, isMoment, isNil, isNull, isNumber, isObject, isObjectLike, isPrimitive, isPromise, isString, isSymbol, iterate, keys, last, list, listify, lowerize, map, mapEntries, mapKeys, mapValues, max, memo, merge, merge_dict, merge_preset_options, min, noop, numberLikeCompare, objectify, omit, optionKey不详, optionKey其他, optionKey否, parallel, partial, partob, pascal, pick, presets_date, proxied, random, randomHex, random_word, range, reduce, replace, replaceOrAppend, retry, safeExec, safeGetFromFuncOrData, safe_async_call, safe_fetch_options, safe_json_parse, safe_json_parse_arr, safe_json_stringify, safe_number_parse, scrollIntoView, select, series, set, setSearchParamsAll, setSearchParamsValue, shake, shift, shuffle, sift, simple_decrypt, simple_decrypt_str, simple_encrypt, simple_encrypt_str, size, sleep, snake, sort, speculate_on_display, sum, template, throttle, title, toFloat, toInt, toString, toggle, trim, tryit as try, tryit, uid, unicodeToChar, unicode_to_UTF8, unique, upperize, uuid, warpBase64Type, zip, zipToObject };
-export type { AnyObject, Dayjs, DayjsConfigType, ICommonOption, PartialAll, PartialSome, TCommonFileType, T_FETCH_OPTIONS };
+interface IOpt {
+    id?: string;
+    text?: string;
+    url?: string;
+    debug?: boolean;
+    allowExternal?: boolean;
+    cache?: boolean;
+    async?: boolean;
+    type?: 'text/css' | 'text/javascript';
+    charset?: string;
+}
+type TMixOpt = IOpt | string;
+declare function create_load_src(): (items: TMixOpt | TMixOpt[], node?: HTMLHeadElement) => Promise<Element> | Promise<Element[]>;
+declare function load_src(items: TMixOpt, node?: HTMLHeadElement): Promise<Element>;
+declare function load_src(items: TMixOpt[], node?: HTMLHeadElement): Promise<Element[]>;
+
+export { ARG_URS1_KEY, ARG_URS2_KEY, AggregateError, EMPTY_PLACEHOLDER, EventEmitter, MyLog, ROMAN_NUMERALS, TOKEN_KEY, all, alphabetical, assign, base64ToBinary, base64_to_image, boil, cache_fetch, callable, camel, capitalize, chain, charToUTF8, charToUnicode, clone, cloneDeep, cluster, compose, confirm_operation, construct, copyText, counting, create_load_src, crush, dash, dayjs_quarter, debounce, defer, diff, diff_between, downloadFile, draw, expect_array, filter_obj_to_url_search, first, flat, fork, formatDate, formatDateTime, formatDateTimeNoSecond, formatTime, gen_encoded_char_svg, get, getDictionaries, getDictionariesEnumerations, getDictionaryLabel, getDictionaryValue, getDualModeOptions, getFilledArray, getFuckTimeInterval, getFutureDate, getMomentObj, getMomentRange, getOptionLabel, getOptionValue, getPresetOptions, getSameOptions, getSearchParamsAll, getSearchParamsValue, getSimpleOptions, get_global, group, guard, hasOwn, identity, image_to_base64, inRange, intersects, invert, isArray, isBoolean, isDate, isEmpty, isEqual, isFloat, isFunction, isInt, isMoment, isNil, isNull, isNumber, isObject, isObjectLike, isPrimitive, isPromise, isString, isSymbol, iterate, keys, last, list, listify, load_src, lowerize, map, mapEntries, mapKeys, mapValues, max, memo, merge, merge_dict, merge_preset_options, min, noop, numberLikeCompare, objectify, omit, optionKey不详, optionKey其他, optionKey否, parallel, partial, partob, pascal, pick, presets_date, proxied, random, randomHex, random_word, range, reduce, replace, replaceOrAppend, retry, safeExec, safeGetFromFuncOrData, safe_async_call, safe_json_parse, safe_json_parse_arr, safe_json_stringify, safe_number_parse, scrollIntoView, select, series, set, setSearchParamsAll, setSearchParamsValue, shake, shift, shuffle, sift, simple_decrypt, simple_decrypt_str, simple_encrypt, simple_encrypt_str, size, sleep, snake, sort, speculate_on_display, sum, template, throttle, title, toFloat, toInt, toString, toggle, trim, tryit as try, tryit, uid, unicodeToChar, unicode_to_UTF8, unique, upperize, uuid, warpBase64Type, zip, zipToObject };
+export type { AnyObject, Dayjs, DayjsConfigType, ICommonOption, PartialAll, PartialSome, PropertyKey$1 as PropertyKey, TCommonFileType };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@noah-libjs/utils",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -34,5 +34,5 @@
     "keywords": [],
     "author": "",
     "license": "MIT",
-    "gitHead": "fcd560c4526837addb257776124afb9381853236"
+    "gitHead": "a50958bb900a9e145a8a722b69c639cac93d2094"
 }