@lcap/nasl 1.0.0-alpha.9 → 1.0.0
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/automate/engine/index.d.ts +3 -0
- package/out/automate/engine/index.js +513 -0
- package/out/automate/engine/index.js.map +1 -0
- package/out/automate/engine/utils.d.ts +24 -0
- package/out/automate/engine/utils.js +363 -0
- package/out/automate/engine/utils.js.map +1 -0
- package/out/common/BaseNode.d.ts +20 -0
- package/out/common/BaseNode.js +219 -81
- package/out/common/BaseNode.js.map +1 -1
- package/out/concepts/App__.d.ts +18 -1
- package/out/concepts/App__.js +75 -35
- package/out/concepts/App__.js.map +1 -1
- package/out/concepts/Argument__.d.ts +5 -1
- package/out/concepts/Argument__.js +21 -3
- package/out/concepts/Argument__.js.map +1 -1
- package/out/concepts/Assignee__.d.ts +190 -0
- package/out/concepts/Assignee__.js +264 -0
- package/out/concepts/Assignee__.js.map +1 -0
- package/out/concepts/Assignment__.js +5 -0
- package/out/concepts/Assignment__.js.map +1 -1
- package/out/concepts/BinaryExpression__.js +8 -7
- package/out/concepts/BinaryExpression__.js.map +1 -1
- package/out/concepts/BindAttribute__.d.ts +19 -0
- package/out/concepts/BindAttribute__.js +54 -9
- package/out/concepts/BindAttribute__.js.map +1 -1
- package/out/concepts/BindDirective__.js +22 -2
- package/out/concepts/BindDirective__.js.map +1 -1
- package/out/concepts/BindEvent__.d.ts +2 -2
- package/out/concepts/BindEvent__.js +67 -34
- package/out/concepts/BindEvent__.js.map +1 -1
- package/out/concepts/BooleanLiteral__.d.ts +2 -0
- package/out/concepts/BooleanLiteral__.js +10 -0
- package/out/concepts/BooleanLiteral__.js.map +1 -1
- package/out/concepts/CallFunction__.js +41 -23
- package/out/concepts/CallFunction__.js.map +1 -1
- package/out/concepts/CallInterface__.d.ts +5 -0
- package/out/concepts/CallInterface__.js +238 -31
- package/out/concepts/CallInterface__.js.map +1 -1
- package/out/concepts/CallLogic__.d.ts +4 -4
- package/out/concepts/CallLogic__.js +110 -53
- package/out/concepts/CallLogic__.js.map +1 -1
- package/out/concepts/CallQueryComponent__.d.ts +7 -1
- package/out/concepts/CallQueryComponent__.js +44 -25
- package/out/concepts/CallQueryComponent__.js.map +1 -1
- package/out/concepts/Comment__.js +6 -2
- package/out/concepts/Comment__.js.map +1 -1
- package/out/concepts/CompletionProperty__.d.ts +3 -1
- package/out/concepts/CompletionProperty__.js +2 -0
- package/out/concepts/CompletionProperty__.js.map +1 -1
- package/out/concepts/ConfigGroup__.js +2 -2
- package/out/concepts/ConfigGroup__.js.map +1 -1
- package/out/concepts/ConfigProperty__.js +2 -2
- package/out/concepts/ConfigProperty__.js.map +1 -1
- package/out/concepts/Configuration__.js +2 -2
- package/out/concepts/Configuration__.js.map +1 -1
- package/out/concepts/Constant__.d.ts +1 -0
- package/out/concepts/Constant__.js +14 -0
- package/out/concepts/Constant__.js.map +1 -1
- package/out/concepts/Destination__.d.ts +12 -0
- package/out/concepts/Destination__.js +94 -18
- package/out/concepts/Destination__.js.map +1 -1
- package/out/concepts/End__.js +9 -1
- package/out/concepts/End__.js.map +1 -1
- package/out/concepts/EntityProperty__.d.ts +11 -0
- package/out/concepts/EntityProperty__.js +73 -5
- package/out/concepts/EntityProperty__.js.map +1 -1
- package/out/concepts/Entity__.d.ts +4 -1
- package/out/concepts/Entity__.js +37 -15
- package/out/concepts/Entity__.js.map +1 -1
- package/out/concepts/Enum__.d.ts +4 -0
- package/out/concepts/Enum__.js +18 -10
- package/out/concepts/Enum__.js.map +1 -1
- package/out/concepts/Event__.js +2 -2
- package/out/concepts/Event__.js.map +1 -1
- package/out/concepts/ForEachStatement__.js +9 -13
- package/out/concepts/ForEachStatement__.js.map +1 -1
- package/out/concepts/Function__.js +9 -9
- package/out/concepts/Function__.js.map +1 -1
- package/out/concepts/Identifier__.d.ts +3 -0
- package/out/concepts/Identifier__.js +76 -29
- package/out/concepts/Identifier__.js.map +1 -1
- package/out/concepts/IfStatement__.js +4 -4
- package/out/concepts/IfStatement__.js.map +1 -1
- package/out/concepts/InterfaceParam__.d.ts +6 -4
- package/out/concepts/InterfaceParam__.js +52 -19
- package/out/concepts/InterfaceParam__.js.map +1 -1
- package/out/concepts/Interface__.d.ts +42 -30
- package/out/concepts/Interface__.js +131 -15
- package/out/concepts/Interface__.js.map +1 -1
- package/out/concepts/JSBlock__.d.ts +1 -0
- package/out/concepts/JSBlock__.js +3 -0
- package/out/concepts/JSBlock__.js.map +1 -1
- package/out/concepts/LogicItem__.d.ts +2 -1
- package/out/concepts/LogicItem__.js +14 -0
- package/out/concepts/LogicItem__.js.map +1 -1
- package/out/concepts/Logic__.d.ts +16 -1
- package/out/concepts/Logic__.js +176 -33
- package/out/concepts/Logic__.js.map +1 -1
- package/out/concepts/MemberExpression__.d.ts +2 -0
- package/out/concepts/MemberExpression__.js +49 -12
- package/out/concepts/MemberExpression__.js.map +1 -1
- package/out/concepts/Module__.d.ts +126 -120
- package/out/concepts/Module__.js +28 -18
- package/out/concepts/Module__.js.map +1 -1
- package/out/concepts/Namespace__.d.ts +5 -1
- package/out/concepts/Namespace__.js +36 -25
- package/out/concepts/Namespace__.js.map +1 -1
- package/out/concepts/NullLiteral__.d.ts +3 -0
- package/out/concepts/NullLiteral__.js +11 -1
- package/out/concepts/NullLiteral__.js.map +1 -1
- package/out/concepts/NumericLiteral__.d.ts +1 -1
- package/out/concepts/NumericLiteral__.js +17 -6
- package/out/concepts/NumericLiteral__.js.map +1 -1
- package/out/concepts/Param__.d.ts +7 -3
- package/out/concepts/Param__.js +57 -28
- package/out/concepts/Param__.js.map +1 -1
- package/out/concepts/ProcessComponent__.js +4 -4
- package/out/concepts/ProcessComponent__.js.map +1 -1
- package/out/concepts/ProcessElement__.d.ts +0 -4
- package/out/concepts/ProcessElement__.js +112 -49
- package/out/concepts/ProcessElement__.js.map +1 -1
- package/out/concepts/ProcessOutcome__.js +1 -1
- package/out/concepts/ProcessOutcome__.js.map +1 -1
- package/out/concepts/Process__.d.ts +7 -1
- package/out/concepts/Process__.js +77 -81
- package/out/concepts/Process__.js.map +1 -1
- package/out/concepts/QueryAggregateExpression__.js +1 -1
- package/out/concepts/QueryAggregateExpression__.js.map +1 -1
- package/out/concepts/QueryFromExpression__.js +2 -2
- package/out/concepts/QueryFromExpression__.js.map +1 -1
- package/out/concepts/QueryJoinExpression__.js +4 -4
- package/out/concepts/QueryJoinExpression__.js.map +1 -1
- package/out/concepts/QueryLimitExpression__.js +3 -3
- package/out/concepts/QueryLimitExpression__.js.map +1 -1
- package/out/concepts/QuerySelectExpression__.js +2 -2
- package/out/concepts/QuerySelectExpression__.js.map +1 -1
- package/out/concepts/Return__.d.ts +4 -1
- package/out/concepts/Return__.js +67 -21
- package/out/concepts/Return__.js.map +1 -1
- package/out/concepts/Role__.d.ts +4 -0
- package/out/concepts/Role__.js +13 -4
- package/out/concepts/Role__.js.map +1 -1
- package/out/concepts/SqlQueryComponent__.js +2 -2
- package/out/concepts/SqlQueryComponent__.js.map +1 -1
- package/out/concepts/StringLiteral__.d.ts +1 -1
- package/out/concepts/StringLiteral__.js +21 -31
- package/out/concepts/StringLiteral__.js.map +1 -1
- package/out/concepts/StructureProperty__.d.ts +5 -4
- package/out/concepts/StructureProperty__.js +55 -26
- package/out/concepts/StructureProperty__.js.map +1 -1
- package/out/concepts/Structure__.d.ts +44 -30
- package/out/concepts/Structure__.js +42 -10
- package/out/concepts/Structure__.js.map +1 -1
- package/out/concepts/SwitchCase__.js +4 -4
- package/out/concepts/SwitchCase__.js.map +1 -1
- package/out/concepts/SwitchStatement__.js +2 -2
- package/out/concepts/SwitchStatement__.js.map +1 -1
- package/out/concepts/TypeAnnotation__.d.ts +5 -5
- package/out/concepts/TypeAnnotation__.js +74 -20
- package/out/concepts/TypeAnnotation__.js.map +1 -1
- package/out/concepts/UnaryExpression__.js +10 -8
- package/out/concepts/UnaryExpression__.js.map +1 -1
- package/out/concepts/Unparsed__.js +1 -1
- package/out/concepts/Unparsed__.js.map +1 -1
- package/out/concepts/ValidationRule__.d.ts +1 -0
- package/out/concepts/ValidationRule__.js +48 -13
- package/out/concepts/ValidationRule__.js.map +1 -1
- package/out/concepts/Variable__.d.ts +10 -1
- package/out/concepts/Variable__.js +70 -18
- package/out/concepts/Variable__.js.map +1 -1
- package/out/concepts/ViewComponent__.js +10 -10
- package/out/concepts/ViewComponent__.js.map +1 -1
- package/out/concepts/ViewElement__.d.ts +17 -11
- package/out/concepts/ViewElement__.js +299 -201
- package/out/concepts/ViewElement__.js.map +1 -1
- package/out/concepts/View__.d.ts +12 -13
- package/out/concepts/View__.js +106 -103
- package/out/concepts/View__.js.map +1 -1
- package/out/concepts/WhileStatement__.js +3 -3
- package/out/concepts/WhileStatement__.js.map +1 -1
- package/out/concepts/basics/stdlib/index.js +4 -1
- package/out/concepts/basics/stdlib/index.js.map +1 -1
- package/out/concepts/basics/stdlib/{nasl.validate.d.ts → nasl.auth.d.ts} +0 -0
- package/out/concepts/basics/stdlib/nasl.auth.js +30 -0
- package/out/concepts/basics/stdlib/nasl.auth.js.map +1 -0
- package/out/concepts/basics/stdlib/nasl.browser copy.d.ts +3 -0
- package/out/concepts/basics/stdlib/nasl.browser copy.js +70 -0
- package/out/concepts/basics/stdlib/nasl.browser copy.js.map +1 -0
- package/out/concepts/basics/stdlib/nasl.browser.d.ts +3 -0
- package/out/concepts/basics/stdlib/nasl.browser.js +41 -0
- package/out/concepts/basics/stdlib/nasl.browser.js.map +1 -0
- package/out/concepts/basics/stdlib/nasl.configuration.d.ts +3 -0
- package/out/concepts/basics/stdlib/nasl.configuration.js +25 -0
- package/out/concepts/basics/stdlib/nasl.configuration.js.map +1 -0
- package/out/concepts/basics/stdlib/nasl.ui.js +20 -0
- package/out/concepts/basics/stdlib/nasl.ui.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.util.js +149 -13
- package/out/concepts/basics/stdlib/nasl.util.js.map +1 -1
- package/out/concepts/basics/stdlib/nasl.validation.js +54 -20
- package/out/concepts/basics/stdlib/nasl.validation.js.map +1 -1
- package/out/concepts/basics/types/coreTypeList.js +11 -10
- package/out/concepts/basics/types/coreTypeList.js.map +1 -1
- package/out/concepts/index__.d.ts +1 -0
- package/out/concepts/index__.js +1 -0
- package/out/concepts/index__.js.map +1 -1
- package/out/config.d.ts +1 -2
- package/out/config.js +1 -2
- package/out/config.js.map +1 -1
- package/out/enums/KEYWORDS.d.ts +3 -0
- package/out/enums/KEYWORDS.js +1208 -0
- package/out/enums/KEYWORDS.js.map +1 -0
- package/out/enums/LEVEL_NAME_MAP.d.ts +26 -0
- package/out/enums/LEVEL_NAME_MAP.js +30 -0
- package/out/enums/LEVEL_NAME_MAP.js.map +1 -0
- package/out/eventBus.d.ts +3 -0
- package/out/eventBus.js +7 -0
- package/out/eventBus.js.map +1 -0
- package/out/generator/genBundleFiles.d.ts +7 -2
- package/out/generator/genBundleFiles.js +168 -27
- package/out/generator/genBundleFiles.js.map +1 -1
- package/out/generator/genMetaData.d.ts +20 -20
- package/out/generator/genMetaData.js +50 -15
- package/out/generator/genMetaData.js.map +1 -1
- package/out/index.d.ts +2 -0
- package/out/index.js +2 -0
- package/out/index.js.map +1 -1
- package/out/manager/diagnostic.d.ts +1 -1
- package/out/server/createUiTs.d.ts +1 -0
- package/out/server/createUiTs.js +49 -5
- package/out/server/createUiTs.js.map +1 -1
- package/out/server/entity2LogicNamespace.js +38 -23
- package/out/server/entity2LogicNamespace.js.map +1 -1
- package/out/server/getExtensionModules.js +2 -0
- package/out/server/getExtensionModules.js.map +1 -1
- package/out/server/getFunctions.d.ts +1 -0
- package/out/server/getFunctions.js +7 -1
- package/out/server/getFunctions.js.map +1 -1
- package/out/server/getLogics.js +63 -18
- package/out/server/getLogics.js.map +1 -1
- package/out/server/getMemberIdentifier.d.ts +16 -1
- package/out/server/getMemberIdentifier.js +279 -36
- package/out/server/getMemberIdentifier.js.map +1 -1
- package/out/server/getProcesses.d.ts +6 -1
- package/out/server/getProcesses.js +243 -1
- package/out/server/getProcesses.js.map +1 -1
- package/out/server/getScope.d.ts +11 -0
- package/out/server/getScope.js +45 -0
- package/out/server/getScope.js.map +1 -0
- package/out/server/index.js +4 -0
- package/out/server/index.js.map +1 -1
- package/out/server/naslServer.d.ts +30 -53
- package/out/server/naslServer.js +682 -363
- package/out/server/naslServer.js.map +1 -1
- package/out/server/process2LogicNamespace.d.ts +10 -0
- package/out/server/process2LogicNamespace.js +29 -1
- package/out/server/process2LogicNamespace.js.map +1 -1
- package/out/server/translator.d.ts +22 -3
- package/out/server/translator.js +367 -123
- package/out/server/translator.js.map +1 -1
- package/out/service/creator/add.configs.d.ts +1 -0
- package/out/service/creator/add.configs.js +68 -0
- package/out/service/creator/add.configs.js.map +1 -0
- package/out/service/creator/errHandles.d.ts +18 -0
- package/out/service/creator/errHandles.js +60 -0
- package/out/service/creator/errHandles.js.map +1 -0
- package/out/service/creator/index.d.ts +1 -0
- package/out/service/creator/index.js +72 -0
- package/out/service/creator/index.js.map +1 -0
- package/out/service/storage/api.d.ts +18 -0
- package/out/service/storage/api.js +17 -0
- package/out/service/storage/api.js.map +1 -0
- package/out/service/storage/init.js +200 -37
- package/out/service/storage/init.js.map +1 -1
- package/out/service/storage/service.d.ts +2 -0
- package/out/service/storage/service.js +10 -0
- package/out/service/storage/service.js.map +1 -0
- package/out/service/storage/storagePoint.d.ts +1 -14
- package/out/service/storage/storagePoint.js +16 -16
- package/out/service/storage/storagePoint.js.map +1 -1
- package/out/templator/genCreateBlock.js +6 -6
- package/out/templator/genCreateBlock.js.map +1 -1
- package/out/templator/genCurdEditMultipleKeyBlock.js +13 -17
- package/out/templator/genCurdEditMultipleKeyBlock.js.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.js +11 -11
- package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
- package/out/templator/genEditTableBlock.js +5 -5
- package/out/templator/genEditTableBlock.js.map +1 -1
- package/out/templator/genEnumSelectBlock.js +2 -2
- package/out/templator/genEnumSelectBlock.js.map +1 -1
- package/out/templator/genGetBlock.js +5 -3
- package/out/templator/genGetBlock.js.map +1 -1
- package/out/templator/genGridViewBlock.d.ts +3 -1
- package/out/templator/genGridViewBlock.js +61 -6
- package/out/templator/genGridViewBlock.js.map +1 -1
- package/out/templator/genQueryComponent.d.ts +2 -0
- package/out/templator/genQueryComponent.js +27 -14
- package/out/templator/genQueryComponent.js.map +1 -1
- package/out/templator/genTableBlock.d.ts +1 -1
- package/out/templator/genTableBlock.js +4 -5
- package/out/templator/genTableBlock.js.map +1 -1
- package/out/templator/genUpdateBlock.js +9 -10
- package/out/templator/genUpdateBlock.js.map +1 -1
- package/out/templator/utils.d.ts +13 -4
- package/out/templator/utils.js +8 -4
- package/out/templator/utils.js.map +1 -1
- package/out/test/fixtures/env.js +0 -1
- package/out/test/fixtures/env.js.map +1 -1
- package/out/test/units/page/Element.spec.js +3 -3
- package/out/test/units/page/Element.spec.js.map +1 -1
- package/out/test/units/temp/temp.spec.js +1 -1
- package/out/test/units/temp/temp.spec.js.map +1 -1
- package/out/utils/index.d.ts +6 -0
- package/out/utils/index.js +20 -1
- package/out/utils/index.js.map +1 -1
- package/package.json +2 -1
- package/src/automate/engine/index.js +116 -39
- package/src/automate/engine/utils.js +49 -19
- package/src/common/BaseNode.ts +215 -71
- package/src/concepts/App__.ts +77 -37
- package/src/concepts/Argument__.ts +23 -3
- package/src/concepts/Assignee__.ts +437 -0
- package/src/concepts/Assignment__.ts +4 -1
- package/src/concepts/BinaryExpression__.ts +9 -7
- package/src/concepts/BindAttribute__.ts +68 -8
- package/src/concepts/BindDirective__.ts +21 -2
- package/src/concepts/BindEvent__.ts +67 -23
- package/src/concepts/BooleanLiteral__.ts +8 -0
- package/src/concepts/CallFunction__.ts +38 -21
- package/src/concepts/CallInterface__.ts +236 -26
- package/src/concepts/CallLogic__.ts +114 -86
- package/src/concepts/CallQueryComponent__.ts +23 -15
- package/src/concepts/Comment__.ts +6 -2
- package/src/concepts/CompletionProperty__.ts +5 -1
- package/src/concepts/ConfigGroup__.ts +2 -2
- package/src/concepts/ConfigProperty__.ts +2 -2
- package/src/concepts/Configuration__.ts +2 -2
- package/src/concepts/Constant__.ts +12 -0
- package/src/concepts/Destination__.ts +101 -17
- package/src/concepts/End__.ts +8 -1
- package/src/concepts/EntityProperty__.ts +58 -5
- package/src/concepts/Entity__.ts +40 -23
- package/src/concepts/Enum__.ts +16 -11
- package/src/concepts/Event__.ts +2 -2
- package/src/concepts/ForEachStatement__.ts +14 -19
- package/src/concepts/Function__.ts +9 -9
- package/src/concepts/Identifier__.ts +83 -32
- package/src/concepts/IfStatement__.ts +4 -4
- package/src/concepts/InterfaceParam__.ts +52 -16
- package/src/concepts/Interface__.ts +128 -14
- package/src/concepts/JSBlock__.ts +4 -0
- package/src/concepts/LogicItem__.ts +16 -1
- package/src/concepts/Logic__.ts +173 -35
- package/src/concepts/MemberExpression__.ts +58 -14
- package/src/concepts/Module__.ts +27 -16
- package/src/concepts/Namespace__.ts +37 -25
- package/src/concepts/NullLiteral__.ts +8 -1
- package/src/concepts/NumericLiteral__.ts +17 -6
- package/src/concepts/Param__.ts +56 -15
- package/src/concepts/ProcessComponent__.ts +4 -4
- package/src/concepts/ProcessElement__.ts +138 -39
- package/src/concepts/ProcessOutcome__.ts +1 -1
- package/src/concepts/Process__.ts +81 -94
- package/src/concepts/QueryAggregateExpression__.ts +1 -1
- package/src/concepts/QueryFromExpression__.ts +2 -2
- package/src/concepts/QueryJoinExpression__.ts +4 -4
- package/src/concepts/QueryLimitExpression__.ts +3 -12
- package/src/concepts/QuerySelectExpression__.ts +2 -2
- package/src/concepts/Return__.ts +62 -15
- package/src/concepts/Role__.ts +5 -4
- package/src/concepts/SqlQueryComponent__.ts +2 -2
- package/src/concepts/StringLiteral__.ts +20 -31
- package/src/concepts/StructureProperty__.ts +50 -18
- package/src/concepts/Structure__.ts +30 -8
- package/src/concepts/SwitchCase__.ts +4 -4
- package/src/concepts/SwitchStatement__.ts +2 -2
- package/src/concepts/TypeAnnotation__.ts +58 -15
- package/src/concepts/UnaryExpression__.ts +10 -8
- package/src/concepts/Unparsed__.ts +1 -1
- package/src/concepts/ValidationRule__.ts +44 -14
- package/src/concepts/Variable__.ts +63 -14
- package/src/concepts/ViewComponent__.ts +10 -10
- package/src/concepts/ViewElement__.ts +285 -162
- package/src/concepts/View__.ts +116 -70
- package/src/concepts/WhileStatement__.ts +4 -4
- package/src/concepts/basics/stdlib/index.ts +4 -2
- package/src/concepts/basics/stdlib/nasl.auth.ts +26 -0
- package/src/concepts/basics/stdlib/nasl.browser.ts +37 -0
- package/src/concepts/basics/stdlib/nasl.configuration.ts +21 -0
- package/src/concepts/basics/stdlib/nasl.ui.ts +20 -1
- package/src/concepts/basics/stdlib/nasl.util.ts +151 -13
- package/src/concepts/basics/stdlib/nasl.validation.ts +45 -11
- package/src/concepts/basics/types/coreTypeList.ts +11 -11
- package/src/concepts/index__.ts +1 -0
- package/src/config.ts +1 -2
- package/src/enums/KEYWORDS.ts +1206 -0
- package/src/{terms → enums}/LEVEL_NAME_MAP.ts +0 -0
- package/src/eventBus.ts +5 -0
- package/src/generator/genBundleFiles.ts +182 -30
- package/src/generator/genMetaData.ts +72 -21
- package/src/index.ts +2 -0
- package/src/manager/diagnostic.ts +1 -1
- package/src/server/createUiTs.ts +45 -7
- package/src/server/entity2LogicNamespace.ts +41 -25
- package/src/server/getExtensionModules.ts +2 -0
- package/src/server/getFunctions.ts +6 -0
- package/src/server/getLogics.ts +66 -19
- package/src/server/getMemberIdentifier.ts +233 -63
- package/src/server/getProcesses.ts +248 -4
- package/src/server/getScope.ts +50 -0
- package/src/server/index.ts +12 -1
- package/src/server/naslServer.ts +685 -387
- package/src/server/process2LogicNamespace.ts +30 -2
- package/src/server/translator.ts +423 -128
- package/src/service/config/index.js +1 -1
- package/src/service/creator/errHandles.js +5 -2
- package/src/service/creator/index.js +0 -6
- package/src/service/storage/api.js +14 -0
- package/src/service/storage/init.ts +198 -45
- package/src/service/storage/service.ts +6 -0
- package/src/service/storage/storagePoint.ts +16 -16
- package/src/templator/genCreateBlock.ts +6 -6
- package/src/templator/genCurdEditMultipleKeyBlock.ts +29 -30
- package/src/templator/genCurdMultipleKeyBlock.ts +11 -11
- package/src/templator/genEditTableBlock.ts +5 -5
- package/src/templator/genEnumSelectBlock.ts +2 -2
- package/src/templator/genGetBlock.ts +6 -8
- package/src/templator/genGridViewBlock.ts +59 -9
- package/src/templator/genQueryComponent.ts +39 -28
- package/src/templator/genTableBlock.ts +5 -9
- package/src/templator/genUpdateBlock.ts +9 -11
- package/src/templator/utils.ts +9 -6
- package/src/test/fixtures/env.ts +0 -2
- package/src/test/units/page/Element.spec.ts +3 -3
- package/src/test/units/temp/temp.spec.ts +1 -1
- package/src/utils/index.ts +19 -0
- package/out/concepts/basics/stdlib/nasl.validate.js +0 -527
- package/out/concepts/basics/stdlib/nasl.validate.js.map +0 -1
- package/out/data/Module.d.ts +0 -34
- package/out/data/Module.js +0 -53
- package/out/data/Module.js.map +0 -1
- package/src/automate/engine/index.d.ts +0 -3
package/src/server/naslServer.ts
CHANGED
|
@@ -36,10 +36,17 @@ import {
|
|
|
36
36
|
CallQueryComponent,
|
|
37
37
|
Role,
|
|
38
38
|
Configuration,
|
|
39
|
+
CallInterface,
|
|
40
|
+
Return,
|
|
41
|
+
ProcessElement,
|
|
42
|
+
NullLiteral,
|
|
43
|
+
Namespace,
|
|
44
|
+
Theme,
|
|
45
|
+
Variable,
|
|
39
46
|
} from '../concepts';
|
|
40
47
|
import { lsp2tspNumber, SourceMap, SourceMapItem, embeddedTSEmitter } from '../translator';
|
|
41
48
|
import axios from '../service/storage';
|
|
42
|
-
import {
|
|
49
|
+
import { translateDiagnosticMessage, naslNodeTranslateMessage, MinRange } from './translator';
|
|
43
50
|
import { EventPayload, invokeCommand, registerCommand } from '../common';
|
|
44
51
|
import { DiagnosticRecord, Diagnostic, default as diagnosticManager } from '../manager/diagnostic';
|
|
45
52
|
import formatUiTs from './createUiTs';
|
|
@@ -48,6 +55,8 @@ import { primitiveTypeList } from '../concepts/basics/types/coreTypeList';
|
|
|
48
55
|
const EmbeddedTSFileLineMap: { [name: string]: number } = {
|
|
49
56
|
Entity: 3,
|
|
50
57
|
};
|
|
58
|
+
// 要Check的文件
|
|
59
|
+
const filesToCheck: Set<string> = new Set();
|
|
51
60
|
|
|
52
61
|
interface FileNode extends BaseNode {
|
|
53
62
|
getEmbeddedFilePath(name?: string): string;
|
|
@@ -58,14 +67,11 @@ interface FileNode extends BaseNode {
|
|
|
58
67
|
};
|
|
59
68
|
}
|
|
60
69
|
|
|
61
|
-
interface
|
|
70
|
+
interface SetNameNode extends BaseNode {
|
|
62
71
|
setName(name: string): any;
|
|
63
72
|
[propname: string]: any;
|
|
64
73
|
}
|
|
65
|
-
|
|
66
|
-
[propName: string]: QuoteNode[];
|
|
67
|
-
}
|
|
68
|
-
export { transformType, translateDiagnosticMessage };
|
|
74
|
+
|
|
69
75
|
const worker = new Worker('/ts-worker.js');
|
|
70
76
|
const messager = new Messager({
|
|
71
77
|
protocol: 'ts-worker',
|
|
@@ -80,29 +86,17 @@ const messager = new Messager({
|
|
|
80
86
|
},
|
|
81
87
|
});
|
|
82
88
|
|
|
83
|
-
interface MinRange {
|
|
84
|
-
node: BaseNode;
|
|
85
|
-
item: SourceMapItem;
|
|
86
|
-
}
|
|
87
89
|
interface reNameMinRange extends MinRange {
|
|
88
90
|
newValue?: any;
|
|
89
91
|
setTypeMethods?: string;
|
|
90
92
|
}
|
|
91
93
|
// 查找引用节点
|
|
92
94
|
interface QuoteNode {
|
|
93
|
-
|
|
95
|
+
icon: any;
|
|
94
96
|
node: BaseNode;
|
|
97
|
+
expanded: boolean;
|
|
95
98
|
children?: QuoteNode[];
|
|
96
99
|
}
|
|
97
|
-
// 组装后的resMap, 一个页面节点下可能有多个queue
|
|
98
|
-
interface ResMap {
|
|
99
|
-
[propName: string]: {
|
|
100
|
-
queue: QuoteNode[][];
|
|
101
|
-
name: string;
|
|
102
|
-
concept: string;
|
|
103
|
-
node: BaseNode;
|
|
104
|
-
};
|
|
105
|
-
}
|
|
106
100
|
const naslServer = {
|
|
107
101
|
messager,
|
|
108
102
|
worker,
|
|
@@ -117,85 +111,125 @@ const naslServer = {
|
|
|
117
111
|
return this.messager.requestCommand('start');
|
|
118
112
|
},
|
|
119
113
|
async createUiTs(allComponent: any) {
|
|
120
|
-
const { code, elementsLogic } = await formatUiTs(allComponent);
|
|
114
|
+
const { code, elementsLogic, naslStdlibMap } = await formatUiTs(allComponent);
|
|
121
115
|
// 放入生產的uits文件
|
|
122
116
|
await naslServer.addFile({
|
|
123
117
|
file: 'nasl.ui.definition.ts',
|
|
124
118
|
fileContent: code,
|
|
125
119
|
});
|
|
120
|
+
Object.keys(naslStdlibMap).forEach(async (libFileName: string) => {
|
|
121
|
+
await naslServer.addFile({
|
|
122
|
+
file: '/' + libFileName,
|
|
123
|
+
fileContent: naslStdlibMap[libFileName],
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
126
|
naslServer.elementsLogic = elementsLogic;
|
|
127
127
|
// 全部文件加载完毕开始初始化
|
|
128
128
|
await naslServer.getDiagnosticRecordsAndPushAll();
|
|
129
129
|
},
|
|
130
130
|
contentToFile(module: Module | App, results: Array<ReturnType<Structure['toEmbeddedTSFile']>>) {
|
|
131
131
|
module.structures.forEach((structure) => {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
132
|
+
try {
|
|
133
|
+
const result = structure.toEmbeddedTSFile();
|
|
134
|
+
results.push(result);
|
|
135
|
+
// sourceMap都存在目录级别内容下,在页面层级下去找
|
|
136
|
+
structure.sourceMap = result.sourceMap;
|
|
137
|
+
this.file2NodeMap.set(result.filePath, structure);
|
|
138
|
+
} catch (err) {
|
|
139
|
+
console.log(err);
|
|
140
|
+
}
|
|
137
141
|
});
|
|
138
142
|
module.entities.forEach((entity) => {
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
143
|
+
try {
|
|
144
|
+
const result = entity.toEmbeddedTSFile();
|
|
145
|
+
results.push(result);
|
|
146
|
+
// sourceMap都存在目录级别内容下,在页面层级下去找
|
|
147
|
+
entity.sourceMap = result.sourceMap;
|
|
148
|
+
this.file2NodeMap.set(result.filePath, entity);
|
|
149
|
+
} catch (err) {
|
|
150
|
+
console.log(err);
|
|
151
|
+
}
|
|
144
152
|
});
|
|
145
153
|
module.interfaces.forEach((_interface) => {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
154
|
+
try {
|
|
155
|
+
const result = _interface.toEmbeddedTSFile();
|
|
156
|
+
results.push(result);
|
|
157
|
+
// sourceMap都存在目录级别内容下,在页面层级下去找
|
|
158
|
+
_interface.sourceMap = result.sourceMap;
|
|
159
|
+
this.file2NodeMap.set(result.filePath, _interface);
|
|
160
|
+
} catch (err) {
|
|
161
|
+
console.log(err);
|
|
162
|
+
}
|
|
151
163
|
});
|
|
152
164
|
module.enums.forEach((_enum) => {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
165
|
+
try {
|
|
166
|
+
const result = _enum.toEmbeddedTSFile();
|
|
167
|
+
results.push(result);
|
|
168
|
+
// sourceMap都存在目录级别内容下,在页面层级下去找
|
|
169
|
+
_enum.sourceMap = result.sourceMap;
|
|
170
|
+
this.file2NodeMap.set(result.filePath, _enum);
|
|
171
|
+
} catch (err) {
|
|
172
|
+
console.log(err);
|
|
173
|
+
}
|
|
158
174
|
});
|
|
159
175
|
module.logics.forEach((logic) => {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
176
|
+
try {
|
|
177
|
+
if (!(logic instanceof Logic))
|
|
178
|
+
return;
|
|
179
|
+
const result = logic.toEmbeddedTSFile();
|
|
180
|
+
results.push(result);
|
|
181
|
+
logic.sourceMap = result.sourceMap;
|
|
182
|
+
this.file2NodeMap.set(result.filePath, logic);
|
|
183
|
+
} catch (err) {
|
|
184
|
+
console.log(err);
|
|
185
|
+
}
|
|
166
186
|
});
|
|
167
187
|
|
|
168
188
|
// view的生成
|
|
169
189
|
naslServer.view2TSFile(module.views, results);
|
|
170
190
|
|
|
171
191
|
module.processes.forEach((process) => {
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
192
|
+
try {
|
|
193
|
+
const result = process.toEmbeddedTSFile();
|
|
194
|
+
results.push(result);
|
|
195
|
+
process.sourceMap = result.sourceMap;
|
|
196
|
+
this.file2NodeMap.set(result.filePath, process);
|
|
197
|
+
} catch (err) {
|
|
198
|
+
console.log(err);
|
|
199
|
+
}
|
|
176
200
|
});
|
|
177
201
|
|
|
178
202
|
if (module instanceof App) {
|
|
179
203
|
module.roles.forEach((role) => {
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
204
|
+
try {
|
|
205
|
+
const result = role.toEmbeddedTSFile();
|
|
206
|
+
results.push(result);
|
|
207
|
+
// sourceMap都存在目录级别内容下,在页面层级下去找
|
|
208
|
+
role.sourceMap = result.sourceMap;
|
|
209
|
+
this.file2NodeMap.set(result.filePath, role);
|
|
210
|
+
} catch (err) {
|
|
211
|
+
console.log(err);
|
|
212
|
+
}
|
|
185
213
|
});
|
|
186
214
|
}
|
|
187
215
|
},
|
|
188
216
|
view2TSFile(viewsChildren: View[], results: Array<ReturnType<Structure['toEmbeddedTSFile']>>) {
|
|
189
|
-
//
|
|
190
|
-
viewsChildren.
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
217
|
+
// 如果有子页面
|
|
218
|
+
if (viewsChildren && viewsChildren.length) {
|
|
219
|
+
viewsChildren.forEach((view) => {
|
|
220
|
+
try {
|
|
221
|
+
const result = view.toEmbeddedTSFile();
|
|
222
|
+
results.push(result);
|
|
223
|
+
view.sourceMap = result.sourceMap;
|
|
224
|
+
this.file2NodeMap.set(result.filePath, view);
|
|
225
|
+
if (view.children.length) {
|
|
226
|
+
naslServer.view2TSFile(view.children, results);
|
|
227
|
+
}
|
|
228
|
+
} catch (err) {
|
|
229
|
+
console.log(err);
|
|
230
|
+
}
|
|
231
|
+
});
|
|
232
|
+
}
|
|
199
233
|
},
|
|
200
234
|
async openApp(app: App) {
|
|
201
235
|
const results: Array<ReturnType<Structure['toEmbeddedTSFile']>> = [];
|
|
@@ -225,19 +259,16 @@ const naslServer = {
|
|
|
225
259
|
callback();
|
|
226
260
|
});
|
|
227
261
|
},
|
|
228
|
-
async
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
}));
|
|
239
|
-
await this.writeFiles(files);
|
|
240
|
-
this._debugInFileStorage(module.parentNode as App, files);
|
|
262
|
+
async refreshApp(app: App) {
|
|
263
|
+
// 清除所有问题
|
|
264
|
+
diagnosticManager.clear();
|
|
265
|
+
await naslServer.deleteDirectoryFiles({ directoryName: '/embedded' });
|
|
266
|
+
// 清楚check count的数量
|
|
267
|
+
await this.messager.requestCommand('_clearTimeout');
|
|
268
|
+
// 重新加载app下内容
|
|
269
|
+
await naslServer.openApp(app);
|
|
270
|
+
// 重新check一遍所有内容
|
|
271
|
+
await naslServer.getDiagnosticRecordsAndPushAll();
|
|
241
272
|
},
|
|
242
273
|
/**
|
|
243
274
|
* 初始化之前添加文件
|
|
@@ -252,14 +283,7 @@ const naslServer = {
|
|
|
252
283
|
writeFiles(files: Array<tsProtocol.OpenRequestArgs>) {
|
|
253
284
|
return this.messager.requestCommand('writeFiles', files);
|
|
254
285
|
},
|
|
255
|
-
|
|
256
|
-
* 新增或修改文件
|
|
257
|
-
* @param {*} files
|
|
258
|
-
* @returns
|
|
259
|
-
*/
|
|
260
|
-
outputFiles(files: Array<tsProtocol.OpenRequestArgs>) {
|
|
261
|
-
return this.messager.requestCommand('outputFiles', files);
|
|
262
|
-
},
|
|
286
|
+
|
|
263
287
|
/**
|
|
264
288
|
* 新增、修改
|
|
265
289
|
* 删除文件 文件用修改内容为空模拟,防止报错
|
|
@@ -268,15 +292,26 @@ const naslServer = {
|
|
|
268
292
|
updateFiles(args: { outputFiles: Array<tsProtocol.OpenRequestArgs> }) {
|
|
269
293
|
return this.messager.requestCommand('updateFiles', args);
|
|
270
294
|
},
|
|
295
|
+
|
|
296
|
+
/**
|
|
297
|
+
* 清除一个目录下的所有文件
|
|
298
|
+
*/
|
|
299
|
+
deleteDirectoryFiles(args: { directoryName: string }) {
|
|
300
|
+
return this.messager.requestCommand('deleteDirectoryFiles', args);
|
|
301
|
+
},
|
|
271
302
|
_debugInFileStorage(node: BaseNode, openFiles: Array<tsProtocol.OpenRequestArgs>) {
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
303
|
+
/// #if process.env.NODE_ENV === 'development'
|
|
304
|
+
let app = node;
|
|
305
|
+
if (node.concept !== 'App') {
|
|
306
|
+
app = (node as any).rootNode || (node as any).app;
|
|
307
|
+
}
|
|
308
|
+
return Promise.all(openFiles.map(async (file) => {
|
|
309
|
+
const res = await axios.post('/api/App/debugEmbedded?id=' + app.id, file);
|
|
310
|
+
return res.data;
|
|
311
|
+
})).catch((e) => {
|
|
312
|
+
console.error(e);
|
|
313
|
+
});
|
|
314
|
+
/// #endif
|
|
280
315
|
},
|
|
281
316
|
open() {
|
|
282
317
|
return this.messager.requestCommand('open');
|
|
@@ -317,7 +352,9 @@ const naslServer = {
|
|
|
317
352
|
const types = reg.exec(displayString);
|
|
318
353
|
// 取出提示的类型,组成是数组
|
|
319
354
|
const typeList: string[] = types[1].split(' | ').map((item: string) => {
|
|
320
|
-
if (
|
|
355
|
+
if (/\<([^()]+)\>/g.exec(item)) {
|
|
356
|
+
return item;
|
|
357
|
+
} else if (item.includes(' ')) {
|
|
321
358
|
const strs = item.split(' ');
|
|
322
359
|
const type = strs[strs.length - 1];
|
|
323
360
|
return type;
|
|
@@ -332,8 +369,7 @@ const naslServer = {
|
|
|
332
369
|
return typeList;
|
|
333
370
|
},
|
|
334
371
|
async getTypeQuickinfo(node: BaseNode) {
|
|
335
|
-
|
|
336
|
-
if (node instanceof Identifier) {
|
|
372
|
+
if (node && node instanceof BaseNode) {
|
|
337
373
|
const callFunction = node.parentNode.parentNode;
|
|
338
374
|
/**
|
|
339
375
|
* currentSource callFunction 的节点,要去到当前节点的位置
|
|
@@ -354,22 +390,45 @@ const naslServer = {
|
|
|
354
390
|
const typeAnnotation = primitiveTypeList.find((typeAnnotation) => typeAnnotation.typeName === type);
|
|
355
391
|
if (typeAnnotation) {
|
|
356
392
|
res.push(typeAnnotation);
|
|
357
|
-
} else if (type === 'unknown') {
|
|
393
|
+
} else if (type === 'unknown' || type === 'never') {
|
|
358
394
|
return null;
|
|
359
395
|
}
|
|
360
396
|
});
|
|
361
397
|
if (!res.length) {
|
|
362
|
-
|
|
398
|
+
return [];
|
|
399
|
+
} else {
|
|
400
|
+
return [{ title: '基础类型', children: res }];
|
|
363
401
|
}
|
|
364
|
-
// 调整结构
|
|
365
|
-
const dataTypeList: Array<{
|
|
366
|
-
title: string;
|
|
367
|
-
children: Array<TypeAnnotation>;
|
|
368
|
-
}> = [{ title: '基础类型', children: res }];
|
|
369
|
-
return dataTypeList;
|
|
370
402
|
}
|
|
403
|
+
} else {
|
|
404
|
+
// 字符串 和 inter
|
|
405
|
+
return [{ title: '基础类型', children: [primitiveTypeList[4]] }];
|
|
371
406
|
}
|
|
372
407
|
},
|
|
408
|
+
async getDataSchemaType(node: BaseNode) {
|
|
409
|
+
if (!(node instanceof ViewElement))
|
|
410
|
+
return;
|
|
411
|
+
const { currentSource, fileNode } = naslServer.getCurrentSource(node);
|
|
412
|
+
const quickInfo = await naslServer._getTypeQuickinfo({
|
|
413
|
+
file: (fileNode as FileNode).getEmbeddedFilePath(),
|
|
414
|
+
line: lsp2tspNumber(currentSource.range.start.line),
|
|
415
|
+
offset: lsp2tspNumber(currentSource.range.start.character) + `__elements.`.length,
|
|
416
|
+
});
|
|
417
|
+
if (quickInfo.responseRequired) {
|
|
418
|
+
const displayString = quickInfo?.response?.displayString || '';
|
|
419
|
+
const flag = displayString.includes('<') && displayString.includes('>');
|
|
420
|
+
if (flag) {
|
|
421
|
+
let str = '';
|
|
422
|
+
const types = naslServer.getDisplayString2Type(displayString);
|
|
423
|
+
if (Array.isArray(types) && types.length) {
|
|
424
|
+
const type = types[0];
|
|
425
|
+
str = type === 'any' || type === 'unknown' || type === 'never' ? '' : type;
|
|
426
|
+
}
|
|
427
|
+
return str;
|
|
428
|
+
}
|
|
429
|
+
}
|
|
430
|
+
return '';
|
|
431
|
+
},
|
|
373
432
|
_getTypeQuickinfo(args: any) {
|
|
374
433
|
return this.messager.requestCommand('quickInfo', args) as unknown as { responseRequired: boolean; response: tsProtocol.QuickInfoResponseBody };
|
|
375
434
|
},
|
|
@@ -416,7 +475,7 @@ const naslServer = {
|
|
|
416
475
|
|
|
417
476
|
// 语义诊断
|
|
418
477
|
record.semanticDiagnostics = record.semanticDiagnostics
|
|
419
|
-
.map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, node
|
|
478
|
+
.map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, node as FileNode))
|
|
420
479
|
.filter((diag) => !!diag);
|
|
421
480
|
|
|
422
481
|
// 建议诊断
|
|
@@ -440,8 +499,8 @@ const naslServer = {
|
|
|
440
499
|
});
|
|
441
500
|
return records;
|
|
442
501
|
},
|
|
443
|
-
_resolveDiagnostic(diagnostic: tsProtocol.DiagnosticWithFileName,
|
|
444
|
-
const minRange = this._findMinRange(diagnostic,
|
|
502
|
+
_resolveDiagnostic(diagnostic: tsProtocol.DiagnosticWithFileName, fileNode: FileNode): Diagnostic {
|
|
503
|
+
const minRange = this._findMinRange(diagnostic, fileNode);
|
|
445
504
|
const tsErrorDetail = {
|
|
446
505
|
severity: diagnostic.category === 'error' ? 'error' : 'warning',
|
|
447
506
|
message: translateDiagnosticMessage(diagnostic.text),
|
|
@@ -450,9 +509,8 @@ const naslServer = {
|
|
|
450
509
|
};
|
|
451
510
|
|
|
452
511
|
if (minRange) {
|
|
453
|
-
// let message = this.translateDiagnosticMessage(diagnostic.text);
|
|
454
512
|
// 节点的error要置为true
|
|
455
|
-
return
|
|
513
|
+
return naslNodeTranslateMessage(minRange, tsErrorDetail);
|
|
456
514
|
} else {
|
|
457
515
|
// 没找到节点, 先把问题暴露出来
|
|
458
516
|
return {
|
|
@@ -461,45 +519,10 @@ const naslServer = {
|
|
|
461
519
|
};
|
|
462
520
|
}
|
|
463
521
|
},
|
|
464
|
-
|
|
465
|
-
* 处理一些边界情况
|
|
466
|
-
* @param minRange
|
|
467
|
-
* @param tsErrorDetail 报错具体信息
|
|
468
|
-
* @returns
|
|
469
|
-
*/
|
|
470
|
-
_diagnosticSpecialTreatment(minRange: MinRange, tsErrorDetail: Diagnostic) {
|
|
471
|
-
const text = tsErrorDetail.originalDiagnostic.text;
|
|
472
|
-
// 有一些节点报错信息不向外暴露,缺失一些原生标签等等的展示
|
|
473
|
-
if (minRange.node instanceof View || minRange.node instanceof ViewElement) {
|
|
474
|
-
if (text.startsWith(`'nasl.ui' has no exported member named `)) {
|
|
475
|
-
return null;
|
|
476
|
-
} else if (text.startsWith(`Property '`) && text.includes(`does not exist on type 'typeof ui'.`)) {
|
|
477
|
-
return null;
|
|
478
|
-
} else if (text.startsWith(`Namespace 'nasl.ui' has no exported member `)) {
|
|
479
|
-
return null;
|
|
480
|
-
}
|
|
481
|
-
}
|
|
482
|
-
if (/Expected (.+?) arguments, but got (.+?)./.exec(text)) {
|
|
483
|
-
// bindevent本身现在就不传参数
|
|
484
|
-
if (minRange.node instanceof BindEvent) {
|
|
485
|
-
return null;
|
|
486
|
-
}
|
|
487
|
-
// 因为缺少参数时候有可能有特殊情况,因为原本少的多了就会找到 callLogic上,
|
|
488
|
-
// 但是只少一个的时候就会找到准确的Argument上 需要特殊处理, ui层就可以统一处理
|
|
489
|
-
if (minRange.node instanceof Argument) {
|
|
490
|
-
minRange.node = minRange.node.parentNode;
|
|
491
|
-
}
|
|
492
|
-
}
|
|
493
|
-
|
|
494
|
-
minRange.node.tsErrorDetail = tsErrorDetail;
|
|
495
|
-
return {
|
|
496
|
-
id: minRange.node.id,
|
|
497
|
-
node: minRange.node,
|
|
498
|
-
...tsErrorDetail,
|
|
499
|
-
};
|
|
500
|
-
},
|
|
501
|
-
_findMinRange(diagnostic: tsProtocol.DiagnosticWithFileName | tsProtocol.ReferencesResponseItem, sourceMap: SourceMap) {
|
|
522
|
+
_findMinRange(diagnostic: tsProtocol.DiagnosticWithFileName | tsProtocol.ReferencesResponseItem, fileNode: FileNode) {
|
|
502
523
|
let minRange: MinRange;
|
|
524
|
+
const sourceMap: SourceMap = fileNode.sourceMap;
|
|
525
|
+
|
|
503
526
|
for (const [node, item] of sourceMap.entries()) {
|
|
504
527
|
/**
|
|
505
528
|
* 当前内容的开始行 <= 诊断开始的行 &&
|
|
@@ -528,51 +551,18 @@ const naslServer = {
|
|
|
528
551
|
}
|
|
529
552
|
}
|
|
530
553
|
if (!minRange) {
|
|
554
|
+
if (fileNode instanceof View) {
|
|
555
|
+
return { node: fileNode, item: sourceMap.get(fileNode) };
|
|
556
|
+
}
|
|
531
557
|
console.log(diagnostic, 'diagnostic');
|
|
532
558
|
console.log(sourceMap, 'sourceMap');
|
|
533
559
|
console.log(minRange, '需要特殊看下,为什么没找到内容-------------');
|
|
534
560
|
}
|
|
535
561
|
return minRange;
|
|
536
562
|
},
|
|
537
|
-
|
|
538
|
-
async findReferences(node: BaseNode) {
|
|
539
|
-
console.log(node);
|
|
540
|
-
const refsList = await naslServer._isHaveRef(node, true);
|
|
541
|
-
console.log(refsList, 'refsList');
|
|
542
|
-
// refsList = refsList.filter((item) =>
|
|
543
|
-
// // 不是创建者
|
|
544
|
-
// item.isDefinition !== true);
|
|
545
|
-
let result = {};
|
|
546
|
-
const resMap = {};
|
|
547
|
-
try {
|
|
548
|
-
refsList.forEach((record) => {
|
|
549
|
-
const fileNode = this.file2NodeMap.get(record.file);
|
|
550
|
-
if (!fileNode)
|
|
551
|
-
return;
|
|
552
|
-
const minRange = this._findMinRange(record, fileNode.sourceMap);
|
|
553
|
-
// 过滤一把不需要改的信息
|
|
554
|
-
if (minRange) {
|
|
555
|
-
// 如果查找引用查到自己里面的引用不展示
|
|
556
|
-
// 因为view生成的特殊性
|
|
557
|
-
if (minRange.node === node || (minRange.node instanceof View && node instanceof View)) {
|
|
558
|
-
return;
|
|
559
|
-
}
|
|
560
|
-
// 拼装树
|
|
561
|
-
naslServer._getTreeMap(minRange, fileNode, resMap);
|
|
562
|
-
}
|
|
563
|
-
});
|
|
564
|
-
console.log(resMap, 'resMap');
|
|
565
|
-
result = naslServer.handleTreeMap(resMap);
|
|
566
|
-
} catch (err) {
|
|
567
|
-
console.log(err);
|
|
568
|
-
}
|
|
569
|
-
console.log(result);
|
|
570
|
-
return result;
|
|
571
|
-
},
|
|
572
|
-
async _isHaveRef(node: BaseNode, isFind: boolean = false) {
|
|
563
|
+
async _isHaveRef(node: BaseNode) {
|
|
573
564
|
const { currentSource, fileNode } = naslServer.getCurrentSource(node);
|
|
574
565
|
let refsList: tsProtocol.ReferencesResponseItem[] = [];
|
|
575
|
-
|
|
576
566
|
/**
|
|
577
567
|
* 未完成创建的节点 ,或者异常情况 可能找不到节点
|
|
578
568
|
*/
|
|
@@ -583,15 +573,36 @@ const naslServer = {
|
|
|
583
573
|
offset: lsp2tspNumber(currentSource.range.start.character),
|
|
584
574
|
});
|
|
585
575
|
refsList = [...newRefs.refs];
|
|
576
|
+
} else {
|
|
577
|
+
if (node instanceof Module) {
|
|
578
|
+
const lists = node.logics || node.structures || node.enums;
|
|
579
|
+
const moduleName = (fileNode as FileNode).getEmbeddedFilePath();
|
|
580
|
+
if (lists.length) {
|
|
581
|
+
const item = lists[0];
|
|
582
|
+
const { fileNode } = naslServer.getCurrentSource(item);
|
|
583
|
+
const newRefs = await naslServer.references({
|
|
584
|
+
file: (fileNode as FileNode).getEmbeddedFilePath(),
|
|
585
|
+
line: 1,
|
|
586
|
+
offset: 22, //固定的位置,module的位置信息
|
|
587
|
+
});
|
|
588
|
+
refsList = newRefs.refs.filter((item) => !item.file.startsWith(moduleName));
|
|
589
|
+
// 多塞一个 ,删除的时候就有值了, 上面过滤了之后可能是空的
|
|
590
|
+
refsList.unshift(newRefs.refs[0]);
|
|
591
|
+
}
|
|
592
|
+
}
|
|
586
593
|
}
|
|
587
594
|
|
|
588
595
|
// 如果是entity就需要在单独,查一边来修改名字
|
|
589
596
|
if (node instanceof Entity) {
|
|
590
597
|
// 过滤一把不需要改的信息
|
|
591
|
-
refsList = refsList.filter((item) =>
|
|
598
|
+
refsList = refsList.filter((item) => (fileNode as FileNode).getEmbeddedFilePath() !== item.file || item.isDefinition === true);
|
|
592
599
|
// 不再当前文件里
|
|
593
600
|
// 或者在当前列表但是位置小于entity的结束位置
|
|
594
|
-
|
|
601
|
+
}
|
|
602
|
+
|
|
603
|
+
if (node instanceof Return) {
|
|
604
|
+
// 过滤一下最后出去的值
|
|
605
|
+
refsList = refsList.filter((item) => !item.lineText.includes('return '));
|
|
595
606
|
}
|
|
596
607
|
|
|
597
608
|
// 如果是参数, 就需要把logic的引用 都查找出来就需要把他的父级的引用全部查找出来
|
|
@@ -606,8 +617,8 @@ const naslServer = {
|
|
|
606
617
|
refsList = [...refsList, ...parentRefs.refs];
|
|
607
618
|
}
|
|
608
619
|
|
|
609
|
-
//
|
|
610
|
-
if (node instanceof Param && node.parentNode instanceof View
|
|
620
|
+
// 如果是参数修改, 就需要把logic的引用 都查找出来就需要把他的父级的引用全部查找出来d
|
|
621
|
+
if (node instanceof Param && node.parentNode instanceof View) {
|
|
611
622
|
const viewNode = node.parentNode;
|
|
612
623
|
const { currentSource } = naslServer.getCurrentSource(viewNode);
|
|
613
624
|
const code = currentSource.code;
|
|
@@ -622,46 +633,54 @@ const naslServer = {
|
|
|
622
633
|
refsList = [...refsList, ...filterViewRefs];
|
|
623
634
|
}
|
|
624
635
|
/**
|
|
636
|
+
* 暂时不要了, 因为生成的结构发生了变化
|
|
625
637
|
* view 因为不是嵌套的,所以不能用最前面的变量查找,所以要单独处理一下
|
|
626
638
|
* 找到第一个 { 之前的变量 进行修改
|
|
627
639
|
* 如果是VIew的查找,比较特殊,他查的是当前抛出的 {} 大括号前的
|
|
628
640
|
* 最后一个,因为生成的规则不一样
|
|
629
641
|
*/
|
|
630
|
-
if (node instanceof View) {
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
}
|
|
642
|
+
// if (node instanceof View) {
|
|
643
|
+
// const code = currentSource.code;
|
|
644
|
+
// const viewIndex = code.indexOf(' {');
|
|
645
|
+
// const viewRefs = await naslServer.references({
|
|
646
|
+
// file: (fileNode as FileNode).getEmbeddedFilePath(),
|
|
647
|
+
// line: lsp2tspNumber(currentSource.range.start.line),
|
|
648
|
+
// offset: lsp2tspNumber(currentSource.range.start.character + viewIndex),
|
|
649
|
+
// });
|
|
650
|
+
// refsList = [...viewRefs.refs];
|
|
651
|
+
// }
|
|
640
652
|
/**
|
|
641
653
|
* elements 需要查的是__elements.后面的那个内容,过滤两个为了生成内容的节点
|
|
642
654
|
*/
|
|
643
655
|
if (node instanceof ViewElement) {
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
656
|
+
if (currentSource) {
|
|
657
|
+
const code = currentSource.code;
|
|
658
|
+
const prefix = '__elements.';
|
|
659
|
+
const prefixIndex = code.indexOf(prefix) !== -1 ? code.indexOf(prefix) : 0;
|
|
660
|
+
const methodsNameIndex = prefixIndex + prefix.length;
|
|
661
|
+
const methods = await naslServer.references({
|
|
662
|
+
file: (fileNode as FileNode).getEmbeddedFilePath(),
|
|
663
|
+
line: lsp2tspNumber(currentSource.range.start.line),
|
|
664
|
+
offset: lsp2tspNumber(currentSource.range.start.character + methodsNameIndex),
|
|
665
|
+
});
|
|
666
|
+
const methodRefs: tsProtocol.ReferencesResponseItem[] = [];
|
|
667
|
+
methods.refs.forEach((item) => {
|
|
668
|
+
// 定义里的格式,在删除的时候留下来占位
|
|
669
|
+
// 重命名的时候会过滤
|
|
653
670
|
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
return false;
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
671
|
+
// 这里只过滤 __elements.button = new nasl.ui.Button<any>这种格式
|
|
672
|
+
// if (item.lineText.includes('__elements.') && item.lineText.includes('new nasl.ui.'))
|
|
673
|
+
// return false;
|
|
674
|
+
// 处理声明组件名可能重复的问题, 查找引用不提示
|
|
675
|
+
const find = methodRefs.find((findItem) => item.lineText === findItem.lineText && item.lineText.includes(': nasl.ui.'));
|
|
676
|
+
if (!find) {
|
|
677
|
+
methodRefs.push(item);
|
|
678
|
+
}
|
|
679
|
+
});
|
|
680
|
+
refsList = [...methodRefs];
|
|
681
|
+
}
|
|
664
682
|
}
|
|
683
|
+
console.log(refsList, 'refsList');
|
|
665
684
|
return refsList;
|
|
666
685
|
},
|
|
667
686
|
/**
|
|
@@ -679,13 +698,17 @@ const naslServer = {
|
|
|
679
698
|
const fileNode = this.file2NodeMap.get(record.file);
|
|
680
699
|
if (!fileNode)
|
|
681
700
|
return null;
|
|
682
|
-
const minRange: reNameMinRange = this._findMinRange(record, fileNode
|
|
701
|
+
const minRange: reNameMinRange = this._findMinRange(record, fileNode as FileNode);
|
|
683
702
|
if (minRange) {
|
|
684
703
|
// 如果节点是TypeAnnotation类型,
|
|
685
704
|
// 很复杂,可能是多级嵌套结构
|
|
686
705
|
// 不一定只修改typeName
|
|
687
706
|
if (minRange.node instanceof TypeAnnotation) {
|
|
688
707
|
// console.log(record);
|
|
708
|
+
// 如果是fake的逻辑,内部的重命名都不需要修改
|
|
709
|
+
// if ((minRange.node?.parentNode as any).logic && (minRange.node?.parentNode as any).logic?.fake) {
|
|
710
|
+
// return null;
|
|
711
|
+
// }
|
|
689
712
|
minRange.setTypeMethods = 'setTypeName';
|
|
690
713
|
}
|
|
691
714
|
// 如果节点是logic修改引发calllogic修改
|
|
@@ -693,11 +716,11 @@ const naslServer = {
|
|
|
693
716
|
minRange.setTypeMethods = 'setCalleeName';
|
|
694
717
|
}
|
|
695
718
|
if (minRange.node instanceof CallLogic && node instanceof ViewElement) {
|
|
696
|
-
minRange.setTypeMethods = '
|
|
719
|
+
minRange.setTypeMethods = 'setCalleeNamespace';
|
|
697
720
|
minRange.newValue = 'elements.' + newValue + '.logics';
|
|
698
721
|
}
|
|
699
722
|
// 如果节点是实体修改引发calllogic修改
|
|
700
|
-
if (minRange.node instanceof CallLogic && (node instanceof Entity || node instanceof View)) {
|
|
723
|
+
if (minRange.node instanceof CallLogic && (node instanceof Entity || node instanceof View || node instanceof Process || node instanceof ProcessElement)) {
|
|
701
724
|
// 匹配到的内容,当前这一行的内容;
|
|
702
725
|
// 因为要用下面的点位信息
|
|
703
726
|
/**
|
|
@@ -719,26 +742,29 @@ const naslServer = {
|
|
|
719
742
|
const end = record.end.offset - index - 1;
|
|
720
743
|
// 新的完整的value
|
|
721
744
|
let newTsNameSpace = tsCalleeNamespace.substring(0, start) + newValue + tsCalleeNamespace.substring(end, tsCalleeNamespace.length);
|
|
722
|
-
newTsNameSpace = newTsNameSpace.replace(
|
|
745
|
+
newTsNameSpace = newTsNameSpace.replace(/.\$/g, '.');
|
|
723
746
|
minRange.setTypeMethods = 'setCalleeNamespace';
|
|
724
747
|
minRange.newValue = newTsNameSpace;
|
|
725
748
|
}
|
|
726
749
|
// 如果参数修改影响了 callLogic
|
|
727
750
|
if (minRange.node instanceof CallLogic && node instanceof Param) {
|
|
751
|
+
return null;
|
|
728
752
|
// 逻辑第几个位置发生修改,对应的calllogic对应位置的内容要进行修改
|
|
729
|
-
|
|
730
|
-
const
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
|
|
741
|
-
}
|
|
753
|
+
// minRange.setTypeMethods = 'setArgumentName';
|
|
754
|
+
// const nodeArguments = minRange.node.arguments;
|
|
755
|
+
// minRange.newValue = [...nodeArguments];
|
|
756
|
+
// const LogicNode = node.parentNode;
|
|
757
|
+
// const paramIndex = (LogicNode as Logic).params.findIndex((param) => param === node);
|
|
758
|
+
// console.log(node, nodeArguments);
|
|
759
|
+
// if (paramIndex !== -1) {
|
|
760
|
+
// minRange.setTypeMethods = 'setArgumentName';
|
|
761
|
+
// minRange.newValue = {
|
|
762
|
+
// argument: nodeArguments[paramIndex],
|
|
763
|
+
// newKeyword: newValue,
|
|
764
|
+
// };
|
|
765
|
+
// } else {
|
|
766
|
+
// return null;
|
|
767
|
+
// }
|
|
742
768
|
}
|
|
743
769
|
// 如果节点是Identifier表达式
|
|
744
770
|
if (minRange.node instanceof Identifier) {
|
|
@@ -760,6 +786,11 @@ const naslServer = {
|
|
|
760
786
|
minRange.newValue = newTextValue;
|
|
761
787
|
}
|
|
762
788
|
}
|
|
789
|
+
// 如果是枚举修改,枚举的值刚好在Identifier 中选了 就修改值
|
|
790
|
+
if (minRange.node instanceof Identifier && node instanceof Enum) {
|
|
791
|
+
minRange.newValue = newValue;
|
|
792
|
+
minRange.setTypeMethods = 'setName';
|
|
793
|
+
}
|
|
763
794
|
// 如果修改逻辑,改到了Identifier表达式,只能说明是在属性里有使用了
|
|
764
795
|
if (minRange.node instanceof Identifier && node instanceof Logic) {
|
|
765
796
|
minRange.newValue = newValue;
|
|
@@ -837,7 +868,12 @@ const naslServer = {
|
|
|
837
868
|
// 如果是view也需要加前缀
|
|
838
869
|
// logic 和 views名称修改 可能会触发bindEvent修改
|
|
839
870
|
if (minRange.node instanceof BindEvent) {
|
|
840
|
-
|
|
871
|
+
// 页面逻辑直接赋值就可以, 因为是相对路径
|
|
872
|
+
if ((node instanceof ViewElement)) {
|
|
873
|
+
minRange.setTypeMethods = 'setCalleeNamespace';
|
|
874
|
+
minRange.newValue = 'elements.' + newValue + '.logics';
|
|
875
|
+
} else {
|
|
876
|
+
/**
|
|
841
877
|
* 如果namespce是 'app.views.Student.views.404.views.505.views.update'
|
|
842
878
|
* 在ts中会是'app.views.Student.views.$404.views.$505.views.update'
|
|
843
879
|
* 但是505 要改名为 666 ,要存的是666
|
|
@@ -846,25 +882,45 @@ const naslServer = {
|
|
|
846
882
|
* 2.在匹配到的内容中取转后的namespace的位置
|
|
847
883
|
* 3.然后把namespace中的 $替换成 ''
|
|
848
884
|
*/
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
minRange.setTypeMethods = 'setCalleeName';
|
|
861
|
-
minRange.newValue = newValue;
|
|
862
|
-
} else {
|
|
885
|
+
const tsCalleeNamespace = minRange.node.tsCalleeNamespace;
|
|
886
|
+
const oldValue = tsCalleeNamespace;
|
|
887
|
+
|
|
888
|
+
// 先看下标位置
|
|
889
|
+
const lineText = record.lineText;
|
|
890
|
+
const index = lineText.indexOf(oldValue);
|
|
891
|
+
|
|
892
|
+
// 在把开始结束位置的-开始位置,来知道是哪里要替换
|
|
893
|
+
const start = record.start.offset - index - 1;
|
|
894
|
+
const end = record.end.offset - index - 1;
|
|
895
|
+
|
|
863
896
|
// 新的完整的value
|
|
864
|
-
|
|
865
|
-
|
|
866
|
-
|
|
867
|
-
|
|
897
|
+
if (start > tsCalleeNamespace.length) {
|
|
898
|
+
minRange.setTypeMethods = 'setCalleeName';
|
|
899
|
+
minRange.newValue = newValue;
|
|
900
|
+
} else {
|
|
901
|
+
// 新的完整的value
|
|
902
|
+
let newTsNameSpace = tsCalleeNamespace.substring(0, start) + newValue + tsCalleeNamespace.substring(end, tsCalleeNamespace.length);
|
|
903
|
+
minRange.setTypeMethods = 'setCalleeNamespace';
|
|
904
|
+
newTsNameSpace = newTsNameSpace.replace(/\.\$/g, '.');
|
|
905
|
+
minRange.newValue = newTsNameSpace;
|
|
906
|
+
}
|
|
907
|
+
}
|
|
908
|
+
}
|
|
909
|
+
if (minRange.node instanceof Destination && node instanceof Param) {
|
|
910
|
+
// 因为view是key value 绑定所以需要重新赋值
|
|
911
|
+
if (node.parentNode instanceof View) {
|
|
912
|
+
const nodeArguments = minRange.node.arguments;
|
|
913
|
+
const findArgument = nodeArguments.find((item) => node.name === item.keyword);
|
|
914
|
+
if (findArgument) {
|
|
915
|
+
minRange.setTypeMethods = 'setArgumentsKeyWord';
|
|
916
|
+
minRange.newValue = {
|
|
917
|
+
findArgument,
|
|
918
|
+
newKeyword: newValue,
|
|
919
|
+
};
|
|
920
|
+
}
|
|
921
|
+
} else {
|
|
922
|
+
// 如果是修改param查找到Destination就不操作
|
|
923
|
+
return null;
|
|
868
924
|
}
|
|
869
925
|
}
|
|
870
926
|
if (minRange.node instanceof Interface && node instanceof Logic) {
|
|
@@ -880,13 +936,31 @@ const naslServer = {
|
|
|
880
936
|
const newBindRoles = str.split(',');
|
|
881
937
|
minRange.newValue = newBindRoles;
|
|
882
938
|
}
|
|
939
|
+
if (minRange.node instanceof QueryFieldExpression && node instanceof Entity) {
|
|
940
|
+
minRange.setTypeMethods = 'setEntityAsName';
|
|
941
|
+
}
|
|
942
|
+
|
|
943
|
+
if ((minRange.node instanceof QueryFromExpression || minRange.node instanceof QueryJoinExpression) && node instanceof Entity) {
|
|
944
|
+
minRange.setTypeMethods = 'setEntityName';
|
|
945
|
+
}
|
|
946
|
+
if (minRange.node instanceof QueryFieldExpression && node instanceof EntityProperty) {
|
|
947
|
+
minRange.setTypeMethods = 'setPropertyName';
|
|
948
|
+
}
|
|
949
|
+
|
|
950
|
+
// 如果跳转链接或者页面变量同一个param和TypeAnnotation 有两个过滤掉一个
|
|
951
|
+
if ((minRange.node instanceof Param || minRange.node instanceof Variable || minRange.node instanceof Return) && (node instanceof Entity || node instanceof Enum || node instanceof Structure)) {
|
|
952
|
+
return null;
|
|
953
|
+
}
|
|
954
|
+
if (minRange.node instanceof Destination && (node instanceof Process || node instanceof ProcessElement)) {
|
|
955
|
+
return null;
|
|
956
|
+
}
|
|
883
957
|
// 枚举修改枚举名,比较特殊
|
|
884
958
|
if (minRange.node instanceof EnumItem && node instanceof Enum) {
|
|
885
959
|
// 什么都不做,用来跳过修改
|
|
886
960
|
return null;
|
|
887
961
|
}
|
|
888
|
-
//
|
|
889
|
-
if (minRange.node instanceof
|
|
962
|
+
// params修改 查找bindevent不需要修改
|
|
963
|
+
if (minRange.node instanceof BindEvent && node instanceof Param) {
|
|
890
964
|
return null;
|
|
891
965
|
}
|
|
892
966
|
// 如果是子页面修改
|
|
@@ -894,8 +968,39 @@ const naslServer = {
|
|
|
894
968
|
if (minRange.node instanceof View && node instanceof View && minRange.node !== node) {
|
|
895
969
|
return null;
|
|
896
970
|
}
|
|
971
|
+
/**
|
|
972
|
+
* 屏蔽组件生成内容块中的变量或者逻辑,出现在表格选择中。在bindAttr中还会有,所以过滤一把
|
|
973
|
+
*/
|
|
974
|
+
if ((minRange.node instanceof Identifier || minRange.node instanceof MemberExpression) && node instanceof Param && minRange.node.parentNode instanceof BindAttribute) {
|
|
975
|
+
return null;
|
|
976
|
+
}
|
|
977
|
+
// 修改element引发view改名
|
|
978
|
+
if (node instanceof ViewElement && minRange.node instanceof View) {
|
|
979
|
+
return null;
|
|
980
|
+
}
|
|
981
|
+
// params修改 查找View不需要修改
|
|
897
982
|
// 逻辑改名,触发了在定义里面的,element定义,的值,直接掠过
|
|
898
|
-
if (minRange.node instanceof View && node instanceof Logic) {
|
|
983
|
+
if (minRange.node instanceof View && (node instanceof Logic || node instanceof Param)) {
|
|
984
|
+
/**
|
|
985
|
+
* 这里过滤一下,一些查找引用,重复的内容,直接屏蔽掉,防止操作重复
|
|
986
|
+
* 因为在生成的时候 ,可能弄了一些副作用的引用
|
|
987
|
+
*/
|
|
988
|
+
// 本来是想在上面过滤一把的先放到这里匹配这两个的时候 就会找到
|
|
989
|
+
// refsList = refsList.filter((item) => {
|
|
990
|
+
// 屏蔽组件查找查到定义这里,也过滤一下
|
|
991
|
+
// if (item.lineText.includes(': nasl.ui.'))
|
|
992
|
+
// return false;
|
|
993
|
+
// return true;
|
|
994
|
+
// });
|
|
995
|
+
return null;
|
|
996
|
+
}
|
|
997
|
+
/**
|
|
998
|
+
* 理论上 logic setName只能自己触发,别的地方查到引用都不用重命名
|
|
999
|
+
* 流程改名不触发Logic改名
|
|
1000
|
+
* 如果是修改param查找到logic就不操作
|
|
1001
|
+
* 除非想在内部修改别的内容所以暂时屏蔽掉
|
|
1002
|
+
*/
|
|
1003
|
+
if (minRange.node instanceof Logic && node !== minRange.node) {
|
|
899
1004
|
return null;
|
|
900
1005
|
}
|
|
901
1006
|
} else {
|
|
@@ -912,40 +1017,82 @@ const naslServer = {
|
|
|
912
1017
|
},
|
|
913
1018
|
_addParamsPrepare(node: BaseNode, refsList: any[]) {
|
|
914
1019
|
const App = node.rootNode;
|
|
915
|
-
const
|
|
1020
|
+
const parantNode = node.parentNode as Logic | View;
|
|
916
1021
|
// 收集修改
|
|
917
1022
|
App.emit('collect:start', {
|
|
918
1023
|
actionMsg: '增加逻辑参数',
|
|
919
1024
|
});
|
|
920
1025
|
node.create({
|
|
921
1026
|
index: 0,
|
|
922
|
-
parentNode:
|
|
1027
|
+
parentNode: parantNode,
|
|
923
1028
|
parentKey: node.parentKey,
|
|
924
1029
|
});
|
|
925
1030
|
refsList.forEach((record) => {
|
|
926
1031
|
const fileNode = this.file2NodeMap.get(record.file);
|
|
927
1032
|
if (!fileNode)
|
|
928
1033
|
return null;
|
|
929
|
-
const minRange: MinRange = this._findMinRange(record, fileNode
|
|
1034
|
+
const minRange: MinRange = this._findMinRange(record, fileNode as FileNode);
|
|
930
1035
|
if (minRange) {
|
|
931
1036
|
// 如果找到节点是callLogic就去更新
|
|
932
1037
|
if (minRange.node instanceof CallLogic && node instanceof Param) {
|
|
933
|
-
minRange.node.setCalleeArgName(
|
|
1038
|
+
minRange.node.setCalleeArgName((parantNode) as Logic);
|
|
1039
|
+
}
|
|
1040
|
+
// 如果节点参数增加页面也要更新
|
|
1041
|
+
if (minRange.node instanceof Destination && node instanceof Param) {
|
|
1042
|
+
minRange.node.setViewArgument((parantNode) as View);
|
|
934
1043
|
}
|
|
935
1044
|
}
|
|
936
1045
|
});
|
|
937
1046
|
// 结束修改 ,批量操作
|
|
938
1047
|
App.emit('collect:end');
|
|
939
1048
|
},
|
|
1049
|
+
// 查找引用
|
|
1050
|
+
async findReferences(node: BaseNode) {
|
|
1051
|
+
let refsList = await naslServer._isHaveRef(node);
|
|
1052
|
+
// 如果查找引用查到自己里面的引用不展示
|
|
1053
|
+
refsList = refsList.filter((item) => {
|
|
1054
|
+
// 自己引用自己的过滤掉
|
|
1055
|
+
// 删除的时候过滤一把组件删除提示
|
|
1056
|
+
// 展示组件自己屏蔽掉
|
|
1057
|
+
return !item.isDefinition && !(item.lineText.includes(' = new nasl.ui.'));
|
|
1058
|
+
});
|
|
1059
|
+
// 最后返回的结果
|
|
1060
|
+
let result = new Map();
|
|
1061
|
+
// 树的构造,key: 一个file的node, 值是 [[logic, params],[logic, returns]]
|
|
1062
|
+
const resMap = new Map<BaseNode, Array<Array<QuoteNode>>>();
|
|
1063
|
+
// 普通节点和要输出的节点做一个映射,为了引用地址一样
|
|
1064
|
+
const nodeMap = new Map<BaseNode, QuoteNode>();
|
|
1065
|
+
try {
|
|
1066
|
+
refsList.forEach((record) => {
|
|
1067
|
+
const fileNode = this.file2NodeMap.get(record.file);
|
|
1068
|
+
if (!fileNode)
|
|
1069
|
+
return;
|
|
1070
|
+
const minRange = this._findMinRange(record, fileNode as FileNode);
|
|
1071
|
+
// 过滤一把不需要改的信息
|
|
1072
|
+
if (minRange) {
|
|
1073
|
+
// 拼装树
|
|
1074
|
+
naslServer._getTreeMap(minRange, fileNode, resMap, nodeMap);
|
|
1075
|
+
}
|
|
1076
|
+
});
|
|
1077
|
+
console.log(resMap, 'resMap');
|
|
1078
|
+
if (resMap.size > 0) {
|
|
1079
|
+
result = naslServer.handleTreeMap(resMap);
|
|
1080
|
+
}
|
|
1081
|
+
} catch (err) {
|
|
1082
|
+
console.log(err);
|
|
1083
|
+
}
|
|
1084
|
+
console.log(result);
|
|
1085
|
+
return result;
|
|
1086
|
+
},
|
|
940
1087
|
// 获取节点的上层渲染
|
|
941
|
-
_getTreeMap(minRange: MinRange, fileNode: BaseNode, resMap:
|
|
1088
|
+
_getTreeMap(minRange: MinRange, fileNode: BaseNode, resMap: Map<BaseNode, Array<Array<QuoteNode>>>, nodeMap: Map<BaseNode, QuoteNode>) {
|
|
942
1089
|
const minRangeNode = minRange.node;
|
|
943
1090
|
let parantNode = minRangeNode;
|
|
944
1091
|
// 顺序队列
|
|
945
1092
|
const queue: any[] = [];
|
|
946
1093
|
// 先插入自己,如果没有在往上找,
|
|
947
1094
|
// 一直到file节点的父级
|
|
948
|
-
while (parantNode
|
|
1095
|
+
while (!(parantNode instanceof App)) {
|
|
949
1096
|
// 找到上一级 在map对象中构造出他的子集
|
|
950
1097
|
const currentNode = parantNode;
|
|
951
1098
|
parantNode = parantNode.parentNode;
|
|
@@ -953,11 +1100,12 @@ const naslServer = {
|
|
|
953
1100
|
// 因为部分节点没有name,先过滤掉
|
|
954
1101
|
// if (currentNode.name) {
|
|
955
1102
|
// }
|
|
956
|
-
|
|
957
1103
|
// 排除一些不放入集合的节点
|
|
958
1104
|
let isNeedPush = true;
|
|
959
1105
|
// 如果不是ViewElement 或者 Assignment , 或者如果是的话, 排除l-root
|
|
960
|
-
if (currentNode instanceof ViewElement && (currentNode as ViewElement).tag
|
|
1106
|
+
if (currentNode instanceof ViewElement && (currentNode as ViewElement).tag === 'l-root')
|
|
1107
|
+
isNeedPush = false;
|
|
1108
|
+
else if (currentNode instanceof Argument)
|
|
961
1109
|
isNeedPush = false;
|
|
962
1110
|
else if (currentNode instanceof Assignment)
|
|
963
1111
|
isNeedPush = false;
|
|
@@ -967,13 +1115,11 @@ const naslServer = {
|
|
|
967
1115
|
isNeedPush = false;
|
|
968
1116
|
else if (currentNode instanceof QueryFromExpression)
|
|
969
1117
|
isNeedPush = false;
|
|
970
|
-
|
|
971
|
-
isNeedPush = false;
|
|
1118
|
+
// 需要放到数组中
|
|
972
1119
|
if (isNeedPush) {
|
|
973
1120
|
// 名称
|
|
974
|
-
let name = currentNode.name || currentNode.concept;
|
|
975
1121
|
// 赋值图标
|
|
976
|
-
let icon =
|
|
1122
|
+
let icon = '';
|
|
977
1123
|
if (currentNode instanceof ViewElement)
|
|
978
1124
|
icon = 'element';
|
|
979
1125
|
else if (currentNode instanceof BindAttribute)
|
|
@@ -982,55 +1128,34 @@ const naslServer = {
|
|
|
982
1128
|
icon = 'logicNode';
|
|
983
1129
|
else if (currentNode instanceof CallLogic) {
|
|
984
1130
|
icon = 'interface';
|
|
985
|
-
name = '调用逻辑';
|
|
986
1131
|
}
|
|
987
|
-
|
|
1132
|
+
|
|
1133
|
+
// 相同节点使用一个引用
|
|
1134
|
+
if (nodeMap.get(currentNode)) {
|
|
1135
|
+
queue.unshift(nodeMap.get(currentNode));
|
|
1136
|
+
} else {
|
|
1137
|
+
const quoteNode: QuoteNode = { node: currentNode, expanded: true, icon };
|
|
1138
|
+
nodeMap.set(currentNode, quoteNode);
|
|
1139
|
+
queue.unshift(quoteNode);
|
|
1140
|
+
}
|
|
988
1141
|
}
|
|
989
1142
|
}
|
|
990
1143
|
|
|
991
|
-
const key = fileNode.name;
|
|
992
1144
|
// 一个logic 或者 view可能会有多个顺序队列
|
|
993
|
-
if (resMap
|
|
994
|
-
//
|
|
995
|
-
|
|
996
|
-
// const queues = resMap[key].queue;
|
|
997
|
-
// queues.forEach((item) => {
|
|
998
|
-
// if (item.length === queue.length) {
|
|
999
|
-
// let equalIndex = 0;
|
|
1000
|
-
// item.forEach((queueItem, index) => {
|
|
1001
|
-
// if (queueItem.name === queue[index].name)
|
|
1002
|
-
// equalIndex++;
|
|
1003
|
-
// });
|
|
1004
|
-
// console.log(equalIndex)
|
|
1005
|
-
// if (equalIndex === queue.length)
|
|
1006
|
-
// equalFlag = true;
|
|
1007
|
-
// }
|
|
1008
|
-
// });
|
|
1009
|
-
|
|
1010
|
-
// // 如果有值就return
|
|
1011
|
-
// if (equalFlag)
|
|
1012
|
-
// return;
|
|
1013
|
-
queue.length && resMap[key].queue.push(queue);
|
|
1145
|
+
if (resMap.get(fileNode)) {
|
|
1146
|
+
// 是否展示两个内容全等,但是两个queue的node可能不一样,但是只需要展示一个
|
|
1147
|
+
resMap.get(fileNode).push(queue);
|
|
1014
1148
|
} else {
|
|
1015
|
-
resMap[
|
|
1016
|
-
queue: queue.length ? [queue] : [],
|
|
1017
|
-
concept: fileNode.concept,
|
|
1018
|
-
name: fileNode.name,
|
|
1019
|
-
node: fileNode,
|
|
1020
|
-
};
|
|
1149
|
+
resMap.set(fileNode, [queue]);
|
|
1021
1150
|
}
|
|
1022
1151
|
},
|
|
1023
|
-
handleTreeMap(
|
|
1024
|
-
const treeNodeMap
|
|
1025
|
-
|
|
1152
|
+
handleTreeMap(resMap: Map<BaseNode, Array<Array<QuoteNode>>>) {
|
|
1153
|
+
const treeNodeMap = new Map();
|
|
1154
|
+
resMap.forEach((value, fileNode) => {
|
|
1026
1155
|
// 循环处理tree的queue
|
|
1027
|
-
const treeObj = naslServer.handleTreeQueue(
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
} else {
|
|
1031
|
-
treeNodeMap[val.concept] = [treeObj];
|
|
1032
|
-
}
|
|
1033
|
-
}
|
|
1156
|
+
const treeObj = naslServer.handleTreeQueue(value);
|
|
1157
|
+
treeNodeMap.set(fileNode, treeObj);
|
|
1158
|
+
});
|
|
1034
1159
|
return treeNodeMap;
|
|
1035
1160
|
},
|
|
1036
1161
|
/**
|
|
@@ -1039,30 +1164,26 @@ const naslServer = {
|
|
|
1039
1164
|
* @param arr 当前页面下的queue的二维数组,一个数组下有多条链路
|
|
1040
1165
|
* @returns 最后要使用到的节点和对应的子集
|
|
1041
1166
|
*/
|
|
1042
|
-
handleTreeQueue(
|
|
1043
|
-
const map
|
|
1044
|
-
let root:
|
|
1045
|
-
if (!
|
|
1167
|
+
handleTreeQueue(queueLists: Array<Array<QuoteNode>>) {
|
|
1168
|
+
const map = new Map<QuoteNode, Array<QuoteNode>>();
|
|
1169
|
+
let root: QuoteNode = null;
|
|
1170
|
+
if (!queueLists.length)
|
|
1046
1171
|
return;
|
|
1047
|
-
for (const
|
|
1172
|
+
for (const queueList of queueLists) {
|
|
1048
1173
|
let preNode = null;
|
|
1049
|
-
for (const
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
if (!map[key]) {
|
|
1054
|
-
map[key] = [];
|
|
1174
|
+
for (const queueItem of queueList) {
|
|
1175
|
+
if (!map.get(queueItem)) {
|
|
1176
|
+
map.set(queueItem, []);
|
|
1055
1177
|
}
|
|
1056
1178
|
if (preNode) {
|
|
1057
|
-
const
|
|
1058
|
-
const find = map[preKey].find((item) => node.name === item.name);
|
|
1179
|
+
const find = map.get(preNode).find((item: QuoteNode) => item === queueItem);
|
|
1059
1180
|
if (!find) {
|
|
1060
|
-
map
|
|
1181
|
+
map.get(preNode).push(queueItem);
|
|
1061
1182
|
}
|
|
1062
1183
|
} else {
|
|
1063
|
-
root =
|
|
1184
|
+
root = queueItem;
|
|
1064
1185
|
}
|
|
1065
|
-
preNode =
|
|
1186
|
+
preNode = queueItem;
|
|
1066
1187
|
}
|
|
1067
1188
|
}
|
|
1068
1189
|
const children = naslServer._recursionCreateResult(root, map);
|
|
@@ -1074,14 +1195,12 @@ const naslServer = {
|
|
|
1074
1195
|
* @param map 当前所有节点的map对象
|
|
1075
1196
|
* @returns 当前节点,最后输出所有节点
|
|
1076
1197
|
*/
|
|
1077
|
-
_recursionCreateResult(root: QuoteNode, map:
|
|
1078
|
-
const
|
|
1079
|
-
const rootKey = root.name;
|
|
1080
|
-
const children = map[rootKey].map((item: QuoteNode) => naslServer._recursionCreateResult(item, map));
|
|
1198
|
+
_recursionCreateResult(root: QuoteNode, map: Map<QuoteNode, Array<QuoteNode>>) {
|
|
1199
|
+
const children = map.get(root).map((item: QuoteNode) => naslServer._recursionCreateResult(item, map));
|
|
1081
1200
|
if (children && children.length) {
|
|
1082
|
-
|
|
1201
|
+
root.children = children;
|
|
1083
1202
|
}
|
|
1084
|
-
return
|
|
1203
|
+
return root;
|
|
1085
1204
|
},
|
|
1086
1205
|
|
|
1087
1206
|
/**
|
|
@@ -1089,12 +1208,13 @@ const naslServer = {
|
|
|
1089
1208
|
* 当前this上下文 的Source 和 父级文件级别的节点
|
|
1090
1209
|
*/
|
|
1091
1210
|
getCurrentSource(node: BaseNode) {
|
|
1211
|
+
if (node instanceof App || node instanceof Theme)
|
|
1212
|
+
return { fileNode: null };
|
|
1092
1213
|
let sourceMap = node.sourceMap;
|
|
1093
1214
|
let fileNode = node;
|
|
1094
1215
|
// 如果没有sourceMap,就继续向上找 ,或者到module结束
|
|
1095
1216
|
// 如果 节点找到 app 或者module 停止
|
|
1096
|
-
|
|
1097
|
-
while (!sourceMap && fileNode && !(fileNode.parentNode instanceof App) && !(fileNode.parentNode instanceof Module)) {
|
|
1217
|
+
while (!sourceMap && fileNode && !(fileNode.parentNode instanceof App) && !(fileNode.parentNode instanceof Module) && !(fileNode instanceof View)) {
|
|
1098
1218
|
fileNode = fileNode.parentNode;
|
|
1099
1219
|
sourceMap = fileNode?.sourceMap;
|
|
1100
1220
|
}
|
|
@@ -1117,7 +1237,6 @@ const naslServer = {
|
|
|
1117
1237
|
// 获取element方法的可选值
|
|
1118
1238
|
getFieldKeySelectCompletion(node: BaseNode, fieldKey?: string) {
|
|
1119
1239
|
const { currentSource, fileNode } = naslServer.getCurrentSource(node);
|
|
1120
|
-
console.log(currentSource);
|
|
1121
1240
|
if (currentSource && fileNode) {
|
|
1122
1241
|
return naslServer._getFieldKeySelectCompletion({
|
|
1123
1242
|
file: (fileNode as FileNode).getEmbeddedFilePath(),
|
|
@@ -1165,11 +1284,49 @@ async function handleDelete(fileNode: BaseNode, targetNode: BaseNode, result: Re
|
|
|
1165
1284
|
// 更新文件之后
|
|
1166
1285
|
await naslServer.updateFiles({ outputFiles });
|
|
1167
1286
|
|
|
1168
|
-
const filesToCheck: Set<string> = new Set();
|
|
1169
1287
|
newRefs.refs.forEach((ref) => filesToCheck.add(ref.file));
|
|
1170
|
-
console.log('filesToCheck', filesToCheck, filesToCheck.size);
|
|
1171
|
-
await naslServer.getDiagnosticRecordsAndPushAll(Array.from(filesToCheck));
|
|
1172
1288
|
}
|
|
1289
|
+
BaseNode.prototype.findReadOnlyLogicUsage = function () {
|
|
1290
|
+
let targetNode;
|
|
1291
|
+
|
|
1292
|
+
if (this.parentNode.concept === 'Namespace' || this.parentNode.parentNode.concept === 'Namespace') {
|
|
1293
|
+
const sourceMap = this.parentNode.concept === 'Namespace' ? this.parentNode.parentNode.sourceMap : this.parentNode.parentNode.parentNode.sourceMap;
|
|
1294
|
+
for (const item of sourceMap) {
|
|
1295
|
+
const logic = item[0] as Logic;
|
|
1296
|
+
if (this.concept === 'Logic') {
|
|
1297
|
+
if (logic instanceof Logic)
|
|
1298
|
+
if (logic.calleewholeKey === (this as Logic).calleewholeKey) {
|
|
1299
|
+
targetNode = logic;
|
|
1300
|
+
break;
|
|
1301
|
+
}
|
|
1302
|
+
} else {
|
|
1303
|
+
if (logic instanceof Logic)
|
|
1304
|
+
if (logic.calleewholeKey === (this.parentNode as Logic).calleewholeKey) {
|
|
1305
|
+
targetNode = logic;
|
|
1306
|
+
break;
|
|
1307
|
+
}
|
|
1308
|
+
}
|
|
1309
|
+
}
|
|
1310
|
+
} else if (this.parentNode.concept === 'Module') {
|
|
1311
|
+
// 父级是模块的还是用它本身去查找引用
|
|
1312
|
+
targetNode = this;
|
|
1313
|
+
} else {
|
|
1314
|
+
const sourceMap = this.parentNode.sourceMap;
|
|
1315
|
+
for (const item of sourceMap) {
|
|
1316
|
+
const logic = item[0] as Logic;
|
|
1317
|
+
if (logic.getNamespace && logic.getNamespace() === (this as Logic).getNamespace()) {
|
|
1318
|
+
targetNode = logic;
|
|
1319
|
+
break;
|
|
1320
|
+
}
|
|
1321
|
+
}
|
|
1322
|
+
}
|
|
1323
|
+
|
|
1324
|
+
try {
|
|
1325
|
+
return naslServer.findReferences(targetNode);
|
|
1326
|
+
} catch (err) {
|
|
1327
|
+
console.log(err);
|
|
1328
|
+
}
|
|
1329
|
+
};
|
|
1173
1330
|
// 查找引用
|
|
1174
1331
|
BaseNode.prototype.findUsage = function findUsage() {
|
|
1175
1332
|
try {
|
|
@@ -1195,7 +1352,7 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
|
|
|
1195
1352
|
*/
|
|
1196
1353
|
const res = naslServer._renamePrepare(this, refsList, newValue);
|
|
1197
1354
|
if (res.length <= 1) {
|
|
1198
|
-
(this as
|
|
1355
|
+
(this as SetNameNode).setName(newValue);
|
|
1199
1356
|
} else {
|
|
1200
1357
|
const callback = (value: boolean) => {
|
|
1201
1358
|
if (value) {
|
|
@@ -1205,7 +1362,7 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
|
|
|
1205
1362
|
actionMsg: '重命名并更新引用',
|
|
1206
1363
|
});
|
|
1207
1364
|
res.forEach((item) => {
|
|
1208
|
-
const itemNode = item.node as
|
|
1365
|
+
const itemNode = item.node as SetNameNode;
|
|
1209
1366
|
if (item.newValue) {
|
|
1210
1367
|
// 如果有指定的修改方法,就用那个,没有就修改名字
|
|
1211
1368
|
item.setTypeMethods ? itemNode[item.setTypeMethods](item.newValue) : itemNode.setName?.(item.newValue);
|
|
@@ -1216,12 +1373,13 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
|
|
|
1216
1373
|
// 结束修改 ,批量操作
|
|
1217
1374
|
App.emit('collect:end');
|
|
1218
1375
|
} else {
|
|
1219
|
-
(this as
|
|
1376
|
+
(this as SetNameNode).setName(newValue);
|
|
1220
1377
|
}
|
|
1221
1378
|
};
|
|
1222
1379
|
const confirmParms = {
|
|
1223
1380
|
actionType: 'rename',
|
|
1224
1381
|
node: this,
|
|
1382
|
+
newValue,
|
|
1225
1383
|
};
|
|
1226
1384
|
/**
|
|
1227
1385
|
* nasl和vue的通信,回退,要触发vue的watch。
|
|
@@ -1253,15 +1411,39 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
|
|
|
1253
1411
|
* 查找这个节点是不是有依赖
|
|
1254
1412
|
*/
|
|
1255
1413
|
const node = this;
|
|
1256
|
-
|
|
1257
|
-
//
|
|
1414
|
+
let refsList = await naslServer._isHaveRef(node);
|
|
1415
|
+
// 删除的时候过滤一把组件删除提示
|
|
1416
|
+
refsList = refsList.filter((item) => {
|
|
1417
|
+
// 因为ui组件本身会多渲染一次,就先过滤一个
|
|
1418
|
+
return !(item.lineText.includes(': nasl.ui.'));
|
|
1419
|
+
});
|
|
1420
|
+
// 删除参数单独处理
|
|
1421
|
+
if (node instanceof Param) {
|
|
1422
|
+
const methodRefs: tsProtocol.ReferencesResponseItem[] = [];
|
|
1423
|
+
refsList.forEach((item) => {
|
|
1424
|
+
// 入参查找引用,查到logic 和自己,内容完全一样,就保留一个
|
|
1425
|
+
const find = methodRefs.find((findItem) => item.lineText === findItem.lineText);
|
|
1426
|
+
if (!find) {
|
|
1427
|
+
methodRefs.push(item);
|
|
1428
|
+
}
|
|
1429
|
+
});
|
|
1430
|
+
refsList = methodRefs;
|
|
1431
|
+
}
|
|
1432
|
+
|
|
1433
|
+
// delete的弹框展示
|
|
1258
1434
|
const confirmParms = {
|
|
1259
1435
|
actionType: 'delete',
|
|
1260
1436
|
tipFlag: false,
|
|
1261
1437
|
node,
|
|
1438
|
+
icon: 'warning',
|
|
1262
1439
|
};
|
|
1263
1440
|
let callback = null;
|
|
1264
1441
|
if (refsList.length <= 1) {
|
|
1442
|
+
// 页面组件直接删除然后return
|
|
1443
|
+
if (node instanceof ViewElement) {
|
|
1444
|
+
this.delete();
|
|
1445
|
+
return;
|
|
1446
|
+
}
|
|
1265
1447
|
callback = () => {
|
|
1266
1448
|
// Structure 和 Interface是内部有delete方法
|
|
1267
1449
|
if (node instanceof Structure || node instanceof Interface) {
|
|
@@ -1274,12 +1456,27 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
|
|
|
1274
1456
|
// 如果有依赖就有一个查找引用提示
|
|
1275
1457
|
confirmParms.tipFlag = true;
|
|
1276
1458
|
const node = this;
|
|
1459
|
+
|
|
1460
|
+
// 删除页面或者流程
|
|
1461
|
+
if (node instanceof View || node instanceof Process) {
|
|
1462
|
+
/**
|
|
1463
|
+
* 查找这个页面是不是有依赖
|
|
1464
|
+
*/
|
|
1465
|
+
let viewPath = (this as FileNode).getEmbeddedFilePath();
|
|
1466
|
+
viewPath = viewPath.slice(0, viewPath.length - 3);
|
|
1467
|
+
const find = refsList.find((record) => !record.file.includes(viewPath));
|
|
1468
|
+
// 如果没有别的文件的依赖,就直接delete
|
|
1469
|
+
if (!find) {
|
|
1470
|
+
this.delete();
|
|
1471
|
+
return;
|
|
1472
|
+
}
|
|
1473
|
+
}
|
|
1277
1474
|
callback = () => {
|
|
1278
1475
|
// removeParam
|
|
1279
1476
|
// 跟rename 还不太一样,部分修改依赖修改好的值,然后在下面的修改需要把自己传递进去
|
|
1280
1477
|
if (node instanceof Param) {
|
|
1281
1478
|
const App = this.rootNode;
|
|
1282
|
-
const
|
|
1479
|
+
const parentNode = this.parentNode;
|
|
1283
1480
|
// 收集修改
|
|
1284
1481
|
App.emit('collect:start', {
|
|
1285
1482
|
actionMsg: '删除参数',
|
|
@@ -1289,10 +1486,13 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
|
|
|
1289
1486
|
const fileNode = naslServer.file2NodeMap.get(record.file);
|
|
1290
1487
|
if (!fileNode)
|
|
1291
1488
|
return null;
|
|
1292
|
-
const minRange: MinRange = naslServer._findMinRange(record, fileNode
|
|
1489
|
+
const minRange: MinRange = naslServer._findMinRange(record, fileNode as FileNode);
|
|
1293
1490
|
if (minRange) {
|
|
1294
1491
|
if (minRange.node instanceof CallLogic) {
|
|
1295
|
-
minRange.node.setCalleeArgName(
|
|
1492
|
+
minRange.node.setCalleeArgName(parentNode as Logic);
|
|
1493
|
+
}
|
|
1494
|
+
if (minRange.node instanceof Destination) {
|
|
1495
|
+
minRange.node.setViewArgument(parentNode as View);
|
|
1296
1496
|
}
|
|
1297
1497
|
}
|
|
1298
1498
|
});
|
|
@@ -1312,7 +1512,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
|
|
|
1312
1512
|
const fileNode = naslServer.file2NodeMap.get(record.file);
|
|
1313
1513
|
if (!fileNode)
|
|
1314
1514
|
return null;
|
|
1315
|
-
const minRange: MinRange = naslServer._findMinRange(record, fileNode
|
|
1515
|
+
const minRange: MinRange = naslServer._findMinRange(record, fileNode as FileNode);
|
|
1316
1516
|
if (minRange) {
|
|
1317
1517
|
if (minRange.node instanceof Interface) {
|
|
1318
1518
|
minRange.node.delete();
|
|
@@ -1321,6 +1521,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
|
|
|
1321
1521
|
});
|
|
1322
1522
|
// 结束修改 ,批量操作
|
|
1323
1523
|
App.emit('collect:end');
|
|
1524
|
+
return;
|
|
1324
1525
|
}
|
|
1325
1526
|
// 删除权限节点
|
|
1326
1527
|
if (node instanceof Role) {
|
|
@@ -1334,7 +1535,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
|
|
|
1334
1535
|
const fileNode = naslServer.file2NodeMap.get(record.file);
|
|
1335
1536
|
if (!fileNode)
|
|
1336
1537
|
return null;
|
|
1337
|
-
const minRange: MinRange = naslServer._findMinRange(record, fileNode
|
|
1538
|
+
const minRange: MinRange = naslServer._findMinRange(record, fileNode as FileNode);
|
|
1338
1539
|
if (minRange) {
|
|
1339
1540
|
if (minRange.node instanceof View || minRange.node instanceof ViewElement) {
|
|
1340
1541
|
// oldName旧的节点存的值
|
|
@@ -1351,6 +1552,10 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
|
|
|
1351
1552
|
return;
|
|
1352
1553
|
}
|
|
1353
1554
|
|
|
1555
|
+
// 删除页面或者流程,如果上一步没有return 就说明他是有别的引用的,会有引用弹框
|
|
1556
|
+
if (node instanceof View || node instanceof Process) {
|
|
1557
|
+
this.delete();
|
|
1558
|
+
}
|
|
1354
1559
|
// 其余的都直接调用删除
|
|
1355
1560
|
// Structure 和 Interface是内部有delete方法
|
|
1356
1561
|
if (node instanceof Structure || node instanceof Interface) {
|
|
@@ -1400,19 +1605,22 @@ async function handleChange(fileNode: BaseNode, targetNode: BaseNode, result: Re
|
|
|
1400
1605
|
line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
|
|
1401
1606
|
offset: 6,
|
|
1402
1607
|
});
|
|
1403
|
-
const filesToCheck: Set<string> = new Set();
|
|
1404
1608
|
|
|
1405
1609
|
newRefs.refs.forEach((ref) => filesToCheck.add(ref.file));
|
|
1406
1610
|
// 唤起建立连接弹框
|
|
1407
1611
|
// 文件级别的建立连接采取提醒
|
|
1408
|
-
if (
|
|
1409
|
-
|
|
1410
|
-
|
|
1411
|
-
|
|
1412
|
-
|
|
1413
|
-
|
|
1612
|
+
if (action === 'create' && (targetNode as any).__init) {
|
|
1613
|
+
// 清除临时状态, 完成本次创建
|
|
1614
|
+
delete (targetNode as any).__init;
|
|
1615
|
+
if (fileNode === targetNode && filesToCheck.size > 1) {
|
|
1616
|
+
const confirmParms = {
|
|
1617
|
+
actionType: 'createEstablishConnection',
|
|
1618
|
+
node: fileNode,
|
|
1619
|
+
icon: 'success',
|
|
1620
|
+
};
|
|
1621
|
+
invokeCommand('tsConfirm.open', confirmParms, () => {});
|
|
1622
|
+
}
|
|
1414
1623
|
}
|
|
1415
|
-
await naslServer.getDiagnosticRecordsAndPushAll(Array.from(filesToCheck));
|
|
1416
1624
|
}
|
|
1417
1625
|
|
|
1418
1626
|
/**
|
|
@@ -1426,7 +1634,6 @@ async function handleChange(fileNode: BaseNode, targetNode: BaseNode, result: Re
|
|
|
1426
1634
|
async function handleRename(fileNode: BaseNode, targetNode: BaseNode, result: ReturnType<Structure['toEmbeddedTSFile']>, oldFilePath?: string) {
|
|
1427
1635
|
// rename 场景
|
|
1428
1636
|
const outputFiles = [{ file: result.filePath, fileContent: result.code }];
|
|
1429
|
-
const filesToCheck: Set<string> = new Set();
|
|
1430
1637
|
// 如果是要修改顶级文件名
|
|
1431
1638
|
// file节点和当前改得是同一节点
|
|
1432
1639
|
if (fileNode === targetNode) {
|
|
@@ -1461,36 +1668,98 @@ async function handleRename(fileNode: BaseNode, targetNode: BaseNode, result: Re
|
|
|
1461
1668
|
|
|
1462
1669
|
// 文件级别重命名,有依赖才唤起弹框
|
|
1463
1670
|
// 唤起重命名,提示有连接弹框
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
|
|
1468
|
-
|
|
1469
|
-
|
|
1470
|
-
|
|
1671
|
+
// 重命名建立连接先不展示弹框了
|
|
1672
|
+
|
|
1673
|
+
// if (newRefFileList.size > 1) {
|
|
1674
|
+
// const confirmParms = {
|
|
1675
|
+
// actionType: 'renameEstablishConnection',
|
|
1676
|
+
// node: fileNode,
|
|
1677
|
+
// icon: 'success',
|
|
1678
|
+
// };
|
|
1679
|
+
// invokeCommand('tsConfirm.open', confirmParms, () => {});
|
|
1680
|
+
// }
|
|
1471
1681
|
} else {
|
|
1472
1682
|
// 查一下当前属性依赖的文件
|
|
1473
1683
|
const { currentSource, fileNode } = naslServer.getCurrentSource(targetNode);
|
|
1474
|
-
|
|
1475
|
-
|
|
1476
|
-
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
|
|
1684
|
+
if (currentSource) {
|
|
1685
|
+
const oldRefs = await naslServer.references({
|
|
1686
|
+
file: (fileNode as FileNode).getEmbeddedFilePath(),
|
|
1687
|
+
line: lsp2tspNumber(currentSource.range.start.line),
|
|
1688
|
+
offset: lsp2tspNumber(currentSource.range.start.character),
|
|
1689
|
+
});
|
|
1690
|
+
oldRefs.refs.forEach((ref) => filesToCheck.add(ref.file));
|
|
1691
|
+
// 更新文件之后
|
|
1692
|
+
await naslServer.updateFiles({ outputFiles });
|
|
1482
1693
|
|
|
1483
|
-
|
|
1484
|
-
|
|
1485
|
-
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1694
|
+
const newRefs2 = await naslServer.references({
|
|
1695
|
+
file: (fileNode as FileNode).getEmbeddedFilePath(),
|
|
1696
|
+
line: lsp2tspNumber(currentSource.range.start.line),
|
|
1697
|
+
offset: lsp2tspNumber(currentSource.range.start.character),
|
|
1698
|
+
});
|
|
1699
|
+
newRefs2.refs.forEach((ref) => filesToCheck.add(ref.file));
|
|
1700
|
+
}
|
|
1489
1701
|
}
|
|
1702
|
+
}
|
|
1703
|
+
|
|
1704
|
+
/**
|
|
1705
|
+
* 处理一些节点操作,子节点需要更新并且check的场景
|
|
1706
|
+
* 因为删除,新增父页面,或者重命名会一起
|
|
1707
|
+
* 删除或者新增view而且他有子集 就要执行同样的操作
|
|
1708
|
+
* @param action 当前操作类型
|
|
1709
|
+
* @param fileNode 文件节点
|
|
1710
|
+
* @param targetNode 操作节点 这里要两个相等才会走家去面对哦逻辑
|
|
1711
|
+
* @param oldpath 触发内容的oldpath
|
|
1712
|
+
*/
|
|
1713
|
+
async function incidentalAction(action: string, fileNode: BaseNode, targetNode: BaseNode, oldpath?: string) {
|
|
1714
|
+
if ((action === 'create' || action === 'delete' || (action === 'update' && oldpath)) && fileNode === targetNode) {
|
|
1715
|
+
// 删除或者新增页面
|
|
1716
|
+
if (fileNode instanceof View && fileNode.children?.length) {
|
|
1717
|
+
const fileNodeChildren = fileNode.children;
|
|
1718
|
+
for (let i = 0; i < fileNodeChildren.length; i++) {
|
|
1719
|
+
const fileNodeItem = fileNodeChildren[i];
|
|
1720
|
+
const result = (fileNodeItem as FileNode).toEmbeddedTSFile();
|
|
1721
|
+
if (action === 'create') {
|
|
1722
|
+
await handleChange(fileNodeItem, fileNodeItem, result, action);
|
|
1723
|
+
await incidentalAction(action, fileNodeItem, fileNodeItem);
|
|
1724
|
+
} else if (action === 'delete') {
|
|
1725
|
+
await handleDelete(fileNodeItem, fileNodeItem, result);
|
|
1726
|
+
await incidentalAction(action, fileNodeItem, fileNodeItem);
|
|
1727
|
+
} else if (action === 'update' && oldpath) {
|
|
1728
|
+
const parentPath = oldpath.replace('.ts', '/');
|
|
1729
|
+
const currentOldPath = parentPath + fileNodeItem.name + '.ts';
|
|
1730
|
+
// 因为重命名这里只有当前修改父级的 旧名称, 所以他的子集也要根据旧名称去查依赖 更新内容
|
|
1731
|
+
await handleRename(fileNodeItem, fileNodeItem, result, currentOldPath);
|
|
1732
|
+
await incidentalAction(action, fileNodeItem, fileNodeItem, currentOldPath);
|
|
1733
|
+
}
|
|
1734
|
+
};
|
|
1735
|
+
}
|
|
1736
|
+
// 删除或新增模块
|
|
1737
|
+
// 需要把下面的哦内容全部都更新一遍
|
|
1738
|
+
if (fileNode instanceof Module) {
|
|
1739
|
+
const module: Module = (targetNode) as Module;
|
|
1740
|
+
const results: Array<ReturnType<Structure['toEmbeddedTSFile']>> = [];
|
|
1741
|
+
naslServer.contentToFile(module, results);
|
|
1742
|
+
for (let i = 0; i < results.length; i++) {
|
|
1743
|
+
const result = results[i];
|
|
1744
|
+
const node = naslServer.file2NodeMap.get(result.filePath);
|
|
1745
|
+
if (action === 'create') {
|
|
1746
|
+
await handleChange(node, node, result, action);
|
|
1747
|
+
} else {
|
|
1748
|
+
await handleDelete(node, node, result);
|
|
1749
|
+
}
|
|
1750
|
+
};
|
|
1490
1751
|
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1752
|
+
// 删除模块通知更新列表
|
|
1753
|
+
if (action === 'delete') {
|
|
1754
|
+
try {
|
|
1755
|
+
// 如果已经
|
|
1756
|
+
invokeCommand('module.delete', true);
|
|
1757
|
+
} catch (err) {
|
|
1758
|
+
console.log('module.delete', '组件销毁了,不用唤起了');
|
|
1759
|
+
}
|
|
1760
|
+
}
|
|
1761
|
+
}
|
|
1762
|
+
}
|
|
1494
1763
|
}
|
|
1495
1764
|
|
|
1496
1765
|
async function receiveHandleChange($event: EventPayload) {
|
|
@@ -1500,7 +1769,11 @@ async function receiveHandleChange($event: EventPayload) {
|
|
|
1500
1769
|
// 当前操作的文件节点
|
|
1501
1770
|
const { fileNode } = naslServer.getCurrentSource(targetNode);
|
|
1502
1771
|
// 如果是导入模块就,就引入对应模块,先不处理module和Configuration,下面的内容会自动创建
|
|
1503
|
-
if (fileNode instanceof Module || fileNode instanceof Configuration) {
|
|
1772
|
+
if (!fileNode || fileNode instanceof Module || fileNode instanceof Configuration) {
|
|
1773
|
+
// module单独处理
|
|
1774
|
+
if (fileNode instanceof Module) {
|
|
1775
|
+
await incidentalAction(action, fileNode, targetNode);
|
|
1776
|
+
}
|
|
1504
1777
|
return;
|
|
1505
1778
|
}
|
|
1506
1779
|
|
|
@@ -1520,25 +1793,50 @@ async function receiveHandleChange($event: EventPayload) {
|
|
|
1520
1793
|
|
|
1521
1794
|
fileNode.sourceMap = result.sourceMap;
|
|
1522
1795
|
if (action === 'update' || action === 'create') {
|
|
1523
|
-
if ($event?.field !== 'name')
|
|
1796
|
+
if ($event?.field !== 'name') {
|
|
1524
1797
|
await handleChange(fileNode, targetNode, result, action);
|
|
1525
|
-
|
|
1526
|
-
|
|
1798
|
+
await incidentalAction(action, fileNode, targetNode);
|
|
1799
|
+
} else {
|
|
1800
|
+
const oldpath = (fileNode as FileNode).getEmbeddedFilePath($event.oldObject.name);
|
|
1801
|
+
await handleRename(fileNode, targetNode, result, oldpath);
|
|
1802
|
+
await incidentalAction(action, fileNode, targetNode, oldpath);
|
|
1527
1803
|
}
|
|
1528
1804
|
}
|
|
1529
1805
|
// 删除
|
|
1530
1806
|
if (action === 'delete') {
|
|
1807
|
+
await incidentalAction(action, fileNode, targetNode);
|
|
1531
1808
|
await handleDelete(fileNode, targetNode, result);
|
|
1532
1809
|
}
|
|
1810
|
+
return true;
|
|
1533
1811
|
}
|
|
1534
1812
|
|
|
1535
1813
|
// 监听所有改变操作
|
|
1536
1814
|
embeddedTSEmitter.on('change', ($event: EventPayload) => {
|
|
1537
1815
|
// 收集到一个行为集合
|
|
1538
1816
|
const eventValue = $event.value;
|
|
1539
|
-
|
|
1540
|
-
|
|
1817
|
+
const stackList: Array<EventPayload> = [];
|
|
1818
|
+
eventValue.forEach(async (item: EventPayload) => {
|
|
1819
|
+
stackList.push(item.originEvent);
|
|
1541
1820
|
});
|
|
1821
|
+
|
|
1822
|
+
// 异步状态机,一个完成了在执行下一个
|
|
1823
|
+
function next() {
|
|
1824
|
+
const item = stackList.shift();
|
|
1825
|
+
receiveHandleChange(item).then(async() => {
|
|
1826
|
+
if (stackList.length) {
|
|
1827
|
+
next();
|
|
1828
|
+
} else {
|
|
1829
|
+
console.log('filesToCheck', filesToCheck, filesToCheck.size);
|
|
1830
|
+
await naslServer.getDiagnosticRecordsAndPushAll(Array.from(filesToCheck));
|
|
1831
|
+
filesToCheck.clear();
|
|
1832
|
+
}
|
|
1833
|
+
});
|
|
1834
|
+
}
|
|
1835
|
+
|
|
1836
|
+
// 如果有长度开始执行状态机
|
|
1837
|
+
if (stackList.length) {
|
|
1838
|
+
next();
|
|
1839
|
+
}
|
|
1542
1840
|
});
|
|
1543
1841
|
|
|
1544
1842
|
naslServer.messager.options.context = naslServer;
|