@lcap/nasl 4.4.0-beta.9 → 4.4.0-rc.2

package/out/generator/templates/chunk.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const tpl = `"use strict";
-(self["<%= name %>"] = self["<%= name %>"] || []).push([
+(self["chunkLoadingGlobal_<%= name %>"] = self["chunkLoadingGlobal_<%= name %>"] || []).push([
   ["<%= chunkId %>"],
   {
     "./<%= moduleId %>.js": ((__webpack_module, __webpack_exports__, __webpack_require__) => {

package/out/generator/templates/runtime.js

@@ -393,8 +393,8 @@ const tpl = `(() => {
       return __webpack_require__.O(result);
     };
 
-    var chunkLoadingGlobal = (self["<%= name %>"] =
-      self["<%= name %>"] || []);
+    var chunkLoadingGlobal = (self["chunkLoadingGlobal_<%= name %>"] =
+      self["chunkLoadingGlobal_<%= name %>"] || []);
     chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));
     chunkLoadingGlobal.push = webpackJsonpCallback.bind(
       null,

package/out/natural/exports/nasl2Files.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nasl2Files.d.ts","sourceRoot":"","sources":["../../../src/natural/exports/nasl2Files.ts"],"names":[],"mappings":"AAEA,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,oBAGpB;IACD,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;CAC7B,KAAG,aAAa,EA8EhB,CAAC"}

package/out/natural/{getContext → exports}/nasl2Files.js

@@ -11,14 +11,14 @@ const index_1 = require("../../index");
  */
 const nasl2Files = ({ app, range = 'all', }) => {
     const result = [];
-    const state = (0, index_1.createCompilerState)('', { descriptionComment: true });
+    const state = (0, index_1.createCompilerState)('', { descriptionComment: true, consistentMode: true });
     try {
         if (range === 'all' || range === 'ts') {
             // 处理枚举
             if (app.enums && app.enums.length > 0) {
                 app.enums.forEach((item) => {
                     const path = `app.enums.${item.name}.ts`;
-                    const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0 }));
+                    const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0, descriptionComment: false }));
                     result.push({ path, content });
                 });
             }
@@ -26,7 +26,7 @@ const nasl2Files = ({ app, range = 'all', }) => {
             if (app.structures && app.structures.length > 0) {
                 app.structures.forEach((item) => {
                     const path = `app.structures.${item.name}.ts`;
-                    const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0 }));
+                    const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0, descriptionComment: false }));
                     result.push({ path, content });
                 });
             }
@@ -34,7 +34,7 @@ const nasl2Files = ({ app, range = 'all', }) => {
             if (app.dataSources && app.dataSources.length > 0 && app.dataSources[0]?.entities) {
                 app.dataSources[0].entities.forEach((item) => {
                     const path = `app.dataSources.defaultDS.entities.${item.name}.ts`;
-                    const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0 }));
+                    const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0, descriptionComment: false }));
                     result.push({ path, content });
                 });
             }

package/out/natural/exports/nasl2Files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nasl2Files.js","sourceRoot":"","sources":["../../../src/natural/exports/nasl2Files.ts"],"names":[],"mappings":"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"}

package/out/natural/{transform2BatchActions.d.ts → exports/transform2BatchActions.d.ts}

@@ -107,6 +107,6 @@ export declare const transform2BatchActions: ({ codeActions, app, sessionId, typ
  * @param app - NASL 应用实例，需传入 Vue 劫持后的响应式 app
  * @param batchActions - 需要应用的批量操作
  */
-export declare const applyBatchActions: (app: any, batchActions: Operators) => void;
+export declare const applyBatchActions: (app: any, batchActions: Operators) => Promise<unknown>;
 export {};
 //# sourceMappingURL=transform2BatchActions.d.ts.map

package/out/natural/exports/transform2BatchActions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform2BatchActions.d.ts","sourceRoot":"","sources":["../../../src/natural/exports/transform2BatchActions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAOH;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;CAClD;AAED;;;GAGG;AACH,UAAU,WAAW;IACnB,WAAW;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,cAAc;IACd,MAAM,EAAE,GAAG,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,YAAY;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,aAAa;IACb,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,aAAa;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU;IACV,UAAU,EAAE,MAAM,CAAC;CACpB;AAOD;;GAEG;AACH,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,WAClC,KAAK,oBAAoB,EAAE,UAAU,GAAG,OAAO,GAAG,WAAW,CAAC,KACrE,MAeF,CAAC;AA6RF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,sBAAsB,2CAKhC;IACD,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC3B,KAAG;IACF,YAAY,EAAE,SAAS,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;CAmN9D,CAAC;AAqBF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,QAAS,GAAG,gBAAgB,SAAS,qBA2DlE,CAAC"}

package/out/natural/{transform2BatchActions.js → exports/transform2BatchActions.js}

@@ -21,9 +21,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyBatchActions = exports.transform2BatchActions = exports.generateRouterContainerTemplate = void 0;
 const uuid_1 = require("uuid");
-const concepts_1 = require("../concepts");
-const index_1 = require("../index");
-const utils_1 = require("../utils");
+const concepts_1 = require("../../concepts");
+const index_1 = require("../../index");
+const utils_1 = require("../../utils");
 /**
  * 生成空的路由容器模板
  * 用于为嵌套视图创建父级容器视图
@@ -110,6 +110,46 @@ const extractParentViewPaths = (path) => {
     }
     return parentInfos;
 };
+/**
+ * 构建嵌套视图的路径
+ * @param parentViewNames - 父级视图名称数组，例如: ['dashboard', 'teamLeader']
+ * @param viewName - 当前视图名称，例如: 'teamLeaveStatistics'
+ * @returns 构建的路径，例如: 'app.frontendTypes[name=pc].frontends[name=pc].views[name=dashboard].children[name=teamLeader].children[name=teamLeaveStatistics]'
+ */
+const buildNestedViewPath = (parentViewNames, viewName) => {
+    // 基础路径常量
+    const basePath = 'app.frontendTypes[name=pc].frontends[name=pc].views';
+    if (!parentViewNames || parentViewNames.length === 0) {
+        // 如果没有父级，返回顶级视图路径
+        return `${basePath}[name=${viewName}]`;
+    }
+    // 使用数组拼接优化字符串构建性能
+    const pathParts = [`${basePath}[name=${parentViewNames[0]}]`];
+    // 添加后续的父级视图（使用 children）
+    for (let i = 1; i < parentViewNames.length; i++) {
+        pathParts.push(`children[name=${parentViewNames[i]}]`);
+    }
+    // 添加当前视图
+    pathParts.push(`children[name=${viewName}]`);
+    return pathParts.join('.');
+};
+/**
+ * 创建视图查找函数
+ * 统一处理顶级视图和嵌套视图的查找逻辑
+ * @param instance - 应用实例（appInstance 或 app）
+ * @param name - 视图名称
+ * @param parentViewNames - 可选的父级视图名称数组
+ * @returns 找到的视图节点或 undefined
+ */
+const createViewFinder = (instance) => (name, parentViewNames) => {
+    if (parentViewNames && parentViewNames.length > 0) {
+        // 对于嵌套视图，使用路径查找
+        const viewPath = buildNestedViewPath(parentViewNames, name);
+        return instance?.findNodeByPath(viewPath);
+    }
+    // 顶级视图使用 findViewByName
+    return instance?.frontendTypes?.[0]?.frontends?.[0]?.findViewByName(name);
+};
 /**
  * 创建不同类型处理器的工厂函数
  * 为每种类型（entity、structure、enum、logic、view）提供统一的操作接口
@@ -122,9 +162,9 @@ const createTypeHandlers = (appInstance, app) => ({
         /** 实体在应用中的路径模板 */
         path: 'app.dataSources[name=defaultDS].entities[0]',
         /** 从解析实例中查找实体的方法 */
-        findMethod: (name) => appInstance?.dataSources[0].findEntityByName(name),
+        findMethod: (name) => appInstance?.dataSources?.[0]?.findEntityByName(name),
         /** 从目标应用中查找已存在实体的方法 */
-        findExisting: (name) => app.dataSources[0].findEntityByName(name),
+        findExisting: (name) => app.dataSources?.[0]?.findEntityByName(name),
         /** 向目标应用添加实体的方法 */
         addMethod: (json) => app.dataSources[0].addEntity(json),
     },
@@ -162,9 +202,9 @@ const createTypeHandlers = (appInstance, app) => ({
         /** 视图在应用中的路径模板 */
         path: 'app.frontendTypes[name=pc].frontends[name=pc].views[0]',
         /** 从解析实例中查找视图的方法 */
-        findMethod: (name) => appInstance?.frontendTypes[0].frontends[0].findViewByName(name),
+        findMethod: createViewFinder(appInstance),
         /** 从目标应用中查找已存在视图的方法 */
-        findExisting: (name) => app.frontendTypes[0].frontends[0].findViewByName(name),
+        findExisting: createViewFinder(app),
         /** 向目标应用添加视图的方法 */
         addMethod: (json) => app.frontendTypes[0].frontends[0].addView(json),
     },
@@ -209,13 +249,13 @@ const processParentViews = (path, codeArray, processedPaths, errors) => {
  * @param path - 文件路径
  * @param content - 文件内容
  * @param action - 操作类型
- * @returns 包含转换后代码、项目类型、项目名称和操作类型的对象
+ * @returns 包含转换后代码、项目类型、项目名称、操作类型和父级视图名称数组的对象
  */
 const transformCodeAction = ({ path, content, action, }) => {
-    // 移除路径前缀 'src/'
-    const namespace = path.replace('src/', '');
-    // 解析命名空间，提取项目名称
+    // 移除路径前缀 'src/'，并解析命名空间
+    const namespace = path.replace(/^src\//, '');
     const namespaceParts = namespace.split('.');
+    // 提取项目名称和父命名空间
     const itemName = namespaceParts.length >= 2 ? namespaceParts[namespaceParts.length - 2] : '';
     const parentNamespace = namespaceParts.slice(0, -2).join('.');
     // 根据命名空间确定项目类型
@@ -227,11 +267,15 @@ const transformCodeAction = ({ path, content, action, }) => {
         const indent = itemType === 'view' ? '    ' : '';
         transformedCode = `namespace ${parentNamespace} {\n${indent}${content}\n}\n`;
     }
+    // 如果是 view 类型，提取父级视图名称数组
+    // 优化：只在需要时计算 parentViewNames
+    const parentViewNames = itemType === 'view' ? extractParentViewPaths(path).map((info) => info.viewName) : undefined;
     return {
         transformedCode,
         itemType,
         itemName,
         action,
+        ...(parentViewNames && parentViewNames.length > 0 && { parentViewNames }),
     };
 };
 /**
@@ -257,7 +301,7 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
     const startTime = performance.now();
     // 存储转换后的代码片段（用于解析）
     const codeArray = [];
-    // 存储每个项目的类型、名称和操作信息
+    // 存储每个项目的类型、名称、操作信息和父级视图名称
     const itemTypes = [];
     // 存储处理过程中的错误
     const errors = [];
@@ -275,13 +319,13 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
                 processParentViews(item.path, codeArray, processedPaths, errors);
             }
             // 处理当前项
-            const { transformedCode, itemType, itemName, action } = transformCodeAction(item);
+            const { transformedCode, itemType, itemName, action, parentViewNames } = transformCodeAction(item);
             // 只有非删除操作才需要累积代码用于解析，因为删除操作不需要解析新的 NASL 对象
             if (action !== 'delete') {
                 codeArray.push(transformedCode);
             }
             if (action !== 'exist') {
-                itemTypes.push({ type: itemType, name: itemName, action });
+                itemTypes.push({ type: itemType, name: itemName, action, parentViewNames });
             }
             processedPaths.add(item.path);
         }
@@ -326,9 +370,8 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
     // 第三阶段：生成批量操作
     // 获取不同类型的处理器
     const typeHandlers = createTypeHandlers(appInstance, app);
-    const itemTypeNames = new Set(itemTypes.map((item) => item.name));
     // 遍历每个项目，生成对应的批量操作
-    for (const { type: itemType, name: itemName, action } of itemTypes) {
+    for (const { type: itemType, name: itemName, action, parentViewNames } of itemTypes) {
         // 跳过未知类型或无名称的项目
         if (itemType === 'unknown' || !itemName)
             continue;
@@ -339,7 +382,7 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
             // 根据操作类型执行不同的处理逻辑
             if (action === 'delete') {
                 // 删除操作：查找已存在的对象并删除
-                const existingNode = handler.findExisting(itemName);
+                const existingNode = handler.findExisting(itemName, parentViewNames);
                 if (existingNode) {
                     // 添加删除操作到批量操作列表
                     batchActions.actions.push({
@@ -360,7 +403,7 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
             }
             else {
                 // 创建或更新操作：从解析的实例中获取 NASL 对象
-                const naslObject = handler.findMethod(itemName);
+                const naslObject = handler.findMethod(itemName, parentViewNames);
                 if (!naslObject) {
                     errors.push({
                         item: itemName,
@@ -386,7 +429,7 @@ const transform2BatchActions = ({ codeActions, app, sessionId, type = 'normal',
                     path = `${naslObject.parentNode.nodePath}.${type}[${index}]`;
                 }
                 // 检查目标应用中是否已存在同名对象
-                const existingNode = handler.findExisting(itemName);
+                const existingNode = handler.findExisting(itemName, parentViewNames);
                 if (existingNode) {
                     // 存在同名对象，标记为更新操作
                     finalAction = 'update';
@@ -513,6 +556,12 @@ const applyBatchActions = (app, batchActions) => {
         }
     }
     app.emit('collect:end');
+    return new Promise((resolve, reject) => {
+        app.on('save-nasl-success', resolve);
+        app.on('save-nasl-error', (error) => {
+            reject(error);
+        });
+    });
 };
 exports.applyBatchActions = applyBatchActions;
 //# sourceMappingURL=transform2BatchActions.js.map

package/out/natural/exports/transform2BatchActions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform2BatchActions.js","sourceRoot":"","sources":["../../../src/natural/exports/transform2BatchActions.ts"],"names":[],"mappings":"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"}

package/out/natural/index.d.ts

@@ -1,13 +1,13 @@
-export * from './genNaturalTS';
-export * from './genTextualNASL';
-export * from './transformTSCode';
-export * from './transformTS2UI';
-export * from './parseNaturalTS';
-export * from './parseNaturalTSXView';
-export * from './getContext';
-export * from './getContext/getUILib';
-export * from './getContext/nasl2Files';
-export * from './tools';
-export * from './transform2BatchActions';
-export { parseNaturalTSErrorMap } from './transforms/utils';
+export * from './old/getContext/genNaturalTS';
+export * from './old/getContext/genTextualNASL';
+export * from './old/getContext';
+export * from './old/getContext/getUILib';
+export * from './old/parser/transformTSCode';
+export * from './old/parser/transformTS2UI';
+export * from './old/tools';
+export * from './parser/parseNaturalTS';
+export * from './parser/parseNaturalTSXView';
+export * from './exports/nasl2Files';
+export * from './exports/transform2BatchActions';
+export * from './utils';
 //# sourceMappingURL=index.d.ts.map

package/out/natural/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,SAAS,CAAC;AACxB,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,aAAa,CAAC;AAE5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kCAAkC,CAAC;AACjD,cAAc,SAAS,CAAC"}

package/out/natural/index.js

@@ -14,18 +14,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNaturalTSErrorMap = void 0;
-__exportStar(require("./genNaturalTS"), exports);
-__exportStar(require("./genTextualNASL"), exports);
-__exportStar(require("./transformTSCode"), exports);
-__exportStar(require("./transformTS2UI"), exports);
-__exportStar(require("./parseNaturalTS"), exports);
-__exportStar(require("./parseNaturalTSXView"), exports);
-__exportStar(require("./getContext"), exports);
-__exportStar(require("./getContext/getUILib"), exports);
-__exportStar(require("./getContext/nasl2Files"), exports);
-__exportStar(require("./tools"), exports);
-__exportStar(require("./transform2BatchActions"), exports);
-var utils_1 = require("./transforms/utils");
-Object.defineProperty(exports, "parseNaturalTSErrorMap", { enumerable: true, get: function () { return utils_1.parseNaturalTSErrorMap; } });
+__exportStar(require("./old/getContext/genNaturalTS"), exports);
+__exportStar(require("./old/getContext/genTextualNASL"), exports);
+__exportStar(require("./old/getContext"), exports);
+__exportStar(require("./old/getContext/getUILib"), exports);
+__exportStar(require("./old/parser/transformTSCode"), exports);
+__exportStar(require("./old/parser/transformTS2UI"), exports);
+__exportStar(require("./old/tools"), exports);
+__exportStar(require("./parser/parseNaturalTS"), exports);
+__exportStar(require("./parser/parseNaturalTSXView"), exports);
+__exportStar(require("./exports/nasl2Files"), exports);
+__exportStar(require("./exports/transform2BatchActions"), exports);
+__exportStar(require("./utils"), exports);
 //# sourceMappingURL=index.js.map

package/out/natural/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,mDAAiC;AACjC,oDAAkC;AAClC,mDAAiC;AACjC,mDAAiC;AACjC,wDAAsC;AACtC,+CAA6B;AAC7B,wDAAsC;AACtC,0DAAwC;AACxC,0CAAwB;AACxB,2DAAyC;AACzC,4CAA4D;AAAnD,+GAAA,sBAAsB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gEAA8C;AAC9C,kEAAgD;AAChD,mDAAiC;AACjC,4DAA0C;AAC1C,+DAA6C;AAC7C,8DAA4C;AAC5C,8CAA4B;AAE5B,0DAAwC;AACxC,+DAA6C;AAC7C,uDAAqC;AACrC,mEAAiD;AACjD,0CAAwB"}

package/out/natural/{genNaturalTS.d.ts → old/getContext/genNaturalTS.d.ts}

@@ -1,5 +1,5 @@
-import { App, BaseNode } from '../concepts';
-export * as getNaturalContext from './getContext';
+import { App, BaseNode } from '../../../concepts';
+export * as getNaturalContext from '.';
 export declare function genNaturalTS(app: App, currentNode?: BaseNode, focusedNodePath?: string): string;
 export declare function genNaturalTSCurrentContext(currentNode: BaseNode, focusedNodePath?: string, experimental?: boolean, restParams?: any): {
     currentViewTitle?: string;
@@ -77,34 +77,34 @@ export declare function genNaturalTSContextJSONForUI(app: App, currentNode: Base
     componentDeclaration: string;
     enums: {
         namespace: string;
-        data: import("./getContext").Snippet[];
+        data: import(".").Snippet[];
     };
-    entities: import("./getContext").SnippetBlock[];
+    entities: import(".").SnippetBlock[];
     structures: {
         namespace: string;
-        data: import("./getContext").Snippet[];
+        data: import(".").Snippet[];
     };
     appLogics: {
         namespace: string;
-        data: import("./getContext").Snippet[];
+        data: import(".").Snippet[];
     };
     interfaceDependencies: {
         name: string;
-        structures: import("./getContext").SnippetBlock;
-        logics: import("./getContext").SnippetBlock;
+        structures: import(".").SnippetBlock;
+        logics: import(".").SnippetBlock;
     }[];
     dependencies: {
         name: string;
-        structures: import("./getContext").SnippetBlock;
-        logics: import("./getContext").SnippetBlock;
+        structures: import(".").SnippetBlock;
+        logics: import(".").SnippetBlock;
     }[];
     frontendVariables: {
         namespace: string;
-        data: import("./getContext").Snippet[];
+        data: import(".").Snippet[];
     };
     views: {
         namespace: string;
-        data: import("./getContext").Snippet[];
+        data: import(".").Snippet[];
     };
     currentPage: string;
 };

package/out/natural/old/getContext/genNaturalTS.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"genNaturalTS.d.ts","sourceRoot":"","sources":["../../../../src/natural/old/getContext/genNaturalTS.ts"],"names":[],"mappings":"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"}