@lcap/nasl 2.18.0 → 2.20.0-beta.2

package/out/templator/genTableBlock.js

@@ -35,27 +35,23 @@ function genTableColumnTemplate(property, currentName = 'current') {
     const entity = property.entity;
     const dataSource = entity.parentNode;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
     if (property.relationEntity) {
         const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
         const relationEntity = dataSource?.findEntityByName(property.relationEntity);
         const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
-        // 有外键关联
-        expression = (0, _1.getExpression)(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
-    }
-    else {
-        expression = (0, _1.getExpression)(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`;
     }
     const getText = (property) => {
         if (property.typeAnnotation.typeName === 'Boolean') {
             return `
-            <u-text v-if="${expression}" text="是"></u-text>
-            <u-text v-if="!${expression}" text="否"></u-text>
+            <u-text v-if="${valueExpression}" text="是"></u-text>
+            <u-text v-if="!${valueExpression}" text="否"></u-text>
             `;
         }
         else {
-            return `<u-text :text="${expression}"></u-text>`;
+            return `<u-text :text="${valueExpression}"></u-text>`;
         }
     };
     return `<u-table-view-column field="${lowerEntityName}.${property.name}">
@@ -79,7 +75,7 @@ function genTableTemplate(entity, nameGroup, modifyable) {
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pageable="true" :remote-paging="true" :show-sizer="true">
-    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template></u-table-view-column>
+    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genTableColumnTemplate(property, currentName) + '\n').join('')}
 

package/out/templator/genTableBlock.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.18.0",
+  "version": "2.20.0-beta.2",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",
@@ -67,4 +67,4 @@
     "typedoc": "^0.22.17",
     "typescript": "^4.1.3"
   }
-}
+}

package/sandbox/stdlib/nasl.auth.ts

@@ -4,7 +4,7 @@ declare namespace nasl.auth {
     export function logout(): Promise<void>;
     export function encryptByAES(authPath: nasl.core.String): nasl.core.String;
     export function decryptByAES(authPath: nasl.core.String): nasl.core.String;
-    export function getProcessStartBy(userNameFilter: nasl.core.String, limit: nasl.core.Long, offset: nasl.core.Long): nasl.collection.List<nasl.core.Any>;
+    export function getUserList(userNameFilter: nasl.core.String, limit: nasl.core.Long, offset: nasl.core.Long): nasl.collection.List<nasl.core.Any>;
    
 
     export class LCAPCurrentUserInfo {

package/sandbox/stdlib/nasl.core.ts

@@ -207,4 +207,5 @@ declare namespace nasl.core {
     export class Enums {
         accept: 'Enums';
     }
+    export type Incompatible<A, B> = A extends B ? never : A
 }

package/sandbox/stdlib/nasl.logging.ts

@@ -1,6 +1,6 @@
 declare namespace nasl.logging {
-    export function INFO<T>(log: nasl.core.String, ..._arg: any[]): T;
-    export function DEBUG<T>(log: nasl.core.String, ..._arg: any[]): T;
-    export function WARN<T>(log: nasl.core.String, ..._arg: any[]): T;
-    export function ERROR<T>(log: nasl.core.String, ..._arg: any[]): T;
+    export function INFO<T>(log: nasl.core.Any, ..._arg: any[]): T;
+    export function DEBUG<T>(log: nasl.core.Any, ..._arg: any[]): T;
+    export function WARN<T>(log: nasl.core.Any, ..._arg: any[]): T;
+    export function ERROR<T>(log: nasl.core.Any, ..._arg: any[]): T;
 }

package/sandbox/stdlib/nasl.util.ts

@@ -13,6 +13,8 @@ declare namespace nasl.util {
     export function Convert(value: nasl.core.Boolean): <T extends nasl.core.String | nasl.core.Integer | nasl.core.Decimal>() => T;
     export function Convert(value: nasl.core.Any): <T extends nasl.core.String>() => T;
 
+    export function ToString<T extends nasl.core.Any>(value: T): nasl.core.String;
+    export function FromString(value: nasl.core.String): <T extends nasl.core.Decimal | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Double | nasl.core.Integer | nasl.core.Long | nasl.core.Boolean>() => T;
     export function EnumToList<T extends nasl.core.Enums>(): nasl.collection.List<{ text: nasl.core.String, value: nasl.core.String }>;
     export function EnumValueToText<T extends nasl.core.Enums>(value: nasl.core.Enums): nasl.core.String;
     export function StringToEnumValue<T extends nasl.core.Enums>(value: nasl.core.String): T;
@@ -23,6 +25,7 @@ declare namespace nasl.util {
     export function Concat(...args: nasl.core.Any): nasl.core.String;
     export function Length(str1: nasl.core.String): nasl.core.Integer;
     export function Length<K, V>(str1: nasl.collection.Map<K, V>): nasl.core.Integer;
+    export function Length<T>(str1: nasl.collection.List<T>): nasl.core.Integer;
     export function IndexOf(str: nasl.core.String, search: nasl.core.String, formIndex: nasl.core.Integer, ignoreCase: nasl.core.Boolean): nasl.core.Integer;
     export function LastIndexOf(str: nasl.core.String, search: nasl.core.String, ignoreCase: nasl.core.Boolean): nasl.core.Integer;
     export function Replace(str: nasl.core.String, search: nasl.core.String, replace: nasl.core.String): nasl.core.String;
@@ -40,13 +43,12 @@ declare namespace nasl.util {
     export function Remove<T, K extends T>(list: nasl.collection.List<T>, item: K): void;
     export function RemoveAt<T>(list: nasl.collection.List<T>, index: nasl.core.Integer): T;
 
-    export function ListLength<T>(str1: nasl.collection.List<T>): nasl.core.Integer;
     export function ListHead<T>(list: nasl.collection.List<T>): T;
     export function ListLast<T>(list: nasl.collection.List<T>): T;
     export function ListFlatten<T>(list: nasl.collection.List<nasl.collection.List<T>>): nasl.collection.List<T>;
-    export function ListTransform<T0, T>(list: nasl.collection.List<T0>, by : (elem : T0) => T): nasl.collection.List<T>;
-    export function ListToMap<T, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.List<T>, byKey: (elem : T) => K, byVal: (elem : T) => V): nasl.collection.Map<K, V>;
-    export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by : (elem : A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
+    export function ListTransform<T0, T>(list: nasl.collection.List<T0>, by: (elem: T0) => T): nasl.collection.List<T>;
+    export function ListToMap<T, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.List<T>, byKey: (elem: T) => K, byVal: (elem: T) => V): nasl.collection.Map<K, V>;
+    export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
 
     export function ListSum<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
     export function ListProduct<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
@@ -93,6 +95,8 @@ declare namespace nasl.util {
     export function Clear<T>(struct: T): T;
     export function RandomInt(start: nasl.core.Integer, end: nasl.core.Integer): nasl.core.Integer;
     export function New<T>(): T;
+    export function NewList<T>(...args: T[]): nasl.collection.List<T>;
+    export function NewMap<K, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
 
     export function CreateListPage<T>(list: nasl.collection.List<T>, total: nasl.core.Integer): { list: nasl.collection.List<T>, total: nasl.core.Integer };
 
@@ -101,7 +105,7 @@ declare namespace nasl.util {
     export function jsonDeserialize<T>(arg: nasl.core.String): T;
 
     export function concatString(...args: nasl.core.String[]): any;
-    export function stringInterpolation(...args:( nasl.core.String | nasl.core.Boolean | nasl.core.Integer | nasl.core.Double | nasl.core.Decimal | nasl.core.Long | nasl.core.Text | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Email) []): String;
+    export function stringInterpolation(...args: (nasl.core.String | nasl.core.Boolean | nasl.core.Integer | nasl.core.Double | nasl.core.Decimal | nasl.core.Long | nasl.core.Text | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Email)[]): String;
 }
 
 

package/src/automate/engine/index.js

@@ -260,7 +260,7 @@ function autoScript(stack) {
         return ${JSON.stringify(roleNASL)};
     }
 
-    const execTemplate = function(app, getCtor, getCMeta, base, rootBindCallback, roleCallback, finalCallback) {
+    const execTemplate = function(app, frontend, getCtor, getCMeta, base, rootBindCallback, roleCallback, finalCallback) {
         let _templateObjects = [];
         const {
             _set,
@@ -271,7 +271,7 @@ function autoScript(stack) {
         } = injectModule.operators;
         const _uniqueName = new injectModule.uniqueName();
 
-        _uniqueName.initAppUniqueNames(app);
+        _uniqueName.initAppUniqueNames(app, frontend);
 
         app.emit('collect:start', {
             actionMsg: '导入页面模板'
@@ -440,7 +440,7 @@ export function getRoles(script) {
     const { exportRoles } = eval(script);
     return exportRoles();
 }
-export function applyTemplate(script, app, rootBindCallback, roleCallback, finalCallback) {
+export function applyTemplate(script, app, frontend, rootBindCallback, roleCallback, finalCallback) {
     operatorModule.upgraders.forEach((upgrader) => upgrader.replace && (script = upgrader.replace(script)));
     const { execTemplate, importModule } = eval(script);
     // 为了兼容 2.11 老模板
@@ -448,7 +448,7 @@ export function applyTemplate(script, app, rootBindCallback, roleCallback, final
         importModule('operators', operatorModule);
         importModule('uniqueName', uniqueName);
     }
-    execTemplate(app, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
+    execTemplate(app, frontend, getConceptConstructor, getConceptMeta, BaseNode, rootBindCallback, roleCallback, finalCallback);
 }
 
 export function applyDropComponent(app, view, element) {

package/src/automate/engine/uniqueName.js

@@ -1,7 +1,7 @@
 import { unique } from '../../utils/string';
 export class uniqueName {
     NamesWeakMap = new Map();
-    initAppUniqueNames(app) {
+    initAppUniqueNames(app, frontend) {
         const NamesWeakMap = this.NamesWeakMap;
         const defaultDS = app.dataSources.find((d) => d.name === 'defaultDS');
         NamesWeakMap.set('defaultDS', new Set(defaultDS.getEntityExistingNames()));
@@ -11,10 +11,10 @@ export class uniqueName {
         NamesWeakMap.set('Enum', new Set(app.getEnumExistingNames()));
         NamesWeakMap.set('Logic', new Set(app.getLogicExistingNames()));
         NamesWeakMap.set('Interface', new Set(app.getInterfaceExistingNames()));
-        NamesWeakMap.set('View', new Set(app.getViewExistingNames()));
+        NamesWeakMap.set('View', new Set(frontend.getViewExistingNames()));
         NamesWeakMap.set('Process', new Set(app.getProcessExistingNames()));
         NamesWeakMap.set('Role', new Set(app.getRoleExistingNames()));
-        NamesWeakMap.set('Variable', new Set(app.getVarExistingNames()));
+        NamesWeakMap.set('Variable', new Set(frontend.getVarExistingNames()));
     }
     getGenUniqNameFunctionName(item, concept) {
         if (item.name === null)

package/src/automate/template/myProcess.js

@@ -10009,7 +10009,7 @@ export const processComponent = (function () {
 		_set(t_CallLogic_unknown_1178, "label", "调用逻辑");
 		_set(t_CallLogic_unknown_1178, "folded", false);
 		_set(t_CallLogic_unknown_1178, "calleeNamespace", "nasl.auth");
-		_set(t_CallLogic_unknown_1178, "calleeName", "getProcessStartBy");
+		_set(t_CallLogic_unknown_1178, "calleeName", "getUserList");
 		_set(t_CallLogic_unknown_1178, "typeArguments", null);
 		_push(t_CallLogic_unknown_1178, "arguments", t_Argument_unknown_1179);
 		_push(t_CallLogic_unknown_1178, "arguments", t_Argument_unknown_1183);

package/src/automate/upgrader/2.20.js

@@ -0,0 +1,41 @@
+import * as nasl from '@nasl';
+
+const excludedKeySet = new Set([
+    'parentNode',
+    'sourceMap',
+    'storageJSON',
+    'tsErrorDetail',
+    'NaslAnnotatedJSON',
+    'calledFrom',
+    '_events',
+    '_collectingList',
+    '_historyList',
+]);
+
+/**
+ * 升级要点：
+ * - 增加frontend参数
+ * @param script 升级前的 script
+ * @returns 升级后的 script
+ */
+export function replace(script) {
+    script = script.replace('execTemplate = function(app,', 'execTemplate = function(app, frontend, ');
+    script = script.replace('_uniqueName.initAppUniqueNames(app);', '_uniqueName.initAppUniqueNames(app, frontend);');
+    return script;
+}
+
+/**
+ * 升级要点：
+ * - app下新建frontends
+ * - 将views放到frontends
+ * - 将frontendVariables放到frontends
+ * - 将componentDependencies放到frontends
+ * @param json 升级前的 JSON
+ * @returns 升级后的 JSON
+ */
+export function upgrade(json) {
+    nasl.utils.traverse((current) => {
+        const { node, parent } = current;
+    }, { node: json }, { mode: 'anyObject', depthFirst: true, excludedKeySet });
+    return json;
+}

package/src/bak/translator.js

@@ -45,7 +45,10 @@ export default function (definition) {
     viewVariables.forEach((viewVariable) => {
         dataMap[viewVariable.code || viewVariable.name] = true;
         const typeAnnotation = viewVariable.typeAnnotation || viewVariable.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && !['primitive', 'union'].includes(typeAnnotation.typeKind);
+        const needGenInitFromSchema = typeAnnotation && (
+            !['primitive', 'union'].includes(typeAnnotation.typeKind)
+            || typeAnnotation.typeName === 'DateTime'
+        );
         let code = `${safeCodeAsKey(viewVariable.name)}:`;
         if (needGenInitFromSchema) {
             code += `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', `;

package/src/common/BaseNode.ts

@@ -907,6 +907,7 @@ export class BaseNode extends EventEmitter {
             } else {
                 const expIndex = parentNode[parentKey].findIndex((item: any) => item === oldNode);
                 const firstUpperText = parentKey[0].toUpperCase() + parentKey.slice(1, parentKey.length);
+                Object.assign(newNode, { offsetX, offsetY });
                 if (parentNode[`insertItemIn${firstUpperText}At`])
                     parentNode[`insertItemIn${firstUpperText}At`](newNode, expIndex);
                 else

package/src/concepts/AnonymousFunction__.ts

@@ -2,6 +2,10 @@ import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import ForEachStatement from './ForEachStatement__';
+import NewList from './NewList__';
+import CallLogic from './CallLogic__';
+import MemberExpression from './MemberExpression__';
+import Entity from './Entity__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -412,6 +416,12 @@ export class AnonymousFunction extends BaseNode {
     //================================================================================
 
     toJS(state?: TranslatorState): String {
+        const grandParent = this.parentNode?.parentNode;
+        if(grandParent instanceof CallLogic
+            && /dataSources\.[^.]+\.entities\.[^.]+\.logics/.test(grandParent.calleeNamespace)
+            && ['update', 'updateBy', 'createOrUpdate', 'batchUpdate'].includes(grandParent.calleeName))
+            return this.toJSOfEntityLogicProperties(state);
+
         let code = '';
         code += '(';
         this.params.forEach((param, index) => {
@@ -429,6 +439,18 @@ export class AnonymousFunction extends BaseNode {
         return code;
     }
 
+    toJSOfEntityLogicProperties(state?: TranslatorState): String {
+        let code = '[';
+        if (this.body && this.body instanceof NewList) {
+            this.body.items.forEach((item: MemberExpression, index, array) => {
+                code += `'${item.property.toJS(shiftState(state, code))}'`;
+                if(index !== array.length-1) code += ',';
+            });
+        }
+        code += ']';
+        return code;
+    }
+
     getVarExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return [...this.params].filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -445,6 +467,24 @@ export class AnonymousFunction extends BaseNode {
     }
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
+        let updateNoPropertyCode = '';
+        const grandParent = this.parentNode?.parentNode;
+        if(grandParent instanceof CallLogic
+            && /dataSources\.[^.]+\.entities\.[^.]+\.logics/.test(grandParent.calleeNamespace)
+            && ['update', 'updateBy', 'createOrUpdate', 'batchUpdate'].includes(grandParent.calleeName)) {
+                const logicNode = grandParent.getCallNode();
+                const entity = logicNode.upperNode.upperNode as Entity;
+                const primaryKeys = entity.properties.filter((item) => item.primaryKey);
+
+                const propertyArg = grandParent.arguments.find((item) => item.keyword === 'properties');
+                const expression = propertyArg?.expression as unknown as AnonymousFunction;
+                const newList = expression?.body as NewList;
+                const newListItems = newList?.items;
+                
+                if(primaryKeys.length === newListItems?.length)
+                    updateNoPropertyCode = 'const __UpdateNoProperty__: any = null;\n';
+        }
+
         let code = '';
         if (this.body) {
             code += `(`;
@@ -454,12 +494,18 @@ export class AnonymousFunction extends BaseNode {
                     code += ', ';
             });
             code += `)`;
-            code += ` => (`;
+            code += ` => {\n`;
+
+            if(updateNoPropertyCode)
+                code += updateNoPropertyCode;
 
+            code += `return `;
+            
             if (this.body) {
                 code += this.body.toEmbeddedTS && this.body.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
             }
-            code += indent(state.tabSize) + ')';
+            code += ';'
+            code += indent(state.tabSize) + '}';
         } else {
             code += '__IDENTIFIER__';
         }