@dcloudio/uni-cli-shared 2.0.2-4020920240930001 → 2.0.2-4040420241231001

package/lib/uts/uni_modules.js

@@ -3,27 +3,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUTSModuleDeps = exports.capitalize = exports.camelize = exports.parseInjects = exports.parseUniExtApis = exports.getUniExtApiProviderRegisters = exports.getUniExtApiProviders = void 0;
+exports.parseUTSModuleDeps = exports.capitalize = exports.camelize = exports.parseInjects = exports.parseUniExtApi = exports.parseUniExtApis = exports.getUniExtApiProviderRegisters = exports.formatExtApiProviderName = exports.getUniExtApiPlugins = exports.getUniExtApiProviders = void 0;
 // 重要：此文件编译后的js，需同步至 vue2 编译器中 uni-cli-shared/lib/uts/uni_modules.js
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const extApiProviders = [];
+const extApiPlugins = new Set();
 function getUniExtApiProviders() {
     return extApiProviders;
 }
 exports.getUniExtApiProviders = getUniExtApiProviders;
+function getUniExtApiPlugins() {
+    return [...extApiPlugins].map((plugin) => {
+        return { plugin };
+    });
+}
+exports.getUniExtApiPlugins = getUniExtApiPlugins;
+function formatExtApiProviderName(service, name) {
+    if (service === 'oauth') {
+        service = 'OAuth';
+    }
+    return `Uni${(0, exports.capitalize)((0, exports.camelize)(service))}${(0, exports.capitalize)((0, exports.camelize)(name))}ProviderImpl`;
+}
+exports.formatExtApiProviderName = formatExtApiProviderName;
 function getUniExtApiProviderRegisters() {
     const result = [];
     extApiProviders.forEach((provider) => {
         if (provider.name && provider.service) {
             result.push({
                 name: provider.name,
+                plugin: provider.plugin,
                 service: provider.service,
-                class: `uts.sdk.modules.${(0, exports.camelize)(provider.plugin)}.${(0, exports.capitalize)((0, exports.camelize)('uni-ext-api-' +
-                    provider.service +
-                    '-' +
-                    provider.name +
-                    '-provider'))}`,
+                class: `uts.sdk.modules.${(0, exports.camelize)(provider.plugin)}.${formatExtApiProviderName(provider.service, provider.name)}`,
             });
         }
     });
@@ -40,6 +51,7 @@ function parseUniExtApis(vite = true, platform, language = 'javascript') {
     }
     const injects = {};
     extApiProviders.length = 0;
+    extApiPlugins.clear();
     fs_extra_1.default.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
         // 必须以 uni- 开头
         if (!uniModuleDir.startsWith('uni-')) {
@@ -62,6 +74,7 @@ function parseUniExtApis(vite = true, platform, language = 'javascript') {
                     provider.plugin = uniModuleDir;
                     extApiProviders.push(provider);
                 }
+                extApiPlugins.add(uniModuleDir);
                 const curInjects = parseInjects(vite, platform, language, `@/uni_modules/${uniModuleDir}`, uniModuleRootDir, exports);
                 Object.assign(injects, curInjects);
             }
@@ -71,6 +84,21 @@ function parseUniExtApis(vite = true, platform, language = 'javascript') {
     return injects;
 }
 exports.parseUniExtApis = parseUniExtApis;
+function parseUniExtApi(pluginDir, pluginId, vite = true, platform, language = 'javascript') {
+    const pkgPath = path_1.default.resolve(pluginDir, 'package.json');
+    if (!fs_extra_1.default.existsSync(pkgPath)) {
+        return;
+    }
+    let exports;
+    const pkg = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'));
+    if (pkg && pkg.uni_modules && pkg.uni_modules['uni-ext-api']) {
+        exports = pkg.uni_modules['uni-ext-api'];
+    }
+    if (exports) {
+        return parseInjects(vite, platform, language, `@/uni_modules/${pluginId}`, pluginDir, exports);
+    }
+}
+exports.parseUniExtApi = parseUniExtApi;
 /**
  *  uni:'getBatteryInfo'
  * import getBatteryInfo from '..'
@@ -113,13 +141,15 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
             if (platform === 'app') {
                 hasPlatformFile =
                     fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-android')) ||
-                        fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-ios'));
+                        fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-ios')) ||
+                        fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-harmony'));
             }
         }
         // 其他平台修改source，直接指向目标文件，否则 uts2js 找不到类型信息
         if (platform !== 'app' &&
             platform !== 'app-android' &&
-            platform !== 'app-ios') {
+            platform !== 'app-ios' &&
+            platform !== 'app-harmony') {
             if (fs_extra_1.default.existsSync(platformIndexFileName)) {
                 source = `${source}/utssdk/${platform}/index.uts`;
             }
@@ -127,6 +157,11 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
                 source = `${source}/utssdk/index.uts`;
             }
         }
+        else if (process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js') {
+            if (fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'app-js', 'index.uts'))) {
+                source = `${source}/utssdk/app-js/index.uts`;
+            }
+        }
         for (const key in rootDefines) {
             Object.assign(injects, parseInject(vite, platform, language, source, 'uni', rootDefines[key], hasPlatformFile));
         }
@@ -162,7 +197,9 @@ function parseInject(vite = true, platform, language, source, globalObject, defi
             }
             else {
                 const defineOptions = define[d];
-                const p = platform === 'app-android' || platform === 'app-ios'
+                const p = platform === 'app-android' ||
+                    platform === 'app-ios' ||
+                    platform === 'app-harmony'
                     ? 'app'
                     : platform;
                 if (!(p in defineOptions)) {
@@ -175,18 +212,12 @@ function parseInject(vite = true, platform, language, source, globalObject, defi
                         if (p === 'app') {
                             const appOptions = defineOptions.app;
                             if (isPlainObject(appOptions)) {
-                                if (language === 'javascript') {
-                                    if (appOptions.js === false) {
-                                        return;
-                                    }
-                                }
-                                else if (language === 'kotlin') {
-                                    if (appOptions.kotlin === false) {
-                                        return;
-                                    }
-                                }
-                                else if (language === 'swift') {
-                                    if (appOptions.swift === false) {
+                                // js engine 下且存在 app-js，不检查
+                                const skipCheck = process.env.UNI_APP_X_UVUE_SCRIPT_ENGINE === 'js' &&
+                                    source.includes('app-js');
+                                if (!skipCheck) {
+                                    const targetLanguage = language === 'javascript' ? 'js' : language;
+                                    if (targetLanguage && appOptions[targetLanguage] === false) {
                                         return;
                                     }
                                 }

package/lib/uts/uts-loader.js

@@ -6,10 +6,159 @@ const {
 const {
   parseUTSModuleDeps
 } = require('./uni_modules')
+const {
+  dataToEsm
+} = require('./dataToEsm')
+const {
+  getUniXKotlinCompiler,
+  getUniXSwiftCompiler,
+  getChangedFiles,
+  getUTSPlugins
+} = require('./uts-webpack-plugin')
+
+function createUniModulesSyncFilePreprocessor (
+  platform,
+  utsPlatform
+) {
+  const initPreprocessContext = require('../preprocess')
+  const {
+    vueContext: preContext
+  } = initPreprocessContext(
+    platform,
+    global.uniPlugin.platforms
+  )
+  if (utsPlatform === 'app-android') {
+    preContext.APP_ANDROID = true
+  }
+  if (utsPlatform === 'app-ios') {
+    preContext.APP_IOS = true
+  }
+  const {
+    preprocess
+  } = require('@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader/preprocess/lib/preprocess')
+
+  function preJs (jsCode) {
+    return preprocess(jsCode, preContext, {
+      type: 'js'
+    })
+  }
+
+  function preHtml (htmlCode) {
+    return preprocess(htmlCode, preContext, {
+      type: 'html'
+    })
+  }
+
+  return async (content, fileName) => {
+    const extname = path.extname(fileName)
+    if (extname === '.json') {
+      return dataToEsm(JSON.parse(preJs(content)), {
+        namedExports: true,
+        preferConst: true
+      })
+    } else if (extname === '.uts' || extname === '.ts') {
+      return preJs(content)
+    } else if (extname === '.uvue' || extname === '.vue') {
+      return preJs(preHtml(content))
+    }
+    return content
+  }
+}
+
+function once (fn, ctx = null) {
+  let res
+  return (...args) => {
+    if (fn) {
+      res = fn.apply(ctx, args)
+      fn = null
+    }
+    return res
+  }
+}
+
+const createAppAndroidUniModulesSyncFilePreprocessorOnce = once(
+  () => {
+    return createUniModulesSyncFilePreprocessor('app', 'app-android')
+  }
+)
+
+const createAppIosUniModulesSyncFilePreprocessorOnce = once(
+  () => {
+    return createUniModulesSyncFilePreprocessor('app', 'app-ios')
+  }
+)
+
 module.exports = async function (content) {
   const callback = this.async()
 
+  const uniXKotlinCompiler = getUniXKotlinCompiler()
+  const uniXSwiftCompiler = getUniXSwiftCompiler()
+
+  const {
+    syncUniModuleFilesByCompiler,
+    resolveTscUniModuleIndexFileName
+  } = resolveUTSCompiler()
+
   const compilePlugin = async (pluginDir) => {
+    const pluginId = path.basename(pluginDir)
+
+    const utsPlugins = getUTSPlugins()
+    const changedFiles = getChangedFiles()
+    if (uniXKotlinCompiler) {
+      await uniXKotlinCompiler.init()
+      await syncUniModuleFilesByCompiler(
+        'app-android',
+        uniXKotlinCompiler,
+        pluginDir,
+        createAppAndroidUniModulesSyncFilePreprocessorOnce()
+      )
+    }
+
+    if (uniXSwiftCompiler) {
+      await uniXSwiftCompiler.init()
+      await syncUniModuleFilesByCompiler(
+        'app-ios',
+        uniXSwiftCompiler,
+        pluginDir,
+        createAppIosUniModulesSyncFilePreprocessorOnce()
+      )
+    }
+
+    if (!utsPlugins.has(pluginId)) {
+      utsPlugins.add(pluginId)
+      if (uniXKotlinCompiler) {
+        const indexFileName = resolveTscUniModuleIndexFileName(
+          'app-android',
+          pluginDir
+        )
+        if (indexFileName) {
+          await uniXKotlinCompiler.addRootFile(indexFileName)
+        }
+      }
+      if (uniXSwiftCompiler) {
+        const indexFileName = resolveTscUniModuleIndexFileName(
+          'app-ios',
+          pluginDir
+        )
+        if (indexFileName) {
+          await uniXSwiftCompiler.addRootFile(indexFileName)
+        }
+      }
+    }
+
+    // 处理uni_modules中的文件变更
+    const files = changedFiles.get(pluginId)
+    if (files) {
+      // 仅限watch模式是会生效
+      changedFiles.delete(pluginId)
+      if (uniXKotlinCompiler) {
+        await uniXKotlinCompiler.invalidate(files)
+      }
+      if (uniXSwiftCompiler) {
+        await uniXSwiftCompiler.invalidate(files)
+      }
+    }
+
     const pkgJson = require(path.join(pluginDir, 'package.json'))
     const compiler = resolveUTSCompiler()
     // 处理依赖的 uts 插件
@@ -33,6 +182,9 @@ module.exports = async function (content) {
       ),
       sourceMap: process.env.NODE_ENV === 'development',
       uni_modules: deps
+      // 暂不提供
+      // async kotlinAutoImports() {}
+      // async swiftAutoImports() {}
     })
   }
 

package/lib/uts/uts-webpack-plugin.js

@@ -0,0 +1,138 @@
+const path = require('path')
+const fs = require('fs-extra')
+const {
+  resolveUTSCompiler
+} = require('./uts')
+const {
+  normalizePath
+} = require('../util')
+const {
+  runByHBuilderX
+} = require('../platform')
+
+class WebpackUTSPlugin {
+  apply (compiler) {
+    compiler.hooks.watchRun.tapAsync('WatchRun', (comp, done) => {
+      let changedFileNames = []
+      if (comp.modifiedFiles) { // webpack5
+        changedFileNames = Array.from(comp.modifiedFiles)
+      } else if (comp.watchFileSystem?.watcher?.mtimes) { // webpack4
+        changedFileNames = Object.keys(comp.watchFileSystem.watcher.mtimes)
+      }
+      if (changedFileNames.length) {
+        // console.log('====================================')
+        // console.log('NEW BUILD FILES CHANGED:', changedFileNames)
+        // console.log('====================================')
+        const uniModulesDir = normalizePath(path.resolve(process.env.UNI_INPUT_DIR, 'uni_modules'))
+        changedFileNames.forEach(fileName => {
+          fileName = normalizePath(fileName)
+          if (fileName.startsWith(uniModulesDir)) {
+            // 仅处理uni_modules中的文件
+            const plugin = fileName.slice(uniModulesDir.length + 1).split('/')[0]
+            if (utsPlugins.has(plugin)) {
+              const changeFile = {
+                fileName,
+                event: 'update' // 写死 update
+              }
+              if (!changedFiles.has(plugin)) {
+                changedFiles.set(plugin, [changeFile])
+              } else {
+                changedFiles.get(plugin).push(changeFile)
+              }
+            }
+          }
+        })
+      }
+      return done()
+    })
+    compiler.hooks.done.tapPromise('webpack-uts-done', async () => {
+      if (process.env.NODE_ENV !== 'development') {
+        if (uniXKotlinCompiler) {
+          await uniXKotlinCompiler.close()
+        }
+        if (uniXSwiftCompiler) {
+          await uniXSwiftCompiler.close()
+        }
+      }
+    })
+  }
+}
+let uniXKotlinCompiler = null
+let uniXSwiftCompiler = null
+const utsPlugins = new Set()
+const changedFiles = new Map()
+
+function getUTSPlugins () {
+  return utsPlugins
+}
+
+function getChangedFiles () {
+  return changedFiles
+}
+
+function getUniXKotlinCompiler () {
+  if (uniXKotlinCompiler) {
+    return uniXKotlinCompiler
+  }
+  const {
+    createUniXKotlinCompilerOnce
+  } = resolveUTSCompiler()
+
+  uniXKotlinCompiler = runByHBuilderX && process.env.UNI_APP_X_TSC === 'true' &&
+    (process.env.UNI_UTS_PLATFORM === 'app-android' ||
+      process.env.UNI_UTS_PLATFORM === 'app' ||
+      process.env.UNI_UTS_PLATFORM === 'app-plus')
+    ? createUniXKotlinCompilerOnce()
+    : null
+  if (uniXKotlinCompiler) {
+    const tscDir = path.resolve(process.env.UNI_OUTPUT_DIR, '../.tsc/app-android')
+    const uvueDir = path.resolve(process.env.UNI_OUTPUT_DIR, '../.uvue/app-android')
+    try {
+      if (fs.existsSync(tscDir)) {
+        fs.emptyDirSync(tscDir)
+      }
+      if (fs.existsSync(uvueDir)) {
+        fs.emptyDirSync(uvueDir)
+      }
+    } catch (e) {}
+  }
+  return uniXKotlinCompiler
+}
+
+function getUniXSwiftCompiler () {
+  if (uniXSwiftCompiler) {
+    return uniXSwiftCompiler
+  }
+  const {
+    createUniXSwiftCompilerOnce
+  } = resolveUTSCompiler()
+
+  uniXSwiftCompiler =
+    runByHBuilderX && process.env.UNI_APP_X_TSC === 'true' &&
+    (process.env.UNI_UTS_PLATFORM === 'app-ios' ||
+      process.env.UNI_UTS_PLATFORM === 'app' ||
+      process.env.UNI_UTS_PLATFORM === 'app-plus')
+      ? createUniXSwiftCompilerOnce()
+      : null
+
+  if (uniXSwiftCompiler) {
+    const tscDir = path.resolve(process.env.UNI_OUTPUT_DIR, '../.tsc/app-ios')
+    const uvueDir = path.resolve(process.env.UNI_OUTPUT_DIR, '../.uvue/app-ios')
+    try {
+      if (fs.existsSync(tscDir)) {
+        fs.emptyDirSync(tscDir)
+      }
+      if (fs.existsSync(uvueDir)) {
+        fs.emptyDirSync(uvueDir)
+      }
+    } catch (e) {}
+  }
+  return uniXSwiftCompiler
+}
+module.exports = {
+  getUTSPlugins,
+  getChangedFiles,
+  getUniXKotlinCompiler,
+  getUniXSwiftCompiler,
+  WebpackUTSPlugin
+}