@share-crm/sharedev-cli 0.0.4-rc.47-test.0 → 0.0.4-rc.48

package/dist/sharedev.js

@@ -13630,10 +13630,11 @@ Examples:
             await (0, pwc_command_ts_1.pwcPlaceholderCommand)(commandName);
         }));
     });
-    pwc.command('dev <filePath>')
+    pwc.command('dev [filePath]')
         .description('Start the local Beefly development server (output name defaults to the PWC apiName)')
         .option('--name <name>', 'Override the output bundle name (default: PWC resource apiName)')
         .option('--port <port>', 'Dev server port (default: Beefly default, usually 8080)')
+        .option('--all', 'Debug all local PWC resources (components + plugins) in one dev server')
         .action((0, command_ts_1.createCommandAction)('pwc', 'dev', runtimeContext, async ({ args, options, context }) => {
         await (0, pwc_command_ts_1.pwcDevCommand)(args[0], context, options);
     }));
@@ -17687,7 +17688,7 @@ exports.aplDebugCommand = aplDebugCommand;
 exports.aplPlaceholderCommand = aplPlaceholderCommand;
 const prompts_1 = __webpack_require__(29848);
 const logger_ts_1 = __webpack_require__(63333);
-const diff2_ts_1 = __webpack_require__(54444);
+const diff_ts_1 = __webpack_require__(27804);
 const apl_service_ts_1 = __webpack_require__(76869);
 const apl_workspace_ts_1 = __webpack_require__(20527);
 async function aplListCommand(_context, options = {}) {
@@ -17919,7 +17920,7 @@ async function aplDiffCommand(apiName, context, options = {}) {
                 : `remote@v${remoteVersion.actualVersion}`;
         }
     }
-    const diffResult = (0, diff2_ts_1.createLineDiff)(baseBody, target.localBody, {
+    const diffResult = (0, diff_ts_1.createLineDiff)(baseBody, target.localBody, {
         oldFileName: `${target.apiName}.groovy`,
         newFileName: `${target.apiName}.groovy`,
         oldHeader: baseLabel,
@@ -17927,7 +17928,7 @@ async function aplDiffCommand(apiName, context, options = {}) {
         oldGitPath: `${target.apiName}.groovy`,
         newGitPath: `${target.apiName}.groovy`
     });
-    const summary = (0, diff2_ts_1.summarizeDiff)(diffResult);
+    const summary = (0, diff_ts_1.summarizeDiff)(diffResult);
     if (!summary.changed) {
         logger_ts_1.loggerService.stopLoading();
         logger_ts_1.loggerService.success(`No changes for APL function ${target.apiName} (baseline: ${baseLabel}).`);
@@ -17935,7 +17936,7 @@ async function aplDiffCommand(apiName, context, options = {}) {
     }
     logger_ts_1.loggerService.stopLoading();
     logger_ts_1.loggerService.info(`APL diff ${target.apiName}: baseline=${baseLabel}, localVersion=${snapshot.version}, compareVersion=${actualVersion}, +${summary.additions} -${summary.deletions}`);
-    logger_ts_1.loggerService.printRaw((0, diff2_ts_1.renderUnifiedDiff)(diffResult));
+    logger_ts_1.loggerService.printRaw((0, diff_ts_1.renderUnifiedDiff)(diffResult));
 }
 async function aplPushCommand(apiName, context, options = {}) {
     const pushComment = options.remark?.trim();
@@ -20702,7 +20703,7 @@ async function aplDiffNewService(target, options = {}) {
         }
     }
     // 输出对比结果
-    const { createLineDiff, renderUnifiedDiff, summarizeDiff } = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 54444, 23));
+    const { createLineDiff, renderUnifiedDiff, summarizeDiff } = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 27804, 23));
     const diffResult = createLineDiff(baseBody, target.localBody, {
         oldFileName: `${target.apiName}.groovy`,
         newFileName: `${target.apiName}.groovy`,
@@ -40248,12 +40249,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isPublicObject = isPublicObject;
 exports.objectListService = objectListService;
 const logger_ts_1 = __webpack_require__(63333);
 const request_execute_command_paths_ts_1 = __webpack_require__(32351);
 const normalize_ts_1 = __importDefault(__webpack_require__(39268));
 const request_ts_1 = __webpack_require__(43176);
 const types_ts_1 = __webpack_require__(77480);
+const PUBLIC_OBJECT_VISIBLE_SCOPES = new Set(['public', 'public_big']);
+function isPublicObject(item) {
+    return PUBLIC_OBJECT_VISIBLE_SCOPES.has(item.visibleScope) && item.upstreamTenantId.length > 0;
+}
 const getObjectListFromExecute = async (queryType) => {
     if (queryType === null) {
         throw new Error('queryType is required');
@@ -40282,6 +40288,8 @@ const getObjectsFromPullResponse = async (response) => {
             apiName: normalize_ts_1.default.normalizeText(item.api_name),
             description: normalize_ts_1.default.normalizeText(item.description),
             defineType: normalize_ts_1.default.normalizeText(item.define_type),
+            visibleScope: normalize_ts_1.default.normalizeText(item.visible_scope),
+            upstreamTenantId: normalize_ts_1.default.normalizeText(item.upstream_tenant_id),
             createTime: normalize_ts_1.default.normalizeDateTime(item.create_time),
             lastModifiedTime: normalize_ts_1.default.normalizeDateTime(item.last_modified_time)
         })).filter(item => item.apiName);
@@ -40363,13 +40371,19 @@ async function objectPullService(shouldQueryAll, queryType = null, apiName, skip
     }
     else if (shouldQueryAll) {
         logger_ts_1.loggerService.startLoading('Fetching object apiName list...');
+        const skippedPublicApiNames = objectListResult.objects
+            .filter(obj => (0, object_list_ts_1.isPublicObject)(obj))
+            .map(obj => obj.apiName);
         try {
-            apiNamesList.push(...remoteApiNamesList);
+            apiNamesList.push(...remoteApiNamesList.filter(name => !skippedPublicApiNames.includes(name)));
         }
         finally {
             logger_ts_1.loggerService.stopLoading();
         }
         logger_ts_1.loggerService.info(`Fetched object apiName count: ${apiNamesList.length}`);
+        if (skippedPublicApiNames.length) {
+            logger_ts_1.loggerService.info(`Skipped public object count: ${skippedPublicApiNames.length}`);
+        }
     }
     // 50个分批拉取
     const apiNamesListGroups = apiNamesList.reduce((acc, item, index) => {
@@ -44897,57 +44911,111 @@ async function pwcInfoCommand(apiName, type) {
         throw error;
     }
 }
+/** 批量调试时扫描的资源类型：组件与插件都扫，宿主对两者都从同一端口取资源 */
+const PWC_DEV_ALL_TYPES = [pwc_types_ts_1.PWCType.Component, pwc_types_ts_1.PWCType.Plugin];
 /**
  * 启动 PWC 本地 Beefly 开发服务。
- * filePath 支持相对当前目录的路径和绝对路径，未提供时抛出参数错误。
- * 产物名默认取 PWC 资源 apiName（宿主按 <apiName>.js 取资源），可用 --name 覆盖。
- * 服务入口从 Beefly npm 依赖加载，并通过 configureWebpack 注入入口文件。
+ *
+ * 两种模式：
+ *  - 单资源：sharedev pwc dev <filePath> [--name <name>] [--port <port>]
+ *  - 批量：  sharedev pwc dev --all [--port <port>]
+ *
+ * 批量模式会同时扫描 pwc/components 与 pwc/plugins，合并为同一个 dev server 的多入口。
+ * 宿主对组件和插件都从固定端口（8080）取 <apiName>.js，因此两类资源必须挂在同一端口上，
+ * 分端口启动会导致宿主导不到另一类资源。
+ * 产物名默认取 PWC 资源 apiName，单资源模式可用 --name 覆盖。
+ * 服务入口从 Beefly npm 依赖加载。
  */
 async function pwcDevCommand(filePath, context, options = {}) {
     const normalizedFilePath = filePath?.trim();
-    if (!normalizedFilePath) {
-        throw new Error('Invalid arguments: use sharedev pwc dev <filePath>.');
-    }
-    const projectRoot = context.cwd;
-    const entryPath = node_path_1.default.isAbsolute(normalizedFilePath)
-        ? normalizedFilePath
-        : node_path_1.default.resolve(projectRoot, normalizedFilePath);
-    // 校验显式传入的 Beefly 入口文件，避免开发服务启动后才报告路径错误。
-    try {
-        const entryStat = await (0, file_ts_1.statPath)(entryPath);
-        if (!entryStat.isFile()) {
-            throw new Error(`PWC dev entry is not a file: ${entryPath}`);
+    const shouldQueryAll = options.all === true;
+    // 参数校验：--all 与 filePath 互斥；单资源模式 filePath 必填。
+    if (shouldQueryAll && normalizedFilePath) {
+        throw new Error('Invalid arguments: do not pass filePath when using --all.');
+    }
+    if (!shouldQueryAll && !normalizedFilePath) {
+        throw new Error('Invalid arguments: use sharedev pwc dev <filePath> or sharedev pwc dev --all.');
+    }
+    // 构建 webpack 多入口：key 为产物名（= apiName），value 为入口文件绝对路径。
+    const entry = {};
+    if (shouldQueryAll) {
+        // 批量模式：同时扫描 components 与 plugins，逐个解析入口文件后合并为多入口。
+        // 宿主对两类资源都从同一端口取 <apiName>.js，必须放进同一个 dev server。
+        const { entries, skipped } = await (0, pwc_workspace_ts_1.collectLocalPwcDevEntries)(context, PWC_DEV_ALL_TYPES);
+        if (!entries.length) {
+            throw new Error('No local PWC resource with a resolvable entry file found under pwc/components or pwc/plugins.');
+        }
+        for (const item of entries) {
+            entry[item.apiName] = item.entryPath;
+        }
+        // 按类型分组统计，便于确认组件与插件是否都已被纳入同一个 server
+        const summary = PWC_DEV_ALL_TYPES
+            .map((type) => {
+            const names = entries.filter((item) => item.type === type).map((item) => item.apiName);
+            return `${type}=${names.length}${names.length ? ` (${names.join(', ')})` : ''}`;
+        })
+            .join('; ');
+        logger_ts_1.loggerService.info(`PWC dev --all resolved ${entries.length} resource(s): ${summary}`);
+        if (skipped.length) {
+            logger_ts_1.loggerService.warn(`Skipped ${skipped.length} resource(s) without a resolvable entry file: ${skipped
+                .map((item) => `${item.type}/${item.apiName}`)
+                .join(', ')}`);
         }
     }
-    catch (error) {
-        if (error instanceof Error && error.message.startsWith('PWC dev entry is not a file:')) {
-            throw error;
+    else {
+        // 单资源模式：解析并校验显式传入的入口文件。
+        const projectRoot = context.cwd;
+        const entryPath = node_path_1.default.isAbsolute(normalizedFilePath)
+            ? normalizedFilePath
+            : node_path_1.default.resolve(projectRoot, normalizedFilePath);
+        try {
+            const entryStat = await (0, file_ts_1.statPath)(entryPath);
+            if (!entryStat.isFile()) {
+                throw new Error(`PWC dev entry is not a file: ${entryPath}`);
+            }
         }
-        throw new Error(`PWC dev entry file not found: ${entryPath}`);
-    }
-    // 产物名默认取 PWC 资源 apiName：宿主插件引擎按 <apiName>.js 到 dev server 取资源，
-    // 取入口文件名（通常 index.js）会产出 index.js，导致宿主请求 <apiName>.js 时 404。
-    const entryName = await (0, pwc_workspace_ts_1.resolvePwcDevEntryName)(entryPath, options.name);
-    const fallbackName = node_path_1.default.parse(entryPath).name;
-    if (entryName !== fallbackName) {
-        logger_ts_1.loggerService.info(`PWC dev entry name resolved to "${entryName}" (host loads <apiName>.js). Entry file: ${normalizedFilePath}`);
+        catch (error) {
+            if (error instanceof Error && error.message.startsWith('PWC dev entry is not a file:')) {
+                throw error;
+            }
+            throw new Error(`PWC dev entry file not found: ${entryPath}`);
+        }
+        // 产物名默认取 PWC 资源 apiName：宿主插件引擎按 <apiName>.js 到 dev server 取资源，
+        // 取入口文件名（通常 index.js）会产出 index.js，导致宿主请求 <apiName>.js 时 404。
+        const entryName = await (0, pwc_workspace_ts_1.resolvePwcDevEntryName)(entryPath, options.name);
+        const fallbackName = node_path_1.default.parse(entryPath).name;
+        if (entryName !== fallbackName) {
+            logger_ts_1.loggerService.info(`PWC dev entry name resolved to "${entryName}" (host loads <apiName>.js). Entry file: ${normalizedFilePath}`);
+        }
+        entry[entryName] = entryPath;
     }
-    logger_ts_1.loggerService.info(`Starting Beefly dev server with ${normalizedFilePath}`);
+    const outputNames = Object.keys(entry);
+    logger_ts_1.loggerService.info(shouldQueryAll
+        ? `Starting Beefly dev server for ${outputNames.length} entr${outputNames.length === 1 ? 'y' : 'ies'}`
+        : `Starting Beefly dev server with ${normalizedFilePath}`);
     const require = (0, node_module_1.createRequire)("file:///Users/dlxpq/work/fx/web-ide/packages/share-dev-cli/src/modules/pwc/pwc.command.ts");
-    const beefly = require('beefly');
+    let beefly;
+    try {
+        beefly = require('beefly');
+    }
+    catch {
+        logger_ts_1.loggerService.error('beefly@1.0.10 is required by "pwc dev" but is not installed on this machine, ' +
+            'and beefly has been unpublished from public npm registries. ' +
+            'Obtain the beefly tarball from the team (or an internal mirror) and install it globally to use "pwc dev".');
+        return;
+    }
     // 复用 Beefly 官方 API 启动 webpack dev server，入口名称决定预览产物名称。
     const server = await beefly.cli.dev({
         port: options.port,
         configureWebpack: {
-            entry: {
-                [entryName]: entryPath
-            }
+            entry
         }
     });
     const port = server.options?.port;
-    logger_ts_1.loggerService.success(`Beefly dev server started${port ? ` at http://localhost:${port}/${entryName}.js` : ''}.`);
+    const bundleList = outputNames.map((name) => `${name}.js`).join(', ');
+    logger_ts_1.loggerService.success(`Beefly dev server started${port ? ` at http://localhost:${port}/` : ''} serving: ${port ? bundleList : outputNames.join(', ')}.`);
     if (port) {
-        logger_ts_1.loggerService.info(`Open the host page with ?debug=1 to load this resource; add --name <name> to override the output name.`);
+        logger_ts_1.loggerService.info(`Open the host page with ?debug=1 to load these resources; add --name <name> to override the output name.`);
     }
 }
 async function pwcPlaceholderCommand(commandName) {
@@ -46072,6 +46140,7 @@ exports.readLocalPwcUploadBundle = readLocalPwcUploadBundle;
 exports.resolveFileTreeRelativePath = resolveFileTreeRelativePath;
 exports.resolvePwcDevEntryName = resolvePwcDevEntryName;
 exports.writePwcComponent = writePwcComponent;
+exports.collectLocalPwcDevEntries = collectLocalPwcDevEntries;
 const node_path_1 = __importDefault(__webpack_require__(76760));
 const fast_xml_parser_1 = __webpack_require__(94603);
 const file_ts_1 = __webpack_require__(85409);
@@ -46297,6 +46366,88 @@ async function writePwcComponent(context, component) {
     });
     return componentRoot;
 }
+/**
+ * 将单个本地 PWC 资源的 mateXml.xml 解析为调试入口。
+ * 入口文件取 source/<entryFileName>（entryFileName 来自 mateXml，通常 index.js / index.vue）；
+ * 若 mateXml 未声明或文件缺失，则回退到 source/index.js、source/index.vue、source/index.ts 探测。
+ */
+async function resolveLocalPwcDevEntry(type, componentRoot) {
+    const sourceDir = node_path_1.default.join(componentRoot, 'source');
+    if (!(await (0, file_ts_1.pathExists)(sourceDir))) {
+        return undefined;
+    }
+    const apiName = node_path_1.default.basename(componentRoot);
+    let entryFileName = '';
+    const mateXmlPath = node_path_1.default.join(componentRoot, 'mateXml.xml');
+    if (await (0, file_ts_1.pathExists)(mateXmlPath)) {
+        try {
+            entryFileName = resolveMateXmlInfo(type, await (0, file_ts_1.readTextFile)(mateXmlPath)).entryFileName.trim();
+        }
+        catch {
+            // mateXml 解析失败时走文件名探测兜底
+            entryFileName = '';
+        }
+    }
+    const candidates = [
+        ...(entryFileName ? [entryFileName] : []),
+        'index.js',
+        'index.vue',
+        'index.ts',
+        'index.jsx',
+        'index.tsx'
+    ];
+    for (const candidate of candidates) {
+        const entryPath = node_path_1.default.join(sourceDir, candidate);
+        try {
+            const entryStat = await (0, file_ts_1.statPath)(entryPath);
+            if (entryStat.isFile()) {
+                return {
+                    apiName,
+                    type,
+                    entryPath,
+                    entryRelativePath: node_path_1.default.relative(componentRoot, entryPath).split(node_path_1.default.sep).join('/')
+                };
+            }
+        }
+        catch {
+            // 该候选不存在，继续尝试下一个
+        }
+    }
+    return undefined;
+}
+/**
+ * 扫描本地工作区下指定类型（component/plugin）的全部 PWC 资源并解析调试入口。
+ * 传入多个类型时会一并扫描并合并结果——宿主对组件与插件都从同一个端口取资源，
+ * 因此 sharedev pwc dev --all 必须能把两类资源放进同一个 dev server。
+ * 无入口文件的资源会被跳过并在 skipped 中返回，由调用方提示用户。
+ */
+async function collectLocalPwcDevEntries(context, types) {
+    const targetTypes = Array.isArray(types) ? types : [types];
+    const entries = [];
+    const skipped = [];
+    const { readdir } = await Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 59031));
+    for (const type of targetTypes) {
+        const rootDir = node_path_1.default.join(resolveProjectRoot(context), getPwcWorkspaceRootDir(type));
+        if (!(await (0, file_ts_1.pathExists)(rootDir))) {
+            continue;
+        }
+        const dirEntries = await readdir(rootDir, { withFileTypes: true });
+        const apiNames = dirEntries
+            .filter((entry) => entry.isDirectory())
+            .map((entry) => entry.name)
+            .sort((a, b) => a.localeCompare(b));
+        for (const apiName of apiNames) {
+            const resolved = await resolveLocalPwcDevEntry(type, node_path_1.default.join(rootDir, apiName));
+            if (resolved) {
+                entries.push(resolved);
+            }
+            else {
+                skipped.push({ apiName, type });
+            }
+        }
+    }
+    return { entries, skipped };
+}
 
 
 /***/ },
@@ -48998,7 +49149,7 @@ async function executeWorkflowDefShareCli(commandPath, data, others) {
 
 /***/ },
 
-/***/ 54444
+/***/ 27804
 (__unused_webpack_module, exports, __webpack_require__) {
 
 
@@ -49510,8 +49661,8 @@ async function readCliPackageMeta() {
             ? "@share-crm/sharedev-cli".trim()
             : '@share-crm/sharedev-cli';
         const debugEnabled =  true && Boolean(false);
-        const rawVersion = ( true && "0.0.4-rc.47-test.0".trim())
-            ? "0.0.4-rc.47-test.0".trim()
+        const rawVersion = ( true && "0.0.4-rc.48".trim())
+            ? "0.0.4-rc.48".trim()
             : '0.0.0';
         const version = rawVersion + (debugEnabled ? '-debug' : '');
         return { name, version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@share-crm/sharedev-cli",
-  "version": "0.0.4-rc.47-test.0",
+  "version": "0.0.4-rc.48",
   "private": false,
   "description": "sharedev command line tool",
   "type": "module",
@@ -33,7 +33,6 @@
     "@clack/prompts": "^1.1.0",
     "@mariozechner/pi-coding-agent": "^0.62.0",
     "axios": "~1.13.0",
-    "beefly": "1.0.10",
     "chalk": "^5.6.2",
     "commander": "^14.0.1",
     "extract-zip": "^2.0.1",
@@ -43,6 +42,9 @@
     "ora": "^9.3.0",
     "terser-webpack-plugin": "^5.6.1"
   },
+  "optionalDependencies": {
+    "beefly": "1.0.10"
+  },
   "devDependencies": {
     "@types/extract-zip": "^2.0.3",
     "@types/fs-extra": "^11.0.4",