@dcloudio/uni-cli-shared 3.0.0-alpha-3061420221219001 → 3.0.0-alpha-3061520221220001

package/dist/easycom.d.ts

@@ -5,7 +5,7 @@ interface EasycomOption {
     autoscan?: boolean;
     custom?: EasycomCustom;
 }
-interface EasycomMatcher {
+export interface EasycomMatcher {
     pattern: RegExp;
     replacement: string;
 }

package/dist/easycom.js

@@ -7,13 +7,13 @@ exports.UNI_EASYCOM_EXCLUDE = exports.genResolveEasycomCode = exports.addImportD
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
-const fast_glob_1 = __importDefault(require("fast-glob"));
 const shared_1 = require("@vue/shared");
 const pluginutils_1 = require("@rollup/pluginutils");
 const uni_shared_1 = require("@dcloudio/uni-shared");
 const utils_1 = require("./utils");
 const pages_1 = require("./json/pages");
 const messages_1 = require("./messages");
+const uts_1 = require("./uts");
 const debugEasycom = (0, debug_1.default)('uni:easycom');
 const easycoms = [];
 const easycomsCache = new Map();
@@ -26,7 +26,6 @@ function clearEasycom() {
 }
 function initEasycoms(inputDir, { dirs, platform }) {
     const componentsDir = path_1.default.resolve(inputDir, 'components');
-    const utssdkDir = path_1.default.resolve(inputDir, 'utssdk');
     const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
     const initEasycomOptions = (pagesJson) => {
         // 初始化时，从once中读取缓存，refresh时，实时读取
@@ -38,17 +37,7 @@ function initEasycoms(inputDir, { dirs, platform }) {
                     ...dirs,
                     componentsDir,
                     ...initUniModulesEasycomDirs(uniModulesDir),
-                ]
-                    .concat(platform === 'app'
-                    ? initUniModulesUTSSDKDirs(uniModulesDir)
-                    : [])
-                    .concat(platform === 'app' && fs_1.default.existsSync(utssdkDir)
-                    ? fast_glob_1.default.sync('*', {
-                        cwd: utssdkDir,
-                        absolute: true,
-                        onlyDirectories: true,
-                    })
-                    : []),
+                ],
             rootDir: inputDir,
             autoscan: !!(easycom && easycom.autoscan),
             custom: (easycom && easycom.custom) || {},
@@ -57,7 +46,19 @@ function initEasycoms(inputDir, { dirs, platform }) {
         return easycomOptions;
     };
     const options = initEasycomOptions((0, pages_1.parsePagesJsonOnce)(inputDir, platform));
+    const initUTSEasycom = () => {
+        (0, uts_1.initUTSComponents)(inputDir, platform).forEach((item) => {
+            const index = easycoms.findIndex((easycom) => item.pattern.toString() === easycom.pattern.toString());
+            if (index > -1) {
+                easycoms.splice(index, 1, item);
+            }
+            else {
+                easycoms.push(item);
+            }
+        });
+    };
     initEasycom(options);
+    initUTSEasycom();
     const res = {
         options,
         filter: (0, pluginutils_1.createFilter)([
@@ -71,6 +72,7 @@ function initEasycoms(inputDir, { dirs, platform }) {
         refresh() {
             res.options = initEasycomOptions();
             initEasycom(res.options);
+            initUTSEasycom();
         },
         easycoms,
     };
@@ -92,20 +94,6 @@ function initUniModulesEasycomDirs(uniModulesDir) {
     })
         .filter(Boolean);
 }
-function initUniModulesUTSSDKDirs(uniModulesDir) {
-    if (!fs_1.default.existsSync(uniModulesDir)) {
-        return [];
-    }
-    return fs_1.default
-        .readdirSync(uniModulesDir)
-        .map((uniModuleDir) => {
-        const uniModuleComponentsDir = path_1.default.resolve(uniModulesDir, uniModuleDir, 'utssdk');
-        if (fs_1.default.existsSync(uniModuleComponentsDir)) {
-            return uniModuleComponentsDir;
-        }
-    })
-        .filter(Boolean);
-}
 function initEasycom({ dirs, rootDir, custom, extensions = ['.vue', '.jsx', '.tsx'], }) {
     clearEasycom();
     const easycomsObj = Object.create(null);
@@ -161,83 +149,52 @@ function initAutoScanEasycom(dir, rootDir, extensions) {
     if (!fs_1.default.existsSync(dir)) {
         return easycoms;
     }
-    const is_uni_modules_utssdk = dir.endsWith('utssdk');
-    const is_ussdk = !is_uni_modules_utssdk && path_1.default.dirname(dir).endsWith('utssdk');
-    if (is_uni_modules_utssdk || is_ussdk) {
-        fast_glob_1.default
-            .sync('**/*.vue', {
-            cwd: dir,
-            absolute: true,
-        })
-            .forEach((file) => {
-            let name = parseVueComponentName(file);
-            if (!name) {
-                if (file.endsWith('index.vue')) {
-                    name = path_1.default.basename(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
-                }
-            }
-            if (name) {
-                const importDir = (0, utils_1.normalizePath)(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
-                easycoms[`^${name}$`] = `\0${importDir}?uts-proxy`;
-            }
-        });
-    }
-    else {
-        fs_1.default.readdirSync(dir).forEach((name) => {
-            const folder = path_1.default.resolve(dir, name);
-            if (!isDir(folder)) {
-                return;
-            }
-            const importDir = (0, utils_1.normalizePath)(folder);
-            const files = fs_1.default.readdirSync(folder);
-            // 读取文件夹文件列表，比对文件名（fs.existsSync在大小写不敏感的系统会匹配不准确）
-            for (let i = 0; i < extensions.length; i++) {
-                const ext = extensions[i];
-                if (files.includes(name + ext)) {
-                    easycoms[`^${name}$`] = `${importDir}/${name}${ext}`;
-                    break;
-                }
+    fs_1.default.readdirSync(dir).forEach((name) => {
+        const folder = path_1.default.resolve(dir, name);
+        if (!isDir(folder)) {
+            return;
+        }
+        const importDir = (0, utils_1.normalizePath)(folder);
+        const files = fs_1.default.readdirSync(folder);
+        // 读取文件夹文件列表，比对文件名（fs.existsSync在大小写不敏感的系统会匹配不准确）
+        for (let i = 0; i < extensions.length; i++) {
+            const ext = extensions[i];
+            if (files.includes(name + ext)) {
+                easycoms[`^${name}$`] = `${importDir}/${name}${ext}`;
+                break;
             }
-        });
-    }
+        }
+    });
     return easycoms;
 }
-const nameRE = /name\s*:\s*['|"](.*)['|"]/;
-function parseVueComponentName(file) {
-    const content = fs_1.default.readFileSync(file, 'utf8');
-    const matches = content.match(nameRE);
-    if (matches) {
-        return matches[1];
-    }
-}
 function initAutoScanEasycoms(dirs, rootDir, extensions) {
     const conflict = {};
     const res = dirs.reduce((easycoms, dir) => {
         const curEasycoms = initAutoScanEasycom(dir, rootDir, extensions);
         Object.keys(curEasycoms).forEach((name) => {
             // Use the first component when name conflict
-            const compath = easycoms[name];
-            if (!compath) {
+            const componentPath = easycoms[name];
+            if (!componentPath) {
                 easycoms[name] = curEasycoms[name];
             }
             else {
                 ;
-                (conflict[compath] || (conflict[compath] = [])).push(normalizeCompath(curEasycoms[name], rootDir));
+                (conflict[componentPath] || (conflict[componentPath] = [])).push(normalizeComponentPath(curEasycoms[name], rootDir));
             }
         });
         return easycoms;
     }, Object.create(null));
-    const conflictComs = Object.keys(conflict);
-    if (conflictComs.length) {
+    const conflictComponents = Object.keys(conflict);
+    if (conflictComponents.length) {
         console.warn(messages_1.M['easycom.conflict']);
-        conflictComs.forEach((com) => {
-            console.warn([normalizeCompath(com, rootDir), conflict[com]].join(','));
+        conflictComponents.forEach((com) => {
+            console.warn([normalizeComponentPath(com, rootDir), conflict[com]].join(','));
         });
     }
     return res;
 }
-function normalizeCompath(compath, rootDir) {
-    return (0, utils_1.normalizePath)(path_1.default.relative(rootDir, compath));
+function normalizeComponentPath(componentPath, rootDir) {
+    return (0, utils_1.normalizePath)(path_1.default.relative(rootDir, componentPath));
 }
 function addImportDeclaration(importDeclarations, local, source, imported) {
     importDeclarations.push(createImportDeclaration(local, source, imported));

package/dist/uts.d.ts

@@ -1,4 +1,5 @@
 import * as UTSCompiler from '@dcloudio/uni-uts-v1';
+import type { EasycomMatcher } from './easycom';
 /**
  * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
  * @param id
@@ -8,3 +9,4 @@ import * as UTSCompiler from '@dcloudio/uni-uts-v1';
 export declare function resolveUtsAppModule(id: string, importer: string): string | undefined;
 export declare function resolveUtsModule(id: string, importer: string): string | undefined;
 export declare function resolveUTSCompiler(): typeof UTSCompiler;
+export declare function initUTSComponents(inputDir: string, platform: UniApp.PLATFORM): EasycomMatcher[];

package/dist/uts.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUTSCompiler = exports.resolveUtsModule = exports.resolveUtsAppModule = void 0;
+exports.initUTSComponents = 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");
 /**
@@ -99,3 +100,65 @@ function resolveUTSCompiler() {
     return require(compilerPath);
 }
 exports.resolveUTSCompiler = resolveUTSCompiler;
+function initUTSComponents(inputDir, platform) {
+    const components = [];
+    if (platform !== 'app' && platform !== 'app-plus') {
+        return components;
+    }
+    const easycomsObj = Object.create(null);
+    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');
+        if (is_uni_modules_utssdk || is_ussdk) {
+            fast_glob_1.default
+                .sync('**/*.vue', {
+                cwd: dir,
+                absolute: true,
+            })
+                .forEach((file) => {
+                let name = parseVueComponentName(file);
+                if (!name) {
+                    if (file.endsWith('index.vue')) {
+                        name = path_1.default.basename(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
+                    }
+                }
+                if (name) {
+                    const importDir = (0, utils_1.normalizePath)(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
+                    easycomsObj[`^${name}$`] = `\0${importDir}?uts-proxy`;
+                }
+            });
+        }
+    });
+    Object.keys(easycomsObj).forEach((name) => {
+        components.push({
+            pattern: new RegExp(name),
+            replacement: easycomsObj[name],
+        });
+    });
+    return components;
+}
+exports.initUTSComponents = initUTSComponents;
+function resolveUTSComponentDirs(inputDir) {
+    const utssdkDir = path_1.default.resolve(inputDir, 'utssdk');
+    const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
+    return fast_glob_1.default
+        .sync('*', {
+        cwd: utssdkDir,
+        absolute: true,
+        onlyDirectories: true,
+    })
+        .concat(fast_glob_1.default.sync('*/utssdk', {
+        cwd: uniModulesDir,
+        absolute: true,
+        onlyDirectories: true,
+    }));
+}
+const nameRE = /name\s*:\s*['|"](.*)['|"]/;
+function parseVueComponentName(file) {
+    const content = fs_1.default.readFileSync(file, 'utf8');
+    const matches = content.match(nameRE);
+    if (matches) {
+        return matches[1];
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3061420221219001",
+  "version": "3.0.0-alpha-3061520221220001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.19.6",
     "@babel/parser": "^7.19.6",
     "@babel/types": "^7.20.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3061420221219001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3061420221219001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3061520221220001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3061520221220001",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "devDependencies": {
-    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061420221219001",
+    "@dcloudio/uni-uts-v1": "3.0.0-alpha-3061520221220001",
     "@types/babel__core": "^7.1.19",
     "@types/debug": "^4.1.7",
     "@types/estree": "^0.0.51",