@lcap/nasl 3.8.0-beta.5 → 3.8.0-beta.7

package/out/natural/getContext/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentNodeContextForUI = exports.getCurrentNodeContext = exports.getFrontendViewsCode = exports.getFrontendViews = exports.getChildrenViews = exports.getFrontendVariables = exports.getDependenciesCode = exports.getDependencies = exports.getConnectorsCode = exports.getConnectors = exports.getConnections = exports.getModuleInterfacesCode = exports.getModuleInterfaces = exports.getLogicsCode = exports.getLogics = exports.getStructuresCode = exports.getStructures = exports.getEntitiesCode = exports.getEntities = exports.getEnumsCode = exports.getEnums = exports.getNaslOQL = exports.getNaslUIOld = exports.getNaslUICode = exports.getNaslUI = exports.getNaslUtil = exports.getNaslCore = exports.getLogicWithStructuresCode = exports.getReferenceStructures = exports.wrapTSBlock = void 0;
-const concepts_1 = require("../../concepts");
+exports.getCurrentNodeContextForUI = exports.getCurrentNodeContext = exports.getFrontendViews = exports.getChildrenViews = exports.getFrontendVariables = exports.getDependencies = exports.getConnectors = exports.getModuleInterfaces = exports.getLogics = exports.getStructures = exports.getEntities = exports.getEnums = exports.getNaslOQL = exports.getNaslUIOld = exports.getNaslUI = exports.getNaslUtil = exports.getNaslCore = exports.getLogicStructures = exports.wrapTSBlock = void 0;
 const translator_1 = require("../../translator");
 const getUILib_1 = require("./getUILib");
 const naslStdlibMap_1 = require("./naslStdlibMap");
@@ -9,35 +8,8 @@ const wrapTSBlock = (code) => {
     return `\`\`\`ts\n${code.trimEnd()}\n\`\`\`\n`;
 };
 exports.wrapTSBlock = wrapTSBlock;
-// 获取有引用的 structures
-function getReferenceStructures(referenceStructures, structures) {
-    const relationStructures = [];
-    referenceStructures?.forEach((reference) => {
-        structures?.filter((structure) => structure?.name === reference?.typeName)
-            ?.forEach((structure) => {
-            structure.properties?.forEach((property) => {
-                if (property?.typeAnnotation?.typeKind === 'reference') {
-                    const { typeNamespace, typeName } = property?.typeAnnotation || {};
-                    relationStructures.push({ typeNamespace, typeName });
-                }
-                if (property?.typeAnnotation?.typeArguments?.length) {
-                    property?.typeAnnotation?.typeArguments?.forEach((typeArg) => {
-                        if (typeArg.typeKind === 'reference') {
-                            const { typeNamespace, typeName } = typeArg || {};
-                            relationStructures.push({ typeNamespace, typeName });
-                        }
-                    });
-                }
-            });
-        });
-    });
-    if (!relationStructures.length)
-        return relationStructures;
-    return [...relationStructures, ...getReferenceStructures(relationStructures, structures)];
-}
-exports.getReferenceStructures = getReferenceStructures;
 // 获取logic用到的数据结构(带属性版)
-function getLogicWithStructuresCode(logic, type, desc, namespace) {
+function getLogicStructures(logic, type, desc, namespace) {
     const { params, returns } = logic || {};
     if (!params?.length && !returns?.length)
         return '';
@@ -59,28 +31,29 @@ function getLogicWithStructuresCode(logic, type, desc, namespace) {
             });
         }
     });
-    let structures = [];
-    if (type === 'connector') {
-        structures = logic?.connector?.structures;
-    }
-    else if (type === 'extension' || type === 'interface') {
-        structures = logic?.parentNode?.structures;
-    }
-    const relationStructures = getReferenceStructures(referenceStructures, structures);
-    const newRelationStructures = [...relationStructures, ...referenceStructures];
-    if (namespace && newRelationStructures?.length) {
+    if (namespace && referenceStructures?.length) {
         code += `declare namespace ${namespace} {\n`;
     }
-    newRelationStructures?.forEach((reference) => {
-        const { typeName } = reference || {};
+    referenceStructures?.forEach((reference) => {
+        const { typeNamespace, typeName } = reference || {};
         const state = (0, translator_1.createCompilerState)();
         const tabSize = namespace ? (0, translator_1.shiftState)(state, code, { tabSize: 1 }) : undefined;
-        structures?.filter((structure) => structure?.name === typeName)
-            ?.forEach((structure) => {
-            code += `${structure?.toNaturalTS(tabSize)}\n`;
-        });
+        if (typeNamespace?.includes('extensions.') && type === 'connector') {
+            logic?.connector?.structures
+                ?.filter((structure) => structure?.name === typeName)
+                ?.forEach((structure) => {
+                code += `${structure?.toNaturalTS(tabSize)}\n`;
+            });
+        }
+        if ((typeNamespace?.includes('extensions.') && type === 'extension') || (typeNamespace?.includes('apis.') && type === 'interface')) {
+            logic?.parentNode?.structures
+                ?.filter((structure) => structure?.name === typeName)
+                ?.forEach((structure) => {
+                code += `${structure?.toNaturalTS(tabSize)}\n`;
+            });
+        }
     });
-    if (namespace && newRelationStructures?.length) {
+    if (namespace && referenceStructures?.length) {
         code += `}\n`;
     }
     const { description, codeStr } = desc || {};
@@ -91,7 +64,7 @@ function getLogicWithStructuresCode(logic, type, desc, namespace) {
     code = (0, exports.wrapTSBlock)(code);
     return code;
 }
-exports.getLogicWithStructuresCode = getLogicWithStructuresCode;
+exports.getLogicStructures = getLogicStructures;
 function getNaslCore(logicType) {
     let naslCore = `${(0, naslStdlibMap_1.getNASLStdlibMap)('nasl.core.ts')}\n`;
     if (logicType === 'global_logic')
@@ -108,43 +81,31 @@ function getNaslUtil() {
     return { code, naslUtil };
 }
 exports.getNaslUtil = getNaslUtil;
-const getNaslUI = (app, frontendType, material) => {
-    let naslUI = [];
-    if (material.basicMaterials) {
-        naslUI = typeof material.basicMaterials === 'string' ? (0, getUILib_1.getUILib)(material.basicMaterials) : (0, getUILib_1.handleMaterial)(material.basicMaterials);
+const getNaslUI = (app, frontendType, material, requiredIndexes) => {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
+    const uiLib = typeof material === 'string' ? (0, getUILib_1.getUILib)(material) : (0, getUILib_1.handleMaterial)(material.basicMaterials);
+    const extensionMaterials = typeof material === 'string' ? (0, getUILib_1.getExtensionsMaterial)(app, frontendType) : material.extensionMaterials || [];
+    uiLib.push(...extensionMaterials);
+    if (!hasModuleIndexList) {
+        const naslUI = uiLib;
+        const code = naslUI.map((item, index) => `[3-${index}] ${item.name} | ${item.title} | ${item.description}`).join('\n');
+        return { code, naslUI };
     }
-    const extensionMaterials = typeof material.extensionMaterials === 'string' ? (0, getUILib_1.getExtensionsMaterial)(app, frontendType) : material.extensionMaterials || [];
-    naslUI.push(...extensionMaterials);
-    return { naslUI };
-};
-exports.getNaslUI = getNaslUI;
-const getNaslUICode = (naslUI, codeType, requiredIndexes) => {
-    let code = '';
     const preDeclaration = (0, getUILib_1.getPreDeclaration)();
-    let uiLib = naslUI;
-    if (requiredIndexes?.length) {
-        // 过滤出需要的组件
-        uiLib = naslUI.filter((item, index) => requiredIndexes.includes(`3-${index}`) ||
-            item.name.endsWith('LinearLayout') ||
-            item.name.endsWith('Text') ||
-            item.name.endsWith('Link') ||
-            item.name.endsWith('Button'));
-    }
-    if (codeType === 'detail') {
-        code = (0, exports.wrapTSBlock)(`${preDeclaration}\n${uiLib
-            .map((item) => `/**
+    const naslUI = uiLib.filter((item, index) => requiredIndexes.includes(`3-${index}`) ||
+        item.name.endsWith('LinearLayout') ||
+        item.name.endsWith('Text') ||
+        item.name.endsWith('Link') ||
+        item.name.endsWith('Button'));
+    const code = (0, exports.wrapTSBlock)(`${preDeclaration}\n${naslUI.map((item) => `/**
 * ${item.name}
 * ${item.title}
 * ${item.description}
 */
 ${item.tsDeclaration}`).join('\n')}`);
-    }
-    else {
-        code += uiLib.map((item, index) => `[3-${index}] ${item.name} | ${item.title} | ${item.description}`).join('\n');
-    }
-    return code;
+    return { code, naslUI };
 };
-exports.getNaslUICode = getNaslUICode;
+exports.getNaslUI = getNaslUI;
 const getNaslUIOld = () => {
     const naslUI = `${(0, naslStdlibMap_1.getNASLStdlibMap)('nasl.ui.ts')}\n`;
     const code = (0, exports.wrapTSBlock)(naslUI);
@@ -157,114 +118,89 @@ function getNaslOQL() {
     return { code, naslOql };
 }
 exports.getNaslOQL = getNaslOQL;
-function getEnums(app, state) {
+function getEnums(app, state, requiredIndexes) {
+    const needNamespace = requiredIndexes?.length >= 0;
     const namespace = 'app.enums';
     const data = [];
+    let code = '';
+    code += `declare namespace ${namespace} {\n`;
     app.enums.forEach((enumeration) => {
-        const temp = `${enumeration?.toNaturalTS({ ...state, needNamespace: true })}`;
+        const temp = `${enumeration?.toNaturalTS({ ...state, needNamespace })}`;
+        code += temp;
         data.push({ description: enumeration?.description || enumeration?.name, code: temp });
     });
-    return { namespace, enums: { namespace, data } };
-}
-exports.getEnums = getEnums;
-const getEnumsCode = (enums) => {
-    let code = '';
-    code += `declare namespace ${enums?.namespace} {\n`;
-    enums?.data?.forEach((item) => {
-        code += item?.description ? `/* ${item.description} */ \n` : '';
-        code += `${item.code}\n`;
-    });
     code += `}\n`;
     code = (0, exports.wrapTSBlock)(code);
-    return code;
-};
-exports.getEnumsCode = getEnumsCode;
-function getEntities(app, state) {
+    return { code, namespace, enums: { namespace, data } };
+}
+exports.getEnums = getEnums;
+function getEntities(app, state, requiredIndexes) {
+    const needNamespace = requiredIndexes?.length >= 0;
     const entities = [];
+    let code = '';
     app.dataSources.forEach((dataSource) => {
         const data = [];
         const namespace = `app.dataSources.${dataSource?.name}.entities`;
+        code += `declare namespace ${namespace} {\n`;
         dataSource.entities
             .filter((entity) => !entity.name.startsWith('LCAP') || entity.name === 'LCAPUser')
             .forEach((entity) => {
-            const entityName = `app.dataSources.${dataSource?.name}.entities.${entity?.name}`;
-            const tempCode = `${entity?.toNaturalTS({ ...state, needNamespace: true }, entityName)}`;
+            const entityName = needNamespace ? `app.dataSources.${dataSource?.name}.entities.${entity?.name}` : undefined;
+            const tempCode = `${entity?.toNaturalTS({ ...state, needNamespace }, entityName)}`;
+            code += tempCode;
             data.push({ description: entity?.description || entity?.name, code: tempCode });
         });
         entities.push({ namespace, data });
-    });
-    return { entities };
-}
-exports.getEntities = getEntities;
-const getEntitiesCode = (entities) => {
-    let code = '';
-    entities?.forEach((entity) => {
-        code += `declare namespace ${entity?.namespace} {\n`;
-        entity?.data?.forEach((item) => {
-            code += item?.description ? `/* ${item.description} */ \n` : '';
-            code += `${item.code}\n`;
-        });
         code += `}\n`;
     });
     code = (0, exports.wrapTSBlock)(code);
-    return code;
-};
-exports.getEntitiesCode = getEntitiesCode;
-function getStructures(app, state) {
+    return { code, entities };
+}
+exports.getEntities = getEntities;
+function getStructures(app, state, requiredIndexes) {
+    const needNamespace = requiredIndexes?.length >= 0;
     const data = [];
     const namespace = `app.structures`;
+    let code = '';
+    code += `declare namespace ${namespace} {\n`;
     app.structures
         .filter((entity) => !entity.name.startsWith('LCAP'))
         .forEach((structure) => {
-        const tempCode = `${structure?.toNaturalTS({ ...state, needNamespace: true })}`;
+        const tempCode = `${structure?.toNaturalTS({ ...state, needNamespace })}`;
+        code += tempCode;
         data.push({ description: structure?.description || structure?.name, code: tempCode });
     });
-    return { structures: { namespace, data } };
-}
-exports.getStructures = getStructures;
-const getStructuresCode = (structures) => {
-    let code = '';
-    code += `declare namespace ${structures?.namespace} {\n`;
-    structures?.data?.forEach((item) => {
-        code += item?.description ? `/* ${item.description} */ \n` : '';
-        code += `${item.code}\n`;
-    });
     code += `}\n`;
     code = (0, exports.wrapTSBlock)(code);
-    return code;
-};
-exports.getStructuresCode = getStructuresCode;
-function getLogics(app, currentNode) {
+    return { code, structures: { namespace, data } };
+}
+exports.getStructures = getStructures;
+function getLogics(app, currentNode, requiredIndexes) {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const data = [];
     const namespace = `app.logics`;
+    let code = '';
     app?.logics
         ?.filter((logic) => logic !== currentNode && !logic.name.startsWith('LCAP'))
-        ?.forEach((logic) => {
-        const rename = logic?.calleewholeKey;
-        const tempCode = `${logic?.toNaturalTS({ needNamespace: true, rename, declaration: true })}`;
+        ?.forEach((logic, index) => {
+        const logicIndex = `6-${index}`;
+        if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex))
+            return;
+        const rename = requiredIndexes?.length >= 0 ? logic?.calleewholeKey : undefined;
+        const needNamespace = requiredIndexes?.length >= 0;
+        const tempCode = `${logic?.toNaturalTS({ needNamespace, rename, declaration: true })}`;
         const description = logic?.description || '';
+        code += `[${logicIndex}] ${description ? `${description}: ` : ''}\`${tempCode}\`\n`;
         data.push({ description, code: tempCode });
     });
-    return { appLogics: { namespace, data } };
+    return { code, appLogics: { namespace, data } };
 }
 exports.getLogics = getLogics;
-const getLogicsCode = (appLogics, codeType, requiredIndexes) => {
-    let code = '';
-    appLogics?.data?.forEach((item, index) => {
-        const logicIndex = `6-${index}`;
-        if (requiredIndexes?.length && !requiredIndexes?.includes(logicIndex))
-            return;
-        const tempCode = codeType === 'short' ? item.code.replace(`${appLogics.namespace}.`, '') : item.code;
-        code += `[${logicIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
-    });
-    return code;
-};
-exports.getLogicsCode = getLogicsCode;
-function getModuleInterfaces(modules, state) {
+function getModuleInterfaces(app, state, requiredIndexes) {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const interfaceDependencies = [];
-    modules?.forEach((interfaceDependency) => {
-        interfaceDependency = new concepts_1.Module(interfaceDependency);
-        interfaceDependency.parentKey = 'interfaceDependencies';
+    let code = '';
+    app?.interfaceDependencies?.forEach((interfaceDependency, moduleIndex) => {
         const name = interfaceDependency?.name;
         let structures = {};
         let logics = {};
@@ -278,42 +214,33 @@ function getModuleInterfaces(modules, state) {
         structures = { namespace: structureNamespace, data: structureData };
         const logicNamespace = `${namespace}.interfaces`;
         const logicData = [];
-        interfaceDependency?.interfaces?.forEach((interface_) => {
+        interfaceDependency?.interfaces?.forEach((interface_, index) => {
+            const interfaceIndex = `7-${moduleIndex}-${index}`;
+            if (hasModuleIndexList && !requiredIndexes?.includes(interfaceIndex))
+                return;
             const description = interface_?.description || '';
-            const interfaceName = interface_?.calleewholeKey;
-            const tempCode = interface_?.toNaturalTS((0, translator_1.createCompilerState)('', { needNamespace: true }), interfaceName);
-            const codeWithDetail = getLogicWithStructuresCode(interface_, 'interface', { description, codeStr: tempCode }, structureNamespace);
-            logicData.push({ description, code: tempCode, codeWithDetail });
+            const interfaceName = requiredIndexes?.length >= 0 ? interface_?.calleewholeKey : undefined;
+            const needNamespace = requiredIndexes?.length >= 0;
+            const tempCode = interface_?.toNaturalTS((0, translator_1.createCompilerState)('', { needNamespace }), interfaceName);
+            logicData.push({ description, code: tempCode });
+            if (requiredIndexes?.includes(interfaceIndex)) {
+                code += getLogicStructures(interface_, 'interface', { description, codeStr: tempCode }, structureNamespace);
+            }
+            else {
+                code += `[${interfaceIndex}] ${description ? `${description}: ` : ''}\`${tempCode}\`\n`;
+            }
         });
         logics = { namespace: logicNamespace, data: logicData };
         interfaceDependencies.push({ name, structures, logics });
     });
-    return { interfaceDependencies };
+    return { code, interfaceDependencies };
 }
 exports.getModuleInterfaces = getModuleInterfaces;
-const getModuleInterfacesCode = (interfaceDependencies, codeType, requiredIndexes) => {
-    let code = '';
-    interfaceDependencies.forEach((interfaceDependency, index) => {
-        interfaceDependency?.logics?.data?.forEach((item, idx) => {
-            const interfaceIndex = `7-${index}-${idx}`;
-            if (requiredIndexes?.length && !requiredIndexes?.includes(interfaceIndex))
-                return;
-            if (codeType === 'short') {
-                const tempCode = item.code.replace(`${interfaceDependency?.logics.namespace}.`, '');
-                code += `[${interfaceIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
-            }
-            else {
-                code += item.codeWithDetail;
-            }
-        });
-    });
-    return code;
-};
-exports.getModuleInterfacesCode = getModuleInterfacesCode;
-// 连接
-function getConnections(modules, state) {
+function getConnectors(app, state, requiredIndexes) {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const connections = [];
-    modules?.forEach((connection) => {
+    let code = '';
+    app?.connections?.forEach((connection, connectionIndex) => {
         const name = connection?.name;
         let structures = {};
         let logics = {};
@@ -325,110 +252,59 @@ function getConnections(modules, state) {
             structureData.push({ description: structure?.description || structure?.name, code: tempCode });
         });
         structures = { namespace: structureNamespace, data: structureData };
+        code += `[8-${connectionIndex}] ${connection?.connector?.title}\n`;
         const logicData = [];
-        connection?.connector?.namespaces?.forEach((namespace) => {
-            const curNameSpace = `${connectionNamespace}.${namespace?.name}`;
-            namespace?.logics?.forEach((logic) => {
+        connection?.connector?.namespaces?.forEach((namespace, namespaceIndex) => {
+            namespace?.logics?.forEach((logic, index) => {
+                const logicIndex = `8-${connectionIndex}-${namespaceIndex}-${index}`;
+                if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex))
+                    return;
                 const description = `${logic?.description || logic?.title || ''}`;
-                const rename = `${connection?.name}.${logic?.calleewholeKey}`;
-                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, '', { needNamespace: true, rename, declaration: true }))}`;
-                const codeWithDetail = getLogicWithStructuresCode(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
-                logicData.push({ description, code: tempCode, codeWithDetail, namespace: curNameSpace });
+                const rename = requiredIndexes?.length >= 0 ? `${connection?.name}.${logic?.calleewholeKey}` : undefined;
+                const needNamespace = requiredIndexes?.length >= 0;
+                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, code, { needNamespace, rename, declaration: true }))}`;
+                logicData.push({ description, code: tempCode });
+                if (requiredIndexes?.includes(logicIndex)) {
+                    code += getLogicStructures(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
+                }
+                else {
+                    code += `[${logicIndex}] ${description ? `${description}: ` : ''}\`${tempCode}\`\n`;
+                }
             });
         });
         if (!connection?.connector?.namespaces?.length && connection?.connector?.logics?.length) {
-            connection?.connector?.logics.forEach((logic) => {
+            connection?.connector?.logics.forEach((logic, index) => {
+                const logicIndex = `8-${connectionIndex}-${index}`;
+                if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex))
+                    return;
                 const description = logic?.description || '';
-                const rename = `${connection?.name}.${logic?.calleewholeKey}`;
-                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, '', { needNamespace: true, rename, declaration: true }))}`;
-                const codeWithDetail = getLogicWithStructuresCode(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
-                logicData.push({ description, code: tempCode, codeWithDetail });
+                const rename = requiredIndexes?.length >= 0 ? `${connection?.name}.${logic?.calleewholeKey}` : undefined;
+                const needNamespace = requiredIndexes?.length >= 0;
+                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, code, { needNamespace, rename, declaration: true }))}`;
+                logicData.push({ description, code: tempCode });
+                if (requiredIndexes?.includes(logicIndex)) {
+                    code += getLogicStructures(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
+                }
+                else {
+                    code += `[${logicIndex}] ${description ? `${description}: ` : ''}\`${tempCode}\`\n`;
+                }
             });
         }
         logics = { namespace: connectionNamespace, data: logicData };
         connections.push({ name, structures, logics });
     });
-    return { connections };
-}
-exports.getConnections = getConnections;
-// 连接器
-function getConnectors(modules, state) {
-    const connectors = [];
-    modules?.forEach((connector) => {
-        connector = new concepts_1.Connector(connector);
-        connector.parentKey = 'connectorDependencies';
-        const { name } = connector;
-        let structures = {};
-        let logics = {};
-        const connectorNamespace = `${name}.connector.${name}`;
-        const structureNamespace = `connector.${name}.structures`;
-        const structureData = [];
-        connector?.structures?.forEach((structure) => {
-            const tempCode = `${structure?.toNaturalTS({ ...state, needNamespace: true })}`;
-            structureData.push({ description: structure?.description || structure?.name, code: tempCode });
-        });
-        structures = { namespace: structureNamespace, data: structureData };
-        const logicData = [];
-        connector?.namespaces?.forEach((namespace) => {
-            const curNameSpace = `${connectorNamespace}.${namespace?.name}`;
-            namespace?.logics?.forEach((logic) => {
-                const description = `${logic?.description || logic?.title || ''}`;
-                const rename = `${name}.${logic?.calleewholeKey}`;
-                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, '', { needNamespace: true, rename, declaration: true }))}`;
-                const codeWithDetail = getLogicWithStructuresCode(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
-                logicData.push({ description, code: tempCode, codeWithDetail, namespace: curNameSpace });
-            });
-        });
-        if (!connector?.namespaces?.length && connector?.logics?.length) {
-            connector?.logics.forEach((logic) => {
-                const description = logic?.description || '';
-                const rename = `${name}.${logic?.calleewholeKey}`;
-                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, '', { needNamespace: true, rename, declaration: true }))}`;
-                const codeWithDetail = getLogicWithStructuresCode(logic, 'connector', { description, codeStr: tempCode }, structureNamespace);
-                logicData.push({ description, code: tempCode, codeWithDetail });
-            });
-        }
-        logics = { namespace: connectorNamespace, data: logicData };
-        connectors.push({ name, structures, logics });
-    });
-    return { connectors };
+    return { code, connections };
 }
 exports.getConnectors = getConnectors;
-const getConnectorsCode = (connections, codeType, requiredIndexes) => {
-    let code = '';
-    connections.forEach((connection, index) => {
-        connection?.logics?.data?.forEach((item, idx) => {
-            const interfaceIndex = `8-${index}-${idx}`;
-            if (requiredIndexes?.length && !requiredIndexes?.includes(interfaceIndex))
-                return;
-            if (codeType === 'short') {
-                const namespace = item?.namespace || connection?.logics.namespace;
-                const tempCode = item.code.replace(`${namespace}.`, '');
-                code += `[${interfaceIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
-            }
-            else {
-                code += item.codeWithDetail;
-            }
-        });
-    });
-    return code;
-};
-exports.getConnectorsCode = getConnectorsCode;
-function getDependencies(modules, state, logicType, frontendType) {
+function getDependencies(app, state, requiredIndexes) {
+    const hasModuleIndexList = requiredIndexes?.length > 0;
     const dependencies = [];
-    modules?.forEach((module) => {
-        module = new concepts_1.Module(module);
-        module.parentKey = 'dependencies';
-        // 根据类型获取对应的逻辑
-        let curLogics = module?.logics;
-        if (logicType !== 'global_logic' && frontendType) {
-            module?.frontends?.forEach((frontend) => {
-                if (frontend.type === frontendType) {
-                    curLogics = curLogics.concat([...frontend?.logics]);
-                }
-            });
-        }
-        if (curLogics?.length) {
+    let code = '';
+    app?.dependencies
+        ?.filter((dependency) => dependency.concept === 'Module')
+        ?.forEach((module, moduleIndex) => {
+        // 区分一下扩展组件和依赖库
+        if (module?.logics?.length) {
             const name = module?.name;
             let structures = {};
             let logics = {};
@@ -436,46 +312,35 @@ function getDependencies(modules, state, logicType, frontendType) {
             const structureNamespace = `${namespace}.structures`;
             const structureData = [];
             module?.structures?.forEach((structure) => {
-                const tempCode = structure?.toNaturalTS ? `${structure?.toNaturalTS({ ...state, needNamespace: true })}` : '';
+                const tempCode = `${structure?.toNaturalTS({ ...state, needNamespace: true })}`;
                 structureData.push({ description: structure?.description || structure?.name, code: tempCode });
             });
             structures = { namespace: structureNamespace, data: structureData };
-            let logicsNamespace = '';
+            const logicsNamespace = `${namespace}.logics`;
             const logicData = [];
-            curLogics?.forEach((logic) => {
+            module?.logics?.forEach((logic, index) => {
+                const logicIndex = `9-${moduleIndex}-${index}`;
+                if (hasModuleIndexList && !requiredIndexes?.includes(logicIndex))
+                    return;
                 const description = logic?.description || '';
-                const rename = logic?.calleewholeKey;
-                logicsNamespace = logic?.calleewholeKey.replace(`.${logic.name}`, '');
-                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, '', { needNamespace: true, rename, declaration: true }))}`;
-                const codeWithDetail = getLogicWithStructuresCode(logic, 'extension', { description, codeStr: tempCode }, structureNamespace);
-                logicData.push({ description, code: tempCode, codeWithDetail });
+                const rename = requiredIndexes?.length >= 0 ? logic?.calleewholeKey : undefined;
+                const needNamespace = requiredIndexes?.length >= 0;
+                const tempCode = `${logic?.toNaturalTS((0, translator_1.shiftState)(state, code, { needNamespace, rename, declaration: true }))}`;
+                logicData.push({ description, code: tempCode });
+                if (requiredIndexes?.includes(logicIndex)) {
+                    code += getLogicStructures(logic, 'extension', { description, codeStr: tempCode }, structureNamespace);
+                }
+                else {
+                    code += `[${logicIndex}] ${description ? `${description}: ` : ''}\`${tempCode}\`\n`;
+                }
             });
             logics = { namespace: logicsNamespace, data: logicData };
             dependencies.push({ name, structures, logics });
         }
     });
-    return { dependencies };
+    return { code, dependencies };
 }
 exports.getDependencies = getDependencies;
-const getDependenciesCode = (dependencies, codeType, requiredIndexes) => {
-    let code = '';
-    dependencies.forEach((dependency, index) => {
-        dependency?.logics?.data?.forEach((item, idx) => {
-            const logicIndex = `9-${index}-${idx}`;
-            if (requiredIndexes?.length && !requiredIndexes?.includes(logicIndex))
-                return;
-            if (codeType === 'short') {
-                const tempCode = item.code.replace(`${dependency?.logics.namespace}.`, '');
-                code += `[${logicIndex}] ${item.description ? `${item.description}: ` : ''}\`${tempCode}\`\n`;
-            }
-            else {
-                code += item.codeWithDetail;
-            }
-        });
-    });
-    return code;
-};
-exports.getDependenciesCode = getDependenciesCode;
 function getFrontendVariables(frontend, state) {
     let code = '';
     frontend?.variables?.forEach((variable) => {
@@ -531,17 +396,7 @@ function getFrontendViews(frontend, state, currentNode, convertChildren) {
     return { code: (0, exports.wrapTSBlock)(code), views: { namespace, data } };
 }
 exports.getFrontendViews = getFrontendViews;
-const getFrontendViewsCode = (views) => {
-    let code = '';
-    views?.data?.forEach((item) => {
-        code += `/* ${item.description} */ \n`;
-        code += item.code;
-        code += `\n`;
-    });
-    return (0, exports.wrapTSBlock)(code);
-};
-exports.getFrontendViewsCode = getFrontendViewsCode;
-function getCurrentNodeContext(currentNode, focusedNodePath) {
+function getCurrentNodeContext(currentNode, focusedNodePath, experimental) {
     let code = '';
     let view;
     if (currentNode?.concept === 'View') {
@@ -568,14 +423,20 @@ function getCurrentNodeContext(currentNode, focusedNodePath) {
             needNamespace: true,
         }), function (state) {
             let code = '';
-            code += `\n${(0, translator_1.indent)(state.tabSize + 1)}const $refs = {\n`;
-            // 生成所有的name和类型定义
-            this.elements.forEach((element) => {
-                code += element.toNaturalTSDefinition((0, translator_1.shiftState)(state, code, {
-                    tabSize: state.tabSize + 1,
-                }));
-            });
-            code += `${(0, translator_1.indent)(state.tabSize + 1)}}\n`;
+            code += `\n${(0, translator_1.indent)(state.tabSize)}`;
+            if (experimental) {
+                code += this.elements[0].toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: state.tabSize + 1 }));
+            }
+            else {
+                code += `const $refs = {\n`;
+                // 生成所有的name和类型定义
+                this.elements.forEach((element) => {
+                    code += element.toNaturalTSDefinition((0, translator_1.shiftState)(state, code, {
+                        tabSize: state.tabSize + 1,
+                    }));
+                });
+                code += `${(0, translator_1.indent)(state.tabSize + 1)}}\n`;
+            }
             // 逻辑
             if (currentNode?.concept === 'Logic') {
                 code += '\n';