@lcap/nasl 2.19.0-beta.1 → 2.19.0-beta.2

package/src/concepts/NewComposite__.ts

@@ -823,16 +823,13 @@ export class NewComposite extends LogicItem {
         });
 
         const autoConnection = () => {
-            let structure: any;
             const isAnnotation = this.typeAnnotation.typeKind === 'anonymousStructure';
-            if (!isAnnotation)
-                structure = this.app.findNodeByCompleteName(this.typeAnnotation.typeNamespace + '.' + this.typeAnnotation.typeName);
             this.app.emit('collect:start', {
                 actionMsg: '自动连线',
             });
             this.properties.forEach((property: Identifier, leftSecondIndex: number) => {
                 const leftName = property.name;
-                const leftTypeAnnotation = !isAnnotation && structure.properties.find((p: StructureProperty) => p.name === property.name).typeAnnotation;
+                const leftTypeAnnotation = !isAnnotation && property.__TypeAnnotation;
                 const typeStruct = isAnnotation && this.typeAnnotation.properties[leftSecondIndex]; // 获取匿名数据结构typeAnnotation的具体property
                 if (leftLineSet.has(leftSecondIndex) || leftLineSet.has(leftName))
                     return;
@@ -902,9 +899,10 @@ export class NewComposite extends LogicItem {
 
         let count = 0;
         const typeAnnotationEnd = () => {
-            const r = this.rights.every((right) => right.members.every((item) => item.__isCorrectTypeAnnotation));
+            const l = this.properties.every((item) => item.__isCorrectTypeAnnotation);
+            const r = this.rights.every((right) => right.members.every((item) => item.__isCorrectTypeAnnotation) && right.expression.__isCorrectTypeAnnotation);
             count++;
-            if (r) {
+            if (r && l) {
                 autoConnection();
             } else if (count <= 10) {
                 setTimeout(() => {
@@ -1286,7 +1284,7 @@ export class NewComposite extends LogicItem {
                 const name = property.name;
                 const rightItem = nameMap.get(name);
                 if (rightMap.get(rightItem) !== undefined) {
-                    code += `{ const x = ${rightMap.get(rightItem)}; const `;
+                    code += `{ const x${rightMap.get(rightItem) === 'null' ? ':void' : ''} = ${rightMap.get(rightItem)}; const `;
                     code += property.toEmbeddedTS(shiftState(state, code, { inline: true }));
                     code += `: nasl.core.Incompatible<typeof x, void> = x`;
                     code += '; }\n';

package/src/concepts/NewList__.ts

@@ -378,9 +378,10 @@ export class NewList extends LogicItem {
             this.items.forEach((item, index) => {
                 if (item.concept === 'Unparsed')
                     return;
+                code += 'nasl.core.ensureVoid(';
                 arr.push(item.toEmbeddedTS(shiftState(state, code, { inline: true })));
                 code += arr[index];
-                code += '; ';
+                code += '); ';
             });
             code += '\n';
             if (!arr.length || arr.every((item: any) => ['__IDENTIFIER__', '__IDENTIFIER__()', 'null'].includes(item)))

package/src/concepts/NewMap__.ts

@@ -594,10 +594,11 @@ export class NewMap extends LogicItem {
                 this.values.forEach((item, index) => {
                     if (item)
                         valueTs = true;
+                    code += 'nasl.core.ensureVoid(';
                     const ts = item ? item.toEmbeddedTS(shiftState(state, code, { inline: true })) : null;
                     valueTsArr.push(ts);
                     code += valueTsArr[index];
-                    code += '; ';
+                    code += '); ';
                 });
                 code += '\n';
                 if (keyTs === 'null' || !valueTs) {

package/src/concepts/OqlQueryComponent__.ts

@@ -319,6 +319,8 @@ export class OqlQueryComponent extends LogicItem {
                 },
             }).then((res: any) => {
                 this.codeSourceMap = res || { typescript: '', lexicalErrorCode: 1001 };
+            }).catch(() => {
+                this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
             });
         } else {
             this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };

package/src/concepts/ViewElement__.ts

@@ -1501,7 +1501,7 @@ export class ViewElement extends BaseNode {
             this.children.forEach((element) => {
                 code += element.toEmbeddedTS(shiftState(state, code, {
                     tabSize: (state?.tabSize || 0),
-                }));
+                }), levelIndex);
             });
             code += indent((state?.tabSize || 0) + 2);
             code += ']';

package/src/concepts/basics/stdlib/nasl.util.ts

@@ -1078,7 +1078,8 @@ export default new Namespace({
                 }),
                 new Param({
                     name: 'formatter',
-                    defaultValue: '格式化规则，默认为yyyy-MM-dd，即年月日格式',
+                    description: '格式化规则，默认为yyyy-MM-dd，即年月日格式',
+                    defaultValue: 'yyyy-MM-dd',
                     defaultExpression: new StringLiteral({ value: 'yyyy-MM-dd' }),
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
                 }),
@@ -1100,8 +1101,9 @@ export default new Namespace({
                 }),
                 new Param({
                     name: 'formatter',
+                    description: '格式化规则，默认为yyyy-MM-dd',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                    defaultValue: '格式化规则，默认为yyyy-MM-dd',
+                    defaultValue: 'yyyy-MM-dd HH:mm:ss',
                     defaultExpression: new StringLiteral({ value: 'yyyy-MM-dd HH:mm:ss' }),
                 }),
             ],

package/src/generator/genBundleFiles.ts

@@ -370,9 +370,18 @@ export function genBundleFiles(app: App,
             sourceMap: {
                 url: bundleSourceMapPath,
             },
+            compress: {
+                // @ts-ignore
+                awaits: false,
+            },
         });
     } else {
-        minifyObj = UglifyJS.minify(content);
+        minifyObj = UglifyJS.minify(content, {
+            compress: {
+                // @ts-ignore
+                awaits: false,
+            },
+        });
     }
     const outputs = [
         {

package/src/server/naslServer.ts

@@ -1297,15 +1297,18 @@ export class NaslServer {
                 }
             });
         }
-        if (node instanceof MatchCase && (node.getAncestor('Match') as Match)?.isExpression && node.body.length === 0 && !node.isDisabled) {
-            const diagnostic = {
-                node,
-                severity: 'error',
-                message: '匹配分支：表达式不能为空',
-                titleTip: '表达式不能为空',
-            };
-            node.tsErrorDetail = diagnostic;
-            diagnostics.push(diagnostic);
+        if (node instanceof MatchCase && (node.getAncestor('Match') as Match)?.isExpression && node.body.length === 0) {
+            // 如果不是其他就标红
+            if ((node?.getIndexOfParent() !== ((node.getAncestor('Match') as Match)?.cases?.length || 0) - 1)) {
+                const diagnostic = {
+                    node,
+                    severity: 'error',
+                    message: '匹配分支：表达式不能为空',
+                    titleTip: '表达式不能为空',
+                };
+                node.tsErrorDetail = diagnostic;
+                diagnostics.push(diagnostic);
+            }
         }
         // 如果节点是match的patterns 里的
         if (node?.parentKey === 'patterns' && node.parentNode instanceof MatchCase) {

package/src/server/translator.ts

@@ -49,6 +49,7 @@ import {
     OqlQueryComponent,
     NewMap,
     NewList,
+    NewComposite,
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
@@ -532,8 +533,14 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
                 // node = node.getAncestor('CallLogic');
                 tsErrorDetail.message = tsErrorDetail.message.replace('参数类型不一致！传入类型：', '赋值：类型不一致！右边类型：').replace('接收类型：', '左边类型：');
             }
-        } else if (node.parentNode instanceof NewMap && text.includes(`is not assignable to parameter of type 'None'`)) {
-            tsErrorDetail.message = tsErrorDetail.message = `'参数类型不一致！', 'map的key类型只能是String | Integer | Boolean | Long | Decimal'的其中一种`;
+        } else if (node.parentNode instanceof NewMap) {
+            if (text.includes(`is not assignable to parameter of type 'None'`)) {
+                tsErrorDetail.message = tsErrorDetail.message = `'参数类型不一致！', 'map的key类型只能是String | Integer | Boolean | Long | Decimal'的其中一种`;
+            } else if (text.includes(`parameter of type 'never'`)) {
+                tsErrorDetail.message = '自动推导推断不出类型！newMap中有未知类型';
+            }
+        } else if (node.parentNode instanceof NewList && text.includes(`parameter of type 'never'`)) {
+            tsErrorDetail.message = '自动推导推断不出类型！newList中有未知类型';
         }
     }
     if (node instanceof Argument || node instanceof Anchor) {
@@ -567,7 +574,6 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
     if (node instanceof OqlQueryComponent) {
         console.log(minRange, tsErrorDetail);
     }
-    console.log(node, text)
     // 类型报错的，需要放到上一级
     if (/'(.+?)' has no exported member(?: named)? '(.+?)'/.exec(text) || /Property '(.+?)' does not exist on type '(.+?)'./.exec(text)) {
         if (node instanceof TypeAnnotation) {
@@ -690,12 +696,33 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         }
     }
     if (/Variable '(.+?)' implicitly has an 'any' type./.exec(text) || /Variable '(.+?)' implicitly has an 'any\[\]' type./.exec(text)) {
-        if (node instanceof NewMap || node instanceof NewList || node instanceof Logic)
+        if (node.parentNode instanceof NewComposite) {
+            //
+        } else if (node.parentNode instanceof NewList) {
+            tsErrorDetail.message = tsErrorDetail.message.replace('！请连线或手动设置', '');
+        } else if (node.parentNode instanceof NewMap) {
+            tsErrorDetail.message = tsErrorDetail.message.replace('！请连线或手动设置', '');
+        } else {
             return;
+        }
     }
     for (const rule of POST_RULES) {
-        if (rule.re.test(tsErrorDetail.message))
-            tsErrorDetail.message = tsErrorDetail.message.replace(rule.re, rule.result);
+        if (rule.re.test(tsErrorDetail.message)) {
+            tsErrorDetail.message = tsErrorDetail.message.replace(rule.re, (value, index, oldStr) => {
+                // 处理匹配到的值的左右的内容，是不是还是字母，要是字母就原样输出，防止展示问题
+                try {
+                    const leftCode = index - 1 < 0 ? '' : oldStr[index - 1];
+                    const rightCode = oldStr[index + value.length] || '';
+                    if (/^[A-Za-z]+$/.test(leftCode) || /^[A-Za-z]+$/.test(rightCode)) {
+                        return value;
+                    } else {
+                        return rule.result;
+                    }
+                } catch (err) {
+                    return value;
+                }
+            });
+        }
     }
     node.tsErrorDetail = tsErrorDetail;
     // 如果logic中有报错就把标识置为true

package/ts-worker/lib/tsserver.js

@@ -171847,6 +171847,9 @@ var ts;
             ProjectService.prototype.doEnsureDefaultProjectForFile = function (fileName) {
                 this.ensureProjectStructuresUptoDate();
                 var scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
+                if (!scriptInfo) {
+                    console.log(fileName);
+                }
                 return scriptInfo ? scriptInfo.getDefaultProject() : (this.logErrorForScriptInfoNotFound(fileName), server.Errors.ThrowNoProject());
             };
             ProjectService.prototype.getScriptInfoEnsuringProjectsUptoDate = function (uncheckedFileName) {
@@ -176745,7 +176748,7 @@ var ts;
                     if (left) {
                         typeInfo.typeNamespace = analyzeTypeNameSpace(left);
                     }
-                } else if(Array.isArray(types)) {
+                } else if (Array.isArray(types)) {
                     typeInfo.typeName = 'Union';
                 } else {
                     typeInfo.typeKind = 'anonymousStructure';