feat: 优化文件导出

Author: luckyadam

.gitignore

@@ -121,7 +121,7 @@ dist
 .AppleDouble
 .LSOverride
 
-# Icon must end with two 
+# Icon must end with two 
 Icon
 
 
@@ -195,3 +195,4 @@ Cargo.lock
 !.yarn/versions
 
 *.node
+./index.js

Cargo.toml

@@ -8,13 +8,17 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.12.0", default-features = false, features = ["napi4"] }
-napi-derive = "2.12.2"
+napi = { version = "2", default-features = false, features = [
+  "napi4",
+  "serde-json",
+] }
+napi-derive = { version = "2", default-features = false }
+
 serde_json = "1.0"
 jsonschema = "0.17"
 emojis = "0.6.0"
 console = "0.15.7"
-termcolor = "1.2.0"
+regex = "1.8.3"
 
 [build-dependencies]
 napi-build = "2.0.1"

index.js

@@ -1,261 +1,27 @@
-/* tslint:disable */
-/* eslint-disable */
-/* prettier-ignore */
-
-/* auto-generated by NAPI-RS */
-
-const { existsSync, readFileSync } = require('fs')
-const { join } = require('path')
-
-const { platform, arch } = process
-
-let nativeBinding = null
-let localFileExisted = false
-let loadError = null
-
-function isMusl() {
-  // For Node 10
-  if (!process.report || typeof process.report.getReport !== 'function') {
-    try {
-      const lddPath = require('child_process').execSync('which ldd').toString().trim();
-      return readFileSync(lddPath, 'utf8').includes('musl')
-    } catch (e) {
-      return true
-    }
-  } else {
-    const { glibcVersionRuntime } = process.report.getReport().header
-    return !glibcVersionRuntime
-  }
-}
-
-switch (platform) {
-  case 'android':
-    switch (arch) {
-      case 'arm64':
-        localFileExisted = existsSync(join(__dirname, 'doctor.android-arm64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.android-arm64.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-android-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(join(__dirname, 'doctor.android-arm-eabi.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.android-arm-eabi.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-android-arm-eabi')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Android ${arch}`)
-    }
-    break
-  case 'win32':
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(
-          join(__dirname, 'doctor.win32-x64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.win32-x64-msvc.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-win32-x64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'ia32':
-        localFileExisted = existsSync(
-          join(__dirname, 'doctor.win32-ia32-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.win32-ia32-msvc.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-win32-ia32-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'doctor.win32-arm64-msvc.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.win32-arm64-msvc.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-win32-arm64-msvc')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Windows: ${arch}`)
-    }
-    break
-  case 'darwin':
-    localFileExisted = existsSync(join(__dirname, 'doctor.darwin-universal.node'))
-    try {
-      if (localFileExisted) {
-        nativeBinding = require('./doctor.darwin-universal.node')
-      } else {
-        nativeBinding = require('@tarojs/doctor-darwin-universal')
-      }
-      break
-    } catch {}
-    switch (arch) {
-      case 'x64':
-        localFileExisted = existsSync(join(__dirname, 'doctor.darwin-x64.node'))
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.darwin-x64.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-darwin-x64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      case 'arm64':
-        localFileExisted = existsSync(
-          join(__dirname, 'doctor.darwin-arm64.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.darwin-arm64.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-darwin-arm64')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on macOS: ${arch}`)
-    }
-    break
-  case 'freebsd':
-    if (arch !== 'x64') {
-      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
-    }
-    localFileExisted = existsSync(join(__dirname, 'doctor.freebsd-x64.node'))
-    try {
-      if (localFileExisted) {
-        nativeBinding = require('./doctor.freebsd-x64.node')
-      } else {
-        nativeBinding = require('@tarojs/doctor-freebsd-x64')
-      }
-    } catch (e) {
-      loadError = e
-    }
-    break
-  case 'linux':
-    switch (arch) {
-      case 'x64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'doctor.linux-x64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./doctor.linux-x64-musl.node')
-            } else {
-              nativeBinding = require('@tarojs/doctor-linux-x64-musl')
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var js_binding_1 = require("./js-binding");
+exports.default = (function (ctx) {
+    ctx.registerCommand({
+        name: 'dd',
+        fn: function () {
+            var _a = ctx.paths, appPath = _a.appPath, nodeModulesPath = _a.nodeModulesPath, configPath = _a.configPath;
+            var _b = ctx.helper, fs = _b.fs, chalk = _b.chalk, PROJECT_CONFIG = _b.PROJECT_CONFIG;
+            if (!configPath || !fs.existsSync(configPath)) {
+                console.log(chalk.red("\u627E\u4E0D\u5230\u9879\u76EE\u914D\u7F6E\u6587\u4EF6".concat(PROJECT_CONFIG, "\uFF0C\u8BF7\u786E\u5B9A\u5F53\u524D\u76EE\u5F55\u662F Taro \u9879\u76EE\u6839\u76EE\u5F55!")));
+                process.exit(1);
             }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'doctor.linux-x64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./doctor.linux-x64-gnu.node')
-            } else {
-              nativeBinding = require('@tarojs/doctor-linux-x64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm64':
-        if (isMusl()) {
-          localFileExisted = existsSync(
-            join(__dirname, 'doctor.linux-arm64-musl.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./doctor.linux-arm64-musl.node')
-            } else {
-              nativeBinding = require('@tarojs/doctor-linux-arm64-musl')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        } else {
-          localFileExisted = existsSync(
-            join(__dirname, 'doctor.linux-arm64-gnu.node')
-          )
-          try {
-            if (localFileExisted) {
-              nativeBinding = require('./doctor.linux-arm64-gnu.node')
-            } else {
-              nativeBinding = require('@tarojs/doctor-linux-arm64-gnu')
-            }
-          } catch (e) {
-            loadError = e
-          }
-        }
-        break
-      case 'arm':
-        localFileExisted = existsSync(
-          join(__dirname, 'doctor.linux-arm-gnueabihf.node')
-        )
-        try {
-          if (localFileExisted) {
-            nativeBinding = require('./doctor.linux-arm-gnueabihf.node')
-          } else {
-            nativeBinding = require('@tarojs/doctor-linux-arm-gnueabihf')
-          }
-        } catch (e) {
-          loadError = e
-        }
-        break
-      default:
-        throw new Error(`Unsupported architecture on Linux: ${arch}`)
-    }
-    break
-  default:
-    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
-}
-
-if (!nativeBinding) {
-  if (loadError) {
-    throw loadError
-  }
-  throw new Error(`Failed to load native binding`)
-}
-
-const { validateConfig, validatePackage, validateEnv, validateRecommend, validateEslint } = nativeBinding
-
-module.exports.validateConfig = validateConfig
-module.exports.validatePackage = validatePackage
-module.exports.validateEnv = validateEnv
-module.exports.validateRecommend = validateRecommend
-module.exports.validateEslint = validateEslint
+            var configStr = JSON.stringify(ctx.initialConfig, function (_, v) {
+                if (typeof v === 'function') {
+                    return '__function__';
+                }
+                return v;
+            });
+            (0, js_binding_1.validateEnv)();
+            (0, js_binding_1.validateConfig)(configStr);
+            (0, js_binding_1.validatePackage)(appPath, nodeModulesPath);
+            (0, js_binding_1.validateRecommend)(appPath);
+            (0, js_binding_1.validateEslint)();
+        },
+    });
+});

index.ts

@@ -0,0 +1,33 @@
+import {
+  validateEnv,
+  validateConfig,
+  validatePackage,
+  validateRecommend,
+  validateEslint
+} from './js-binding'
+
+export default (ctx) => {
+	ctx.registerCommand({
+    name: 'dd',
+    fn() {
+      const { appPath, nodeModulesPath, configPath } = ctx.paths
+      const { fs, chalk, PROJECT_CONFIG } = ctx.helper
+
+      if (!configPath || !fs.existsSync(configPath)) {
+        console.log(chalk.red(`找不到项目配置文件${PROJECT_CONFIG}，请确定当前目录是 Taro 项目根目录!`))
+        process.exit(1)
+      }
+      const configStr = JSON.stringify(ctx.initialConfig, (_, v) => {
+        if (typeof v === 'function') {
+          return '__function__'
+        }
+        return v
+      })
+      validateEnv()
+      validateConfig(configStr)
+      validatePackage(appPath, nodeModulesPath)
+      validateRecommend(appPath)
+      validateEslint()
+    },
+  })
+}

index.d.ts js-binding.d.tsindex.d.ts renamed to js-binding.d.ts

@@ -4,7 +4,7 @@
 /* auto-generated by NAPI-RS */
 
 export function validateConfig(configStr: string): void
-export function validatePackage(appPath: string, nodeModulesPath: string, cliVersion: string): void
+export function validatePackage(appPath: string, nodeModulesPath: string): void
 export function validateEnv(): void
 export function validateRecommend(appPath: string): void
 export function validateEslint(): void