@lcap/nasl 2.21.0-beta.2 → 2.21.0-beta.3

package/sandbox/stdlib/nasl.core.ts

@@ -5,29 +5,29 @@ declare namespace nasl.core {
     export type Any = any;
     export class Boolean extends globalThis.Boolean {
     }
-    // Long<Long<Decimal<Decimal  小类型可以隐式转换为大类型，反之不可。
-    // export class Long {
-    //     accept: 'Long';
-    //     constructor(num?: number);
-    // }
-
-    // export class Decimal {
-    //     accept: 'Decimal' | 'Long' | 'Long';
-    //     constructor(num?: number);
-    // }
+    // Integer<Long<Double<Decimal  小类型可以隐式转换为大类型，反之不可。
+    export class Integer {
+        accept: 'Integer';
+        constructor(num?: number);
+    }
+
+    export class Double {
+        accept: 'Double' | 'Integer' | 'Long';
+        constructor(num?: number);
+    }
     export class Decimal {
-        accept: 'Decimal' | 'Long';
+        accept: 'Decimal' | 'Double' | 'Integer' | 'Long';
         constructor(num?: number);
     }
 
     export class Long {
-        accept: 'Long' ;
+        accept: 'Long' | 'Integer';
         constructor(num?: number);
     }
 
     export class String extends globalThis.String {
         // @ts-ignore
-        length: nasl.core.Long;
+        length: nasl.core.Integer;
     }
 
     export class Text extends String {
@@ -49,9 +49,9 @@ declare namespace nasl.core {
         accept: 'DateTime';
     }
 
-    // export class Email extends String {
-    //     subAccept: 'Email';
-    // }
+    export class Email extends String {
+        subAccept: 'Email';
+    }
 
     export class Union {
         accept: 'Union';
@@ -62,62 +62,80 @@ declare namespace nasl.core {
     // ||
     export function or(left: Boolean, right: Boolean): Boolean;
 
+    export function add(left: Integer, right: Integer): Integer;
     export function add(left: Long, right: Long): Long;
+    export function add(left: Double, right: Double): Double;
     export function add(left: Decimal, right: Decimal): Decimal;
     export function add(left: String, right: Any): String;
     export function add(left: Any, right: String): String;
-    export function add(left: Long, right: Long): Long; // 为了让提示到整数上，最后补一个重载
+    export function add(left: Integer, right: Integer): Integer; // 为了让提示到整数上，最后补一个重载
 
+    export function minus(left: Integer, right: Integer): Integer;
     export function minus(left: Long, right: Long): Long;
+    export function minus(left: Double, right: Double): Double;
     export function minus(left: Decimal, right: Decimal): Decimal;
-    export function minus(left: Long, right: Long): Long;
+    export function minus(left: Integer, right: Integer): Integer;
 
+    export function multiply(left: Integer, right: Integer): Integer;
     export function multiply(left: Long, right: Long): Long;
+    export function multiply(left: Double, right: Double): Double;
     export function multiply(left: Decimal, right: Decimal): Decimal;
-    export function multiply(left: Long, right: Long): Long;
+    export function multiply(left: Integer, right: Integer): Integer;
 
-    export function divide(left: Long, right: Long): Decimal;
+    export function divide(left: Integer, right: Integer): Integer;
+    export function divide(left: Long, right: Long): Long;
+    export function divide(left: Double, right: Double): Double;
     export function divide(left: Decimal, right: Decimal): Decimal;
-    export function divide(left: Long, right: Long): Decimal;
+    export function divide(left: Integer, right: Integer): Integer;
 
+    export function remainder(left: Integer, right: Integer): Integer;
     export function remainder(left: Long, right: Long): Long;
+    export function remainder(left: Double, right: Double): Double;
     export function remainder(left: Decimal, right: Decimal): Decimal;
-    export function remainder(left: Long, right: Long): Long;
+    export function remainder(left: Integer, right: Integer): Integer;
 
     export function equal<T>(left: T, right: T): Boolean;
     export function notEqual<T>(left: T, right: T): Boolean;
 
+    export function greaterThan(left: Integer, right: Integer): Boolean;
     export function greaterThan(left: Long, right: Long): Boolean;
+    export function greaterThan(left: Double, right: Double): Boolean;
     export function greaterThan(left: String, right: String): Boolean;
     export function greaterThan(left: Date, right: Date): Boolean;
     export function greaterThan(left: Time, right: Time): Boolean;
     export function greaterThan(left: DateTime, right: DateTime): Boolean;
     export function greaterThan(left: Decimal, right: Decimal): Boolean;
-    export function greaterThan(left: Long, right: Long): Boolean;
+    export function greaterThan(left: Integer, right: Integer): Boolean;
 
+    export function lessThan(left: Integer, right: Integer): Boolean;
     export function lessThan(left: Long, right: Long): Boolean;
+    export function lessThan(left: Double, right: Double): Boolean;
     export function lessThan(left: String, right: String): Boolean;
     export function lessThan(left: Date, right: Date): Boolean;
     export function lessThan(left: Time, right: Time): Boolean;
     export function lessThan(left: DateTime, right: DateTime): Boolean;
     export function lessThan(left: Decimal, right: Decimal): Boolean;
-    export function lessThan(left: Long, right: Long): Boolean;
+    export function lessThan(left: Integer, right: Integer): Boolean;
 
+    export function greaterThanOrEqual(left: Integer, right: Integer): Boolean;
     export function greaterThanOrEqual(left: Long, right: Long): Boolean;
+    export function greaterThanOrEqual(left: Double, right: Double): Boolean;
     export function greaterThanOrEqual(left: String, right: String): Boolean;
     export function greaterThanOrEqual(left: Date, right: Date): Boolean;
     export function greaterThanOrEqual(left: Time, right: Time): Boolean;
     export function greaterThanOrEqual(left: DateTime, right: DateTime): Boolean;
     export function greaterThanOrEqual(left: Decimal, right: Decimal): Boolean;
-    export function greaterThanOrEqual(left: Long, right: Long): Boolean;
+    export function greaterThanOrEqual(left: Integer, right: Integer): Boolean;
 
+    export function lessThanOrEqual(left: Integer, right: Integer): Boolean;
     export function lessThanOrEqual(left: Long, right: Long): Boolean;
+    export function lessThanOrEqual(left: Double, right: Double): Boolean;
     export function lessThanOrEqual(left: String, right: String): Boolean;
     export function lessThanOrEqual(left: Date, right: Date): Boolean;
     export function lessThanOrEqual(left: Time, right: Time): Boolean;
     export function lessThanOrEqual(left: DateTime, right: DateTime): Boolean;
     export function lessThanOrEqual(left: Decimal, right: Decimal): Boolean;
-    export function lessThanOrEqual(left: Long, right: Long): Boolean;
+    export function lessThanOrEqual(left: Integer, right: Integer): Boolean;
 
     export function ensureBoolean(value: Boolean): Boolean;
     export function ensureVoid<T>(value: IsVoid<T>): Boolean
@@ -132,45 +150,89 @@ declare namespace nasl.core {
     export function compareNew(left: Date, right: Date): Boolean;
     export function compareNew(left: Time, right: Time): Boolean;
     export function compareNew(left: DateTime, right: DateTime): Boolean;
-    export function compareNew(left: Long, right: Long): Boolean;
-    export function compareNew(left: Long, right: Decimal): Boolean;
-    export function compareNew(left: Decimal, right: Long): Boolean;
+    export function compareNew(left: String, right: Text): Boolean;
+    export function compareNew(left: Text, right: String): Boolean;
+    export function compareNew(left: Integer, right: Long): Boolean;
+    export function compareNew(left: Long, right: Integer): Boolean;
+    export function compareNew(left: Integer, right: Double): Boolean;
+    export function compareNew(left: Double, right: Integer): Boolean;
+    export function compareNew(left: Long, right: Double): Boolean;
+    export function compareNew(left: Double, right: Long): Boolean;
     export function compareNew(left: String, right: String): Boolean;
-    export function compareNew(left: Decimal, right: Decimal): Boolean;
+    export function compareNew(left: Decimal, right: Double): Boolean;
+    export function compareNew(left: Double, right: Decimal): Boolean;
+    export function compareNew(left: Decimal, right: Long): Boolean;
+    export function compareNew(left: Long, right: Decimal): Boolean;
+    export function compareNew(left: Decimal, right: Integer): Boolean;
+    export function compareNew(left: Integer, right: Decimal): Boolean;
     export function compareNew<T>(left: T, right: T): Boolean;
 
     // OQL 临时补救
     export function compare2(left: Date, right: String): Boolean;
     export function compare2(left: DateTime, right: String): Boolean;
+    export function compare2(left: Time, right: String): Boolean;
     export function compare2(left: String, right: Date): Boolean;
     export function compare2(left: String, right: DateTime): Boolean;
     export function compare2(left: String, right: Time): Boolean;
     export function compare2(left: Date, right: Date): Boolean;
     export function compare2(left: Time, right: Time): Boolean;
     export function compare2(left: DateTime, right: DateTime): Boolean;
+    export function compare2(left: String, right: Text): Boolean;
+    export function compare2(left: Text, right: String): Boolean;
+    export function compare2(left: Integer, right: Long): Boolean;
+    export function compare2(left: Long, right: Integer): Boolean;
+    export function compare2(left: Integer, right: Double): Boolean;
+    export function compare2(left: Double, right: Integer): Boolean;
+    export function compare2(left: Long, right: Double): Boolean;
+    export function compare2(left: Double, right: Long): Boolean;
     export function compare2(left: String, right: String): Boolean;
-    export function compare2(left: Long, right: Long): Boolean;
-    export function compare2(left: Long, right: Decimal): Boolean;
+    export function compare2(left: Decimal, right: Double): Boolean;
+    export function compare2(left: Double, right: Decimal): Boolean;
     export function compare2(left: Decimal, right: Long): Boolean;
-    export function compare2(left: Decimal, right: Decimal): Boolean;
+    export function compare2(left: Long, right: Decimal): Boolean;
+    export function compare2(left: Decimal, right: Integer): Boolean;
+    export function compare2(left: Integer, right: Decimal): Boolean;
     export function compare2<T>(left: T, right: T): Boolean;
 
     // 包括 +
+    export function add2(left: Integer, right: Integer): Integer;
     export function add2(left: Long, right: Long): Long;
+    export function add2(left: Double, right: Double): Double;
     export function add2(left: Decimal, right: Decimal): Decimal;
-    export function add2(left: Long, right: Long): Long;
-    export function add2(left: Long, right: Decimal): Decimal;
+    export function add2(left: Integer, right: Long): Long;
+    export function add2(left: Long, right: Integer): Long;
+    export function add2(left: Integer, right: Double): Double;
+    export function add2(left: Double, right: Integer): Double;
+    export function add2(left: Long, right: Double): Double;
+    export function add2(left: Double, right: Long): Double;
+    export function add2(left: Decimal, right: Double): Decimal;
+    export function add2(left: Double, right: Decimal): Decimal;
     export function add2(left: Decimal, right: Long): Decimal;
+    export function add2(left: Long, right: Decimal): Decimal;
+    export function add2(left: Decimal, right: Integer): Decimal;
+    export function add2(left: Integer, right: Decimal): Decimal;
     export function add2(left: String, right: Any): String;
     export function add2(left: Any, right: String): String;
-    export function add2(left: Long, right: Long): Long; // 为了让提示到整数上，最后补一个重载
+    export function add2(left: Integer, right: Integer): Integer; // 为了让提示到整数上，最后补一个重载
 
     // 包括 - * / %
+    export function arith2(left: Integer, right: Integer): Integer;
     export function arith2(left: Long, right: Long): Long;
+    export function arith2(left: Double, right: Double): Double;
     export function arith2(left: Decimal, right: Decimal): Decimal;
-    export function arith2(left: Long, right: Decimal): Decimal;
+    export function arith2(left: Integer, right: Long): Long;
+    export function arith2(left: Long, right: Integer): Long;
+    export function arith2(left: Integer, right: Double): Double;
+    export function arith2(left: Double, right: Integer): Double;
+    export function arith2(left: Long, right: Double): Double;
+    export function arith2(left: Double, right: Long): Double;
+    export function arith2(left: Decimal, right: Double): Decimal;
+    export function arith2(left: Double, right: Decimal): Decimal;
     export function arith2(left: Decimal, right: Long): Decimal;
-    export function arith2(left: Long, right: Long): Long; // 为了让提示到整数上，最后补一个重载
+    export function arith2(left: Long, right: Decimal): Decimal;
+    export function arith2(left: Decimal, right: Integer): Decimal;
+    export function arith2(left: Integer, right: Decimal): Decimal;
+    export function arith2(left: Integer, right: Integer): Integer; // 为了让提示到整数上，最后补一个重载
 
     export class Enums {
         accept: 'Enums';

package/sandbox/stdlib/nasl.interface.ts

@@ -1,7 +1,7 @@
 declare namespace nasl.interface {
     export class ApiReturnOf<T> {
         Data: T;
-        Code: nasl.core.Long;
+        Code: nasl.core.Integer;
         Message: nasl.core.String;
     }
 }

package/sandbox/stdlib/nasl.langUtil.ts

@@ -14,7 +14,7 @@ declare namespace nasl.langUtil {
         HAVING(...exprs: Array<(...types: Arr) => nasl.core.Boolean>): Collection<Arr>;
         ORDER_BY(...exprs: Array<(...types: Arr) => any>): Collection<Arr>;
         LIMIT(expr: (...types: Arr) => any): Collection<Arr>;
-        // PAGINATE(page: nasl.core.Long, size: nasl.core.Long): Collection<Arr>
+        // PAGINATE(page: nasl.core.Integer, size: nasl.core.Integer): Collection<Arr>
         // SELECT_PAGE_OF<R>(expr: (...types: Arr) => R): <R>
     }
 
@@ -25,8 +25,8 @@ declare namespace nasl.langUtil {
     export function IN<T>(value: T, list: nasl.collection.List<T>): nasl.core.Boolean;
     export function ISNULL(value: any): nasl.core.Boolean;
     export function NOT(value: nasl.core.Boolean): nasl.core.Boolean;
-    export function COUNT(value: any): nasl.core.Long;
-    export function COUNTD(value: any): nasl.core.Long;
+    export function COUNT(value: any): nasl.core.Integer;
+    export function COUNTD(value: any): nasl.core.Integer;
     export function SUM<T>(value: T): T;
     export function AVG<T>(value: T): T;
     export function MAX<T>(value: T): T;
@@ -40,6 +40,6 @@ declare namespace nasl.langUtil {
 // nasl.langUtil.FROM(new nasl.langUtil.Collection<[app.dataSources.defaultDS.entities.Student]>()
 //     .LEFT_JOIN(new nasl.langUtil.Collection<[app.dataSources.defaultDS.entities.School]>())
 //     .ON((Student, School) => Student.schoolId === School.id))
-//     .WHERE((Student, School) => Student.age > new nasl.core.Long(200))
+//     .WHERE((Student, School) => Student.age > new nasl.core.Integer(200))
 //     .ORDER_BY((Student, School) => Student.name, 'ASC')
 //     .SELECT((Student, School) => ({ Student, School }))