feat: infuse formatting with @intlify/cli formatter (#192)

Author: kazupon

package.json

@@ -25,7 +25,9 @@
     }
   },
   "dependencies": {
+    "@intlify/cli": "^0.10.0",
     "@vue/component-compiler-utils": "^3.0.0",
+    "cosmiconfig": "^7.0.1",
     "debug": "^4.1.1",
     "deep-diff": "^1.0.2",
     "deepmerge": "^4.2.2",

src/commands/infuse.ts

@@ -1,4 +1,8 @@
 import { Arguments, Argv } from 'yargs'
+import fs from 'fs'
+import path from 'path'
+import { applyDiff } from 'deep-diff'
+import glob from 'glob'
 
 import {
   resolve,
@@ -7,15 +11,12 @@ import {
   loadNamespaceDictionary,
   splitLocaleMessages,
   readIgnoreFile,
-  returnIgnoreInstance
+  returnIgnoreInstance,
+  getPrettierConfig
 } from '../utils'
 
 import infuse from '../infuser'
 import squeeze from '../squeezer'
-import fs from 'fs'
-import path from 'path'
-import { applyDiff } from 'deep-diff'
-import glob from 'glob'
 import {
   Locale,
   LocaleMessages,
@@ -36,6 +37,7 @@ type InfuseOptions = {
   unbundleTo?: string
   unbundleMatch?: string
   namespace?: string
+  prettier?: string
   dryRun: boolean
   ignoreFileName?: string
 }
@@ -89,6 +91,11 @@ export const builder = (args: Argv): Argv<InfuseOptions> => {
       alias: 'i',
       describe: 'dot ignore file name, i.e. .ignore-i18n'
     })
+    .option('prettier', {
+      type: 'string',
+      alias: 'p',
+      describe: 'the config file path of prettier'
+    })
 }
 
 export const handler = async (args: Arguments<InfuseOptions>) => {
@@ -100,6 +107,12 @@ export const handler = async (args: Arguments<InfuseOptions>) => {
     returnIgnoreInstance(ig, ignoreFiles)
   }
 
+  const prettierConfig = args.prettier
+    ? await getPrettierConfig(path.resolve(process.cwd(), args.prettier))
+    : undefined
+  debug('prettier config', prettierConfig)
+  const format = loadFormat()
+
   let nsDictionary = {} as NamespaceDictionary
   try {
     if (args.namespace) {
@@ -122,7 +135,7 @@ export const handler = async (args: Arguments<InfuseOptions>) => {
   const newSources = infuse(targetPath, sources, meta)
 
   if (!args.dryRun) {
-    writeSFC(newSources)
+    writeSFC(newSources, format, prettierConfig)
   }
 
   if (!args.dryRun && external) {
@@ -248,9 +261,13 @@ function getTargetLocaleMessages (messages: LocaleMessages, hierarchy: string[])
   }, {} as LocaleMessages)
 }
 
-function writeSFC (sources: SFCFileInfo[]) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function writeSFC (sources: SFCFileInfo[], format?: any, prettier?: any) {
   // TODO: async implementation
   sources.forEach(({ path, content }) => {
+    if (format && prettier) {
+      content = format(content, path, { prettier })
+    }
     fs.writeFileSync(path, content)
   })
 }
@@ -262,6 +279,16 @@ function writeExternalLocaleMessages (meta: MetaExternalLocaleMessages[]) {
   })
 }
 
+function loadFormat () {
+  let format
+  try {
+    format = require('@intlify/cli').format
+  } catch (e) {
+    debug('@intlify/cli format loading error', e)
+  }
+  return format
+}
+
 export default {
   command,
   aliases,

src/utils.ts

@@ -35,6 +35,7 @@ import { promisify } from 'util'
 import type { Ignore } from 'ignore'
 import querystring from 'query-string'
 import { flatten, unflatten } from 'flat'
+import { cosmiconfig } from 'cosmiconfig'
 const jsonDiff = require('json-diff') // NOTE: not provided type definition ...
 
 import { debug as Debug } from 'debug'
@@ -532,3 +533,8 @@ export async function pushFunc (options: PushOptions): Promise<unknown> {
   }
   return Promise.resolve()
 }
+
+export async function getPrettierConfig (filepath: string) {
+  const explorer = cosmiconfig('prettier')
+  return await explorer.load(filepath)
+}

test/commands/infuse.test.ts

@@ -63,6 +63,13 @@ jest.mock('path', () => ({
 }))
 import path from 'path'
 
+// mock: `@intlify/cli
+// jest.mock('@intlify/cli', () => ({
+//   __esModule: true,
+//   ...jest.requireActual('@intlify/cli')
+// }))
+// import '@intlify/cli'
+
 // -------------------
 // setup/teadown hooks