@aiot-toolkit/parser 2.0.6-alpha.1 → 2.0.6-beta.10

package/lib/ux/config/{vela/StyleAttributeConfig.d.ts → StyleBaseConfig.d.ts}

@@ -1,6 +1,6 @@
 import { Dictionary, Loglevel } from '@aiot-toolkit/shared-utils';
 import { StyleMessage } from '@aiot-toolkit/shared-utils';
-import { BlockItem, StyleItem } from '../../interface/IStyleAst';
+import { BlockItem, StyleItem } from '../interface/IStyleAst';
 type ValidateInfo = {
     level: Loglevel;
     message: StyleMessage[];

package/lib/ux/config/{vela/StyleAttributeConfig.js → StyleBaseConfig.js}

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.STYLE_ATTRIBUTE_LIST = exports.STYLE_ATTRIBUTE_CONFIG = void 0;
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
-var _ExtendedBoxStyle = _interopRequireDefault(require("../../translate/vela/utils/ExtendedBoxStyle"));
-var _UxUtil = _interopRequireDefault(require("../../utils/UxUtil"));
+var _ExtendedBoxStyle = _interopRequireDefault(require("../translate/vela/utils/ExtendedBoxStyle"));
+var _UxUtil = _interopRequireDefault(require("../utils/UxUtil"));
 var _cssTree = _interopRequireDefault(require("css-tree"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const REGEXP_NAME = /^([a-zA-Z_]+[a-zA-Z0-9]*\s*,\s*)*[a-zA-Z_]+[a-zA-Z0-9]*$/;
@@ -1345,9 +1345,9 @@ function validateLengthNode(sourceNode) {
     value[0] = value[0];
     const validResult = validLength(value[0]);
     if (validResult.message.length > 0) {
-      validateInfo.message = [`The value verification of attribute`, {
-        word: attributeName
-      }, `failed.`, ...validResult.message];
+      validateInfo.message = [`The value of attribute`, {
+        word: `${attributeName}:`
+      }, ...validResult.message];
     }
   }
   return validateInfo;
@@ -1363,11 +1363,9 @@ function validLength(value) {
     message: []
   };
   if (_cssTree.default.lexer.matchType('length', value.value + value.unit).error !== null) {
-    validateInfo.message = [`The length value is`, {
-      word: value.value || 'null'
-    }, `, unit is`, {
-      word: value.unit || 'null'
-    }, `, which does not meet the length standard.`];
+    validateInfo.message = [{
+      word: `${value.value}${value.unit}`
+    }, `is invalid.`];
   }
   return validateInfo;
 }
@@ -1549,30 +1547,24 @@ function validPosition(sourceNode) {
     name: attributeName
   } = sourceNode;
   if (value.length <= 0) {
-    validateInfo.message = [`Error parsing the value of attribute`, {
+    validateInfo.message = [`The value of attribute`, {
       word: `${attributeName}`
-    }];
+    }, 'is invalid.'];
   } else if (value.length > 3) {
-    validateInfo.message = [`Error parsing the value length`, `of`, {
-      word: `'${attributeName}'`
-    }, `is`, {
-      word: value.length
-    }, `, which does not meet the requirement.`];
+    validateInfo.message = [`The value length`, `of attribute`, {
+      word: `${attributeName}: ${value.length}`
+    }, `is invalid.`];
   } else {
     value.forEach(v => {
       v = v;
       const validResult = validLength(v);
       // 有报错
       if (validResult.message.length > 0) {
-        validateInfo.message.push(...validResult.message);
+        validateInfo.message = [`The value of attribute`, {
+          word: `${attributeName}:`
+        }, ...validResult.message];
       }
     });
-    // 如果有报错，添加一下属性名
-    if (validateInfo.message.length > 0) {
-      validateInfo.message.unshift(`The value verification of attribute `, {
-        word: attributeName
-      }, `failed.`);
-    }
   }
   return validateInfo;
 }

package/lib/ux/config/vela/ElementConfig.js

@@ -93,6 +93,12 @@ const elementConfig = {
         }
       }
     },
+    markdown: {
+      allowTextChildren: true,
+      attributes: {
+        value: {}
+      }
+    },
     'arc-text': {
       allowTextChildren: true,
       attributes: {

package/lib/ux/interface/IE2eConfig.d.ts

@@ -0,0 +1,44 @@
+/**
+ * IE2eConfig
+ */
+export default interface IE2eConfig {
+    /**
+     * 测试文件的目录
+     *
+     * 绝对路径或相对config文件的路径
+     *
+     * @default "test"
+     */
+    dir: string;
+    /**
+     * 测试模式打包，入口文件的在manifest中的名称
+     */
+    entry?: {
+        name: string;
+        launchMode?: string;
+    };
+    /**
+     * 待测试的页面配置
+     */
+    testcases?: Array<ITestCase>;
+}
+export interface ITestCase {
+    /**
+     * 页面名称, 对应manifest中的路由名称
+     *
+     * @example "pages/index"
+     */
+    name: string;
+    /**
+     * 测试完成后，等待多久回退到上一个页面，单位ms
+     *
+     * @default 0
+     */
+    sleep?: number;
+    /**
+     * 测试完成后，是否回退到上一个页面
+     *
+     * @default true
+     */
+    back?: boolean;
+}

package/lib/ux/interface/IE2eConfig.js

@@ -0,0 +1 @@
+"use strict";

package/lib/ux/interface/IStyleError.d.ts

@@ -1,8 +1,9 @@
 /**
  * IStyleError
  */
+import { StyleMessage } from '@aiot-toolkit/shared-utils';
 export interface IStyleError {
-    message: string;
+    messages: StyleMessage[];
     details: string;
     startLine: number;
     startCol: number;

package/lib/ux/parser/ScriptParser.js

@@ -14,7 +14,8 @@ class ScriptParser {
   parser(content) {
     // const { onLog } = this.options
     const ast = {
-      content
+      // 判断content是否包含有效js内容，若只包含\n\r\t空白符，则content为''
+      content: content.trim() ? content : ''
     };
     return {
       ast

package/lib/ux/parser/StyleParser.d.ts

@@ -3,7 +3,7 @@ import IOptions from '../config/IOptions';
 import { IStyleAst } from '../interface/IStyleAst';
 import ITranslateOption from '../interface/ITranslateOption';
 import { IImageFunction } from '../interface/IImageResource';
-import { RawSourceMap, SourceMapConsumer } from 'source-map';
+import { SourceMapConsumer } from 'source-map';
 /**
  * StyleParser
  * 1. 根据语言类型分别转为CSS样式
@@ -15,9 +15,10 @@ declare class StyleParser implements IParser<IStyleAst> {
     readonly compilerOption: ITranslateOption;
     collectImageResource: IImageFunction;
     readonly styleLineOffset: number;
-    nodeMap: RawSourceMap | string;
+    nodeMap: string;
     sourceMapConsumer: SourceMapConsumer;
     private styleMapUtil;
+    private isCss;
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
     constructor(options: IOptions, compilerOption: ITranslateOption, collectImageResource: IImageFunction, styleLineOffset: number);
     parser(content: string, fileName: string): Promise<ParserResult<IStyleAst>>;

package/lib/ux/parser/StyleParser.js

@@ -32,19 +32,21 @@ const {
  * 3. 把解析结果转换为目标格式
  */
 class StyleParser {
+  // 是否是css样式代码
+  isCss = true;
   QUICKAPP_CONFIG = 'quickapp.config.js';
   constructor(options, compilerOption, collectImageResource, styleLineOffset) {
     this.options = options;
     this.compilerOption = compilerOption;
     this.collectImageResource = collectImageResource;
     this.styleLineOffset = styleLineOffset;
-    this.nodeMap = {
+    this.nodeMap = JSON.stringify({
       version: 3,
       sources: [],
       names: [],
       mappings: '',
       file: ''
-    };
+    });
   }
   async parser(content, fileName) {
     const {
@@ -147,7 +149,8 @@ class StyleParser {
         relativeUrls: true,
         sourceMap: {
           sourceMapURL: `${baseName}.map`,
-          outputSourceFiles: true
+          outputSourceFiles: true,
+          sourceMapRootpath: 'file:///'
         }
       }, (error, output) => {
         if (error) {
@@ -161,6 +164,7 @@ class StyleParser {
           CSSCode = output?.css ? output.css : '';
           if (output?.map) {
             this.nodeMap = output.map;
+            this.isCss && (this.isCss = false);
           }
           resolve(CSSCode);
         }
@@ -177,7 +181,7 @@ class StyleParser {
       onLog,
       filePath
     } = this.options;
-    const url = `file://${filePath}`;
+    const url = `file:///${filePath}`;
     const alias = this.getAlias();
 
     // sass 的 alias 处理依赖当前文件路径
@@ -196,6 +200,7 @@ class StyleParser {
       });
       if (Result.sourceMap) {
         this.nodeMap = JSON.stringify(Result.sourceMap);
+        this.isCss && (this.isCss = false);
       }
       return Result.css;
     } catch (error) {
@@ -217,23 +222,29 @@ class StyleParser {
       onLog,
       filePath
     } = this.options;
+    const newFilePath = this.isCss ? filePath : `file:///${filePath}`;
     const alias = this.getAlias();
     try {
       const result = await (0, _postcss.default)([(0, _postcssImport.default)({
-        resolve: id => {
+        resolve: (id, basedir) => {
+          // 处理所有路径中的 file:/// 前缀
+          const cleanId = id.replace(/^file:\/\/\//, '');
+          const cleanBase = basedir.replace(/^file:\/\/\//, '');
+          const filePath = _path.default.resolve(cleanBase, cleanId);
           for (const [key, value] of Object.entries(alias)) {
-            if (id.startsWith(key)) {
-              return id.replace(key, value);
+            if (filePath.startsWith(key)) {
+              return filePath.replace(key, value);
             }
           }
-          return id;
+          return filePath;
         }
       }), _postcssUrl.default]).process(sourceContent, {
-        from: filePath,
+        from: newFilePath,
         map: {
           prev: this.nodeMap,
           inline: false,
-          annotation: true
+          sourcesContent: true,
+          absolute: this.isCss
         }
       });
       this.nodeMap = result.map.toString();
@@ -307,7 +318,7 @@ class StyleParser {
       type: '',
       prelude: [],
       block: [],
-      position: sourceNode.loc ? this.styleMapUtil.transfromLocToPosition(sourceNode.loc) : undefined
+      position: sourceNode.loc ? this.styleMapUtil.transfromLocToPosition(sourceNode.loc, false) : undefined
     };
     const {
       type,
@@ -330,7 +341,7 @@ class StyleParser {
       name: '',
       prelude: [],
       rules: [],
-      position: sourceNode.loc ? this.styleMapUtil.transfromLocToPosition(sourceNode.loc) : undefined
+      position: sourceNode.loc ? this.styleMapUtil.transfromLocToPosition(sourceNode.loc, false) : undefined
     };
     const {
       type,
@@ -376,7 +387,7 @@ class StyleParser {
       type: '',
       name: '',
       block: [],
-      position: sourceNode.loc ? this.styleMapUtil.transfromLocToPosition(sourceNode.loc) : undefined
+      position: sourceNode.loc ? this.styleMapUtil.transfromLocToPosition(sourceNode.loc, false) : undefined
     };
     const {
       type,
@@ -494,7 +505,7 @@ class StyleParser {
       let value = '';
       nodeValue.children.map(v => {
         let tempTargetValue;
-        const tempPosition = v.loc ? this.styleMapUtil.transfromLocToPosition(v.loc) : undefined;
+        const tempPosition = v.loc ? this.styleMapUtil.transfromLocToPosition(v.loc, false) : undefined;
         switch (v.type) {
           case 'Operator':
             value = _cssTree.default.generate(v);
@@ -578,7 +589,7 @@ class StyleParser {
       targetList.push({
         name: nodeName,
         value: valueList,
-        position: node.loc ? this.styleMapUtil.transfromLocToPosition(node.loc) : undefined
+        position: node.loc ? this.styleMapUtil.transfromLocToPosition(node.loc, false) : undefined
       });
     }
     return targetList;
@@ -587,17 +598,10 @@ class StyleParser {
     let errors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     let isParserError = errorType === 'parserError';
     let sourceCodeStyle = _sharedUtils.Loglevel.WARN;
-    const {
-      onLog,
-      filePath
-    } = this.options;
     if (isParserError) {
       sourceCodeStyle = _sharedUtils.Loglevel.ERROR;
     }
     errors.forEach(error => {
-      const sourceCode = error.source ? [`, source code:`, {
-        word: `${error.source}`
-      }] : [];
       const position = this.styleMapUtil.transfromLocToPosition({
         start: {
           line: error.startLine,
@@ -613,14 +617,7 @@ class StyleParser {
       });
       position.startColumn++;
       position.endColumn++;
-      onLog({
-        level: sourceCodeStyle,
-        filePath,
-        position,
-        message: [{
-          word: error.message
-        }, ...sourceCode]
-      });
+      _StyleUtil.default.handleStyleError(sourceCodeStyle, error.messages, this.options, position);
     });
     return [];
   }

package/lib/ux/parser/UxParser.d.ts

@@ -20,6 +20,7 @@ declare class UxParser implements IParser<IUxAst> {
      * 1. template：
      *    a. 最多1个
      *    b. 子元素有且仅有1个，不能是 block
+     * 2. 必须有闭合标签， 示例：  `<script>....</script>`正确，  `<script>aaaa`错误
      */
     private validateContent;
     /**

package/lib/ux/parser/UxParser.js

@@ -201,6 +201,7 @@ class UxParser {
    * 1. template：
    *    a. 最多1个
    *    b. 子元素有且仅有1个，不能是 block
+   * 2. 必须有闭合标签， 示例：  `<script>....</script>`正确，  `<script>aaaa`错误
    */
   validateContent(childNodes) {
     let result = true;
@@ -249,21 +250,22 @@ class UxParser {
     }
 
     // 2
-    // if (scriptCount !== 1) {
-    //   onLog({
-    //     level: Loglevel.THROW,
-    //     filePath,
-    //     message: [
-    //       { word: '<script>' },
-    //       `There are`,
-    //       { word: scriptCount },
-    //       `, but expect to have`,
-    //       { word: 1 }
-    //     ]
-    //   })
-    //   result = false
-    // }
-
+    childNodes.forEach(node => {
+      if (_TemplateUtil.default.isElement(node)) {
+        const {
+          sourceCodeLocation
+        } = node;
+        if (sourceCodeLocation && !sourceCodeLocation.endTag) {
+          onLog({
+            level: _sharedUtils.Loglevel.ERROR,
+            filePath,
+            position: _TemplateUtil.default.parse5LocationToPosition(sourceCodeLocation.startTag),
+            message: [`<${node.nodeName}>`, 'must have an end tag']
+          });
+          result = false;
+        }
+      }
+    });
     return result;
   }
   /**

package/lib/ux/translate/vela/ScriptToTypescript.d.ts

@@ -12,8 +12,9 @@ declare class ScriptToTypescript implements ITranslate<IScriptAst, SourceFile> {
     options: IOptions;
     readonly compilerOption: ITranslateOption;
     readonly context: IFileLaneContext;
+    readonly disableCheckCode: boolean;
     private _systemFeatures;
-    constructor(options: IOptions, compilerOption: ITranslateOption, context: IFileLaneContext);
+    constructor(options: IOptions, compilerOption: ITranslateOption, context: IFileLaneContext, disableCheckCode?: boolean);
     translate(sourceTree: IScriptAst, offsetList: IOffset[]): Promise<{
         targetTree: SourceFile;
         mapList: never[];

package/lib/ux/translate/vela/ScriptToTypescript.js

@@ -21,19 +21,23 @@ const BabelPreset = require('@babel/preset-env');
 class ScriptToTypescript {
   _systemFeatures = (() => new Set())();
   constructor(options, compilerOption, context) {
+    let disableCheckCode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     this.options = options;
     this.compilerOption = compilerOption;
     this.context = context;
+    this.disableCheckCode = disableCheckCode;
   }
   async translate(sourceTree,
   // eslint-disable-next-line
   offsetList) {
     // 检查代码错误
-    const logs = await this.checkCode(sourceTree);
-    if (logs) {
-      logs.forEach(log => {
-        this.options.onLog(log);
-      });
+    if (!this.disableCheckCode) {
+      const logs = await this.checkCode(sourceTree);
+      if (logs) {
+        logs.forEach(log => {
+          this.options.onLog(log);
+        });
+      }
     }
     // 使用babel实现替换，由此实现自动更新source map
     const content = this.babelScript(sourceTree);
@@ -51,7 +55,10 @@ class ScriptToTypescript {
    * @returns
    */
   babelScript(sourceTree) {
-    const sourceCode = sourceTree.content ? sourceTree.content : `""`;
+    if (sourceTree.content === '') {
+      return '';
+    }
+    const sourceCode = sourceTree.content;
     const relativePath = _path.default.relative(this.options.projectPath, this.options.filePath);
     const plugins = [
     // 替换所有的require节点

package/lib/ux/translate/vela/StyleToTypescript.js

@@ -94,8 +94,14 @@ class StyleToTypescript {
         const selector = node[i];
         const {
           type,
-          name
+          name: orgName
         } = selector;
+
+        // 去除名称中的转义符，例如 源码是  .w-20\% {},  希望生成 w-20%
+        // 注意：此处的反转义不能用 JSON.parse
+        // 原因：js中 % 不需要转义，但css选择器中%需要转义，两者规则不一样，所以不能使用 JSON.parse
+        // 示例：js可以写'abc%', 但css选择器中必须写'abc\%'
+        const name = orgName.replace(/\\(.{1})/g, '$1');
         // 选择器类型转为数字
         const selectorIndex = (0, _StyleSelectorType.findSelectorIndex)(type);
         if (type === _StyleSelectorType.Selector.COMBINATOR) {
@@ -131,10 +137,6 @@ class StyleToTypescript {
    * @param name
    */
   addThorwLog(type, name, position, info) {
-    const {
-      onLog,
-      filePath
-    } = this.options;
     const logLevel = name === ' ' || name === '>' ? _sharedUtils.Loglevel.WARN : _sharedUtils.Loglevel.THROW;
     const message = info ? [`### StyleToTypescript ### Selector type unsupport`, {
       word: info
@@ -143,12 +145,7 @@ class StyleToTypescript {
     }, ',name:', {
       word: name
     }];
-    onLog({
-      filePath,
-      position,
-      level: logLevel,
-      message
-    });
+    _StyleUtil.default.handleStyleError(logLevel, message, this.options, position);
   }
   translateAtrule(sourceNode) {
     let targetNodes = [];