shoplazza-cli 1.0.6 → 1.0.7-beta.2

package/lib/app/commands/serve.js

@@ -1,36 +1,35 @@
-const path = require('path');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
-const { STORE_DOMAIN, THEME_APP_PATH, EXCHANGE_TOKEN } = require('../utils/config');
-const { compress, getThemeAppConfig, setThemeAppConfig } = require('../utils');
-const { toCreateThemeApp, toUploadThemeApp, getTaskStatus, getThemeList } = require('../api/api');
-const { initWatcher } = require('../../utils');
+const fsExtra = require('fs-extra');
+const ora = require('ora');
+const { STORE_DOMAIN, THEME_APP_DIR_PATH, EXCHANGE_TOKEN } = require('../utils/config');
+const { compress, getThemeExtensionConfig, setThemeExtensionConfig, getFileInfo } = require('../utils');
+const {
+  toCreateThemeApp,
+  toUploadThemeApp,
+  getTaskStatus,
+  getThemeList,
+  toCreateFile,
+  toUpdateFile,
+  toDeleteFile
+} = require('../api');
+const { watchWorkspace } = require('../../utils/utils');
 const { useOss } = require('../../oss');
 
-/**
- * 模拟上传文件到服务器
- */
-async function uploadFileToServer(filePath) {
-  console.log(chalk.blue(`[UPLOAD] ${filePath} - Uploading to server...`));
-  // TODO: 替换为实际的上传逻辑（例如调用后端 API 或 WebSocket 通信）
-  await new Promise((resolve) => setTimeout(resolve, 1000)); // 模拟网络延迟
-  console.log(chalk.green(`[SUCCESS] ${filePath} - Uploaded successfully.`));
-}
-
 /**
  * 控制台提示信息
  */
-function consoleTips(selectedThemeId, appId) {
+function consoleTips(selectedThemeId, extensionId) {
   console.log(`\n======================================PREVIEW URLS======================================`);
   console.log(chalk.cyan.bold('🔗 Admin Preview URL:'));
   console.log(
-    chalk.blueBright(`  https://${STORE_DOMAIN}/admin/card?theme_id=${selectedThemeId}&ext_debug=${appId}\n`)
+    chalk.blueBright(`  https://${STORE_DOMAIN}/admin/card?theme_id=${selectedThemeId}&ext_debug=${extensionId}\n`)
   );
   console.log(chalk.cyan.bold('🔗 Storefront Preview URL:'));
-  console.log(chalk.blueBright(`  https://${STORE_DOMAIN}?preview_theme_id=${selectedThemeId}&ext_debug[]=${appId}\n`));
+  console.log(chalk.blueBright(`  https://${STORE_DOMAIN}?preview_theme_id=${selectedThemeId}&ext_debug=${extensionId}\n`));
   console.log(`=====================================WATCHER RUNNING=====================================`);
   console.log(chalk.green(`🎉 File watcher is now running!`));
-  console.log(chalk.green(`📂 Watching directory:`), chalk.blue(THEME_APP_PATH));
+  console.log(chalk.green(`📂 Watching directory:`), chalk.blue(THEME_APP_DIR_PATH));
   console.log(chalk.green(`✨ You can make changes to your files, and they will be processed automatically.`));
   console.log(chalk.green(`🚀 Press Ctrl+C to stop.\n`));
 }
@@ -38,33 +37,42 @@ function consoleTips(selectedThemeId, appId) {
 /**
  * 同步本地代码到远程服务器
  */
-async function syncLocalFiles(appId) {
-  const { zipPath, zipName } = await compress(THEME_APP_PATH);
+async function syncLocalFiles(extensionId) {
+  const spinner = ora('Start synchronizing local files to remote...').start();
+  const { zipPath, zipName } = await compress(THEME_APP_DIR_PATH);
   const { uploadOss } = useOss(
     EXCHANGE_TOKEN,
     STORE_DOMAIN,
     `✗ No store found. Please run ${chalk.cyan('shoplazza login')} to login to a specific store.`
   );
   const zipOssUrl = await uploadOss(zipPath, zipName);
-  const res = await toUploadThemeApp({
-    extension_id: appId,
+  // 上传完成删除压缩包
+  fsExtra.removeSync(zipPath);
+  const res = await toUploadThemeApp(extensionId, {
     resource_url: zipOssUrl
   });
   const taskId = res.data?.task_id;
-  // 轮询查看任务是否完成
-  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));
-    }
+  if (!taskId) {
+    spinner.fail(chalk.red(`Failed to synchronize local files to remote location!`));
+    throw new Error('taskId is required');
   }
+  // 轮询查看任务是否完成
+  return new Promise((resolve, reject) => {
+    const timer = setInterval(async () => {
+      const res = await getTaskStatus({ taskId });
+      if (res.data?.state === 1) {
+        clearInterval(timer);
+        spinner.succeed(chalk.green(`Successfully synchronized local files to remote location!`));
+        resolve();
+      } else if (res.data?.state === 2) {
+        clearInterval(timer);
+        spinner.fail(chalk.red(`Failed to synchronize local files to remote location!`));
+        reject(new Error(res.data?.message));
+      } else {
+        spinner.text = chalk.blue(`[WAITING] Synchronizing local files to remote...`);
+      }
+    }, 1000);
+  });
 }
 
 /**
@@ -81,7 +89,8 @@ async function usePrompt() {
       choices: themeList.map((theme) => ({
         name: theme.name,
         value: theme.id
-      }))
+      })),
+      loop: false
     }
   ]);
   return selectedThemeId;
@@ -90,26 +99,71 @@ async function usePrompt() {
 /**
  * 创建主题插件
  */
-async function createThemeApp(appName) {
-  const res = await toCreateThemeApp({
-    title: appName
+async function createThemeApp(themeExtensionConfig) {
+  const data = {
+    title: themeExtensionConfig.extensionName || '' // 插件显示名称
+  };
+  if (themeExtensionConfig.extensionId) {
+    data.extension_id = themeExtensionConfig.extensionId;
+  }
+  const res = await toCreateThemeApp(data);
+  const extensionId = res.data?.extension_id;
+  await setThemeExtensionConfig({ extensionId });
+  return extensionId;
+}
+
+/**
+ * 启动监听
+ */
+function startWatcher(extensionId) {
+  const ACTION_MAP = {
+    ADD: 'add',
+    CHANGE: 'change',
+    DELETE: 'delete'
+  };
+  const actionToApiMap = {
+    [ACTION_MAP.ADD]: toCreateFile,
+    [ACTION_MAP.CHANGE]: toUpdateFile,
+    [ACTION_MAP.DELETE]: toDeleteFile
+  };
+  const funcCache = {};
+  const handleFileChange = (action) => {
+    if (funcCache[action]) {
+      return funcCache[action];
+    }
+    const func = (filePath) => {
+      const { fileName, parentDirName } = getFileInfo(filePath);
+      const data = {
+        type: parentDirName,
+        location: fileName
+      };
+      if ([ACTION_MAP.CHANGE, ACTION_MAP.ADD].includes(action)) {
+        data.content = fsExtra.readFileSync(filePath, 'utf-8');
+      }
+      actionToApiMap[action](extensionId, data);
+    };
+    funcCache[action] = func;
+    return func;
+  };
+  watchWorkspace(THEME_APP_DIR_PATH, {
+    onAdd: handleFileChange(ACTION_MAP.ADD),
+    onChange: handleFileChange(ACTION_MAP.CHANGE),
+    onDelete: handleFileChange(ACTION_MAP.DELETE),
+    ignored: '**/assets-manifest.json',
   });
-  const appId = res.data?.extension_id;
-  // QQQ1
-  await setThemeAppConfig({ appId });
-  return appId;
 }
 
 async function serve() {
   try {
-    let { appId, appName } = await getThemeAppConfig();
-    // if (!appId) {
-    //   appId = createThemeApp(appName);
-    // }
-    // await syncLocalFiles(appId);
+    const themeExtensionConfig = await getThemeExtensionConfig();
+    let extensionId = themeExtensionConfig.extensionId;
+    if (!extensionId) {
+      extensionId = await createThemeApp(themeExtensionConfig);
+    }
+    await syncLocalFiles(extensionId);
     const selectedThemeId = await usePrompt();
-    initWatcher(THEME_APP_PATH);
-    consoleTips(selectedThemeId, appId);
+    startWatcher(extensionId);
+    consoleTips(selectedThemeId, extensionId);
   } catch (error) {
     console.error(chalk.red(`[ERROR IN SERVE] ${error.message}`));
   }

package/lib/app/commands/versions.js

@@ -1,38 +1,49 @@
 const chalk = require('chalk');
-const ora = require('ora');
-const { getThemeAppConfig, renderTable } = require('../utils');
-const { getThemeAppVersionList } = require('../api/api');
+const { getThemeExtensionConfig, renderTable } = require('../utils');
+const { getThemeAppVersionList } = require('../api');
 
 /**
  * 控制台提示
  */
 function consoleTips(versionList) {
-  console.log(chalk.green('\n📜 Available Versions:'));
-  console.log(
-    renderTable(versionList, [
-      {
-        label: 'Version',
-        filed: 'version',
-        color: 'yellowBright'
-      },
-      {
-        label: 'Date',
-        filed: 'date',
-        color: 'blackBright'
-      },
-      {
-        label: 'Description',
-        filed: 'description',
-        color: 'whiteBright'
-      }
-    ])
-  );
+  if (versionList.length) {
+    const tempVersionList = versionList.map((item) => ({
+      ...item,
+      composeVersion: item.published === 1 ? `${item.version}(published)` : item.version
+    }));
+    console.log(chalk.green('\n📜 Available Versions:'));
+    console.log(
+      renderTable(tempVersionList, [
+        {
+          label: 'Version',
+          filed: 'composeVersion',
+          color: 'yellowBright'
+        },
+        {
+          label: 'CreateTime',
+          filed: 'created_at',
+          color: 'blackBright'
+        },
+        {
+          label: 'Description',
+          filed: 'exts',
+          color: 'whiteBright'
+        }
+      ])
+    );
+  } else {
+    console.log(chalk.green('Your current theme extension does not have an available version.'));
+  }
 }
 
 async function versions() {
   try {
-    const { appId } = await getThemeAppConfig();
-    const versionList = await getThemeAppVersionList({ appId });
+    const { extensionId } = await getThemeExtensionConfig();
+    if (!extensionId) {
+      throw new Error('ExtensionId is empty, please use `serve` command first.');
+    }
+    const res = await getThemeAppVersionList(extensionId);
+    const versionList = res.data?.data || [];
     consoleTips(versionList);
   } catch (error) {
     console.error(chalk.red(`[ERROR IN VERSIONS] ${error.message}`));

package/lib/app/index.js

@@ -1,23 +1,27 @@
 function initThemeAppCommand(_program) {
-  const program = _program.command('app').description('Shoplazza app CLI');
+  const program = _program.command('te').alias('theme_extension').description('Shoplazza theme extension CLI');
 
-  program.command('create').description('Create a new theme app').action(require('./commands/create').create);
+  program.command('create').description('Create a new theme extension').action(require('./commands/create').create);
 
   program
     .command('serve')
-    .description('Start a local development server for the theme app')
+    .description('Start a local development server for the theme extension')
     .action(require('./commands/serve').serve);
 
-  program.command('build').description('Build the theme app for production').action(require('./commands/build').build);
+  program.command('build').description('Build the theme extension for production').action(require('./commands/build').build);
 
   program
     .command('versions')
-    .description('List all versions of the theme app')
+    .description('List all versions of the theme extension')
     .action(require('./commands/versions').versions);
 
-  program.command('deploy').description('Deploy the theme app').action(require('./commands/deploy').deploy);
+  program.command('deploy').description('Deploy the theme extension').action(require('./commands/deploy').deploy);
 
-  program.command('list').description('List all theme apps').action(require('./commands/list').list);
+  program.command('list').description('List all theme extensions').action(require('./commands/list').list);
+
+  program.command('connect').description('Establish a connection between the theme extension and the shoplazza app').action(require('./commands/connect').connect);
+
+  program.command('release').description('Release a theme extension version to be applied in the shoplazza app').action(require('./commands/release').release);
 }
 
 module.exports = {

package/lib/app/template/basic-app/README.md

@@ -19,7 +19,7 @@ npm install -g shoplazza-cli
 创建主题插件项目模版
 
 ```bash
-shoplazza app create
+shoplazza te create
 ```
 
 ---
@@ -37,7 +37,7 @@ npm start
 或者
 
 ```bash
-shoplazza app serve
+shoplazza te serve
 ```
 
 ### `build`
@@ -51,7 +51,7 @@ npm run build
 或者
 
 ```bash
-shoplazza app build
+shoplazza te build
 ```
 
 ### `deploy`
@@ -65,7 +65,7 @@ npm run deploy
 或者
 
 ```bash
-shoplazza app deploy
+shoplazza te deploy
 ```
 
 ### `versions`
@@ -79,6 +79,20 @@ npm run versions
 或者
 
 ```bash
-shoplazza app versions
+shoplazza te versions
+```
+
+### `list`
+
+查询店铺的私有主题插件列表
+
+```bash
+npm run list
+```
+
+或者
+
+```bash
+shoplazza te list
 ```
 

package/lib/app/template/basic-app/extension.config.json

@@ -0,0 +1,4 @@
+{
+  "extensionId": "",
+  "extensionName": "{{projectName}}"
+}

package/lib/app/template/basic-app/package.json

@@ -1,13 +1,14 @@
 {
   "name": "{{projectName}}",
   "version": "1.0.0",
-  "description": "theme basic app",
+  "description": "theme basic extension",
   "main": "null",
   "scripts": {
-    "start": "shoplazza app serve",
-    "build": "shoplazza app build",
-    "deploy": "shoplazza app deploy",
-    "versions": "shoplazza app versions"
+    "start": "shoplazza te serve",
+    "build": "shoplazza te build",
+    "deploy": "shoplazza te deploy",
+    "versions": "shoplazza te versions",
+    "list": "shoplazza te list"
   },
   "keywords": [],
   "author": "",

package/lib/app/template/basic-app/theme-app/assets/index.css

@@ -1,4 +1,4 @@
-/* css code */
 .container {
-  color: red;
+  color: #da534d;
+  text-align: center;
 }

package/lib/app/template/basic-app/theme-app/assets-manifest.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/blocks/index.liquid

@@ -1,13 +1,15 @@
+{% use "{{projectName}}.css" %}
+
 <div id="{{projectName}}" class="container">
-  <p>Hello world</p>
+  <h1>{{ 'i18n.initial.title' | t }}</h1>
+  {% include "{{projectName}}" %}
 </div>
-{% include "{{projectName}}_snippet" %}
 
 {% schema %} 
 {
   "name": {
-    "en-US": "default name",
-    "zh-CN": "默认名称"
+    "en-US": "{{projectName}}(dev)",
+    "zh-CN": "{{projectName}}(开发)"
   },
   "settings": []
 }

package/lib/app/template/basic-app/theme-app/locales/ar-SA.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/de-DE.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/en-US.json

@@ -0,0 +1,6 @@
+{
+  "initial":{
+    "title": "SHOPLAZZA THEME EXTENSION",
+    "sub_title": "BASIC TYPE"
+  }
+}

package/lib/app/template/basic-app/theme-app/locales/es-ES.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/fr-FR.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/id-ID.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/it-IT.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/ja-JP.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/ko-KR.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/nl-NL.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/pl-PL.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/pt-PT.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/ru-RU.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/th-TH.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/locales/zh-CN.json

@@ -0,0 +1,6 @@
+{
+  "initial": {
+    "title": "SHOPLAZZA 主题插件",
+    "sub_title": "BASIC 类型"
+  }
+}

package/lib/app/template/basic-app/theme-app/locales/zh-TW.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/snippets/index.liquid

@@ -1,5 +1,5 @@
 <div>
-    Shoplazza theme APP
+    <h3>{{ 'i18n.initial.sub_title' | t }}</h3>
 </div>
 
 

package/lib/app/template/embed-app/README.md

@@ -19,7 +19,7 @@ npm install -g shoplazza-cli
 创建主题插件项目模版
 
 ```bash
-shoplazza app create
+shoplazza te create
 ```
 
 ---
@@ -37,7 +37,7 @@ npm start
 或者
 
 ```bash
-shoplazza app serve
+shoplazza te serve
 ```
 
 ### `build`
@@ -51,12 +51,12 @@ npm run build
 或者
 
 ```bash
-shoplazza app build
+shoplazza te build
 ```
 
 ### `deploy`
 
-部署正式版本的主题插件（部署后插件在店铺的主题编辑器的app列表中可见）
+部署正式版本的主题插件
 
 ```bash
 npm run deploy
@@ -65,7 +65,7 @@ npm run deploy
 或者
 
 ```bash
-shoplazza app deploy
+shoplazza te deploy
 ```
 
 ### `versions`
@@ -79,6 +79,19 @@ npm run versions
 或者
 
 ```bash
-shoplazza app versions
+shoplazza te versions
 ```
 
+### `list`
+
+查询店铺的私有主题插件列表
+
+```bash
+npm run list
+```
+
+或者
+
+```bash
+shoplazza te list
+```

package/lib/app/template/embed-app/extension.config.json

@@ -0,0 +1,4 @@
+{
+  "extensionId": "",
+  "extensionTitle": "{{projectName}}"
+}

package/lib/app/template/embed-app/package.json

@@ -1,13 +1,14 @@
 {
   "name": "{{projectName}}",
   "version": "1.0.0",
-  "description": "theme embed app",
+  "description": "theme embed extension",
   "main": "null",
   "scripts": {
-    "start": "shoplazza app serve",
-    "build": "shoplazza app build",
-    "deploy": "shoplazza app deploy",
-    "versions": "shoplazza app versions"
+    "start": "shoplazza te serve",
+    "build": "shoplazza te build",
+    "deploy": "shoplazza te deploy",
+    "versions": "shoplazza te versions",
+    "list": "shoplazza te list"
   },
   "keywords": [],
   "author": "",

package/lib/app/template/embed-app/theme-app/assets-manifest.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/embed-app/theme-app/blocks/index.liquid

@@ -1,14 +1,17 @@
+{% include "{{projectName}}_css" %}
+
 <div id="{{projectName}}" class="container">
-  <p>Hello world</p>
+  <h1>{{ 'i18n.initial.title' | t }}</h1>
+  {% include "{{projectName}}" %}
 </div>
-{% include "{{projectName}}_snippet" %}
 
 {% schema %} 
 {
   "name": {
-    "en-US": "default name",
-    "zh-CN": "默认名称"
+    "en-US": "{{projectName}}(dev)",
+    "zh-CN": "{{projectName}}(开发)"
   },
+  "icon":"https://assets.shoplazza.com/oss/operation/a425c6e10e32f87a1e7271c9ed9347d8.svg",
   "target":"body",
   "settings": []
 }

package/lib/app/template/embed-app/theme-app/locales/ar-SA.json

@@ -1,3 +1 @@
-{
-  "general": {}
-}
+{}

package/lib/app/template/embed-app/theme-app/locales/de-DE.json

@@ -1,3 +1 @@
-{
-  "general": {}
-}
+{}

package/lib/app/template/embed-app/theme-app/locales/en-US.json

@@ -1,3 +1,6 @@
 {
-  "general": {}
+  "initial":{
+    "title": "SHOPLAZZA THEME EXTENSION",
+    "sub_title": "EMBED TYPE"
+  }
 }

package/lib/app/template/embed-app/theme-app/locales/es-ES.json

@@ -1,3 +1 @@
-{
-  "general": {}
-}
+{}

package/lib/app/template/embed-app/theme-app/locales/fr-FR.json

@@ -1,3 +1 @@
-{
-  "general": {}
-}
+{}

package/lib/app/template/embed-app/theme-app/locales/id-ID.json

@@ -1,3 +1 @@
-{
-  "general": {}
-}
+{}