@noah-libjs/utils 0.0.8 → 0.0.9

package/dist/es.js

@@ -1632,6 +1632,17 @@ function copyText(text) {
   document.body.removeChild(textareaC);
   return res;
 }
+function dyn_cb(cb, g_ctx) {
+  try {
+    cb(g_ctx());
+    return false;
+  } catch (error) {
+    console.error('dyn_cb', {
+      error: error
+    });
+    return true;
+  }
+}
 function safeExec(fn) {
   for (var _len8 = arguments.length, args = new Array(_len8 > 1 ? _len8 - 1 : 0), _key8 = 1; _key8 < _len8; _key8++) {
     args[_key8 - 1] = arguments[_key8];
@@ -1639,8 +1650,14 @@ function safeExec(fn) {
   return isFunction(fn) ? fn.apply(void 0, args) : null;
 }
 function safeGetFromFuncOrData(fn) {
+  var default_v = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var _a;
-  return (_a = safeExec(fn)) !== null && _a !== void 0 ? _a : fn;
+  try {
+    return (_a = safeExec(fn)) !== null && _a !== void 0 ? _a : fn;
+  } catch (error) {
+    if (default_v) return default_v;
+    throw error;
+  }
 }
 function numberLikeCompare(a, b) {
   if (a === b) return true;
@@ -1797,15 +1814,22 @@ function cache_fetch_inner(key, cb) {
     }, _callee10);
   }));
 }
+function join_option_value(value) {
+  if (!isObjectLike(value)) return value;
+  var msg = (value === null || value === void 0 ? void 0 : value.label) || (value === null || value === void 0 ? void 0 : value.value);
+  var text = value === null || value === void 0 ? void 0 : value.text;
+  if (!msg) return null;
+  return text ? "".concat(msg, "(").concat(text, ")") : msg;
+}
 function speculate_on_display(value) {
   if (!value) return '';
   if (isNumber(value)) return value + '';
   if (Array.isArray(value)) {
-    var item0 = value[0];
-    return (item0 === null || item0 === void 0 ? void 0 : item0.label) || (item0 === null || item0 === void 0 ? void 0 : item0.value);
+    var arr = value.map(join_option_value).filter(identity);
+    return arr.join('/');
   }
   if (isObjectLike(value)) {
-    return value.label || value.value;
+    return join_option_value(value);
   }
   if (isString(value)) {
     var obj = safe_json_parse(value);
@@ -1875,6 +1899,11 @@ function simple_decrypt_str(code) {
   }).join('');
   return str;
 }
+function text_ellipsis(text, max) {
+  if (!text || !isNumber(max)) return '';
+  if (text.length <= max) return text;
+  return text.slice(0, max) + '...';
+}
 Object.assign(get_global(), {
   safe_async_call: safe_async_call,
   simple_decrypt_str: simple_decrypt_str,
@@ -2641,8 +2670,8 @@ function create_load_src() {
     })) : exec(items, node);
   };
 }
-var load_src_ = create_load_src();
 function load_src(items, node) {
+  var load_src_ = create_load_src();
   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 };
+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, dyn_cb, 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, text_ellipsis, throttle, title, toFloat, toInt, toString, toggle, trim, tryit as try, tryit, uid, unicodeToChar, unicode_to_UTF8, unique, upperize, uuid, warpBase64Type, zip, zipToObject };

package/dist/lib.js

@@ -1642,6 +1642,17 @@ function copyText(text) {
   document.body.removeChild(textareaC);
   return res;
 }
+function dyn_cb(cb, g_ctx) {
+  try {
+    cb(g_ctx());
+    return false;
+  } catch (error) {
+    console.error('dyn_cb', {
+      error: error
+    });
+    return true;
+  }
+}
 function safeExec(fn) {
   for (var _len8 = arguments.length, args = new Array(_len8 > 1 ? _len8 - 1 : 0), _key8 = 1; _key8 < _len8; _key8++) {
     args[_key8 - 1] = arguments[_key8];
@@ -1649,8 +1660,14 @@ function safeExec(fn) {
   return isFunction(fn) ? fn.apply(void 0, args) : null;
 }
 function safeGetFromFuncOrData(fn) {
+  var default_v = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var _a;
-  return (_a = safeExec(fn)) !== null && _a !== void 0 ? _a : fn;
+  try {
+    return (_a = safeExec(fn)) !== null && _a !== void 0 ? _a : fn;
+  } catch (error) {
+    if (default_v) return default_v;
+    throw error;
+  }
 }
 function numberLikeCompare(a, b) {
   if (a === b) return true;
@@ -1807,15 +1824,22 @@ function cache_fetch_inner(key, cb) {
     }, _callee10);
   }));
 }
+function join_option_value(value) {
+  if (!isObjectLike(value)) return value;
+  var msg = (value === null || value === void 0 ? void 0 : value.label) || (value === null || value === void 0 ? void 0 : value.value);
+  var text = value === null || value === void 0 ? void 0 : value.text;
+  if (!msg) return null;
+  return text ? "".concat(msg, "(").concat(text, ")") : msg;
+}
 function speculate_on_display(value) {
   if (!value) return '';
   if (isNumber(value)) return value + '';
   if (Array.isArray(value)) {
-    var item0 = value[0];
-    return (item0 === null || item0 === void 0 ? void 0 : item0.label) || (item0 === null || item0 === void 0 ? void 0 : item0.value);
+    var arr = value.map(join_option_value).filter(identity);
+    return arr.join('/');
   }
   if (isObjectLike(value)) {
-    return value.label || value.value;
+    return join_option_value(value);
   }
   if (isString(value)) {
     var obj = safe_json_parse(value);
@@ -1885,6 +1909,11 @@ function simple_decrypt_str(code) {
   }).join('');
   return str;
 }
+function text_ellipsis(text, max) {
+  if (!text || !isNumber(max)) return '';
+  if (text.length <= max) return text;
+  return text.slice(0, max) + '...';
+}
 Object.assign(get_global(), {
   safe_async_call: safe_async_call,
   simple_decrypt_str: simple_decrypt_str,
@@ -2651,8 +2680,8 @@ function create_load_src() {
     })) : exec(items, node);
   };
 }
-var load_src_ = create_load_src();
 function load_src(items, node) {
+  var load_src_ = create_load_src();
   return load_src_(items, node);
 }
 Object.defineProperty(exports, 'dayjs', {
@@ -2699,6 +2728,7 @@ exports.diff = diff;
 exports.diff_between = diff_between;
 exports.downloadFile = downloadFile;
 exports.draw = draw;
+exports.dyn_cb = dyn_cb;
 exports.expect_array = expect_array;
 exports.filter_obj_to_url_search = filter_obj_to_url_search;
 exports.first = first;
@@ -2821,6 +2851,7 @@ exports.sort = sort;
 exports.speculate_on_display = speculate_on_display;
 exports.sum = sum;
 exports.template = template;
+exports.text_ellipsis = text_ellipsis;
 exports.throttle = throttle;
 exports.title = title;
 exports.toFloat = toFloat;

package/dist/moment-help.d.ts

@@ -37,5 +37,5 @@ export declare function isMoment(m: any): boolean;
  */
 export declare function getFutureDate(num: number): any;
 export declare function dayjs_quarter(input: Dayjs, which_quarter?: number): [Dayjs, number];
-export declare function diff_between(a: ConfigType, b: ConfigType, unit: QUnitType | OpUnitType, float?: boolean): any;
+export declare function diff_between(a: ConfigType, b: ConfigType, unit: QUnitType | OpUnitType, float?: boolean): number;
 export { dayjs };

package/dist/small-fn.d.ts

@@ -16,8 +16,9 @@ export declare function unicodeToChar(u: number): string | null;
 export declare function unicode_to_UTF8(u: number): number[] | null;
 export declare function getFilledArray(n: number): any[];
 export declare function copyText(text: string): boolean;
+export declare function dyn_cb<T>(cb: (ctx: T) => void, g_ctx: () => T): 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 safeGetFromFuncOrData(fn: any, default_v?: any): any;
 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;
@@ -40,3 +41,4 @@ 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, sp?: string): string | null;
 export declare function simple_decrypt_str(code: string, sp?: string): string | null;
+export declare function text_ellipsis(text: string, max: number): string;

package/dist/typing.d.ts

@@ -734,8 +734,9 @@ declare function unicodeToChar(u: number): string | null;
 declare function unicode_to_UTF8(u: number): number[] | null;
 declare function getFilledArray(n: number): any[];
 declare function copyText(text: string): boolean;
+declare function dyn_cb<T>(cb: (ctx: T) => void, g_ctx: () => T): boolean;
 declare function safeExec<T extends (...args: any) => any>(fn?: T, ...args: Parameters<T>): any;
-declare function safeGetFromFuncOrData(fn: any): any;
+declare function safeGetFromFuncOrData(fn: any, default_v?: any): any;
 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;
@@ -758,6 +759,7 @@ declare function simple_encrypt(data: AnyObject | any[]): number[] | null;
 declare function simple_decrypt(code: number[]): AnyObject | null;
 declare function simple_encrypt_str(data: string, sp?: string): string | null;
 declare function simple_decrypt_str(code: string, sp?: string): string | null;
+declare function text_ellipsis(text: string, max: number): string;
 
 interface ILL {
     log?(...optionalParams: any[]): void;
@@ -859,7 +861,7 @@ declare function isMoment(m: any): boolean;
  */
 declare function getFutureDate(num: number): any;
 declare function dayjs_quarter(input: Dayjs, which_quarter?: number): [Dayjs, number];
-declare function diff_between(a: ConfigType, b: ConfigType, unit: QUnitType | OpUnitType, float?: boolean): any;
+declare function diff_between(a: ConfigType, b: ConfigType, unit: QUnitType | OpUnitType, float?: boolean): number;
 
 interface ISpectialOption {
     sp?: ICommonOption[];
@@ -933,5 +935,5 @@ declare function create_load_src(): (items: TMixOpt | TMixOpt[], node?: HTMLHead
 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 { 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, dyn_cb, 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, text_ellipsis, 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.8",
+    "version": "0.0.9",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -34,5 +34,5 @@
     "keywords": [],
     "author": "",
     "license": "MIT",
-    "gitHead": "a50958bb900a9e145a8a722b69c639cac93d2094"
+    "gitHead": "bb49d078600e65d77b842887c63be3b254faf999"
 }