Merge branch 'main' into feat/ssr-component

Author: ZEJIA-LIU

packages/postcss-unit-transform/__tests__/index.test.ts

@@ -0,0 +1,26 @@
+const Processors = require('postcss')
+const unitTransform = require('../index')
+
+describe('wxss解析', () => {
+  test('wxss文件样式解析', () => {
+    const input = `
+        .box{
+            width: 100px;
+            height: 200rpx;
+            border: 0.5px solid red;
+            margin: 0.5px 100px;
+            transform: translate(0px, 0rpx);
+            font-size: 0rpx;
+          }`
+    const result = Processors([unitTransform]).process(input)
+    expect(result.css).toBe(`
+        .box{
+            width: 200px;
+            height: 200px;
+            border: 1px solid red;
+            margin: 1px 200px;
+            transform: translate(0px, 0px);
+            font-size: 0px;
+          }`)
+  })
+})

packages/postcss-unit-transform/index.js

@@ -7,8 +7,7 @@ function plugin (opts) {
     root.walkDecls(function (decl) {
       let value = decl.value
       value = value.replace(/\b-?(\d+(\.\d+)?)px\b/ig, function (match, size) {
-        // 绝对值<1的非0数值转十进制后会被转成0,赋值为1
-        return Number(size) === 0 ? '0px': parseInt(size, 10) !== 0? (parseInt(size, 10) * 2) + 'px': '1px'
+        return Number(size) === 0 ? '0px': parseFloat(size) * 2 + 'px'
       }).replace(/\b-?(\d+(\.\d+)?)rpx\b/ig, function (match, size) {
         return size + 'px'
       })

packages/postcss-unit-transform/package.json

@@ -4,12 +4,38 @@
   "description": "小程序单位转换",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest",
+    "test:clear": "jest --clearCache",
+    "test:cov": "jest --coverage",
+    "test:updateSnapshot": "jest --updateSnapshot",
+    "test:ci": "cross-env NODE_ENV=test jest --ci -i"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "transform": {
+      "^.+\\.tsx?$": "ts-jest"
+    },
+    "testRegex": "(/postcss-unit-transform/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "jsx",
+      "json",
+      "node"
+    ],
+    "testPathIgnorePatterns": [
+      "/node_modules/"
+    ]
   },
   "author": "luckyadam",
   "license": "MIT",
   "dependencies": {
     "postcss": "^6.0.21",
     "typescript": "^4.7.4"
+  },
+  "devDependencies": {
+    "jest": "^29.7.0",
+    "ts-jest": "^29.0.5"
   }
 }

packages/postcss-unit-transform/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true
+  }
+}

packages/taro-cli-convertor/__tests__/__mocks__/fs-extra.js

@@ -2,22 +2,40 @@
 
 const path = require('path')
 
+const fsSystem = jest.requireActual('fs-extra')
 // 存储文件信息，包括文件路径和对应的内容
 const oriFileMap = new Map()
 
 // 保存转换后的文件
 const resFileMap = new Map()
 
+/**
+ *  输出模拟文件的所有path结构
+ */
+const flatteningFile = (file,path = '',result = {}) => {
+  for(const filePath in file){
+    if(typeof file[filePath] === 'object' && file[filePath] !== null){
+      result[path + filePath] = file[filePath]
+      flatteningFile(file[filePath], path + filePath, result)
+    } else {
+      result[path + filePath] = file[filePath]
+    }
+  }
+}
+
 /**
  * 保存文件信息
  * 
  * @param { string } root 工程根目录 
  * @param { map } newMockFiles 
  */
 function setMockFiles (root, newMockFiles) {
-  for (const file in newMockFiles) {
-    oriFileMap.set(normalizePath(path.join(root, file)), newMockFiles[file])
+  const flatteningFileRes = {}
+  flatteningFile(newMockFiles,'',flatteningFileRes)
+  for (const file in flatteningFileRes) {
+    oriFileMap.set(normalizePath(path.join(root, file)), flatteningFileRes[file])
   }
+  oriFileMap.set(root,newMockFiles)
 }
 
 
@@ -36,8 +54,10 @@ function getMockFiles () {
  * @param { map } updateFiles 
  */
 function updateMockFiles (root, updateFiles) {
-  for (const file in updateFiles) {
-    oriFileMap.set(normalizePath(path.join(root, file)), updateFiles[file])
+  const flatteningFileRes = {}
+  flatteningFile(updateFiles,'',flatteningFileRes)
+  for (const file in flatteningFileRes) {
+    oriFileMap.set(normalizePath(path.join(root, file)), flatteningFileRes[file])
   }
 }
 
@@ -70,40 +90,55 @@ function deleteMockFiles (key) {
  * @param { 文件路径 } path 
  * @returns 
  */
-function readFileSyncMock (path) {
+function readFileSyncMock (path, type) {
   if (path === undefined || path === null || path === '') {
     throw new Error(`文件路径异常，path：${path}`)
   }
 
   path = normalizePath(path)
-
+  
   if (!existsSyncMock(path)) {
     throw new Error(`文件不存在，path：${path}`)
   }
+  const fileMap = oriFileMap.has(path) ? oriFileMap : resFileMap
+  const content = fileMap.get(path)
 
-  return oriFileMap.get(path)
+  return content !== undefined ? content : fsSystem.readFileSync(path,type)
 }
 
 /**
  * 判断文件是否存在
  * 
  */
-function existsSyncMock (path) {
-  if (typeof path !== 'string' || path === '') {
+function existsSyncMock (pathParam) {
+  /**
+   * 针对于测试 generateConfigFiles 函数需要，因为 generateConfigFiles 中会查找 taro 子包中的文件
+   * jest.requireActual('fs-extra') 操作使用的是真实fs-extra模块，非模拟，所以会查找真实路径
+   */
+  if(fsSystem.existsSync(pathParam) && path.isAbsolute(pathParam)) return true
+    
+  if (typeof pathParam !== 'string' || pathParam === '') {
     return false
   }
 
-  path = normalizePath(path)
+  pathParam = normalizePath(pathParam)
 
-  const parts = path.split('/')
+  const parts = pathParam.split('/')
   // 根据是否有后缀名判断为文件
   if (parts[parts.length - 1].includes('.')) {
-    if (oriFileMap.get(path) === undefined) {
-      return false
+    let isFile = true
+    if (oriFileMap.get(pathParam) === undefined) {
+      isFile = false
+    } 
+    if(resFileMap.get(pathParam)){
+      isFile = true
     }
+    return isFile
+  }
+  // 判断文件夹
+  if(oriFileMap.get(pathParam) && !parts[parts.length - 1].includes('.')){
     return true
   }
-
   // 文件夹内默认不存在
   return false
 }
@@ -122,7 +157,8 @@ function ensureDirSyncMock () {
  * 
  * @returns 默认存在
  */
-function ensureDirMock () {
+function ensureDirMock (path) {
+  resFileMap.set(path,'')
   return true
 }
 
@@ -131,7 +167,9 @@ function ensureDirMock () {
  * 
  * @returns 
  */
-function mkdirSyncMock () {
+function mkdirSyncMock (path) {
+  path = normalizePath(path)
+  resFileMap.set(path,'')
   return true
 }
 
@@ -148,11 +186,11 @@ function appendFileMock (path, appendContent) {
   }
 
   path = normalizePath(path)
-  if (oriFileMap.get(path)) {
-    const newContent = oriFileMap.get(path) + appendContent
-    oriFileMap.set(path, newContent)
+  if (resFileMap.get(path)) {
+    const newContent = resFileMap.get(path) + appendContent
+    resFileMap.set(path, newContent)
   }
-  oriFileMap.set(path, appendContent)
+  resFileMap.set(path, appendContent)
 }
 
 /**
@@ -169,6 +207,8 @@ function writeFileSyncMock (path, data) {
 
   path = normalizePath(path)
 
+  data = Buffer.isBuffer(data) ? Buffer.from(data).toString('utf8') : data
+
   resFileMap.set(path, data)
 }
 
@@ -228,7 +268,7 @@ function isDir (path) {
 }
 
 /**
- * 获取状态
+ * 获取文件或目录状态，在处理路径为符号链接时返回链接指向的文件或目录的状态
  */
 function statSyncMock (path) {
   if (typeof path !== 'string' || path === '') {
@@ -243,14 +283,64 @@ function statSyncMock (path) {
   }
 }
 
+/**
+ * 获取文件或目录状态，在处理路径为符号链接时返回链接自身的文件或目录的状态
+ */
+function lstatSyncMock (path) {
+  if (typeof path !== 'string' || path === '') {
+    return
+  }
+
+  path = normalizePath(path)
+  // 返回包含状态信息的对象
+  return {
+    isFile: () => customIsFile(path),
+    isDirectory: () => customIsDirectory(path),
+    isSymbolicLink: () => false
+  }
+}
+
+/** 
+ * 读取文件夹下的内容
+*/
+function readdirSyncMock (source){
+  source = normalizePath(source)
+  const parts = source.split('/')
+  if(oriFileMap.get(source) && !parts[parts.length - 1].includes('.')){
+    const fileName  = []
+    Object.keys(oriFileMap.get(source)).forEach((item) => {
+      fileName.push(item)
+    })
+    return fileName  
+  } else {
+    return fsSystem.readdirSync(source)
+  }
+}
+
+/**
+ * 文件复制
+ */
+function copyFileSyncMock (sourcePath, destinationPath){
+  resFileMap.set(destinationPath, oriFileMap.get(sourcePath))
+}
+
+function copyFileMock (sourcePath, destinationPath){
+  resFileMap.set(destinationPath, oriFileMap.get(sourcePath))
+}
+
 // 自定义的 isFile 函数
 function customIsFile (path) {
-  return oriFileMap.get(path)
+  let isFileRes = false
+  const fileMap = oriFileMap.has(path) ? oriFileMap : resFileMap
+  if(fileMap.has(path)){
+    isFileRes = typeof fileMap.get(path) === 'string'
+  }
+  return isFileRes
 }
 
 // 自定义的 isDirectory 函数
 function customIsDirectory (path) {
-  if (typeof path !== 'string' || path === '') {
+  if (typeof path === 'string' && path.includes('.') && path.indexOf('.') !== 0) {
     return false
   }
   return true
@@ -267,21 +357,28 @@ function normalizePath (path) {
 }
 
 module.exports = {
-  ...jest.requireActual('fs-extra'),
-  readFileSync: jest.fn((content) => readFileSyncMock(content)),
+  ...fsSystem,
+  readFileSync: jest.fn((content,type) => readFileSyncMock(content,type)),
   existsSync: jest.fn((path) => existsSyncMock(path)),
   ensureDirSync: jest.fn(() => ensureDirSyncMock()),
   ensureDir: jest.fn(() => ensureDirMock()),
-  mkdirSync: jest.fn(() => mkdirSyncMock()),
+  mkdirSync: jest.fn((path) => mkdirSyncMock(path)),
   appendFile: jest.fn((path, appendContent) => appendFileMock(path, appendContent)),
   writeFileSync: jest.fn((path, data) => writeFileSyncMock(path, data)),
   copySync: jest.fn((from, to) => copySyncMock(from, to)),
   statSync: jest.fn((path) => statSyncMock(path)),
+  lstatSync: jest.fn((path) => lstatSyncMock(path)),
+  readdirSync:jest.fn((source) => readdirSyncMock(source)),
+  copyFileSync:jest.fn((sourcePath,destinationPath) => copyFileSyncMock(sourcePath,destinationPath)),
+  copyFile:jest.fn((sourcePath,destinationPath) => copyFileMock(sourcePath,destinationPath)),
+  writeJSONSync:jest.fn(() => true)
 }
 
 module.exports.setMockFiles = setMockFiles
 module.exports.getMockFiles = getMockFiles
 module.exports.clearMockFiles = clearMockFiles
 module.exports.getResMapFile = getResMapFile
 module.exports.updateMockFiles = updateMockFiles
-module.exports.deleteMockFiles = deleteMockFiles
+module.exports.deleteMockFiles = deleteMockFiles
+module.exports.resFileMap = resFileMap
+module.exports.normalizePath = normalizePath

packages/taro-cli-convertor/__tests__/__mocks__/path.js

@@ -17,11 +17,16 @@ function joinMock (...pathSegments) {
   // 初始化一个数组用于保存最终路径的各个部分
   const finalPathSegments = []
 
-  for (const segment of pathSegments) {
+  for (let segment of pathSegments) {
+    // 将路劲中的 `\\` 替换为 `/` (示例："E:\\code\\taro-16\\packages\\taro-cli")
+    if(segment.includes(`\\`)){
+      segment = segment.replace(/\\/g, '/')
+    }
+    
     // 去掉路径段两端的斜杠并分割路径
     const segments = segment.split('/').filter(processPathSegment)
 
-    // 处理路径段中的 `..`
+    // 处理路径段中的 `..` 
     for (const subSegment of segments) {
       if (subSegment === '..') {
         // 如果是 `..`，则回退一层