@lcap/nasl 3.13.1-beta.8 → 3.13.1-beta.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/out/generator/annotation/utils.d.ts.map +1 -1
- package/out/generator/annotation/utils.js +2 -1
- package/out/generator/annotation/utils.js.map +1 -1
- package/out/server/naslServer.d.ts.map +1 -1
- package/out/server/naslServer.js +84 -64
- package/out/server/naslServer.js.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.d.ts.map +1 -1
- package/out/templator/genCurdMultipleKeyBlock.js +0 -1
- package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
- package/out/utils/vue.d.ts +3 -0
- package/out/utils/vue.d.ts.map +1 -0
- package/out/utils/vue.js +10 -0
- package/out/utils/vue.js.map +1 -0
- package/package.json +11 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAe,UAAU,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAE3F,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EACL,KAAK,UAAU,EACf,KAAK,GAAG,EACR,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAe,UAAU,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAE3F,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EACL,KAAK,UAAU,EACf,KAAK,GAAG,EACR,KAAK,cAAc,EAGpB,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,YAAY,gBAAgB,CAAC;AAE1C,oBAAoB;AACpB,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,oBAAoB,EAC5B,MAAM,oCAAiB,uBAgBxB;AAED,gBAAgB;AAChB,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,yDAc/D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAQpF;AAED,YAAY;AACZ,wBAAgB,cAAc,CAAC,IAAI,EAAE,UAAU,WAO9C;AAED,aAAa;AACb,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,OAAO;;;EAyBrD;AAED,eAAe;AACf,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,OAYhH"}
|
|
@@ -7,6 +7,7 @@ const server_1 = require("../../server");
|
|
|
7
7
|
const config_1 = require("../../config");
|
|
8
8
|
const nasl_concepts_1 = require("@lcap/nasl-concepts");
|
|
9
9
|
const types_1 = require("./types");
|
|
10
|
+
const vue_1 = require("../../utils/vue");
|
|
10
11
|
exports.LogEventName = 'Nasl Server';
|
|
11
12
|
/** 生成 NaslServer */
|
|
12
13
|
async function createNaslServer(axios, uiData, logger = nasl_utils_1.internalLogger) {
|
|
@@ -87,7 +88,7 @@ function getFullAnnotationData(app, naslServer, typesMap) {
|
|
|
87
88
|
const NodeToJsonMap = new Map();
|
|
88
89
|
/** 全量标注数据 */
|
|
89
90
|
const annotationJSON = app._toJSON((source, instance) => {
|
|
90
|
-
NodeToJsonMap.set(instance, source);
|
|
91
|
+
NodeToJsonMap.set((0, vue_1.toRaw)(instance), source);
|
|
91
92
|
return source;
|
|
92
93
|
});
|
|
93
94
|
naslServer.annotationToJson(typesMap, NodeToJsonMap);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":";;;AAEA,iDAAkD;AAClD,+EAA2F;AAE3F,yCAA0C;AAC1C,yCAAsC;AACtC,uDAM6B;AAC7B,mCAA+C;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/generator/annotation/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"naslServer.d.ts","sourceRoot":"","sources":["../../src/server/naslServer.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI3C,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAM1C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,OAAO,EACL,MAAM,EACN,QAAQ,EACR,GAAG,EAEH,KAAK,EAEL,cAAc,EAed,KAAK,EAIL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,aAAa,EAKb,aAAa,EAkCb,SAAS,EAET,UAAU,EAmBV,UAAU,EAGV,YAAY,EAIZ,yBAAyB,EAI1B,MAAM,aAAa,CAAC;AA4BrB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAwD,QAAQ,EAAoB,MAAM,cAAc,CAAC;AAEhH,OAAO,EAAoB,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"naslServer.d.ts","sourceRoot":"","sources":["../../src/server/naslServer.ts"],"names":[],"mappings":"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"}
|
package/out/server/naslServer.js
CHANGED
|
@@ -57,6 +57,7 @@ const translator_2 = require("./translator");
|
|
|
57
57
|
const common_1 = require("../common");
|
|
58
58
|
const diagnostic_1 = require("../manager/diagnostic");
|
|
59
59
|
const naslStdlibMap_1 = __importDefault(require("./naslStdlibMap"));
|
|
60
|
+
const vue_1 = require("../utils/vue");
|
|
60
61
|
const utils_2 = require("../utils");
|
|
61
62
|
const decorators_1 = require("../decorators");
|
|
62
63
|
const nasl_concepts_1 = require("@lcap/nasl-concepts");
|
|
@@ -5000,7 +5001,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5000
5001
|
// 预留时间做 minor gc，减少峰值内存占用
|
|
5001
5002
|
utils.delay(55);
|
|
5002
5003
|
}
|
|
5003
|
-
const { node, filePath, item } = itemDetail;
|
|
5004
|
+
const { node: nodeOrigin, filePath, item } = itemDetail;
|
|
5005
|
+
const node = (0, vue_1.toRaw)(nodeOrigin);
|
|
5004
5006
|
// 先按照顺序占位
|
|
5005
5007
|
types.set(node, null);
|
|
5006
5008
|
// 获取已知节点类型的类型
|
|
@@ -5285,7 +5287,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5285
5287
|
const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
|
|
5286
5288
|
this.logger.time('app to AnnotatedJSON');
|
|
5287
5289
|
const jsonMap = new Map();
|
|
5288
|
-
const json = naslNode._toJSON((newJson, oldNode) => {
|
|
5290
|
+
const json = (0, vue_1.toRaw)(naslNode)._toJSON((newJson, oldNode) => {
|
|
5289
5291
|
// 删除多余属性，降低全量数据
|
|
5290
5292
|
delete newJson._aiUID;
|
|
5291
5293
|
jsonMap.set(oldNode, newJson);
|
|
@@ -5624,70 +5626,74 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5624
5626
|
// 有值而且没有类型再去设置
|
|
5625
5627
|
// 但是Identifier 和 MemberExpression 都用标注出来的因为本身是变量，有类型也需要覆盖一下
|
|
5626
5628
|
if (typ && (node instanceof concepts_1.Argument) && node.getAncestor('Connector')?.concept === 'Connector') {
|
|
5627
|
-
const newJson = jsonMap.get(node);
|
|
5629
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5628
5630
|
if (newJson) {
|
|
5629
5631
|
newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
|
|
5630
5632
|
}
|
|
5631
5633
|
}
|
|
5632
5634
|
if (typ && (!node.typeAnnotation || node instanceof concepts_1.Identifier || node instanceof concepts_1.MemberExpression)) {
|
|
5633
|
-
const newJson = jsonMap.get(node);
|
|
5635
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5634
5636
|
if (newJson) {
|
|
5635
5637
|
newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
|
|
5636
5638
|
}
|
|
5637
5639
|
}
|
|
5638
5640
|
// 旧版本数据查询需要确认是匿名数据结构的 ListTotal 类型
|
|
5639
5641
|
if (node instanceof concepts_1.CallQueryComponent && !node.isAutoInfer()) {
|
|
5640
|
-
const
|
|
5641
|
-
|
|
5642
|
-
|
|
5643
|
-
|
|
5644
|
-
|
|
5645
|
-
|
|
5646
|
-
|
|
5647
|
-
|
|
5648
|
-
|
|
5649
|
-
|
|
5650
|
-
|
|
5651
|
-
|
|
5652
|
-
|
|
5653
|
-
|
|
5654
|
-
|
|
5655
|
-
|
|
5656
|
-
|
|
5657
|
-
|
|
5658
|
-
|
|
5659
|
-
|
|
5660
|
-
|
|
5661
|
-
|
|
5642
|
+
const jsonNode = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5643
|
+
if (jsonNode) {
|
|
5644
|
+
jsonNode.typeAnnotation = {
|
|
5645
|
+
concept: 'TypeAnnotation',
|
|
5646
|
+
typeKind: 'anonymousStructure',
|
|
5647
|
+
typeNamespace: null,
|
|
5648
|
+
typeName: null,
|
|
5649
|
+
typeArguments: [],
|
|
5650
|
+
inferred: false,
|
|
5651
|
+
ruleMap: null,
|
|
5652
|
+
properties: [
|
|
5653
|
+
{
|
|
5654
|
+
concept: 'StructureProperty',
|
|
5655
|
+
name: 'list',
|
|
5656
|
+
label: null,
|
|
5657
|
+
description: null,
|
|
5658
|
+
typeAnnotation: {
|
|
5659
|
+
concept: 'TypeAnnotation',
|
|
5660
|
+
typeKind: 'generic',
|
|
5661
|
+
typeNamespace: 'nasl.collection',
|
|
5662
|
+
typeName: 'List',
|
|
5663
|
+
typeArguments: [jsonNode.typeAnnotation],
|
|
5664
|
+
inferred: null,
|
|
5665
|
+
},
|
|
5666
|
+
required: null,
|
|
5667
|
+
defaultValue: null,
|
|
5662
5668
|
},
|
|
5663
|
-
|
|
5664
|
-
|
|
5665
|
-
|
|
5666
|
-
|
|
5667
|
-
|
|
5668
|
-
|
|
5669
|
-
|
|
5670
|
-
|
|
5671
|
-
|
|
5672
|
-
|
|
5673
|
-
|
|
5674
|
-
|
|
5675
|
-
|
|
5676
|
-
|
|
5677
|
-
|
|
5669
|
+
{
|
|
5670
|
+
concept: 'StructureProperty',
|
|
5671
|
+
name: 'total',
|
|
5672
|
+
label: null,
|
|
5673
|
+
description: null,
|
|
5674
|
+
typeAnnotation: {
|
|
5675
|
+
concept: 'TypeAnnotation',
|
|
5676
|
+
typeKind: 'primitive',
|
|
5677
|
+
typeNamespace: 'nasl.core',
|
|
5678
|
+
typeName: 'Long',
|
|
5679
|
+
typeArguments: null,
|
|
5680
|
+
inferred: null,
|
|
5681
|
+
},
|
|
5682
|
+
required: null,
|
|
5683
|
+
defaultValue: null,
|
|
5678
5684
|
},
|
|
5679
|
-
|
|
5680
|
-
|
|
5681
|
-
|
|
5682
|
-
],
|
|
5683
|
-
};
|
|
5685
|
+
],
|
|
5686
|
+
};
|
|
5687
|
+
}
|
|
5684
5688
|
}
|
|
5685
5689
|
// 特殊处理param有类型错误的
|
|
5686
5690
|
if (node instanceof concepts_1.Param) {
|
|
5687
5691
|
// index在nasl foreach上有脏数据
|
|
5688
5692
|
if (node.parentKey === 'index' && node.parentNode instanceof concepts_1.ForEachStatement) {
|
|
5689
|
-
const
|
|
5690
|
-
|
|
5693
|
+
const jsonNode = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5694
|
+
if (jsonNode) {
|
|
5695
|
+
jsonNode.typeAnnotation = concepts_1.TypeAnnotation.createPrimitive('Long').toJSON();
|
|
5696
|
+
}
|
|
5691
5697
|
}
|
|
5692
5698
|
}
|
|
5693
5699
|
if (node instanceof concepts_1.Match) {
|
|
@@ -5699,8 +5705,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5699
5705
|
fileNode.sourceMap.forEach((item, itemNode) => {
|
|
5700
5706
|
const itemCode = this.getNodeCode(fileNode, item);
|
|
5701
5707
|
if (itemNode.concept === matchExpression.concept && itemCode === currentCode) {
|
|
5702
|
-
const newJson = jsonMap.get(itemNode);
|
|
5703
|
-
newJson
|
|
5708
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(itemNode));
|
|
5709
|
+
if (newJson) {
|
|
5710
|
+
newJson.typeAnnotation = matchExpression.__TypeAnnotation;
|
|
5711
|
+
}
|
|
5704
5712
|
}
|
|
5705
5713
|
});
|
|
5706
5714
|
}
|
|
@@ -5709,13 +5717,17 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5709
5717
|
if (typ && (node instanceof concepts_1.Param)) {
|
|
5710
5718
|
// index在nasl foreach上有脏数据
|
|
5711
5719
|
if (node.parentKey === 'index' && node.parentNode instanceof concepts_1.ForEachStatement) {
|
|
5712
|
-
const newJson = jsonMap.get(node);
|
|
5713
|
-
|
|
5720
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5721
|
+
if (newJson) {
|
|
5722
|
+
newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
|
|
5723
|
+
}
|
|
5714
5724
|
}
|
|
5715
5725
|
}
|
|
5716
5726
|
if (typ && (node instanceof concepts_1.NewComposite) && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
|
|
5717
|
-
const newJson = jsonMap.get(node);
|
|
5718
|
-
|
|
5727
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5728
|
+
if (newJson) {
|
|
5729
|
+
newJson.typeAnnotation = typ?.toJSON?.() ?? typ;
|
|
5730
|
+
}
|
|
5719
5731
|
}
|
|
5720
5732
|
// jsonSerializer 是 CallLogic，其余是 CallFunction
|
|
5721
5733
|
if (node instanceof concepts_1.CallFunction || node instanceof concepts_1.CallLogic) {
|
|
@@ -5731,9 +5743,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5731
5743
|
* 特殊处理，不想去查两次类型, 因为是从函数签名上拿类型，所以直接合并在一起，先这样
|
|
5732
5744
|
*/
|
|
5733
5745
|
if (node instanceof concepts_1.CallLogic && node.__TypeArguments?.length) {
|
|
5734
|
-
const newJson = jsonMap.get(node);
|
|
5735
|
-
|
|
5736
|
-
|
|
5746
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5747
|
+
if (newJson) {
|
|
5748
|
+
newJson.typeArguments = node.__TypeArguments.map((type) => type?.toJSON?.() ?? type);
|
|
5749
|
+
newJson.typeAnnotation = node.__TypeAnnotation?.toJSON?.() ?? node.__TypeAnnotation;
|
|
5750
|
+
}
|
|
5737
5751
|
}
|
|
5738
5752
|
// 根据 https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2737356895760128&id1=null&iterationId=null&versionid=null&tab=info
|
|
5739
5753
|
// 对CallFunction节点，若其callee为部分List/Map内置函数，则修改其argument类型标注以让服务端据此插入显式的类型转换。规则如下：
|
|
@@ -5762,8 +5776,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5762
5776
|
if (itemExpression) {
|
|
5763
5777
|
const listTypeArgument = list.__TypeAnnotation?.typeArguments?.[0]?.toJSON?.() ?? list.__TypeAnnotation?.typeArguments?.[0];
|
|
5764
5778
|
if (listTypeArgument) {
|
|
5765
|
-
const newJson = jsonMap.get(item);
|
|
5766
|
-
newJson
|
|
5779
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(item));
|
|
5780
|
+
if (newJson) {
|
|
5781
|
+
newJson.typeAnnotation = listTypeArgument;
|
|
5782
|
+
}
|
|
5767
5783
|
}
|
|
5768
5784
|
}
|
|
5769
5785
|
}
|
|
@@ -5778,15 +5794,19 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5778
5794
|
if (keyExpression) {
|
|
5779
5795
|
const mapKeyTypeArgument = map.__TypeAnnotation?.typeArguments?.[0]?.toJSON?.() ?? map.__TypeAnnotation?.typeArguments?.[0];
|
|
5780
5796
|
if (mapKeyTypeArgument) {
|
|
5781
|
-
const newJson = jsonMap.get(key);
|
|
5782
|
-
newJson
|
|
5797
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(key));
|
|
5798
|
+
if (newJson) {
|
|
5799
|
+
newJson.typeAnnotation = mapKeyTypeArgument;
|
|
5800
|
+
}
|
|
5783
5801
|
}
|
|
5784
5802
|
}
|
|
5785
5803
|
if (valueExpression) {
|
|
5786
5804
|
const mapValueTypeArgument = map.__TypeAnnotation?.typeArguments?.[1]?.toJSON?.() ?? map.__TypeAnnotation?.typeArguments?.[1];
|
|
5787
5805
|
if (mapValueTypeArgument) {
|
|
5788
|
-
const newJson = jsonMap.get(value);
|
|
5789
|
-
newJson
|
|
5806
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(value));
|
|
5807
|
+
if (newJson) {
|
|
5808
|
+
newJson.typeAnnotation = mapValueTypeArgument;
|
|
5809
|
+
}
|
|
5790
5810
|
}
|
|
5791
5811
|
}
|
|
5792
5812
|
}
|
|
@@ -5796,7 +5816,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
|
|
|
5796
5816
|
}
|
|
5797
5817
|
// 服务端需要默认值节点有类型来判断父节点是否是日期类型
|
|
5798
5818
|
if (node instanceof concepts_1.DefaultValue && !typ) {
|
|
5799
|
-
const newJson = jsonMap.get(node);
|
|
5819
|
+
const newJson = jsonMap.get((0, vue_1.toRaw)(node));
|
|
5800
5820
|
const parentNodeType = node.parentNode?.typeAnnotation || node.parentNode?.__TypeAnnotation;
|
|
5801
5821
|
if (parentNodeType && newJson) {
|
|
5802
5822
|
newJson.typeAnnotation = parentNodeType?.toJSON?.() ?? parentNodeType;
|