@lcap/nasl 2.13.0-beta → 2.13.0-beta.1

package/out/utils/index.d.ts

@@ -0,0 +1,37 @@
+export * from './string';
+export * from './traverse';
+export * from './logger';
+import { BaseNode } from '..';
+export declare function findClosestModule(node: BaseNode): BaseNode;
+export declare function findConceptKeyWordByNamespace(namespace: string): string;
+export declare function findConceptKeyWordIndexFromNamespace(namespace: string, keyword: string): number;
+export declare function findConceptValueFromNamespace(namespace: string, keyword: string): string;
+export declare function getGlobalEnv(): any;
+/**
+ * 用 lodash 的 throttle 好像有点问题，先临时做个处理
+ * @param func
+ * @param wait
+ * @param options
+ */
+export declare const throttle: (func: Function, wait: number, options: any) => Function;
+export declare function clearObject(obj: any): void;
+export declare function clearObjectDeep(obj: any): void;
+export declare const waitPromise: (wait: number) => Promise<unknown>;
+export declare const officialCustoms: string[];
+export declare const specialOfficialCustoms: {
+    name: string;
+    version: string;
+}[];
+export declare const shouldLoadCss: (name: string, version: string) => boolean;
+export declare type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
+export declare type WritableKeysOf<T> = {
+    [P in keyof T]: IfEquals<{
+        [Q in P]: T[P];
+    }, {
+        -readonly [Q in P]: T[P];
+    }, P, never>;
+}[keyof T];
+export declare type WritablePart<T> = Pick<T, WritableKeysOf<T>>;
+export declare type NoReadonly<T> = {
+    -readonly [P in keyof T]: T[P];
+};

package/out/utils/index.js

@@ -0,0 +1,125 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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.shouldLoadCss = exports.specialOfficialCustoms = exports.officialCustoms = exports.waitPromise = exports.clearObjectDeep = exports.clearObject = exports.throttle = exports.getGlobalEnv = exports.findConceptValueFromNamespace = exports.findConceptKeyWordIndexFromNamespace = exports.findConceptKeyWordByNamespace = exports.findClosestModule = void 0;
+__exportStar(require("./string"), exports);
+__exportStar(require("./traverse"), exports);
+__exportStar(require("./logger"), exports);
+const compare_versions_1 = require("compare-versions");
+const traverse_1 = require("./traverse");
+// 查找最近的模块
+function findClosestModule(node) {
+    let moduleNode = node;
+    while (moduleNode && !['App', 'Module'].includes(moduleNode.concept)) {
+        moduleNode = moduleNode.parentNode;
+    }
+    return moduleNode;
+}
+exports.findClosestModule = findClosestModule;
+// 从namespace获取关键字
+function findConceptKeyWordByNamespace(namespace) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const keywordViews = namespaceArr.filter((namespaceItem, index) => index % 2 === mod);
+    return keywordViews.pop();
+}
+exports.findConceptKeyWordByNamespace = findConceptKeyWordByNamespace;
+// 从namespace中查找concept关键字
+function findConceptKeyWordIndexFromNamespace(namespace, keyword) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    return namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+}
+exports.findConceptKeyWordIndexFromNamespace = findConceptKeyWordIndexFromNamespace;
+// 从namespace中查找concept，返回找到类型对应的值
+// 如 namespace : app.datasource.defaultDS  keyword: datasource
+// 返回 defaultDS
+function findConceptValueFromNamespace(namespace, keyword) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const findIndex = namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+    if (findIndex)
+        return namespaceArr[findIndex + 1];
+    return '';
+}
+exports.findConceptValueFromNamespace = findConceptValueFromNamespace;
+function getGlobalEnv() {
+    return typeof window !== 'undefined' ? window.appInfo.env : global.appInfoEnv;
+}
+exports.getGlobalEnv = getGlobalEnv;
+/**
+ * 用 lodash 的 throttle 好像有点问题，先临时做个处理
+ * @param func
+ * @param wait
+ * @param options
+ */
+const throttle = (func, wait, options) => func;
+exports.throttle = throttle;
+function clearObject(obj) {
+    Object.keys(obj).forEach((key) => {
+        if (obj[key] === undefined || obj[key] === null)
+            delete obj[key];
+    });
+}
+exports.clearObject = clearObject;
+function clearObjectDeep(obj) {
+    (0, traverse_1.traverse)((current) => {
+        Object.keys(current.node).forEach((key) => {
+            if (current.node[key] === null)
+                delete current.node[key];
+        });
+    }, { node: obj }, { mode: 'anyObject' });
+}
+exports.clearObjectDeep = clearObjectDeep;
+const waitPromise = (wait) => new Promise((res) => setTimeout(() => res(wait), wait));
+exports.waitPromise = waitPromise;
+// 官方扩展组件暂时不包含 css 文件
+exports.officialCustoms = [
+    'u-sider-modal',
+    'timer-count-down',
+    'u-calendar-table',
+    'lcap-login',
+    'lcap-video',
+    'lcap-amap-nav',
+    'lcap-amap-poi',
+    'lcap-echarts-bar',
+    'lcap-echarts-line',
+    'lcap-echarts-pie',
+    'lcap-report',
+    'lcap-wang-editor',
+    'lcap-clock',
+];
+// 特殊官方组件，部分低版本有 css，高版本没有 css
+exports.specialOfficialCustoms = [{ name: 'lcap-rich-text-editor', version: '1.3.10' }];
+// lcap-h5 开头表示官方 H5 扩展组件
+const shouldLoadCss = (name, version) => (!exports.officialCustoms.includes(name)
+    && !/lcap-h5/.test(name)
+    && !exports.specialOfficialCustoms.find((extra) => extra.name === name && (0, compare_versions_1.compare)(version, extra.version, '>=')));
+exports.shouldLoadCss = shouldLoadCss;
+//# sourceMappingURL=index.js.map

package/out/utils/index.js.map

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

package/out/utils/logger.d.ts

@@ -0,0 +1,3 @@
+export declare const logger: {
+    debug(...args: Array<any>): void;
+};

package/out/utils/logger.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logger = void 0;
+const config_1 = require("../config");
+exports.logger = {
+    debug(...args) {
+        if (config_1.config.debug)
+            console.debug('[ASL Debug]', ...args);
+    },
+};
+//# sourceMappingURL=logger.js.map

package/out/utils/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AAEtB,QAAA,MAAM,GAAG;IAClB,KAAK,CAAC,GAAG,IAAgB;QACrB,IAAI,eAAM,CAAC,KAAK;YACZ,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC;CACJ,CAAC"}

package/out/utils/string.d.ts

@@ -0,0 +1,38 @@
+/**
+ * 中划线格式 -转-> 驼峰格式
+ * @param name 原名称
+ * @return 转换后的名称
+ */
+export declare const kebab2Camel: (name: string) => string;
+/**
+ * 驼峰格式 -转-> 中划线格式
+ * @param name 原名称
+ * @return 转换后的名称
+ */
+export declare const Camel2kebab: (name: string) => string;
+/**
+ * 首字母大写
+ * @param value 字符串
+ */
+export declare const firstUpperCase: (value: string) => string;
+/**
+ * 首字母小写
+ * @param value 字符串
+ */
+export declare const firstLowerCase: (value: string) => string;
+/**
+ * @param key 键
+ * @param set 数据集合，Array | Map | Set
+ * @param start 数字起始
+ */
+export declare function unique(key: string, set: Set<string> | Map<string, any> | Array<string> | {
+    [name: string]: string;
+}, start?: number, insensitive?: boolean): string;
+export declare const getLastOfPath: (path: string) => string;
+/**
+ * 切出标签内的内容
+ * @param source 原始内容
+ * @param tag 标签
+ * @param attrs 属性匹配
+ */
+export declare const sliceTagContent: (source: string, tag: string, attrs?: string) => string;

package/out/utils/string.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sliceTagContent = exports.getLastOfPath = exports.unique = exports.firstLowerCase = exports.firstUpperCase = exports.Camel2kebab = exports.kebab2Camel = void 0;
+/**
+ * 中划线格式 -转-> 驼峰格式
+ * @param name 原名称
+ * @return 转换后的名称
+ */
+const kebab2Camel = (name) => name.replace(/(?:^|-)([a-zA-Z0-9])/g, (m, $1) => $1.toUpperCase());
+exports.kebab2Camel = kebab2Camel;
+/**
+ * 驼峰格式 -转-> 中划线格式
+ * @param name 原名称
+ * @return 转换后的名称
+ */
+const Camel2kebab = (name) => name.replace(/([A-Z]|[0-9]+)/g, (m, $1, offset) => (offset ? '-' : '') + $1.toLowerCase());
+exports.Camel2kebab = Camel2kebab;
+/**
+ * 首字母大写
+ * @param value 字符串
+ */
+const firstUpperCase = (value) => value.replace(/^\S/, (letter) => letter.toUpperCase());
+exports.firstUpperCase = firstUpperCase;
+/**
+ * 首字母小写
+ * @param value 字符串
+ */
+const firstLowerCase = (value) => value.replace(/^\S/, (letter) => letter.toLowerCase());
+exports.firstLowerCase = firstLowerCase;
+/**
+ * @param key 键
+ * @param set 数据集合，Array | Map | Set
+ * @param start 数字起始
+ */
+function unique(key, set, start = 1, insensitive = false) {
+    let has;
+    if (insensitive) {
+        has = (_key) => {
+            const lkey = _key.toLowerCase();
+            if (set instanceof Set || set instanceof Map) {
+                // return set.has(_key);
+                const iterator = set.keys();
+                let i = iterator.next();
+                while (!i.done) {
+                    const name = i.value;
+                    if (name.toLowerCase() === lkey) {
+                        return true;
+                    }
+                    i = iterator.next();
+                }
+                return false;
+            }
+            else if (Array.isArray(set))
+                // return set.includes(_key);
+                return set.some((s) => s.toLowerCase() === lkey);
+            else {
+                // return set[_key];
+                const keys = Object.keys(set);
+                return keys.some((k) => k.toLowerCase() === lkey);
+            }
+        };
+    }
+    else {
+        has = (_key) => {
+            if (set instanceof Set || set instanceof Map)
+                return set.has(_key);
+            else if (Array.isArray(set))
+                return set.includes(_key);
+            else
+                return set[_key];
+        };
+    }
+    while (has(key))
+        key = key.replace(/\d*$/, (m) => String(m === '' ? start : +m + 1));
+    return key;
+}
+exports.unique = unique;
+const getLastOfPath = (path) => {
+    const arr = path.split('/');
+    return arr[arr.length - 1];
+};
+exports.getLastOfPath = getLastOfPath;
+/**
+ * 切出标签内的内容
+ * @param source 原始内容
+ * @param tag 标签
+ * @param attrs 属性匹配
+ */
+const sliceTagContent = (source, tag, attrs = '') => {
+    const reg = new RegExp(`<${tag}${attrs ? ' ' + attrs : ''}.*?>([\\s\\S]+)<\\/${tag}>`);
+    const m = source.match(reg);
+    return m ? m[1].replace(/^\n+/, '') : '';
+};
+exports.sliceTagContent = sliceTagContent;
+//# sourceMappingURL=string.js.map

package/out/utils/string.js.map

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

package/out/utils/traverse.d.ts

@@ -0,0 +1,36 @@
+/**
+ * 用于遍历的节点接口
+ */
+export interface INode {
+    children?: Array<INode>;
+    [prop: string]: any;
+}
+/**
+ * 用于遍历的节点信息
+ */
+export interface INodeInfo<T extends INode> {
+    node: T;
+    parent?: T;
+    stack?: Array<T>;
+    nodePath?: string;
+    jsonPath?: string;
+    index?: number;
+    key?: string | number;
+}
+export interface TraverseOptions {
+    mode?: 'onlyChildren' | 'onlyArray' | 'anyObject';
+    depthFirst?: boolean;
+    backTracking?: boolean;
+    excludedKeySet?: Set<string>;
+}
+/**
+ * 遍历树
+ * @param func
+ * @param init 初始点信息
+ * @param options.mode 'onlyChildren' 表示只向下遍历 children 的元素（默认）；'onlyArray' 表示只向下遍历 Array 的元素；'anyObject' 表示只要属性为 Object 类型都会遍历
+ * @param options.depthFirst 默认广度优先搜索，是否深度优先搜索
+ * @example traverse((current) => console.log(current.node.name), { init: rootNode });
+ * @example traverse((current) => console.log(current.jsonPath), { init: ast }, { mode: 'anyObject' });
+ */
+export declare function traverse<T extends INode>(func: (current: INodeInfo<T>) => any, init: INodeInfo<T>, options?: TraverseOptions): any;
+export default traverse;

package/out/utils/traverse.js

@@ -0,0 +1,132 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.traverse = void 0;
+function handleNext(func, current, options) {
+    if (options.mode === 'onlyChildren') {
+        const list = current.node && current.node.children;
+        if (!list)
+            return;
+        for (let index = 0; index < list.length; index++) {
+            const child = list[index];
+            if (!child)
+                continue;
+            const nodeInfo = {
+                node: child,
+                parent: current.node,
+                stack: current.stack.concat([current.node]),
+                nodePath: `${current.nodePath}/${index}`,
+                jsonPath: `${current.jsonPath}.children[${index}]`.replace(/^\./, ''),
+                index,
+                key: index,
+            };
+            const result = func(nodeInfo);
+            // if (result !== undefined)
+            //     return result;
+        }
+    }
+    else if (options.mode === 'onlyArray') {
+        for (const key in current.node) {
+            if (!current.node.hasOwnProperty(key) || options.excludedKeySet.has(key))
+                continue;
+            const value = current.node[key];
+            if (!Array.isArray(value))
+                continue;
+            const list = value;
+            for (let index = 0; index < list.length; index++) {
+                const child = list[index];
+                if (!child)
+                    continue;
+                const nodeInfo = {
+                    node: child,
+                    parent: current.node,
+                    stack: current.stack.concat([current.node]),
+                    nodePath: `${current.nodePath}/${index}`,
+                    jsonPath: `${current.jsonPath}.${key}[${index}]`.replace(/^\./, ''),
+                    index,
+                    key: index,
+                };
+                const result = func(nodeInfo);
+                // if (result !== undefined)
+                //     return result;
+            }
+        }
+    }
+    else if (options.mode === 'anyObject') {
+        for (const key in current.node) {
+            if (!current.node.hasOwnProperty(key) || options.excludedKeySet.has(key))
+                continue;
+            const value = current.node[key];
+            if (Array.isArray(value)) {
+                const list = value;
+                for (let index = 0; index < list.length; index++) {
+                    const child = list[index];
+                    if (!child)
+                        continue;
+                    const nodeInfo = {
+                        node: child,
+                        parent: current.node,
+                        stack: current.stack.concat([current.node]),
+                        nodePath: `${current.nodePath}/${index}`,
+                        jsonPath: `${current.jsonPath}.${key}[${index}]`.replace(/^\./, ''),
+                        index,
+                        key: index,
+                    };
+                    const result = func(nodeInfo);
+                    // if (result !== undefined)
+                    //     return result;
+                }
+            }
+            else if (typeof value === 'object' && value !== null) {
+                const nodeInfo = {
+                    node: value,
+                    parent: current.node,
+                    stack: current.stack.concat([current.node]),
+                    nodePath: `${current.nodePath}/${key}`,
+                    jsonPath: `${current.jsonPath}['${key}']`,
+                    index: undefined,
+                    key,
+                };
+                const result = func(nodeInfo);
+                // if (result !== undefined)
+                //     return result;
+            }
+        }
+    }
+}
+/**
+ * 遍历树
+ * @param func
+ * @param init 初始点信息
+ * @param options.mode 'onlyChildren' 表示只向下遍历 children 的元素（默认）；'onlyArray' 表示只向下遍历 Array 的元素；'anyObject' 表示只要属性为 Object 类型都会遍历
+ * @param options.depthFirst 默认广度优先搜索，是否深度优先搜索
+ * @example traverse((current) => console.log(current.node.name), { init: rootNode });
+ * @example traverse((current) => console.log(current.jsonPath), { init: ast }, { mode: 'anyObject' });
+ */
+function traverse(func, init, options) {
+    init = Object.assign({ parent: undefined, stack: [], nodePath: '', jsonPath: '', index: undefined }, init);
+    options = Object.assign({ mode: 'onlyChildren', depthFirst: false, backTracking: false, excludedKeySet: new Set() }, options);
+    if (options.depthFirst) {
+        if (options.backTracking) {
+            handleNext((next) => traverse(func, next, options), init, options);
+            func(init);
+        }
+        else {
+            func(init);
+            handleNext((next) => traverse(func, next, options), init, options);
+        }
+    }
+    else {
+        let queue = [];
+        queue = queue.concat(init);
+        let current;
+        while ((current = queue.shift())) {
+            const result = func(current);
+            if (result !== undefined)
+                return result;
+            handleNext((next) => queue.push(next), current, options);
+        }
+    }
+}
+exports.traverse = traverse;
+exports.default = traverse;
+//# sourceMappingURL=traverse.js.map

package/out/utils/traverse.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.13.0-beta",
+  "version": "2.13.0-beta.1",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/concepts/BindEvent__.ts

@@ -567,13 +567,19 @@ export class BindEvent extends BaseNode {
 
         code += ') => [\n';
         this.logics.forEach((logic) => {
-            const logicName = logic.name;
-            logic.name = logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
-            logic.name = logic.name.replace(/-/g, '');
-            code += logic.toEmbeddedTS(shiftState(state, code, {
-                tabSize: (state?.tabSize || 0) + 2,
-            }), 'noExport');
-            logic.name = logicName;
+            if (logic.view) {
+                const logicName = logic.name;
+                logic.name = logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
+                logic.name = logic.name.replace(/-/g, '');
+                code += logic.toEmbeddedTS(shiftState(state, code, {
+                    tabSize: (state?.tabSize || 0) + 2,
+                }), 'noExport');
+                logic.name = logicName;
+            } else {
+                code += logic.toEmbeddedTS(shiftState(state, code, {
+                    tabSize: (state?.tabSize || 0) + 2,
+                }), 'noExport');
+            }
 
             code += indent((state?.tabSize || 0));
             code += ',\n';
@@ -593,8 +599,10 @@ export class BindEvent extends BaseNode {
                 const ref = refParam.schema.$ref;
                 let type = '';
                 if (ref.includes('systemTypes')) {
+                    // 不要删除，用于转换类型
                     type = ref.replace('#/systemTypes/', 'nasl.ui.');
                 } else if (ref.includes('basicTypes')) {
+                    // 不要删除，用于转换类型
                     type = ref.replace('#/basicTypes/', 'nasl.core.');
                 }
                 code = `${type}`;

package/src/concepts/Logic__.ts

@@ -1610,7 +1610,8 @@ export class Logic extends BaseNode {
         if (!this.body.length && this.returns.length) {
             code += indent((state?.tabSize || 0) + 1) + `return ${this.returns[0].name};\n`;
         } else {
-            if (this.body.length <= 2 && !(this.parentNode instanceof Namespace)) {
+            // 如果长度小于2 并且不是虚拟节点就 加 报错，
+            if (this.body.length <= 2 && !(this.parentNode instanceof Namespace) && !(this.parentNode instanceof ProcessElement)) {
                 code += 'const $LogicEmpty: any = null;';
             }
             this.body.forEach((item) => {

package/src/concepts/Process__.ts

@@ -1280,7 +1280,7 @@ export class Process extends BaseNode {
             this.bindEvents.forEach((event) => {
                 code += event.toEmbeddedTS(shiftState(state, code, {
                     tabSize: (state?.tabSize || 0),
-                }), true);
+                }));
                 code += '\n';
             });
         }

package/src/concepts/View__.ts

@@ -1854,7 +1854,7 @@ export class View extends BaseNode {
         // 页面上的绑定的事件
         this.bindEvents.forEach((bindEvent) => {
             bindEvent.logics.forEach((logic) => {
-                logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
+                // logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
                 logics.push(logic);
             });
         });
@@ -1862,7 +1862,7 @@ export class View extends BaseNode {
             utils.traverse((current) => {
                 current.node.bindEvents.forEach((bindEvent) => {
                     bindEvent.logics.forEach((logic) => {
-                        logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
+                        // logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
                         logics.push(logic);
                     });
                 });

package/src/server/getProcesses.ts

@@ -296,7 +296,7 @@ export function getPreviousTask(node: ProcessElement, nodePorcess?: Process) {
     return elements;
 }
 
-export function getProcessVariableSuggestions(node: Logic, abandonConstant: boolean = false): CompletionProperty {
+export function getProcessVariableSuggestions(node: LogicItem, abandonConstant: boolean = false): CompletionProperty {
     // if (!node.processElement) {
     //     return;
     // }
@@ -346,7 +346,7 @@ export function getProcessVariableSuggestions(node: Logic, abandonConstant: bool
     if (processElem.type === 'UserTask') {
         // 任务完成时可以拿到该任务的输出参数
         let returns: CompletionProperty[] = [];
-        if (node.logic && node.logic.upperNode.name === 'OnClose') {
+        if (node.logic && node.logic.parentNode.name === 'OnClose') {
             returns = processElem.returns.map(genCompletionProperty([process.name, processElem.name]));
         }
         const scopeVariable = new CompletionProperty({