@optima-chat/commerce-cli 1.7.3 → 1.7.5

package/dist/commands/product/list.js

@@ -8,7 +8,7 @@ import { addEnhancedHelp } from '../../utils/helpText.js';
 const cmd = new Command('list')
     .description('List products with pagination and filtering options')
     .option('-l, --limit <number>', 'Products per page (default: 20)', '20')
-    .option('-o, --offset <number>', 'Offset for pagination (default: 0)', '0')
+    .option('-p, --page <number>', 'Page number (default: 1)', '1')
     .option('-s, --status <string>', 'Filter by status: active|inactive|draft|archived')
     .option('-c, --category-id <uuid>', 'Filter by category ID')
     .option('--search <keyword>', 'Search by keyword in title/description')
@@ -30,8 +30,8 @@ addEnhancedHelp(cmd, {
         '# List with custom limit',
         '$ commerce product list --limit 50',
         '',
-        '# List second page (offset pagination)',
-        '$ commerce product list --limit 20 --offset 20',
+        '# List second page',
+        '$ commerce product list --page 2',
         '',
         '# Filter by status',
         '$ commerce product list --status active',
@@ -59,10 +59,9 @@ addEnhancedHelp(cmd, {
                         stock_quantity: 100,
                     },
                 ],
-                total: 42,
+                total_count: 42,
                 page: 1,
                 per_page: 20,
-                offset: 0,
                 has_next: true,
             },
         }, null, 2),
@@ -74,8 +73,9 @@ addEnhancedHelp(cmd, {
         { command: 'category list', description: 'List categories for filtering' },
     ],
     notes: [
-        'Default pagination: limit=20, offset=0',
-        'Use offset for page navigation: page 2 = offset 20, page 3 = offset 40',
+        'Default pagination: limit=20, page=1',
+        'Use --page for navigation: --page 2, --page 3, etc.',
+        'total_count shows total products, has_next indicates more pages available',
         'Status values: active (live), inactive (hidden), draft (unpublished), archived',
         'Search looks in both title and description fields',
     ],
@@ -85,8 +85,8 @@ async function listProducts(options) {
     const spinner = output.spinner('正在获取商品列表...');
     try {
         const params = {
-            limit: parseInt(options.limit || '20', 10),
-            offset: parseInt(options.offset || '0', 10),
+            per_page: parseInt(options.limit || '20', 10),
+            page: parseInt(options.page || '1', 10),
         };
         if (options.status) {
             params.status = options.status;
@@ -109,9 +109,9 @@ async function listProducts(options) {
             if (output.isJson()) {
                 output.success({
                     products: [],
-                    total: 0,
-                    page: Math.floor(params.offset / params.limit) + 1,
-                    per_page: params.limit,
+                    total_count: 0,
+                    page: params.page,
+                    per_page: params.per_page,
                     has_next: false
                 }, '暂无商品');
             }
@@ -120,15 +120,16 @@ async function listProducts(options) {
             }
             return;
         }
+        const totalCount = result.total_count ?? result.total;
+        const hasNext = result.has_next ?? (totalCount > params.page * params.per_page);
         if (output.isJson()) {
             // JSON 模式：输出结构化数据
             output.success({
                 products: result.products,
-                total: result.total,
-                page: Math.floor(params.offset / params.limit) + 1,
-                per_page: params.limit,
-                offset: params.offset,
-                has_next: result.total > (params.offset + params.limit)
+                total_count: totalCount,
+                page: params.page,
+                per_page: params.per_page,
+                has_next: hasNext
             });
         }
         else {
@@ -136,12 +137,14 @@ async function listProducts(options) {
             console.log();
             console.log(formatProductList(result.products));
             // 显示分页信息
-            console.log(chalk.gray(`\n显示 ${params.offset + 1}-${Math.min(params.offset + params.limit, result.total)} / 共 ${result.total} 件商品`));
+            const startIndex = (params.page - 1) * params.per_page + 1;
+            const endIndex = Math.min(params.page * params.per_page, totalCount);
+            console.log(chalk.gray(`\n显示 ${startIndex}-${endIndex} / 共 ${totalCount} 件商品`));
             // 提示翻页
-            if (result.total > params.offset + params.limit) {
-                const nextOffset = params.offset + params.limit;
+            if (hasNext) {
+                const nextPage = params.page + 1;
                 console.log(chalk.gray(`下一页: `) +
-                    chalk.cyan(`commerce product list --limit ${params.limit} --offset ${nextOffset}`));
+                    chalk.cyan(`commerce product list --limit ${params.per_page} --page ${nextPage}`));
             }
             console.log();
         }

package/dist/commands/product/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/product/list.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/product/list.ts"],"names":[],"mappings":"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"}