shoplazza-cli 0.0.9 → 0.1.8

package/lib/checkout/util.js

@@ -0,0 +1,204 @@
+const AdmZip = require('adm-zip');
+const { cwd, configFile } = require('./config');
+const fs = require('fs');
+const path = require('path');
+const { consoleError, consoleBlue } = require('./console');
+const inquirer = require('inquirer');
+
+const walkSync = (currentDirPath, callback) => {
+  fs.readdirSync(currentDirPath, { withFileTypes: true }).forEach(function (dirent) {
+    var filePath = path.join(currentDirPath, dirent.name);
+    if (dirent.isFile()) {
+      callback(filePath, dirent);
+    } else if (dirent.isDirectory()) {
+      walkSync(filePath, callback);
+    }
+  });
+};
+
+function getExtensionPathById(extensionId) {
+  return path.join(cwd, !cwd.includes('/extensions') ? 'extensions' : '', extensionId);
+}
+
+/**
+ * 根据id获取当前extension信息
+ * @param {*} extensionId
+ * @returns
+ */
+function getExtensionInfo(extensionId) {
+  let result = {};
+  const currentPath = path.resolve(cwd);
+  const isInExtensionDir = !!fs.readdirSync(currentPath).find((f) => f === configFile);
+  // 已经在一个extension内部
+  if (isInExtensionDir) {
+    const extensionId = currentPath.split('/').pop();
+    result = {
+      path: currentPath,
+      id: extensionId
+    };
+  } else if (extensionId) {
+    const extensionPath = path.join(cwd, !cwd.includes('/extensions') ? 'extensions' : '', extensionId);
+    if (!fs.existsSync(extensionPath)) {
+      consoleError(`The extension '${extensionId}' does not exist.`);
+      throw `The extension '${extensionId}' does not exist.`;
+    }
+
+    result = {
+      id: extensionId,
+      path: extensionPath
+    };
+  } else {
+    let dirPath = path.resolve(cwd);
+
+    if (!dirPath.includes('extensions')) {
+      consoleError('Please specify Extension id through --id.');
+      throw 'not_id';
+    }
+    const extensionId = dirPath.split('/').pop();
+    result = {
+      id: extensionId,
+      path: dirPath
+    };
+  }
+  result.distPath = getDistPath();
+  if (fs.existsSync(result.distPath)) {
+    result.distName = fs.readdirSync(result.distPath).find((f) => f.includes(result.id));
+  }
+  return result;
+}
+
+function getExtensionConfig(id) {
+  const info = getExtensionInfo(id);
+  const config = path.join(info.path, configFile);
+
+  if (!fs.existsSync(config)) {
+    consoleError(`Extension '${info.id}' not exist ${configFile}.`);
+    throw 'not_exist_config_file';
+  }
+  return JSON.parse(fs.readFileSync(config, 'utf-8'));
+}
+
+function getRootPath() {
+  return cwd;
+}
+
+function getExtensionsPath() {
+  return path.join(getRootPath(), 'extensions');
+}
+
+function getDistPath() {
+  return path.join(getRootPath(), 'dist');
+}
+
+function getProjectConfig() {
+  return require(path.join(getRootPath(), 'extension.config.js'));
+}
+
+function copy(src, dest) {
+  const stat = fs.statSync(src);
+  if (stat.isDirectory()) {
+    copyDir(src, dest);
+  } else {
+    fs.copyFileSync(src, dest);
+  }
+}
+
+function copyDir(srcDir, destDir) {
+  fs.mkdirSync(destDir, { recursive: true });
+  for (const file of fs.readdirSync(srcDir)) {
+    const srcFile = path.resolve(srcDir, file);
+    const destFile = path.resolve(destDir, file);
+    copy(srcFile, destFile);
+  }
+}
+
+/**
+ * 选择模式，返回所选extension信息
+ * @param {Array} extensionList extension列表
+ * @param {String} type 类型：push | deploy | undeploy | preview
+ * @returns {Object} 所选extension信息
+ */
+async function useSelectExtensionMode(extensionList = [], type = 'push') {
+  const choices = extensionList.map((item, index) => ({
+    name: (type === 'push' && index === 0) ? item.name : `${item.name}(${item.extension_id})`,
+    value: item.extension_id
+  }))
+  if (!choices.length) {
+    consoleBlue(`No extensions available to ${type}.`);
+    process.exit(1);
+  }
+  const { extensionId } = await inquirer
+    .prompt([
+      {
+        type: 'list',
+        name: 'extensionId',
+        message: `Please select an extension to ${type}:`,
+        prefix: '*',
+        loop: false,
+        choices,
+      },
+    ])
+  return extensionList.find((item) => item.extension_id === extensionId);
+}
+
+/**
+ * 重写指定extension的extension.json文件内容
+ * @param {String} extensionName extension名称
+ * @param {*} extensionConfig extension配置
+ */
+function setExtensionConfig(extensionName, extensionConfig) {
+  const info = getExtensionInfo(extensionName);
+  const configFilePath = path.join(info.path, configFile);
+  if (!fs.existsSync(configFilePath)) {
+    consoleError(`Extension '${extensionName}' does not exist in ${configFile}.`);
+    throw 'Config file does not exist';
+  } else {
+    fs.writeFile(configFilePath, JSON.stringify(extensionConfig, null, 2), (err) => {
+      if (err) {
+        consoleError(`Error writing file to disk: ${err}`);
+      }
+    });
+  }
+}
+
+/**
+ * 判断是否为本地extension
+ * @param {String} extensionInfo extension信息
+ */
+function checkLocalExtension(extensionInfo) {
+  const extensionPath = path.resolve(cwd, './extensions', extensionInfo.name || extensionInfo.extension_id); // todo: 此处extension_id兼容已存在extension，可考虑去掉
+  if (fs.existsSync(extensionPath)) {
+    const extensionJsonPath = path.resolve(extensionPath, './extension.json');
+    const localExtensionInfo = JSON.parse(fs.readFileSync(extensionJsonPath, 'utf8'));
+    if (localExtensionInfo.extensionId !== extensionInfo.extension_id) {
+      consoleError(`The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`);
+      throw `The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`;
+    }
+  } else {
+    consoleError(`The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`);
+    throw `The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`;
+  }
+}
+
+module.exports = {
+  copy,
+  getRootPath,
+  getDistPath,
+  getExtensionsPath,
+  getProjectConfig,
+  getExtensionInfo,
+  getExtensionConfig,
+  getExtensionPathById,
+  getFileJson: async (path) => JSON.parse(await fs.readFileSync(path)),
+  debug: async (...log) => {
+    ~process.argv.indexOf('--debug') && console.log(`${log.join('  ')}`);
+  },
+  zip: (filePath, uuid) => {
+    const zip = new AdmZip();
+    zip.addLocalFolder(filePath, uuid);
+    zip.writeZip(`${cwd}/${uuid}.zip`);
+  },
+  useSelectExtensionMode,
+  setExtensionConfig,
+  checkLocalExtension
+};

package/lib/checkout/verify.js

@@ -0,0 +1,16 @@
+const api = require('./api');
+const { consoleError } = require('./console');
+const {  getProjectConfig } = require('./util');
+
+async function verifyConfig(commands) {
+  const configJson = getProjectConfig();
+  if (!configJson.token || !configJson.store) {
+    consoleError(`Must provide the token and store of the shop in extension.config.js config file.`);
+    throw 'not_exist_token_or_store';
+  }
+  return configJson;
+}
+
+module.exports = {
+  verifyConfig
+};

package/lib/checkout/version.js

@@ -0,0 +1,7 @@
+const semver = require("semver");
+const { engines } = require("../../package");
+const version = engines.node;
+if (!semver.satisfies(process.version, version)) {
+  console.error(`Required node version ${version}`);
+  process.exit(1);
+}

package/lib/commands/login.js

@@ -7,7 +7,7 @@ const { hasBeenSetAnalytics, setAnalyticsConfig } = require('../db/analytics');
 const log = require('../log');
 const { getShopDetail } = require('../openAPI/api');
 const getCode = require('../auth/getCode');
-const { postAccessToken, getUserInfo, postExchangeToken } = require('../auth');
+const { postAccessToken, getUserInfo, postExchangeToken, postStoreToken } = require('../auth');
 const { loginIntoPartner } = require('../app/login');
 
 let spinner;
@@ -39,6 +39,7 @@ const checkAndLogin = async (store) => {
   await postAccessToken(code, store);
   await getUserInfo(store);
   await postExchangeToken(store);
+  await postStoreToken(store);
   spinner?.stop?.();
   log.info(`${chalk.green('✓')} Finalizing authentication`);
   log.info(`Logged into ${chalk.green(get('store_domain'))}`);
@@ -80,7 +81,7 @@ const loginIntoStore = async (store) => {
         }
       ]);
       if (answers.store) {
-        if (!answers.store.includes('myshoplaza.com') || !answers.store.includes('myshoplaza.com')) {
+        if (!answers.store.includes('myshoplaza.com')) {
           log.error(
             chalk.red(
               `✗ Invalid store provided ${answers.store}. Please provide the store in the following format: developer.myshoplaza.com`

package/lib/commands/theme/init.js

@@ -15,8 +15,8 @@ const createDirAndCloneTheme = async (directory) => {
     return;
   }
   fs.mkdirSync(themeDir);
-  const spinner = ora(chalk.cyan(`Cloning https://github.com/Shoplazza/LifeStyle into ${directory}…`)).start();
-  await execa('git', ['clone', 'https://github.com/Shoplazza/LifeStyle', directory]);
+  const spinner = ora(chalk.cyan(`Cloning https://github.com/Shoplazza/Nova-2023 into ${directory}…`)).start();
+  await execa('git', ['clone', 'https://github.com/Shoplazza/Nova-2023', directory]);
   fs.rmSync(path.join(process.cwd(), `${directory}/.git`), { recursive: true });
   spinner.stop();
   log.info(chalk.green(`✓ Cloned into ${directory}`));

package/lib/commands/theme/pull.js

@@ -56,7 +56,7 @@ module.exports = async (options) => {
       await pullThemeFiles(answers.theme);
     }
   } catch (error) {
-    log.error(chalk.red(`✗ Failed to pull theme`));
+    log.error(chalk.red(`✗ Failed to pull theme: ${error?.response?.status}`));
     Sentry.captureException(error);
   }
 };

package/lib/config.js

@@ -6,3 +6,7 @@ exports.THEME_DIRS = ['assets', 'config', 'layout', 'locales', 'sections', 'snip
 exports.DEV_SSO_AUTH_URL = 'https://sso.dev.shoplazza.com';
 exports.DEV_ACCOUNT_URL = 'https://myaccount.dev.shoplazza.com';
 exports.DEV_CLIENT_ID = 'b630b285-e098-4c51-a7a4-d0240c9fc209';
+
+exports.STG_SSO_AUTH_URL = 'https://sso.stg.shoplazza.com';
+exports.STG_ACCOUNT_URL = 'https://myaccount.stg.shoplazza.com';
+exports.STG_CLIENT_ID = 'b630b285-e098-4c51-a7a4-d0240c9fc209';

package/lib/db/user.js

@@ -9,6 +9,7 @@ const createTableIfNeeded = () => {
       theme_id  text,
       theme_name text,
       store_domain text,
+      store_session text,
       user_id text
     )`);
   createTable.run();
@@ -27,10 +28,11 @@ const insertOrReplace = ({
   theme_id = get('theme_id'),
   theme_name = get('theme_name'),
   store_domain = get('store_domain'),
+  store_session = get('store_session'),
   user_id = get('user_id')
 }) => {
   const stmt = db.prepare(
-    `insert or replace into user (id, access_token, session_id, exchange_token, theme_id, theme_name, store_domain, user_id) values (
+    `insert or replace into user (id, access_token, session_id, exchange_token, theme_id, theme_name, store_domain, store_session, user_id) values (
       (select id from user where access_token = @access_token),
       @access_token,
       @session_id,
@@ -38,10 +40,11 @@ const insertOrReplace = ({
       @theme_id,
       @theme_name,
       @store_domain,
+      @store_session,
       @user_id
     )`
   );
-  stmt.run({ access_token, session_id, exchange_token, theme_id, theme_name, store_domain, user_id });
+  stmt.run({ access_token, session_id, exchange_token, theme_id, theme_name, store_domain, store_session, user_id });
 };
 
 const emptyUserData = () => {

package/lib/utils.js

@@ -3,7 +3,19 @@ const fs = require('fs-extra');
 const AdmZip = require('adm-zip');
 const chalk = require('chalk');
 
-const { SSO_AUTH_URL, ACCOUNT_URL, CLIENT_ID, DEV_SSO_AUTH_URL, DEV_ACCOUNT_URL, DEV_CLIENT_ID } = require('./config');
+const {
+  SSO_AUTH_URL,
+  ACCOUNT_URL,
+  CLIENT_ID,
+  DEV_SSO_AUTH_URL,
+  DEV_ACCOUNT_URL,
+  DEV_CLIENT_ID,
+  STG_CLIENT_ID,
+  STG_ACCOUNT_URL,
+  STG_SSO_AUTH_URL
+} = require('./config');
+
+const ZIP_IGNORE_FOLDER = ['.git', '.DS_Store'];
 
 exports.unzipTheme = (zipPath, outputPath) => {
   const zip = new AdmZip(zipPath);
@@ -22,7 +34,26 @@ exports.unzipTheme = (zipPath, outputPath) => {
 
 exports.zipTheme = (filePath, themeName) => {
   const zip = new AdmZip();
-  zip.addLocalFolder(filePath, themeName);
+
+  // Old code
+  // zip.addLocalFolder(filePath, themeName);
+
+  // zip, but ignore some folder
+  const lsDir = fs.readdirSync(filePath);
+  lsDir.forEach((lsItem) => {
+    const lsItemStat = fs.statSync(path.join(filePath, lsItem));
+
+    if (ZIP_IGNORE_FOLDER.includes(lsItem)) {
+      return;
+    }
+
+    if (lsItemStat.isDirectory()) {
+      zip.addLocalFolder(path.join(filePath, lsItem), path.join(themeName, lsItem));
+    } else if (lsItemStat.isFile()) {
+      zip.addLocalFile(path.join(filePath, lsItem), path.join(themeName, lsItem));
+    }
+  });
+
   zip.writeZip(`${process.cwd()}/${themeName}.zip`);
 };
 
@@ -48,14 +79,35 @@ exports.formatThemeList = (themes, defaultThemeId) => {
 
 exports.sleep = (time) => new Promise((resolve) => setTimeout(resolve, time));
 
+function getEnv(store) {
+  return store.includes('dev.myshoplaza.com') ? 'dev' : store.includes('stg.myshoplaza.com') ? 'stg' : 'prod';
+}
+
+const CLIENT_ID_ENV_MAP = {
+  dev: DEV_CLIENT_ID,
+  stg: STG_CLIENT_ID,
+  prod: CLIENT_ID
+};
+
 exports.getClientId = (store) => {
-  return store.includes('dev.') ? DEV_CLIENT_ID : CLIENT_ID;
+  return CLIENT_ID_ENV_MAP[getEnv(store)];
 };
 
+const ACCOUNT_URL_ENV_MAP = {
+  dev: DEV_ACCOUNT_URL,
+  stg: STG_ACCOUNT_URL,
+  prod: ACCOUNT_URL
+};
 exports.getAccountUrl = (store) => {
-  return store.includes('dev.myshoplaza.com') ? DEV_ACCOUNT_URL : ACCOUNT_URL;
+  return ACCOUNT_URL_ENV_MAP[getEnv(store)];
+};
+
+const SSO_AUTH_URL_MAP = {
+  dev: DEV_SSO_AUTH_URL,
+  stg: STG_SSO_AUTH_URL,
+  prod: SSO_AUTH_URL
 };
 
 exports.getSSOAuthUrl = (store) => {
-  return store.includes('dev.myshoplaza.com') ? DEV_SSO_AUTH_URL : SSO_AUTH_URL;
+  return SSO_AUTH_URL_MAP[getEnv(store)];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoplazza-cli",
-  "version": "0.0.9",
+  "version": "0.1.8",
   "description": "",
   "main": "bin/shoplazza",
   "engines": {
@@ -28,26 +28,52 @@
   "dependencies": {
     "@sentry/node": "^6.19.7",
     "@sentry/tracing": "^6.19.7",
+    "@shoplazza/extension-ui": "^1.0.0",
     "adm-zip": "^0.5.9",
+    "ali-oss": "^6.17.1",
     "archiver": "^5.3.1",
-    "axios": "^0.27.1",
-    "better-sqlite3": "^7.5.1",
+    "axios": "^1.6.8",
+    "better-sqlite3": "^11.5.0",
     "chalk": "^4.1.2",
+    "chokidar": "^3.6.0",
+    "classnames": "~2.3.2",
     "clean-css": "^5.3.1",
+    "colors": "^1.4.0",
     "commander": "^9.2.0",
+    "connect": "^3.7.0",
     "download-git-repo": "^3.0.2",
     "execa": "^5.1.1",
+    "extension-ui": "^1.0.6",
+    "fancy-log": "~1.3.3",
+    "file-type": "~16.5.0",
     "form-data": "^4.0.0",
     "fs-extra": "^10.1.0",
     "glob": "^8.0.3",
+    "imagemin": "~8.0.0",
+    "imagemin-jpegtran": "~7.0.0",
+    "imagemin-pngquant": "~9.0.2",
+    "imagemin-svgo": "~9.0.0",
     "inquirer": "^8.2.3",
+    "js-queue": "~2.0.2",
+    "jscodeshift": "^0.15.0",
     "livereload": "^0.9.3",
+    "loading-cli": "^1.1.2",
+    "md5": "~2.3.0",
+    "mime": "^3.0.0",
+    "mobx": "~6.9.0",
+    "node-fetch": "^2.6.7",
     "node-watch": "^0.7.3",
     "open": "^8.4.0",
     "ora": "^5.4.1",
+    "process": "~0.11.10",
+    "semver": "~7.3.5",
+    "serve-static": "^1.15.0",
     "spark-md5": "^3.0.2",
     "uglify-js": "^3.17.4",
     "update-notifier": "^5.1.0",
+    "vite": "~4.3.1",
+    "vite-plugin-inspect": "^0.7.25",
+    "ws": "^8.17.0",
     "yargs": "^17.5.0"
   }
 }