@lcap/nasl 2.13.0-beta.2 → 2.13.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/concepts/BindAttribute__.js +7 -4
- package/out/concepts/BindAttribute__.js.map +1 -1
- package/out/concepts/CompletionProperty__.d.ts +0 -1
- package/out/concepts/CompletionProperty__.js +0 -1
- package/out/concepts/CompletionProperty__.js.map +1 -1
- package/out/concepts/DataSource__.js +1 -0
- package/out/concepts/DataSource__.js.map +1 -1
- package/out/concepts/Destination__.js +6 -1
- package/out/concepts/Destination__.js.map +1 -1
- package/out/concepts/Entity__.js +1 -0
- package/out/concepts/Entity__.js.map +1 -1
- package/out/concepts/Enum__.js +1 -0
- package/out/concepts/Enum__.js.map +1 -1
- package/out/concepts/Function__.d.ts +2 -1
- package/out/concepts/Function__.js +0 -28
- package/out/concepts/Function__.js.map +1 -1
- package/out/concepts/InterfaceParam__.js +6 -3
- package/out/concepts/InterfaceParam__.js.map +1 -1
- package/out/concepts/Interface__.js +1 -0
- package/out/concepts/Interface__.js.map +1 -1
- package/out/concepts/Logic__.js +1 -0
- package/out/concepts/Logic__.js.map +1 -1
- package/out/concepts/Param__.js +6 -3
- package/out/concepts/Param__.js.map +1 -1
- package/out/concepts/ProcessElement__.d.ts +4 -0
- package/out/concepts/ProcessElement__.js +31 -0
- package/out/concepts/ProcessElement__.js.map +1 -1
- package/out/concepts/Process__.js +1 -0
- package/out/concepts/Process__.js.map +1 -1
- package/out/concepts/Return__.js +6 -3
- package/out/concepts/Return__.js.map +1 -1
- package/out/concepts/Role__.js +1 -0
- package/out/concepts/Role__.js.map +1 -1
- package/out/concepts/Structure__.js +1 -0
- package/out/concepts/Structure__.js.map +1 -1
- package/out/concepts/TypeAnnotation__.js +3 -14
- package/out/concepts/TypeAnnotation__.js.map +1 -1
- package/out/concepts/Unparsed__.js +3 -3
- package/out/concepts/Unparsed__.js.map +1 -1
- package/out/concepts/Variable__.js +6 -3
- package/out/concepts/Variable__.js.map +1 -1
- package/out/concepts/ViewElement__.js.map +1 -1
- package/out/concepts/View__.js +1 -0
- package/out/concepts/View__.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.collection.js +12 -0
- package/out/concepts/basics/stdlib/nasl.collection.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.util.js +187 -5
- package/out/concepts/basics/stdlib/nasl.util.js.map +1 -1
- package/out/concepts/basics/stdlib/reference2TypeAnnotationList.js +1 -1
- package/out/concepts/basics/stdlib/reference2TypeAnnotationList.js.map +1 -1
- package/out/enums/KEYWORDS.d.ts +1 -0
- package/out/enums/KEYWORDS.js +16 -1
- package/out/enums/KEYWORDS.js.map +1 -1
- package/out/generator/genBundleFiles.js +25 -1
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/server/createUiTs.js +12 -12
- package/out/server/createUiTs.js.map +1 -1
- package/out/server/formatTsUtils.d.ts +21 -0
- package/out/server/formatTsUtils.js +323 -0
- package/out/server/formatTsUtils.js.map +1 -0
- package/out/server/getLogics.js +18 -17
- package/out/server/getLogics.js.map +1 -1
- package/out/server/getMemberIdentifier.d.ts +1 -12
- package/out/server/getMemberIdentifier.js +11 -264
- package/out/server/getMemberIdentifier.js.map +1 -1
- package/out/server/getProcesses.js +9 -18
- package/out/server/getProcesses.js.map +1 -1
- package/out/server/naslServer.d.ts +48 -0
- package/out/server/naslServer.js +58 -13
- package/out/server/naslServer.js.map +1 -1
- package/out/server/stdlib/nasl.annotation.d.ts +4 -0
- package/out/server/stdlib/nasl.annotation.js +1 -0
- package/out/server/stdlib/nasl.annotation.js.map +1 -0
- package/out/server/stdlib/nasl.auth.d.ts +30 -0
- package/out/server/stdlib/nasl.auth.js +1 -0
- package/out/server/stdlib/nasl.auth.js.map +1 -0
- package/out/server/stdlib/nasl.browser.d.ts +5 -0
- package/out/server/stdlib/nasl.browser.js +1 -0
- package/out/server/stdlib/nasl.browser.js.map +1 -0
- package/out/server/stdlib/nasl.collection.d.ts +22 -0
- package/out/server/stdlib/nasl.collection.js +1 -0
- package/out/server/stdlib/nasl.collection.js.map +1 -0
- package/out/server/stdlib/nasl.configuration.d.ts +3 -0
- package/out/server/stdlib/nasl.configuration.js +1 -0
- package/out/server/stdlib/nasl.configuration.js.map +1 -0
- package/out/server/stdlib/nasl.core.d.ts +104 -0
- package/out/server/stdlib/nasl.core.js +1 -0
- package/out/server/stdlib/nasl.core.js.map +1 -0
- package/out/server/stdlib/nasl.interface.d.ts +7 -0
- package/out/server/stdlib/nasl.interface.js +1 -0
- package/out/server/stdlib/nasl.interface.js.map +1 -0
- package/out/server/stdlib/nasl.langUtil.d.ts +28 -0
- package/out/server/stdlib/nasl.langUtil.js +1 -0
- package/out/server/stdlib/nasl.langUtil.js.map +1 -0
- package/out/server/stdlib/nasl.process.d.ts +50 -0
- package/out/server/stdlib/nasl.process.js +1 -0
- package/out/server/stdlib/nasl.process.js.map +1 -0
- package/out/server/stdlib/nasl.ui.d.ts +186 -0
- package/out/server/stdlib/nasl.ui.definition.d.ts +1072 -0
- package/out/server/stdlib/nasl.ui.definition.js +632 -0
- package/out/server/stdlib/nasl.ui.definition.js.map +1 -0
- package/out/server/stdlib/nasl.ui.js +1 -0
- package/out/server/stdlib/nasl.ui.js.map +1 -0
- package/out/server/stdlib/nasl.util.d.ts +74 -0
- package/out/server/stdlib/nasl.util.js +4 -0
- package/out/server/stdlib/nasl.util.js.map +1 -0
- package/out/server/stdlib/nasl.validation.d.ts +32 -0
- package/out/server/stdlib/nasl.validation.js +1 -0
- package/out/server/stdlib/nasl.validation.js.map +1 -0
- package/out/templator/genQueryComponent.js +8 -8
- package/out/templator/genQueryComponent.js.map +1 -1
- package/package.json +1 -1
- package/src/concepts/BindAttribute__.ts +7 -24
- package/src/concepts/CompletionProperty__.ts +0 -1
- package/src/concepts/DataSource__.ts +1 -0
- package/src/concepts/Destination__.ts +6 -1
- package/src/concepts/Entity__.ts +1 -0
- package/src/concepts/Enum__.ts +1 -0
- package/src/concepts/InterfaceParam__.ts +6 -3
- package/src/concepts/Interface__.ts +1 -0
- package/src/concepts/Logic__.ts +1 -0
- package/src/concepts/Param__.ts +5 -3
- package/src/concepts/ProcessElement__.ts +35 -1
- package/src/concepts/Process__.ts +1 -0
- package/src/concepts/Return__.ts +5 -3
- package/src/concepts/Role__.ts +1 -0
- package/src/concepts/Structure__.ts +1 -0
- package/src/concepts/TypeAnnotation__.ts +3 -30
- package/src/concepts/Unparsed__.ts +3 -10
- package/src/concepts/Variable__.ts +5 -3
- package/src/concepts/ViewElement__.ts +1 -19
- package/src/concepts/View__.ts +1 -0
- package/src/concepts/basics/stdlib/nasl.collection.ts +12 -0
- package/src/concepts/basics/stdlib/nasl.util.ts +187 -5
- package/src/concepts/basics/stdlib/reference2TypeAnnotationList.ts +1 -1
- package/src/enums/KEYWORDS.ts +16 -0
- package/src/generator/genBundleFiles.ts +24 -1
- package/src/server/createUiTs.ts +12 -12
- package/src/server/formatTsUtils.ts +319 -0
- package/src/server/getLogics.ts +18 -17
- package/src/server/getMemberIdentifier.ts +10 -264
- package/src/server/getProcesses.ts +10 -19
- package/src/server/naslServer.ts +58 -12
- package/src/server/stdlib/nasl.annotation.ts +4 -0
- package/src/server/stdlib/nasl.auth.ts +31 -0
- package/src/server/stdlib/nasl.browser.ts +5 -0
- package/src/server/stdlib/nasl.collection.ts +22 -0
- package/src/server/stdlib/nasl.configuration.ts +3 -0
- package/src/server/stdlib/nasl.core.ts +128 -0
- package/src/server/stdlib/nasl.interface.ts +7 -0
- package/src/server/stdlib/nasl.langUtil.ts +31 -0
- package/src/server/stdlib/nasl.process.ts +87 -0
- package/src/server/stdlib/nasl.ui.definition.ts +1760 -0
- package/src/server/stdlib/nasl.ui.ts +189 -0
- package/src/server/stdlib/nasl.util.ts +84 -0
- package/src/server/stdlib/nasl.validation.ts +33 -0
- package/src/templator/genQueryComponent.ts +8 -8
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
declare namespace nasl.util {
|
|
2
|
+
function Convert(value: null): <T extends never>() => T;
|
|
3
|
+
function Convert(value: nasl.core.Integer): <T extends nasl.core.Decimal | nasl.core.Boolean | nasl.core.Double | nasl.core.Long | nasl.core.String>() => T;
|
|
4
|
+
function Convert(value: nasl.core.Long): <T extends nasl.core.Decimal | nasl.core.Integer | nasl.core.String | nasl.core.Boolean | nasl.core.DateTime>() => T;
|
|
5
|
+
function Convert(value: nasl.core.Double): <T extends nasl.core.Decimal | nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.String>() => T;
|
|
6
|
+
function Convert(value: nasl.core.Decimal): <T extends nasl.core.String | nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Double>() => T;
|
|
7
|
+
function Convert(value: nasl.core.Email): <T extends nasl.core.String>() => T;
|
|
8
|
+
function Convert(value: nasl.core.Binary): <T extends nasl.core.String>() => T;
|
|
9
|
+
function Convert(value: nasl.core.String): <T extends nasl.core.Decimal | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Double | nasl.core.Integer | nasl.core.Long | nasl.core.Boolean>() => T;
|
|
10
|
+
function Convert(value: nasl.core.Date): <T extends nasl.core.DateTime | nasl.core.String>() => T;
|
|
11
|
+
function Convert(value: nasl.core.Time): <T extends nasl.core.String>() => T;
|
|
12
|
+
function Convert(value: nasl.core.DateTime): <T extends nasl.core.Date | nasl.core.Time | nasl.core.String | nasl.core.Long>() => T;
|
|
13
|
+
function Convert(value: nasl.core.Boolean): <T extends nasl.core.String | nasl.core.Integer>() => T;
|
|
14
|
+
function Convert(value: nasl.core.Any): <T extends nasl.core.String>() => T;
|
|
15
|
+
function Enum(enumName: nasl.core.String, value: nasl.core.Enums): nasl.core.String;
|
|
16
|
+
function Split(str: nasl.core.String, separator: nasl.core.String): nasl.collection.List<nasl.core.String>;
|
|
17
|
+
function Join(list: nasl.collection.List<nasl.core.Any>, separator: nasl.core.String): nasl.core.String;
|
|
18
|
+
function Concat(str1: nasl.core.Any, str2: nasl.core.Any): nasl.core.String;
|
|
19
|
+
function Length(str1: nasl.core.String): nasl.core.Integer;
|
|
20
|
+
function Length<T>(str1: nasl.collection.List<T>): nasl.core.Integer;
|
|
21
|
+
function Length<K, V>(str1: nasl.collection.Map<K, V>): nasl.core.Integer;
|
|
22
|
+
function IndexOf(str: nasl.core.String, search: nasl.core.String, formIndex: nasl.core.Integer, ignoreCase: nasl.core.Boolean): nasl.core.Integer;
|
|
23
|
+
function LastIndexOf(str: nasl.core.String, search: nasl.core.String, ignoreCase: nasl.core.Boolean): nasl.core.Integer;
|
|
24
|
+
function Replace(str: nasl.core.String, search: nasl.core.String, replace: nasl.core.String): nasl.core.String;
|
|
25
|
+
function SubString(str: nasl.core.String, start: nasl.core.Integer, length?: nasl.core.Integer): nasl.core.String;
|
|
26
|
+
function ToLower(str1: nasl.core.String): nasl.core.String;
|
|
27
|
+
function ToUpper(str1: nasl.core.String): nasl.core.String;
|
|
28
|
+
function Trim(str1: nasl.core.String): nasl.core.String;
|
|
29
|
+
function Get<T>(list: nasl.collection.List<T>, index: nasl.core.Integer): T;
|
|
30
|
+
function Set<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Integer, item: K): T;
|
|
31
|
+
function Contains<T, K extends T>(list: nasl.collection.List<T>, item: K): nasl.core.Boolean;
|
|
32
|
+
function Add<T, K extends T>(list: nasl.collection.List<T>, item: K): void;
|
|
33
|
+
function AddAll<T>(list: nasl.collection.List<T>, addList: nasl.collection.List<T>): nasl.core.Integer;
|
|
34
|
+
function Insert<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Integer, item: K): void;
|
|
35
|
+
function Remove<T, K extends T>(list: nasl.collection.List<T>, item: K): void;
|
|
36
|
+
function RemoveAt<T>(list: nasl.collection.List<T>, index: nasl.core.Integer): T;
|
|
37
|
+
function MapGet<K, V>(map: nasl.collection.Map<K, V>, key: K): V;
|
|
38
|
+
function MapPut<K, V>(map: nasl.collection.Map<K, V>, key: K, value: V): void;
|
|
39
|
+
function MapRemove<K, V>(map: nasl.collection.Map<K, V>, key: K): void;
|
|
40
|
+
function MapContains<K, V>(map: nasl.collection.Map<K, V>, key: K): nasl.core.Boolean;
|
|
41
|
+
function MapKeys<K, V>(map: nasl.collection.Map<K, V>): nasl.collection.List<K>;
|
|
42
|
+
function MapValues<K, V>(map: nasl.collection.Map<K, V>): nasl.collection.List<V>;
|
|
43
|
+
function MapFilter<K, V>(map: nasl.collection.Map<K, V>, filterKey: (key: K) => any, filterValue: (value: V) => any): nasl.collection.Map<K, V>;
|
|
44
|
+
function CurrDate(): nasl.core.Date;
|
|
45
|
+
function CurrTime(): nasl.core.Time;
|
|
46
|
+
function CurrDateTime(): nasl.core.DateTime;
|
|
47
|
+
function FormatDate(date: nasl.core.Date, formatter: nasl.core.String): nasl.core.String;
|
|
48
|
+
function FormatDateTime(dateTime: nasl.core.DateTime, formatter: nasl.core.String): nasl.core.String;
|
|
49
|
+
function FormatNumber(doubleValue: nasl.core.Decimal | nasl.core.Double | nasl.core.Integer | nasl.core.Long, digits: nasl.core.Integer, showGroups: nasl.core.Boolean): nasl.core.String;
|
|
50
|
+
function AddDays(dateTime: nasl.core.Date, amount: nasl.core.Integer): nasl.core.Date;
|
|
51
|
+
function AddDays(dateTime: nasl.core.DateTime, amount: nasl.core.Integer): nasl.core.DateTime;
|
|
52
|
+
function AddMonths(dateTime: nasl.core.Date, amount: nasl.core.Integer): nasl.core.Date;
|
|
53
|
+
function AddMonths(dateTime: nasl.core.DateTime, amount: nasl.core.Integer): nasl.core.DateTime;
|
|
54
|
+
function SubDays(dateTime: nasl.core.Date, amount: nasl.core.Integer): nasl.core.Date;
|
|
55
|
+
function SubDays(dateTime: nasl.core.DateTime, amount: nasl.core.Integer): nasl.core.DateTime;
|
|
56
|
+
function DateDiff(dateTime1: nasl.core.DateTime, dateTime2: nasl.core.DateTime, calcType: nasl.core.String): nasl.core.Integer;
|
|
57
|
+
function Clone<T>(struct: T): T;
|
|
58
|
+
function Clear<T>(struct: T): T;
|
|
59
|
+
function RandomInt(start: nasl.core.Integer, end: nasl.core.Integer): nasl.core.Integer;
|
|
60
|
+
function ListSort<T>(list: nasl.collection.List<T>, by: (item: T) => any, sort: nasl.core.Boolean): void;
|
|
61
|
+
function ListFind<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): T;
|
|
62
|
+
function ListFindIndex<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.core.Integer;
|
|
63
|
+
function ListFindAll<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.collection.List<T>;
|
|
64
|
+
function ListReverse<T>(list: nasl.collection.List<T>): void;
|
|
65
|
+
function ListDistinct<T>(list: nasl.collection.List<T>): void;
|
|
66
|
+
function ListSlice<T>(list: nasl.collection.List<T>, start: nasl.core.Integer, end: nasl.core.Integer): nasl.collection.List<T>;
|
|
67
|
+
function ListSliceToPageOf<T>(list: nasl.collection.List<T>, page: nasl.core.Integer, size: nasl.core.Integer): nasl.collection.PageOf<T>;
|
|
68
|
+
function New<T>(): T;
|
|
69
|
+
function CreatePageOf<T>(list: nasl.collection.List<T>, page: nasl.core.Integer, size: nasl.core.Integer, total: nasl.core.Integer): nasl.collection.PageOf<T>;
|
|
70
|
+
function consoleLog(arg: nasl.core.Any): void;
|
|
71
|
+
function jsonSerialize(arg: nasl.core.Any): nasl.core.String;
|
|
72
|
+
function jsonDeserialize<T>(arg: nasl.core.String): T;
|
|
73
|
+
function concatString(...args: nasl.core.String[]): any;
|
|
74
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nasl.util.js","sourceRoot":"","sources":["../../../src/server/stdlib/nasl.util.ts"],"names":[],"mappings":"AAgFA,iCAAiC;AACjC,mCAAmC;AAEnC,gEAAgE"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
declare namespace nasl.validation {
|
|
2
|
+
function minLength(min: nasl.core.Integer): nasl.core.Boolean;
|
|
3
|
+
function maxLength(min: nasl.core.Integer): nasl.core.Boolean;
|
|
4
|
+
function rangeLength(min: nasl.core.Integer, max: nasl.core.Integer): nasl.core.Boolean;
|
|
5
|
+
function min(min: nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
|
|
6
|
+
function max(min: nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
|
|
7
|
+
function range(min: nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime, max: nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
|
|
8
|
+
function pattern(re: nasl.core.String | RegExp): nasl.core.Boolean;
|
|
9
|
+
function is(arg: nasl.core.Any): nasl.core.Boolean;
|
|
10
|
+
function isNot(arg: nasl.core.Any): nasl.core.Boolean;
|
|
11
|
+
function equals(arg: nasl.core.Any): nasl.core.Boolean;
|
|
12
|
+
function notEquals(arg: nasl.core.Any): nasl.core.Boolean;
|
|
13
|
+
function confirmed(value: nasl.core.Any): nasl.core.Boolean;
|
|
14
|
+
function includes(arr: nasl.collection.List<nasl.core.Any>): nasl.core.Boolean;
|
|
15
|
+
function excludes(arr: nasl.collection.List<nasl.core.Any>): nasl.core.Boolean;
|
|
16
|
+
function included(arr: nasl.collection.List<nasl.core.Any>): nasl.core.Boolean;
|
|
17
|
+
function excluded(arr: nasl.collection.List<nasl.core.Any>): nasl.core.Boolean;
|
|
18
|
+
function unique(arr: nasl.collection.List<nasl.core.Any>): nasl.core.Boolean;
|
|
19
|
+
function noDuplicates(): nasl.core.Boolean;
|
|
20
|
+
function numeric(noSymbols?: nasl.core.Boolean): nasl.core.Boolean;
|
|
21
|
+
function decimal(force?: nasl.core.Boolean, digits?: nasl.core.String): nasl.core.Boolean;
|
|
22
|
+
function ip(version: nasl.core.Double): nasl.core.Boolean;
|
|
23
|
+
function ipRange(version: nasl.core.Double): nasl.core.Boolean;
|
|
24
|
+
function byteLength(min: nasl.core.Integer, max: nasl.core.Integer): nasl.core.Boolean;
|
|
25
|
+
function divisibleBy(divisor: nasl.core.Integer | nasl.core.Long | nasl.core.Double): nasl.core.Boolean;
|
|
26
|
+
function hash(algorithm?: nasl.core.String): nasl.core.Boolean;
|
|
27
|
+
function isbn(version: nasl.core.String): nasl.core.Boolean;
|
|
28
|
+
function iso8601(strict: nasl.core.Boolean): nasl.core.Boolean;
|
|
29
|
+
function mobile(locale?: nasl.core.String, strict?: nasl.core.Boolean): nasl.core.Boolean;
|
|
30
|
+
function postalCode(locale: nasl.core.String): nasl.core.Boolean;
|
|
31
|
+
function uuid(version?: nasl.core.String): nasl.core.Boolean;
|
|
32
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=nasl.validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nasl.validation.js","sourceRoot":"","sources":["../../../src/server/stdlib/nasl.validation.ts"],"names":[],"mappings":""}
|
|
@@ -270,14 +270,6 @@ async function joinEntity(callQueryComponent, entity, recordStructure) {
|
|
|
270
270
|
propertyName: joinInfo.rightProperty.name,
|
|
271
271
|
}),
|
|
272
272
|
}));
|
|
273
|
-
const structureProperty = concepts_1.StructureProperty.from(utils_1.NaslNode.StructureProperty({
|
|
274
|
-
name: utils.firstLowerCase(entity.name),
|
|
275
|
-
typeAnnotation: utils_1.NaslTypeAnnotation.Reference({
|
|
276
|
-
typeNamespace: entity.getNamespace(),
|
|
277
|
-
typeName: entity.name,
|
|
278
|
-
}),
|
|
279
|
-
}), recordStructure, 'properties');
|
|
280
|
-
recordStructure.addProperty(structureProperty);
|
|
281
273
|
}
|
|
282
274
|
else {
|
|
283
275
|
queryJoinExpression.onExpressions.push(utils_1.NaslLogicItem.BinaryExpression({
|
|
@@ -294,6 +286,14 @@ async function joinEntity(callQueryComponent, entity, recordStructure) {
|
|
|
294
286
|
}),
|
|
295
287
|
}));
|
|
296
288
|
}
|
|
289
|
+
const structureProperty = concepts_1.StructureProperty.from(utils_1.NaslNode.StructureProperty({
|
|
290
|
+
name: utils.firstLowerCase(entity.name),
|
|
291
|
+
typeAnnotation: utils_1.NaslTypeAnnotation.Reference({
|
|
292
|
+
typeNamespace: entity.getNamespace(),
|
|
293
|
+
typeName: entity.name,
|
|
294
|
+
}),
|
|
295
|
+
}), recordStructure, 'properties');
|
|
296
|
+
recordStructure.addProperty(structureProperty);
|
|
297
297
|
const newJoinPartLogicItem = concepts_1.QueryJoinExpression.from(queryJoinExpression, callQueryComponent, 'joinParts');
|
|
298
298
|
from.addJoinPart(newJoinPartLogicItem);
|
|
299
299
|
callQueryComponent.saveStructure();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -224,7 +224,7 @@ export class BindAttribute extends BaseNode {
|
|
|
224
224
|
});
|
|
225
225
|
}
|
|
226
226
|
|
|
227
|
-
|
|
227
|
+
getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
|
|
228
228
|
const excludedSet = new Set(excludedList);
|
|
229
229
|
return (this.rules || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
|
|
230
230
|
}
|
|
@@ -365,8 +365,6 @@ export class BindAttribute extends BaseNode {
|
|
|
365
365
|
return node;
|
|
366
366
|
}
|
|
367
367
|
|
|
368
|
-
|
|
369
|
-
|
|
370
368
|
/**
|
|
371
369
|
* 插入逻辑项
|
|
372
370
|
* @internal
|
|
@@ -399,8 +397,6 @@ export class BindAttribute extends BaseNode {
|
|
|
399
397
|
return logicItem;
|
|
400
398
|
}
|
|
401
399
|
|
|
402
|
-
|
|
403
|
-
|
|
404
400
|
/**
|
|
405
401
|
* 插入逻辑项
|
|
406
402
|
* @param logicItemOptions 逻辑项参数
|
|
@@ -423,8 +419,6 @@ export class BindAttribute extends BaseNode {
|
|
|
423
419
|
return node;
|
|
424
420
|
}
|
|
425
421
|
|
|
426
|
-
|
|
427
|
-
|
|
428
422
|
/**
|
|
429
423
|
* 添加逻辑项
|
|
430
424
|
* @internal
|
|
@@ -444,8 +438,6 @@ export class BindAttribute extends BaseNode {
|
|
|
444
438
|
return this._insertItemInPlaygroundAt(options as any, index);
|
|
445
439
|
}
|
|
446
440
|
|
|
447
|
-
|
|
448
|
-
|
|
449
441
|
/**
|
|
450
442
|
* 添加逻辑项
|
|
451
443
|
* @param logicItemOptions 逻辑项参数
|
|
@@ -469,9 +461,6 @@ export class BindAttribute extends BaseNode {
|
|
|
469
461
|
return node;
|
|
470
462
|
}
|
|
471
463
|
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
464
|
/**
|
|
476
465
|
* 删除逻辑项
|
|
477
466
|
* @param name 逻辑项名称
|
|
@@ -497,8 +486,6 @@ export class BindAttribute extends BaseNode {
|
|
|
497
486
|
return expression.delete();
|
|
498
487
|
}
|
|
499
488
|
|
|
500
|
-
|
|
501
|
-
|
|
502
489
|
/**
|
|
503
490
|
* 删除跳转页面
|
|
504
491
|
* @param name 跳转页面名称
|
|
@@ -524,8 +511,6 @@ export class BindAttribute extends BaseNode {
|
|
|
524
511
|
return destination.delete();
|
|
525
512
|
}
|
|
526
513
|
|
|
527
|
-
|
|
528
|
-
|
|
529
514
|
/**
|
|
530
515
|
* 删除验证规则
|
|
531
516
|
* @param name 验证规则名称
|
|
@@ -551,8 +536,6 @@ export class BindAttribute extends BaseNode {
|
|
|
551
536
|
return validationRule.delete();
|
|
552
537
|
}
|
|
553
538
|
|
|
554
|
-
|
|
555
|
-
|
|
556
539
|
/**
|
|
557
540
|
* 删除经办人
|
|
558
541
|
* @param name 经办人名称
|
|
@@ -578,8 +561,6 @@ export class BindAttribute extends BaseNode {
|
|
|
578
561
|
return assignee.delete();
|
|
579
562
|
}
|
|
580
563
|
|
|
581
|
-
|
|
582
|
-
|
|
583
564
|
/**
|
|
584
565
|
* 删除逻辑项
|
|
585
566
|
* @param logicItem 已有的逻辑项实例
|
|
@@ -587,7 +568,7 @@ export class BindAttribute extends BaseNode {
|
|
|
587
568
|
removeItemInPlayground(logicItem: LogicItem): void;
|
|
588
569
|
|
|
589
570
|
removeItemInPlayground(options: LogicItem) {
|
|
590
|
-
|
|
571
|
+
const logicItem: LogicItem = options;
|
|
591
572
|
return logicItem.delete();
|
|
592
573
|
}
|
|
593
574
|
|
|
@@ -637,8 +618,10 @@ export class BindAttribute extends BaseNode {
|
|
|
637
618
|
*/
|
|
638
619
|
toVue(options?: ElementToVueOptions) {
|
|
639
620
|
let value = this.value;
|
|
640
|
-
if (this.type === 'dynamic'
|
|
641
|
-
value = this.expression
|
|
621
|
+
if (this.type === 'dynamic') {
|
|
622
|
+
value = this.expression?.toVue(options) || '';
|
|
623
|
+
} else if (value !== undefined && value !== null && typeof value === 'string') {
|
|
624
|
+
value = value.replace(/"/g, "'");
|
|
642
625
|
}
|
|
643
626
|
if (value !== undefined && value !== null && typeof value === 'string') {
|
|
644
627
|
value = value.replace(/"/g, "'");
|
|
@@ -670,7 +653,7 @@ export class BindAttribute extends BaseNode {
|
|
|
670
653
|
@withSourceMap()
|
|
671
654
|
toEmbeddedTS(state?: TranslatorState): string {
|
|
672
655
|
let code = '';
|
|
673
|
-
if (this.name === 'destination') {
|
|
656
|
+
if (this.name === 'destination' && this.type === 'dynamic') {
|
|
674
657
|
code += this.destination.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
|
|
675
658
|
} else if (this.name === 'rules') {
|
|
676
659
|
this.rules?.forEach((item, index) => {
|
|
@@ -239,7 +239,6 @@ export class CompletionProperty extends BaseNode {
|
|
|
239
239
|
|
|
240
240
|
isProcess: boolean = false;
|
|
241
241
|
|
|
242
|
-
noFurther: boolean = false;
|
|
243
242
|
//================================================================================
|
|
244
243
|
// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成,请不手动修改!
|
|
245
244
|
// ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓
|
|
@@ -478,7 +478,12 @@ export class Destination extends LogicItem {
|
|
|
478
478
|
}
|
|
479
479
|
|
|
480
480
|
get viewNode() {
|
|
481
|
-
|
|
481
|
+
if (!this.viewNamespace || !this.viewName)
|
|
482
|
+
return null;
|
|
483
|
+
let nameSpace = this.viewNamespace;
|
|
484
|
+
nameSpace = nameSpace.replaceAll('views', 'children');
|
|
485
|
+
nameSpace = nameSpace.replace('children', 'views');
|
|
486
|
+
return getNodeByNodeCallee(this.app, nameSpace + '.' + this.viewName);
|
|
482
487
|
}
|
|
483
488
|
//================================================================================
|
|
484
489
|
// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成,请不手动修改!
|
package/src/concepts/Entity__.ts
CHANGED
package/src/concepts/Enum__.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { dataTypesMap } from './basics/types';
|
|
|
2
2
|
import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
|
|
3
3
|
import Entity from './Entity__';
|
|
4
4
|
import Structure from './Structure__';
|
|
5
|
+
import StructureProperty from './StructureProperty__';
|
|
5
6
|
import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
|
|
6
7
|
|
|
7
8
|
//================================================================================
|
|
@@ -310,12 +311,14 @@ export class InterfaceParam extends BaseNode {
|
|
|
310
311
|
}
|
|
311
312
|
} else if (typeKind === 'generic') {
|
|
312
313
|
const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
|
|
313
|
-
const properties = node.properties || [];
|
|
314
|
+
const properties = [...node.properties] || [];
|
|
314
315
|
for (let i = 0; i < properties.length; i++) {
|
|
315
316
|
const item = properties[i];
|
|
316
317
|
if (item?.typeAnnotation?.typeKind === 'typeParam') {
|
|
317
|
-
|
|
318
|
-
|
|
318
|
+
const newItem = StructureProperty.from(item.toJSON());
|
|
319
|
+
newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
|
|
320
|
+
newItem.parentNode = this;
|
|
321
|
+
properties[i] = newItem;
|
|
319
322
|
}
|
|
320
323
|
}
|
|
321
324
|
completionChildren = properties;
|
package/src/concepts/Logic__.ts
CHANGED
package/src/concepts/Param__.ts
CHANGED
|
@@ -371,12 +371,14 @@ export class Param extends BaseNode {
|
|
|
371
371
|
// if (typeNamespace === 'nasl.collection' || typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.interface') {
|
|
372
372
|
// }
|
|
373
373
|
const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
|
|
374
|
-
const properties = node.properties || [];
|
|
374
|
+
const properties = [...node.properties] || [];
|
|
375
375
|
for (let i = 0; i < properties.length; i++) {
|
|
376
376
|
const item = properties[i];
|
|
377
377
|
if (item?.typeAnnotation?.typeKind === 'typeParam') {
|
|
378
|
-
|
|
379
|
-
|
|
378
|
+
const newItem = StructureProperty.from(item.toJSON());
|
|
379
|
+
newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
|
|
380
|
+
newItem.parentNode = this;
|
|
381
|
+
properties[i] = newItem;
|
|
380
382
|
}
|
|
381
383
|
}
|
|
382
384
|
completionChildren = properties;
|
|
@@ -21,6 +21,7 @@ import BindAttribute from './BindAttribute__';
|
|
|
21
21
|
import Process from './Process__';
|
|
22
22
|
import Module from './Module__';
|
|
23
23
|
import App from './App__';
|
|
24
|
+
import View from './View__';
|
|
24
25
|
|
|
25
26
|
/**
|
|
26
27
|
* 流程元素
|
|
@@ -1324,6 +1325,39 @@ export class ProcessElement extends BaseNode {
|
|
|
1324
1325
|
// return ns;
|
|
1325
1326
|
}
|
|
1326
1327
|
|
|
1328
|
+
cancelBindDelete() {
|
|
1329
|
+
this.delete();
|
|
1330
|
+
this.bindAttrs.forEach(({ destination }) => {
|
|
1331
|
+
if (destination && destination.viewNode)
|
|
1332
|
+
this.cancelBind(destination.viewNode);
|
|
1333
|
+
});
|
|
1334
|
+
}
|
|
1335
|
+
|
|
1336
|
+
async cancelBind(view: View) {
|
|
1337
|
+
const name = this.uniqueTaskId(view);
|
|
1338
|
+
const node = view.params.find((param) => param.name === name);
|
|
1339
|
+
const UsageMap = await node.findUsage();
|
|
1340
|
+
if (!UsageMap.size)
|
|
1341
|
+
view.removeParam(name);
|
|
1342
|
+
}
|
|
1343
|
+
//获取当前页面类型为String的taskId参数
|
|
1344
|
+
uniqueTaskId(view: View) {
|
|
1345
|
+
let count = 0;
|
|
1346
|
+
let uniqueName = 'taskId0';
|
|
1347
|
+
let param = view.params.find((param) => param.name === 'taskId');
|
|
1348
|
+
if (!param || param.typeAnnotation.typeName === 'String')
|
|
1349
|
+
return 'taskId';
|
|
1350
|
+
do {
|
|
1351
|
+
count++;
|
|
1352
|
+
uniqueName = uniqueName.substring(0, uniqueName.length - 1) + count;
|
|
1353
|
+
param = view.params.find((param) => param.name === uniqueName);
|
|
1354
|
+
if (!param) {
|
|
1355
|
+
return uniqueName;
|
|
1356
|
+
}
|
|
1357
|
+
} while (param.typeAnnotation.typeName !== 'String');
|
|
1358
|
+
return uniqueName;
|
|
1359
|
+
}
|
|
1360
|
+
|
|
1327
1361
|
@withSourceMap()
|
|
1328
1362
|
toEmbeddedTS(state?: TranslatorState): string {
|
|
1329
1363
|
// this.syncLogic();
|
|
@@ -1377,7 +1411,7 @@ export class ProcessElement extends BaseNode {
|
|
|
1377
1411
|
code += `${attr.destination.toEmbeddedTSInProcess(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 3 }), prevCode)},\n`;
|
|
1378
1412
|
}
|
|
1379
1413
|
if (attr.name === 'assignee') {
|
|
1380
|
-
code += `assignee: function(): string[] {\n
|
|
1414
|
+
code += `assignee: function(): string[] {\n`;
|
|
1381
1415
|
code += `${attr.assignee.toEmbeddedTSInProcess(shiftState(state, code, { tabSize: state.tabSize + 3 }), prevCode)}\n`;
|
|
1382
1416
|
code += `},\n`;
|
|
1383
1417
|
}
|
package/src/concepts/Return__.ts
CHANGED
|
@@ -345,12 +345,14 @@ export class Return extends BaseNode {
|
|
|
345
345
|
}
|
|
346
346
|
} else if (typeKind === 'generic') {
|
|
347
347
|
const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
|
|
348
|
-
const properties = node.properties || [];
|
|
348
|
+
const properties = [...node.properties] || [];
|
|
349
349
|
for (let i = 0; i < properties.length; i++) {
|
|
350
350
|
const item = properties[i];
|
|
351
351
|
if (item?.typeAnnotation?.typeKind === 'typeParam') {
|
|
352
|
-
|
|
353
|
-
|
|
352
|
+
const newItem = StructureProperty.from(item.toJSON());
|
|
353
|
+
newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
|
|
354
|
+
newItem.parentNode = this;
|
|
355
|
+
properties[i] = newItem;
|
|
354
356
|
}
|
|
355
357
|
}
|
|
356
358
|
completionChildren = properties;
|
package/src/concepts/Role__.ts
CHANGED