From 28585c99aaedb6dc80ca1a3cb7557b9d40b9bb7b Mon Sep 17 00:00:00 2001 From: Lance Wang Date: Sun, 6 Jul 2025 15:27:47 +0800 Subject: [PATCH 1/3] Fixed local dolphin.y[a]ml not automatically detected issue --- .changeset/sour-trainers-refuse.md | 5 +++++ apps/cli/src/commands/import.ts | 7 +------ packages/base/src/config.ts | 8 +------- packages/translate/src/utils.ts | 5 +---- 4 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 .changeset/sour-trainers-refuse.md diff --git a/.changeset/sour-trainers-refuse.md b/.changeset/sour-trainers-refuse.md new file mode 100644 index 0000000..9cee89a --- /dev/null +++ b/.changeset/sour-trainers-refuse.md @@ -0,0 +1,5 @@ +--- +'@rootapp/dolphin': patch +--- + +Fixed local dolphin.y[a]ml not automatically detected issue diff --git a/apps/cli/src/commands/import.ts b/apps/cli/src/commands/import.ts index a72c64d..f6cdbf2 100644 --- a/apps/cli/src/commands/import.ts +++ b/apps/cli/src/commands/import.ts @@ -6,7 +6,7 @@ import { Arguments, ArgumentsCamelCase, Argv, CommandModule } from 'yargs'; import { importLocalizations, loadConfig } from './core.js'; interface CmdArgs extends Arguments { - config: string; + config?: string; bundlePath: string; } @@ -21,7 +21,6 @@ const cmd: CommandModule<{}, CmdArgs> = { describe: 'Path to the config file. Will search dolphin.y[a]ml under root path if not specified', type: 'string', - demandOption: true, }, bundlePath: { alias: 'p', @@ -50,10 +49,6 @@ async function handleImportCommand(args: CmdArgs) { logger.info('==================================='); logger.info('============= Importing ==========='); logger.info('==================================='); - if (!args.config) { - spinner.fail(chalk.red('Config file path is not specified')); - return; - } const config = await loadConfig({ path: args.config, }); diff --git a/packages/base/src/config.ts b/packages/base/src/config.ts index 071fa6c..8787490 100644 --- a/packages/base/src/config.ts +++ b/packages/base/src/config.ts @@ -127,13 +127,7 @@ export async function parseConfigText({ } export async function parseConfig(userConfigPath?: string): Promise { - let configPath = userConfigPath; - if (!configPath) { - throw new Error( - `Missing config file. You can either set using --config or put dolphin.y[a]ml under the root path of the project.`, - ); - } - configPath = absoluteFilePath(configPath, process.cwd()); + let configPath = absoluteFilePath(userConfigPath ?? '', process.cwd()); // Check if configPath is a directory const stats = await fs.promises.stat(configPath); if (stats.isDirectory()) { diff --git a/packages/translate/src/utils.ts b/packages/translate/src/utils.ts index 6649294..b0341d5 100644 --- a/packages/translate/src/utils.ts +++ b/packages/translate/src/utils.ts @@ -189,10 +189,7 @@ function getState({ ); if (isSourceDifferent) { // if source changes, we consider it as new - if (newTargetUnit.state === 'undefined') { - return 'new'; - } - return newTargetUnit.state; + return 'new'; } const isTargetDifferent = newTargetUnit.value !== previousTargetUnit.value; if (isTargetDifferent) { From 4ae6a5844eafd696e1152e99945d8389c2f542c0 Mon Sep 17 00:00:00 2001 From: Lance Wang Date: Sun, 6 Jul 2025 15:29:44 +0800 Subject: [PATCH 2/3] Update tests --- packages/base/src/__tests__/config.test.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/base/src/__tests__/config.test.ts b/packages/base/src/__tests__/config.test.ts index db3bfc9..ceca8c5 100644 --- a/packages/base/src/__tests__/config.test.ts +++ b/packages/base/src/__tests__/config.test.ts @@ -6,10 +6,6 @@ import { describe, expect, it } from 'vitest'; import { LocalizationFormat, parseConfig, parseConfigText } from '../config'; describe('Config Parser', () => { - it('should throw error when no config path provided', async () => { - await expect(parseConfig(undefined)).rejects.toThrow('Missing config file'); - }); - it('should throw error for invalid config path', async () => { await expect( parseConfig('/some-invalid/path/config.yml'), From b5aef35fef023a5c8cc791d42775e5c1fce3d95c Mon Sep 17 00:00:00 2001 From: Lance Wang Date: Sun, 6 Jul 2025 15:34:40 +0800 Subject: [PATCH 3/3] Update tests --- packages/translate/src/__tests__/utils.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/translate/src/__tests__/utils.test.ts b/packages/translate/src/__tests__/utils.test.ts index c8dc65d..a55410a 100644 --- a/packages/translate/src/__tests__/utils.test.ts +++ b/packages/translate/src/__tests__/utils.test.ts @@ -228,6 +228,6 @@ describe('mergeDolphinJsons', () => { }); mergeDolphinJsons({ newJson, previousJson }); - expect(newJson.strings.key1.localizations.ja.state).toBe('translated'); + expect(newJson.strings.key1.localizations.ja.state).toBe('new'); }); });