@dcloudio/uni-cli-shared 3.0.0-alpha-4010820240603001 → 3.0.0-alpha-4010920240606001

package/dist/easycom.js

@@ -115,8 +115,18 @@ function initEasycom({ isX, dirs, rootDir, custom, extensions, }) {
                 if (path_1.default.isAbsolute(source) && source.startsWith(rootDir)) {
                     source = '@/' + (0, utils_1.normalizePath)(path_1.default.relative(rootDir, source));
                 }
+                let imported = '';
+                // 加密插件easycom类型导入
+                if (source.includes('?uts-proxy')) {
+                    const moduleId = path_1.default.basename(source.split('?uts-proxy')[0]);
+                    source = `uts.sdk.modules.${(0, shared_1.camelize)(moduleId)}`;
+                    imported = genUTSComponentPublicInstanceImported(rootDir, `@/uni_modules/${moduleId}/components/${tagName}/${tagName}`);
+                }
+                else {
+                    imported = genUTSComponentPublicInstanceImported(rootDir, source);
+                }
                 addUTSEasyComAutoImports(source, [
-                    genUTSComponentPublicInstanceImported(rootDir, source),
+                    imported,
                     genUTSComponentPublicInstanceIdent(tagName),
                 ]);
             });

package/dist/index.d.ts

@@ -22,7 +22,7 @@ export * from './resolve';
 export * from './scripts';
 export * from './platform';
 export * from './utsUtils';
-export { parseUniExtApis, parseInjects, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, } from './uni_modules';
+export { parseUniExtApis, parseInjects, parseUniModulesArtifacts, Define, DefineOptions, Defines, getUniExtApiProviderRegisters, resolveEncryptUniModule, } 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.getUniExtApiProviderRegisters = exports.parseInjects = exports.parseUniExtApis = void 0;
+exports.checkUpdate = exports.M = exports.resolveEncryptUniModule = exports.getUniExtApiProviderRegisters = exports.parseUniModulesArtifacts = exports.parseInjects = exports.parseUniExtApis = void 0;
 __exportStar(require("./fs"), exports);
 __exportStar(require("./mp"), exports);
 __exportStar(require("./url"), exports);
@@ -42,7 +42,9 @@ __exportStar(require("./utsUtils"), exports);
 var uni_modules_1 = require("./uni_modules");
 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; } });
 var messages_1 = require("./messages");
 Object.defineProperty(exports, "M", { enumerable: true, get: function () { return messages_1.M; } });
 __exportStar(require("./exports"), exports);

package/dist/json/pages.js

@@ -242,7 +242,7 @@ function normalizePageStyle(pagePath, pageStyle, platform) {
         else {
             (0, shared_1.extend)(pageStyle, pageStyle[platform]);
         }
-        if (['h5', 'app'].includes(platform)) {
+        if (['h5', 'app', 'app-harmony'].includes(platform)) {
             pageStyle.navigationBar = normalizeNavigationBar(pageStyle);
             if (isEnablePullDownRefresh(pageStyle)) {
                 pageStyle.enablePullDownRefresh = true;

package/dist/messages/en.d.ts

@@ -43,5 +43,6 @@ declare const _default: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "Quick App Alliance Devtools";
     readonly 'uvue.unsupported': "uvue does not support {platform} platform";
     readonly 'uvue.dev.watching.end.empty': "The compilation outcome remains unchanged; there is no need to synchronize.";
+    readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
 };
 export default _default;

package/dist/messages/en.js

@@ -45,4 +45,5 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview-union': 'Quick App Alliance Devtools',
     'uvue.unsupported': 'uvue does not support {platform} platform',
     'uvue.dev.watching.end.empty': 'The compilation outcome remains unchanged; there is no need to synchronize.',
+    'uni_modules.import': 'Plug-in [{0}] only supports @/uni_modules/{1}.',
 };

package/dist/messages/index.d.ts

@@ -43,6 +43,7 @@ export declare const M: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
     readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
     readonly 'uvue.dev.watching.end.empty': "本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。";
+    readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
 } | {
     readonly 'app.compiler.version': "Compiler version: {version}";
     readonly compiling: "Compiling...";
@@ -88,4 +89,5 @@ export declare const M: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "Quick App Alliance Devtools";
     readonly 'uvue.unsupported': "uvue does not support {platform} platform";
     readonly 'uvue.dev.watching.end.empty': "The compilation outcome remains unchanged; there is no need to synchronize.";
+    readonly 'uni_modules.import': "Plug-in [{0}] only supports @/uni_modules/{1}.";
 };

package/dist/messages/zh_CN.d.ts

@@ -43,5 +43,6 @@ declare const _default: {
     readonly 'prompt.run.devtools.quickapp-webview-union': "快应用联盟开发者工具";
     readonly 'uvue.unsupported': "uvue 暂不支持 {platform} 平台";
     readonly 'uvue.dev.watching.end.empty': "本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。";
+    readonly 'uni_modules.import': "插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。";
 };
 export default _default;

package/dist/messages/zh_CN.js

@@ -45,4 +45,5 @@ exports.default = {
     'prompt.run.devtools.quickapp-webview-union': '快应用联盟开发者工具',
     'uvue.unsupported': 'uvue 暂不支持 {platform} 平台',
     'uvue.dev.watching.end.empty': '本次代码变更，编译结果未发生变化，跳过同步手机端程序文件。',
+    'uni_modules.import': '插件[{0}]仅支持 @/uni_modules/{1} 方式引入，不支持直接导入内部文件 {2}。',
 };

package/dist/preprocess/context.js

@@ -16,6 +16,7 @@ const DEFAULT_KEYS = [
     'APP_VUE',
     'APP_ANDROID',
     'APP_IOS',
+    'APP_HARMONY',
     'H5',
     'MP',
     'MP_360',

package/dist/uni_modules.d.ts

@@ -70,7 +70,7 @@ export declare const capitalize: (str: string) => string;
  * @returns
  */
 export declare function parseUTSModuleDeps(deps: string[], inputDir: string): string[];
-export declare function genEncryptEasyComModuleIndex(components: Record<string, '.vue' | '.uvue'>): string;
+export declare function genEncryptEasyComModuleIndex(platform: typeof process.env.UNI_UTS_PLATFORM, components: Record<string, '.vue' | '.uvue'>): string;
 export declare function parseUniModulesWithComponents(inputDir: string): Record<string, Record<string, ".vue" | ".uvue">>;
 /**
  * 解析 easyCom 组件列表
@@ -95,6 +95,8 @@ interface EncryptPackageJson {
             } & Record<string, any>;
             apis: string[];
             components: string[];
+            scopedSlots: string[];
+            declaration: string;
         };
     };
 }
@@ -109,4 +111,10 @@ export declare function checkEncryptUniModules(inputDir: string, params: {
     platform: typeof process.env.UNI_UTS_PLATFORM;
     'uni-app-x': boolean;
 }): Promise<{} | undefined>;
+export declare function parseUniModulesArtifacts(): {
+    name: string;
+    package: string;
+    scopedSlots: string[];
+    declaration: string;
+}[];
 export {};

package/dist/uni_modules.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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.parseUniExtApis = exports.getUniExtApiProviderRegisters = 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 fast_glob_1 = require("fast-glob");
 const utils_1 = require("./utils");
+const easycom_1 = require("./easycom");
+const messages_1 = require("./messages");
 const extApiProviders = [];
 const extApiPlugins = new Set();
 function getUniExtApiProviders() {
@@ -120,13 +122,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`;
             }
@@ -174,7 +178,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)) {
@@ -252,17 +258,23 @@ function parseUTSModuleDeps(deps, inputDir) {
     });
 }
 exports.parseUTSModuleDeps = parseUTSModuleDeps;
-function genEncryptEasyComModuleIndex(components) {
+function genEncryptEasyComModuleIndex(platform, components) {
     const imports = [];
     const ids = [];
     Object.keys(components).forEach((component) => {
         const id = (0, exports.capitalize)((0, exports.camelize)(component));
-        imports.push(`import ${id} from './components/${component}/${component}${components[component]}'`);
         ids.push(id);
+        if (platform === 'app-android') {
+            // 类型
+            ids.push((0, easycom_1.genUTSComponentPublicInstanceIdent)(component));
+        }
+        imports.push(`import ${id} from './components/${component}/${component}${components[component]}'`);
     });
     return `
 ${imports.join('\n')}
-export { ${ids.join(',')} }
+export { 
+  ${ids.join(',\n  ')} 
+}
 `;
 }
 exports.genEncryptEasyComModuleIndex = genEncryptEasyComModuleIndex;
@@ -395,6 +407,10 @@ function findEncryptUniModuleCache(uniModuleId, cacheDir, options) {
         // 插件版本以及各种环境一致
         if (pkg.version === options.version &&
             !isEnvExpired(pkg.uni_modules?.artifacts?.env || {}, options.env)) {
+            const declaration = path_1.default.resolve(uniModuleCacheDir, 'utssdk/app-android/index.d.uts');
+            pkg.uni_modules.artifacts.declaration = fs_extra_1.default.existsSync(declaration)
+                ? declaration
+                : '';
             return pkg;
         }
         console.log(`插件${uniModuleId} 缓存已过期，需要重新云编译。`);
@@ -462,6 +478,12 @@ function resolveEncryptUniModule(id, platform, isX = true) {
     if (index !== -1) {
         const uniModuleId = parts[index + 1];
         if (uniModuleId in encryptUniModules) {
+            if (parts[index + 2]) {
+                console.warn(messages_1.M['uni_modules.import']
+                    .replace('{0}', uniModuleId)
+                    .replace('{1}', uniModuleId)
+                    .replace('{2}', parts.slice(index + 2).join('/')));
+            }
             // 原生平台走旧的uts-proxy
             return (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, `uni_modules/${uniModuleId}?${isX && platform === 'app-android' ? 'uts-proxy' : 'uni_helpers'}`));
         }
@@ -481,10 +503,13 @@ async function checkEncryptUniModules(inputDir, params) {
     const { zipFile, modules } = packUploadEncryptUniModules(encryptUniModules, process.env.UNI_UTS_PLATFORM, inputDir, cacheDir);
     if (zipFile) {
         const downloadFile = path_1.default.resolve(cacheDir, 'uni_modules.download.zip');
-        const { C, D, R, U } = require(path_1.default.join(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'));
+        const { C, D, R, U } = (0, utils_1.requireUniHelpers)();
         try {
             const isLogin = await C();
-            console.log(`正在云编译插件${isLogin ? '' : '（请先登录）'}：${modules.join(',')}...`);
+            const tips = process.env.UNI_UTS_PLATFORM !== 'app-android'
+                ? '（此过程耗时较长）'
+                : '';
+            console.log(`正在云编译插件${isLogin ? '' : '（请先登录）'}${tips}：${modules.join(',')}...`);
             let downloadUrl = '';
             try {
                 downloadUrl = await U({
@@ -525,7 +550,7 @@ async function checkEncryptUniModules(inputDir, params) {
     else {
         // android 平台需要在这里初始化
         if (params.platform === 'app-android') {
-            const { R } = require(path_1.default.join(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'));
+            const { R } = (0, utils_1.requireUniHelpers)();
             R({
                 dir: process.env.UNI_INPUT_DIR,
                 cacheDir: process.env.UNI_MODULES_ENCRYPT_CACHE_DIR,
@@ -535,3 +560,19 @@ async function checkEncryptUniModules(inputDir, params) {
     encryptUniModules = findEncryptUniModules(inputDir, process.env.UNI_MODULES_ENCRYPT_CACHE_DIR);
 }
 exports.checkEncryptUniModules = checkEncryptUniModules;
+function parseUniModulesArtifacts() {
+    const res = [];
+    Object.keys(encryptUniModules).forEach((uniModuleId) => {
+        const pkg = encryptUniModules[uniModuleId];
+        if (pkg?.uni_modules?.artifacts) {
+            res.push({
+                name: uniModuleId,
+                package: `uts.sdk.modules.${(0, exports.camelize)(uniModuleId)}`,
+                scopedSlots: pkg.uni_modules.artifacts.scopedSlots || [],
+                declaration: pkg.uni_modules.artifacts.declaration,
+            });
+        }
+    });
+    return res;
+}
+exports.parseUniModulesArtifacts = parseUniModulesArtifacts;

package/dist/utils.d.ts

@@ -27,3 +27,4 @@ export declare function resolveAppVue(inputDir: string): string;
 export declare function parseImporter(importer: string): string;
 export declare function createResolveErrorMsg(source: string, importer: string): string;
 export declare function enableSourceMap(): boolean;
+export declare function requireUniHelpers(): any;

package/dist/utils.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.enableSourceMap = exports.createResolveErrorMsg = exports.parseImporter = exports.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isArray = exports.capitalize = exports.camelize = exports.hash = void 0;
+exports.requireUniHelpers = exports.enableSourceMap = exports.createResolveErrorMsg = exports.parseImporter = exports.resolveAppVue = exports.isAppVue = exports.installDepTips = exports.resolveSourceMapPath = exports.pathToGlob = exports.normalizeParsePlugins = exports.normalizeMiniProgramFilename = exports.normalizeNodeModules = exports.removeExt = exports.normalizePagePath = exports.normalizeIdentifier = exports.checkElementNodeTag = exports.normalizePath = exports.isWindows = exports.isArray = exports.capitalize = exports.camelize = exports.hash = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -164,3 +164,8 @@ function enableSourceMap() {
         process.env.UNI_COMPILE_TARGET !== 'uni_modules');
 }
 exports.enableSourceMap = enableSourceMap;
+function requireUniHelpers() {
+    require(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers/lib/bytenode'));
+    return require(path_1.default.join(process.env.UNI_HBUILDERX_PLUGINS, 'uni_helpers'));
+}
+exports.requireUniHelpers = requireUniHelpers;

package/dist/vite/cloud.js

@@ -10,6 +10,7 @@ const uni_modules_1 = require("../uni_modules");
 const utils_1 = require("./plugins/vitejs/utils");
 const uts_1 = require("../uts");
 const utils_2 = require("../utils");
+const easycom_1 = require("../easycom");
 function createEncryptCssUrlReplacer(resolve) {
     return async (url, importer) => {
         if (url.startsWith('/') && !url.startsWith('//')) {
@@ -66,7 +67,7 @@ function uniEncryptUniModulesPlugin() {
                 resolve: {
                     alias: initEncryptUniModulesAlias(),
                 },
-                build: initEncryptUniModulesBuildOptions(process.env.UNI_INPUT_DIR),
+                build: initEncryptUniModulesBuildOptions(process.env.UNI_UTS_PLATFORM, process.env.UNI_INPUT_DIR),
             };
         },
         configResolved(config) {
@@ -150,10 +151,12 @@ function uniEncryptUniModulesPlugin() {
                     uni_modules: [],
                     transform: {
                         uvueClassNamePrefix: 'Gen',
+                        autoImports: (0, easycom_1.getUTSEasyComAutoImports)(),
                     },
                 });
                 if (result) {
                     const apis = result.inject_apis;
+                    const scopedSlots = result.scoped_slots;
                     const components = getUniModulesExtApiComponents(uniModule);
                     const modules = (0, uts_1.resolveUTSCompiler)().parseInjectModules(apis, {}, components);
                     fs_extra_1.default.writeFileSync(path_1.default.resolve(process.env.UNI_OUTPUT_DIR, 'uni_modules', uniModule, 'package.json'), genUniModulesPackageJson(uniModule, tempOutputDir, {
@@ -161,6 +164,7 @@ function uniEncryptUniModulesPlugin() {
                         apis,
                         components,
                         modules,
+                        scopedSlots,
                     }));
                 }
             }
@@ -218,7 +222,7 @@ const indexFiles = ['index.uts', 'index.ts', 'index.js'];
 function hasIndexFile(uniModuleDir) {
     return fs_extra_1.default.readdirSync(uniModuleDir).some((file) => indexFiles.includes(file));
 }
-function initEncryptUniModulesBuildOptions(inputDir) {
+function initEncryptUniModulesBuildOptions(platform, inputDir) {
     const modules = (0, uni_modules_1.parseUniModulesWithComponents)(inputDir);
     const moduleNames = Object.keys(modules);
     if (!moduleNames.length) {
@@ -235,7 +239,7 @@ function initEncryptUniModulesBuildOptions(inputDir) {
         }
         // easyCom
         if (modules[module] && Object.keys(modules[module]).length) {
-            codes.push((0, uni_modules_1.genEncryptEasyComModuleIndex)(modules[module]));
+            codes.push((0, uni_modules_1.genEncryptEasyComModuleIndex)(platform, modules[module]));
         }
         if (codes.length) {
             fs_extra_1.default.writeFileSync(indexEncryptFile, codes.join(`\n`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-4010820240603001",
+  "version": "3.0.0-alpha-4010920240606001",
   "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-4010820240603001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240603001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4010920240606001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4010920240606001",
     "@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-4010820240603001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-4010920240606001",
     "@types/adm-zip": "^0.5.5",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__core": "^7.1.19",