@struggler/cli 1.0.10 → 1.0.12

package/index.js

@@ -58,7 +58,7 @@ program.configureHelp({
 	},
 })
 
-program.name("struggler-cli").description(locale.appDescription).version(packageJson.version, "-v, --version", locale.options.version).helpOption("-h, --help", locale.options.help).option("-c, --config <path>", locale.options.config, "./command/qiniu.json").option("-d, --dir <path>", locale.options.dir, "./dist").option("--dry-run", locale.options.dryRun).option("--concurrency <number>", locale.options.concurrency, "5").option("--exclude <pattern>", locale.options.exclude).option("--ignore-file <path>", locale.options.ignoreFile, ".strugglerignore").option("--manifest <path>", locale.options.manifest).option("--json", locale.options.json).option("--skip-init", locale.options.skipInit).option("--skip-refresh", locale.options.skipRefresh).option("--no-cache", locale.options.noCache).option("--lang <lang>", locale.options.lang, lang)
+program.name("struggler-cli").description(locale.appDescription).version(packageJson.version, "-v, --version", locale.options.version).helpOption("-h, --help", locale.options.help).option("-c, --config <path>", locale.options.config, "./command/qiniu.json").option("--config-dir [path]", locale.options.configDir).option("-d, --dir <path>", locale.options.dir, "./dist").option("--dry-run", locale.options.dryRun).option("--concurrency <number>", locale.options.concurrency, "5").option("--exclude <pattern>", locale.options.exclude).option("--ignore-file <path>", locale.options.ignoreFile, ".strugglerignore").option("--manifest <path>", locale.options.manifest).option("--json", locale.options.json).option("--skip-init", locale.options.skipInit).option("--skip-refresh", locale.options.skipRefresh).option("--no-cache", locale.options.noCache).option("--lang <lang>", locale.options.lang, lang)
 
 program
 	.command("init")

package/lib/config.js

@@ -1,6 +1,8 @@
 let path = require('path')
+const { getJsonData } = require('./files');
 
 const DEFAULT_QINIU_CONFIG = './command/qiniu.json';
+const DEFAULT_META_DIR = './command';
 const DEFAULT_CONFIG = './command/config.json';
 const DEFAULT_CACHE = './command/upload-cache.json';
 
@@ -12,22 +14,43 @@ function getQiniuConfigPath(options = {}) {
     return resolveFromCwd(options.config || DEFAULT_QINIU_CONFIG);
 }
 
-function getConfigPath(options = {}) {
-    if (!options.config) {
-        return resolveFromCwd(DEFAULT_CONFIG);
+function resolveConfigDirOption(options = {}) {
+    const value = options.configDir;
+    if (value === true || value === '') {
+        return DEFAULT_META_DIR;
+    }
+    if (typeof value === 'string') {
+        return value;
+    }
+    return null;
+}
+
+/** config.json / upload-cache.json 所在目录；优先级：CLI --config-dir > qiniu.json configDir > 与 qiniu 同目录 > ./command */
+function getMetaDir(options = {}) {
+    const cliConfigDir = resolveConfigDirOption(options);
+    if (cliConfigDir) {
+        return resolveFromCwd(cliConfigDir);
     }
 
     const qiniuConfigPath = getQiniuConfigPath(options);
-    return path.join(path.dirname(qiniuConfigPath), 'config.json');
-}
+    const qiniuConfig = getJsonData(qiniuConfigPath);
+    if (qiniuConfig.configDir) {
+        return resolveFromCwd(qiniuConfig.configDir);
+    }
 
-function getCachePath(options = {}) {
     if (!options.config) {
-        return resolveFromCwd(DEFAULT_CACHE);
+        return resolveFromCwd(DEFAULT_META_DIR);
     }
 
-    const qiniuConfigPath = getQiniuConfigPath(options);
-    return path.join(path.dirname(qiniuConfigPath), 'upload-cache.json');
+    return path.dirname(qiniuConfigPath);
+}
+
+function getConfigPath(options = {}) {
+    return path.join(getMetaDir(options), 'config.json');
+}
+
+function getCachePath(options = {}) {
+    return path.join(getMetaDir(options), 'upload-cache.json');
 }
 
 module.exports = {
@@ -40,6 +63,9 @@ module.exports = {
     getCachePath: (options) => {
         return getCachePath(options)
     },
+    getMetaDir: (options) => {
+        return getMetaDir(options)
+    },
     getDir: (options) => {
         return resolveFromCwd(options.dir || './dist')
     },

package/lib/i18n.js

@@ -38,6 +38,7 @@ const LANGUAGES = {
         options: {
             version: '显示版本号。',
             config: '指定上传配置文件路径。',
+            configDir: '指定 config.json、upload-cache.json 所在目录；可写 --config-dir ./command，单独写 --config-dir 时默认为 ./command。',
             dir: '指定要上传的目录。',
             dryRun: '仅预览执行计划，不写文件也不调用七牛接口。',
             concurrency: '设置上传并发数。',
@@ -111,6 +112,7 @@ const LANGUAGES = {
         options: {
             version: 'Display the version number.',
             config: 'Specify the path to the upload configuration file.',
+            configDir: 'Directory for config.json and upload-cache.json; use --config-dir ./command, or --config-dir alone for ./command.',
             dir: 'Specify the directory to upload.',
             dryRun: 'Preview actions without writing files or calling Qiniu APIs.',
             concurrency: 'Set upload concurrency.',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@struggler/cli",
-	"version": "1.0.10",
+	"version": "1.0.12",
 	"description": "CLI to Upload vite packaged files to Qiniu Cloud OSS.",
 	"main": "index.js",
 	"scripts": {

package/test/config.test.js

@@ -24,6 +24,30 @@ test('config helpers resolve qiniu and derived config paths together', () => {
     );
 });
 
+test('config-dir overrides default meta directory', () => {
+    const options = {
+        config: './test/command/qiniu.json',
+        configDir: './test/meta',
+    };
+
+    assert.equal(
+        getConfig(options),
+        `${process.cwd()}/test/meta/config.json`
+    );
+});
+
+test('config-dir flag without path defaults to ./command', () => {
+    const options = {
+        config: './test/command/qiniu.json',
+        configDir: true,
+    };
+
+    assert.equal(
+        getConfig(options),
+        `${process.cwd()}/command/config.json`
+    );
+});
+
 test('deploy helpers normalize concurrency and build remote keys', () => {
     assert.equal(normalizeConcurrency('0'), 5);
     assert.equal(normalizeConcurrency('3'), 3);