shoplazza-cli 1.0.5 → 1.0.6

package/bin/shoplazza

@@ -10,8 +10,7 @@ const report = require('../lib/report');
 require('../lib/tracing');
 
 const { makeCheckoutCommand } = require('../lib/checkout');
-
-const { generateExtension, deployExtension, publishExtension, buildExtension, retry } = require('../lib/app');
+const { initThemeAppCommand } = require('../lib/app');
 
 Sentry.init({
   dsn: 'https://89964605acaf4db8839f2d5237396d6c@sentry.shoplazza.com/730',
@@ -113,21 +112,11 @@ theme
   .option('-t, --theme <theme>', 'The ID of the theme that you want to delete.')
   .action(require('../lib/commands/theme/delete'));
 
-const app = program.command('app').description('Shoplazza app extensions cli');
-
-app.command('generate').command('extension').description('Generate your extension').action(generateExtension);
-app.command('deploy').command('extension').description('Deploy your extension to cdn').action(deployExtension);
-app.command('publish').command('extension').description('Publish your extension').action(publishExtension);
-app.command('build').description('Build your extension').action(buildExtension);
-app
-  .command('retry')
-  .description('Retry to do some tasks.')
-  .option('-p, --partner', 'Retry get and choose your partner list.')
-  .option('-a, --app', 'Retry get and choose your app list.')
-  .action(retry);
 
 // checkout cli
 makeCheckoutCommand(program);
+// theme app cli
+initThemeAppCommand(program);
 
 program.parse(process.argv);
 !program.args.length && program.help();

package/lib/app/api/api.js

@@ -0,0 +1,93 @@
+const { get, post, put, del, patch } = require('./request');
+
+/**
+ * 获取主题列表
+ */
+async function getThemeList() {
+  return get('/themes');
+}
+
+/**
+ * 获取店铺私有主题插件列表
+ * @returns
+ */
+async function getThemeAppList() {
+  return [
+    {
+      name: '主题插件1',
+      version: '1.0.0',
+      description: '主题插件1的描述'
+    },
+    {
+      name: '主题插件2',
+      version: '2.0.0',
+      description: '主题插件2的描述'
+    },
+    {
+      name: '主题插件3',
+      version: '3.0.0',
+      description: '主题插件3的描述'
+    }
+  ];
+  // return get('/theme-extensions');
+}
+
+/**
+ * 创建主题插件
+ */
+async function toCreateThemeApp(data) {
+  return put('/theme-extensions', data);
+}
+
+/**
+ * 上传主题插件
+ */
+async function toUploadThemeApp(data) {
+  return patch(`theme-extensions/${data.appId}/dev-doctree`, data);
+}
+
+/**
+ * 获取任务状态
+ */
+async function getTaskStatus(data) {
+  return get(`/theme-extensions/version-tasks/${data.taskId}`);
+}
+
+/**
+ * 获取主题插件版本列表
+ */
+async function getThemeAppVersionList(data) {
+  return [
+    { version: '1.0.0', date: '2023-01-01', description: 'Initial release' },
+    { version: '1.1.0', date: '2023-02-01', description: 'Added new features and bug fixes' },
+    { version: '1.2.0', date: '2023-03-01', description: 'Fixed bugs and improved performance' },
+    { version: '1.3.0', date: '2023-04-01', description: 'Optimized performance and added new features' },
+    { version: '1.4.0', date: '2023-05-01', description: 'Fixed bugs and improved user experience' }
+  ];
+  // return get(`/theme-extensions/:${data.appId}/versions`);
+}
+
+/**
+ * 创建主题插件版本
+ */
+async function toCreateThemeAppVersion(data) {
+  return post(`/theme-extensions/version-tasks`, data);
+}
+
+/**
+ * 部署主题插件
+ */
+async function toDeployThemeApp(data) {
+  return post(`theme-extensions/publications`, data);
+}
+
+module.exports = {
+  getThemeList,
+  getThemeAppList,
+  toCreateThemeApp,
+  toUploadThemeApp,
+  getThemeAppVersionList,
+  toCreateThemeAppVersion,
+  toDeployThemeApp,
+  getTaskStatus
+};

package/lib/app/api/request.js

@@ -0,0 +1,72 @@
+const instance = require('../../openAPI/index');
+
+/**
+ * 基础的 API 请求方法
+ * @param {string} method 请求方法 (GET, POST, PUT, DELETE)
+ * @param {string} url 请求的路径
+ * @param {Object} data 请求的数据（适用于 POST、PUT）
+ * @param {Object} params 请求的 URL 参数（适用于 GET）
+ */
+async function request({ method, url, data, params }) {
+  const response = await instance({
+    method,
+    url,
+    data,
+    params
+  });
+  return response; // 返回请求结果
+}
+
+/**
+ * GET 请求封装
+ * @param {string} url 请求的路径
+ * @param {Object} params 请求的 URL 参数
+ */
+async function get(url, params) {
+  return request({ method: 'get', url, params });
+}
+
+/**
+ * POST 请求封装
+ * @param {string} url 请求的路径
+ * @param {Object} data 请求的数据
+ */
+async function post(url, data) {
+  return request({ method: 'post', url, data });
+}
+
+/**
+ * PUT 请求封装
+ * @param {string} url 请求的路径
+ * @param {Object} data 请求的数据
+ */
+async function put(url, data) {
+  return request({ method: 'put', url, data });
+}
+
+/**
+ * DELETE 请求封装
+ * @param {string} url 请求的路径
+ * @param {Object} params 请求的 URL 参数
+ */
+async function del(url, params) {
+  return request({ method: 'delete', url, params });
+}
+
+/**
+ * PATCH 请求封装
+ * @param {string} url 请求的路径
+ * @param {Object} data 请求的数据
+ */
+async function patch(url, data) {
+  return request({ method: 'patch', url, data });
+}
+
+
+module.exports = {
+  get,
+  post,
+  put,
+  del,
+  patch
+};

package/lib/app/commands/build.js

@@ -1,66 +1,87 @@
 const chalk = require('chalk');
-const ora = require('ora');
-const fs = require('fs-extra');
+const inquirer = require('inquirer');
 const path = require('path');
+const { getThemeAppConfig, compareVersions } = require('../utils');
+const { getThemeAppVersionList, toCreateThemeAppVersion } = require('../api/api');
 
-const { zipTheme } = require('../../utils');
-const { line, done } = require('../log');
-const { buildThemeAssets } = require('../extensions/theme-app');
-
-const isFileExist = (path) => {
-  return fs.existsSync(path);
-};
-
-const clearManifest = async () => {
-  try {
-    if (isFileExist('./assets-manifest.json') && isFileExist('./assets')) {
-      const mainfest = JSON.parse(fs.readFileSync('./assets-manifest.json', { encoding: 'utf-8' }));
-      await Promise.all(
-        Object.values(mainfest).map((path) => {
-          if (isFileExist(path)) {
-            return fs.unlink(path);
-          }
-          return Promise.resolve(true);
-        })
-      );
-      await fs.unlink('./assets-manifest.json');
+async function createNewVersion(appId, version, description) {
+  const themeAppPath = path.resolve(WORKSPACE_PATH, 'theme-app');
+  const { zipPath, zipName } = await compress(themeAppPath);
+  const zipOssUrl = await uploadOss(zipPath, zipName);
+  const taskId = await toCreateThemeAppVersion({
+    extension_id: appId,
+    version,
+    description,
+    resource_url: zipOssUrl
+  });
+  while (true) {
+    const res = await getTaskStatus({ taskId });
+    if (res.data?.task?.state === 1) {
+      console.log(chalk.green(`[SUCCESS] Theme app pushed successfully.`));
+      break;
+    } else if (res.data?.task?.state === 2) {
+      console.error(chalk.red(`[ERROR] Theme app push failed: ${res.data?.task?.error_message}`));
+      break;
+    } else {
+      console.log(chalk.yellow(`[WAITING] Theme app push in progress...`));
+      await new Promise((resolve) => setTimeout(resolve, 1000));
     }
-    return true;
-  } catch (e) {
-    console.log(e);
   }
-};
+}
 
-const getZipName = () => {
-  return path.basename(process.cwd());
-};
+/**
+ * 交互式命令行
+ */
+async function usePrompt() {
+  const versionList = await getThemeAppVersionList();
+  const latestVersion = versionList[versionList.length - 1];
 
-const generateZip = async (name) => {
-  const zipPath = `${process.cwd()}/${name}.zip`;
-  isFileExist(zipPath) && (await fs.unlink(zipPath));
-  zipTheme(process.cwd(), name);
-};
+  console.log(
+    chalk.cyanBright(`\n🔍 Latest version: `) +
+      chalk.yellow(`${latestVersion.version} `) +
+      chalk.white(`(${latestVersion.description})`) +
+      chalk.gray(` [Released on: ${latestVersion.date}]`)
+  );
+
+  return inquirer.prompt([
+    {
+      type: 'input',
+      name: 'newVersion',
+      message: 'Enter the new version number:',
+      validate: (newVersion) => {
+        if (!/^[0-9]+\.[0-9]+\.[0-9]+$/.test(newVersion)) {
+          return chalk.red('❌ Version must follow the format X.Y.Z (e.g., 1.0.0).');
+        }
+        if (compareVersions(newVersion, latestVersion.version) !== 1) {
+          return chalk.red('❌ Version must be greater than the latest version.');
+        }
+        return true;
+      }
+    },
+    {
+      type: 'input',
+      name: 'description',
+      message: 'Enter the description for this version:',
+      validate: (description) => {
+        if (!description.trim()) {
+          return chalk.red('❌ Description cannot be empty.');
+        }
+        return true;
+      }
+    }
+  ]);
+}
 
-const zipApp = async () => {
-  const spinner = ora(chalk.cyan('Building your app and generate zip package ...')).start();
+async function build() {
   try {
-    const zipName = getZipName();
-    await generateZip(zipName);
-    spinner.succeed(chalk.cyan(`Success to build your app and generate zip package: ${chalk.green(`${zipName}.zip`)}`));
-    return true;
-  } catch (e) {
-    spinner.fail(e.message);
+    const { appId } = await getThemeAppConfig();
+    const { newVersion, description } = await usePrompt();
+    await createNewVersion(appId, newVersion, description);
+  } catch (error) {
+    console.error(chalk.red(`[ERROR IN BUILD] ${error.message}`));
   }
-};
-
-const build = async () => {
-  line();
-  (await clearManifest()) && (await buildThemeAssets('./assets')) && (await zipApp());
-  done();
-  line();
-};
+}
 
 module.exports = {
-  build,
-  getZipName
+  build
 };

package/lib/app/commands/create.js

@@ -0,0 +1,100 @@
+const inquirer = require('inquirer');
+const path = require('path');
+const fsExtra = require('fs-extra');
+const chalk = require('chalk');
+const { WORKSPACE_PATH, THEME_APP_TYPE } = require('../utils/config');
+const { replacePlaceholders, renameFile } = require('../utils');
+
+/**
+ * 交互式命令行
+ */
+async function usePrompt() {
+  return await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'themeAppType',
+      message: 'Select theme app type:',
+      choices: [THEME_APP_TYPE.BASIC_APP.description, THEME_APP_TYPE.EMBEDS_APP.description],
+      prefix: '*'
+    },
+    {
+      type: 'input',
+      name: 'projectName',
+      message: 'Please enter the theme app project name:',
+      prefix: '*',
+      validate: (projectName) => {
+        if (!projectName.trim()) {
+          return 'Project name cannot be empty';
+        }
+        return true;
+      }
+    }
+  ]);
+}
+
+/**
+ * 初始化项目
+ */
+async function initProj(projectPath, projectName) {
+  // 替换占位符 key文件相对路径 value替换的内容
+  const replacementConfig = {
+    'package.json': { projectName },
+    'theme-app/blocks/index.liquid': { projectName },
+    'theme-app.config.json': { projectName }
+  };
+  for (const [filePath, replacements] of Object.entries(replacementConfig)) {
+    const fullPath = path.resolve(projectPath, filePath);
+    await replacePlaceholders(fullPath, replacements);
+  }
+
+  // 重命名文件
+  const filesToRename = ['assets/index.css', 'blocks/index.liquid', 'snippets/index.liquid'];
+  for (const file of filesToRename) {
+    const filePath = path.resolve(projectPath, 'theme-app', file);
+    await renameFile(filePath, `${projectName}${file.includes('snippets') ? '_snippet' : ''}`);
+  }
+}
+
+/**
+ * 控制台提示信息
+ */
+function consoleTips(projectName) {
+  console.log(chalk.green(`Theme app project "${projectName}" has been successfully created.`));
+  console.log(chalk.bold(`To get started:\n`));
+  console.log(`  ${chalk.cyan(`cd ${projectName}`)}`);
+  console.log(`  ${chalk.cyan(`npm start`)}\n`);
+  console.log(chalk.greenBright(`Happy coding! 🎉🎉🎉`));
+}
+
+/**
+ * 创建项目
+ */
+async function _create(themeAppDescription, projectName) {
+  const projectPath = path.resolve(WORKSPACE_PATH, projectName);
+  const projectExists = await fsExtra.pathExists(projectPath);
+
+  if (projectExists) {
+    throw new Error(`Project directory "${projectName}" already exists.`);
+  }
+  await fsExtra.ensureDir(projectPath);
+  const templatePath =
+    THEME_APP_TYPE.BASIC_APP.description === themeAppDescription
+      ? THEME_APP_TYPE.BASIC_APP.templatePath
+      : THEME_APP_TYPE.EMBEDS_APP.templatePath;
+  await fsExtra.copy(templatePath, projectPath);
+  await initProj(projectPath, projectName);
+  consoleTips(projectName);
+}
+
+async function create() {
+  try {
+    const { themeAppType, projectName } = await usePrompt();
+    await _create(themeAppType, projectName);
+  } catch (error) {
+    console.error(chalk.red(`[ERROR IN CREATE] ${error.message}`));
+  }
+}
+
+module.exports = {
+  create
+};