Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/spicy-birds-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"lingo.dev": patch
---

run prettier in context of the target file
12 changes: 6 additions & 6 deletions packages/cli/src/cli/loaders/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ export default function createBucketLoader(
case "html":
return composeLoaders(
createTextFileLoader(bucketPathPattern),
createPrettierLoader({ parser: "html", alwaysFormat: true }),
createPrettierLoader({ parser: "html", bucketPathPattern }),
createHtmlLoader(),
createSyncLoader(),
createUnlocalizableLoader(options.isCacheRestore, options.returnUnlocalizedKeys),
);
case "json":
return composeLoaders(
createTextFileLoader(bucketPathPattern),
createPrettierLoader({ parser: "json" }),
createPrettierLoader({ parser: "json", bucketPathPattern }),
createJsonLoader(),
createFlatLoader(),
createSyncLoader(),
Expand All @@ -80,7 +80,7 @@ export default function createBucketLoader(
case "markdown":
return composeLoaders(
createTextFileLoader(bucketPathPattern),
createPrettierLoader({ parser: "markdown" }),
createPrettierLoader({ parser: "markdown", bucketPathPattern }),
createMarkdownLoader(),
createSyncLoader(),
createUnlocalizableLoader(options.isCacheRestore, options.returnUnlocalizedKeys),
Expand Down Expand Up @@ -130,7 +130,7 @@ export default function createBucketLoader(
case "yaml":
return composeLoaders(
createTextFileLoader(bucketPathPattern),
createPrettierLoader({ parser: "yaml" }),
createPrettierLoader({ parser: "yaml", bucketPathPattern }),
createYamlLoader(),
createFlatLoader(),
createSyncLoader(),
Expand All @@ -139,7 +139,7 @@ export default function createBucketLoader(
case "yaml-root-key":
return composeLoaders(
createTextFileLoader(bucketPathPattern),
createPrettierLoader({ parser: "yaml" }),
createPrettierLoader({ parser: "yaml", bucketPathPattern }),
createYamlLoader(),
createRootKeyLoader(true),
createFlatLoader(),
Expand All @@ -149,7 +149,7 @@ export default function createBucketLoader(
case "flutter":
return composeLoaders(
createTextFileLoader(bucketPathPattern),
createPrettierLoader({ parser: "json" }),
createPrettierLoader({ parser: "json", bucketPathPattern }),
createJsonLoader(),
createFlutterLoader(),
createFlatLoader(),
Expand Down
13 changes: 9 additions & 4 deletions packages/cli/src/cli/loaders/prettier.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import path from "path";
import prettier, { Options } from "prettier";
import { ILoader } from "./_types";
import { createLoader } from "./_utils";

export type PrettierLoaderOptions = {
parser: Options["parser"];
bucketPathPattern: string;
alwaysFormat?: boolean;
};

Expand All @@ -13,8 +15,11 @@ export default function createPrettierLoader(options: PrettierLoaderOptions): IL
return data;
},
async push(locale, data) {
const prettierConfig = await loadPrettierConfig();
if (!prettierConfig && !options.alwaysFormat) {
const draftPath = options.bucketPathPattern.replaceAll("[locale]", locale);
const finalPath = path.resolve(draftPath);

const prettierConfig = await loadPrettierConfig(finalPath);
if (!prettierConfig) {
return data;
}

Expand All @@ -36,9 +41,9 @@ export default function createPrettierLoader(options: PrettierLoaderOptions): IL
});
}

async function loadPrettierConfig() {
async function loadPrettierConfig(filePath: string) {
try {
const config = await prettier.resolveConfig(process.cwd());
const config = await prettier.resolveConfig(filePath);
return config;
} catch (error) {
return {};
Expand Down