@zwa73/utils 1.0.2 → 1.0.3

package/build.js

@@ -0,0 +1,19 @@
+const fs = require('fs');
+const path = require('path');
+const tscAlias = require('tsc-alias');
+
+
+// 读取并更新包配置文件中的版本号
+function updateVersion() {
+  const packagePath = path.join(__dirname, 'package.json');
+  const packageData = JSON.parse(fs.readFileSync(packagePath));
+  const version = packageData.version.split('.');
+  version[2] = parseInt(version[2]) + 1;
+  packageData.version = version.join('.');
+  fs.writeFileSync(packagePath, JSON.stringify(packageData, null, 2));
+  return packageData.version;
+}
+
+
+tscAlias.replaceTscAliasPaths();
+updateVersion();

package/dist/UtilClass.d.ts

@@ -43,7 +43,7 @@ export declare class SList<T> {
      */
     reverse(): SList<T>;
     /**将SList转换为数组 */
-    toArray(): T[];
+    toArray(): Array<T>;
     /**返回指定元素在数组中首次出现的位置
      * @param value 目标元素
      */
@@ -155,8 +155,8 @@ export declare class SList<T> {
     };
 }
 export declare class SIterator<T> {
-    _index: number;
-    _list: SList<T>;
+    private _index;
+    private _list;
     constructor(list: SList<T>);
     /**判断还有没有下一个元素
      */
@@ -212,15 +212,17 @@ export declare class SIterator<T> {
      */
     addNext(obj: T): void;
 }
-export declare class SEntry<K extends struct, V> {
-    _key: K;
-    _value: V;
+export declare class SEntry<K, V> {
+    private _key;
+    private _value;
     constructor(key: K, value: V);
     getKey(): K;
     getValue(): V;
+    get key(): K;
+    get value(): V;
 }
-export declare class SHashMap<K extends struct, V> {
-    _obj: Record<K, V>;
+export declare class SHashMap<K, V> {
+    private _map;
     constructor();
     /**添加一个键值对
      * @param entry 键值对
@@ -231,7 +233,7 @@ export declare class SHashMap<K extends struct, V> {
      * @param key 键
      * @returns 值
      */
-    get(key: K): V | null;
+    get(key: K): V | undefined;
     /**添加一个键值对
      * @param key 键
      * @param value 值
@@ -263,7 +265,7 @@ export declare class SHashMap<K extends struct, V> {
      * @param key 键
      * @returns 删除的值
      */
-    remove(key: K): V;
+    remove(key: K): V | undefined;
     /**清空哈希表
      * @returns 自身
      */
@@ -320,5 +322,11 @@ export declare class SHashMap<K extends struct, V> {
      * @returns 结果
      */
     stat<O>(init: O, func: (accumulator: O, entry: SEntry<K, V>) => O): O;
+    [Symbol.iterator](): {
+        next(): {
+            value: SEntry<K, V> | null;
+            done: boolean;
+        };
+    };
 }
 export {};

package/dist/UtilClass.js

@@ -278,7 +278,7 @@ class SList {
 }
 exports.SList = SList;
 class SIterator {
-    _index = 0;
+    _index = -1;
     _list;
     constructor(list) {
         this._list = list;
@@ -392,17 +392,24 @@ class SEntry {
     getValue() {
         return this._value;
     }
+    //重载TypeScript操作符
+    get key() {
+        return this.getKey();
+    }
+    get value() {
+        return this._value;
+    }
 }
 exports.SEntry = SEntry;
 class SHashMap {
-    _obj = {};
+    _map = new Map();
     constructor() { }
     /**添加一个键值对
      * @param entry 键值对
      * @returns 自身
      */
     putEntry(entry) {
-        this._obj[entry.getKey()] = entry.getValue();
+        this._map.set(entry.getKey(), entry.getValue());
         return this;
     }
     /**获取指定键的值
@@ -410,7 +417,7 @@ class SHashMap {
      * @returns 值
      */
     get(key) {
-        return this._obj[key];
+        return this._map.get(key);
     }
     /**添加一个键值对
      * @param key 键
@@ -418,7 +425,7 @@ class SHashMap {
      * @returns 自身
      */
     put(key, value) {
-        this._obj[key] = value;
+        this._map.set(key, value);
         return this;
     }
     /**判断是否存在指定键
@@ -426,16 +433,15 @@ class SHashMap {
      * @returns 是否存在
      */
     has(key) {
-        return key in this._obj;
+        return this._map.has(key);
     }
     /**获取所有键值对
      * @returns 键值对列表
      */
     entrys() {
         let list = new SList();
-        for (let k in this._obj) {
-            list.push(new SEntry(k, this._obj[k]));
-        }
+        for (const [key, value] of this._map)
+            list.push(new SEntry(key, value));
         return list;
     }
     /**获取所有键
@@ -443,8 +449,9 @@ class SHashMap {
      */
     keys() {
         let list = new SList();
-        for (let k in this._obj)
-            list.push(k);
+        let it = this._map.keys();
+        for (let key of it)
+            list.push(key);
         return list;
     }
     /**获取所有值
@@ -452,10 +459,9 @@ class SHashMap {
      */
     values() {
         let list = new SList();
-        for (let k in this._obj) {
-            let val = this._obj[k];
+        let it = this._map.values();
+        for (let val of it)
             list.push(val);
-        }
         return list;
     }
     /**获取迭代器
@@ -469,22 +475,22 @@ class SHashMap {
      * @returns 删除的值
      */
     remove(key) {
-        let out = this._obj[key];
-        delete this._obj[key];
+        let out = this._map.get(key);
+        this._map.delete(key);
         return out;
     }
     /**清空哈希表
      * @returns 自身
      */
     clear() {
-        this._obj = {};
+        this._map.clear();
         return this;
     }
     /**判断哈希表是否为空
      * @returns 是否为空
      */
     isEmpty() {
-        return this.keys().isEmpty();
+        return this.isEmpty();
     }
     /**判断是否存在指定值
      * @param val 值
@@ -498,7 +504,7 @@ class SHashMap {
      * @returns 是否存在
      */
     containsKey(key) {
-        return this.keys().contains(key);
+        return this._map.has(key);
     }
     /**加载指定键的值，若不存在则添加默认值并返回默认值
      * @param key 键
@@ -533,7 +539,7 @@ class SHashMap {
      * @returns 大小（键的数量）
      */
     size() {
-        return this.keys().size();
+        return this._map.size;
     }
     /**对哈希表的每一个键值对进行加工，返回加工完成的键值对组成的新哈希表
      * @param func 加工函数
@@ -574,6 +580,20 @@ class SHashMap {
     stat(init, func) {
         return this.entrys().stat(init, func);
     }
+    //重载TypeScript操作符
+    [Symbol.iterator]() {
+        let it = this.iterator();
+        return {
+            next() {
+                if (it.hasNext()) {
+                    return { value: it.next(), done: false };
+                }
+                else {
+                    return { value: null, done: true };
+                }
+            },
+        };
+    }
 }
 exports.SHashMap = SHashMap;
 class SKVC {

package/index.d.ts

@@ -0,0 +1 @@
+export * from './dist';

package/index.js

@@ -1,16 +1 @@
-const tsconfigPaths = require("tsconfig-paths");
-
-const baseUrl = "."; // 项目根目录
-const paths = {
-    "@/*"                   : ["./*"]                       ,
-    "@/src/*"               : ["./dist/*"]                  , // 将 @ 映射到 dist 目录
-};
-
-
-tsconfigPaths.register({
-    baseUrl,
-    paths,
-});
-
-const dist = require("./dist");
-module.exports = dist;
+module.exports = require("./dist");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "my utils",
   "main": "index.js",
   "scripts": {
@@ -21,4 +21,4 @@
     "https-proxy-agent": "^5.0.1",
     "tsconfig-paths": "^4.2.0"
   }
-}
+}

package/release.bat

@@ -1,2 +1,4 @@
+call tsc
+node build.js
 npm publish --access public
 pause

package/src/UtilClass.ts

@@ -1,8 +1,6 @@
-import { deepClone } from "./UtilFunctions";
-
 type struct = number|string;
 
-export class SList<T>{
+export class SList<T> {
 	private _arr:Array<T>;
     constructor(obj?:Array<T>|number){
         if(typeof obj == 'number')
@@ -81,7 +79,7 @@ export class SList<T>{
     }
 
     /**将SList转换为数组 */
-    toArray():T[]{
+    toArray():Array<T>{
         return ([] as T[]).concat(this._arr);
     }
 
@@ -309,32 +307,32 @@ export class SList<T>{
 }
 
 export class SIterator<T>{
-    _index=0;
-    _list:SList<T>;
+    private _index=-1;
+    private _list:SList<T>;
     constructor(list:SList<T>){
         this._list = list;
     }
     /**判断还有没有下一个元素
      */
-    public hasNext(): boolean {
+    hasNext(): boolean {
         return this._index < this.size() - 1 && this._index >= -1;
     }
 
     /**判断当前下标有无元素
      */
-    public hasCurr(): boolean {
+    hasCurr(): boolean {
         return this._index < this.size() && this._index >= 0;
     }
 
     /**判断还有没有上一个元素
      */
-    public hasPre(): boolean {
+    hasPre(): boolean {
         return this._index < this.size() + 1 && this._index >= 1;
     }
 
     /**返回下一个下标指向的数组内成员,然后下标自加1
      */
-    public next(): T {
+    next(): T {
         if (this.hasNext())
             return this._list.get(++this._index);
         else
@@ -343,7 +341,7 @@ export class SIterator<T>{
 
     /**返回上一个下标指向的数组内成员,然后下标自减1
      */
-    public pre(): T {
+    pre(): T {
         if (this.hasPre())
             return this._list.get(--this._index);
         else
@@ -352,7 +350,7 @@ export class SIterator<T>{
 
     /**返回当前下标指向的数组内成员
      */
-    public curr(): T {
+    curr(): T {
         if (this.hasCurr())
             return this._list.get(this._index);
         else
@@ -424,9 +422,10 @@ export class SIterator<T>{
     }
 }
 
-export class SEntry<K extends struct,V>{
-	_key:K;
-	_value:V;
+export class SEntry<K,V>{
+	private _key:K;
+	private _value:V;
+
 	constructor(key:K,value:V){
 		this._key = key;
 		this._value = value;
@@ -437,16 +436,26 @@ export class SEntry<K extends struct,V>{
 	getValue(){
 		return this._value;
 	}
+
+
+    //重载TypeScript操作符
+    get key(): K {
+        return this.getKey();
+    }
+
+    get value(): V {
+        return this._value;
+    }
 }
-export class SHashMap<K extends struct,V>{
-	_obj:Record<K,V> = {} as Record<K,V>;
+export class SHashMap<K,V>{
+	private _map:Map<K,V> = new Map();
 	constructor(){}
     /**添加一个键值对
      * @param entry 键值对
      * @returns 自身
      */
     putEntry(entry: SEntry<K, V>): SHashMap<K,V> {
-        this._obj[entry.getKey()] = entry.getValue();
+        this._map.set(entry.getKey(),entry.getValue());
         return this;
     }
 
@@ -454,8 +463,8 @@ export class SHashMap<K extends struct,V>{
      * @param key 键
      * @returns 值
      */
-    get(key: K): V | null {
-        return this._obj[key];
+    get(key: K): V | undefined {
+        return this._map.get(key);
     }
 
     /**添加一个键值对
@@ -464,7 +473,7 @@ export class SHashMap<K extends struct,V>{
      * @returns 自身
      */
     put(key: K, value: V): SHashMap<K,V> {
-        this._obj[key] = value;
+        this._map.set(key, value);
         return this;
     }
 
@@ -473,7 +482,7 @@ export class SHashMap<K extends struct,V>{
      * @returns 是否存在
      */
     has(key: K): boolean {
-        return key in this._obj;
+        return this._map.has(key);
     }
 
     /**获取所有键值对
@@ -481,9 +490,8 @@ export class SHashMap<K extends struct,V>{
      */
     entrys(): SList<SEntry<K, V>> {
         let list = new SList<SEntry<K, V>>();
-        for (let k in this._obj) {
-            list.push(new SEntry(k, this._obj[k]));
-        }
+        for (const [key, value] of this._map)
+            list.push(new SEntry(key, value));
         return list;
     }
 
@@ -492,8 +500,9 @@ export class SHashMap<K extends struct,V>{
      */
     keys(): SList<K> {
         let list = new SList<K>();
-    for (let k in this._obj)
-            list.push(k);
+        let it = this._map.keys();
+        for(let key of it)
+            list.push(key);
         return list;
     }
 
@@ -502,11 +511,10 @@ export class SHashMap<K extends struct,V>{
      */
     values(): SList<V> {
         let list = new SList<V>();
-    for (let k in this._obj) {
-        let val = this._obj[k];
+        let it = this._map.values();
+        for(let val of it)
             list.push(val);
-    }
-    return list;
+        return list;
     }
 
     /**获取迭代器
@@ -520,9 +528,9 @@ export class SHashMap<K extends struct,V>{
      * @param key 键
      * @returns 删除的值
      */
-    remove(key: K): V {
-        let out = this._obj[key];
-        delete this._obj[key];
+    remove(key: K): V|undefined {
+        let out = this._map.get(key);
+        this._map.delete(key);
         return out;
     }
 
@@ -530,7 +538,7 @@ export class SHashMap<K extends struct,V>{
      * @returns 自身
      */
     clear(): SHashMap<K, V> {
-        this._obj = {} as Record<K, V>;
+        this._map.clear();
         return this;
     }
 
@@ -538,7 +546,7 @@ export class SHashMap<K extends struct,V>{
      * @returns 是否为空
      */
     isEmpty(): boolean {
-        return this.keys().isEmpty();
+        return this.isEmpty();
     }
 
     /**判断是否存在指定值
@@ -554,7 +562,7 @@ export class SHashMap<K extends struct,V>{
      * @returns 是否存在
      */
     containsKey(key: K): boolean {
-        return this.keys().contains(key);
+        return this._map.has(key);
     }
 
     /**加载指定键的值，若不存在则添加默认值并返回默认值
@@ -564,7 +572,7 @@ export class SHashMap<K extends struct,V>{
      */
     load(key: K, def: V): V {
         if (this.containsKey(key))
-            return this.get(key) as V;
+            return this.get(key)!;
         this.put(key, def);
         return def;
     }
@@ -592,7 +600,7 @@ export class SHashMap<K extends struct,V>{
      * @returns 大小（键的数量）
      */
     size(): number {
-        return this.keys().size();
+        return this._map.size;
     }
     /**对哈希表的每一个键值对进行加工，返回加工完成的键值对组成的新哈希表
      * @param func 加工函数
@@ -637,10 +645,25 @@ export class SHashMap<K extends struct,V>{
         return this.entrys().stat(init, func);
     }
 
+
+    //重载TypeScript操作符
+    [Symbol.iterator]() {
+        let it = this.iterator();
+
+        return {
+            next(): { value: SEntry<K,V>|null; done: boolean } {
+                if (it.hasNext()) {
+                    return { value: it.next(), done: false };
+                } else {
+                    return { value: null, done: true };
+                }
+            },
+        };
+    }
 }
 
 class SKVC{
-	stringMap:SHashMap<string,string> = new SHashMap();
+	private stringMap:SHashMap<string,string> = new SHashMap();
 
 	constructor(){}
 }

package/test.js

@@ -1,6 +1,12 @@
-let {SList} = require('./dist');
+let {SList,SHashMap,SEntry} = require('./dist');
 
 let slist = new SList([1,2,3,3,4,5,6]);
 slist.each(val => console.log(val));
 for(let v of slist)
-    console.log(v)
+    console.log(v)
+
+let map = new SHashMap();
+map.put("123",456)
+map.put("789",111)
+for(let {key,value} of map)
+    console.log(key,value)