@lcap/nasl 3.8.0-beta.3 → 3.8.0-beta.5

package/src/concepts/basics/stdlib/nasl.validation.ts

@@ -14,6 +14,11 @@ export function initialize() {
   const Param = getConceptConstructor('Param');
   const Return = getConceptConstructor('Return');
   const Function = getConceptConstructor('Function');
+  const DefaultValue = getConceptConstructor('DefaultValue');
+  const BooleanLiteral = getConceptConstructor('BooleanLiteral');
+  const NumericLiteral = getConceptConstructor('NumericLiteral');
+  const StringLiteral = getConceptConstructor('StringLiteral');
+  const NewList = getConceptConstructor('NewList');
 
   const genEmptyParamFunction = function (name: string) {
     return new Function({
@@ -39,6 +44,9 @@ export function initialize() {
           name: 'min',
           typeAnnotation: TypeAnnotation.createPrimitive('Long'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
       ],
       returns: [
@@ -54,6 +62,9 @@ export function initialize() {
           name: 'max',
           typeAnnotation: TypeAnnotation.createPrimitive('Long'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
       ],
       returns: [
@@ -69,11 +80,17 @@ export function initialize() {
           name: 'min',
           typeAnnotation: TypeAnnotation.createPrimitive('Long'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
         new Param({
           name: 'max',
           typeAnnotation: TypeAnnotation.createPrimitive('Long'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
       ],
       returns: [
@@ -89,6 +106,9 @@ export function initialize() {
           name: 'min',
           typeAnnotation: TypeAnnotation.createPrimitive('Decimal'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
       ],
       returns: [
@@ -104,6 +124,9 @@ export function initialize() {
           name: 'max',
           typeAnnotation: TypeAnnotation.createPrimitive('Decimal'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
       ],
       returns: [
@@ -119,11 +142,17 @@ export function initialize() {
           name: 'min',
           typeAnnotation: TypeAnnotation.createPrimitive('Decimal'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
         new Param({
           name: 'max',
           typeAnnotation: TypeAnnotation.createPrimitive('Decimal'),
           required: true,
+          defaultValue: new DefaultValue({
+            expression: new NumericLiteral({ value: '0' })
+          })
         }),
       ],
       returns: [
@@ -140,6 +169,22 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
           required: true,
         }),
+        new Param({
+          name: 'strict',
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+          required: true,
+          defaultValue: new DefaultValue({
+            expression: new BooleanLiteral({ value: 'true' })
+          }),
+        }),
+        new Param({
+          name: 'matchCase',
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+          required: true,
+          defaultValue: new DefaultValue({
+            expression: new BooleanLiteral({ value: 'true' })
+          }),
+        }),
       ],
       returns: [
         new Return({
@@ -230,6 +275,9 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createGeneric('List', {
             typeArguments: [TypeAnnotation.createPrimitive('Any')],
           }),
+          defaultValue: new DefaultValue({
+            expression: new NewList({ items: [] })
+          }),
           required: true,
         }),
       ],
@@ -247,6 +295,9 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createGeneric('List', {
             typeArguments: [TypeAnnotation.createPrimitive('Any')],
           }),
+          defaultValue: new DefaultValue({
+            expression: new NewList({ items: [] })
+          }),
           required: true,
         }),
       ],
@@ -264,6 +315,9 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createGeneric('List', {
             typeArguments: [TypeAnnotation.createPrimitive('Any')],
           }),
+          defaultValue: new DefaultValue({
+            expression: new NewList({ items: [] })
+          }),
           required: true,
         }),
       ],
@@ -281,6 +335,9 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createGeneric('List', {
             typeArguments: [TypeAnnotation.createPrimitive('Any')],
           }),
+          defaultValue: new DefaultValue({
+            expression: new NewList({ items: [] })
+          }),
           required: true,
         }),
       ],
@@ -344,7 +401,7 @@ export function initialize() {
         }),
         new Param({
           name: 'digits',
-          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
           required: false,
         }),
       ],
@@ -474,9 +531,53 @@ export function initialize() {
     }),
     genEmptyParamFunction('hexColor'),
     genEmptyParamFunction('hex'),
-    genEmptyParamFunction('creditCard'),
     genEmptyParamFunction('fqdn'),
     genEmptyParamFunction('ipOrFQDN'),
+    new Function({
+      name: 'creditCard',
+      params: [
+        new Param({
+          name: 'types',
+          required: true,
+          typeAnnotation: TypeAnnotation.createGeneric('List', {
+            typeArguments: [TypeAnnotation.createPrimitive('String')],
+          }),
+          defaultValue: new DefaultValue({
+            expression: new NewList({
+              typeAnnotation: TypeAnnotation.createGeneric('List', {
+                typeArguments: [TypeAnnotation.createPrimitive('String')],
+              }),
+              items: [
+                new StringLiteral({ value: "UnionPay" })
+              ]
+            }),
+
+          }),
+          useComponent: { type: 's-bidirectional-bind-switch' },
+          // defaultExpression: new NewList({
+          //   // name: 'creditCardTypesDefaultExpression',
+          //   name:"GetSpecificDaysOfWeekTargetDefaultExpression",
+          //   typeAnnotation: TypeAnnotation.createGeneric('List', {
+          //       typeArguments: [TypeAnnotation.createPrimitive('String')],
+          //   }),
+          // }),
+          options: [
+            { text: '银联', value: 'UnionPay' },
+            { text: '维萨', value: 'Visa' },
+            { text: '万事达', value: 'Mastercard' },
+            { text: '美国运通', value: 'AMEX' },
+            { text: '吉士美', value: 'JCB' },
+            { text: '发现', value: 'Discover' },
+            { text: '大来', value: 'DinersClub' },
+          ],
+        }),
+      ],
+      returns: [
+        new Return({
+          typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+        }),
+      ],
+    }),
     new Function({
       name: 'isbn',
       params: [
@@ -520,12 +621,18 @@ export function initialize() {
         new Param({
           name: 'locale',
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
-          required: false,
+          required: true,
+          defaultValue: new DefaultValue({
+            expression: new StringLiteral({ value: "zh-CN" })
+          })
         }),
         new Param({
           name: 'strict',
           typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
-          required: false,
+          required: true,
+          defaultValue: new DefaultValue({
+            expression: new BooleanLiteral({ value: 'false' })
+          }),
         }),
       ],
       returns: [

package/src/generator/genBundleFiles.ts

@@ -40,6 +40,8 @@ interface Config {
   tenantLevel: any;
   appid: string;
   isExport?:string;
+  sysPrefixPath?:string;
+  realRelease?:string;
   devDnsAddr: string;
   miniEnable: boolean;
   isPreviewFe?: boolean;
@@ -113,7 +115,7 @@ function genExportComponetCode(component: RawOptions) {
 
 // 获取文件路径
 // name 或者 文件 至少有一个必填
-const getCompletePath = (name: string, fileContent: string) => {
+const getCompletePath = (name: string, fileContent: string,config?:any) => {
   let fileName = '';
   if (name) {
     fileName += `${name}.`;
@@ -122,6 +124,9 @@ const getCompletePath = (name: string, fileContent: string) => {
     fileName += `${genHash(fileContent)}.`;
   }
   fileName += `min.js`;
+  if(config?.isExport){
+    fileName =`${config.sysPrefixPath}/${fileName}`
+  }
 
   return fileName;
 };
@@ -167,14 +172,14 @@ function genRouterFileContent(routes: Route[], defaultRoute: string) {
 }
 
 // 生成路由文件
-function genRouteFiles(routes: Route[], defaultRoute: string) {
+function genRouteFiles(routes: Route[], defaultRoute: string,config?: any) {
   // 生成路由文件列表
   const routeFiles: any[] = [];
   function routeToFile(route: Route) {
     console.log(route, 'route');
     if (route?.component?.script) {
       const content = genExportComponetCode(route.component);
-      const lazyPath = getCompletePath(null, content);
+      const lazyPath = getCompletePath(null, content, config);
       route.lazyPath = lazyPath;
       routeFiles.push({
         name: lazyPath,
@@ -189,7 +194,7 @@ function genRouteFiles(routes: Route[], defaultRoute: string) {
     routeToFile(route);
   });
 
-  let routerPath = getCompletePath('router', null);
+  let routerPath = getCompletePath('router', null, config);
 
   routeFiles.push({
     name: routerPath,
@@ -199,6 +204,7 @@ function genRouteFiles(routes: Route[], defaultRoute: string) {
   return routeFiles;
 }
 export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
+  config.sysPrefixPath = app?.sysPrefixPath
   // 获取端类型
   const frontendType = frontend.getAncestor('FrontendType') as FrontendType;
   // 获取业务组件
@@ -234,7 +240,8 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
       (current) => {
         if (current.node.toVueOptions) {
           componentMap[current.node.id] = current.node.toVueOptions({
-            isExport: !!config.isExport
+            isExport: !!config.isExport,
+            isRelease: !!config.realRelease,
           });
         }
       },
@@ -269,6 +276,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     baseUrl = '';
     // basePath = '';
   }
+  // todo
   let completePath = `${baseUrl}${basePath || ''}/`;
 
   /**
@@ -381,7 +389,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
   }
   const authResourcePaths: string[] = Object.keys(authResourcePathMap);
 
-  const routerFiles = genRouteFiles(routes, defaultRoute);
+  const routerFiles = genRouteFiles(routes, defaultRoute, config);
   routerFiles.forEach(item => {
     item.name = completePath + item.name;
     // 在路由文件上存入端的信息，后续页面维度发布时候做标识
@@ -549,7 +557,6 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
                         }
         `;
   }
-
   if (frontend.documentIcon) {
     content += `{
             const link = document.createElement('link');
@@ -625,7 +632,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
           return importXMLHttpRequestComponent(scriptUrl);
         }
 
-        var routes = await importComponent('${getCompletePath('router', null)}?t=' + Date.now());
+        var routes = await importComponent('${getCompletePath('router', null, config)}?t=' + Date.now());
       `;
       // 按页面维度发布先不考虑鉴权，页面维度新增的页面都算是不鉴权的数组中
       // 只有完全页面维度新增的才会进入到这个数组中
@@ -841,9 +848,9 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
         if (window.annotationAllData) {
               resolve(window.annotationAllData);
           } else {
-              let urlEntity = '/api/system/annotation/entityAll'
-              let urlLogic = '/api/system/annotation/logicAll'
-              Promise.all([
+           let urlEntity = window.appInfo.sysPrefixPath + '/api/system/annotation/entityAll'
+           let urlLogic = window.appInfo.sysPrefixPath + '/api/system/annotation/logicAll'
+           Promise.all([
                   fetch(urlEntity).then(response => response.json()),
                   fetch(urlLogic).then(response => response.json())
               ])
@@ -868,7 +875,8 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
 
 
   console.time('genHash')
-  let bundleMinPath = completePath + getCompletePath(getBundleFileName(), content);
+  // todo
+  let bundleMinPath = completePath + getCompletePath(getBundleFileName(), content, config);
   console.timeEnd('genHash');
 
   const otherJsList = (frontend as any)?.appletsConfig?.enable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
@@ -995,33 +1003,6 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     ${microAppIntegration || 'loadAssets();'}
 })()
 `;
-  const assets = config.assets;
-  // 导出源码才处理
-  if (config.isExport && Array.isArray(assets) && assets.length) {
-    const assetsMap = config.assetsMap;
-    const regex = new RegExp(assets.map((asset) => asset.fileUrl?.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|'), 'g');
-    content = content.replace(regex, (url) => {
-      const asset = assetsMap.get(url);
-      if (asset) {
-        const basePath = frontend?.basePath;
-        const assetName = encodeURIComponent(asset.name);
-        const assetDir = basePath ? `${basePath}/assets/${assetName}` : `/assets/${assetName}`;
-        let path = assetDir;
-        const sysPrefixPath = frontend?.app?.sysPrefixPath;
-        if (sysPrefixPath) {
-          path = `${sysPrefixPath}${assetDir}`;
-        }
-        globalConfig.assets.push({
-          path: assetDir,
-          isDir: false,
-          url,
-        });
-        return path;
-      }
-      return url;
-    });
-  }
-
   const outputs = [
     {
       name: bundleMinPath,
@@ -1033,6 +1014,39 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     },
     ...routerFiles,
   ];
+  const assets = config.assets;
+  // 导出源码才处理
+  if (config.isExport && Array.isArray(assets) && assets.length) {
+    function replaceContentFilePath(content: string) {
+      const assetsMap = config.assetsMap;
+      // 正则
+      const regex = utils.transAssetsToRegx(assets, 'fileUrl');
+      content = content.replace(regex, (url) => {
+        const asset: Asset = utils.getAssetFromAssetsMap(assetsMap, url);
+        if (asset) {
+          const basePath = frontend?.basePath;
+          const assetName = encodeURIComponent(asset.name);
+          const assetDir = basePath ? `${basePath}/assets/${assetName}` : `/assets/${assetName}`;
+          let path = assetDir;
+          const sysPrefixPath = frontend?.app?.sysPrefixPath;
+          if (sysPrefixPath) {
+            path = `${sysPrefixPath}${assetDir}`;
+          }
+          globalConfig.assets.push({
+            path: assetDir,
+            isDir: false,
+            url,
+          });
+          return path;
+        }
+        return url;
+      });
+      return content;
+    }
+    outputs.forEach((output) => {
+      output.content = replaceContentFilePath(output.content || '');
+    })
+  }
   console.log('outputs', outputs)
   return outputs;
 }

package/src/generator/genMetaData.ts

@@ -192,31 +192,11 @@ export function genMetaData(app: App, frontend: Frontend, config: any) {
         item.value = typeName === 'Long' && typeNamespace === 'nasl.core' ? +item.value : item.value
       })
     }
-
+    
     const nodeJson = newNode.toJSON?.();
-    if (Array.isArray(nodeJson.properties)) {
-      const app = node.getAncestor('App') as App
-      nodeJson.properties.forEach((property: any) => {
-          const { typeAnnotation = {} } = property;
-          if (typeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
-            let originType = {} as TypeAnnotation
-            if (typeAnnotation.typeNamespace === 'app.metadataTypes') {
-              originType = app.metadataTypes?.find((metadataType: MetadataType) => metadataType.name === typeAnnotation.typeName)?.typeAnnotation;
-            } else if (typeAnnotation.typeNamespace?.startsWith('extensions.') && typeAnnotation.typeNamespace?.endsWith('.metadataTypes')) {
-              const dependencyName = typeAnnotation.typeNamespace?.replace('extensions.', '').replace('.metadataTypes', '')
-              originType = app.dependencies?.find((dependency: Module) => dependency.name === dependencyName)?.metadataTypes?.find((ele: MetadataType) => ele.name === typeAnnotation.typeName)?.typeAnnotation ?? {} as TypeAnnotation
-            }
-            typeAnnotation.typeKind = 'primitive'
-            typeAnnotation.typeNamespace = 'nasl.core'
-            typeAnnotation.typeName = originType.typeName
-          }
-      });
-    }
-    dataTypesMap[id] = nodeJson;
     // 对存在defaultValue的结构进行翻译储存到defaultCode中
     if (['Entity', 'Structure'].includes(node.concept)) {
-      newNode = node.toJSON?.();
-      newNode.properties.forEach((property: any, index: number) => {
+      nodeJson.properties.forEach((property: any, index: number) => {
         const { defaultValue } = (node as Entity).properties[index];
         if (defaultValue?.expression) {
           property.defaultCode = {
@@ -235,11 +215,26 @@ export function genMetaData(app: App, frontend: Frontend, config: any) {
           property.defaultCode = {};
         }
       });
-      dataTypesMap[id] = newNode;
-      newNode = BaseNode.from({ ...node.toJSON?.() });
-    } else {
-      dataTypesMap[id] = newNode.toJSON?.();
     }
+    if (Array.isArray(nodeJson.properties)) {
+      const app = node.getAncestor('App') as App
+      nodeJson.properties.forEach((property: any) => {
+          const { typeAnnotation = {} } = property;
+          if (typeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
+            let originType = {} as TypeAnnotation
+            if (typeAnnotation.typeNamespace === 'app.metadataTypes') {
+              originType = app.metadataTypes?.find((metadataType: MetadataType) => metadataType.name === typeAnnotation.typeName)?.typeAnnotation;
+            } else if (typeAnnotation.typeNamespace?.startsWith('extensions.') && typeAnnotation.typeNamespace?.endsWith('.metadataTypes')) {
+              const dependencyName = typeAnnotation.typeNamespace?.replace('extensions.', '').replace('.metadataTypes', '')
+              originType = app.dependencies?.find((dependency: Module) => dependency.name === dependencyName)?.metadataTypes?.find((ele: MetadataType) => ele.name === typeAnnotation.typeName)?.typeAnnotation ?? {} as TypeAnnotation
+            }
+            typeAnnotation.typeKind = 'primitive'
+            typeAnnotation.typeNamespace = 'nasl.core'
+            typeAnnotation.typeName = originType.typeName
+          }
+      });
+    }
+    dataTypesMap[id] = nodeJson;
     const { properties } = node as any;
     if (Array.isArray(properties)) {
       properties.forEach((property) => {

package/src/generator/release-body/body.ts

@@ -11,6 +11,7 @@ import { getCallLogicData } from './validation';
 
 import * as utils from '../../utils';
 import { config as globalConfig } from '../../config'
+import type { Asset } from '../release-body/internal';
 
 /**
  * 替换端类型中的资源
@@ -74,11 +75,12 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
   // 导出前端源码+后端源码
   if (opt.isExport && opt.ignoreFiles && Array.isArray(assets) && assets.length) {
     const assetsMap = opt.assetsMap;
-    const regex = new RegExp(assets.map((asset) => asset.fileUrl?.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join("|"), "g");
+    // 正则
+    const regex = utils.transAssetsToRegx(assets, 'fileUrl');
     replaceFrontendTypesAssets(NaslAnnotatedJSON.frontendTypes, (node: any, key: string, url: string) => {
       if (['staticStyle'].includes(key)) {
         node[key] = url.replace(regex, (url) => {
-          const asset = assetsMap.get(url);
+          const asset: Asset = utils.getAssetFromAssetsMap(assetsMap, url);
           if (asset) {
             const assetName = encodeURIComponent(asset.name);
             const path = `/assets/${assetName}`;
@@ -92,11 +94,12 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
           return url;
         });
       } else {
-        const asset = assetsMap.get(url);
+        const asset: Asset = utils.getAssetFromAssetsMap(assetsMap, url);
         if (asset) {
           // 这里是用户上传的图片链接 在导出的时候变为 离线下载的
           // 上边也是同样的目的 只是处理的css样式里的图片链接
-          const path = `/assets/${asset.name}`;
+          const assetName = encodeURIComponent(asset.name);
+          const path = `/assets/${assetName}`;
           globalConfig.assets.push({
             path,
             isDir: false,
@@ -109,14 +112,14 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
   }
 
   replaceFrontendTypesAssets(NaslAnnotatedJSON.frontendTypes, (node: any, key: string, url: string) => {
-      // 增加处理两种情况 1 css 自带图片； 2 src 属性带的图片
+      // 增加处理两种情况 1 css 自带图片； 2 src  属性带的图片 3 用户上传的icon name 属性
     if (['staticStyle'].includes(key)) {
       // "background: url('/assets/login-bg-1.jpg') no-repeat; background-size: cover; height: 100vh;"
       if(url.includes(`url('/assets/`) && app.sysPrefixPath?.length > 0 ){
         node[key] = url.replace(/url\('\/assets\/(.*?)'\)/, `url('${app.sysPrefixPath}/assets/$1')`)
       }
     } else {
-      if(node.name=='src' && /^\/assets\/(.*?)$/.test(url) &&app.sysPrefixPath?.length>0){
+      if(['src' ,'name'].includes(node.name)&& /^\/assets\/(.*?)$/.test(url) &&app.sysPrefixPath?.length>0){
         node[key]= `${app.sysPrefixPath}${url}`
       }
     }

package/src/generator/release-body/index.ts

@@ -1,2 +1,3 @@
 export * from './types';
 export * from './data';
+export * from './utils';

package/src/generator/release-body/utils.ts

@@ -423,6 +423,10 @@ export function getProcessFormDefinitions(app: App) {
                 `${process.name}.`,
                 'processDetailFormData.'
               );
+              formDefinition = formDefinition.replaceAll(
+                `(${process.name} ||`,
+                '{processDetailFormData ||'
+              );
               formDefinition = formDefinition.replace(
                 /:ref="([^"]+)"/g,
                 (match: any, p1: string) => {
@@ -433,7 +437,6 @@ export function getProcessFormDefinitions(app: App) {
 
               if (process?.composedBy) {
                 const formInfo = genProcessFormCode(view);
-                console.log('formInfo: ', formInfo);
                 // 往form内塞入内容
                 if (type === 'pc')
                   formDefinition = formDefinition.replace(/<\/u-form>/, `${formInfo}</u-form>`);
@@ -458,6 +461,5 @@ export function getProcessFormDefinitions(app: App) {
       res.push(itemH5);
     }
   });
-
   return res;
 }