@lcap/nasl 1.0.0-alpha.9 → 1.0.2

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.
Files changed (481) hide show
  1. package/out/automate/engine/index.d.ts +3 -0
  2. package/out/automate/engine/index.js +414 -0
  3. package/out/automate/engine/index.js.map +1 -0
  4. package/out/automate/engine/operators.d.ts +13 -0
  5. package/out/automate/engine/operators.js +63 -0
  6. package/out/automate/engine/operators.js.map +1 -0
  7. package/out/automate/engine/uniqueName.d.ts +6 -0
  8. package/out/automate/engine/uniqueName.js +39 -0
  9. package/out/automate/engine/uniqueName.js.map +1 -0
  10. package/out/automate/engine/utils.d.ts +24 -0
  11. package/out/automate/engine/utils.js +379 -0
  12. package/out/automate/engine/utils.js.map +1 -0
  13. package/out/common/BaseNode.d.ts +21 -1
  14. package/out/common/BaseNode.js +232 -84
  15. package/out/common/BaseNode.js.map +1 -1
  16. package/out/concepts/App__.d.ts +19 -1
  17. package/out/concepts/App__.js +88 -45
  18. package/out/concepts/App__.js.map +1 -1
  19. package/out/concepts/Argument__.d.ts +5 -1
  20. package/out/concepts/Argument__.js +21 -3
  21. package/out/concepts/Argument__.js.map +1 -1
  22. package/out/concepts/Assignee__.d.ts +201 -0
  23. package/out/concepts/Assignee__.js +298 -0
  24. package/out/concepts/Assignee__.js.map +1 -0
  25. package/out/concepts/Assignment__.js +5 -0
  26. package/out/concepts/Assignment__.js.map +1 -1
  27. package/out/concepts/BinaryExpression__.js +8 -7
  28. package/out/concepts/BinaryExpression__.js.map +1 -1
  29. package/out/concepts/BindAttribute__.d.ts +19 -0
  30. package/out/concepts/BindAttribute__.js +55 -10
  31. package/out/concepts/BindAttribute__.js.map +1 -1
  32. package/out/concepts/BindDirective__.js +23 -3
  33. package/out/concepts/BindDirective__.js.map +1 -1
  34. package/out/concepts/BindEvent__.d.ts +2 -2
  35. package/out/concepts/BindEvent__.js +67 -34
  36. package/out/concepts/BindEvent__.js.map +1 -1
  37. package/out/concepts/BooleanLiteral__.d.ts +2 -0
  38. package/out/concepts/BooleanLiteral__.js +10 -0
  39. package/out/concepts/BooleanLiteral__.js.map +1 -1
  40. package/out/concepts/CallFunction__.js +58 -25
  41. package/out/concepts/CallFunction__.js.map +1 -1
  42. package/out/concepts/CallInterface__.d.ts +5 -0
  43. package/out/concepts/CallInterface__.js +238 -31
  44. package/out/concepts/CallInterface__.js.map +1 -1
  45. package/out/concepts/CallLogic__.d.ts +4 -4
  46. package/out/concepts/CallLogic__.js +107 -50
  47. package/out/concepts/CallLogic__.js.map +1 -1
  48. package/out/concepts/CallQueryComponent__.d.ts +38 -3
  49. package/out/concepts/CallQueryComponent__.js +329 -75
  50. package/out/concepts/CallQueryComponent__.js.map +1 -1
  51. package/out/concepts/Comment__.js +6 -2
  52. package/out/concepts/Comment__.js.map +1 -1
  53. package/out/concepts/CompletionProperty__.d.ts +3 -1
  54. package/out/concepts/CompletionProperty__.js +2 -0
  55. package/out/concepts/CompletionProperty__.js.map +1 -1
  56. package/out/concepts/ConfigGroup__.js +3 -3
  57. package/out/concepts/ConfigGroup__.js.map +1 -1
  58. package/out/concepts/ConfigProperty__.js +3 -3
  59. package/out/concepts/ConfigProperty__.js.map +1 -1
  60. package/out/concepts/Configuration__.js +3 -3
  61. package/out/concepts/Configuration__.js.map +1 -1
  62. package/out/concepts/Constant__.d.ts +1 -0
  63. package/out/concepts/Constant__.js +16 -2
  64. package/out/concepts/Constant__.js.map +1 -1
  65. package/out/concepts/Destination__.d.ts +12 -0
  66. package/out/concepts/Destination__.js +115 -22
  67. package/out/concepts/Destination__.js.map +1 -1
  68. package/out/concepts/End__.js +9 -1
  69. package/out/concepts/End__.js.map +1 -1
  70. package/out/concepts/EntityIndex__.js +4 -2
  71. package/out/concepts/EntityIndex__.js.map +1 -1
  72. package/out/concepts/EntityProperty__.d.ts +11 -0
  73. package/out/concepts/EntityProperty__.js +71 -5
  74. package/out/concepts/EntityProperty__.js.map +1 -1
  75. package/out/concepts/Entity__.d.ts +5 -4
  76. package/out/concepts/Entity__.js +35 -19
  77. package/out/concepts/Entity__.js.map +1 -1
  78. package/out/concepts/Enum__.d.ts +5 -0
  79. package/out/concepts/Enum__.js +24 -12
  80. package/out/concepts/Enum__.js.map +1 -1
  81. package/out/concepts/Event__.js +3 -3
  82. package/out/concepts/Event__.js.map +1 -1
  83. package/out/concepts/ForEachStatement__.d.ts +1 -1
  84. package/out/concepts/ForEachStatement__.js +11 -15
  85. package/out/concepts/ForEachStatement__.js.map +1 -1
  86. package/out/concepts/Function__.js +13 -13
  87. package/out/concepts/Function__.js.map +1 -1
  88. package/out/concepts/Identifier__.d.ts +3 -0
  89. package/out/concepts/Identifier__.js +77 -30
  90. package/out/concepts/Identifier__.js.map +1 -1
  91. package/out/concepts/IfStatement__.js +4 -4
  92. package/out/concepts/IfStatement__.js.map +1 -1
  93. package/out/concepts/InterfaceParam__.d.ts +6 -4
  94. package/out/concepts/InterfaceParam__.js +57 -19
  95. package/out/concepts/InterfaceParam__.js.map +1 -1
  96. package/out/concepts/Interface__.d.ts +42 -30
  97. package/out/concepts/Interface__.js +133 -17
  98. package/out/concepts/Interface__.js.map +1 -1
  99. package/out/concepts/JSBlock__.d.ts +1 -0
  100. package/out/concepts/JSBlock__.js +3 -0
  101. package/out/concepts/JSBlock__.js.map +1 -1
  102. package/out/concepts/LogicItem__.d.ts +2 -1
  103. package/out/concepts/LogicItem__.js +14 -0
  104. package/out/concepts/LogicItem__.js.map +1 -1
  105. package/out/concepts/Logic__.d.ts +20 -1
  106. package/out/concepts/Logic__.js +194 -37
  107. package/out/concepts/Logic__.js.map +1 -1
  108. package/out/concepts/MemberExpression__.d.ts +2 -0
  109. package/out/concepts/MemberExpression__.js +49 -13
  110. package/out/concepts/MemberExpression__.js.map +1 -1
  111. package/out/concepts/Module__.d.ts +126 -120
  112. package/out/concepts/Module__.js +36 -26
  113. package/out/concepts/Module__.js.map +1 -1
  114. package/out/concepts/Namespace__.d.ts +5 -1
  115. package/out/concepts/Namespace__.js +48 -37
  116. package/out/concepts/Namespace__.js.map +1 -1
  117. package/out/concepts/NullLiteral__.d.ts +3 -0
  118. package/out/concepts/NullLiteral__.js +11 -1
  119. package/out/concepts/NullLiteral__.js.map +1 -1
  120. package/out/concepts/NumericLiteral__.d.ts +1 -1
  121. package/out/concepts/NumericLiteral__.js +17 -6
  122. package/out/concepts/NumericLiteral__.js.map +1 -1
  123. package/out/concepts/Param__.d.ts +7 -3
  124. package/out/concepts/Param__.js +64 -28
  125. package/out/concepts/Param__.js.map +1 -1
  126. package/out/concepts/ProcessComponent__.js +6 -6
  127. package/out/concepts/ProcessComponent__.js.map +1 -1
  128. package/out/concepts/ProcessElement__.d.ts +0 -4
  129. package/out/concepts/ProcessElement__.js +123 -54
  130. package/out/concepts/ProcessElement__.js.map +1 -1
  131. package/out/concepts/ProcessOutcome__.js +1 -1
  132. package/out/concepts/ProcessOutcome__.js.map +1 -1
  133. package/out/concepts/Process__.d.ts +7 -1
  134. package/out/concepts/Process__.js +81 -85
  135. package/out/concepts/Process__.js.map +1 -1
  136. package/out/concepts/QueryAggregateExpression__.js +1 -1
  137. package/out/concepts/QueryAggregateExpression__.js.map +1 -1
  138. package/out/concepts/QueryFieldExpression__.d.ts +1 -0
  139. package/out/concepts/QueryFieldExpression__.js +3 -0
  140. package/out/concepts/QueryFieldExpression__.js.map +1 -1
  141. package/out/concepts/QueryFromExpression__.js +2 -2
  142. package/out/concepts/QueryFromExpression__.js.map +1 -1
  143. package/out/concepts/QueryGroupByExpression__.d.ts +3 -0
  144. package/out/concepts/QueryGroupByExpression__.js +20 -0
  145. package/out/concepts/QueryGroupByExpression__.js.map +1 -1
  146. package/out/concepts/QueryJoinExpression__.js +5 -5
  147. package/out/concepts/QueryJoinExpression__.js.map +1 -1
  148. package/out/concepts/QueryLimitExpression__.js +2 -2
  149. package/out/concepts/QueryLimitExpression__.js.map +1 -1
  150. package/out/concepts/QuerySelectExpression__.js +3 -3
  151. package/out/concepts/QuerySelectExpression__.js.map +1 -1
  152. package/out/concepts/Return__.d.ts +4 -1
  153. package/out/concepts/Return__.js +74 -23
  154. package/out/concepts/Return__.js.map +1 -1
  155. package/out/concepts/Role__.d.ts +4 -0
  156. package/out/concepts/Role__.js +13 -4
  157. package/out/concepts/Role__.js.map +1 -1
  158. package/out/concepts/SqlQueryComponent__.js +2 -2
  159. package/out/concepts/SqlQueryComponent__.js.map +1 -1
  160. package/out/concepts/StringLiteral__.d.ts +1 -1
  161. package/out/concepts/StringLiteral__.js +22 -39
  162. package/out/concepts/StringLiteral__.js.map +1 -1
  163. package/out/concepts/StructureProperty__.d.ts +5 -4
  164. package/out/concepts/StructureProperty__.js +55 -26
  165. package/out/concepts/StructureProperty__.js.map +1 -1
  166. package/out/concepts/Structure__.d.ts +44 -30
  167. package/out/concepts/Structure__.js +44 -12
  168. package/out/concepts/Structure__.js.map +1 -1
  169. package/out/concepts/SwitchCase__.js +4 -4
  170. package/out/concepts/SwitchCase__.js.map +1 -1
  171. package/out/concepts/SwitchStatement__.js +2 -2
  172. package/out/concepts/SwitchStatement__.js.map +1 -1
  173. package/out/concepts/TypeAnnotation__.d.ts +5 -5
  174. package/out/concepts/TypeAnnotation__.js +82 -20
  175. package/out/concepts/TypeAnnotation__.js.map +1 -1
  176. package/out/concepts/UnaryExpression__.js +10 -8
  177. package/out/concepts/UnaryExpression__.js.map +1 -1
  178. package/out/concepts/Unparsed__.js +1 -1
  179. package/out/concepts/Unparsed__.js.map +1 -1
  180. package/out/concepts/ValidationRule__.d.ts +1 -0
  181. package/out/concepts/ValidationRule__.js +48 -13
  182. package/out/concepts/ValidationRule__.js.map +1 -1
  183. package/out/concepts/Variable__.d.ts +10 -1
  184. package/out/concepts/Variable__.js +77 -20
  185. package/out/concepts/Variable__.js.map +1 -1
  186. package/out/concepts/ViewComponent__.js +15 -15
  187. package/out/concepts/ViewComponent__.js.map +1 -1
  188. package/out/concepts/ViewElement__.d.ts +17 -11
  189. package/out/concepts/ViewElement__.js +302 -204
  190. package/out/concepts/ViewElement__.js.map +1 -1
  191. package/out/concepts/View__.d.ts +13 -12
  192. package/out/concepts/View__.js +124 -102
  193. package/out/concepts/View__.js.map +1 -1
  194. package/out/concepts/WhileStatement__.js +3 -3
  195. package/out/concepts/WhileStatement__.js.map +1 -1
  196. package/out/concepts/basics/stdlib/index.js +4 -1
  197. package/out/concepts/basics/stdlib/index.js.map +1 -1
  198. package/out/concepts/basics/stdlib/{nasl.validate.d.ts → nasl.auth.d.ts} +0 -0
  199. package/out/concepts/basics/stdlib/nasl.auth.js +30 -0
  200. package/out/concepts/basics/stdlib/nasl.auth.js.map +1 -0
  201. package/out/concepts/basics/stdlib/nasl.browser.d.ts +3 -0
  202. package/out/concepts/basics/stdlib/nasl.browser.js +41 -0
  203. package/out/concepts/basics/stdlib/nasl.browser.js.map +1 -0
  204. package/out/concepts/basics/stdlib/nasl.configuration.d.ts +3 -0
  205. package/out/concepts/basics/stdlib/nasl.configuration.js +25 -0
  206. package/out/concepts/basics/stdlib/nasl.configuration.js.map +1 -0
  207. package/out/concepts/basics/stdlib/nasl.interface.d.ts +2 -0
  208. package/out/concepts/basics/stdlib/nasl.interface.js +4 -4
  209. package/out/concepts/basics/stdlib/nasl.interface.js.map +1 -1
  210. package/out/concepts/basics/stdlib/nasl.ui.js +20 -0
  211. package/out/concepts/basics/stdlib/nasl.ui.js.map +1 -1
  212. package/out/concepts/basics/stdlib/nasl.util.js +138 -18
  213. package/out/concepts/basics/stdlib/nasl.util.js.map +1 -1
  214. package/out/concepts/basics/stdlib/nasl.validation.js +54 -20
  215. package/out/concepts/basics/stdlib/nasl.validation.js.map +1 -1
  216. package/out/concepts/basics/stdlib/reference2TypeAnnotationList.js +1 -1
  217. package/out/concepts/basics/stdlib/reference2TypeAnnotationList.js.map +1 -1
  218. package/out/concepts/basics/types/coreTypeList.js +11 -10
  219. package/out/concepts/basics/types/coreTypeList.js.map +1 -1
  220. package/out/concepts/basics/types/index.d.ts +1 -0
  221. package/out/concepts/basics/types/index.js +3 -1
  222. package/out/concepts/basics/types/index.js.map +1 -1
  223. package/out/concepts/index__.d.ts +1 -0
  224. package/out/concepts/index__.js +1 -0
  225. package/out/concepts/index__.js.map +1 -1
  226. package/out/config.d.ts +1 -2
  227. package/out/config.js +1 -2
  228. package/out/config.js.map +1 -1
  229. package/out/enums/KEYWORDS.d.ts +3 -0
  230. package/out/enums/KEYWORDS.js +1199 -0
  231. package/out/enums/KEYWORDS.js.map +1 -0
  232. package/out/{terms → enums}/LEVEL_NAME_MAP.d.ts +0 -0
  233. package/out/{terms → enums}/LEVEL_NAME_MAP.js +0 -0
  234. package/out/{terms → enums}/LEVEL_NAME_MAP.js.map +1 -1
  235. package/out/eventBus.d.ts +3 -0
  236. package/out/eventBus.js +7 -0
  237. package/out/eventBus.js.map +1 -0
  238. package/out/generator/genBundleFiles.d.ts +7 -2
  239. package/out/generator/genBundleFiles.js +168 -27
  240. package/out/generator/genBundleFiles.js.map +1 -1
  241. package/out/generator/genMetaData.d.ts +20 -20
  242. package/out/generator/genMetaData.js +50 -15
  243. package/out/generator/genMetaData.js.map +1 -1
  244. package/out/index.d.ts +2 -0
  245. package/out/index.js +2 -0
  246. package/out/index.js.map +1 -1
  247. package/out/manager/diagnostic.d.ts +2 -2
  248. package/out/server/createUiTs.d.ts +1 -0
  249. package/out/server/createUiTs.js +49 -5
  250. package/out/server/createUiTs.js.map +1 -1
  251. package/out/server/entity2LogicNamespace.js +38 -23
  252. package/out/server/entity2LogicNamespace.js.map +1 -1
  253. package/out/server/extendBaseNode.d.ts +1 -0
  254. package/out/server/extendBaseNode.js +323 -0
  255. package/out/server/extendBaseNode.js.map +1 -0
  256. package/out/server/getExtensionModules.js +2 -0
  257. package/out/server/getExtensionModules.js.map +1 -1
  258. package/out/server/getFunctions.d.ts +1 -0
  259. package/out/server/getFunctions.js +7 -1
  260. package/out/server/getFunctions.js.map +1 -1
  261. package/out/server/getLogics.js +84 -18
  262. package/out/server/getLogics.js.map +1 -1
  263. package/out/server/getMemberIdentifier.d.ts +16 -1
  264. package/out/server/getMemberIdentifier.js +326 -38
  265. package/out/server/getMemberIdentifier.js.map +1 -1
  266. package/out/server/getProcesses.d.ts +8 -1
  267. package/out/server/getProcesses.js +383 -1
  268. package/out/server/getProcesses.js.map +1 -1
  269. package/out/server/getScope.d.ts +13 -0
  270. package/out/server/getScope.js +61 -0
  271. package/out/server/getScope.js.map +1 -0
  272. package/out/server/index.d.ts +1 -0
  273. package/out/server/index.js +5 -0
  274. package/out/server/index.js.map +1 -1
  275. package/out/server/naslServer.d.ts +36 -57
  276. package/out/server/naslServer.js +689 -615
  277. package/out/server/naslServer.js.map +1 -1
  278. package/out/server/process2LogicNamespace.d.ts +10 -0
  279. package/out/server/process2LogicNamespace.js +29 -1
  280. package/out/server/process2LogicNamespace.js.map +1 -1
  281. package/out/server/translator.d.ts +22 -3
  282. package/out/server/translator.js +369 -123
  283. package/out/server/translator.js.map +1 -1
  284. package/out/service/creator/add.configs.d.ts +1 -0
  285. package/out/service/creator/add.configs.js +68 -0
  286. package/out/service/creator/add.configs.js.map +1 -0
  287. package/out/service/creator/errHandles.d.ts +18 -0
  288. package/out/service/creator/errHandles.js +60 -0
  289. package/out/service/creator/errHandles.js.map +1 -0
  290. package/out/service/creator/index.d.ts +1 -0
  291. package/out/service/creator/index.js +72 -0
  292. package/out/service/creator/index.js.map +1 -0
  293. package/out/service/storage/api.d.ts +18 -0
  294. package/out/service/storage/api.js +17 -0
  295. package/out/service/storage/api.js.map +1 -0
  296. package/out/service/storage/init.js +221 -37
  297. package/out/service/storage/init.js.map +1 -1
  298. package/out/service/storage/service.d.ts +2 -0
  299. package/out/service/storage/service.js +10 -0
  300. package/out/service/storage/service.js.map +1 -0
  301. package/out/service/storage/storagePoint.d.ts +1 -14
  302. package/out/service/storage/storagePoint.js +16 -16
  303. package/out/service/storage/storagePoint.js.map +1 -1
  304. package/out/templator/genCreateBlock.js +6 -6
  305. package/out/templator/genCreateBlock.js.map +1 -1
  306. package/out/templator/genCurdEditMultipleKeyBlock.js +13 -17
  307. package/out/templator/genCurdEditMultipleKeyBlock.js.map +1 -1
  308. package/out/templator/genCurdMultipleKeyBlock.js +11 -11
  309. package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
  310. package/out/templator/genEditTableBlock.js +5 -5
  311. package/out/templator/genEditTableBlock.js.map +1 -1
  312. package/out/templator/genEnumSelectBlock.js +2 -2
  313. package/out/templator/genEnumSelectBlock.js.map +1 -1
  314. package/out/templator/genGetBlock.js +6 -4
  315. package/out/templator/genGetBlock.js.map +1 -1
  316. package/out/templator/genGridViewBlock.d.ts +3 -1
  317. package/out/templator/genGridViewBlock.js +61 -6
  318. package/out/templator/genGridViewBlock.js.map +1 -1
  319. package/out/templator/genQueryComponent.d.ts +2 -0
  320. package/out/templator/genQueryComponent.js +34 -18
  321. package/out/templator/genQueryComponent.js.map +1 -1
  322. package/out/templator/genSelectBlock.js +5 -15
  323. package/out/templator/genSelectBlock.js.map +1 -1
  324. package/out/templator/genTableBlock.d.ts +1 -1
  325. package/out/templator/genTableBlock.js +4 -5
  326. package/out/templator/genTableBlock.js.map +1 -1
  327. package/out/templator/genUpdateBlock.js +10 -11
  328. package/out/templator/genUpdateBlock.js.map +1 -1
  329. package/out/templator/utils.d.ts +16 -5
  330. package/out/templator/utils.js +10 -5
  331. package/out/templator/utils.js.map +1 -1
  332. package/out/test/fixtures/env.js +0 -1
  333. package/out/test/fixtures/env.js.map +1 -1
  334. package/out/test/units/page/Element.spec.js +3 -3
  335. package/out/test/units/page/Element.spec.js.map +1 -1
  336. package/out/test/units/temp/temp.spec.js +1 -1
  337. package/out/test/units/temp/temp.spec.js.map +1 -1
  338. package/out/utils/index.d.ts +6 -0
  339. package/out/utils/index.js +25 -1
  340. package/out/utils/index.js.map +1 -1
  341. package/out/utils/string.d.ts +1 -1
  342. package/out/utils/string.js +38 -9
  343. package/out/utils/string.js.map +1 -1
  344. package/package.json +2 -2
  345. package/src/automate/engine/index.js +95 -119
  346. package/src/automate/engine/operators.js +63 -0
  347. package/src/automate/engine/uniqueName.js +36 -0
  348. package/src/automate/engine/utils.js +63 -19
  349. package/src/common/BaseNode.ts +229 -74
  350. package/src/concepts/App__.ts +92 -85
  351. package/src/concepts/Argument__.ts +23 -3
  352. package/src/concepts/Assignee__.ts +467 -0
  353. package/src/concepts/Assignment__.ts +4 -1
  354. package/src/concepts/BinaryExpression__.ts +9 -7
  355. package/src/concepts/BindAttribute__.ts +69 -9
  356. package/src/concepts/BindDirective__.ts +22 -3
  357. package/src/concepts/BindEvent__.ts +67 -23
  358. package/src/concepts/BooleanLiteral__.ts +8 -0
  359. package/src/concepts/CallFunction__.ts +55 -23
  360. package/src/concepts/CallInterface__.ts +236 -26
  361. package/src/concepts/CallLogic__.ts +111 -52
  362. package/src/concepts/CallQueryComponent__.ts +315 -67
  363. package/src/concepts/Comment__.ts +6 -2
  364. package/src/concepts/CompletionProperty__.ts +5 -1
  365. package/src/concepts/ConfigGroup__.ts +3 -3
  366. package/src/concepts/ConfigProperty__.ts +3 -3
  367. package/src/concepts/Configuration__.ts +3 -3
  368. package/src/concepts/Constant__.ts +14 -2
  369. package/src/concepts/Destination__.ts +123 -37
  370. package/src/concepts/End__.ts +8 -1
  371. package/src/concepts/EntityIndex__.ts +4 -2
  372. package/src/concepts/EntityProperty__.ts +56 -5
  373. package/src/concepts/Entity__.ts +38 -21
  374. package/src/concepts/Enum__.ts +23 -26
  375. package/src/concepts/Event__.ts +3 -3
  376. package/src/concepts/ForEachStatement__.ts +16 -21
  377. package/src/concepts/Function__.ts +13 -13
  378. package/src/concepts/Identifier__.ts +84 -42
  379. package/src/concepts/IfStatement__.ts +4 -4
  380. package/src/concepts/InterfaceParam__.ts +57 -16
  381. package/src/concepts/Interface__.ts +130 -16
  382. package/src/concepts/JSBlock__.ts +4 -0
  383. package/src/concepts/LogicItem__.ts +16 -1
  384. package/src/concepts/Logic__.ts +192 -39
  385. package/src/concepts/MemberExpression__.ts +58 -15
  386. package/src/concepts/Module__.ts +35 -24
  387. package/src/concepts/Namespace__.ts +49 -37
  388. package/src/concepts/NullLiteral__.ts +8 -1
  389. package/src/concepts/NumericLiteral__.ts +17 -6
  390. package/src/concepts/Param__.ts +64 -16
  391. package/src/concepts/ProcessComponent__.ts +6 -6
  392. package/src/concepts/ProcessElement__.ts +149 -44
  393. package/src/concepts/ProcessOutcome__.ts +1 -1
  394. package/src/concepts/Process__.ts +85 -98
  395. package/src/concepts/QueryAggregateExpression__.ts +1 -1
  396. package/src/concepts/QueryFieldExpression__.ts +4 -0
  397. package/src/concepts/QueryFromExpression__.ts +2 -2
  398. package/src/concepts/QueryGroupByExpression__.ts +23 -0
  399. package/src/concepts/QueryJoinExpression__.ts +5 -5
  400. package/src/concepts/QueryLimitExpression__.ts +2 -2
  401. package/src/concepts/QuerySelectExpression__.ts +3 -3
  402. package/src/concepts/Return__.ts +69 -17
  403. package/src/concepts/Role__.ts +5 -4
  404. package/src/concepts/SqlQueryComponent__.ts +2 -2
  405. package/src/concepts/StringLiteral__.ts +21 -39
  406. package/src/concepts/StructureProperty__.ts +50 -18
  407. package/src/concepts/Structure__.ts +32 -10
  408. package/src/concepts/SwitchCase__.ts +4 -4
  409. package/src/concepts/SwitchStatement__.ts +2 -2
  410. package/src/concepts/TypeAnnotation__.ts +66 -15
  411. package/src/concepts/UnaryExpression__.ts +10 -8
  412. package/src/concepts/Unparsed__.ts +1 -1
  413. package/src/concepts/ValidationRule__.ts +44 -14
  414. package/src/concepts/Variable__.ts +70 -16
  415. package/src/concepts/ViewComponent__.ts +15 -15
  416. package/src/concepts/ViewElement__.ts +289 -166
  417. package/src/concepts/View__.ts +135 -69
  418. package/src/concepts/WhileStatement__.ts +4 -4
  419. package/src/concepts/basics/stdlib/index.ts +4 -2
  420. package/src/concepts/basics/stdlib/nasl.auth.ts +26 -0
  421. package/src/concepts/basics/stdlib/nasl.browser.ts +37 -0
  422. package/src/concepts/basics/stdlib/nasl.configuration.ts +21 -0
  423. package/src/concepts/basics/stdlib/nasl.interface.ts +1 -1
  424. package/src/concepts/basics/stdlib/nasl.ui.ts +20 -1
  425. package/src/concepts/basics/stdlib/nasl.util.ts +140 -18
  426. package/src/concepts/basics/stdlib/nasl.validation.ts +45 -11
  427. package/src/concepts/basics/stdlib/reference2TypeAnnotationList.ts +1 -1
  428. package/src/concepts/basics/types/coreTypeList.ts +11 -11
  429. package/src/concepts/basics/types/index.ts +1 -0
  430. package/src/concepts/index__.ts +1 -0
  431. package/src/config.ts +1 -2
  432. package/src/enums/KEYWORDS.ts +1197 -0
  433. package/src/{terms → enums}/LEVEL_NAME_MAP.ts +0 -0
  434. package/src/eventBus.ts +5 -0
  435. package/src/generator/genBundleFiles.ts +182 -30
  436. package/src/generator/genMetaData.ts +72 -21
  437. package/src/index.ts +2 -0
  438. package/src/manager/diagnostic.ts +2 -2
  439. package/src/server/createUiTs.ts +45 -7
  440. package/src/server/entity2LogicNamespace.ts +41 -25
  441. package/src/server/extendBaseNode.ts +318 -0
  442. package/src/server/getExtensionModules.ts +2 -0
  443. package/src/server/getFunctions.ts +6 -0
  444. package/src/server/getLogics.ts +87 -19
  445. package/src/server/getMemberIdentifier.ts +282 -65
  446. package/src/server/getProcesses.ts +397 -4
  447. package/src/server/getScope.ts +67 -0
  448. package/src/server/index.ts +13 -1
  449. package/src/server/naslServer.ts +694 -632
  450. package/src/server/process2LogicNamespace.ts +30 -2
  451. package/src/server/translator.ts +425 -128
  452. package/src/service/config/index.js +1 -1
  453. package/src/service/creator/errHandles.js +5 -2
  454. package/src/service/creator/index.js +0 -6
  455. package/src/service/storage/api.js +14 -0
  456. package/src/service/storage/init.ts +218 -45
  457. package/src/service/storage/service.ts +6 -0
  458. package/src/service/storage/storagePoint.ts +16 -16
  459. package/src/templator/genCreateBlock.ts +6 -6
  460. package/src/templator/genCurdEditMultipleKeyBlock.ts +29 -30
  461. package/src/templator/genCurdMultipleKeyBlock.ts +11 -11
  462. package/src/templator/genEditTableBlock.ts +5 -5
  463. package/src/templator/genEnumSelectBlock.ts +2 -2
  464. package/src/templator/genGetBlock.ts +7 -9
  465. package/src/templator/genGridViewBlock.ts +59 -9
  466. package/src/templator/genQueryComponent.ts +46 -32
  467. package/src/templator/genSelectBlock.ts +5 -15
  468. package/src/templator/genTableBlock.ts +5 -9
  469. package/src/templator/genUpdateBlock.ts +10 -12
  470. package/src/templator/utils.ts +12 -6
  471. package/src/test/fixtures/env.ts +0 -2
  472. package/src/test/units/page/Element.spec.ts +3 -3
  473. package/src/test/units/temp/temp.spec.ts +1 -1
  474. package/src/utils/index.ts +24 -0
  475. package/src/utils/string.ts +39 -9
  476. package/out/concepts/basics/stdlib/nasl.validate.js +0 -527
  477. package/out/concepts/basics/stdlib/nasl.validate.js.map +0 -1
  478. package/out/data/Module.d.ts +0 -34
  479. package/out/data/Module.js +0 -53
  480. package/out/data/Module.js.map +0 -1
  481. package/src/automate/engine/index.d.ts +0 -3
@@ -45,7 +45,7 @@ function genGetTemplate(entity, nameGroup) {
45
45
  }
46
46
  exports.genGetTemplate = genGetTemplate;
47
47
  function genLoadLogic(getLogic, nameGroup) {
48
- const params = [(0, _1.genLogicParam)(`${getLogic.params[0].name}`, 'id')];
48
+ const params = [(0, _1.genLogicParam)(`${getLogic.params[0].name}`, nameGroup.viewParamId)];
49
49
  return utils_1.NaslNode.Logic({
50
50
  name: nameGroup.viewLogicLoad,
51
51
  description: '',
@@ -73,9 +73,11 @@ function genH5GetTemplate(entity, nameGroup) {
73
73
  return `<van-cell-group>
74
74
  ${properties
75
75
  .map((property) => {
76
- let formItem = ` <van-cell isLink title="${property.label || property.name}"`;
76
+ const temptitle = property.label || property.name;
77
+ let formItem = ` <van-cell isLink`;
77
78
  formItem += ' :value="' + (0, _1.getExpression)(property, `${nameGroup.viewVariableEntity}.${property.name}`) + '">';
78
- formItem += ` </van-cell>\n`;
79
+ formItem += `<template #title>${temptitle}</template>`;
80
+ formItem += `<template>{{ ${(0, _1.getExpression)(property, `${nameGroup.viewVariableEntity}.${property.name}`)} }}</template> </van-cell>\n`;
79
81
  return formItem;
80
82
  })
81
83
  .join('')}
@@ -120,7 +122,7 @@ function genGetBlock(entity, view) {
120
122
  "concept": "BindEvent",
121
123
  "arguments": [],
122
124
  "name": "created",
123
- "calleeNamespace": "${view.getNamespace()}.${view.name}.logics",
125
+ "calleeNamespace": "",
124
126
  "calleeName": "${nameGroup.viewLogicLoad}"
125
127
  }
126
128
  ]
@@ -1 +1 @@
1
- {"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":"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"}
@@ -5,12 +5,14 @@ import { NameGroup } from '.';
5
5
  * @param property 实体属性
6
6
  */
7
7
  export declare function genGridViewCardTemplate(property: EntityProperty): string;
8
+ export declare function genH5GridViewCardTemplate(property: EntityProperty): string;
8
9
  /**
9
10
  * 生成表格模板
10
11
  * @param entity 实体
11
12
  * @param nameGroup 命名组
12
13
  */
13
- export declare function genGridViewTemplate(entity: Entity, nameGroup: NameGroup): string;
14
+ export declare function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean): string;
15
+ export declare function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup): string;
14
16
  /**
15
17
  * 生成表格 load 逻辑
16
18
  * @param entity 实体
@@ -23,7 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.genGridViewCardBlock = exports.genGridViewBlock = exports.genGridViewRemoveLogic = exports.genGridViewLoadLogic = exports.genGridViewTemplate = exports.genGridViewCardTemplate = void 0;
26
+ exports.genGridViewCardBlock = exports.genGridViewBlock = exports.genGridViewRemoveLogic = exports.genGridViewLoadLogic = exports.genH5GridViewTemplate = exports.genGridViewTemplate = exports.genH5GridViewCardTemplate = exports.genGridViewCardTemplate = void 0;
27
+ const config_1 = require("../config");
27
28
  const utils = __importStar(require("../utils"));
28
29
  const _1 = require(".");
29
30
  const utils_1 = require("./utils");
@@ -71,12 +72,50 @@ function genGridViewCardTemplate(property) {
71
72
  </u-linear-layout>`;
72
73
  }
73
74
  exports.genGridViewCardTemplate = genGridViewCardTemplate;
75
+ function genH5GridViewCardTemplate(property) {
76
+ const entity = property.entity;
77
+ const parentNode = entity.parentNode;
78
+ const lowerEntityName = utils.firstLowerCase(entity.name);
79
+ let expression = `scope.item.${lowerEntityName}.${property.name}`;
80
+ const title = property.label || property.name;
81
+ if (property.relationEntity) {
82
+ // 有外键关联
83
+ const relationEntity = parentNode?.findEntityByName(property.relationEntity);
84
+ if (relationEntity) {
85
+ const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
86
+ if (displayedProperty) {
87
+ const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
88
+ expression = (0, _1.getExpression)(property, `scope.item.${relationLowerEntityName}.${displayedProperty.name}`);
89
+ }
90
+ else
91
+ return '';
92
+ }
93
+ else
94
+ return '';
95
+ }
96
+ else
97
+ expression = (0, _1.getExpression)(property, `scope.item.${lowerEntityName}.${property.name}`);
98
+ const getText = (property) => {
99
+ const propertyTypeName = property.typeAnnotation.typeName;
100
+ if (propertyTypeName === 'Boolean') {
101
+ return `
102
+ <van-text v-if="${expression}" text="是" display="block"></van-text>
103
+ <van-text v-if="!${expression}" text="否" display="block"></van-text>
104
+ `;
105
+ }
106
+ else {
107
+ return `<van-text :text="${expression}" display="block"></van-text>`;
108
+ }
109
+ };
110
+ return `${getText(property)}`;
111
+ }
112
+ exports.genH5GridViewCardTemplate = genH5GridViewCardTemplate;
74
113
  /**
75
114
  * 生成表格模板
76
115
  * @param entity 实体
77
116
  * @param nameGroup 命名组
78
117
  */
79
- function genGridViewTemplate(entity, nameGroup) {
118
+ function genGridViewTemplate(entity, nameGroup, modifyable) {
80
119
  const properties = entity.properties.filter((0, _1.filterProperty)('inTable'));
81
120
  return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
82
121
  value-field="${nameGroup.viewVariableEntity}.id"
@@ -94,8 +133,8 @@ function genGridViewTemplate(entity, nameGroup) {
94
133
  <u-linear-layout direction="vertical" gap="small">
95
134
  ${properties.map((property) => genGridViewCardTemplate(property) + '\n').join('')}
96
135
  <u-linear-layout gap="small">
97
- <u-link @click="${nameGroup.viewLogicModify || 'modify'}($event, scope)">修改</u-link>
98
- <u-link @click="${nameGroup.viewLogicRemove}($event, scope)">删除</u-link>
136
+ <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>
137
+ <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
99
138
  </u-linear-layout>
100
139
  </u-linear-layout>
101
140
  </u-card>
@@ -104,6 +143,22 @@ function genGridViewTemplate(entity, nameGroup) {
104
143
  `;
105
144
  }
106
145
  exports.genGridViewTemplate = genGridViewTemplate;
146
+ function genH5GridViewTemplate(entity, nameGroup) {
147
+ const properties = entity.properties.filter((0, _1.filterProperty)('inTable'));
148
+ return `<van-grid-view ref="gridView" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
149
+ pageable="auto-more"
150
+ :remote-paging="true"
151
+ :col="2"
152
+ :iffall="false">
153
+ <template #item="scope">
154
+ <van-cardu no-title>
155
+ ${properties.map((property) => genH5GridViewCardTemplate(property) + '\n').join('')}
156
+ </van-cardu>
157
+ </template>
158
+ </van-grid-view>
159
+ `;
160
+ }
161
+ exports.genH5GridViewTemplate = genH5GridViewTemplate;
107
162
  /**
108
163
  * 生成表格 load 逻辑
109
164
  * @param entity 实体
@@ -197,7 +252,7 @@ function genGridViewRemoveLogic(entity, nameGroup) {
197
252
  if (!paramFromLogic) {
198
253
  paramFromLogic = (0, _1.getParamFromLogic)(deleteLogic, 'id');
199
254
  }
200
- return (0, _1.genLogicParam)(paramFromLogic.name, `scope.item.${lowerEntityName}.id`);
255
+ return (0, _1.genLogicParam)(paramFromLogic.name, `scope.item.${lowerEntityName}.${paramFromLogic.name}`);
201
256
  }),
202
257
  }),
203
258
  (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'),
@@ -244,7 +299,7 @@ function genGridViewBlock(entity, view) {
244
299
  newLogics.push(entityLogic);
245
300
  return `
246
301
  <template>
247
- ${genGridViewTemplate(entity, nameGroup)}
302
+ ${config_1.config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup) : genGridViewTemplate(entity, nameGroup)}
248
303
  </template>
249
304
  <definition>
250
305
  {
@@ -1 +1 @@
1
- {"version":3,"file":"genGridViewBlock.js","sourceRoot":"","sources":["../../src/templator/genGridViewBlock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"genGridViewBlock.js","sourceRoot":"","sources":["../../src/templator/genGridViewBlock.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ export declare function genQueryStructure(allEntities: Array<Entity>, nameGroup:
4
4
  concept: string;
5
5
  name: string;
6
6
  properties: any[];
7
+ origin: "CallQueryComponent";
7
8
  };
8
9
  export declare function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGroup, supportFilter: boolean, supportSort: boolean): {
9
10
  concept: string;
@@ -29,4 +30,5 @@ export declare function genEditQueryStructure(allEntities: Array<Entity>, nameGr
29
30
  concept: string;
30
31
  name: string;
31
32
  properties: any[];
33
+ origin: "CallQueryComponent";
32
34
  };
@@ -31,13 +31,14 @@ function genQueryStructure(allEntities, nameGroup) {
31
31
  allEntities = Array.from(new Set(allEntities));
32
32
  return utils_1.NaslNode.Structure({
33
33
  name: nameGroup.structure,
34
- properties: allEntities.map((entity) => (utils_1.NaslNode.StructureProperty({
34
+ origin: 'CallQueryComponent',
35
+ properties: allEntities.map((entity) => utils_1.NaslNode.StructureProperty({
35
36
  name: utils.firstLowerCase(entity.name),
36
37
  typeAnnotation: utils_1.NaslTypeAnnotation.Reference({
37
38
  typeNamespace: entity.getNamespace(),
38
39
  typeName: entity.name,
39
40
  }),
40
- }))),
41
+ })),
41
42
  });
42
43
  }
43
44
  exports.genQueryStructure = genQueryStructure;
@@ -96,7 +97,7 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
96
97
  return utils_1.NaslQueryExpression.QueryJoinExpression({
97
98
  entityNamespace: relationEntity.getNamespace(),
98
99
  entityName: relationEntity.name,
99
- joinType: 'INNER',
100
+ joinType: 'LEFT',
100
101
  onExpressions: [
101
102
  utils_1.NaslLogicItem.BinaryExpression({
102
103
  operator: '==',
@@ -118,17 +119,20 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
118
119
  });
119
120
  }),
120
121
  });
121
- const where = supportFilter && genWhereExpression(entity);
122
+ const where = supportFilter ? genWhereExpression(entity) : undefined;
122
123
  return utils_1.NaslLogicItem.Assignment({
123
124
  left: utils_1.NaslLogicItem.Identifier({
124
125
  name: 'result',
125
126
  }),
126
127
  right: utils_1.NaslQueryExpression.CallQueryComponent({
127
128
  label: '数据查询',
128
- typeAnnotation: utils_1.NaslTypeAnnotation.Reference({
129
- typeNamespace: `${parentNamespace}.structures`,
130
- typeName: nameGroup.structure,
131
- }),
129
+ ideVersion: '2.11',
130
+ typeAnnotation: utils_1.NaslCollectionTypeAnnotation.PageOf([
131
+ utils_1.NaslTypeAnnotation.Reference({
132
+ typeNamespace: `${parentNamespace}.structures`,
133
+ typeName: nameGroup.structure,
134
+ }),
135
+ ]),
132
136
  select: utils_1.NaslQueryExpression.QuerySelectExpression({
133
137
  label: '查询组件Select子句',
134
138
  distinct: false,
@@ -138,7 +142,7 @@ function genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort)
138
142
  from,
139
143
  where,
140
144
  groupBy: [],
141
- having: [],
145
+ having: null,
142
146
  orderBy: supportSort ? [
143
147
  utils_1.NaslQueryExpression.QueryOrderByExpression({
144
148
  label: '查询组件OrderBy元素',
@@ -192,11 +196,7 @@ function genQueryLogic(allEntities, nameGroup, supportFilter, supportSort, paren
192
196
  }),
193
197
  ],
194
198
  variables: [],
195
- body: [
196
- utils_1.NaslLogicItem.Start,
197
- genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort),
198
- utils_1.NaslLogicItem.End,
199
- ],
199
+ body: [utils_1.NaslLogicItem.Start, genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort), utils_1.NaslLogicItem.End],
200
200
  playground: [],
201
201
  });
202
202
  if (supportSort) {
@@ -232,7 +232,7 @@ async function joinEntity(callQueryComponent, entity, recordStructure) {
232
232
  // 一般左联是自动有的了
233
233
  const rightProperty = entity.properties.find((property) => property.relationEntity === lastEntity.name);
234
234
  if (rightProperty) {
235
- const leftProperty = lastEntity.properties.find((property) => property.name === rightProperty.name);
235
+ const leftProperty = lastEntity.properties.find((property) => property.name === rightProperty.relationProperty);
236
236
  joinInfo = {
237
237
  leftProperty,
238
238
  rightProperty,
@@ -241,7 +241,7 @@ async function joinEntity(callQueryComponent, entity, recordStructure) {
241
241
  else {
242
242
  const leftProperty = lastEntity.properties.find((property) => property.relationEntity === entity.name);
243
243
  if (leftProperty) {
244
- const rightProperty = entity.properties.find((property) => property.name === leftProperty.name);
244
+ const rightProperty = entity.properties.find((property) => property.name === leftProperty.relationProperty);
245
245
  joinInfo = {
246
246
  leftProperty,
247
247
  rightProperty,
@@ -280,20 +280,36 @@ async function joinEntity(callQueryComponent, entity, recordStructure) {
280
280
  }), recordStructure, 'properties');
281
281
  recordStructure.addProperty(structureProperty);
282
282
  }
283
+ else {
284
+ queryJoinExpression.onExpressions.push(utils_1.NaslLogicItem.BinaryExpression({
285
+ operator: '==',
286
+ left: utils_1.NaslQueryExpression.QueryFieldExpression({
287
+ label: '查询组件实体属性',
288
+ isDotStar: false,
289
+ entityAsName: lastEntity.name,
290
+ }),
291
+ right: utils_1.NaslQueryExpression.QueryFieldExpression({
292
+ label: '查询组件实体属性',
293
+ isDotStar: false,
294
+ entityAsName: entity.name,
295
+ }),
296
+ }));
297
+ }
283
298
  const newJoinPartLogicItem = concepts_1.QueryJoinExpression.from(queryJoinExpression, callQueryComponent, 'joinParts');
284
299
  from.addJoinPart(newJoinPartLogicItem);
300
+ callQueryComponent.saveStructure();
285
301
  }
286
302
  exports.joinEntity = joinEntity;
287
303
  exports.default = genQueryAssignment;
288
304
  function genEditQueryStructure(allEntities, nameGroup) {
289
305
  allEntities = Array.from(new Set(allEntities));
290
- const properties = allEntities.map((entity) => (utils_1.NaslNode.StructureProperty({
306
+ const properties = allEntities.map((entity) => utils_1.NaslNode.StructureProperty({
291
307
  name: utils.firstLowerCase(entity.name),
292
308
  typeAnnotation: utils_1.NaslTypeAnnotation.Reference({
293
309
  typeNamespace: entity.getNamespace(),
294
310
  typeName: entity.name,
295
311
  }),
296
- })));
312
+ }));
297
313
  properties.push(utils_1.NaslNode.StructureProperty({
298
314
  name: 'editing',
299
315
  typeAnnotation: utils_1.NaslCoreTypeAnnotation.String,
@@ -1 +1 @@
1
- {"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"genQueryComponent.js","sourceRoot":"","sources":["../../src/templator/genQueryComponent.ts"],"names":[],"mappings":"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"}
@@ -36,8 +36,8 @@ const utils_1 = require("./utils");
36
36
  */
37
37
  function genSelectTemplate(property, nameGroup) {
38
38
  return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
39
- text-field="${nameGroup.viewVariableEntity}.${property.name}"
40
- value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
39
+ text-field="${nameGroup.lowerEntity}.${property.name}"
40
+ value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
41
41
  </u-select>`;
42
42
  }
43
43
  exports.genSelectTemplate = genSelectTemplate;
@@ -50,8 +50,8 @@ exports.genSelectTemplate = genSelectTemplate;
50
50
  function genH5SelectTemplate(property, nameGroup) {
51
51
  const label = property.label || property.name;
52
52
  return `<van-cascader title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
53
- text-field="${nameGroup.viewVariableEntity}.${property.name}"
54
- value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true" v-model="${nameGroup.viewVariableEntity}.${property.name}" labelField="${label}">
53
+ text-field="${nameGroup.lowerEntity}.${property.name}"
54
+ value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true" labelField="${label}">
55
55
  </van-cascader>`;
56
56
  }
57
57
  exports.genH5SelectTemplate = genH5SelectTemplate;
@@ -110,7 +110,7 @@ function genSelectBlock(entity, view) {
110
110
  const viewElementMainView = view.getViewElementUniqueName('select');
111
111
  const nameGroup = (0, _1.genUniqueQueryNameGroup)(parentNode, view, viewElementMainView, false);
112
112
  nameGroup.viewElementMainView = viewElementMainView;
113
- nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
113
+ nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
114
114
  const displayedProperty = (0, _1.getFirstDisplayedProperty)(entity);
115
115
  const allEntities = [
116
116
  entity,
@@ -131,16 +131,6 @@ function genSelectBlock(entity, view) {
131
131
  "viewLogics": [
132
132
  ${JSON.stringify(genLoadSelectLogic(entity, nameGroup, newLogic))}
133
133
  ],
134
- "viewVariables": [
135
- {
136
- "concept": "Variable",
137
- "name": "${nameGroup.viewVariableEntity}",
138
- "typeAnnotation": ${JSON.stringify(utils_1.NaslTypeAnnotation.Reference({
139
- typeNamespace: entity.getNamespace(),
140
- typeName: entity.name,
141
- }))}
142
- }
143
- ],
144
134
  "logics": ${JSON.stringify(newLogics)},
145
135
  "structures": ${JSON.stringify(newStructures)}
146
136
  }
@@ -1 +1 @@
1
- {"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,wBAAmI;AACnI,mCAGiB;AAEjB;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,QAAwB,EAAE,SAAoB;IAC5E,OAAO,8CAA8C,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBACnJ,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI;mBAC5C,SAAS,CAAC,kBAAkB;YACnC,CAAC;AACb,CAAC;AALD,8CAKC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,QAAwB,EAAE,SAAoB;IAC9E,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC;IAC9C,OAAO,oDAAoD,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBACzJ,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI;mBAC5C,SAAS,CAAC,kBAAkB,yDAAyD,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI,iBAAiB,KAAK;gBAC3J,CAAC;AACjB,CAAC;AAND,kDAMC;AAED,SAAgB,kBAAkB,CAAC,MAAc,EAAE,SAAoB,EAAE,QAAa;IAClF,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IACxD,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG;QACX,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;QAC1D,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;KAC7D,CAAC;IACF,OAAO,gBAAQ,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC,aAAa;QAC7B,MAAM,EAAE;YACJ,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,4BAAoB,CAAC,gBAAgB;aACxD,CAAC;SACL;QACD,OAAO,EAAE;YACL,gBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,oCAA4B,CAAC,MAAM,CAAC;oBAChD,0BAAkB,CAAC,SAAS,CAAC;wBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;wBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;qBAChC,CAAC;iBACL,CAAC;aACL,CAAC;SACL;QACD,SAAS,EAAE,EAAgB;QAC3B,IAAI,EAAE;YACF,qBAAa,CAAC,KAAK;YACnB,qBAAa,CAAC,UAAU,CAAC;gBACrB,IAAI,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC3B,IAAI,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,qBAAa,CAAC,SAAS,CAAC;oBAC3B,eAAe,EAAE,GAAG,eAAe,SAAS;oBAC5C,UAAU,EAAE,QAAQ,CAAC,IAAI;oBACzB,SAAS,EAAE,MAAM;iBACpB,CAAC;aACL,CAAC;YACF,qBAAa,CAAC,GAAG;SACpB;KACJ,CAAC,CAAC;AACP,CAAC;AA1CD,gDA0CC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,MAAc,EAAE,IAAU;IACrD,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IAExD,MAAM,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,IAAA,0BAAuB,EAAC,UAAU,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,CAAC,CAAC;IACxF,SAAS,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACpD,SAAS,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE7F,MAAM,iBAAiB,GAAG,IAAA,4BAAyB,EAAC,MAAM,CAAC,CAAC;IAE5D,MAAM,WAAW,GAAG;QAChB,MAAM;KACT,CAAC;IAEF,MAAM,aAAa,GAAe;QAC9B,IAAA,oBAAiB,EAAC,WAAW,EAAE,SAAS,CAAC;KAC5C,CAAC;IACF,MAAM,QAAQ,GAAG,IAAA,gBAAa,EAAC,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACjF,MAAM,SAAS,GAAe;QAC1B,QAAQ;KACX,CAAC;IAEF,OAAO;MACL,eAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,SAAS,CAAC;;;;;;UAMvH,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;;;;;uBAKlD,SAAS,CAAC,kBAAkB;iCAClB,IAAI,CAAC,SAAS,CAAC,0BAAkB,CAAC,SAAS,CAAC;QACrE,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;QACpC,QAAQ,EAAE,MAAM,CAAC,IAAI;KACxB,CAAC,CAAC;;;gBAGS,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;oBACrB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;;;CAGhD,CAAC;AACF,CAAC;AA9CD,wCA8CC;AAED,kBAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@ export declare function genTableColumnTemplate(property: EntityProperty): string
10
10
  * @param entity 实体
11
11
  * @param nameGroup 命名组
12
12
  */
13
- export declare function genTableTemplate(entity: Entity, nameGroup: NameGroup): string;
13
+ export declare function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean): string;
14
14
  /**
15
15
  * 生成表格 load 逻辑
16
16
  * @param entity 实体
@@ -68,7 +68,7 @@ exports.genTableColumnTemplate = genTableColumnTemplate;
68
68
  * @param entity 实体
69
69
  * @param nameGroup 命名组
70
70
  */
71
- function genTableTemplate(entity, nameGroup) {
71
+ function genTableTemplate(entity, nameGroup, modifyable) {
72
72
  const properties = entity.properties.filter((0, _1.filterProperty)('inTable'));
73
73
  return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
74
74
  value-field="${nameGroup.viewVariableEntity}.id"
@@ -80,8 +80,8 @@ function genTableTemplate(entity, nameGroup) {
80
80
  <u-table-view-column title="操作">
81
81
  <template #cell="scope">
82
82
  <u-linear-layout gap="small">
83
- <u-link @click="${nameGroup.viewLogicModify || 'modify'}($event, scope)">修改</u-link>
84
- <u-link @click="${nameGroup.viewLogicRemove}($event, scope)">删除</u-link>
83
+ <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>
84
+ <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
85
85
  </u-linear-layout>
86
86
  </template>
87
87
  </u-table-view-column>
@@ -150,7 +150,6 @@ function genTableRemoveLogic(entity, nameGroup) {
150
150
  const parentNode = entity.parentNode;
151
151
  const parentNamespace = parentNode?.getNamespace();
152
152
  const ns = entity.ns;
153
- console.log(ns);
154
153
  const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
155
154
  const idPropertys = entity.properties.filter((property) => property.primaryKey);
156
155
  return utils_1.NaslNode.Logic({
@@ -183,7 +182,7 @@ function genTableRemoveLogic(entity, nameGroup) {
183
182
  if (!paramFromLogic) {
184
183
  paramFromLogic = (0, _1.getParamFromLogic)(deleteLogic, 'id');
185
184
  }
186
- return (0, _1.genLogicParam)(paramFromLogic.name, `scope.item.${lowerEntityName}.id`);
185
+ return (0, _1.genLogicParam)(paramFromLogic.name, `scope.item.${lowerEntityName}.${paramFromLogic.name}`);
187
186
  }),
188
187
  }),
189
188
  (0, _1.genCallComponentLogic)(nameGroup.viewElementMainView, 'reload'),
@@ -1 +1 @@
1
- {"version":3,"file":"genTableBlock.js","sourceRoot":"","sources":["../../src/templator/genTableBlock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"genTableBlock.js","sourceRoot":"","sources":["../../src/templator/genTableBlock.ts"],"names":[],"mappings":"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"}