@zwa73/utils 1.0.80 → 1.0.81

package/src/UtilInterfaces.ts

@@ -1,4 +1,4 @@
-import { Completed, Failed, Success, Terminated } from "./UtilSymbol";
+import { Failed, Success, Terminated } from "./UtilSymbol";
 
 
 /**可以序列化为JSON文件的对象 */
@@ -17,10 +17,25 @@ export interface IJData{
 	 */
 	toJSON():JToken;
 }
+/**任何可能有ReturnType的函数 */
+export type AnyFunc = (...args:any)=>any;
 
 /**任意可作为键值的类型 */
 export type Keyable = string | number | symbol;
 
+/**真子集 */
+export type ProperSubset<B, T = B> = T extends B ? B extends T ? never : T : never;
+
+/**字面量检测 */
+export type LiteralCheck<L> =
+    ProperSubset<string, L> |
+    ProperSubset<number, L> |
+    ProperSubset<boolean, L>|
+    ProperSubset<symbol, L> |
+    ProperSubset<any[], L> |
+    ProperSubset<Record<any,any>, L> |
+    null | undefined;
+
 /**转为可写的 */
 export type Writeable<T> = {
 	-readonly [P in keyof T]: T[P]
@@ -84,9 +99,13 @@ export type PromiseStat = Success|Failed|Terminated;
 /**promise验证函数 */
 export type PromiseVerifyFn<T> = (obj:T)=>Promise<PromiseStat>|PromiseStat;
 
+/**获取Promise的结果类型 */
+export type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
+
+
 /**类型中任意函数的字符串名称 */
 export type FuncPropNames<T> = {
-    [K in keyof T]: T[K] extends (...args: unknown[]) => unknown ? K : never;
+    [K in keyof T]: T[K] extends AnyFunc ? K : never;
 }[keyof T];
 
 /**部分组合的类 
@@ -124,20 +143,23 @@ export type ComposedMixinable<B, Ms extends unknown[]> =
  * @template N - 如果为假的返回值
  */
 export type ExtendThen<B,T,Y,N = never> = B extends T ? Y : N;
-/** 一个联合类型 B 中如果包含 T  
+/** 一个联合类型 B 中如果包含 联合类型 T 中的任意项  
+ * 无效  
  * @template B - 基础类型
  * @template T - 判断的目标类型
  * @template Y - 如果为真的返回值
  * @template N - 如果为假的返回值
  */
-export type UnionInclude<B,T,Y,N = never> =
+type UnionInclude<B,T,Y,N = never> =
     B extends Exclude<B,T>
-        ? Y
-        : N
+        ? N
+        : Y
 /**排除可选字段 */
 export type RequiredOnly<T> = {
     [K in keyof T as
-        UnionInclude<T[K],undefined,never,K>
+        T[K] extends Exclude<T[K],undefined>
+            ? K
+            : never
     ]: T[K]
 };
 /**添加前缀 */
@@ -154,12 +176,23 @@ export type WithPrefix<T,P extends string> = {
  */
 export type Outcome<K extends Keyable,V> = {
     /**状态类型 */
-    status:K;
+    readonly status:K;
     /**值 */
-    result:V;
+    readonly result:V;
 }
 
-/**从联合 Outcome 中 根据 id 提取对应 value 的 type */
+/**可进行匹配的 outcome或symbol */
+export type Matchable<T extends Keyable> = T|Outcome<T,unknown>;
+/**可进行匹配的 outcome或symbol 中的状态类型 */
+export type MatchableFlag<T> =
+    T extends infer O|Outcome<infer O,unknown>
+        ? O : never;
+
+/**从联合 Outcome 中 根据 id 提取对应 Outcome */
 export type ExtractOutcome<T,K extends Keyable> =
-    T extends Outcome<K,unknown> ? T : never;
+    T extends Outcome<infer O,unknown>
+        ? O extends Exclude<O,K>
+            ? never
+            : T
+        : never;
 

package/src/UtilSymbol.ts

@@ -1,18 +1,42 @@
-/**完成 */
-export const Completed = Symbol("Completed");
-export type Completed = typeof Completed;
-/**成功 */
+import { Outcome } from "./UtilInterfaces";
+
+
+/**成功 经过验证的结果 */
 export const Success = Symbol("Success");
 export type Success = typeof Success;
-/**失败 */
+/**失败 可重试的 */
 export const Failed = Symbol("Failed");
 export type Failed = typeof Failed;
-/**终止 */
-export const Terminated = Symbol("Terminated");
-export type Terminated = typeof Terminated;
-/**不存在 */
+/**不存在 无 */
 export const None = Symbol("None");
 export type None = typeof None;
-/**超时 */
+/**完成 未经验证/未超时的结果  
+ * Success扩展  
+ * 仅在Success同时出现时使用
+ */
+export const Completed = Symbol("Completed");
+export type Completed = typeof Completed;
+/**终止 熔断运行  
+ * Failed扩展  
+ * 仅在Failed同时出现时使用
+ */
+export const Terminated = Symbol("Terminated");
+export type Terminated = typeof Terminated;
+/**超时 超时类型的失败  
+ * Failed扩展  
+ * 仅在超时时使用  
+ */
 export const Timeout = Symbol("Timeout");
-export type Timeout = typeof Timeout;
+export type Timeout = typeof Timeout;
+/**失败及其拓展 */
+export type FailedLike = Failed|Timeout|Terminated;
+/**成功及其拓展 */
+export type SuccessLike = Success|Completed;
+/**任意状态标识符 */
+export type StatusSymbol = FailedLike|SuccessLike|None;
+/**结果为 None 的 Outcome */
+export type NoneOut = Outcome<None,None>;
+export const NoneOut = {
+    status:None,
+    result:None,
+} as const as NoneOut;

package/src/test/repeatTest.ts

@@ -1,4 +1,4 @@
-import { Completed, Failed, PromiseStat, PromiseVerifyFn, Success, UtilFunc } from "..";
+import { Failed, PromiseStat, PromiseVerifyFn, Success, UtilFunc } from "..";
 
 // 模拟的异步函数，有一定几率失败
 async function mockAsyncFunction(): Promise<string> {

package/test.bat

@@ -1,2 +1,2 @@
-node test
+call npm run test
 pause

package/tsconfig.compile.json

@@ -0,0 +1,4 @@
+{
+    "extends": "./tsconfig.json",
+    "include": ["./src/**/*.ts", "./src/**/*.js"]
+}

package/tsconfig.json

@@ -11,9 +11,10 @@
     "experimentalDecorators": true,
     "paths": {
       "@src/*": ["./src/*"],
-      "@*"    : ["./*"]
+      "@/*"   : ["./*"],
+      "@"     : ["./src/index"]
     }
   },
-  "include": ["./src/**/*.ts", "./src/**/*.js"],
+  "include": ["./src/**/*.ts", "./src/**/*.js","./jest/**/*.ts"],
   "exclude": ["./node_modules/**/*"]
 }

package/watch.bat

@@ -0,0 +1 @@
+npm run watch

package/test/test.bat

@@ -1,2 +0,0 @@
-node test.js
-pause

package/testAndCompile.bat

@@ -1,4 +0,0 @@
-call tsc
-call tsc-alias
-node test
-pause

package/tsCompile.bat

@@ -1,3 +0,0 @@
-call tsc
-call tsc-alias
-pause

package/tsCompileWatch.bat

@@ -1,2 +0,0 @@
-start tsc-alias -w
-start tsc -w