@lcap/nasl 3.1.0-beta.2 → 3.1.0-beta.4

package/src/concepts/ViewElement__.ts

@@ -1475,11 +1475,38 @@ export class ViewElement extends BaseNode {
     }
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState, parentLevel?: number): string {
+        const {
+            parentNode,
+            app,
+            tag,
+            staticClass,
+            name,
+            bindDirectives,
+            bindRoles,
+            bindEvents,
+            children,
+        } = this;
+
+        const chineseTsName = (name: string) => {
+            let tsName = name;
+            // 匹配所有特殊字符都转为_
+            tsName = tsName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '_');
+            if (/^\d/.test(tsName)) {
+                tsName = '$' + tsName;
+            }
+            return tsName;
+        }
+
         // 过滤模板的登录中的一些翻译，这里只过滤h5表格中的两个列
-        if ((this.parentNode as ViewElement).tag && this.toHump((this.parentNode as ViewElement).tag) === 'lcapLogin' || this.staticClass === 'login-cell')
+        if (
+            parentNode.concept === 'ViewElement' &&
+            parentNode.tag && this.toHump(parentNode.tag) === 'lcapLogin' ||
+            staticClass === 'login-cell'
+        ) {
             return '';
+        }
         // pc事件翻译
-        if (this.toHump(this.tag) === 'lcapLogin') {
+        if (this.toHump(tag) === 'lcapLogin') {
             let code = `new nasl.ui.div({name: __elements.${this.name},\n`;
             // 事件
             if (Array.isArray(this.bindEvents)) {
@@ -1495,7 +1522,7 @@ export class ViewElement extends BaseNode {
             return code;
         }
         let levelIndex = parentLevel || 0;
-        if (this.tag === 'template' && this.haveScope()) {
+        if (tag === 'template' && this.haveScope()) {
             const slotTarget = !this.slotTarget ? 'slotDefault' : 'slot' + this.toFirstUpper(this.toHump(this.slotTarget));
             let code = '';
             code += `${slotTarget}: (current${levelIndex === 0 ? '' : levelIndex})=> {\n`;
@@ -1511,7 +1538,7 @@ export class ViewElement extends BaseNode {
             code += '\n';
             code += '},\n';
             return code;
-        } else if (this.tag === 'template') {
+        } else if (tag === 'template') {
             const slotTarget = !this.slotTarget ? 'slotDefault' : 'slot' + this.toFirstUpper(this.toHump(this.slotTarget));
             let code = '';
             code += `${slotTarget}: ()=> {\n`;
@@ -1528,29 +1555,20 @@ export class ViewElement extends BaseNode {
             code += '},\n';
             return code;
         }
-        function chineseTsName(name: string) {
-            let tsName = name;
-            // 匹配所有特殊字符都转为_
-            tsName = tsName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '_');
-            if (/^\d/.test(tsName)) {
-                tsName = '$' + tsName;
-            }
-            return tsName;
-        }
+
         // 后面那个name是为了查找引用的时候用的
-        let code = `new nasl.ui.${this.toHump(this.tag)}${this.getTypeArgmentsStr(state)}({name: __elements.${this.name},\n`;
+        let code = `new nasl.ui.${this.toHump(tag)}${this.getTypeArgmentsStr(state)}({name: __elements.${name},\n`;
         // 是否开启权限
-        let hasAuth = false;
-        if (Array.isArray(this.bindDirectives)) {
-            hasAuth = !!this.bindDirectives.filter((directive) => directive.name === 'auth').length;
-        }
+        // const hasAuth = Array.isArray(bindDirectives)
+        //     ? !!bindDirectives.filter((directive) => directive.name === 'auth').length
+        //     : false;
         // 角色
-        if (Array.isArray(this.bindRoles) && this.bindRoles.length) {
+        if (Array.isArray(bindRoles) && bindRoles.length) {
             code += indent((state?.tabSize || 0) + 2);
             code += 'roles = [\n';
-            this.bindRoles.forEach((role) => {
+            bindRoles.forEach((role) => {
                 code += indent((state?.tabSize || 0) + 3);
-                code += `${this.app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
+                code += `${app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
                 code += '\n';
             });
             code += indent((state?.tabSize || 0) + 2);
@@ -1558,8 +1576,8 @@ export class ViewElement extends BaseNode {
         }
 
         // 事件
-        if (Array.isArray(this.bindEvents)) {
-            this.bindEvents.forEach((event) => {
+        if (Array.isArray(bindEvents)) {
+            bindEvents.forEach((event) => {
                 code += event.toEmbeddedTS(shiftState(state, code, {
                     tabSize: (state?.tabSize || 0) + 2,
                 }));
@@ -1568,7 +1586,7 @@ export class ViewElement extends BaseNode {
         }
 
         // 子元素
-        if (Array.isArray(this.children)) {
+        if (Array.isArray(children)) {
             code += indent((state?.tabSize || 0) + 1);
 
             if (Array.isArray(this.bindAttrs)) {
@@ -1580,11 +1598,11 @@ export class ViewElement extends BaseNode {
             }
 
             // 如果子集中有插槽的就
-            if (this.children.find((item) => item.tag === 'template' && item.slotTarget)) {
+            if (children.find((item) => item.tag === 'template' && item.slotTarget)) {
                 code += indent((state?.tabSize || 0) + 2);
                 const defaultArr: ViewElement[] = [];
                 // 先把插槽翻译了
-                this.children.forEach((element) => {
+                children.forEach((element) => {
                     if (element.tag === 'template') {
                         code += element.toEmbeddedTS(shiftState(state, code, {
                             tabSize: (state?.tabSize || 0),
@@ -1612,11 +1630,10 @@ export class ViewElement extends BaseNode {
                 }
             } else {
                 code += indent((state?.tabSize || 0) + 2);
-
                 code += `slotDefault: ()=> {\n`;
-                code += this.getDatasourceTypeCodeStr(state, this.children);
+                code += this.getDatasourceTypeCodeStr(state, children);
                 code += 'return [';
-                this.children.forEach((element) => {
+                children.forEach((element) => {
                     code += element.toEmbeddedTS(shiftState(state, code, {
                         tabSize: (state?.tabSize || 0) + 2,
                     }), levelIndex);
@@ -1629,7 +1646,17 @@ export class ViewElement extends BaseNode {
             }
         }
 
-        code += indent((state?.tabSize || 0)) + '}),\n';
+        code += indent((state?.tabSize || 0)) + '})';
+
+        // TODO: 此 bug 延迟至 3.2 修复
+        // // 顶层元素是单独的表达式
+        // if (parentNode.concept === 'View') {
+        //     code += ';\n';
+        // } else {
+        //     code += ',\n';
+        // }
+
+        code += ',\n';
 
         return code;
     }
@@ -2259,8 +2286,15 @@ export class ViewElement extends BaseNode {
 
     /**
      * 计算约束样式
-     */
-    computeConstraintStyle(positionData: { nodeRect: DOMRect, parentRect: DOMRect, parentBorder: { top: number, right: number, bottom: number, left: number }}) {
+     * @param positionData 位置数据
+     * @param doNotRecordLastWidthHeight 是否不记录上一次的宽高
+     */
+    computeConstraintStyle(positionData: {
+            nodeRect: DOMRect,
+            parentRect: DOMRect,
+            parentBorder: { top: number, right: number, bottom: number, left: number }
+        },
+        doNotRecordLastWidthHeight = false) {
         const {nodeRect, parentRect, parentBorder} = positionData;
         const staticWidth = nodeRect.width;
         const staticHeight = nodeRect.height;
@@ -2348,12 +2382,25 @@ export class ViewElement extends BaseNode {
             '--last-width': rawWidth === 'auto' ? styleObj['--last-width'] : rawWidth,
             '--last-height': rawHeight === 'auto' ? styleObj['--last-height'] : rawHeight,
         };
+        if(!doNotRecordLastWidthHeight){
+            if(rawWidth !== 'auto'){
+                newStyleObj['--last-width'] = rawWidth;
+            }
+            if(rawHeight !== 'auto'){
+                newStyleObj['--last-height'] = rawHeight;
+            }
+        }
         const newStaticStyle = this.stringifyStyleAttr(newStyleObj);
         this.update({
             staticStyle: newStaticStyle,
         });
     }
-
+    updateStyleObj(styleObj: Record<string, string | number>) {
+        this.setStaticStyle(this.stringifyStyleAttr({
+            ...this.parseStyleToObject(this.staticStyle),
+            ...styleObj,
+        }));
+    }
     parseStyleToObject(styleStr: string = '') {
         const styleObj = styleStr.split(/;/gim).reduce((obj:Record<string, string | number>, item) => {
             // background-image:url(http://www...)

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

@@ -64,19 +64,20 @@ export const httpStructures = [
             }),
             new StructureProperty({
                 name: 'headers',
-                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                typeAnnotation: TypeAnnotation.createGeneric('Map', {
                     typeArguments: [
-                        // TypeAnnotation.createPrimitive('String'),
-                        // TypeAnnotation.createPrimitive('String'),
-                        TypeAnnotation.createTypeParam('K'),
-                        TypeAnnotation.createTypeParam('V'),
+                        TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createTypeParam('K'),
+                        // TypeAnnotation.createTypeParam('V'),
                     ],
                 }),
             }), new StructureProperty({
                 name: 'cookies',
-                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                typeAnnotation: TypeAnnotation.createGeneric('Map', {
                     typeArguments: [
-                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createTypeParam('K'),
                         TypeAnnotation.createReference('HttpCookie', {
                             typeNamespace: 'nasl.http',
                         }),
@@ -111,42 +112,43 @@ export const httpStructures = [
             }),
             new StructureProperty({
                 name: 'headers',
-                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                typeAnnotation: TypeAnnotation.createGeneric('Map', {
                     typeArguments: [
-                        // TypeAnnotation.createPrimitive('String'),
-                        // TypeAnnotation.createPrimitive('String'),
-                        TypeAnnotation.createTypeParam('K'),
-                        TypeAnnotation.createTypeParam('V'),
+                        TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createTypeParam('K'),
+                        // TypeAnnotation.createTypeParam('V'),
                     ],
                 }),
             }),
             new StructureProperty({
                 name: 'pathParams',
-                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                typeAnnotation: TypeAnnotation.createGeneric('Map', {
                     typeArguments: [
-                        // TypeAnnotation.createPrimitive('String'),
-                        // TypeAnnotation.createPrimitive('String'),
-                        TypeAnnotation.createTypeParam('K'),
-                        TypeAnnotation.createTypeParam('V'),
+                        TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createTypeParam('K'),
+                        // TypeAnnotation.createTypeParam('V'),
                     ],
                 }),
             }),
             new StructureProperty({
                 name: 'queryParams',
-                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                typeAnnotation: TypeAnnotation.createGeneric('Map', {
                     typeArguments: [
-                        // TypeAnnotation.createPrimitive('String'),
-                        // TypeAnnotation.createPrimitive('String'),
-                        TypeAnnotation.createTypeParam('K'),
-                        TypeAnnotation.createTypeParam('V'),
+                        TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createTypeParam('K'),
+                        // TypeAnnotation.createTypeParam('V'),
                     ],
                 }),
             }),
             new StructureProperty({
                 name: 'cookies',
-                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                typeAnnotation: TypeAnnotation.createGeneric('Map', {
                     typeArguments: [
-                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createTypeParam('K'),
                         TypeAnnotation.createReference('HttpCookie', {
                             typeNamespace: 'nasl.http',
                         }),

package/src/concepts/types__.ts

@@ -38,7 +38,6 @@ import type { Variable } from './Variable__';
 import type { BackendVariable } from './BackendVariable__';
 import type { FrontendVariable } from './FrontendVariable__';
 import type { Constant } from './Constant__';
-import type { LogicItem } from './LogicItem__';
 import type { Function } from './Function__';
 import type { AnonymousFunction } from './AnonymousFunction__';
 import type { Interface } from './Interface__';
@@ -162,7 +161,6 @@ export type SynatxNode =
     | BackendVariable
     | FrontendVariable
     | Constant
-    | LogicItem
     | Function
     | AnonymousFunction
     | Interface
@@ -245,4 +243,4 @@ export type SynatxNode =
     | Connector
     | CallConnector;
 
-export type SynatxNodeConcept = SynatxNode['concept'];
+export type SynatxNodeConcept = SynatxNode['concept'];

package/src/generator/genBundleFiles.ts

@@ -176,10 +176,7 @@ export function genBundleFiles(app: App, frontend: Frontend,
         let content = `{
             path: '${route.path}',\n`;
         if (route?.component?.script) {
-            let template = route.component.template;
-            if (config.env !== 'dev') {
-                template = template.replace(/[\t\r\n]/g, '');
-            }
+            const template = route.component.template;
             content += `component: (function(){
                 var componentOptions = ${route.component.script ? '(function(){\n' + route.component.script.trim().replace(/export default |module\.exports +=/, 'return ') + '\n})()' : '{}'};
                 Object.assign(componentOptions, {
@@ -254,6 +251,37 @@ export function genBundleFiles(app: App, frontend: Frontend,
     const customNames = JSON5.stringify(assetsInfo.custom.names);
     let content = `(function(){
         `;
+    if(frontend.globalScaleEnabled) {
+        content += `{
+            // 如果是顶层页面，才使用iframe缩放，否则会死循环
+            if(window.parent === window){
+                // 顶层页面里有个iframe，用来缩放页面
+                document.body.innerHTML = '<iframe src="' + location.href + '"></iframe>';
+                const iframe = document.querySelector('iframe');
+                function scalePage() {
+                    // 计算缩放比例
+                    const windowWidth = window.innerWidth;
+                    const baseWidth = ${frontend.canvasWidth || frontend.defaultCanvasWidth};;
+                    const scale = windowWidth / baseWidth;
+                    // iframe 按比例缩放
+                    iframe.style.transform = 'scale(' + scale + ')';
+                    iframe.style.transformOrigin = '0 0';
+                    // iframe 的宽高需要缩放回去，使其等于顶层宽高
+                    iframe.style.width = baseWidth + 'px';
+                    iframe.style.height = 100 / scale + 'vh';
+                }
+                // 监听窗口变化
+                window.addEventListener('resize', scalePage);
+                // 初始化缩放
+                scalePage();
+                // 禁止滚动条，原因：缩放后会出现滚动条
+                document.documentElement.style.setProperty('--scrollbar-size', 0);
+                // 移除 iframe 边框
+                iframe.style.border = 'none';
+                return;
+            }
+        }`;
+    }
 
     const themeCSS = frontend.genThemeCSS();
     if (themeCSS) {
@@ -298,29 +326,6 @@ export function genBundleFiles(app: App, frontend: Frontend,
                     push.apply(this, [a, b, console.warn]);
                 };
             } catch (e) { console.error(e) }
-
-            ${frontend.globalScaleEnabled ? `
-            // 拿到 appVM.$el 后，才能进行缩放
-            const body = document.body;
-            const html = document.documentElement;
-            const appEl = appVM.$el;
-
-            function scalePage() {
-                const windowWidth = window.innerWidth;
-                const baseWidth = ${frontend.canvasWidth || frontend.defaultCanvasWidth};
-                const scale = windowWidth / baseWidth;
-                body.style.transform = 'scale(' + scale + ')';
-                body.style.transformOrigin = '0 0';
-                body.style.width = baseWidth + 'px';
-                // body 高度等于屏幕高度，以便兼容 fixed 定位
-                body.style.height = 100/scale +'vh';
-                // 溢出滚动逻辑添加到 body 上无效，因此添加 body 下的 appEl 上
-                appEl.style.overflow = 'auto';
-                html.style.setProperty('--scrollbar-size', 0);
-            }
-            window.addEventListener('resize', scalePage);
-            scalePage();
-            `: ''}
             
             return window.appVM = appVM;
         };

package/src/generator/genReleaseBody.ts

@@ -121,7 +121,14 @@ function removePasswordValidation(serverData: InputServerValidationData, nasl: A
 
         const calledLogicPath = `${node.calleeNamespace}.${node.calleeName}`;
 
-        if (calledLogicPath.includes('encrypt') && node.uuid) {
+        if (
+            Boolean(node.uuid) &&
+            (
+                calledLogicPath === 'app.dataSources.defaultDS.entities.LCAPUser.logics.update' ||
+                calledLogicPath === 'app.dataSources.defaultDS.entities.LCAPUser.logics.create' ||
+                calledLogicPath.includes('encrypt')
+            )
+        ) {
             passwordCallLogicUuid.add(node.uuid);
         }
     });
@@ -168,14 +175,10 @@ export async function genReleaseBody(app: App, releaseData: ReleaseData) {
         },
     } = app;
 
-    let authReport: ReturnType<typeof getAuthReport>;
+    const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, frontends);
+    logPublishFunc(`[权限] "[${app.title}]" 分析权限数据成功！`);
     const logicPageResourceDtoList = await genPermissionData(app);
 
-    if (realRelease) {
-        authReport = getAuthReport(app, frontends);
-        logPublishFunc(`[权限] "[${app.title}]" 分析权限数据成功！`);
-    }
-
     const releaseFrontends = app.frontends.map((frontend) => ({
         name: frontend.name,
         type: frontend.type,

package/src/generator/permission.ts

@@ -239,10 +239,9 @@ function findUploaders(app: App) {
     });
     return map;
 }
-function checkUploadAuth(uploaders: Map<string, ViewElement[]>) {
+function checkUploadAuth(view: View | ViewElement) {
     const res: ResourceNode[] = [];
-    // 如果开启控制权限-componet，没开启权限-page
-    uploaders.get('/upload')?.map(node => {
+    let node: BaseNode = view;
         if (node instanceof ViewElement) {
             if (node.auth) {
                 res.push({
@@ -256,7 +255,6 @@ function checkUploadAuth(uploaders: Map<string, ViewElement[]>) {
                 });
             }
         }
-    })
    return res;
 }
 function checkPageAndUploadAuth(uploaders: Map<string, ViewElement[]>) {
@@ -285,10 +283,12 @@ export async function genPermissionData(app: App) {
         const key = `${service.url.path}:${service.url.method}`;
         logicPageResourceDtoList[key] = resources;
     }
-    const authValue = checkUploadAuth(uploaders);
+    let UIs = Array.from(new Set(uploaders?.get('/upload')))
+    let authValue = UIs.map(ui => checkUploadAuth(ui))
     if (authValue?.length) {
-        logicPageResourceDtoList['/upload:POST'] = [checkPageAndUploadAuth(uploaders) != -1 ? [] : authValue];
+        logicPageResourceDtoList['/upload:POST'] = checkPageAndUploadAuth(uploaders) != -1 ? [[]] : authValue
     }
+
     closeCache();
     // console.timeEnd('xxx');
     return logicPageResourceDtoList;

package/src/server/getInterfaces.ts

@@ -34,7 +34,7 @@ function iterator(tree: Namespace, searchContent: string, fakeNode: FakeNode) {
 }
 export function getInterfaces(node: CallInterface | BindEvent, filterText?: string) {
     const app = node?.rootNode as App;
-    const _moduleList = app.interfaceDependencies.filter((item) => item.type === 'interface');
+    const _moduleList = app?.interfaceDependencies.filter((item) => item.type === 'interface') || [];
     const fakeNode = {};
     const interfaces = _moduleList.map((item) => new Namespace({ name: item.name, interfaces: item.interfaces }));
     const tree = new Namespace({

package/src/server/naslServer.ts

@@ -78,6 +78,7 @@ import {
     CallAuthInterface,
     AuthLogicForCallInterface,
     Connector,
+    AuthInterface,
 } from '../concepts';
 import { lsp2tspNumber, SourceMap, SourceMapItem } from '../translator';
 import axios from '../service/storage';
@@ -95,6 +96,7 @@ import { EventEmitter } from '../common/EventEmitter';
 import { traverse } from '../utils';
 
 import { Decimal } from 'decimal.js';
+import { getNodeByNodeCallee } from '../automate/engine/utils';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
     Entity: 3,
@@ -143,6 +145,7 @@ let isChangeInterface = false; //判断是否导入接口
 type ActionNode = { target: Variable; typeannotation: TypeAnnotation };
 let actionArr: Array<ActionNode> = []; //用于导入接口收集更改的节点
 let timer: number = null; //超时器用于收集导入接口相关
+const __naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map(); // naslStdlib文件缓存
 
 // 联合类型切割取出类型
 export function getDisplayString2Type(displayString: string) {
@@ -182,6 +185,7 @@ export function getDisplayString2Type(displayString: string) {
 
 @sentryMonitorNaslServer
 class NaslServer {
+    naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
     messager: Messager = undefined;
 
     worker: Worker = undefined;
@@ -312,12 +316,12 @@ class NaslServer {
         await this.addFile({
             file: 'nasl.ui.definition.ts',
             fileContent: code,
-        });
+        }, { cache: true });
         Object.keys(naslStdlibMap).forEach(async (libFileName: string) => {
             await this.addFile({
                 file: '/' + libFileName,
                 fileContent: naslStdlibMap[libFileName],
-            });
+            }, { cache: true });
         });
         this.elementsLogic = elementsLogic;
         // 全部文件加载完毕开始初始化
@@ -615,9 +619,14 @@ class NaslServer {
     /**
  * 初始化之前添加文件
  */
-    addFile(file: tsProtocol.OpenRequestArgs) {
+    addFile(file: tsProtocol.OpenRequestArgs, { cache = false } = {}) {
+        cache && this.cacheFile(file)
         return this.messager.requestCommand('addFile', file);
     }
+    // 缓存添加过的文件
+    cacheFile(options: tsProtocol.OpenRequestArgs) {
+        __naslStdlibFileCacheMap.set(options.file, options);
+    }
 
     /**u
  * 只新增文件
@@ -1649,6 +1658,25 @@ class NaslServer {
                             diagnostics.push(diagnostic);
                         }
                     }
+                } else if (node instanceof CallInterface) {
+                    const isAuthInterface = this.hasAuth(node);
+                    const interfaceName = node.calleewholeKey.slice(node.calleewholeKey.lastIndexOf('.') + 1);
+                    if (isAuthInterface) {
+                        const errorMsg = `${interfaceName} 接口有鉴权方式，不支持在前端调用`;
+                        const diagnostic = {
+                            node,
+                            severity: 'error',
+                            message: errorMsg,
+                        };
+                        diagnostics.push(diagnostic);
+                        const tsErrorDetail = {
+                            severity: 'error',
+                            errorPos: {
+                                typeName: errorMsg,
+                            },
+                        };
+                        node.tsErrorDetail = tsErrorDetail;
+                    }
                 } else {
                     this.checkNodeError(node, diagnostics);
                 }
@@ -2244,6 +2272,14 @@ class NaslServer {
         }
     }
 
+    /**
+     * 判断当前CallInterface 对应的 Interface 是否含有鉴权方式
+     */
+    hasAuth(node: CallInterface) {
+        const tInterface = getNodeByNodeCallee(node.rootNode, node.calleewholeKey);
+        return tInterface instanceof AuthInterface
+    }
+
     /* 接口导入查找 */
     existStructureFix(semanticDiagnostics: Diagnostic[], node: FileNode, that: any) {
         let module: Module;
@@ -2489,7 +2525,12 @@ class NaslServer {
                         const minRange = this._findMinRange(refItem, fileNode as FileNode);
                         if (minRange.node && (minRange.node instanceof QueryFromExpression || minRange.node instanceof QueryJoinExpression)) {
                             const callQueryComponent = minRange.node.getAncestor('CallQueryComponent') as CallQueryComponent;
-                            const callQueryComponentTypeAnnotation = callQueryComponent.typeAnnotation;
+                            let callQueryComponentTypeAnnotation: TypeAnnotation;
+                            callQueryComponent.logic.sourceMap.forEach((value, key: TypeAnnotation) => {
+                                if (key.concept === 'TypeAnnotation' && key.parentNode === callQueryComponent) {
+                                    callQueryComponentTypeAnnotation = key;
+                                }
+                            });
                             const { currentSource: qcTypeAnnotationCurrentSource, fileNode } = callQueryComponentTypeAnnotation.getCurrentSource();
                             const { currentSource: logicCurrentSource } = fileNode.getCurrentSource();
                             const aggregateLength = callQueryComponent.select.selectAggregateElements.filter((item: any) => item.aggregateName && item.asName).length;
@@ -3666,11 +3707,20 @@ class NaslServer {
                 line: lsp2tspNumber(item.range.start.line),
                 offset: lsp2tspNumber(item.range.start.character),
             };
+
             // 位置计算偏移
-            if (node.concept === 'BinaryExpression'
-                || node.concept === 'CallLogic'
-                || node.concept === 'CallFunction'
-                || node.concept === 'CallInterface') {
+            if ('getQuickInfoOffset' in node) {
+                Object.assign(fileDetail, (node as any).getQuickInfoOffset(fileDetail, item.code));
+            }
+
+            // 位置计算偏移2
+            // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
+            if (
+                node.concept === 'BinaryExpression' ||
+                node.concept === 'CallLogic' ||
+                node.concept === 'CallFunction' ||
+                node.concept === 'CallInterface'
+            ) {
                 // 如果没有括号 ，括号就在外面，就 -1
                 // 有括号就找到括号的位置 然后 -1
                 let indexOf = 0;

package/src/server/translator.ts

@@ -586,18 +586,6 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             tsErrorDetail.message = '自动推导不出类型！newList中有未知类型';
         }
     }
-
-    // 针对前端逻辑，有可能原因是找接口被增加鉴权方式导致
-    if (/Property '(.+?)' does not exist on type 'typeof (.+?)'/.exec(text) && isFELogic) {
-        // 如果存在 则 目标 Interface 更新为了 鉴权相关的，需要给出对应提示
-        const app = node.rootNode;
-        if ((node as CallInterface)?.calleeKey) {
-            const targetInterface = getNodeByNodeCallee(app, (node as CallInterface).calleeKey);
-            if (targetInterface && node.concept === 'CallInterface') {
-                tsErrorDetail.message = `${(node as CallInterface)?.calleeName}接口有鉴权，不支持在前端调用`;
-            }
-        }
-    }
     if (node instanceof Argument || node instanceof Anchor) {
         // if (/Type '(.+?)' is not assignable to type '(.+?)'./.exec(text)) {
         // }