@vope/utils 1.6.6 → 1.6.8

package/dist/calc.d.ts

@@ -1,13 +1,16 @@
-type Ls = `${string}(${string})` | `${number}${string}`;
+type Ls = `${string}(${string})` | `${number}${string}` | `-${number}${string}`;
 type Lv = Ls | number;
 export declare namespace Calc {
     type Value = Lv;
-}
-declare const formatter: (value: Lv) => 0 | Ls;
-interface Calc {
-    (...list: Lv[]): 0 | Ls;
-    formatter: typeof formatter;
+    interface Clamp {
+        min?: Lv;
+        max?: Lv;
+    }
 }
 export declare const isCalc: (value: Ls) => value is `calc(${string})`;
-declare const calc: Calc;
-export { calc, };
+declare const calc: {
+    (...list: Lv[]): 0 | Ls;
+    formatter: (value: Lv) => 0 | Ls;
+    clamp(value: Lv, { min, max }: Calc.Clamp): Ls | 0;
+};
+export default calc;

package/dist/calc.js

@@ -1,22 +1,81 @@
 import { isNumber } from "lodash-es";
+const { parseFloat } = Number;
 const formatter = (value) => isNumber(value) ? value && `${value}px` : value;
 const isCalc = (value) => value.slice(0, 5) === "calc(" && value.slice(-1) === ")";
+const re_numerical = /^(-?(?:\.\d+|\d+(?:\.\d+)?))([a-zA-Z]+|%)$/;
+const re_zero = /^0[a-zA-Z]+$/;
+class Memory {
+  data = {};
+  memory = {};
+  add(index, value, unit) {
+    const { data, memory } = this;
+    if (!isNumber(value)) {
+      data[index] = { value };
+    } else {
+      const point = memory[unit];
+      if (point === void 0) {
+        data[index] = { value, unit };
+        memory[unit] = index;
+      } else {
+        const tmp = data[point];
+        tmp.value = tmp.value + value;
+      }
+    }
+  }
+}
+class Manager {
+  memory = new Memory();
+  push(value, index) {
+    const { memory } = this;
+    if (isNumber(value)) return memory.add(index, value, "px");
+    const matchs = value.match(re_numerical);
+    if (matchs) return memory.add(index, parseFloat(matchs[1]), matchs[2]);
+    if (!isCalc(value)) return memory.add(index, value);
+    const tmp = value.slice(5, -1).match(re_numerical);
+    tmp ? memory.add(index, parseFloat(tmp[1]), tmp[2]) : memory.add(index, value.slice(4));
+  }
+  at(index) {
+    return this.memory.data[index];
+  }
+}
 const calc = (...list) => {
   const size = list.length;
   if (size === 0) return 0;
-  if (size === 1) return formatter(list[1]);
-  const value = list.reduce((caches, value2) => {
-    let tmp = formatter(value2);
-    if (tmp === 0) return caches;
-    if (isCalc(tmp)) {
-      tmp = tmp.slice(4);
+  if (size === 1) return formatter(list[0]);
+  const manager = new Manager();
+  list.forEach((value2, index) => manager.push(value2, index));
+  const value = list.reduce((caches, _, index) => {
+    const data = manager.at(index);
+    if (!data || data.value === 0) return caches;
+    const { value: value2, unit } = data;
+    let tmp;
+    if (isNumber(value2)) {
+      tmp = value2 + unit;
+    } else {
+      tmp = value2;
     }
-    return caches ? `${caches} + ${tmp}` : tmp;
+    if (!caches) return tmp;
+    return tmp[0] === "-" ? `${caches} - ${tmp.slice(1)}` : `${caches} + ${tmp}`;
   }, "");
-  return value === "" ? 0 : `calc(${value})`;
+  return !value || re_zero.test(value) ? 0 : `calc(${value})`;
 };
 calc.formatter = formatter;
+const zero = "0px";
+const u = void 0;
+calc.clamp = (value, { min, max }) => {
+  const val = calc.formatter(value);
+  if (min !== u && max !== u) {
+    return `clamp(${calc.formatter(min) || zero}, ${val || zero}, ${calc.formatter(max) || zero})`;
+  } else if (max !== u) {
+    return `max(${calc.formatter(max) || zero}, ${val || zero})`;
+  } else if (min !== u) {
+    return `min(${calc.formatter(min) || zero}, ${val || zero})`;
+  } else {
+    return val;
+  }
+};
+var calc_default = calc;
 export {
-  calc,
+  calc_default as default,
   isCalc
 };

package/dist/dic.d.ts

@@ -1,4 +1,4 @@
-import { IsNever, Revise } from '@vope/types';
+import type { IsNever, Revise } from '@vope/types';
 type Key = string | number;
 export interface Dic<V extends Key> {
     label: string;

package/dist/index.cjs.js

@@ -36,7 +36,7 @@ __export(index_exports, {
   Union: () => Union,
   WeekLastUnit: () => WeekLastUnit,
   WildcardUnit: () => WildcardUnit,
-  calc: () => calc,
+  calc: () => calc_default,
   clamp: () => clamp,
   classnames: () => classnames,
   compareVersion: () => compareVersion,
@@ -91,23 +91,82 @@ module.exports = __toCommonJS(index_exports);
 
 // src/calc.ts
 var import_lodash_es = require("lodash-es");
+var { parseFloat } = Number;
 var formatter = (value) => (0, import_lodash_es.isNumber)(value) ? value && `${value}px` : value;
 var isCalc = (value) => value.slice(0, 5) === "calc(" && value.slice(-1) === ")";
+var re_numerical = /^(-?(?:\.\d+|\d+(?:\.\d+)?))([a-zA-Z]+|%)$/;
+var re_zero = /^0[a-zA-Z]+$/;
+var Memory = class {
+  data = {};
+  memory = {};
+  add(index, value, unit) {
+    const { data, memory } = this;
+    if (!(0, import_lodash_es.isNumber)(value)) {
+      data[index] = { value };
+    } else {
+      const point = memory[unit];
+      if (point === void 0) {
+        data[index] = { value, unit };
+        memory[unit] = index;
+      } else {
+        const tmp = data[point];
+        tmp.value = tmp.value + value;
+      }
+    }
+  }
+};
+var Manager = class {
+  memory = new Memory();
+  push(value, index) {
+    const { memory } = this;
+    if ((0, import_lodash_es.isNumber)(value)) return memory.add(index, value, "px");
+    const matchs = value.match(re_numerical);
+    if (matchs) return memory.add(index, parseFloat(matchs[1]), matchs[2]);
+    if (!isCalc(value)) return memory.add(index, value);
+    const tmp = value.slice(5, -1).match(re_numerical);
+    tmp ? memory.add(index, parseFloat(tmp[1]), tmp[2]) : memory.add(index, value.slice(4));
+  }
+  at(index) {
+    return this.memory.data[index];
+  }
+};
 var calc = (...list) => {
   const size = list.length;
   if (size === 0) return 0;
-  if (size === 1) return formatter(list[1]);
-  const value = list.reduce((caches, value2) => {
-    let tmp = formatter(value2);
-    if (tmp === 0) return caches;
-    if (isCalc(tmp)) {
-      tmp = tmp.slice(4);
+  if (size === 1) return formatter(list[0]);
+  const manager = new Manager();
+  list.forEach((value2, index) => manager.push(value2, index));
+  const value = list.reduce((caches, _, index) => {
+    const data = manager.at(index);
+    if (!data || data.value === 0) return caches;
+    const { value: value2, unit } = data;
+    let tmp;
+    if ((0, import_lodash_es.isNumber)(value2)) {
+      tmp = value2 + unit;
+    } else {
+      tmp = value2;
     }
-    return caches ? `${caches} + ${tmp}` : tmp;
+    if (!caches) return tmp;
+    return tmp[0] === "-" ? `${caches} - ${tmp.slice(1)}` : `${caches} + ${tmp}`;
   }, "");
-  return value === "" ? 0 : `calc(${value})`;
+  return !value || re_zero.test(value) ? 0 : `calc(${value})`;
 };
 calc.formatter = formatter;
+var zero = "0px";
+var u = void 0;
+calc.clamp = (value, { min, max }) => {
+  const val = calc.formatter(value);
+  if (min !== u && max !== u) {
+    return `clamp(${calc.formatter(min) || zero}, ${val || zero}, ${calc.formatter(max) || zero})`;
+  } else if (max !== u) {
+    return `max(${calc.formatter(max) || zero}, ${val || zero})`;
+  } else if (min !== u) {
+    return `min(${calc.formatter(min) || zero}, ${val || zero})`;
+  } else {
+    return val;
+  }
+};
+var calc_default = calc;
 
 // src/clamp.ts
 var clamp = (value, min, max) => {
@@ -1230,8 +1289,8 @@ var MemoryBasic = class {
     const { memorys, list } = this;
     if (!memorys.has(type)) return this;
     const local = hash8strings(this.#reflex(memorys.get(type)));
-    const Memory = this.constructor;
-    const imitator = new Memory(this.key, {
+    const Memory2 = this.constructor;
+    const imitator = new Memory2(this.key, {
       mount: this.#mount,
       reflex: this.#reflex
     });

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { type Calc, isCalc, calc } from './calc';
+export { type Calc, isCalc, default as calc } from './calc';
 export { clamp } from './clamp';
 export { classnames } from './classnames';
 export { compareVersion } from './compare/version';

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isCalc, calc } from "./calc";
+import { isCalc, default as default2 } from "./calc";
 import { clamp } from "./clamp";
 import { classnames } from "./classnames";
 import { compareVersion } from "./compare/version";
@@ -8,7 +8,7 @@ import { hash8object } from "./convert/object";
 import { hash8strings } from "./convert/strings";
 import { weekDic, default_max_second, default_min_second, default_max_minute, default_min_minute, default_max_hour, default_min_hour, default_max_day, default_min_day, default_max_month, default_min_month, default_max_week, default_min_week, createCronRegexText, InvalidUnit, isInvalidUnit, DayLastUnit, isDayLastUnit, WeekLastUnit, isWeekLastUnit, WildcardUnit, isWildcardUnit, RangeUnit, isRangeUnit, AggUnit, isAggUnit, Cron } from "./cron";
 import { desensEncrypt, desensDecrypt, desensReplace } from "./desens";
-import { default as default2 } from "./dic";
+import { default as default3 } from "./dic";
 import { getEncoding } from "./encoding";
 import { inputRegex } from "./input-regex";
 import { isClass } from "./is/class";
@@ -20,8 +20,8 @@ import { MemoryBasic } from "./memory/basic";
 import { MemoryList } from "./memory/list";
 import { MemoryPower } from "./memory/power";
 import { MemorySimple } from "./memory/simple";
-import { default as default3 } from "./neo4j-anchors";
-import { default as default4 } from "./neo4j";
+import { default as default4 } from "./neo4j-anchors";
+import { default as default5 } from "./neo4j";
 import { once } from "./once";
 import { parseNum } from "./parse/num";
 import { deconPowersSum } from "./power/decon";
@@ -29,7 +29,7 @@ import { rotateAngle } from "./rotate/angle";
 import { rotateRad } from "./rotate/rad";
 import { cubeURLParams, flatURLParams } from "./serialize/url-params";
 import { css } from "./style/css";
-import { default as default5 } from "./subscriber";
+import { default as default6 } from "./subscriber";
 import { FlexTable } from "./table/flex";
 import { Union } from "./union";
 import { joinPaths } from "./url/join";
@@ -39,21 +39,21 @@ export {
   AggUnit,
   Cron,
   DayLastUnit,
-  default2 as DicRollup,
+  default3 as DicRollup,
   FlexTable,
   InvalidUnit,
   MemoryBasic,
   MemoryList,
   MemoryPower,
   MemorySimple,
-  default4 as Neo4j,
-  default3 as Neo4jAhchors,
+  default5 as Neo4j,
+  default4 as Neo4jAhchors,
   RangeUnit,
-  default5 as Subscriber,
+  default6 as Subscriber,
   Union,
   WeekLastUnit,
   WildcardUnit,
-  calc,
+  default2 as calc,
   clamp,
   classnames,
   compareVersion,

package/dist/memory/basic.d.ts

@@ -1,4 +1,4 @@
-import { type Memory } from './type';
+import type { Memory } from './type';
 interface Config<Reactor> {
     /**
      * 定义数据如何挂载到存储中

package/dist/memory/list.d.ts

@@ -1,5 +1,5 @@
 import { MemoryBasic } from './basic';
-import { type Memory } from './type';
+import type { Memory } from './type';
 /**
  * 分类存储(基于普通的键值存储)
  */

package/dist/memory/power.d.ts

@@ -1,5 +1,5 @@
 import { MemoryBasic } from './basic';
-import { type Memory } from './type';
+import type { Memory } from './type';
 /**
  * 分类存储(基于2的n次幂之和构建唯一键进行存储)
  */

package/dist/memory/simple.d.ts

@@ -1,6 +1,6 @@
-import { Assign } from '@vope/types';
+import type { Assign } from '@vope/types';
 import { MemoryBasic } from './basic';
-import { type Memory } from './type';
+import type { Memory } from './type';
 type Transform<T, V> = {
     [P in keyof T]: T[P] extends (...args: any) => any ? (...args: Parameters<T[P]>) => ReturnType<T[P]> extends T ? V : ReturnType<T[P]> : T[P];
 };

package/dist/neo4j-anchors.d.ts

@@ -1,4 +1,4 @@
-import Neo4j from './neo4j';
+import type Neo4j from './neo4j';
 interface IBox {
     centerX: number;
     centerY: number;

package/dist/neo4j.d.ts

@@ -1,5 +1,5 @@
-import { Equal } from '@type-challenges/utils';
-import { GetGivenProps } from '@vope/types';
+import type { Equal } from '@type-challenges/utils';
+import type { GetGivenProps } from '@vope/types';
 import { MemoryList } from './memory/list';
 import { MemorySimple } from './memory/simple';
 interface Config<INode extends object, IEdge extends object> {

package/dist/rotate/angle.d.ts

@@ -1,4 +1,4 @@
-import { Point2Tuple } from '@vope/types';
+import type { Point2Tuple } from '@vope/types';
 /**
  * 返回点被旋转指定角度后新的位置
  * @param from 旋转点

package/dist/rotate/rad.d.ts

@@ -1,4 +1,4 @@
-import { Point2Tuple } from '@vope/types';
+import type { Point2Tuple } from '@vope/types';
 /**
  * 返回点被旋转指定弧度后新的位置
  * @param from 旋转点

package/dist/serialize/url-params.d.ts

@@ -1,5 +1,5 @@
-import { Equal } from '@type-challenges/utils';
-import { UnionToTuple } from '@vope/types';
+import type { Equal } from '@type-challenges/utils';
+import type { UnionToTuple } from '@vope/types';
 type NativeMap = {
     string: string;
     boolean: boolean;

package/dist/style/css.d.ts

@@ -1,4 +1,4 @@
-import { Properties, PropertiesHyphen } from 'csstype';
+import type { Properties, PropertiesHyphen } from 'csstype';
 export interface CSSProperties extends Properties<string | number>, PropertiesHyphen<string | number> {
     [v: `--${string}`]: string | number | undefined;
 }

package/dist/union.d.ts

@@ -1,4 +1,4 @@
-import { Revise } from '@vope/types';
+import type { Revise } from '@vope/types';
 interface Result<Data, Option> {
     data: Data;
     option: Option;

package/dist/url/params.d.ts

@@ -1,4 +1,4 @@
-import { Serializes } from '../serialize/url-params';
+import { type Serializes } from '../serialize/url-params';
 /**
  * url拼接参数
  * @param url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vope/utils",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "",
   "publishConfig": {
     "access": "public",
@@ -66,7 +66,7 @@
   "dependencies": {
     "@type-challenges/utils": "^0.1.1",
     "@types/lodash-es": "^4.17.12",
-    "@vope/types": "^1.1.3",
+    "@vope/types": "^1.2.0",
     "csstype": "^3.1.3",
     "localforage": "^1.10.0",
     "lodash-es": "^4.17.21",