@dcloudio/uni-cli-shared 2.0.2-3090620231104001 → 2.0.2-3090920231225001

package/lib/cache.js

@@ -79,7 +79,9 @@ function updateComponentJson (name, jsonObj, usingComponents = true, type = 'Com
   if (type === 'Component') {
     jsonObj.component = true
     if (process.env.UNI_PLATFORM === 'mp-alipay') {
-      jsonObj.styleIsolation = 'apply-shared'
+      const manifestConfig = process.UNI_MANIFEST
+      const alipayConfig = manifestConfig['mp-alipay'] || {}
+      jsonObj.styleIsolation = alipayConfig.styleIsolation || 'apply-shared'
     }
   } else if (type === 'Page') {
     if (process.env.UNI_PLATFORM === 'mp-baidu') {
@@ -160,39 +162,28 @@ function updateUsingComponents (name, usingComponents, type) {
   }
 
   const oldJsonStr = getJsonFile(name)
-  if (oldJsonStr) { // update
-    const jsonObj = JSON.parse(oldJsonStr)
-    if (type === 'Component') {
+  const jsonObj = oldJsonStr ? JSON.parse(oldJsonStr) : {
+    usingComponents
+  }
+  if (type === 'Component') {
+    jsonObj.component = true
+    if (process.env.UNI_PLATFORM === 'mp-alipay') {
+      const manifestConfig = process.UNI_MANIFEST
+      const alipayConfig = manifestConfig['mp-alipay'] || {}
+      jsonObj.styleIsolation = alipayConfig.styleIsolation || 'apply-shared'
+    }
+  } else if (type === 'Page') {
+    if (process.env.UNI_PLATFORM === 'mp-baidu') {
       jsonObj.component = true
-      if (process.env.UNI_PLATFORM === 'mp-alipay') {
-        jsonObj.styleIsolation = 'apply-shared'
-      }
-    } else if (type === 'Page') {
-      if (process.env.UNI_PLATFORM === 'mp-baidu') {
-        jsonObj.component = true
-      }
     }
-
+  }
+  if (oldJsonStr) { // update
     jsonObj.usingComponents = usingComponents
     const newJsonStr = JSON.stringify(jsonObj, null, 2)
     if (newJsonStr !== oldJsonStr) {
       updateJsonFile(name, newJsonStr)
     }
   } else { // add
-    const jsonObj = {
-      usingComponents
-    }
-    if (type === 'Component') {
-      jsonObj.component = true
-      if (process.env.UNI_PLATFORM === 'mp-alipay') {
-        jsonObj.styleIsolation = 'apply-shared'
-      }
-    } else if (type === 'Page') {
-      if (process.env.UNI_PLATFORM === 'mp-baidu') {
-        jsonObj.component = true
-      }
-    }
-
     updateJsonFile(name, jsonObj)
   }
 }

package/lib/uts/resolver.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const {
-  resolveUtsModule
+  resolveUTSModule
 } = require('./uts')
 class UTSResolverPlugin {
   apply (resolver) {
@@ -12,7 +12,7 @@ class UTSResolverPlugin {
         utsModulePath = path.resolve(request.path, request.request)
       }
       if (utsModulePath) {
-        const utsModule = resolveUtsModule(utsModulePath)
+        const utsModule = resolveUTSModule(utsModulePath)
         if (utsModule) {
           if (process.env.UNI_PLATFORM === 'app-plus') {
             request.request = utsModule + '/package.json?uts-proxy'

package/lib/{uni_modules → uts}/uni_modules.js

@@ -63,6 +63,9 @@ exports.parseUniExtApis = parseUniExtApis;
  * @returns
  */
 function parseInjects(vite = true, platform, language, source, uniModuleRootDir, exports = {}) {
+    if (platform === 'app-plus') {
+        platform = 'app';
+    }
     let rootDefines = {};
     Object.keys(exports).forEach((name) => {
         if (name.startsWith('uni')) {
@@ -71,10 +74,17 @@ function parseInjects(vite = true, platform, language, source, uniModuleRootDir,
     });
     const injects = {};
     if (Object.keys(rootDefines).length) {
-        const hasPlatformFile = uniModuleRootDir
+        let hasPlatformFile = uniModuleRootDir
             ? fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', 'index.uts')) ||
                 fs_extra_1.default.existsSync(path_1.default.resolve(uniModuleRootDir, 'utssdk', platform))
             : true;
+        if (!hasPlatformFile) {
+            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'));
+            }
+        }
         for (const key in rootDefines) {
             Object.assign(injects, parseInject(vite, platform, language, source, 'uni', rootDefines[key], hasPlatformFile));
         }

package/lib/uts/utils.js

@@ -1,7 +1,9 @@
 const fs = require('fs')
 const path = require('path')
 const {
-  normalizePath
+  normalizePath,
+  camelize,
+  capitalize
 } = require('../util')
 
 function hasProjectYarn (cwd) {
@@ -34,5 +36,8 @@ Please run \`${command}\` and try again.`
 module.exports = {
   version: require('../../package.json').version,
   normalizePath,
-  installDepTips
+  installDepTips,
+  camelize,
+  capitalize,
+  isArray: Array.isArray
 }

package/lib/uts/uts-loader.js

@@ -1,10 +1,19 @@
 const path = require('path')
 const {
-  resolveUTSCompiler
+  resolveUTSCompiler,
+  parseUniExtApiNamespacesOnce
 } = require('./uts')
 module.exports = function (content) {
   const callback = this.async()
-  resolveUTSCompiler().compile(path.dirname(this.resourcePath)).then(result => {
+  resolveUTSCompiler().compile(path.dirname(this.resourcePath), {
+    isX: false,
+    isPlugin: true,
+    extApis: parseUniExtApiNamespacesOnce(
+      process.env.UNI_UTS_PLATFORM,
+      process.env.UNI_UTS_TARGET_LANGUAGE
+    ),
+    sourceMap: process.env.NODE_ENV === 'development'
+  }).then(result => {
     if (result) {
       result.deps.forEach((dep) => {
         this.addDependency(dep)

package/lib/uts/uts.js

@@ -3,24 +3,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initUTSComponents = exports.resolveUTSCompiler = exports.resolveUtsModule = exports.resolveUtsAppModule = void 0;
+exports.parseUniExtApiNamespacesJsOnce = exports.parseUniExtApiNamespacesOnce = exports.parseSwiftPackageWithPluginId = exports.parseKotlinPackageWithPluginId = exports.initUTSComponents = exports.parseUTSComponent = exports.isUTSComponent = exports.resolveUTSCompiler = exports.resolveUTSModule = exports.resolveUTSAppModule = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
+const uni_modules_1 = require("./uni_modules");
+// 重要，该文件编译后的 js 需要同步到 vue2 编译器 uni-cli-shared/lib/uts
+function once(fn, ctx = null) {
+    let res;
+    return ((...args) => {
+        if (fn) {
+            res = fn.apply(ctx, args);
+            fn = null;
+        }
+        return res;
+    });
+}
 /**
  * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
  * @param id
  * @param importer
  * @returns
  */
-function resolveUtsAppModule(id, importer) {
+function resolveUTSAppModule(id, importer, includeUTSSDK = true) {
     id = path_1.default.resolve(importer, id);
-    if (id.includes('utssdk') || id.includes('uni_modules')) {
+    if (id.includes('uni_modules') || (includeUTSSDK && id.includes('utssdk'))) {
         const parts = (0, utils_1.normalizePath)(id).split('/');
         const parentDir = parts[parts.length - 2];
-        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+        if (parentDir === 'uni_modules' ||
+            (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
             if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
                 return id;
@@ -29,32 +42,33 @@ function resolveUtsAppModule(id, importer) {
                 return path_1.default.resolve(id, basedir, p);
             };
             const extname = ['.uts'];
-            if (resolveUtsFile(resolvePlatformDir('app-android'), extname)) {
+            if (resolveUTSFile(resolvePlatformDir('app-android'), extname)) {
                 return id;
             }
-            if (resolveUtsFile(resolvePlatformDir('app-ios'), extname)) {
+            if (resolveUTSFile(resolvePlatformDir('app-ios'), extname)) {
                 return id;
             }
         }
     }
 }
-exports.resolveUtsAppModule = resolveUtsAppModule;
+exports.resolveUTSAppModule = resolveUTSAppModule;
 // 仅限 root/uni_modules/test-plugin | root/utssdk/test-plugin 格式
-function resolveUtsModule(id, importer) {
+function resolveUTSModule(id, importer, includeUTSSDK = true) {
     if (process.env.UNI_PLATFORM === 'app' ||
         process.env.UNI_PLATFORM === 'app-plus') {
-        return resolveUtsAppModule(id, importer);
+        return resolveUTSAppModule(id, importer);
     }
     id = path_1.default.resolve(importer, id);
-    if (id.includes('utssdk') || id.includes('uni_modules')) {
+    if (id.includes('uni_modules') || (includeUTSSDK && id.includes('utssdk'))) {
         const parts = (0, utils_1.normalizePath)(id).split('/');
         const parentDir = parts[parts.length - 2];
-        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+        if (parentDir === 'uni_modules' ||
+            (includeUTSSDK && parentDir === 'utssdk')) {
             const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
             const resolvePlatformDir = (p) => {
                 return path_1.default.resolve(id, basedir, p);
             };
-            let index = resolveUtsFile(resolvePlatformDir(process.env.UNI_UTS_PLATFORM));
+            let index = resolveUTSFile(resolvePlatformDir(process.env.UNI_UTS_PLATFORM));
             if (index) {
                 return index;
             }
@@ -65,8 +79,8 @@ function resolveUtsModule(id, importer) {
         }
     }
 }
-exports.resolveUtsModule = resolveUtsModule;
-function resolveUtsFile(dir, extensions = ['.uts', '.ts', '.js']) {
+exports.resolveUTSModule = resolveUTSModule;
+function resolveUTSFile(dir, extensions = ['.uts', '.ts', '.js']) {
     for (let i = 0; i < extensions.length; i++) {
         const indexFile = path_1.default.join(dir, 'index' + extensions[i]);
         if (fs_1.default.existsSync(indexFile)) {
@@ -100,16 +114,38 @@ function resolveUTSCompiler() {
     return require(compilerPath);
 }
 exports.resolveUTSCompiler = resolveUTSCompiler;
+const utsComponents = new Map();
+function isUTSComponent(name) {
+    return utsComponents.has(name);
+}
+exports.isUTSComponent = isUTSComponent;
+function parseUTSComponent(name, type) {
+    const meta = utsComponents.get(name);
+    if (meta) {
+        const namespace = meta[type === 'swift' ? 'swiftModule' : 'kotlinPackage'] || '';
+        const className = (0, utils_1.capitalize)((0, utils_1.camelize)(name)) + 'Component';
+        return {
+            className,
+            namespace,
+            source: meta.source,
+        };
+    }
+}
+exports.parseUTSComponent = parseUTSComponent;
 function initUTSComponents(inputDir, platform) {
+    utsComponents.clear();
     const components = [];
     if (platform !== 'app' && platform !== 'app-plus') {
         return components;
     }
-    const easycomsObj = Object.create(null);
+    const easycomsObj = {};
     const dirs = resolveUTSComponentDirs(inputDir);
     dirs.forEach((dir) => {
         const is_uni_modules_utssdk = dir.endsWith('utssdk');
         const is_ussdk = !is_uni_modules_utssdk && path_1.default.dirname(dir).endsWith('utssdk');
+        const pluginId = is_uni_modules_utssdk
+            ? path_1.default.basename(path_1.default.dirname(dir))
+            : path_1.default.basename(dir);
         if (is_uni_modules_utssdk || is_ussdk) {
             fast_glob_1.default
                 .sync('**/*.vue', {
@@ -125,15 +161,27 @@ function initUTSComponents(inputDir, platform) {
                 }
                 if (name) {
                     const importDir = (0, utils_1.normalizePath)(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
-                    easycomsObj[`^${name}$`] = `\0${importDir}?uts-proxy`;
+                    easycomsObj[`^${name}$`] = {
+                        source: `${importDir}?uts-proxy`,
+                        kotlinPackage: parseKotlinPackageWithPluginId(pluginId, is_uni_modules_utssdk),
+                        swiftModule: parseSwiftPackageWithPluginId(pluginId, is_uni_modules_utssdk),
+                    };
                 }
             });
         }
     });
     Object.keys(easycomsObj).forEach((name) => {
+        const obj = easycomsObj[name];
+        const componentName = name.slice(1, -1);
         components.push({
+            name: componentName,
             pattern: new RegExp(name),
-            replacement: easycomsObj[name],
+            replacement: obj.source,
+        });
+        utsComponents.set(componentName, {
+            source: obj.source,
+            kotlinPackage: obj.kotlinPackage,
+            swiftModule: obj.swiftModule,
         });
     });
     return components;
@@ -162,3 +210,48 @@ function parseVueComponentName(file) {
         return matches[1];
     }
 }
+function prefix(id) {
+    if (process.env.UNI_UTS_MODULE_PREFIX &&
+        !id.startsWith(process.env.UNI_UTS_MODULE_PREFIX)) {
+        return process.env.UNI_UTS_MODULE_PREFIX + '-' + id;
+    }
+    return id;
+}
+function parseKotlinPackageWithPluginId(id, is_uni_modules) {
+    return 'uts.sdk.' + (is_uni_modules ? 'modules.' : '') + (0, utils_1.camelize)(prefix(id));
+}
+exports.parseKotlinPackageWithPluginId = parseKotlinPackageWithPluginId;
+function parseSwiftPackageWithPluginId(id, is_uni_modules) {
+    return ('UTSSDK' +
+        (is_uni_modules ? 'Modules' : '') +
+        (0, utils_1.capitalize)((0, utils_1.camelize)(prefix(id))));
+}
+exports.parseSwiftPackageWithPluginId = parseSwiftPackageWithPluginId;
+exports.parseUniExtApiNamespacesOnce = once((platform, language) => {
+    const extApis = (0, exports.parseUniExtApiNamespacesJsOnce)(platform, language);
+    const namespaces = {};
+    Object.keys(extApis).forEach((name) => {
+        const options = extApis[name];
+        let source = options[0];
+        const pluginId = path_1.default.basename(options[0]);
+        if (language === 'kotlin') {
+            source = parseKotlinPackageWithPluginId(pluginId, true);
+        }
+        else if (language === 'swift') {
+            source = parseSwiftPackageWithPluginId(pluginId, true);
+        }
+        namespaces[name] = [source, options[1]];
+    });
+    return namespaces;
+});
+exports.parseUniExtApiNamespacesJsOnce = once((platform, language) => {
+    const extApis = (0, uni_modules_1.parseUniExtApis)(true, platform, language);
+    const namespaces = {};
+    Object.keys(extApis).forEach((name) => {
+        const options = extApis[name];
+        if ((0, utils_1.isArray)(options) && options.length >= 2) {
+            namespaces[name.replace('uni.', '')] = [options[0], options[1]];
+        }
+    });
+    return namespaces;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-3090620231104001",
+  "version": "2.0.2-3090920231225001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -26,5 +26,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "5e393c2806e8504886480540c3c6ce1f766137fe"
+  "gitHead": "930c6d04bc26067ed5f7b8a1e782ad43760509fd"
 }