@lcap/nasl 1.0.0-alpha.9 → 1.0.2

package/src/templator/utils.ts

@@ -2,10 +2,11 @@ import { utils } from '..';
 import { App, Namespace, Entity, EntityProperty, Logic, View } from '../concepts';
 
 export const filterProperty = (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') => (property: EntityProperty) => {
-    if (property.display)
+    if (property.display) {
         return property.display[key];
-    else
+    } else {
         return !['id', 'createdTime', 'updatedTime'].includes(property.name);
+    }
 };
 
 /**
@@ -17,7 +18,7 @@ export function getExpression(property: EntityProperty, expression: string) {
     const { typeAnnotation } = property || {};
     const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
     if (propertyTypeName === 'DateTime')
-        return `$utils['FormatDate'](${expression}, 'YYYY-MM-DD HH:mm:ss')`;
+        return `$utils['FormatDateTime'](${expression}, 'YYYY-MM-DD HH:mm:ss')`;
     else if (propertyTypeName === 'Date')
         return `$utils['FormatDate'](${expression}, 'YYYY-MM-DD')`;
     else {
@@ -224,6 +225,7 @@ export const NaslUITypeAnnotation = {
     UploadErrorEvent: genNaslUITypeAnnotation('UploadErrorEvent'),
     SortEvent: genNaslUITypeAnnotation('SortEvent'),
     PoiInfo: genNaslUITypeAnnotation('PoiInfo'),
+    File: genNaslUITypeAnnotation('File'),
     ScopeOf: genNaslUIGenericTypeAnnotation('ScopeOf'),
 };
 
@@ -361,7 +363,7 @@ export const NaslLogicItem = {
 };
 
 export const NaslQueryExpression = {
-    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName }: { label: string; isDotStar: boolean; entityAsName: string; propertyName: string }) => ({
+    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName }: { label: string; isDotStar: boolean; entityAsName: string; propertyName?: string }) => ({
         concept: 'QueryFieldExpression',
         name: '',
         label,
@@ -438,6 +440,7 @@ export const NaslQueryExpression = {
         orderBy,
         logicName,
         structureName,
+        ideVersion,
     }: {
         label?: string;
         typeAnnotation: any;
@@ -446,10 +449,11 @@ export const NaslQueryExpression = {
         where: any;
         limit: any;
         groupBy: any[];
-        having: any[];
+        having: any;
         orderBy: any[];
         logicName: string;
         structureName: string;
+        ideVersion: string
     }) => ({
         concept: 'CallQueryComponent',
         name: '',
@@ -465,6 +469,7 @@ export const NaslQueryExpression = {
         orderBy,
         logicName,
         structureName,
+        ideVersion,
     }),
 };
 
@@ -495,10 +500,11 @@ export const NaslNode = {
         description,
         playground,
     }),
-    Structure: ({ name, properties }: { name: string; properties?: any[] }) => ({
+    Structure: ({ name, properties, origin }: { name: string; properties?: any[], origin?: 'CallQueryComponent' }) => ({
         concept: 'Structure',
         name,
         properties,
+        origin,
     }),
     StructureProperty: ({ name, typeAnnotation }: { name: string; typeAnnotation?: any }) => ({
         concept: 'StructureProperty',

package/src/test/fixtures/env.ts

@@ -9,8 +9,6 @@ export async function getApp() {
     await login('admin', 'Admin@123456');
 
     const app = new App({ id: appId });
-    // config.defaultApp = app;
-
     // await app.loadAll();
 
     return app;

package/src/test/units/page/Element.spec.ts

@@ -6,7 +6,7 @@ describe('Block', () => {
         it('简单标签', () => {
             const source = '<u-input size="normal" :checked="var1" v-model="var2" @change="onChange"></u-input>';
             const element = ViewElement.parse(source);
-            const result = element.toVue();
+            const result = element?.toVue();
             console.info(result);
             expect(source).to.equal(result);
         });
@@ -16,7 +16,7 @@ describe('Block', () => {
     <u-input size="normal" :checked="var1" v-model="var2" @change="onChange"></u-input>
 </u-linear-layout>`;
             const element = ViewElement.parse(source);
-            const result = element.toVue();
+            const result = element?.toVue();
             console.info(result);
             expect(source).to.equal(result);
         });
@@ -24,7 +24,7 @@ describe('Block', () => {
         it('去除 text 类型', () => {
             const source = `<u-linear-layout direction="vertical">这是一行文本</u-linear-layout>`;
             const element = ViewElement.parse(source);
-            const result = element.toVue();
+            const result = element?.toVue();
             console.info(result);
             expect(result).to.equal(`<u-linear-layout direction="vertical">
     <u-text text="这是一行文本"></u-text>

package/src/test/units/temp/temp.spec.ts

@@ -59,7 +59,7 @@ describe('Block', () => {
             </l-dashboard>
         `;
             const element = ViewElement.parse(source);
-            const result = element.toVue({ aslIdAttr: true });
+            const result = element?.toVue({ aslIdAttr: true });
             console.info(result);
         });
     });

package/src/utils/index.ts

@@ -2,6 +2,7 @@ export * from './string';
 export * from './traverse';
 export * from './logger';
 
+import { compare } from 'compare-versions';
 import { traverse } from './traverse';
 
 export function getGlobalEnv() {
@@ -34,6 +35,29 @@ export function clearObjectDeep(obj: any) {
 
 export const waitPromise = (wait: number) => new Promise((res) => setTimeout(() => res(wait), wait));
 
+// 官方扩展组件暂时不包含 css 文件
+export const 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
+export const specialOfficialCustoms = [{ name: 'lcap-rich-text-editor', version: '1.3.10' }];
+// lcap-h5 开头表示官方 H5 扩展组件
+export const shouldLoadCss = (name: string, version: string): boolean => (!officialCustoms.includes(name)
+  && !/lcap-h5/.test(name)
+  && !specialOfficialCustoms.find((extra) => extra.name === name && compare(version, extra.version, '>=')));
+
 // https://github.com/Microsoft/TypeScript/issues/27024#issuecomment-421529650
 export type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
 

package/src/utils/string.ts

@@ -27,15 +27,45 @@ export const firstLowerCase = (value: string) => value.replace(/^\S/, (letter) =
  * @param set 数据集合，Array | Map | Set
  * @param start 数字起始
  */
-export function unique(key: string, set: Set<string> | Map<string, any> | Array<string> | { [name: string]: string }, start: number = 1) {
-    const has = (_key: string) => {
-        if (set instanceof Set || set instanceof Map)
-            return set.has(_key);
-        else if (Array.isArray(set))
-            return set.includes(_key);
-        else
-            return set[_key];
-    };
+export function unique(key: string,
+    set: Set<string> | Map<string, any> | Array<string> | { [name: string]: string },
+    start: number = 1,
+    insensitive: boolean = false) {
+    let has;
+    if (insensitive) {
+        has = (_key: string) => {
+            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: string) => {
+            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));