@vope/utils 1.2.1 → 1.3.1

package/cjs/encoding.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utf8_first_prefix = /^1{2,}/g;
 const utf8_other_prefix = /^10/;
-var Encodes;
-(function (Encodes) {
-    Encodes["UTF_8"] = "utf-8";
-    Encodes["UTF_16LE"] = "utf-16le";
-    Encodes["UTF_16BE"] = "utf-16be";
-    Encodes["GBK"] = "gbk";
-})(Encodes || (Encodes = {}));
+const Encodes = {
+    UTF_8: 'utf-8',
+    UTF_16LE: 'utf-16le',
+    UTF_16BE: 'utf-16be',
+    GBK: 'gbk'
+};
 const defaults = {
     utf8: [0xef, 0xbb, 0xbf],
 };

package/cjs/memory/basic.js

@@ -65,7 +65,7 @@ class MemoryBasic {
      * 检测存储是否包含某种类型
      */
     includes(type) {
-        return type in this.memorys;
+        return this.memorys.has(type);
     }
     /**
      * 获取指定类型存储数据

package/cjs/union.js

@@ -2,24 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * 数据联合(用于需要对加入的数据进行智能提示)
- * @description 如果设置了formatter，则可以通过设置泛型R来变化Union.value的类型
  */
 class Union {
     key;
     formatter;
-    #map = {};
-    get value() {
-        return this.#map;
+    #data = {};
+    #options = {};
+    get data() {
+        return this.#data;
+    }
+    get options() {
+        return this.#options;
     }
     constructor(key, formatter) {
         this.key = key;
         this.formatter = formatter;
     }
     add(data) {
-        const { formatter } = this;
-        this.#map[data[this.key]] = formatter
-            ? formatter(data)
-            : data;
+        const key = data[this.key];
+        const result = this.formatter(data);
+        this.#data[key] = result.data;
+        this.#options[key] = result.option;
         return this;
     }
 }

package/lib/encoding.js

@@ -1,12 +1,11 @@
 const utf8_first_prefix = /^1{2,}/g;
 const utf8_other_prefix = /^10/;
-var Encodes;
-(function (Encodes) {
-    Encodes["UTF_8"] = "utf-8";
-    Encodes["UTF_16LE"] = "utf-16le";
-    Encodes["UTF_16BE"] = "utf-16be";
-    Encodes["GBK"] = "gbk";
-})(Encodes || (Encodes = {}));
+const Encodes = {
+    UTF_8: 'utf-8',
+    UTF_16LE: 'utf-16le',
+    UTF_16BE: 'utf-16be',
+    GBK: 'gbk'
+};
 const defaults = {
     utf8: [0xef, 0xbb, 0xbf],
 };

package/lib/memory/basic.js

@@ -60,7 +60,7 @@ export default class MemoryBasic {
      * 检测存储是否包含某种类型
      */
     includes(type) {
-        return type in this.memorys;
+        return this.memorys.has(type);
     }
     /**
      * 获取指定类型存储数据

package/lib/union.js

@@ -1,23 +1,26 @@
 /**
  * 数据联合(用于需要对加入的数据进行智能提示)
- * @description 如果设置了formatter，则可以通过设置泛型R来变化Union.value的类型
  */
 export default class Union {
     key;
     formatter;
-    #map = {};
-    get value() {
-        return this.#map;
+    #data = {};
+    #options = {};
+    get data() {
+        return this.#data;
+    }
+    get options() {
+        return this.#options;
     }
     constructor(key, formatter) {
         this.key = key;
         this.formatter = formatter;
     }
     add(data) {
-        const { formatter } = this;
-        this.#map[data[this.key]] = formatter
-            ? formatter(data)
-            : data;
+        const key = data[this.key];
+        const result = this.formatter(data);
+        this.#data[key] = result.data;
+        this.#options[key] = result.option;
         return this;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vope/utils",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "",
   "type": "module",
   "publishConfig": {

package/types/encoding.d.ts

@@ -1,16 +1,10 @@
-declare enum Encodes {
-    UTF_8 = "utf-8",
-    UTF_16LE = "utf-16le",
-    UTF_16BE = "utf-16be",
-    GBK = "gbk"
-}
 /**
  * 根据文件内容判断文件的编码
  * @param uint 文件内容Uint8Array格式
  * @param limit 用于约束GBK和utf_8的判定上限
  */
 declare const getEncoding: (uint: Uint8Array, limit?: number) => {
-    encoding: Encodes;
+    encoding: "utf-8" | "utf-16le" | "utf-16be" | "gbk";
     offset: number;
 };
 export default getEncoding;

package/types/union.d.ts

@@ -1,21 +1,20 @@
 import { Revise } from '@vope/types';
-type IMap<K extends string, VV extends string, T extends {
-    [key in K]: string;
-}> = {
-    [key in VV]?: T;
-};
+interface Result<Data, Option> {
+    data: Data;
+    option: Option;
+}
 /**
  * 数据联合(用于需要对加入的数据进行智能提示)
- * @description 如果设置了formatter，则可以通过设置泛型R来变化Union.value的类型
  */
-export default class Union<K extends string, VV extends string, T extends {
-    [key in K]: string;
-}, R extends T = T, L extends VV | never = never> {
+export default class Union<Primary extends string, Member extends string, Origin extends {
+    [key in Primary]: string;
+}, Data extends unknown, Option extends unknown, Status extends Member | never = never> {
     #private;
     private key;
-    private formatter?;
-    get value(): Required<IMap<K, L, R>>;
-    constructor(key: K, formatter?: ((data: T) => R) | undefined);
-    add<V extends Exclude<VV, L>>(data: Revise<T, K, V>): Union<K, VV, T, R, L | V>;
+    private formatter;
+    get data(): Required<Record<Status, Data>>;
+    get options(): Required<Record<Status, Option>>;
+    constructor(key: Primary, formatter: (data: Origin) => Result<Data, Option>);
+    add<V extends Exclude<Member, Status>>(data: Revise<Origin, Primary, V>): Union<Primary, Member, Origin, Data, Option, Status | V> & Omit<this, keyof Union<Primary, Member, Origin, Data, Option, Status | V>>;
 }
 export {};