@dcloudio/uni-cli-shared 3.0.0-alpha-4020220240624001 → 3.0.0-alpha-4020320240629001

package/dist/index.d.ts

@@ -22,7 +22,7 @@ export * from './resolve';
 export * from './scripts';
 export * from './platform';
 export * from './utsUtils';
-export { parseUniExtApis, parseInjects, parseUniModulesArtifacts, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, resolveEncryptUniModule, } from './uni_modules';
+export { parseUniExtApi, parseUniExtApis, parseInjects, parseUniModulesArtifacts, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, resolveEncryptUniModule, formatExtApiProviderName, } from './uni_modules';
 export { M } from './messages';
 export * from './exports';
 export { checkUpdate } from './checkUpdate';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.getUniExtApiProviderRegisters = exports.parseUniModulesArtifacts = exports.parseInjects = exports.parseUniExtApis = void 0;
+exports.checkUpdate = exports.M = exports.formatExtApiProviderName = exports.resolveEncryptUniModule = exports.getUniExtApiProviderRegisters = exports.parseUniModulesArtifacts = exports.parseInjects = exports.parseUniExtApis = exports.parseUniExtApi = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -40,11 +40,13 @@ __exportStar(require("./scripts"), exports);
 __exportStar(require("./platform"), exports);
 __exportStar(require("./utsUtils"), exports);
 var uni_modules_1 = require("./uni_modules");
+Object.defineProperty(exports, "parseUniExtApi", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApi; } });
 Object.defineProperty(exports, "parseUniExtApis", { enumerable: true, get: function () { return uni_modules_1.parseUniExtApis; } });
 Object.defineProperty(exports, "parseInjects", { enumerable: true, get: function () { return uni_modules_1.parseInjects; } });
 Object.defineProperty(exports, "parseUniModulesArtifacts", { enumerable: true, get: function () { return uni_modules_1.parseUniModulesArtifacts; } });
 Object.defineProperty(exports, "getUniExtApiProviderRegisters", { enumerable: true, get: function () { return uni_modules_1.getUniExtApiProviderRegisters; } });
 Object.defineProperty(exports, "resolveEncryptUniModule", { enumerable: true, get: function () { return uni_modules_1.resolveEncryptUniModule; } });
+Object.defineProperty(exports, "formatExtApiProviderName", { enumerable: true, get: function () { return uni_modules_1.formatExtApiProviderName; } });
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/uni_modules.d.ts

@@ -24,8 +24,10 @@ export declare function getUniExtApiProviders(): {
 export declare function getUniExtApiPlugins(): {
     plugin: string;
 }[];
+export declare function formatExtApiProviderName(service: string, name: string): string;
 export declare function getUniExtApiProviderRegisters(): {
     name: string;
+    plugin: string;
     service: string;
     class: string;
 }[];

package/dist/uni_modules.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUniModulesArtifacts = exports.checkEncryptUniModules = exports.resolveEncryptUniModule = exports.initCheckEnv = exports.packUploadEncryptUniModules = exports.findUploadEncryptUniModulesFiles = exports.findEncryptUniModules = exports.parseEasyComComponents = exports.parseUniModulesWithComponents = exports.genEncryptEasyComModuleIndex = exports.parseUTSModuleDeps = exports.capitalize = exports.camelize = exports.parseInjects = exports.parseUniExtApi = exports.parseUniExtApis = exports.getUniExtApiProviderRegisters = exports.getUniExtApiPlugins = exports.getUniExtApiProviders = void 0;
+exports.parseUniModulesArtifacts = exports.checkEncryptUniModules = exports.resolveEncryptUniModule = exports.initCheckEnv = exports.packUploadEncryptUniModules = exports.findUploadEncryptUniModulesFiles = exports.findEncryptUniModules = exports.parseEasyComComponents = exports.parseUniModulesWithComponents = exports.genEncryptEasyComModuleIndex = 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"));
@@ -23,14 +23,22 @@ function getUniExtApiPlugins() {
     });
 }
 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))}Provider`;
+}
+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-' + provider.service + '-' + provider.name + '-provider'))}`,
+                class: `uts.sdk.modules.${(0, exports.camelize)(provider.plugin)}.${formatExtApiProviderName(provider.service, provider.name)}`,
             });
         }
     });

package/dist/vite/plugins/uts/uni_modules.d.ts

@@ -4,7 +4,7 @@ interface UniUTSPluginOptions {
     extApis?: Record<string, [string, string]>;
     isSingleThread?: boolean;
 }
-export declare const utsPlugins: Set<string>;
+export declare function getCurrentCompiledUTSPlugins(): Set<string>;
 export declare function uniUTSAppUniModulesPlugin(options?: UniUTSPluginOptions): Plugin;
 export declare function buildUniExtApis(): Promise<void>;
 export declare function resolveExtApiProvider(pkg: Record<string, any>): {

package/dist/vite/plugins/uts/uni_modules.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniDecryptUniModulesPlugin = exports.resolveExtApiProvider = exports.buildUniExtApis = exports.uniUTSAppUniModulesPlugin = exports.utsPlugins = void 0;
+exports.uniDecryptUniModulesPlugin = exports.resolveExtApiProvider = exports.buildUniExtApis = exports.uniUTSAppUniModulesPlugin = exports.getCurrentCompiledUTSPlugins = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const uni_shared_1 = require("@dcloudio/uni-shared");
@@ -21,14 +21,18 @@ function isUniHelpers(id) {
     return UniHelpersRE.test(id);
 }
 const utsModuleCaches = new Map();
-exports.utsPlugins = new Set();
+const utsPlugins = new Set();
+function getCurrentCompiledUTSPlugins() {
+    return utsPlugins;
+}
+exports.getCurrentCompiledUTSPlugins = getCurrentCompiledUTSPlugins;
 let uniExtApiCompiler = async () => { };
 // 该插件仅限app-android、app-ios、app-harmony
 function uniUTSAppUniModulesPlugin(options = {}) {
     const inputDir = process.env.UNI_INPUT_DIR;
     process.env.UNI_UTS_USING_ROLLUP = 'true';
     const compilePlugin = async (pluginDir) => {
-        exports.utsPlugins.add(path_1.default.basename(pluginDir));
+        utsPlugins.add(path_1.default.basename(pluginDir));
         const pkgJson = require(path_1.default.join(pluginDir, 'package.json'));
         const isExtApi = !!pkgJson.uni_modules?.['uni-ext-api'];
         const extApiProvider = resolveExtApiProvider(pkgJson);
@@ -70,7 +74,7 @@ function uniUTSAppUniModulesPlugin(options = {}) {
     };
     uniExtApiCompiler = async () => {
         // 获取 provider 扩展(编译所有uni)
-        const plugins = (0, uni_modules_1.getUniExtApiPlugins)().filter((provider) => !exports.utsPlugins.has(provider.plugin));
+        const plugins = (0, uni_modules_1.getUniExtApiPlugins)().filter((provider) => !utsPlugins.has(provider.plugin));
         for (const plugin of plugins) {
             const result = await compilePlugin(path_1.default.resolve(inputDir, 'uni_modules', plugin.plugin));
             if (result) {
@@ -153,11 +157,6 @@ function uniUTSAppUniModulesPlugin(options = {}) {
                 };
             }
         },
-        async generateBundle() {
-            if (process.env.UNI_PLATFORM === 'app-harmony') {
-                genAppHarmonyIndex(inputDir, exports.utsPlugins);
-            }
-        },
     };
 }
 exports.uniUTSAppUniModulesPlugin = uniUTSAppUniModulesPlugin;
@@ -214,43 +213,3 @@ function uniDecryptUniModulesPlugin() {
     };
 }
 exports.uniDecryptUniModulesPlugin = uniDecryptUniModulesPlugin;
-function genAppHarmonyIndex(inputDir, utsPlugins) {
-    if (!process.env.UNI_APP_HARMONY_PROJECT_PATH) {
-        return;
-    }
-    const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
-    const importCodes = [];
-    const extApiCodes = [];
-    const registerCodes = [];
-    utsPlugins.forEach((plugin) => {
-        const injects = (0, uni_modules_1.parseUniExtApi)(path_1.default.resolve(uniModulesDir, plugin), plugin, true, 'app-harmony', 'arkts');
-        if (injects) {
-            Object.keys(injects).forEach((key) => {
-                const inject = injects[key];
-                if (Array.isArray(inject) && inject.length > 1) {
-                    const apiName = inject[1];
-                    importCodes.push(`import { ${inject[1]} } from './${plugin}/utssdk/app-harmony'`);
-                    extApiCodes.push(`uni.${apiName} = ${apiName}`);
-                }
-            });
-        }
-        else {
-            const ident = (0, utils_2.camelize)(plugin);
-            importCodes.push(`import * as ${ident} from './${plugin}/utssdk/app-harmony'`);
-            registerCodes.push(`uni.registerUTSPlugin('uni_modules/${plugin}', ${ident})`);
-        }
-    });
-    fs_1.default.writeFileSync(path_1.default.resolve((0, uts_1.resolveUTSCompiler)().resolveAppHarmonyUniModulesRootDir(process.env.UNI_APP_HARMONY_PROJECT_PATH), 'index.generated.ets'), `// This file is automatically generated by uni-app.
-// Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-${importCodes.join('\n')}
-
-export function initUniModules(uni: ESObject) {
-  initUniExtApi(uni)
-  ${registerCodes.join('\n  ')}
-}
-
-function initUniExtApi(uni: ESObject) {
-  ${extApiCodes.join('\n  ')}
-}
-`);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4020220240624001",
+  "version": "3.0.0-alpha-4020320240629001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,8 +26,8 @@
     "@babel/core": "^7.23.3",
     "@babel/parser": "^7.23.9",
     "@babel/types": "^7.20.7",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4020220240624001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4020220240624001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4020320240629001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4020320240629001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -71,7 +71,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4020220240624001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4020320240629001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",