shoplazza-cli 1.0.7-beta.1 → 1.0.7-beta.2

package/lib/app/utils/index.js

@@ -42,10 +42,10 @@ const renameFile = async (filePath, targetName) => {
  * 获取themeApp配置（信息）
  * @returns {Promise<string>}
  */
-async function getThemeAppConfig() {
+async function getThemeExtensionConfig() {
   if (!fsExtra.pathExistsSync(THEME_APP_CONFIG_PATH)) {
     throw new Error(
-      `The current workspace is not a valid theme extension project, because "${WORKSPACE_PATH}" is missing the required "theme-extension.config.json" file.`
+      `The current workspace is not a valid theme extension project, because "${WORKSPACE_PATH}" is missing the required "extension.config.json" file.`
     );
   }
   return fsExtra.readJson(THEME_APP_CONFIG_PATH);
@@ -55,10 +55,10 @@ async function getThemeAppConfig() {
  * 更新themeApp配置（信息）
  * @param {Object} config 待更新的配置信息
  */
-async function setThemeAppConfig(config) {
-  const oldThemeAppConfig = await getThemeAppConfig();
-  const newThemeAppConfig = { ...oldThemeAppConfig, ...config };
-  await fsExtra.writeJson(THEME_APP_CONFIG_PATH, newThemeAppConfig, { spaces: 2 });
+async function setThemeExtensionConfig(config) {
+  const oldThemeExtensionConfig = await getThemeExtensionConfig();
+  const newThemeExtensionConfig = { ...oldThemeExtensionConfig, ...config };
+  await fsExtra.writeJson(THEME_APP_CONFIG_PATH, newThemeExtensionConfig, { spaces: 2 });
 }
 
 /**
@@ -204,8 +204,8 @@ function renderTable(data, options) {
 module.exports = {
   replacePlaceholders,
   renameFile,
-  getThemeAppConfig,
-  setThemeAppConfig,
+  getThemeExtensionConfig,
+  setThemeExtensionConfig,
   compress,
   compareVersions,
   getFileInfo,

package/lib/auth/getCode.js

@@ -3,8 +3,8 @@ const { fork } = require('child_process');
 const path = require('path');
 const open = require('open');
 const log = require('../log');
-const { REDIRECT_URI } = require('../config');
-const { getSSOAuthUrl, getClientId } = require('../utils');
+const { REDIRECT_URI } = require('../utils/config');
+const { getSSOAuthUrl, getClientId } = require('../utils/utils');
 
 const openSSOPage = (store) => {
   open(

package/lib/auth/index.js

@@ -4,8 +4,8 @@ const Sentry = require('@sentry/node');
 const querystring = require('querystring');
 const { get, set, empty } = require('../db/user');
 const log = require('../log');
-const { REDIRECT_URI } = require('../config');
-const { getAccountUrl, getClientId, getSSOAuthUrl } = require('../utils');
+const { REDIRECT_URI } = require('../utils/config');
+const { getAccountUrl, getClientId, getSSOAuthUrl } = require('../utils/utils');
 
 exports.postAccessToken = async (code, store) => {
   try {

package/lib/check.js

@@ -0,0 +1,26 @@
+const supportVersion = ['v20.9.0', 'v20.18.0'];
+
+// 解析当前版本号
+function parseVersion(versionStr) {
+  return versionStr.slice(1).split('.').slice(0, 3).map(Number);
+}
+
+function checkNodeVersion() {
+  const currentVersion = parseVersion(process.version);
+  // 检查当前版本是否在支持范围内
+  const isSupported = supportVersion
+    .map(parseVersion)
+    .some(
+      (version) =>
+        version[0] === currentVersion[0] && version[1] === currentVersion[1] && version[2] === currentVersion[2]
+    );
+
+  if (!isSupported) {
+    console.error(
+      `❌ the version of current Node.js is ${process.version}，advise select the support version:`,
+      supportVersion.join(',')
+    );
+  }
+}
+
+checkNodeVersion();

package/lib/checkout/api.js

@@ -4,10 +4,9 @@ const fs = require('fs');
 const FormData = require('form-data');
 const loading = require('loading-cli');
 const { openAipVersion } = require('./config');
-const { isDebug } = require('./console');
+const { isDebug, consoleWarn } = require('../utils/console');
 const { getProjectConfig } = require('./util');
 const chalk = require('chalk');
-const { consoleWarn } = require('./console');
 const { useOss } = require('../oss');
 
 const FILE_SIGN_URL = '/checkout_extensions/file/sign';

package/lib/checkout/build.js

@@ -1,4 +1,4 @@
-const { consoleError, consoleBlue } = require('./console');
+const { consoleError, consoleBlue } = require('../utils/console');
 const { build } = require('vite');
 const { viteConfig } = require('./build/vite.config');
 const { getExtensionInfo, getDistPath } = require('./util');

package/lib/checkout/create.js

@@ -1,4 +1,4 @@
-const { consoleError, consoleSuccess } = require('./console');
+const { consoleError, consoleSuccess } = require('../utils/console');
 const path = require('path');
 const fs = require('fs');
 const inquirer = require('inquirer');

package/lib/checkout/deploy.js

@@ -2,7 +2,7 @@ const api = require('./api');
 const { verifyConfig } = require('./verify');
 const { useSelectExtensionMode } = require('./util');
 const inquirer = require('inquirer');
-const { consoleSuccess, consoleError, consoleBlue } = require('./console');
+const { consoleSuccess, consoleError, consoleBlue } = require('../utils/console');
 
 module.exports = async () => {
   try {

package/lib/checkout/dev/index.js

@@ -12,7 +12,7 @@ const path = require('path');
 const chokidar = require('chokidar');
 const fs = require('fs');
 const { viteBuild } = require('../build');
-const { consoleError, consoleBlue, consoleSuccess } = require('../console');
+const { consoleError, consoleBlue, consoleSuccess } = require('../../utils/console');
 
 async function buildExtension(id) {
   return viteBuild({ id })

package/lib/checkout/fields.js

@@ -1,5 +1,5 @@
 const api = require('./api');
-const { consoleError } = require('./console');
+const { consoleError } = require('../utils/console');
 const { verifyConfig } = require('./verify');
 const { getExtensionInfo, getExtensionConfig } = require('./util');
 

package/lib/checkout/preview.js

@@ -2,7 +2,7 @@ const inquirer = require('inquirer');
 const api = require('./api');
 const { verifyConfig } = require('./verify');
 const { useSelectExtensionMode, getProjectConfig } = require('./util');
-const { consoleSuccess, consoleError } = require('./console');
+const { consoleSuccess, consoleError } = require('../utils/console');
 
 module.exports = async () => {
   try {

package/lib/checkout/push.js

@@ -12,7 +12,7 @@ const {
   getProjectConfig
 } = require('./util');
 const fsExtra = require('fs-extra');
-const { consoleBlue, consoleSuccess, consoleError, consoleWarn } = require('./console');
+const { consoleBlue, consoleSuccess, consoleError, consoleWarn } = require('../utils/console');
 const { viteBuild } = require('./build');
 const { verifyConfig } = require('./verify');
 

package/lib/checkout/undeploy.js

@@ -2,7 +2,7 @@ const api = require('./api');
 const { verifyConfig } = require('./verify');
 const { useSelectExtensionMode } = require('./util');
 const inquirer = require('inquirer');
-const { consoleSuccess, consoleBlue, consoleError } = require('./console');
+const { consoleSuccess, consoleBlue, consoleError } = require('../utils/console');
 
 module.exports = async () => {
   try {

package/lib/checkout/util.js

@@ -2,7 +2,7 @@ const AdmZip = require('adm-zip');
 const { cwd, configFile } = require('./config');
 const fs = require('fs');
 const path = require('path');
-const { consoleError, consoleBlue } = require('./console');
+const { consoleError, consoleBlue } = require('../utils/console');
 const inquirer = require('inquirer');
 
 const walkSync = (currentDirPath, callback) => {

package/lib/checkout/verify.js

@@ -1,5 +1,5 @@
 const api = require('./api');
-const { consoleError } = require('./console');
+const { consoleError } = require('../utils/console');
 const {  getProjectConfig } = require('./util');
 
 async function verifyConfig(commands) {

package/lib/commands/theme/delete.js

@@ -5,7 +5,7 @@ const inquirer = require('inquirer');
 const { getThemeDetail, getThemes, deleteTheme } = require('../../openAPI/api');
 const { get } = require('../../db/user');
 const log = require('../../log');
-const { formatThemeList } = require('../../utils');
+const { formatThemeList } = require('../../utils/utils');
 
 const confirmAndDeleteTheme = async (themeName, themeId) => {
   const answers = await inquirer.prompt([

package/lib/commands/theme/package.js

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const chalk = require('chalk');
 const Sentry = require('@sentry/node');
 const log = require('../../log');
-const { zipTheme } = require('../../utils');
+const { zipTheme } = require('../../utils/utils');
 
 const checkAndZipThemes = () => {
   const configPath = path.join(process.cwd(), 'config/settings_schema.json');

package/lib/commands/theme/publish.js

@@ -5,7 +5,7 @@ const Sentry = require('@sentry/node');
 const { getThemeDetail, getThemes, publishTheme } = require('../../openAPI/api');
 const { get } = require('../../db/user');
 const log = require('../../log');
-const { formatThemeList } = require('../../utils');
+const { formatThemeList } = require('../../utils/utils');
 
 const confirmAndExecPublish = async (themeName, themeId) => {
   const answers = await inquirer.prompt([

package/lib/commands/theme/pull.js

@@ -7,7 +7,7 @@ const inquirer = require('inquirer');
 const Sentry = require('@sentry/node');
 const { get } = require('../../db/user');
 const { pullTheme, getThemes, getDefaultThemeDetail } = require('../../openAPI/api');
-const { unzipTheme, formatThemeList } = require('../../utils');
+const { unzipTheme, formatThemeList } = require('../../utils/utils');
 const log = require('../../log');
 
 const pullThemeFiles = async (theme) => {

package/lib/commands/theme/push.js

@@ -5,7 +5,7 @@ const Sentry = require('@sentry/node');
 const fs = require('fs-extra');
 const { get } = require('../../db/user');
 const { getThemeDetail, getThemes, getDefaultThemeDetail, pushTheme, getPushTask } = require('../../openAPI/api');
-const { sleep, formatThemeList } = require('../../utils');
+const { sleep, formatThemeList } = require('../../utils/utils');
 const { checkAndZipThemes } = require('./package');
 const log = require('../../log');
 

package/lib/commands/theme/serve.js

@@ -11,8 +11,8 @@ const { get, set } = require('../../db/user');
 const { pushThemeFiles } = require('./push');
 const { getThemes, getDefaultThemeDetail, deleteFile, updateFile, addFile, getFileList } = require('../../openAPI/api');
 const log = require('../../log');
-const { THEME_DIRS } = require('../../config');
-const { getThemeFilenameTypeAndLocation, formatThemeList } = require('../../utils');
+const { THEME_DIRS } = require('../../utils/config');
+const { getThemeFilenameTypeAndLocation, formatThemeList } = require('../../utils/utils');
 
 const existInList = (filename, fileList) => {
   const { type, location } = getThemeFilenameTypeAndLocation(filename);

package/lib/common/login.js

@@ -7,7 +7,7 @@ const path = require('path');
 
 const { set, PARTNER_KEYS, get, empty } = require('./db/partner');
 const { PARNTER_URL, LOGIN_BASE_URL, CLIENT_ID } = require('./constants');
-const { REDIRECT_URI } = require('../config');
+const { REDIRECT_URI } = require('../utils/config');
 const log = require('../log');
 const { choosePartner } = require('./inquirers/choose-partner');
 const { chooseApp } = require('./inquirers/choose-app');

package/lib/function/bin/index.js

@@ -0,0 +1,20 @@
+const fs = require('fs-extra');
+const path = require('path');
+const { getArchPlatform } = require('../../utils/platform');
+
+function getLibPath(name) {
+  const archPlatform = getArchPlatform();
+  const supportedTargets = ['arm-linux', 'arm-macos', 'x86_64-macos', 'x86_64-windows', 'x86_64-linux'];
+  if (!supportedTargets.includes(archPlatform)) {
+    throw Error(`Unsupported platform/architecture combination ${processPlatform}/${processArch}`);
+  }
+  const libDir = fs.readdirSync(__dirname).find((n) => name === n);
+  const targetPath = fs.readdirSync(path.resolve(__dirname, libDir)).find((libName) => libName.includes(archPlatform));
+  const libPath = path.resolve(__dirname, name, targetPath);
+  fs.chmodSync(libPath, 0o755);
+  return libPath;
+}
+
+module.exports = {
+  getLibPath
+};

package/lib/function/commands/compile.js

@@ -0,0 +1,42 @@
+const fs = require('fs-extra');
+const { getConfigJson } = require('../../utils/file');
+const { getLibPath } = require('../bin');
+const path = require('path');
+const loadingCli = require('loading-cli');
+const { exec } = require('child_process');
+
+function createDistIfNotExist() {
+  const distPath = path.resolve(process.cwd(), 'dist');
+  if (fs.existsSync(distPath)) {
+    fs.emptyDirSync(distPath);
+    return;
+  }
+  fs.mkdir(distPath);
+}
+
+async function compileJsToWasm(command) {
+  const config = getConfigJson();
+  const javyPath = getLibPath('javy');
+  const loading = loadingCli('compile js to wasm');
+  try {
+    loading.start();
+    createDistIfNotExist();
+    await new Promise((resolve, reject) =>
+      exec(`"${javyPath}" build './src/index.js' -o "./dist/${config.extensionName}.wasm"`, (err, stdout, stderr) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(stdout);
+        }
+      })
+    );
+    loading.succeed('✅ WASM compile success');
+  } catch (error) {
+    loading.error('❌ compile failed:' + error.message);
+    process.exit(1);
+  }
+}
+
+module.exports = {
+  compileJsToWasm
+};

package/lib/function/commands/create.js

@@ -0,0 +1,77 @@
+const { consoleError, consoleSuccess } = require('../../utils/console');
+const path = require('path');
+const fs = require('fs');
+const inquirer = require('inquirer');
+const { copy } = require('../../utils/file');
+
+const cwd = process.cwd();
+
+const templateDir = path.resolve(__dirname, '../template');
+
+const renameFiles = {
+  _gitignore: '.gitignore'
+};
+
+/**
+ * 使用cli创建一个项目
+ * @param {} command 项目名
+ * @returns
+ */
+async function createFuncExtension(command) {
+  const { language, extensionName } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'extensionName',
+      message: 'Enter the extension name:',
+      prefix: '*'
+    },
+    {
+      type: 'list',
+      name: 'language',
+      message: 'Select a language:',
+      choices: [
+        {
+          name: 'javascript',
+          value: 'js'
+        }
+      ],
+      prefix: '*'
+    }
+  ]);
+  const projectDir = extensionName.replace(/\/+$/g, '');
+  const fullTempDir = path.join(templateDir, language);
+  const root = path.join(cwd, projectDir);
+  if (fs.existsSync(root)) {
+    consoleError(`the directory '${projectDir}' is exist.`);
+    return;
+  }
+  fs.mkdirSync(root, { recursive: true });
+
+  const write = (file, content) => {
+    const targetPath = path.join(root, renameFiles[file] ?? file);
+    if (content) {
+      fs.writeFileSync(targetPath, content);
+    } else {
+      copy(path.join(fullTempDir, file), targetPath);
+    }
+  };
+
+  const files = fs.readdirSync(fullTempDir);
+  for (const file of files.filter((f) => !['package.json'].includes(f))) {
+    write(file);
+  }
+
+  const pkg = JSON.parse(fs.readFileSync(path.join(fullTempDir, `package.json`), 'utf-8'));
+  pkg.name = projectDir;
+  write('package.json', JSON.stringify(pkg, null, 2) + '\n');
+
+  const config = JSON.parse(fs.readFileSync(path.join(fullTempDir, `extension.config.json`), 'utf-8'));
+  config.extensionName = extensionName;
+  write('extension.config.json', JSON.stringify(config, null, 2) + '\n');
+
+  consoleSuccess(`Successfully created extension project '${extensionName}'.`);
+}
+
+module.exports = {
+  createFuncExtension
+};

package/lib/function/commands/list.js

@@ -0,0 +1,18 @@
+const partnerAPI = require('../../partner-api');
+const { requestAppSecretWhenNotExist } = require('../utils');
+
+async function getFunctions() {
+  const data = await partnerAPI.getFunctionList();
+  return data.functions;
+}
+
+async function listFunctionExtension() {
+  await requestAppSecretWhenNotExist();
+  const list = await getFunctions();
+  console.log(list.map(({ source_code, ...other }) => other));
+}
+
+module.exports = {
+  getFunctions,
+  listFunctionExtension
+};

package/lib/function/commands/release.js

@@ -0,0 +1,69 @@
+const inquirer = require('inquirer');
+const chalk = require('chalk');
+const fs = require('fs-extra');
+const path = require('path');
+const loadingCli = require('loading-cli');
+const { requestAppSecretWhenNotExist } = require('../utils');
+const { compileJsToWasm } = require('./compile');
+const { getConfigJson, updateConfigJson } = require('../../utils/file');
+const partnerAPI = require('../../partner-api');
+const { consoleError } = require('../../utils/console');
+const FormData = require('form-data');
+
+async function createOrUpdateFuncExtension() {
+  const config = getConfigJson();
+  const functionId = config.extensionId;
+  const formData = new FormData();
+  formData.append('namespace', 'cart-transform');
+  formData.append('name', config.extensionName);
+  formData.append('source_code', fs.readFileSync(path.resolve(process.cwd(), 'src/index.js'), { encoding: 'utf-8' }));
+  formData.append('source_code', 'hello');
+  formData.append(
+    'file',
+    fs.createReadStream(path.resolve(process.cwd(), 'dist', `${config.extensionName}.wasm`), {
+      filename: `${config.extensionName}.wasm`,
+      contentType: 'application/wasm'
+    })
+  );
+
+  let data;
+  if (!functionId) {
+    const loading = loadingCli('create an new function extension');
+    loading.start();
+    data = await partnerAPI
+      .createFunctionExtension(formData)
+      .then((res) => {
+        loading.succeed();
+        return res;
+      })
+      .catch((err) => {
+        loading.fail();
+        consoleError(err, err.response.data);
+      });
+  } else {
+    const loading = loadingCli('update function extension');
+    loading.start();
+    formData.append('function_id', functionId);
+    data = await partnerAPI
+      .updateFunctionExtension(functionId, formData)
+      .then((res) => {
+        loading.succeed();
+        return res;
+      })
+      .catch((err) => {
+        loading.fail();
+        consoleError(err, err.response);
+      });
+  }
+  data && updateConfigJson({ extensionId: data.function_id, version: data.version });
+}
+
+async function releaseFunctionExtension(command) {
+  await requestAppSecretWhenNotExist();
+  await compileJsToWasm();
+  await createOrUpdateFuncExtension();
+}
+
+module.exports = {
+  releaseFunctionExtension
+};

package/lib/function/index.js

@@ -0,0 +1,24 @@
+function makeFunctionCommand(_program) {
+  const program = _program.command('function').description('Shoplazza function cli');
+
+  program
+    .command('create')
+    .description('create a extension project')
+    .action(require('./commands/create').createFuncExtension);
+
+  program
+    .command('list')
+    .description('list all function of current app')
+    .action(require('./commands/list').listFunctionExtension);
+
+  program.command('compile').description('compile js to wasm').action(require('./commands/compile').compileJsToWasm);
+
+  program
+    .command('release')
+    .description('release a version of function extension')
+    .action(require('./commands/release').releaseFunctionExtension);
+}
+
+module.exports = {
+  makeFunctionCommand
+};

package/lib/function/template/js/README.md

@@ -0,0 +1,37 @@
+# Checkout Extension
+## Getting started
+
+1. 安装依赖
+
+    ```
+    npm i
+    ```
+2. 绑定app
+    ```
+    npm run connect
+    ```
+3. release extension
+    ```
+    npm run release
+    ```
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

package/lib/function/template/js/_gitignore

@@ -0,0 +1,4 @@
+node_modules/
+pnpm-lock.yaml
+dist
+.history/

package/lib/function/template/js/extension.config.json

@@ -0,0 +1,5 @@
+{
+  "extensionName": "",
+  "extensionId": "",
+  "version": "1.0"
+}

package/lib/function/template/js/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "hello",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {},
+  "scripts": {
+    "dev": "shoplazza function dev",
+    "connect": "shoplazza function connect",
+    "release": "shoplazza function release",
+    "list": "shoplazza function list"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}