@lcap/nasl 3.8.2-beta.9 → 3.8.3-beta.2

package/ai-engineer.config.js

@@ -0,0 +1,617 @@
+const path = require('path');
+const fs = require('fs-extra');
+
+module.exports = {
+  requirement: `请完成 transform2LogicItem 文件中，数据查询相关的 transformCall2DataQuery 函数。
+
+其中 naslTypes 有以下类：
+
+- CallQueryComponent 数据查询
+
+class CallQueryComponent extends LogicItem {
+  typeAnnotation?: TypeAnnotation;
+  select: QuerySelectExpression;
+  from: QueryFromExpression;
+  where?: LogicItem;
+  wherePlayground?: Array<LogicItem>;
+  groupBy?: Array<QueryGroupByExpression>;
+  having?: LogicItem;
+  havingPlayground?: Array<LogicItem>;
+  orderBy?: Array<QueryOrderByExpression>;
+  limit?: QueryLimitExpression;
+  ideVersion?: string;
+}
+
+- QuerySelectExpression 查询选择子句
+
+class QuerySelectExpression extends LogicItem {
+  distinct: boolean = false;
+  star: boolean = true;
+  selectElements: Array<QueryAggregateExpression | QueryFieldExpression> = [];
+}
+
+- QueryFromExpression 查询 From 子句
+
+class QueryFromExpression extends LogicItem {
+  entityNamespace: string;
+  entityName: string;
+  asName: string;
+  joinParts: Array<QueryJoinExpression>;
+}
+
+- QueryJoinExpression 查询 Join 子句
+
+class QueryJoinExpression extends LogicItem {
+  entityNamespace: string;
+  entityName: string;
+  asName: string;
+  joinType: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL';
+  onExpressions: Array<BinaryExpression>;
+  joinParts: Array<QueryJoinExpression>;
+}
+
+- QueryFieldExpression 查询属性
+
+class QueryFieldExpression extends LogicItem {
+  isDotStar: boolean = false;
+  asName: string;
+  entityAsName: string;
+  propertyName: string;
+}
+
+- QueryAggregateExpression 查询聚合函数
+
+class QueryAggregateExpression extends LogicItem {
+  asName: string;
+  aggregateName: 'COUNT' | 'COUNTD' | 'SUM' | 'AVG' | 'MAX' | 'MIN';
+  aggregateParam: QueryFieldExpression;
+}
+
+- QueryOrderByExpression 查询排序子句
+
+class QueryOrderByExpression extends LogicItem {
+  orderElement: LogicItem;
+  order: LogicItem;
+}
+
+- QueryGroupByExpression 查询分组
+
+class QueryGroupByExpression extends LogicItem {
+  groupElement: LogicItem;
+}
+
+- Paginate 分页
+
+class Paginate extends LogicItem {
+  list: LogicItem;
+  page: LogicItem;
+  size: LogicItem;
+  typeAnnotation?: TypeAnnotation;
+}
+
+babelTypes 是著名的 babel.js 库，用于解析 JS/TS 的。naslTypes 是我们自定义的数据结构，在 src/concepts 目录中。
+
+transformCall2DataQuery 的 node 参数是根据 babel 解析出来的:
+
+原来 case1/natural.ts 文件的内容是:
+
+FROM(app.dataSources.defaultDS.entities.OrderProductEntity, OrderProduct => $
+    .INNER_JOIN(app.dataSources.defaultDS.entities.OrderFormEntity, OrderForm => ON(() => OrderProduct.orderId == OrderForm.id)
+    .INNER_JOIN(app.dataSources.defaultDS.entities.ProductEntity, Product => ON(() => OrderProduct.productId == Product.id)
+    .WHERE(() => OrderProduct.createdBy == '张三' && OrderProduct.createdTime > startDateTime)
+    .GROUP_BY(() => OrderProduct.productId, Product.name)
+    .ORDER_BY(() => [productName, 'ASC'])
+    .SELECT(() => ({
+        orderProduct: OrderProduct,
+        orderForm: OrderForm,
+        product: Product,
+        totalAmount: SUM(OrderProduct.amount),
+        productId: OrderProduct.productId,
+        productName: Product.name,
+    })))))
+
+经过 babel parse 之后的结果用 JSON 表示是:
+
+{
+  "type": "CallExpression",
+  "callee": { "type": "Identifier", "name": "FROM" },
+  "arguments": [
+    {
+      "type": "MemberExpression",
+      "object": {
+        "type": "MemberExpression",
+        "object": {
+          "type": "MemberExpression",
+          "object": {
+            "type": "MemberExpression",
+            "object": { "type": "Identifier", "name": "app" },
+            "computed": false,
+            "property": { "type": "Identifier", "name": "dataSources" }
+          },
+          "computed": false,
+          "property": { "type": "Identifier", "name": "defaultDS" }
+        },
+        "computed": false,
+        "property": { "type": "Identifier", "name": "entities" }
+      },
+      "computed": false,
+      "property": { "type": "Identifier", "name": "OrderProductEntity" }
+    },
+    {
+      "type": "ArrowFunctionExpression",
+      "id": null,
+      "generator": false,
+      "async": false,
+      "params": [{ "type": "Identifier", "name": "OrderProduct" }],
+      "body": {
+        "type": "CallExpression",
+        "callee": {
+          "type": "MemberExpression",
+          "object": { "type": "Identifier", "name": "$" },
+          "computed": false,
+          "property": { "type": "Identifier", "name": "INNER_JOIN" }
+        },
+        "arguments": [
+          {
+            "type": "MemberExpression",
+            "object": {
+              "type": "MemberExpression",
+              "object": {
+                "type": "MemberExpression",
+                "object": {
+                  "type": "MemberExpression",
+                  "object": { "type": "Identifier", "name": "app" },
+                  "computed": false,
+                  "property": { "type": "Identifier", "name": "dataSources" }
+                },
+                "computed": false,
+                "property": { "type": "Identifier", "name": "defaultDS" }
+              },
+              "computed": false,
+              "property": { "type": "Identifier", "name": "entities" }
+            },
+            "computed": false,
+            "property": { "type": "Identifier", "name": "OrderFormEntity" }
+          },
+          {
+            "type": "ArrowFunctionExpression",
+            "id": null,
+            "generator": false,
+            "async": false,
+            "params": [{ "type": "Identifier", "name": "OrderForm" }],
+            "body": {
+              "type": "CallExpression",
+              "callee": {
+                "type": "MemberExpression",
+                "object": {
+                  "type": "CallExpression",
+                  "callee": { "type": "Identifier", "name": "ON" },
+                  "arguments": [
+                    {
+                      "type": "ArrowFunctionExpression",
+                      "id": null,
+                      "generator": false,
+                      "async": false,
+                      "params": [],
+                      "body": {
+                        "type": "BinaryExpression",
+                        "left": {
+                          "type": "MemberExpression",
+                          "object": {
+                            "type": "Identifier",
+                            "name": "OrderProduct"
+                          },
+                          "computed": false,
+                          "property": {
+                            "type": "Identifier",
+                            "name": "orderId"
+                          }
+                        },
+                        "operator": "==",
+                        "right": {
+                          "type": "MemberExpression",
+                          "object": {
+                            "type": "Identifier",
+                            "name": "OrderForm"
+                          },
+                          "computed": false,
+                          "property": { "type": "Identifier", "name": "id" }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "computed": false,
+                "property": { "type": "Identifier", "name": "INNER_JOIN" }
+              },
+              "arguments": [
+                {
+                  "type": "MemberExpression",
+                  "object": {
+                    "type": "MemberExpression",
+                    "object": {
+                      "type": "MemberExpression",
+                      "object": {
+                        "type": "MemberExpression",
+                        "object": { "type": "Identifier", "name": "app" },
+                        "computed": false,
+                        "property": {
+                          "type": "Identifier",
+                          "name": "dataSources"
+                        }
+                      },
+                      "computed": false,
+                      "property": { "type": "Identifier", "name": "defaultDS" }
+                    },
+                    "computed": false,
+                    "property": { "type": "Identifier", "name": "entities" }
+                  },
+                  "computed": false,
+                  "property": { "type": "Identifier", "name": "ProductEntity" }
+                },
+                {
+                  "type": "ArrowFunctionExpression",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [{ "type": "Identifier", "name": "Product" }],
+                  "body": {
+                    "type": "CallExpression",
+                    "callee": {
+                      "type": "MemberExpression",
+                      "object": {
+                        "type": "CallExpression",
+                        "callee": {
+                          "type": "MemberExpression",
+                          "object": {
+                            "type": "CallExpression",
+                            "callee": {
+                              "type": "MemberExpression",
+                              "object": {
+                                "type": "CallExpression",
+                                "callee": {
+                                  "type": "MemberExpression",
+                                  "object": {
+                                    "type": "CallExpression",
+                                    "callee": {
+                                      "type": "Identifier",
+                                      "name": "ON"
+                                    },
+                                    "arguments": [
+                                      {
+                                        "type": "ArrowFunctionExpression",
+                                        "id": null,
+                                        "generator": false,
+                                        "async": false,
+                                        "params": [],
+                                        "body": {
+                                          "type": "BinaryExpression",
+                                          "left": {
+                                            "type": "MemberExpression",
+                                            "object": {
+                                              "type": "Identifier",
+                                              "name": "OrderProduct"
+                                            },
+                                            "computed": false,
+                                            "property": {
+                                              "type": "Identifier",
+                                              "name": "productId"
+                                            }
+                                          },
+                                          "operator": "==",
+                                          "right": {
+                                            "type": "MemberExpression",
+                                            "object": {
+                                              "type": "Identifier",
+                                              "name": "Product"
+                                            },
+                                            "computed": false,
+                                            "property": {
+                                              "type": "Identifier",
+                                              "name": "id"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    ]
+                                  },
+                                  "computed": false,
+                                  "property": {
+                                    "type": "Identifier",
+                                    "name": "WHERE"
+                                  }
+                                },
+                                "arguments": [
+                                  {
+                                    "type": "ArrowFunctionExpression",
+                                    "id": null,
+                                    "generator": false,
+                                    "async": false,
+                                    "params": [],
+                                    "body": {
+                                      "type": "LogicalExpression",
+                                      "left": {
+                                        "type": "BinaryExpression",
+                                        "left": {
+                                          "type": "MemberExpression",
+                                          "object": {
+                                            "type": "Identifier",
+                                            "name": "OrderProduct"
+                                          },
+                                          "computed": false,
+                                          "property": {
+                                            "type": "Identifier",
+                                            "name": "createdBy"
+                                          }
+                                        },
+                                        "operator": "==",
+                                        "right": {
+                                          "type": "StringLiteral",
+                                          "value": "张三"
+                                        }
+                                      },
+                                      "operator": "&&",
+                                      "right": {
+                                        "type": "BinaryExpression",
+                                        "left": {
+                                          "type": "MemberExpression",
+                                          "object": {
+                                            "type": "Identifier",
+                                            "name": "OrderProduct"
+                                          },
+                                          "computed": false,
+                                          "property": {
+                                            "type": "Identifier",
+                                            "name": "createdTime"
+                                          }
+                                        },
+                                        "operator": ">",
+                                        "right": {
+                                          "type": "Identifier",
+                                          "name": "startDateTime"
+                                        }
+                                      }
+                                    }
+                                  }
+                                ]
+                              },
+                              "computed": false,
+                              "property": {
+                                "type": "Identifier",
+                                "name": "GROUP_BY"
+                              }
+                            },
+                            "arguments": [
+                              {
+                                "type": "ArrowFunctionExpression",
+                                "id": null,
+                                "generator": false,
+                                "async": false,
+                                "params": [],
+                                "body": {
+                                  "type": "MemberExpression",
+                                  "object": {
+                                    "type": "Identifier",
+                                    "name": "OrderProduct"
+                                  },
+                                  "computed": false,
+                                  "property": {
+                                    "type": "Identifier",
+                                    "name": "productId"
+                                  }
+                                }
+                              },
+                              {
+                                "type": "MemberExpression",
+                                "object": {
+                                  "type": "Identifier",
+                                  "name": "Product"
+                                },
+                                "computed": false,
+                                "property": {
+                                  "type": "Identifier",
+                                  "name": "name"
+                                }
+                              }
+                            ]
+                          },
+                          "computed": false,
+                          "property": {
+                            "type": "Identifier",
+                            "name": "ORDER_BY"
+                          }
+                        },
+                        "arguments": [
+                          {
+                            "type": "ArrowFunctionExpression",
+                            "id": null,
+                            "generator": false,
+                            "async": false,
+                            "params": [],
+                            "body": {
+                              "type": "ArrayExpression",
+                              "elements": [
+                                { "type": "Identifier", "name": "productName" },
+                                { "type": "StringLiteral", "value": "ASC" }
+                              ]
+                            }
+                          }
+                        ]
+                      },
+                      "computed": false,
+                      "property": { "type": "Identifier", "name": "SELECT" }
+                    },
+                    "arguments": [
+                      {
+                        "type": "ArrowFunctionExpression",
+                        "id": null,
+                        "generator": false,
+                        "async": false,
+                        "params": [],
+                        "body": {
+                          "type": "ObjectExpression",
+                          "properties": [
+                            {
+                              "type": "ObjectProperty",
+                              "method": false,
+                              "key": {
+                                "type": "Identifier",
+                                "name": "orderProduct"
+                              },
+                              "computed": false,
+                              "shorthand": false,
+                              "value": {
+                                "type": "Identifier",
+                                "name": "OrderProduct"
+                              }
+                            },
+                            {
+                              "type": "ObjectProperty",
+                              "method": false,
+                              "key": {
+                                "type": "Identifier",
+                                "name": "orderForm"
+                              },
+                              "computed": false,
+                              "shorthand": false,
+                              "value": {
+                                "type": "Identifier",
+                                "name": "OrderForm"
+                              }
+                            },
+                            {
+                              "type": "ObjectProperty",
+                              "method": false,
+                              "key": {
+                                "type": "Identifier",
+                                "name": "product"
+                              },
+                              "computed": false,
+                              "shorthand": false,
+                              "value": {
+                                "type": "Identifier",
+                                "name": "Product"
+                              }
+                            },
+                            {
+                              "type": "ObjectProperty",
+                              "method": false,
+                              "key": {
+                                "type": "Identifier",
+                                "name": "totalAmount"
+                              },
+                              "computed": false,
+                              "shorthand": false,
+                              "value": {
+                                "type": "CallExpression",
+                                "callee": {
+                                  "type": "Identifier",
+                                  "name": "SUM"
+                                },
+                                "arguments": [
+                                  {
+                                    "type": "MemberExpression",
+                                    "object": {
+                                      "type": "Identifier",
+                                      "name": "OrderProduct"
+                                    },
+                                    "computed": false,
+                                    "property": {
+                                      "type": "Identifier",
+                                      "name": "amount"
+                                    }
+                                  }
+                                ]
+                              }
+                            },
+                            {
+                              "type": "ObjectProperty",
+                              "method": false,
+                              "key": {
+                                "type": "Identifier",
+                                "name": "productId"
+                              },
+                              "computed": false,
+                              "shorthand": false,
+                              "value": {
+                                "type": "MemberExpression",
+                                "object": {
+                                  "type": "Identifier",
+                                  "name": "OrderProduct"
+                                },
+                                "computed": false,
+                                "property": {
+                                  "type": "Identifier",
+                                  "name": "productId"
+                                }
+                              }
+                            },
+                            {
+                              "type": "ObjectProperty",
+                              "method": false,
+                              "key": {
+                                "type": "Identifier",
+                                "name": "productName"
+                              },
+                              "computed": false,
+                              "shorthand": false,
+                              "value": {
+                                "type": "MemberExpression",
+                                "object": {
+                                  "type": "Identifier",
+                                  "name": "Product"
+                                },
+                                "computed": false,
+                                "property": {
+                                  "type": "Identifier",
+                                  "name": "name"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+
+这部分会传入 transformCall2DataQuery 的第一个 node 参数中。
+
+babel parse 后 json 是用 type 字段来表示 babelTypes 的类型的。 expected JSON 中是用 concept 字段来表示 naslTypes 类型的。
+
+flatMemberExpression 你不要实现了..已经有了!! 另外你不要省略实现,就是让你来写代码的!!
+
+transformCall2DataQuery 不完善，需要你这边修改。理解和补充 transformCall2DataQuery 中 flatCallExpressionAndArrowFunctionExpression 和 flatted.forEach 中的部分
+你是一个 Agent，你可以多次执行 action，直到 current state 中没有错误。
+`,
+  command: 'npm run test:tdd-transform',
+  includes: ['src/concepts', 'src/natural', 'test/tdd/transform'],
+  excludes: ['node_modules', 'out', 'src/concepts/basics', 'src/concepts/utils'],
+  waitBeforeRun: 1500,
+  watchFiles: [async () => {
+    const content = await fs.readFile(path.join(__dirname, 'ts.log'), 'utf-8');
+
+    const separator = 'Starting incremental compilation...';
+    if (content.includes(separator)) {
+      const index = content.lastIndexOf(separator);
+      return content.slice(index);
+    }
+    return content;
+  }],
+  referenceExamples: [
+    'src/natural/transforms/transform2LogicItem.ts#transform2NumericLiteral',
+    'src/natural/transforms/transform2LogicItem.ts#transformCall2Logging',
+  ],
+  currentCode: [
+    'src/natural/transforms/transform2LogicItem.ts#flatMemberExpression',
+    'src/natural/transforms/transform2LogicItem.ts#transformCall2DataQuery',
+  ],
+}

package/out/common/BaseNode.d.ts

@@ -338,11 +338,16 @@ export declare class BaseNode extends EventEmitter {
      */
     traverseStrictChildren(cb: (el: types.SyntaxNode) => void, whitelist?: string[]): void;
     /**
-    * 迭代所有子节点
-    *
-    * @description 严格迭代所有子节点！排除属性！条件满足时可提前终止！
-    */
+   * 迭代所有子节点
+   *
+   * @description 严格迭代所有子节点！排除属性！条件满足时整个遍历全部终止！
+   */
     traverseStrictChildrenStopWhen(cb: (el: types.SyntaxNode) => void, setStopFlag: (el: types.SyntaxNode) => boolean, whitelist?: string[]): void;
+    /**
+     * 迭代所有子节点
+     * @description 严格迭代所有子节点，排除属性；多函数特化版本，不做额外检查
+     */
+    traverseStrictChildrenDoMultiTasks(tasks: Array<(_: BaseNode) => Generator<any, any, any>>, cleanups: Array<(_: BaseNode) => Generator<any, any, any>>): Generator<any, any, any>;
     /**
      *  获取当前节点在nasl标注节点上的节点
      */