@lcap/nasl 0.3.12 → 0.3.14-beta

package/src/types/logic/translator.js

@@ -205,35 +205,42 @@ export default function (source) {
             if (node.type === 'CallLogic') {
                 if (node.calleeCode.startsWith('callInterface_')) {
                     const getParams = (key) => {
-                        // 过滤掉 null 的 param
-                        const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
-                        if (key === 'body') {
-                            let inBody = '';
-                            const bodyStr = [];
-                            nodeParams.filter((t) => t.callInterParamValue)
-                                .forEach((b) => {
-                                    const refTarget = Vertex.getVertexByRef(b.callInterParam);
-                                    if (refTarget.in === 'body') {
-                                        inBody = generateNode(b.callInterParamValue);
-                                    } else if (refTarget.in === '') {
-                                        bodyStr.push(`["${refTarget.name}"]: ${generateNode(b.callInterParamValue)}`);
-                                    }
-                                });
-
-                            return inBody || `{${bodyStr.join(',')}}`;
-                        } else {
-                            return nodeParams
-                                .filter((param) => {
-                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                                    return refTarget && refTarget.in === key;
-                                })
-                                .map((param) => {
-                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                                    const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
-                                    const value = generateNode(callInterParamValue);
-
-                                    return `${safeCodeAsKey(refTarget)}: ${value}`;
-                                });
+                        // 增加参数拼接日志信息
+                        try {
+                            // 过滤掉 null 的 param
+                            const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
+                            if (key === 'body') {
+                                let inBody = '';
+                                const bodyStr = [];
+                                nodeParams.filter((t) => t.callInterParamValue)
+                                    .forEach((b) => {
+                                        const refTarget = Vertex.getVertexByRef(b.callInterParam);
+                                        if (refTarget.in === 'body') {
+                                            inBody = generateNode(b.callInterParamValue);
+                                        } else if (refTarget.in === '') {
+                                            bodyStr.push(`["${refTarget.name}"]: ${generateNode(b.callInterParamValue)}`);
+                                        }
+                                    });
+
+                                return inBody || `{${bodyStr.join(',')}}`;
+                            } else {
+                                return nodeParams
+                                    .filter((param) => {
+                                        const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                        return refTarget && refTarget.in === key;
+                                    })
+                                    .map((param) => {
+                                        const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                        const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
+                                        const value = generateNode(callInterParamValue);
+
+                                        return `${safeCodeAsKey(refTarget)}: ${value}`;
+                                    });
+                            }
+                        } catch (error) {
+                            console.log('CallLogic calleeCode: ', node.calleeCode);
+                            console.log('params type: ', key);
+                            throw error;
                         }
                     };
                     const key = node.interfaceKey || node.callee || '';
@@ -264,30 +271,37 @@ export default function (source) {
                 const key = node.interfaceKey || '';
                 const arr = key.split('/');
                 const getParams = (key) => {
-                    // 过滤掉 null 的 param
-                    const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
-                    if (key === 'body') {
-                        const body = (nodeParams || []).find((param) => {
-                            const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                            return refTarget && refTarget.in === key;
-                        });
-                        if (body) {
-                            return generateNode(body.callInterParamValue);
-                        }
-                        return '{}';
-                    } else {
-                        return nodeParams
-                            .filter((param) => {
+                    // 增加参数拼接日志信息
+                    try {
+                        // 过滤掉 null 的 param
+                        const nodeParams = (node.params || []).filter((param) => param !== null && param !== 'null' && param !== '');
+                        if (key === 'body') {
+                            const body = (nodeParams || []).find((param) => {
                                 const refTarget = Vertex.getVertexByRef(param.callInterParam);
                                 return refTarget && refTarget.in === key;
-                            })
-                            .map((param) => {
-                                const refTarget = Vertex.getVertexByRef(param.callInterParam);
-                                const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
-                                const value = generateNode(callInterParamValue);
-
-                                return `${safeCodeAsKey(refTarget)}: ${value}`;
                             });
+                            if (body) {
+                                return generateNode(body.callInterParamValue);
+                            }
+                            return '{}';
+                        } else {
+                            return nodeParams
+                                .filter((param) => {
+                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                    return refTarget && refTarget.in === key;
+                                })
+                                .map((param) => {
+                                    const refTarget = Vertex.getVertexByRef(param.callInterParam);
+                                    const callInterParamValue = nameToCodeForMemberExpression(param.callInterParamValue);
+                                    const value = generateNode(callInterParamValue);
+
+                                    return `${safeCodeAsKey(refTarget)}: ${value}`;
+                                });
+                        }
+                    } catch (error) {
+                        console.log('CallInterface interfaceKey: ', node.interfaceKey);
+                        console.log('params type: ', key);
+                        throw error;
                     }
                 };
 

package/src/types/page/Element.ts

@@ -1036,15 +1036,26 @@ export class Element extends Vertex {
                     }
                 } else {
                     const expression = <ExpressionNode> this._parseExpression(directive.value, context);
-                    element.directiveList.push(Directive.from({
-                        type: expression ? 'string' : 'dynamic',
-                        name: directive.name,
-                        rawName: directive.rawName,
-                        value: expression ? '' : directive.value,
-                        expression,
-                        arg: directive.arg,
-                        modifiers: directive.modifiers,
-                    }, element));
+                    if(!expression || expression.type === 'StringLiteral') { // 处理类似情况：v-auth="''",v-tooltip="''"
+                        element.directiveList.push(Directive.from({
+                            type: 'string',
+                            name: directive.name,
+                            rawName: directive.rawName,
+                            value:  directive.value && directive.value.replace(/'/g, ''),
+                            arg: directive.arg,
+                            modifiers: directive.modifiers,
+                        }, element));
+                    } else {
+                        element.directiveList.push(Directive.from({
+                            type: 'dynamic',
+                            name: directive.name,
+                            rawName: directive.rawName,
+                            value: '',
+                            expression,
+                            arg: directive.arg,
+                            modifiers: directive.modifiers,
+                        }, element));
+                    }
                 }
             });
 

package/src/types/page/Page.ts

@@ -107,6 +107,9 @@ export class Page extends Vertex {
             path: {
                 id: this.id,
             },
+            headers: {
+                'request-lcpAppId': this.service.appId,
+            },
         });
         this.assign(result);
 
@@ -174,6 +177,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.create',
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         }).catch(catchFn());
@@ -233,6 +237,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.create',
                 operationDesc: actionOptions?.actionDesc || `添加页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         });
@@ -268,6 +273,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.delete',
                 operationDesc: actionOptions?.actionDesc || `删除页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             path: {
                 id: this.id,
@@ -295,6 +301,7 @@ export class Page extends Vertex {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Page.delete',
                 operationDesc: actionOptions?.actionDesc || `修改页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                'request-lcpAppId': this.service.appId,
             },
             body,
         }).catch(catchFn());

package/src/types/page/View.ts

@@ -189,6 +189,7 @@ export class View extends Block {
         if (this.contentPromise)
             return this.contentPromise;
 
+
         return this.contentPromise = (async () => {
             try {
                 const result: View = await viewService.load({
@@ -198,6 +199,9 @@ export class View extends Block {
                     query: {
                         enableCache,
                     },
+                    headers: {
+                        'request-lcpAppId': this.page.service.appId, // generator调用时需要appId headers
+                    },
                 });
 
                 const $def = result.$def;
@@ -237,6 +241,9 @@ export class View extends Block {
                     enableCache,
                 },
                 config: { noErrorTip: true },
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             });
             const oldLogics = this.$def.logics;
             Object.assign(result, {
@@ -357,6 +364,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.create',
                 operationDesc: actionOptions?.actionDesc || `添加子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page ? this.page.service.appId : this.parent.page.service.appId,
+                },
             },
             body,
         }).catch(catchFn());
@@ -411,6 +421,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.create',
                 operationDesc: actionOptions?.actionDesc || `添加子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             body,
         });
@@ -445,6 +458,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.delete',
                 operationDesc: actionOptions?.actionDesc || `删除子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             path: {
                 id: this.id,
@@ -479,6 +495,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'View.update',
                 operationDesc: actionOptions?.actionDesc || `修改子页面"${this.name}${this.title ? `(${this.title})` : ''}"`,
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
             body,
         }).catch(catchFn());
@@ -960,6 +979,9 @@ export class View extends Block {
                 appId: config.defaultApp?.id,
                 operationAction: 'View.mergeBlock',
                 operationDesc: '根据实体自动生成组件和逻辑',
+                headers: {
+                    'request-lcpAppId': this.page.service.appId,
+                },
             },
         });
 

package/src/types/typeCheck.ts

@@ -25,14 +25,19 @@ export default {
     push(record: TypeCheckRecord) {
         const pos = this.deleteOwn(record.id);
 
-        if(record.typeCheckNote?.message?.filter)
+        if (record.typeCheckNote?.message?.filter)
             record.typeCheckNote.message = record.typeCheckNote.message.filter((item) => !!item);
 
-        if(!record.typeCheckNote || record.typeCheckNote.status === 'success'
-            || (record.typeCheckNote && record.typeCheckNote.message && record.typeCheckNote.message.length === 0))
+        if (!record.typeCheckNote || record.typeCheckNote.status === 'success')
             return;
+        // typeCheckNote.message 不存在时，视为误报
+        if (record.typeCheckNote && record.typeCheckNote.status !== 'success'
+            && (!record.typeCheckNote.message || record.typeCheckNote.message.length === 0)) {
+            console.error('typeCheckNote 异常数据', record);
+            return;
+        }
 
-        if(pos === -1)
+        if (pos === -1)
             this.records.unshift(record);
         else
             this.records.splice(pos, 0, record);
@@ -97,13 +102,19 @@ export default {
             if ((record as any)['cases']) {
                 for (const rec of (record as any)['cases']) {
                     this.pushAll(rec.consequent, { processComponentId, logicId });
+                    if(rec.test && rec.test.id)
+                        this.pushAll([rec.test], { processComponentId, logicId });
                 }
             }
 
+            if ((record as any)['test']) {
+                this.pushAll([(record as any)['test']], { processComponentId, logicId });
+            }
+
             if ((record as any)['right'] &&
                 (record as any)['right'].level === 'logicNode') {
                 this.pushAll([(record as any)['right']], { processComponentId, logicId });
             }
         }
     },
-};
+};