@lcap/nasl 2.16.1 → 2.17.1

package/src/automate/upgrader/2.12.js

@@ -0,0 +1,38 @@
+import * as nasl from '@nasl';
+
+const excludedKeySet = new Set([
+    'parentNode',
+    'sourceMap',
+    'storageJSON',
+    'tsErrorDetail',
+    'NaslAnnotatedJSON',
+    'calledFrom',
+    '_events',
+    '_collectingList',
+    '_historyList',
+]);
+
+/**
+ * 升级要点：
+ * - 数据源迁移
+ * @param json 升级前的 JSON
+ * @returns 升级后的 JSON
+ */
+export function upgrade(json) {
+    nasl.utils.traverse((current) => {
+        Object.keys(current.node).forEach((key) => {
+            const value = current.node[key];
+            if (key.endsWith('Namespace') && value?.startsWith?.('app.entities'))
+                current.node[key] = value.replace(/app\.entities/g, 'app.dataSources.defaultDS.entities');
+        });
+    }, { node: json }, { mode: 'anyObject', excludedKeySet });
+    json.dataSources = [{
+        concept: 'DataSource',
+        name: 'defaultDS',
+        description: '默认数据源',
+        entities: json.entities,
+    }];
+    delete json.entities;
+
+    return json;
+}

package/src/automate/upgrader/2.14.js

@@ -0,0 +1,218 @@
+import * as nasl from '@nasl';
+
+const excludedKeySet = new Set([
+    'parentNode',
+    'sourceMap',
+    'storageJSON',
+    'tsErrorDetail',
+    'NaslAnnotatedJSON',
+    'calledFrom',
+    '_events',
+    '_collectingList',
+    '_historyList',
+]);
+import { components, commonEvents } from './2.14-components';
+
+/**
+ * 升级要点：
+ * - 补充前端全局变量
+ * - 迁移绑定事件
+ * - 处理 scope 后缀
+ * - 处理 H5 loginButton 的特殊情况
+ * @param json 升级前的 JSON
+ * @returns 升级后的 JSON
+ */
+export function upgrade(json) {
+    nasl.utils.traverse((current) => {
+        if (current.node.concept === 'App') {
+            if (!current.node.frontendVariables) {
+                current.node.frontendVariables = [];
+            }
+        }
+        if (current.node.concept === 'View' || current.node.concept === 'ViewElement') {
+            if (current.node.name === 'loginButton') {
+                current.node.staticStyle = current.node.staticStyle.replace('width: 25.6vw;', '');
+            }
+            if (current.node.slotScope) {
+                // console.log(current.node.slotTarget);
+                if (current.node.slotTarget !== 'cell'
+                    && current.node.slotTarget !== 'item'
+                    && current.node.slotTarget !== 'default'
+                    && current.node.slotTarget !== 'expand-content'
+                    && current.node.slotTarget !== 'editcell')
+                    current.node.slotScope = undefined;
+            }
+
+            const eventMap = {};
+            const bindEvents = current.node.bindEvents;
+            for (let i = 0; i < bindEvents.length; i++) {
+                const bindEvent = bindEvents[i];
+                const firstBindEvent = eventMap[bindEvent.name];
+                if (!firstBindEvent) {
+                    eventMap[bindEvent.name] = bindEvent;
+                }
+
+                if (!bindEvent.logics) {
+                    bindEvent.logics = [];
+                }
+                if (bindEvent.calleeName) {
+                    let argStrs = [];
+                    let args = [];
+                    if (current.node.concept === 'ViewElement') {
+                        argStrs = current.stack.filter((item) => item.tag === 'template' && item.slotScope === 'scope').map((item, index) => item.slotScope + (index || ''));
+                        if (current.node.concept === 'ViewElement')
+                            argStrs.unshift('event');
+                        args = argStrs.map((name) => ({
+                            concept: 'Argument',
+                            expression: {
+                                concept: 'Identifier',
+                                name,
+                            },
+                        }));
+
+                        if (bindEvent.calleeNamespace) {
+                            args = [];
+                        } else {
+                            const reversedStack = [...current.stack, current.node].reverse();
+                            const view = reversedStack.find((item) => item.concept === 'View');
+                            // console.log(current.stack.map((item) => `${item.concept}-${item.name}`).join(',') + '\n');
+                            if (!view) {
+                                throw new Error('找不到页面！' + reversedStack.map((item) => `${item.concept}-${item.name}`).join(','));
+                            }
+
+                            const logic = view.logics.find((logic) => logic.name === bindEvent.calleeName);
+                            // if (bindEvent.calleeName === 'TaskDefList')
+                            // console.log(bindEvent, view.name, view.logics.map((item) => item.name));
+                            if (logic) {
+                                args = args.slice(0, logic.params.length);
+                                if (args.length < logic.params.length && logic.params.length === 2 && logic.params[1].name === 'scope') {
+                                    console.log('splice', logic.params[1].name);
+                                    logic.params.splice(1, 1);
+                                }
+
+                                // checkEventType
+                                const logicParam = logic.params[0];
+                                let shouldType = components[current.node.tag] && components[current.node.tag][bindEvent.name];
+                                if (!shouldType)
+                                    shouldType = commonEvents[bindEvent.name];
+
+                                if (shouldType && logicParam && logicParam.typeAnnotation && logicParam.typeAnnotation.typeName !== shouldType.typeName) {
+                                    console.log(`事件类型修复：${logic.name}@${bindEvent.name} ${logicParam.typeAnnotation.typeName} -> ${shouldType.typeName}`);
+                                    logicParam.typeAnnotation = Object.assign({}, shouldType);
+                                }
+
+                                if (view.name === 'addRoleUser' && logic.name === 'remove') {
+                                    const logicParam1 = logic.params[1];
+                                    if (logicParam1?.typeAnnotation.typeArguments[0].typeName === 'LoadAddRoleUserTableViewStructure')
+                                        logicParam1.typeAnnotation.typeArguments[0].typeName = 'LoadURMTableViewStructure';
+                                }
+                            } else {
+                                // 处理登录组件没有onSuccess的logic的问题
+                                if (current.node.tag === 'lcap-login' && bindEvent.calleeName === 'onSuccess') {
+                                    view.logics.push({
+                                        concept: 'Logic',
+                                        name: 'onSuccess',
+                                        typeParams: null,
+                                        params: [
+                                            {
+                                                concept: 'Param',
+                                                name: 'event',
+                                                typeAnnotation: {
+                                                    concept: 'TypeAnnotation',
+                                                    name: '',
+                                                    typeKind: 'reference',
+                                                    typeNamespace: 'nasl.ui',
+                                                    typeName: 'BaseEvent',
+                                                    typeArguments: null,
+                                                },
+                                            },
+                                        ],
+                                        returns: [],
+                                        variables: [],
+                                        body: [
+                                            {
+                                                concept: 'Start',
+                                                name: '',
+                                                label: '开始',
+                                                folded: false,
+                                            },
+                                            {
+                                                concept: 'JSBlock',
+                                                name: '',
+                                                label: 'JS 代码块',
+                                                folded: false,
+                                                code: "location.href = '/';",
+                                            },
+                                            {
+                                                concept: 'End',
+                                                name: '',
+                                                label: '结束',
+                                                folded: false,
+                                            },
+                                        ],
+                                        playground: [],
+                                    });
+                                }
+                            }
+                        }
+                    }
+
+                    bindEvent.logics.push({
+                        concept: 'Logic',
+                        name: bindEvent.calleeName,
+                        typeParams: null,
+                        params: [],
+                        returns: [],
+                        variables: [],
+                        body: [
+                            {
+                                concept: 'Start',
+                                label: '开始',
+                                folded: false,
+                            },
+                            {
+                                concept: 'CallLogic',
+                                label: '调用逻辑',
+                                folded: false,
+                                calleeNamespace: bindEvent.calleeNamespace,
+                                calleeName: bindEvent.calleeName,
+                                arguments: args,
+                            },
+                            {
+                                concept: 'End',
+                                label: '结束',
+                                folded: false,
+                            },
+                        ],
+                        playground: [],
+                    });
+                }
+                bindEvent.calleeNamespace = undefined;
+                bindEvent.calleeName = undefined;
+                bindEvent.arguments = [];
+
+                // 合并相同 Event
+                if (firstBindEvent) {
+                    const newLogic = bindEvent.logics[0];
+                    if (newLogic) {
+                        const oldNames = new Set(firstBindEvent.logics.map((logic) => logic.name));
+                        if (oldNames.has(newLogic.name))
+                            newLogic.name = nasl.utils.unique(newLogic.name, oldNames);
+                        firstBindEvent.logics.push(newLogic);
+                    }
+                    bindEvents.splice(i, 1);
+                    i--;
+                }
+            }
+        }
+        if (current.node.concept === 'Identifier') {
+            if (current.node.name === 'scope') {
+                const scopeIndex = current.stack.filter((item) => item.tag === 'template' && item.slotScope === 'scope').length;
+                // 上面是有scope的长度，从1开始，下面是下标要减1
+                current.node.name = scopeIndex <= 1 ? 'scope' : `scope${scopeIndex - 1}`;
+            }
+        }
+    }, { node: json }, { mode: 'anyObject', depthFirst: true, excludedKeySet });
+
+    return json;
+}

package/src/automate/upgrader/2.14.old.js

@@ -0,0 +1,127 @@
+import { BindEvent } from '../../concepts';
+import { components, commonEvents } from './2.14-components';
+import { views, viewCache } from '../engine/viewCache';
+
+function iterateUp(node, callback) {
+    while (node) {
+        callback(node);
+        node = node.parentNode;
+    }
+}
+
+export function rootBind(root) {
+    views.forEach((v) => {
+        if (v.slotScope) {
+            if (v.slotTarget !== 'cell'
+                && v.slotTarget !== 'item'
+                && v.slotTarget !== 'default'
+                && v.slotTarget !== 'expand-content'
+                && v.slotTarget !== 'editcell')
+                v.slotScope = undefined;
+        }
+        const bindEvents = viewCache.get(v).bindEvents;
+        const eventMap = {};
+        function genBindEvent(name) {
+            return new BindEvent({
+                name,
+                calleeNamespace: undefined,
+                calleeName: undefined,
+                arguments: [],
+                logics: [],
+            });
+        }
+        const _curView = v.concept === 'View' ? v : v.view;
+
+        bindEvents.forEach((be) => {
+            if (!eventMap[be.name]) {
+                const t = genBindEvent(be.name);
+                t.parentNode = v;
+                t.parentKey = 'bindEvents';
+                eventMap[be.name] = t;
+            }
+
+            const bindEventTrunk = eventMap[be.name];
+
+            if (be.calleeName) {
+                const argStrs = [];
+                let args = [];
+                iterateUp(be, (item) => {
+                    if (item.tag === 'template' && item.slotScope === 'scope') {
+                        argStrs.push(`scope${argStrs.length > 0 ? argStrs.length - 1 : ''}`);
+                    }
+                });
+                argStrs.unshift('event');
+                args = argStrs.map((name) => ({
+                    concept: 'Argument',
+                    expression: {
+                        concept: 'Identifier',
+                        name,
+                    },
+                }));
+                if (be.calleeNamespace) {
+                    args = [];
+                } else {
+                    const logic = _curView.logics.find((logic) => logic.name === be.calleeName);
+                    if (logic) {
+                        args = args.slice(0, logic.params.length);
+                        if (args.length < logic.params.length
+                            && logic.params.length === 2
+                            && logic.params[1].name === 'scope') {
+                            logic.params.splice(1, 1);
+                        }
+
+                        // checkEventType
+                        const logicParam = logic.params[0];
+                        const vtag = v.tag;
+                        let shouldType = components[vtag] && components[vtag][be.name];
+                        if (!shouldType)
+                            shouldType = commonEvents[be.name];
+
+                        if (shouldType && logicParam && logicParam.typeAnnotation.typeName !== shouldType.typeName) {
+                            console.log(`事件类型修复：${logic.name}@${be.name} ${logicParam.typeAnnotation.typeName} -> ${shouldType.typeName}`);
+                            logicParam.typeAnnotation = Object.assign({}, shouldType);
+                        }
+
+                        if (v.name === 'addRoleUser' && logic.name === 'remove') {
+                            const logicParam1 = logic.params[1];
+                            if (logicParam1.typeAnnotation.typeArguments[0].typeName === 'LoadAddRoleUserTableViewStructure')
+                                logicParam1.typeAnnotation.typeArguments[0].typeName = 'LoadURMTableViewStructure';
+                        }
+                    }
+                }
+                bindEventTrunk.addLogic({
+                    concept: 'Logic',
+                    name: be.calleeName,
+                    typeParams: null,
+                    params: [],
+                    returns: [],
+                    variables: [],
+                    body: [
+                        {
+                            concept: 'Start',
+                            label: '开始',
+                            folded: false,
+                        },
+                        {
+                            concept: 'CallLogic',
+                            label: '调用逻辑',
+                            folded: false,
+                            calleeNamespace: be.calleeNamespace,
+                            calleeName: be.calleeName,
+                            arguments: args,
+                        },
+                        {
+                            concept: 'End',
+                            label: '结束',
+                            folded: false,
+                        },
+                    ],
+                    playground: [],
+                });
+            }
+        });
+        Object.keys(eventMap).forEach((k) => {
+            v.bindEvents.push(eventMap[k]);
+        });
+    });
+}

package/src/automate/upgrader/2.16.js

@@ -0,0 +1,42 @@
+import * as nasl from '@nasl';
+
+const excludedKeySet = new Set([
+    'parentNode',
+    'sourceMap',
+    'storageJSON',
+    'tsErrorDetail',
+    'NaslAnnotatedJSON',
+    'calledFrom',
+    '_events',
+    '_collectingList',
+    '_historyList',
+]);
+
+/**
+ * 升级要点：
+ * - 补充前端全局变量
+ * - 迁移绑定事件
+ * - 处理 scope 后缀
+ * - 处理 H5 loginButton 的特殊情况
+ * @param json 升级前的 JSON
+ * @returns 升级后的 JSON
+ */
+export function upgrade(json) {
+    nasl.utils.traverse((current) => {
+        const { node, parent } = current;
+        if (current.node.concept === 'Param') {
+            // defaultValue默认是空字符串
+            if (parent.concept === 'View') {
+                node.required = false;
+                node.defaultValue = node.defaultValue || '';
+            } else if (parent.concept === 'Logic' || parent.concept === 'Process') {
+                // 有默认值的required 不用必填
+                node.required = !node.defaultValue;
+                node.defaultValue = node.defaultValue || '';
+            }
+            // ForEachStatement  TypeAnnotation Function
+            // 不处理 ，也不补充默认值
+        }
+    }, { node: json }, { mode: 'anyObject', depthFirst: true, excludedKeySet });
+    return json;
+}