a-calc 3.0.1 → 3.0.2

package/calc.d.ts

@@ -1,23 +1,13 @@
 import { U, StrRemoveSome, If_StrIncludes, Or, Equal } from "typescript-treasure";
 
-export type InjectDataFn<Expr> = <const Data>
-    (fill_data: Data extends string | number | undefined | null ? never : Data) =>
-    (
-        If_HasNumFmt<Expr, Data> extends true ?
-        number | GetWrapErr<Data>
-        :
-        string | GetWrapErr<Data>
-    );
+export type InjectDataFn<Expr> = <const Data>
+    (fill_data: Data extends string | number | undefined | null ? never : Data) =>
+    DirectReturn<Expr, Data>;
 
 
-export type InjectExprFn<Data> = <const Expr>
-    (expr: Expr extends string | number ? Expr : never) =>
-    (
-        If_HasNumFmt<Expr, Data> extends true ?
-        number | GetWrapErr<Data>
-        :
-        string | GetWrapErr<Data>
-    );
+export type InjectExprFn<Data> = <const Expr>
+    (expr: Expr extends string | number ? Expr : never) =>
+    DirectReturn<Expr, Data>;
 
 
 type If_IncludesVar<T> = U.If_IncludeVar<StrRemoveSome<T, ["!n", "!e", "!u", "!N", "!E", "!U"]>>;
@@ -28,23 +18,49 @@ type If_FillData<T> = T extends string | number | undefined | null ? false : tru
 type Not<T> = T extends true ? false : true;
 
 type GetWrapErr<T> = T extends { _error: infer I; } ? I : "-";
-type GetFmt<T> = T extends { _fmt: infer I; } ? I : never;
-
-type If_HasNumFmt<Expr, Data> =
-    Or<
-        If_StrIncludes<Expr, ["!n"]> | If_StrIncludes<GetFmt<Data>, ["!n"]>
-    >;
+type GetFmt<T> = T extends { _fmt: infer I; } ? I : "";
 
-
-type DirectReturn<Expr, Data> =
-    If_HasNumFmt<Expr, Data> extends true ?
-    (
-        number | GetWrapErr<Data>
-    )
-    :
-    (
-        string | GetWrapErr<Data>
-    );
+type TrimExpr<S> = S extends ` ${infer R}` | `\n${infer R}` | `\t${infer R}` | `\r${infer R}`
+    ? TrimExpr<R>
+    : S extends `${infer R} ` | `${infer R}\n` | `${infer R}\t` | `${infer R}\r` ? TrimExpr<R> : S;
+
+type ExprBody<Expr> = Expr extends `${string}||${string}` ? Expr
+    : Expr extends `${infer Body}|${string}` ? Body : Expr;
+
+type NumericChar = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
+    | "." | "+" | "-" | "*" | "/" | "%" | "^" | "(" | ")" | " " | "\n" | "\r" | "\t";
+
+// 只对能确认的算术表达式保留窄类型；变量、函数和条件表达式可能返回布尔值。
+// 长表达式保守返回联合类型，避免类型计算耗尽编译器的递归预算。
+type NumericChars<S, Depth extends unknown[] = []> = Depth["length"] extends 128 ? false
+    : S extends "" ? true
+    : S extends `${infer C}${infer Rest}` ? C extends NumericChar ? NumericChars<Rest, [...Depth, unknown]> : false
+    : false;
+
+type NumericExpr<S> = TrimExpr<S> extends `${number}` ? true : NumericChars<S> extends true ? true
+    : S extends `${string}${"<" | ">" | "=" | "!" | "&" | "|" | "?" | ":" | "'" | '"' | "(" | ")"}${string}` ? false
+    : S extends `${infer Left}${"+" | "-" | "*" | "/" | "%" | "^"}${infer Right}`
+        ? TrimExpr<Left> extends "" ? false : TrimExpr<Right> extends "" ? false : true
+        : false;
+
+type StringLiteral<S> = TrimExpr<S> extends `"${infer Content}"`
+    ? Content extends `${string}"${string}` ? false : true
+    : TrimExpr<S> extends `'${infer Content}'` ? Content extends `${string}'${string}` ? false : true
+    : false;
+
+type FormattedNumber<Expr, Fmt> = string extends Fmt ? string | number
+    : true extends If_StrIncludes<Expr, ["!n", "!N"]> | If_StrIncludes<Fmt, ["!n", "!N"]> ? number : string;
+
+type FmtText<T> = T extends string ? T : "";
+
+type ExpressionValue<Expr, Fmt> = 0 extends (1 & Expr) ? string | number | boolean
+    : Expr extends number ? FormattedNumber<Expr, Fmt>
+    : string extends Expr ? string | number | boolean
+    : StringLiteral<Expr> extends true ? string
+    : NumericExpr<ExprBody<Expr>> extends true ? FormattedNumber<Expr, Fmt>
+    : FormattedNumber<Expr, Fmt> | string | boolean;
+
+type DirectReturn<Expr, Data> = ExpressionValue<Expr, GetFmt<Data>> | GetWrapErr<Data>;
 
 
 type FuncReturn<Arg1> =
@@ -88,25 +104,15 @@ type CalcRuntimeOptions<Fmt extends string, Err> =
         [key: string]: any;  // 允许任意数据字段
     }>;
 
-export type Calc = <const Expr extends string | number, const Fmt extends string, const Err = never>
-    (expr: Expr, options?: CalcRuntimeOptions<Fmt, Err>) =>
-    (
-        If_StrIncludes<Fmt, ["!n"]> & If_StrIncludes<Expr, ["!n"]> extends true ?
-        number | Err
-        :
-        string | Err
-    );
+export type Calc = <const Expr extends string | number, const Fmt extends string = "", const Err = "-">
+    (expr: Expr, options?: CalcRuntimeOptions<Fmt, Err>) =>
+    ExpressionValue<Expr, Fmt> | Err;
 
-export type CalcSpace = <const Expr extends string | number, const Fmt extends string, const Err = never>
-    (expr: Expr, options?: CalcRuntimeOptions<Fmt, Err>) =>
-    (
-        If_StrIncludes<Fmt, ["!n"]> & If_StrIncludes<Expr, ["!n"]> extends true ?
-        number | Err
-        :
-        string | Err
-    );
+export type CalcSpace = <const Expr extends string | number, const Fmt extends string = "", const Err = "-">
+    (expr: Expr, options?: CalcRuntimeOptions<Fmt, Err>) =>
+    ExpressionValue<Expr, Fmt> | Err;
 
-export type CalcSum = <const Expr extends string | number, const Fmt extends string, const Err = never>
+export type CalcSum = <const Expr extends string | number, const Fmt extends string = "", const Err = "-">
     (expr: Expr, options: Array<CalcRuntimeOptions<Fmt, Err>>) =>
     (
         If_StrIncludes<Fmt, ["!n"]> & If_StrIncludes<Expr, ["!n"]> extends true ?
@@ -140,11 +146,11 @@ export interface FmtOptions {
  * 直接格式化数字，跳过表达式解析
  */
 export interface Fmt {
-    <const FmtStr extends string | undefined = undefined, const Err = never>(
-        value: number | string,
+    <const FmtStr extends string | undefined = undefined, const Err = "-", const Value extends number | string = number | string, const Options extends FmtOptions = FmtOptions>(
+        value: Value,
         format_str?: FmtStr,
-        options?: FmtOptions & { _error?: Err }
-    ): If_StrIncludes<FmtStr, ["!n"]> extends true ? number | Err : string | Err;
+        options?: Options & { _error?: Err }
+    ): ExpressionValue<Value, `${FmtText<FmtStr>}${FmtText<GetFmt<Options>>}`> | Err;
 
     <const Expr extends string | number, const FmtStr extends string, const Err, const Options extends CalcRuntimeOptions<FmtStr, Err>>(
         expression: Expr,
@@ -154,7 +160,7 @@ export interface Fmt {
 
 export interface CalcWrap {
     <const Expr extends string | number>
-        (expr: Expr): If_IncludesVar<Expr> extends true ? FuncReturn<Expr> : If_StrIncludes<Expr, ["!n", "!N"]> extends true ? number | "-" : string | "-";
+        (expr: Expr): If_IncludesVar<Expr> extends true ? FuncReturn<Expr> : ExpressionValue<Expr, ""> | "-";
 
     <const Expr extends string | number, const Fmt extends string, const Err, const Options extends CalcRuntimeOptions<Fmt, Err>>
         (expr: Expr, options: Options): DirectReturn<Expr, Options>;
@@ -266,7 +272,7 @@ export const calc_min: CalcSum;
  * calc_count("active", [{active: 1}, {active: 0}, {active: 1}]) // '2'
  * ```
  */
-export const calc_count: CalcSum;
+export const calc_count: (expr: string | number, options: Array<CalcRuntimeOptions<string, unknown>>) => string;
 
 /**
  * 专用格式化函数，用于对数字进行格式化处理