@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.3
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/README.md +3 -3
- package/docs/assets/search.js +1 -1
- package/docs/classes/Entity.html +2832 -204
- package/docs/classes/View.html +4567 -365
- package/out/common/BaseNode.js +23 -16
- package/out/common/BaseNode.js.map +1 -1
- package/out/concepts/App__.d.ts +22 -0
- package/out/concepts/App__.js +77 -15
- package/out/concepts/App__.js.map +1 -1
- package/out/concepts/Argument__.d.ts +2 -1
- package/out/concepts/Argument__.js +2 -2
- package/out/concepts/Argument__.js.map +1 -1
- package/out/concepts/Assignment__.d.ts +2 -1
- package/out/concepts/Assignment__.js +3 -8
- package/out/concepts/Assignment__.js.map +1 -1
- package/out/concepts/Attribute__.js.map +1 -1
- package/out/concepts/BinaryExpression__.d.ts +2 -1
- package/out/concepts/BinaryExpression__.js +5 -5
- package/out/concepts/BinaryExpression__.js.map +1 -1
- package/out/concepts/BindAttribute__.d.ts +2 -1
- package/out/concepts/BindAttribute__.js +9 -4
- package/out/concepts/BindAttribute__.js.map +1 -1
- package/out/concepts/BindDirective__.d.ts +2 -1
- package/out/concepts/BindDirective__.js +2 -2
- package/out/concepts/BindDirective__.js.map +1 -1
- package/out/concepts/BindEvent__.d.ts +2 -1
- package/out/concepts/BindEvent__.js +4 -3
- package/out/concepts/BindEvent__.js.map +1 -1
- package/out/concepts/BooleanLiteral__.d.ts +2 -1
- package/out/concepts/BooleanLiteral__.js +1 -1
- package/out/concepts/BooleanLiteral__.js.map +1 -1
- package/out/concepts/CallFunction__.d.ts +57 -1
- package/out/concepts/CallFunction__.js +119 -11
- package/out/concepts/CallFunction__.js.map +1 -1
- package/out/concepts/CallInterface__.d.ts +2 -1
- package/out/concepts/CallInterface__.js +2 -2
- package/out/concepts/CallInterface__.js.map +1 -1
- package/out/concepts/CallLogic__.d.ts +57 -1
- package/out/concepts/CallLogic__.js +117 -10
- package/out/concepts/CallLogic__.js.map +1 -1
- package/out/concepts/CallQueryComponent__.js +1 -1
- package/out/concepts/CallQueryComponent__.js.map +1 -1
- package/out/concepts/Comment__.js.map +1 -1
- package/out/concepts/CompletionProperty__.js.map +1 -1
- package/out/concepts/ConfigGroup__.d.ts +120 -0
- package/out/concepts/ConfigGroup__.js +214 -0
- package/out/concepts/ConfigGroup__.js.map +1 -0
- package/out/concepts/ConfigPropertyValue__.d.ts +43 -0
- package/out/concepts/ConfigPropertyValue__.js +103 -0
- package/out/concepts/ConfigPropertyValue__.js.map +1 -0
- package/out/concepts/ConfigProperty__.d.ts +128 -0
- package/out/concepts/ConfigProperty__.js +236 -0
- package/out/concepts/ConfigProperty__.js.map +1 -0
- package/out/concepts/Configuration__.d.ts +120 -0
- package/out/concepts/Configuration__.js +210 -0
- package/out/concepts/Configuration__.js.map +1 -0
- package/out/concepts/Constant__.d.ts +2 -1
- package/out/concepts/Constant__.js +1 -1
- package/out/concepts/Constant__.js.map +1 -1
- package/out/concepts/DataElement__.js.map +1 -1
- package/out/concepts/Destination__.d.ts +2 -1
- package/out/concepts/Destination__.js +4 -3
- package/out/concepts/Destination__.js.map +1 -1
- package/out/concepts/End__.js.map +1 -1
- package/out/concepts/EntityIndex__.d.ts +8 -0
- package/out/concepts/EntityIndex__.js +18 -0
- package/out/concepts/EntityIndex__.js.map +1 -1
- package/out/concepts/EntityProperty__.d.ts +5 -5
- package/out/concepts/EntityProperty__.js +10 -9
- package/out/concepts/EntityProperty__.js.map +1 -1
- package/out/concepts/Entity__.d.ts +30 -26
- package/out/concepts/Entity__.js +44 -36
- package/out/concepts/Entity__.js.map +1 -1
- package/out/concepts/EnumItem__.js.map +1 -1
- package/out/concepts/Enum__.d.ts +8 -8
- package/out/concepts/Enum__.js +10 -4
- package/out/concepts/Enum__.js.map +1 -1
- package/out/concepts/Event__.js +1 -1
- package/out/concepts/Event__.js.map +1 -1
- package/out/concepts/ForEachStatement__.d.ts +35 -33
- package/out/concepts/ForEachStatement__.js +103 -36
- package/out/concepts/ForEachStatement__.js.map +1 -1
- package/out/concepts/Function__.js +1 -1
- package/out/concepts/Function__.js.map +1 -1
- package/out/concepts/Identifier__.d.ts +2 -1
- package/out/concepts/Identifier__.js +15 -1
- package/out/concepts/Identifier__.js.map +1 -1
- package/out/concepts/IfStatement__.js.map +1 -1
- package/out/concepts/InterfaceParam__.js +1 -1
- package/out/concepts/InterfaceParam__.js.map +1 -1
- package/out/concepts/Interface__.d.ts +5 -1
- package/out/concepts/Interface__.js +19 -5
- package/out/concepts/Interface__.js.map +1 -1
- package/out/concepts/JSBlock__.js.map +1 -1
- package/out/concepts/LogicItem__.d.ts +2 -1
- package/out/concepts/LogicItem__.js +2 -2
- package/out/concepts/LogicItem__.js.map +1 -1
- package/out/concepts/Logic__.js +9 -7
- package/out/concepts/Logic__.js.map +1 -1
- package/out/concepts/MemberExpression__.d.ts +2 -5
- package/out/concepts/MemberExpression__.js +12 -18
- package/out/concepts/MemberExpression__.js.map +1 -1
- package/out/concepts/Module__.d.ts +121 -126
- package/out/concepts/Module__.js +10 -17
- package/out/concepts/Module__.js.map +1 -1
- package/out/concepts/Namespace__.js +12 -12
- package/out/concepts/Namespace__.js.map +1 -1
- package/out/concepts/NullLiteral__.d.ts +2 -1
- package/out/concepts/NullLiteral__.js +1 -1
- package/out/concepts/NullLiteral__.js.map +1 -1
- package/out/concepts/NumericLiteral__.d.ts +2 -1
- package/out/concepts/NumericLiteral__.js +1 -1
- package/out/concepts/NumericLiteral__.js.map +1 -1
- package/out/concepts/Param__.d.ts +1 -1
- package/out/concepts/Param__.js +2 -2
- package/out/concepts/Param__.js.map +1 -1
- package/out/concepts/Point__.js.map +1 -1
- package/out/concepts/ProcessComponent__.js +2 -2
- package/out/concepts/ProcessComponent__.js.map +1 -1
- package/out/concepts/ProcessElement__.d.ts +82 -81
- package/out/concepts/ProcessElement__.js +19 -6
- package/out/concepts/ProcessElement__.js.map +1 -1
- package/out/concepts/ProcessOutcome__.js.map +1 -1
- package/out/concepts/Process__.d.ts +1 -0
- package/out/concepts/Process__.js +10 -4
- package/out/concepts/Process__.js.map +1 -1
- package/out/concepts/QueryAggregateExpression__.js.map +1 -1
- package/out/concepts/QueryFieldExpression__.js +1 -1
- package/out/concepts/QueryFieldExpression__.js.map +1 -1
- package/out/concepts/QueryFromExpression__.js.map +1 -1
- package/out/concepts/QueryGroupByExpression__.js.map +1 -1
- package/out/concepts/QueryJoinExpression__.js +1 -1
- package/out/concepts/QueryJoinExpression__.js.map +1 -1
- package/out/concepts/QueryLimitExpression__.js.map +1 -1
- package/out/concepts/QueryOrderByExpression__.js.map +1 -1
- package/out/concepts/QuerySelectExpression__.js +1 -1
- package/out/concepts/QuerySelectExpression__.js.map +1 -1
- package/out/concepts/Rect__.js.map +1 -1
- package/out/concepts/Return__.d.ts +1 -1
- package/out/concepts/Return__.js +2 -2
- package/out/concepts/Return__.js.map +1 -1
- package/out/concepts/Role__.d.ts +5 -0
- package/out/concepts/Role__.js +19 -2
- package/out/concepts/Role__.js.map +1 -1
- package/out/concepts/Slot__.js.map +1 -1
- package/out/concepts/SqlQueryComponent__.d.ts +2 -0
- package/out/concepts/SqlQueryComponent__.js +16 -0
- package/out/concepts/SqlQueryComponent__.js.map +1 -1
- package/out/concepts/Start__.js.map +1 -1
- package/out/concepts/StringLiteral__.d.ts +2 -1
- package/out/concepts/StringLiteral__.js +1 -1
- package/out/concepts/StringLiteral__.js.map +1 -1
- package/out/concepts/StructureProperty__.d.ts +1 -1
- package/out/concepts/StructureProperty__.js +1 -1
- package/out/concepts/StructureProperty__.js.map +1 -1
- package/out/concepts/Structure__.d.ts +1 -1
- package/out/concepts/Structure__.js +4 -4
- package/out/concepts/Structure__.js.map +1 -1
- package/out/concepts/SwitchCase__.js.map +1 -1
- package/out/concepts/SwitchStatement__.js.map +1 -1
- package/out/concepts/Theme__.js.map +1 -1
- package/out/concepts/Transactional__.js.map +1 -1
- package/out/concepts/TypeAnnotation__.js +3 -0
- package/out/concepts/TypeAnnotation__.js.map +1 -1
- package/out/concepts/TypeParam__.js.map +1 -1
- package/out/concepts/UnaryExpression__.d.ts +2 -1
- package/out/concepts/UnaryExpression__.js +3 -3
- package/out/concepts/UnaryExpression__.js.map +1 -1
- package/out/concepts/Unparsed__.d.ts +2 -1
- package/out/concepts/Unparsed__.js +1 -1
- package/out/concepts/Unparsed__.js.map +1 -1
- package/out/concepts/UseComponent__.js.map +1 -1
- package/out/concepts/ValidationRule__.d.ts +2 -1
- package/out/concepts/ValidationRule__.js +2 -2
- package/out/concepts/ValidationRule__.js.map +1 -1
- package/out/concepts/Variable__.d.ts +6 -5
- package/out/concepts/Variable__.js +3 -3
- package/out/concepts/Variable__.js.map +1 -1
- package/out/concepts/ViewComponent__.js +5 -5
- package/out/concepts/ViewComponent__.js.map +1 -1
- package/out/concepts/ViewElement__.d.ts +5 -4
- package/out/concepts/ViewElement__.js +109 -65
- package/out/concepts/ViewElement__.js.map +1 -1
- package/out/concepts/View__.d.ts +97 -90
- package/out/concepts/View__.js +153 -118
- package/out/concepts/View__.js.map +1 -1
- package/out/concepts/WhileStatement__.js.map +1 -1
- package/out/concepts/basics/stdlib/index.js +2 -2
- package/out/concepts/basics/stdlib/index.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.ui.js +3 -137
- package/out/concepts/basics/stdlib/nasl.ui.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.util.js +21 -5
- package/out/concepts/basics/stdlib/nasl.util.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.validation.d.ts +3 -0
- package/out/concepts/basics/stdlib/nasl.validation.js +527 -0
- package/out/concepts/basics/stdlib/nasl.validation.js.map +1 -0
- package/out/concepts/index__.d.ts +4 -0
- package/out/concepts/index__.js +4 -0
- package/out/concepts/index__.js.map +1 -1
- package/out/data/Module.d.ts +34 -0
- package/out/data/Module.js +53 -0
- package/out/data/Module.js.map +1 -0
- package/out/generator/compileComponent.d.ts +1 -1
- package/out/generator/genBundleFiles.d.ts +0 -1
- package/out/generator/genBundleFiles.js +1 -1
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/genMetaData.d.ts +35 -0
- package/out/generator/genMetaData.js +78 -0
- package/out/generator/genMetaData.js.map +1 -0
- package/out/generator/index.d.ts +1 -0
- package/out/generator/index.js +1 -0
- package/out/generator/index.js.map +1 -1
- package/out/index.d.ts +2 -2
- package/out/index.js +3 -1
- package/out/index.js.map +1 -1
- package/out/server/createUiTs.d.ts +7 -0
- package/out/server/createUiTs.js +157 -0
- package/out/server/createUiTs.js.map +1 -0
- package/out/server/entity2LogicNamespace.d.ts +9 -1
- package/out/server/entity2LogicNamespace.js +11 -1
- package/out/server/entity2LogicNamespace.js.map +1 -1
- package/out/server/getExtensionModules.d.ts +3 -0
- package/out/server/getExtensionModules.js +18 -0
- package/out/server/getExtensionModules.js.map +1 -0
- package/out/server/getLogics.js +18 -15
- package/out/server/getLogics.js.map +1 -1
- package/out/server/getMemberIdentifier.d.ts +3 -2
- package/out/server/getMemberIdentifier.js +47 -15
- package/out/server/getMemberIdentifier.js.map +1 -1
- package/out/server/getProcesses.d.ts +4 -1
- package/out/server/getProcesses.js +16 -7
- package/out/server/getProcesses.js.map +1 -1
- package/out/server/getValidates.js +1 -1
- package/out/server/getValidates.js.map +1 -1
- package/out/server/index.js +1 -0
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +23 -5
- package/out/server/naslServer.js +199 -25
- package/out/server/naslServer.js.map +1 -1
- package/out/server/process2LogicNamespace.d.ts +15 -1
- package/out/server/process2LogicNamespace.js +30 -3
- package/out/server/process2LogicNamespace.js.map +1 -1
- package/out/server/translator.js +28 -0
- package/out/server/translator.js.map +1 -1
- package/out/service/storage/init.d.ts +5 -0
- package/out/service/storage/init.js +60 -52
- package/out/service/storage/init.js.map +1 -1
- package/out/templator/genCallComponentLogic.js +2 -2
- package/out/templator/genCallComponentLogic.js.map +1 -1
- package/out/templator/genCreateBlock.js +6 -8
- package/out/templator/genCreateBlock.js.map +1 -1
- package/out/templator/genCurdEditMultipleKeyBlock.js +3 -3
- package/out/templator/genCurdEditMultipleKeyBlock.js.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.js +4 -4
- package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
- package/out/templator/genEditTableBlock.js +3 -3
- package/out/templator/genEditTableBlock.js.map +1 -1
- package/out/templator/genGetBlock.js +1 -1
- package/out/templator/genGetBlock.js.map +1 -1
- package/out/templator/genListViewBlock.js +2 -2
- package/out/templator/genListViewBlock.js.map +1 -1
- package/out/templator/genSelectBlock.js +1 -1
- package/out/templator/genSelectBlock.js.map +1 -1
- package/out/templator/genUpdateBlock.js +8 -12
- package/out/templator/genUpdateBlock.js.map +1 -1
- package/out/templator/utils.d.ts +20 -20
- package/out/templator/utils.js +22 -22
- package/out/templator/utils.js.map +1 -1
- package/package.json +2 -1
- package/src/automate/engine/index.js +37 -3
- package/src/automate/engine/utils.js +68 -64
- package/src/common/BaseNode.ts +24 -17
- package/src/concepts/App__.ts +93 -17
- package/src/concepts/Argument__.ts +4 -2
- package/src/concepts/Assignment__.ts +5 -7
- package/src/concepts/Attribute__.ts +1 -0
- package/src/concepts/BinaryExpression__.ts +7 -5
- package/src/concepts/BindAttribute__.ts +9 -4
- package/src/concepts/BindDirective__.ts +4 -2
- package/src/concepts/BindEvent__.ts +6 -4
- package/src/concepts/BooleanLiteral__.ts +3 -1
- package/src/concepts/CallFunction__.ts +195 -11
- package/src/concepts/CallInterface__.ts +4 -2
- package/src/concepts/CallLogic__.ts +211 -12
- package/src/concepts/CallQueryComponent__.ts +2 -1
- package/src/concepts/Comment__.ts +1 -0
- package/src/concepts/CompletionProperty__.ts +1 -0
- package/src/concepts/ConfigGroup__.ts +290 -0
- package/src/concepts/ConfigPropertyValue__.ts +112 -0
- package/src/concepts/ConfigProperty__.ts +306 -0
- package/src/concepts/Configuration__.ts +286 -0
- package/src/concepts/Constant__.ts +3 -1
- package/src/concepts/DataElement__.ts +1 -0
- package/src/concepts/Destination__.ts +7 -5
- package/src/concepts/End__.ts +1 -0
- package/src/concepts/EntityIndex__.ts +19 -0
- package/src/concepts/EntityProperty__.ts +9 -8
- package/src/concepts/Entity__.ts +66 -59
- package/src/concepts/EnumItem__.ts +1 -0
- package/src/concepts/Enum__.ts +32 -12
- package/src/concepts/Event__.ts +2 -1
- package/src/concepts/ForEachStatement__.ts +115 -69
- package/src/concepts/Function__.ts +2 -1
- package/src/concepts/Identifier__.ts +18 -1
- package/src/concepts/IfStatement__.ts +1 -0
- package/src/concepts/InterfaceParam__.ts +2 -1
- package/src/concepts/Interface__.ts +21 -5
- package/src/concepts/JSBlock__.ts +1 -0
- package/src/concepts/LogicItem__.ts +9 -40
- package/src/concepts/Logic__.ts +48 -9
- package/src/concepts/MemberExpression__.ts +14 -17
- package/src/concepts/Module__.ts +158 -139
- package/src/concepts/Namespace__.ts +13 -12
- package/src/concepts/NullLiteral__.ts +3 -1
- package/src/concepts/NumericLiteral__.ts +3 -1
- package/src/concepts/Param__.ts +3 -2
- package/src/concepts/Point__.ts +1 -0
- package/src/concepts/ProcessComponent__.ts +3 -2
- package/src/concepts/ProcessElement__.ts +102 -107
- package/src/concepts/ProcessOutcome__.ts +1 -0
- package/src/concepts/Process__.ts +12 -4
- package/src/concepts/QueryAggregateExpression__.ts +1 -0
- package/src/concepts/QueryFieldExpression__.ts +2 -1
- package/src/concepts/QueryFromExpression__.ts +1 -0
- package/src/concepts/QueryGroupByExpression__.ts +1 -0
- package/src/concepts/QueryJoinExpression__.ts +2 -1
- package/src/concepts/QueryLimitExpression__.ts +1 -0
- package/src/concepts/QueryOrderByExpression__.ts +1 -0
- package/src/concepts/QuerySelectExpression__.ts +2 -1
- package/src/concepts/Rect__.ts +1 -0
- package/src/concepts/Return__.ts +3 -2
- package/src/concepts/Role__.ts +19 -2
- package/src/concepts/Slot__.ts +1 -0
- package/src/concepts/SqlQueryComponent__.ts +11 -1
- package/src/concepts/Start__.ts +1 -0
- package/src/concepts/StringLiteral__.ts +3 -1
- package/src/concepts/StructureProperty__.ts +2 -1
- package/src/concepts/Structure__.ts +5 -4
- package/src/concepts/SwitchCase__.ts +1 -0
- package/src/concepts/SwitchStatement__.ts +1 -0
- package/src/concepts/Theme__.ts +1 -0
- package/src/concepts/Transactional__.ts +1 -0
- package/src/concepts/TypeAnnotation__.ts +4 -0
- package/src/concepts/TypeParam__.ts +1 -0
- package/src/concepts/UnaryExpression__.ts +6 -3
- package/src/concepts/Unparsed__.ts +3 -1
- package/src/concepts/UseComponent__.ts +1 -0
- package/src/concepts/ValidationRule__.ts +5 -2
- package/src/concepts/Variable__.ts +12 -6
- package/src/concepts/ViewComponent__.ts +6 -5
- package/src/concepts/ViewElement__.ts +109 -80
- package/src/concepts/View__.ts +245 -206
- package/src/concepts/WhileStatement__.ts +1 -0
- package/src/concepts/basics/stdlib/index.ts +2 -2
- package/src/concepts/basics/stdlib/nasl.ui.ts +3 -137
- package/src/concepts/basics/stdlib/nasl.util.ts +21 -5
- package/src/concepts/basics/stdlib/{nasl.validate.ts → nasl.validation.ts} +28 -28
- package/src/concepts/index__.ts +4 -0
- package/src/generator/compileComponent.ts +1 -1
- package/src/generator/genBundleFiles.ts +1 -2
- package/src/generator/genMetaData.ts +111 -0
- package/src/generator/index.ts +1 -0
- package/src/index.ts +2 -2
- package/src/server/createUiTs.ts +153 -0
- package/src/server/entity2LogicNamespace.ts +17 -1
- package/src/server/getExtensionModules.ts +13 -0
- package/src/server/getLogics.ts +19 -18
- package/src/server/getMemberIdentifier.ts +60 -19
- package/src/server/getProcesses.ts +15 -8
- package/src/server/getValidates.ts +1 -1
- package/src/server/index.ts +2 -1
- package/src/server/naslServer.ts +204 -24
- package/src/server/process2LogicNamespace.ts +44 -3
- package/src/server/translator.ts +121 -97
- package/src/service/config/api.js +32 -0
- package/src/service/config/index.js +6 -0
- package/src/service/creator/index.js +2 -2
- package/src/service/logic/checktypeSocket.js +49 -0
- package/src/service/modules/api.js +20 -0
- package/src/service/modules/index.js +6 -0
- package/src/service/storage/init.ts +62 -54
- package/src/templator/genCallComponentLogic.ts +2 -2
- package/src/templator/genCreateBlock.ts +19 -25
- package/src/templator/genCurdEditMultipleKeyBlock.ts +3 -3
- package/src/templator/genCurdMultipleKeyBlock.ts +4 -4
- package/src/templator/genEditTableBlock.ts +3 -3
- package/src/templator/genGetBlock.ts +1 -1
- package/src/templator/genListViewBlock.ts +2 -2
- package/src/templator/genSelectBlock.ts +1 -1
- package/src/templator/genUpdateBlock.ts +19 -25
- package/src/templator/utils.ts +25 -153
|
@@ -14,6 +14,7 @@ exports.CallFunction = void 0;
|
|
|
14
14
|
const translator_1 = require("../translator");
|
|
15
15
|
const decorators_1 = require("../decorators");
|
|
16
16
|
const classMap_1 = __importDefault(require("../common/classMap"));
|
|
17
|
+
const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
|
|
17
18
|
const Argument__1 = __importDefault(require("./Argument__"));
|
|
18
19
|
const LogicItem__1 = __importDefault(require("./LogicItem__"));
|
|
19
20
|
/**
|
|
@@ -40,6 +41,10 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
|
|
|
40
41
|
* shortcut
|
|
41
42
|
*/
|
|
42
43
|
shortcut = undefined;
|
|
44
|
+
/**
|
|
45
|
+
* 类型参数
|
|
46
|
+
*/
|
|
47
|
+
typeArguments = null;
|
|
43
48
|
/**
|
|
44
49
|
* 实际参数
|
|
45
50
|
*/
|
|
@@ -55,6 +60,47 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
|
|
|
55
60
|
static from(source, parentNode, parentKey) {
|
|
56
61
|
return super.from(source, parentNode, parentKey);
|
|
57
62
|
}
|
|
63
|
+
_insertTypeAnnotationAt(options, index) {
|
|
64
|
+
const typeAnnotationOptions = {};
|
|
65
|
+
const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
|
|
66
|
+
let typeAnnotation;
|
|
67
|
+
if (options instanceof TypeAnnotation__1.default) {
|
|
68
|
+
options.delete(); // 同一实例不支持多处存在
|
|
69
|
+
typeAnnotation = options;
|
|
70
|
+
Object.assign(typeAnnotation, relationOptions);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
typeAnnotation = TypeAnnotation__1.default.from({
|
|
74
|
+
...typeAnnotationOptions,
|
|
75
|
+
...options,
|
|
76
|
+
}, this, 'typeArguments');
|
|
77
|
+
}
|
|
78
|
+
this.typeArguments.splice(index, 0, typeAnnotation);
|
|
79
|
+
return typeAnnotation;
|
|
80
|
+
}
|
|
81
|
+
insertTypeAnnotationAt(options, index) {
|
|
82
|
+
const node = this._insertTypeAnnotationAt(options, index);
|
|
83
|
+
node.create({
|
|
84
|
+
index,
|
|
85
|
+
parentNode: this,
|
|
86
|
+
parentKey: 'typeArguments',
|
|
87
|
+
});
|
|
88
|
+
return node;
|
|
89
|
+
}
|
|
90
|
+
_addTypeAnnotation(options) {
|
|
91
|
+
const index = this.typeArguments.length;
|
|
92
|
+
return this._insertTypeAnnotationAt(options, index);
|
|
93
|
+
}
|
|
94
|
+
addTypeAnnotation(options) {
|
|
95
|
+
const node = this._addTypeAnnotation(options);
|
|
96
|
+
const index = this.typeArguments.length;
|
|
97
|
+
node.create({
|
|
98
|
+
index,
|
|
99
|
+
parentNode: this,
|
|
100
|
+
parentKey: 'typeArguments',
|
|
101
|
+
});
|
|
102
|
+
return node;
|
|
103
|
+
}
|
|
58
104
|
_insertArgumentAt(options, index) {
|
|
59
105
|
const argumentOptions = {};
|
|
60
106
|
const relationOptions = { parentNode: this, parentKey: 'arguments' };
|
|
@@ -96,6 +142,33 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
|
|
|
96
142
|
});
|
|
97
143
|
return node;
|
|
98
144
|
}
|
|
145
|
+
removeTypeAnnotation(options) {
|
|
146
|
+
let typeAnnotation = options;
|
|
147
|
+
return typeAnnotation.delete();
|
|
148
|
+
}
|
|
149
|
+
__removeTypeAnnotation(typeAnnotation) {
|
|
150
|
+
const parentKey = typeAnnotation.parentKey;
|
|
151
|
+
const params = {
|
|
152
|
+
parentNode: this,
|
|
153
|
+
parentKey,
|
|
154
|
+
index: -1,
|
|
155
|
+
object: null,
|
|
156
|
+
oldObject: typeAnnotation,
|
|
157
|
+
};
|
|
158
|
+
if (parentKey) {
|
|
159
|
+
params.parentKey = parentKey;
|
|
160
|
+
if (Array.isArray(this[parentKey])) {
|
|
161
|
+
const index = this[parentKey].indexOf(typeAnnotation);
|
|
162
|
+
~index && this[parentKey].splice(index, 1);
|
|
163
|
+
params.index = index;
|
|
164
|
+
}
|
|
165
|
+
else if (this[parentKey] === typeAnnotation) {
|
|
166
|
+
params.index = 0;
|
|
167
|
+
this[parentKey] = undefined;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
return params;
|
|
171
|
+
}
|
|
99
172
|
removeArgument(options) {
|
|
100
173
|
let argument = options;
|
|
101
174
|
return argument.delete();
|
|
@@ -127,11 +200,11 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
|
|
|
127
200
|
// ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑
|
|
128
201
|
// 自动生成的代码已结束。下面可以手动编写。
|
|
129
202
|
//================================================================================
|
|
130
|
-
toVue() {
|
|
203
|
+
toVue(options) {
|
|
131
204
|
let code = `$utils['${this.calleeName}']`;
|
|
132
205
|
code += '(';
|
|
133
206
|
this.arguments.forEach((arg, index) => {
|
|
134
|
-
code += arg.toVue();
|
|
207
|
+
code += arg.toVue(options);
|
|
135
208
|
if (index !== this.arguments.length - 1)
|
|
136
209
|
code += ', ';
|
|
137
210
|
});
|
|
@@ -161,7 +234,7 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
|
|
|
161
234
|
return code;
|
|
162
235
|
}
|
|
163
236
|
get calleeKey() {
|
|
164
|
-
return `${this.calleeNamespace}
|
|
237
|
+
return this.calleeName ? `${this.calleeNamespace ? this.calleeNamespace + '.' : ''}${this.calleeName}` : '__IDENTIFIER__';
|
|
165
238
|
}
|
|
166
239
|
_setCallee(func) {
|
|
167
240
|
this.calleeNamespace = func.getNamespace();
|
|
@@ -182,21 +255,53 @@ let CallFunction = CallFunction_1 = class CallFunction extends LogicItem__1.defa
|
|
|
182
255
|
Object.assign(argument, relationOptions);
|
|
183
256
|
return argument;
|
|
184
257
|
});
|
|
258
|
+
let typeArguments = null;
|
|
259
|
+
if (func.typeParams) {
|
|
260
|
+
typeArguments = func.typeParams.map(() => {
|
|
261
|
+
const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
|
|
262
|
+
const typeArgu = new TypeAnnotation__1.default();
|
|
263
|
+
Object.assign(typeArgu, relationOptions);
|
|
264
|
+
return typeArgu;
|
|
265
|
+
});
|
|
266
|
+
}
|
|
185
267
|
this.update({
|
|
186
268
|
calleeNamespace,
|
|
187
269
|
calleeName,
|
|
188
270
|
arguments: params,
|
|
271
|
+
typeArguments
|
|
189
272
|
});
|
|
190
273
|
}
|
|
191
274
|
toEmbeddedTS(state) {
|
|
192
|
-
let code =
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
275
|
+
let code = '';
|
|
276
|
+
const calleeKey = this.calleeKey;
|
|
277
|
+
if (calleeKey === 'nasl.util.Convert') {
|
|
278
|
+
// nasl.util.Convert(variable1)<nasl.core.String>();
|
|
279
|
+
// 单独处理
|
|
280
|
+
code = calleeKey;
|
|
281
|
+
code += '(';
|
|
282
|
+
this.arguments.forEach((arg, index) => {
|
|
283
|
+
code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code));
|
|
284
|
+
if (index !== this.arguments.length - 1)
|
|
285
|
+
code += ', ';
|
|
286
|
+
});
|
|
287
|
+
code += ')';
|
|
288
|
+
// 如果有内容
|
|
289
|
+
const typeAnnotation = this.typeArguments[0];
|
|
290
|
+
if (typeAnnotation.typeNamespace && typeAnnotation.typeName) {
|
|
291
|
+
code += `<${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}>()`;
|
|
292
|
+
}
|
|
293
|
+
code += '\n';
|
|
294
|
+
}
|
|
295
|
+
else {
|
|
296
|
+
code = this.calleeKey;
|
|
297
|
+
code += '(';
|
|
298
|
+
this.arguments.forEach((arg, index) => {
|
|
299
|
+
code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code));
|
|
300
|
+
if (index !== this.arguments.length - 1)
|
|
301
|
+
code += ', ';
|
|
302
|
+
});
|
|
303
|
+
code += ')\n';
|
|
304
|
+
}
|
|
200
305
|
return code;
|
|
201
306
|
}
|
|
202
307
|
};
|
|
@@ -215,6 +320,9 @@ __decorate([
|
|
|
215
320
|
__decorate([
|
|
216
321
|
(0, decorators_1.property)()
|
|
217
322
|
], CallFunction.prototype, "shortcut", void 0);
|
|
323
|
+
__decorate([
|
|
324
|
+
(0, decorators_1.property)('TypeAnnotation')
|
|
325
|
+
], CallFunction.prototype, "typeArguments", void 0);
|
|
218
326
|
__decorate([
|
|
219
327
|
(0, decorators_1.property)('Argument')
|
|
220
328
|
], CallFunction.prototype, "arguments", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CallFunction__.js","sourceRoot":"","sources":["../../src/concepts/CallFunction__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2E;
|
|
1
|
+
{"version":3,"file":"CallFunction__.js","sourceRoot":"","sources":["../../src/concepts/CallFunction__.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TranslatorState } from '../translator';
|
|
2
2
|
import Interface from './Interface__';
|
|
3
|
+
import { ElementToVueOptions } from './ViewElement__';
|
|
3
4
|
import { Params } from '../common/EventEmitter';
|
|
4
5
|
import Argument from './Argument__';
|
|
5
6
|
import LogicItem from './LogicItem__';
|
|
@@ -86,7 +87,7 @@ export declare class CallInterface extends LogicItem {
|
|
|
86
87
|
*/
|
|
87
88
|
removeArgument(argument: Argument): void;
|
|
88
89
|
__removeLogicItem(logicItem: LogicItem): Params;
|
|
89
|
-
toVue(): string;
|
|
90
|
+
toVue(options?: ElementToVueOptions): string;
|
|
90
91
|
toUI(state?: TranslatorState): string;
|
|
91
92
|
toJS(state?: TranslatorState): string;
|
|
92
93
|
toEmbeddedTS(state?: TranslatorState): string;
|
|
@@ -127,11 +127,11 @@ let CallInterface = CallInterface_1 = class CallInterface extends LogicItem__1.d
|
|
|
127
127
|
// ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑
|
|
128
128
|
// 自动生成的代码已结束。下面可以手动编写。
|
|
129
129
|
//================================================================================
|
|
130
|
-
toVue() {
|
|
130
|
+
toVue(options) {
|
|
131
131
|
let code = this.calleeName;
|
|
132
132
|
code += '(';
|
|
133
133
|
this.arguments.forEach((arg, index) => {
|
|
134
|
-
code += arg.toVue();
|
|
134
|
+
code += arg.toVue(options);
|
|
135
135
|
if (index !== this.arguments.length - 1)
|
|
136
136
|
code += ', ';
|
|
137
137
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CallInterface__.js","sourceRoot":"","sources":["../../src/concepts/CallInterface__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2E;
|
|
1
|
+
{"version":3,"file":"CallInterface__.js","sourceRoot":"","sources":["../../src/concepts/CallInterface__.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { TranslatorState } from '../translator';
|
|
2
2
|
import Logic from './Logic__';
|
|
3
|
+
import { ElementToVueOptions } from './ViewElement__';
|
|
3
4
|
import { Params } from '../common/EventEmitter';
|
|
5
|
+
import TypeAnnotation from './TypeAnnotation__';
|
|
4
6
|
import Argument from './Argument__';
|
|
5
7
|
import LogicItem from './LogicItem__';
|
|
6
8
|
/**
|
|
@@ -27,6 +29,10 @@ export declare class CallLogic extends LogicItem {
|
|
|
27
29
|
* shortcut
|
|
28
30
|
*/
|
|
29
31
|
shortcut: boolean;
|
|
32
|
+
/**
|
|
33
|
+
* 类型参数
|
|
34
|
+
*/
|
|
35
|
+
typeArguments?: Array<TypeAnnotation>;
|
|
30
36
|
/**
|
|
31
37
|
* 实际参数
|
|
32
38
|
*/
|
|
@@ -37,6 +43,50 @@ export declare class CallLogic extends LogicItem {
|
|
|
37
43
|
constructor(source?: Partial<CallLogic>);
|
|
38
44
|
static from(source: any, parentNode?: any, parentKey?: string): CallLogic;
|
|
39
45
|
/**
|
|
46
|
+
* 插入类型标注
|
|
47
|
+
* @internal
|
|
48
|
+
* @param typeAnnotationOptions 类型标注参数
|
|
49
|
+
*/
|
|
50
|
+
_insertTypeAnnotationAt(typeAnnotationOptions: Partial<TypeAnnotation>, index: number): TypeAnnotation;
|
|
51
|
+
/**
|
|
52
|
+
* 插入类型标注
|
|
53
|
+
* @internal
|
|
54
|
+
* @param typeAnnotation 已有的类型标注实例
|
|
55
|
+
*/
|
|
56
|
+
_insertTypeAnnotationAt(typeAnnotation: TypeAnnotation, index: number): TypeAnnotation;
|
|
57
|
+
/**
|
|
58
|
+
* 插入类型标注
|
|
59
|
+
* @param typeAnnotationOptions 类型标注参数
|
|
60
|
+
*/
|
|
61
|
+
insertTypeAnnotationAt(typeAnnotationOptions: Partial<TypeAnnotation>, index: number): TypeAnnotation;
|
|
62
|
+
/**
|
|
63
|
+
* 插入类型标注
|
|
64
|
+
* @param typeAnnotation 已有的类型标注实例
|
|
65
|
+
*/
|
|
66
|
+
insertTypeAnnotationAt(typeAnnotation: TypeAnnotation, index: number): TypeAnnotation;
|
|
67
|
+
/**
|
|
68
|
+
* 添加类型标注
|
|
69
|
+
* @internal
|
|
70
|
+
* @param typeAnnotationOptions 类型标注参数
|
|
71
|
+
*/
|
|
72
|
+
_addTypeAnnotation(typeAnnotationOptions: Partial<TypeAnnotation>): TypeAnnotation;
|
|
73
|
+
/**
|
|
74
|
+
* 添加类型标注
|
|
75
|
+
* @internal
|
|
76
|
+
* @param typeAnnotation 已有的类型标注实例
|
|
77
|
+
*/
|
|
78
|
+
_addTypeAnnotation(typeAnnotation: TypeAnnotation): TypeAnnotation;
|
|
79
|
+
/**
|
|
80
|
+
* 添加类型标注
|
|
81
|
+
* @param typeAnnotationOptions 类型标注参数
|
|
82
|
+
*/
|
|
83
|
+
addTypeAnnotation(typeAnnotationOptions: Partial<TypeAnnotation>): TypeAnnotation;
|
|
84
|
+
/**
|
|
85
|
+
* 添加类型标注
|
|
86
|
+
* @param typeAnnotation 已有的类型标注实例
|
|
87
|
+
*/
|
|
88
|
+
addTypeAnnotation(typeAnnotation: TypeAnnotation): TypeAnnotation;
|
|
89
|
+
/**
|
|
40
90
|
* 插入实际参数
|
|
41
91
|
* @internal
|
|
42
92
|
* @param argumentOptions 实际参数参数
|
|
@@ -80,6 +130,12 @@ export declare class CallLogic extends LogicItem {
|
|
|
80
130
|
* @param argument 已有的实际参数实例
|
|
81
131
|
*/
|
|
82
132
|
addArgument(argument: Argument): Argument;
|
|
133
|
+
/**
|
|
134
|
+
* 删除类型标注
|
|
135
|
+
* @param typeAnnotation 已有的类型标注实例
|
|
136
|
+
*/
|
|
137
|
+
removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
|
|
138
|
+
__removeTypeAnnotation(typeAnnotation: TypeAnnotation): Params;
|
|
83
139
|
/**
|
|
84
140
|
* 删除实际参数
|
|
85
141
|
* @param argument 已有的实际参数实例
|
|
@@ -106,7 +162,7 @@ export declare class CallLogic extends LogicItem {
|
|
|
106
162
|
_setCallee(logic: Logic): void;
|
|
107
163
|
setCallee(logic: Logic): void;
|
|
108
164
|
setCalleeArgName(logic: Logic): void;
|
|
109
|
-
toVue(): string;
|
|
165
|
+
toVue(options?: ElementToVueOptions): string;
|
|
110
166
|
toUI(state?: TranslatorState): string;
|
|
111
167
|
toJS(state?: TranslatorState): string;
|
|
112
168
|
toEmbeddedTS(state?: TranslatorState): string;
|
|
@@ -14,6 +14,7 @@ exports.CallLogic = void 0;
|
|
|
14
14
|
const translator_1 = require("../translator");
|
|
15
15
|
const decorators_1 = require("../decorators");
|
|
16
16
|
const classMap_1 = __importDefault(require("../common/classMap"));
|
|
17
|
+
const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
|
|
17
18
|
const Argument__1 = __importDefault(require("./Argument__"));
|
|
18
19
|
const LogicItem__1 = __importDefault(require("./LogicItem__"));
|
|
19
20
|
/**
|
|
@@ -40,6 +41,10 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
40
41
|
* shortcut
|
|
41
42
|
*/
|
|
42
43
|
shortcut = undefined;
|
|
44
|
+
/**
|
|
45
|
+
* 类型参数
|
|
46
|
+
*/
|
|
47
|
+
typeArguments = null;
|
|
43
48
|
/**
|
|
44
49
|
* 实际参数
|
|
45
50
|
*/
|
|
@@ -55,6 +60,47 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
55
60
|
static from(source, parentNode, parentKey) {
|
|
56
61
|
return super.from(source, parentNode, parentKey);
|
|
57
62
|
}
|
|
63
|
+
_insertTypeAnnotationAt(options, index) {
|
|
64
|
+
const typeAnnotationOptions = {};
|
|
65
|
+
const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
|
|
66
|
+
let typeAnnotation;
|
|
67
|
+
if (options instanceof TypeAnnotation__1.default) {
|
|
68
|
+
options.delete(); // 同一实例不支持多处存在
|
|
69
|
+
typeAnnotation = options;
|
|
70
|
+
Object.assign(typeAnnotation, relationOptions);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
typeAnnotation = TypeAnnotation__1.default.from({
|
|
74
|
+
...typeAnnotationOptions,
|
|
75
|
+
...options,
|
|
76
|
+
}, this, 'typeArguments');
|
|
77
|
+
}
|
|
78
|
+
this.typeArguments.splice(index, 0, typeAnnotation);
|
|
79
|
+
return typeAnnotation;
|
|
80
|
+
}
|
|
81
|
+
insertTypeAnnotationAt(options, index) {
|
|
82
|
+
const node = this._insertTypeAnnotationAt(options, index);
|
|
83
|
+
node.create({
|
|
84
|
+
index,
|
|
85
|
+
parentNode: this,
|
|
86
|
+
parentKey: 'typeArguments',
|
|
87
|
+
});
|
|
88
|
+
return node;
|
|
89
|
+
}
|
|
90
|
+
_addTypeAnnotation(options) {
|
|
91
|
+
const index = this.typeArguments.length;
|
|
92
|
+
return this._insertTypeAnnotationAt(options, index);
|
|
93
|
+
}
|
|
94
|
+
addTypeAnnotation(options) {
|
|
95
|
+
const node = this._addTypeAnnotation(options);
|
|
96
|
+
const index = this.typeArguments.length;
|
|
97
|
+
node.create({
|
|
98
|
+
index,
|
|
99
|
+
parentNode: this,
|
|
100
|
+
parentKey: 'typeArguments',
|
|
101
|
+
});
|
|
102
|
+
return node;
|
|
103
|
+
}
|
|
58
104
|
_insertArgumentAt(options, index) {
|
|
59
105
|
const argumentOptions = {};
|
|
60
106
|
const relationOptions = { parentNode: this, parentKey: 'arguments' };
|
|
@@ -96,8 +142,35 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
96
142
|
});
|
|
97
143
|
return node;
|
|
98
144
|
}
|
|
145
|
+
removeTypeAnnotation(options) {
|
|
146
|
+
let typeAnnotation = options;
|
|
147
|
+
return typeAnnotation.delete();
|
|
148
|
+
}
|
|
149
|
+
__removeTypeAnnotation(typeAnnotation) {
|
|
150
|
+
const parentKey = typeAnnotation.parentKey;
|
|
151
|
+
const params = {
|
|
152
|
+
parentNode: this,
|
|
153
|
+
parentKey,
|
|
154
|
+
index: -1,
|
|
155
|
+
object: null,
|
|
156
|
+
oldObject: typeAnnotation,
|
|
157
|
+
};
|
|
158
|
+
if (parentKey) {
|
|
159
|
+
params.parentKey = parentKey;
|
|
160
|
+
if (Array.isArray(this[parentKey])) {
|
|
161
|
+
const index = this[parentKey].indexOf(typeAnnotation);
|
|
162
|
+
~index && this[parentKey].splice(index, 1);
|
|
163
|
+
params.index = index;
|
|
164
|
+
}
|
|
165
|
+
else if (this[parentKey] === typeAnnotation) {
|
|
166
|
+
params.index = 0;
|
|
167
|
+
this[parentKey] = undefined;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
return params;
|
|
171
|
+
}
|
|
99
172
|
removeArgument(options) {
|
|
100
|
-
|
|
173
|
+
let argument = options;
|
|
101
174
|
return argument.delete();
|
|
102
175
|
}
|
|
103
176
|
__removeLogicItem(logicItem) {
|
|
@@ -138,15 +211,16 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
138
211
|
}
|
|
139
212
|
get calleeKey() {
|
|
140
213
|
const tsCalleeNamespace = this.tsCalleeNamespace;
|
|
214
|
+
const calleeName = this.calleeName;
|
|
141
215
|
if (!tsCalleeNamespace) {
|
|
142
|
-
return `logics.${
|
|
216
|
+
return calleeName ? `logics.${calleeName}` : '__IDENTIFIER__';
|
|
143
217
|
}
|
|
144
218
|
// elements单独处理相对路径,和后缀的问题
|
|
145
219
|
if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
|
|
146
220
|
const methodName = tsCalleeNamespace.substring(0, tsCalleeNamespace.length - '.logics'.length);
|
|
147
|
-
return '__' + methodName + `.${
|
|
221
|
+
return '__' + methodName + `.${calleeName}`;
|
|
148
222
|
}
|
|
149
|
-
return `${tsCalleeNamespace}.${
|
|
223
|
+
return calleeName ? `${tsCalleeNamespace}.${calleeName}` : '__IDENTIFIER__';
|
|
150
224
|
}
|
|
151
225
|
/**
|
|
152
226
|
* 设置setArgumentName
|
|
@@ -185,6 +259,12 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
185
259
|
keyword: param.name,
|
|
186
260
|
});
|
|
187
261
|
});
|
|
262
|
+
if (logic.typeParams) {
|
|
263
|
+
this.typeArguments = [];
|
|
264
|
+
logic.typeParams.forEach(() => {
|
|
265
|
+
this._addTypeAnnotation({});
|
|
266
|
+
});
|
|
267
|
+
}
|
|
188
268
|
}
|
|
189
269
|
setCallee(logic) {
|
|
190
270
|
const calleeNamespace = logic.getNamespace();
|
|
@@ -197,10 +277,20 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
197
277
|
Object.assign(argument, relationOptions);
|
|
198
278
|
return argument;
|
|
199
279
|
});
|
|
280
|
+
let typeArguments = null;
|
|
281
|
+
if (logic.typeParams) {
|
|
282
|
+
typeArguments = logic.typeParams.map(() => {
|
|
283
|
+
const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
|
|
284
|
+
const typeArgu = new TypeAnnotation__1.default();
|
|
285
|
+
Object.assign(typeArgu, relationOptions);
|
|
286
|
+
return typeArgu;
|
|
287
|
+
});
|
|
288
|
+
}
|
|
200
289
|
this.update({
|
|
201
290
|
calleeNamespace,
|
|
202
291
|
calleeName,
|
|
203
292
|
arguments: params,
|
|
293
|
+
typeArguments,
|
|
204
294
|
});
|
|
205
295
|
}
|
|
206
296
|
setCalleeArgName(logic) {
|
|
@@ -248,11 +338,11 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
248
338
|
arguments: newArgs,
|
|
249
339
|
});
|
|
250
340
|
}
|
|
251
|
-
toVue() {
|
|
341
|
+
toVue(options) {
|
|
252
342
|
let code = this.calleeName;
|
|
253
343
|
code += '(';
|
|
254
344
|
this.arguments.forEach((arg, index) => {
|
|
255
|
-
code += arg.toVue();
|
|
345
|
+
code += arg.toVue(options);
|
|
256
346
|
if (index !== this.arguments.length - 1)
|
|
257
347
|
code += ', ';
|
|
258
348
|
});
|
|
@@ -272,7 +362,11 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
272
362
|
}
|
|
273
363
|
toJS(state) {
|
|
274
364
|
let code = 'await ';
|
|
365
|
+
// 页面逻辑
|
|
275
366
|
let isViewLogic = true;
|
|
367
|
+
// 组件逻辑
|
|
368
|
+
let isComponentLogic = false;
|
|
369
|
+
let componentName = '';
|
|
276
370
|
const calleeNamespace = this.calleeNamespace;
|
|
277
371
|
// calleeNamespace不存在,一定是页面逻辑
|
|
278
372
|
if (calleeNamespace) {
|
|
@@ -284,6 +378,10 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
284
378
|
isViewLogic = false;
|
|
285
379
|
}
|
|
286
380
|
}
|
|
381
|
+
else if (start === 'elements' && namespaceArr.length === 2 && namespaceArr[1] === 'logics') {
|
|
382
|
+
isComponentLogic = true;
|
|
383
|
+
componentName = namespaceArr[0];
|
|
384
|
+
}
|
|
287
385
|
}
|
|
288
386
|
// 全局逻辑
|
|
289
387
|
if (!isViewLogic) {
|
|
@@ -298,10 +396,13 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
298
396
|
const namespaceArr = calleeNamespace.split('.');
|
|
299
397
|
// 去掉app
|
|
300
398
|
namespaceArr.shift();
|
|
301
|
-
const keywordEntities = namespaceArr
|
|
399
|
+
const keywordEntities = namespaceArr
|
|
400
|
+
.map((namespaceItem, index) => ({
|
|
302
401
|
key: namespaceItem,
|
|
303
402
|
index,
|
|
304
|
-
}))
|
|
403
|
+
}))
|
|
404
|
+
.filter((namespaceItem, index) => index % 2 === 0)
|
|
405
|
+
.find((namespaceItem) => namespaceItem.key === 'entities');
|
|
305
406
|
const entityName = namespaceArr[keywordEntities?.index + 1];
|
|
306
407
|
if (entityName) {
|
|
307
408
|
let logicArgs = this.arguments;
|
|
@@ -347,7 +448,10 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
|
|
|
347
448
|
code += '\n})';
|
|
348
449
|
}
|
|
349
450
|
else {
|
|
350
|
-
if (
|
|
451
|
+
if (isComponentLogic) {
|
|
452
|
+
code += `this.$refs.${componentName}.${this.calleeName}`;
|
|
453
|
+
}
|
|
454
|
+
else if (calleeNamespace === 'nasl.ui' || calleeNamespace === 'nasl.util') {
|
|
351
455
|
switch (this.calleeName) {
|
|
352
456
|
case 'showMessage':
|
|
353
457
|
code += `this.$toast.show`;
|
|
@@ -403,6 +507,9 @@ __decorate([
|
|
|
403
507
|
__decorate([
|
|
404
508
|
(0, decorators_1.property)()
|
|
405
509
|
], CallLogic.prototype, "shortcut", void 0);
|
|
510
|
+
__decorate([
|
|
511
|
+
(0, decorators_1.property)('TypeAnnotation')
|
|
512
|
+
], CallLogic.prototype, "typeArguments", void 0);
|
|
406
513
|
__decorate([
|
|
407
514
|
(0, decorators_1.property)('Argument')
|
|
408
515
|
], CallLogic.prototype, "arguments", void 0);
|
|
@@ -413,7 +520,7 @@ CallLogic = CallLogic_1 = __decorate([
|
|
|
413
520
|
decorators_1.concept
|
|
414
521
|
], CallLogic);
|
|
415
522
|
exports.CallLogic = CallLogic;
|
|
416
|
-
classMap_1.default
|
|
523
|
+
classMap_1.default['CallLogic'] = CallLogic;
|
|
417
524
|
exports.default = CallLogic;
|
|
418
525
|
//================================================================================
|
|
419
526
|
// ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑
|