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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/out/natural/transforms/transform2LogicItem.d.ts +4 -0
  2. package/out/natural/transforms/transform2LogicItem.d.ts.map +1 -1
  3. package/out/natural/transforms/transform2LogicItem.js +130 -88
  4. package/out/natural/transforms/transform2LogicItem.js.map +1 -1
  5. package/out/server/checker/continue.d.ts +1 -1
  6. package/out/server/checker/continue.d.ts.map +1 -1
  7. package/out/server/checker/continue.js +9 -6
  8. package/out/server/checker/continue.js.map +1 -1
  9. package/out/server/checker/identifier.d.ts +5 -0
  10. package/out/server/checker/identifier.d.ts.map +1 -0
  11. package/out/server/checker/identifier.js +43 -0
  12. package/out/server/checker/identifier.js.map +1 -0
  13. package/out/server/checker/index.d.ts +3 -1
  14. package/out/server/checker/index.d.ts.map +1 -1
  15. package/out/server/checker/index.js +14 -24
  16. package/out/server/checker/index.js.map +1 -1
  17. package/out/server/naslServer.d.ts.map +1 -1
  18. package/out/server/naslServer.js +68 -54
  19. package/out/server/naslServer.js.map +1 -1
  20. package/out/server/translator.d.ts.map +1 -1
  21. package/out/server/translator.js +5 -0
  22. package/out/server/translator.js.map +1 -1
  23. package/out/service/instruct-ruler/rules/backend-translator.d.ts +3 -0
  24. package/out/service/instruct-ruler/rules/backend-translator.d.ts.map +1 -0
  25. package/out/service/instruct-ruler/rules/backend-translator.js +39 -0
  26. package/out/service/instruct-ruler/rules/backend-translator.js.map +1 -0
  27. package/out/service/instruct-ruler/rules/has-uuid-cache.d.ts.map +1 -1
  28. package/out/service/instruct-ruler/rules/has-uuid-cache.js +1 -2
  29. package/out/service/instruct-ruler/rules/has-uuid-cache.js.map +1 -1
  30. package/out/service/instruct-ruler/rules/index.d.ts.map +1 -1
  31. package/out/service/instruct-ruler/rules/index.js +2 -0
  32. package/out/service/instruct-ruler/rules/index.js.map +1 -1
  33. package/out/service/instruct-ruler/rules/is-view-logic.d.ts.map +1 -1
  34. package/out/service/instruct-ruler/rules/is-view-logic.js +1 -2
  35. package/out/service/instruct-ruler/rules/is-view-logic.js.map +1 -1
  36. package/out/service/instruct-ruler/storage.d.ts +4 -0
  37. package/out/service/instruct-ruler/storage.d.ts.map +1 -1
  38. package/out/service/instruct-ruler/storage.js +8 -1
  39. package/out/service/instruct-ruler/storage.js.map +1 -1
  40. package/package.json +10 -10
@@ -34,6 +34,10 @@ export declare function fixExpression(arg: any, options: TransformOptions, suppo
34
34
  * 铺平点选表达式
35
35
  */
36
36
  export declare function flatMemberExpression(node: babelTypes.Node): Array<babelTypes.Node>;
37
+ /**
38
+ * 将铺平的点选表达式列表转换回 MemberExpression
39
+ */
40
+ export declare function unflatMemberExpression(nodes: Array<babelTypes.Identifier>, options: TransformOptions, memberExpression?: naslTypes.MemberExpression, namespace?: string): naslTypes.MemberExpression;
37
41
  export declare function flatMembers(node: naslTypes.MemberExpression): Array<naslTypes.MemberExpression>;
38
42
  export declare function flatMatchPatternsExpression(node: any): Array<babelTypes.Node>;
39
43
  export declare function flatIfStatement(node: any): Array<babelTypes.Node>;
@@ -1 +1 @@
1
- {"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transform2LogicItem.d.ts","sourceRoot":"","sources":["../../../src/natural/transforms/transform2LogicItem.ts"],"names":[],"mappings":"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"}
@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.transformCall2CallViewLogic = exports.transformArrowFunction2Match = exports.transformCall2Extension = exports.transformCall2Connector = exports.transformCall2Interface = exports.transformAlert2ShowMessage = exports.transformForEach2ForEachStatement = exports.transformForOf2ForEachStatement = exports.transform2ForEachStatement = exports.transformMap2ListTransform = exports.transform2UIFunction = exports.transformCall2CallFunction = exports.transform2CallFunction = exports.transformCall2JSONFunctions = exports.transformCall2Logging = exports.transformCall2ConsoleLog = exports.transformCall2CallDataSourceLogic = exports.transformCall2CallEntityLogic = exports.transformCall2CallViewElementLogic = exports.transformCallCall2Match = exports.transformMemberExpression = exports.transformNewExpression = exports.transform2NewComposite = exports.transform2Comment = exports.transform2StringInterpolation = exports.transformReturnStatement2AssignmentOrEnd = exports.transform2NullLiteral = exports.transform2NumericLiteral = exports.transform2DirectiveLiteral = exports.transform2StringLiteral = exports.transform2BooleanLiteral = exports.transformUpdateExpression2Assignment = exports.transform2Assignment = exports.transform2AnonymousFunction = exports.transformIdentifier = exports.transformSwitchStatement2Match = exports.transform2WhileStatement = exports.transform2Break = exports.transform2Continue = exports.transform2IfStatement = exports.transform2BinaryExpression = exports.transformCallExpressionToBinaryExpression = exports.transform2Param = exports.fixLogicNode = exports.flatIfStatement = exports.flatMatchPatternsExpression = exports.flatMembers = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
7
- exports.transform2LogicItem = exports.transformCall2Paginate = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = void 0;
6
+ exports.transformArrowFunction2Match = exports.transformCall2Extension = exports.transformCall2Connector = exports.transformCall2Interface = exports.transformAlert2ShowMessage = exports.transformForEach2ForEachStatement = exports.transformForOf2ForEachStatement = exports.transform2ForEachStatement = exports.transformMap2ListTransform = exports.transform2UIFunction = exports.transformCall2CallFunction = exports.transform2CallFunction = exports.transformCall2JSONFunctions = exports.transformCall2Logging = exports.transformCall2ConsoleLog = exports.transformCall2CallDataSourceLogic = exports.transformCall2CallEntityLogic = exports.transformCall2CallViewElementLogic = exports.transformCallCall2Match = exports.transformMemberExpression = exports.transformNewExpression = exports.transform2NewComposite = exports.transform2Comment = exports.transform2StringInterpolation = exports.transformReturnStatement2AssignmentOrEnd = exports.transform2NullLiteral = exports.transform2NumericLiteral = exports.transform2DirectiveLiteral = exports.transform2StringLiteral = exports.transform2BooleanLiteral = exports.transformUpdateExpression2Assignment = exports.transform2Assignment = exports.transform2AnonymousFunction = exports.transformIdentifier = exports.transformSwitchStatement2Match = exports.transform2WhileStatement = exports.transform2Break = exports.transform2Continue = exports.transform2IfStatement = exports.transform2BinaryExpression = exports.transformCallExpressionToBinaryExpression = exports.transform2Param = exports.fixLogicNode = exports.flatIfStatement = exports.flatMatchPatternsExpression = exports.flatMembers = exports.unflatMemberExpression = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
7
+ exports.transform2LogicItem = exports.transformCall2Paginate = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = void 0;
8
8
  const utils_1 = require("./utils");
9
9
  const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
10
10
  const utils_2 = require("../../utils");
@@ -132,6 +132,47 @@ function flatMemberExpression(node) {
132
132
  return [node];
133
133
  }
134
134
  exports.flatMemberExpression = flatMemberExpression;
135
+ /**
136
+ * 将铺平的点选表达式列表转换回 MemberExpression
137
+ */
138
+ function unflatMemberExpression(nodes, options, memberExpression, namespace) {
139
+ const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
140
+ // 如果 nodes 为空,直接返回当前的 memberExpression
141
+ if (nodes.length === 0) {
142
+ return memberExpression;
143
+ }
144
+ let newMemberExpression = null;
145
+ let remainingNodes = null;
146
+ // 首次调用时,如果 namespace 存在,构建一个 MemberExpression
147
+ if (namespace) {
148
+ const object = nodes[0];
149
+ const property = nodes[1];
150
+ newMemberExpression = new utils_1.naslTypes.MemberExpression({
151
+ object: new utils_1.naslTypes.Identifier({
152
+ namespace, // 只有第一个 Identifier 带上 namespace
153
+ name: object.name,
154
+ }),
155
+ property: transformNodeFunction(property, options),
156
+ });
157
+ remainingNodes = nodes.slice(2); // 跳过前两个节点
158
+ }
159
+ else {
160
+ // 后续递归调用时,逐个添加剩余的节点
161
+ const property = nodes[0];
162
+ newMemberExpression = new utils_1.naslTypes.MemberExpression({
163
+ object: memberExpression, // 使用当前的 memberExpression 作为 object
164
+ property: transformNodeFunction(property, options),
165
+ });
166
+ remainingNodes = nodes.slice(1); // 跳过当前节点
167
+ }
168
+ // 如果还有剩余的节点,递归处理
169
+ if (remainingNodes.length > 0) {
170
+ return unflatMemberExpression(remainingNodes, options, newMemberExpression);
171
+ }
172
+ // 返回最终的 MemberExpression
173
+ return newMemberExpression;
174
+ }
175
+ exports.unflatMemberExpression = unflatMemberExpression;
135
176
  /**
136
177
  * 铺平链式调用表达式
137
178
  */
@@ -344,6 +385,17 @@ function transform2NewExpression(calleeName, node, options) {
344
385
  members,
345
386
  }));
346
387
  }
388
+ else if (/^(app\..+?)\.variables\.(.+)$/.test(calleeName)) {
389
+ let expression = members[0]?.object;
390
+ if (!members.length) {
391
+ sliceMembers = true;
392
+ expression = transformNodeFunction(arg?.value, options);
393
+ }
394
+ rights.push(new utils_1.naslTypes.SelectMembers({
395
+ expression,
396
+ members,
397
+ }));
398
+ }
347
399
  else {
348
400
  const newExpression = transformNodeFunction(expression[0], options);
349
401
  sliceMembers = newExpression?.concept !== 'Identifier';
@@ -442,6 +494,17 @@ function transform2NewExpression(calleeName, node, options) {
442
494
  members,
443
495
  }));
444
496
  }
497
+ else if (/^(app\..+?)\.variables\.(.+)$/.test(calleeName)) {
498
+ let expression = members[0]?.object;
499
+ if (!members.length) {
500
+ sliceMembers = true;
501
+ expression = transformNodeFunction(arg?.value, options);
502
+ }
503
+ rights.push(new utils_1.naslTypes.SelectMembers({
504
+ expression,
505
+ members,
506
+ }));
507
+ }
445
508
  else {
446
509
  const newExpression = transformNodeFunction(expression[0], options);
447
510
  sliceMembers = newExpression?.concept !== 'Identifier';
@@ -522,74 +585,7 @@ function transform2NewExpression(calleeName, node, options) {
522
585
  });
523
586
  }
524
587
  if (calleeName === 'NewAnonymousStructure') {
525
- const properties = [];
526
- const rights = [];
527
- const structureProperties = [];
528
- const assignmentLines = [];
529
- const newProperties = node?.arguments?.[0]?.properties?.filter((arg) => arg?.value?.type !== 'ConditionalExpression');
530
- let idx = 0;
531
- newProperties?.forEach((arg, index) => {
532
- properties.push(transformNodeFunction(arg.key, options));
533
- const calleeName = (0, utils_1.generate)(arg.value).code;
534
- let sliceMembers = false;
535
- if (arg.value.type === 'MemberExpression') {
536
- const expression = flatMemberExpression(arg.value);
537
- let members = flatMembers(transformNodeFunction(arg.value, options));
538
- if (calleeName?.includes('app.enums')) {
539
- rights.push(new utils_1.naslTypes.SelectMembers({
540
- expression: members[0]?.object,
541
- members,
542
- }));
543
- }
544
- else {
545
- const newExpression = transformNodeFunction(expression[0], options);
546
- sliceMembers = newExpression?.concept !== 'Identifier';
547
- if (sliceMembers) {
548
- members = [];
549
- }
550
- rights.push(new utils_1.naslTypes.SelectMembers({
551
- expression: newExpression,
552
- members,
553
- }));
554
- }
555
- if (arg?.value) {
556
- let rightIndex = [index - idx, members.length - 1];
557
- if (sliceMembers) {
558
- rightIndex = [index - idx];
559
- }
560
- assignmentLines.push(new utils_1.naslTypes.AssignmentLine({
561
- leftIndex: [0, index],
562
- rightIndex,
563
- }));
564
- }
565
- }
566
- else {
567
- if (arg.value && arg.value?.name !== 'undefined') {
568
- rights.push(new utils_1.naslTypes.SelectMembers({
569
- expression: transformNodeFunction(arg.value, options)
570
- }));
571
- if (arg?.value) {
572
- assignmentLines.push(new utils_1.naslTypes.AssignmentLine({
573
- leftIndex: [0, index],
574
- rightIndex: [index - idx],
575
- }));
576
- }
577
- }
578
- else {
579
- idx += 1;
580
- }
581
- }
582
- structureProperties.push(new utils_1.naslTypes.StructureProperty({
583
- name: arg?.key?.name,
584
- typeAnnotation: null
585
- }));
586
- });
587
- return new utils_1.naslTypes.NewComposite({
588
- typeAnnotation: utils_1.naslTypes.TypeAnnotation.createTypeAnonymousStructure(structureProperties),
589
- properties,
590
- rights,
591
- assignmentLines
592
- });
588
+ return transform2NewComposite(node, options);
593
589
  }
594
590
  (0, utils_1.throwError)(`Unhandled ArrowFunctionExpression node ${node.type}`);
595
591
  }
@@ -1024,32 +1020,68 @@ function transform2NewComposite(node, options) {
1024
1020
  const rights = [];
1025
1021
  const structureProperties = [];
1026
1022
  const assignmentLines = [];
1027
- const newProperties = node?.properties?.filter((arg) => arg?.value?.type !== 'ConditionalExpression');
1023
+ const newProperties = (node?.properties || node?.arguments?.[0]?.properties)?.filter((arg) => arg?.value?.type !== 'ConditionalExpression');
1024
+ let idx = 0;
1028
1025
  newProperties?.forEach((arg, index) => {
1029
1026
  properties.push(transformNodeFunction(arg.key, options));
1027
+ const calleeName = (0, utils_1.generate)(arg.value).code;
1028
+ let sliceMembers = false;
1030
1029
  if (arg.value.type === 'MemberExpression') {
1031
1030
  const expression = flatMemberExpression(arg.value);
1032
- const members = flatMembers(transformNodeFunction(arg.value, options));
1033
- rights.push(new utils_1.naslTypes.SelectMembers({
1034
- expression: transformNodeFunction(expression[0], options),
1035
- members,
1036
- }));
1031
+ let members = flatMembers(transformNodeFunction(arg.value, options));
1032
+ if (calleeName?.includes('app.enums')) {
1033
+ rights.push(new utils_1.naslTypes.SelectMembers({
1034
+ expression: members[0]?.object,
1035
+ members,
1036
+ }));
1037
+ }
1038
+ else if (/^(app\..+?)\.variables\.(.+)$/.test(calleeName)) {
1039
+ let expression = members[0]?.object;
1040
+ if (!members.length) {
1041
+ sliceMembers = true;
1042
+ expression = transformNodeFunction(arg?.value, options);
1043
+ }
1044
+ rights.push(new utils_1.naslTypes.SelectMembers({
1045
+ expression,
1046
+ members,
1047
+ }));
1048
+ }
1049
+ else {
1050
+ const newExpression = transformNodeFunction(expression[0], options);
1051
+ sliceMembers = newExpression?.concept !== 'Identifier';
1052
+ if (sliceMembers) {
1053
+ members = [];
1054
+ }
1055
+ rights.push(new utils_1.naslTypes.SelectMembers({
1056
+ expression: newExpression,
1057
+ members,
1058
+ }));
1059
+ }
1037
1060
  if (arg?.value) {
1061
+ let rightIndex = [index - idx, members.length - 1];
1062
+ if (sliceMembers) {
1063
+ rightIndex = [index - idx];
1064
+ }
1038
1065
  assignmentLines.push(new utils_1.naslTypes.AssignmentLine({
1039
1066
  leftIndex: [0, index],
1040
- rightIndex: [index, members.length - 1],
1067
+ rightIndex,
1041
1068
  }));
1042
1069
  }
1043
1070
  }
1044
1071
  else {
1045
- rights.push(new utils_1.naslTypes.SelectMembers({
1046
- expression: transformNodeFunction(arg?.value, options)
1047
- }));
1048
- if (arg?.value) {
1049
- assignmentLines.push(new utils_1.naslTypes.AssignmentLine({
1050
- leftIndex: [0, index],
1051
- rightIndex: [index],
1072
+ if (arg.value && arg.value?.name !== 'undefined') {
1073
+ rights.push(new utils_1.naslTypes.SelectMembers({
1074
+ expression: transformNodeFunction(arg.value, options)
1052
1075
  }));
1076
+ if (arg?.value) {
1077
+ assignmentLines.push(new utils_1.naslTypes.AssignmentLine({
1078
+ leftIndex: [0, index],
1079
+ rightIndex: [index - idx],
1080
+ }));
1081
+ }
1082
+ }
1083
+ else {
1084
+ idx += 1;
1053
1085
  }
1054
1086
  }
1055
1087
  structureProperties.push(new utils_1.naslTypes.StructureProperty({
@@ -1129,10 +1161,20 @@ function transformMemberExpression(node, options) {
1129
1161
  const regex = /^(app\..+?)\.variables\.(.+)$/;
1130
1162
  if (regex.test(calleeName)) {
1131
1163
  const [, namespace, variableName] = calleeName.match(regex);
1132
- return new utils_1.naslTypes.Identifier({
1133
- name: String(variableName),
1134
- namespace: `${namespace}.variables`
1135
- });
1164
+ const variableNameList = variableName.split('.');
1165
+ if (variableNameList?.length === 1) {
1166
+ return new utils_1.naslTypes.Identifier({
1167
+ namespace: `${namespace}.variables`,
1168
+ name: String(variableName)
1169
+ });
1170
+ }
1171
+ else {
1172
+ // 前后端全局变量
1173
+ const number = calleeName?.includes('app.backend.variables') ? 3 : 6;
1174
+ const newCallee = callee.slice(number);
1175
+ const newNode = unflatMemberExpression(newCallee, options, null, `${namespace}.variables`);
1176
+ return newNode;
1177
+ }
1136
1178
  }
1137
1179
  if (node.property.type === 'NumericLiteral' || node?.property?.type === 'BinaryExpression') {
1138
1180
  return new utils_1.naslTypes.CallFunction({