refactor: Move some things around

package.json

@@ -1,12 +1,12 @@
 {
   "name": "@fabschurt/microgen",
   "author": "Fabien Schurter",
-  "license": "MIT",
   "type": "module",
-  "main": "src/main.js",
+  "license": "MIT",
+  "main": "./src/main.js",
   "imports": {
     "#src/*": "./src/*.js",
-    "#tests/helpers": "./tests/_helpers.js"
+    "#tests/helpers": "./tests/.lib/helpers.js"
   },
   "bin": {
     "microgen": "./bin/cli.js"

src/adapter/pug.js

@@ -0,0 +1,10 @@
+const TEMPLATE_EXT = '.pug'
+
+export const renderTemplate = (
+  (renderPug, readFile) => (
+    (templateBasePath, data) => (
+      readFile(templateBasePath + TEMPLATE_EXT)
+        .then((template) => renderPug(template, data))
+    )
+  )
+)

src/domain/assets.js

@@ -2,38 +2,36 @@ const INDEX_TEMPLATE_BASENAME = 'index'
 const INDEX_OUTPUT_NAME = 'index.html'
 const ASSETS_DIR_NAME = 'assets'
 
-export function renderProjectIndex(
-  withSrcDir,
-  withBuildDir,
-  writeFile,
-  renderTemplate,
-  data,
-) {
-  return withSrcDir((prefixWithSrcDir) => {
-    return withBuildDir(async (prefixWithBuildDir) => {
-      return writeFile(
-        prefixWithBuildDir(INDEX_OUTPUT_NAME),
-        await renderTemplate(
-          prefixWithSrcDir(INDEX_TEMPLATE_BASENAME),
-          data,
-        ),
-      )
-    })
-  })
-}
+export const renderProjectIndex = (
+  (withSrcDir, withBuildDir, writeFile, renderTemplate) => (
+    (data) => (
+      withSrcDir((prefixWithSrcDir) => (
+        withBuildDir(async (prefixWithBuildDir) => (
+          writeFile(
+            prefixWithBuildDir(INDEX_OUTPUT_NAME),
+            await renderTemplate(
+              prefixWithSrcDir(INDEX_TEMPLATE_BASENAME),
+              data,
+            ),
+          )
+        ))
+      ))
+    )
+  )
+)
 
-export function copyProjectAssetsDir(
+export const copyProjectAssetsDir = (
   withSrcDir,
   withBuildDir,
   copyDir,
   ifPathExists,
-) {
-  return withSrcDir((prefixWithSrcDir) => {
-    return withBuildDir((prefixWithBuildDir) => {
-      return ifPathExists(
+) => (
+  withSrcDir((prefixWithSrcDir) => (
+    withBuildDir((prefixWithBuildDir) => (
+      ifPathExists(
         prefixWithSrcDir(ASSETS_DIR_NAME),
         (dirPath) => copyDir(dirPath, prefixWithBuildDir(ASSETS_DIR_NAME)),
       )
-    })
-  })
-}
+    ))
+  ))
+)

src/domain/data.js

@@ -1,30 +1,29 @@
 const DATA_FILE_PATH = 'data.json'
 const ENV_VAR_PLACEHOLDER_PATTERN = /^%(.+)%$/
 
-function captureEnvVarName(value) {
+const captureEnvVarName = (value) => {
   const match = value.match?.(ENV_VAR_PLACEHOLDER_PATTERN)
 
   return match ? match[1] : null
 }
 
-export function parseProjectData(parseJSONFile, withSrcDir) {
-  return withSrcDir((prefixWithSrcDir) => parseJSONFile(prefixWithSrcDir(DATA_FILE_PATH)))
-}
+export const parseProjectData = (parseJSONFile, withSrcDir) => (
+  withSrcDir((prefixWithSrcDir) => parseJSONFile(prefixWithSrcDir(DATA_FILE_PATH)))
+)
 
-export function mergeDataWithEnvVars(
-  deepCloneObject,
-  transformObjectValues,
-  data,
-  envVars,
-) {
-  return transformObjectValues(
-    deepCloneObject(data),
-    (obj, key) => {
-      const envVarName = captureEnvVarName(obj[key])
+export const mergeDataWithEnvVars = (
+  (deepCloneObject, transformObjectValues) => (
+    (data, envVars) => (
+      transformObjectValues(
+        deepCloneObject(data),
+        (obj, key) => {
+          const envVarName = captureEnvVarName(obj[key])
 
-      if (envVarName) {
-        obj[key] = envVars[envVarName] ?? null
-      }
-    }
+          if (envVarName) {
+            obj[key] = envVars[envVarName] ?? null
+          }
+        },
+      )
+    )
   )
-}
+)

src/domain/i18n.js

@@ -5,15 +5,19 @@ const LANG_PATTERN = /^[a-z]{2}$/
 const TRANSLATION_DIR_PATH = 'i18n'
 const TRANSLATION_FILE_EXT = '.json'
 
-export function parseProjectTranslations(parseJSONFile, withSrcDir, lang) {
-  assert.match(lang, LANG_PATTERN, `'${lang}' is not a valid language code.`)
+export const parseProjectTranslations = (
+  (parseJSONFile, withSrcDir) => (
+    (lang) => {
+      assert.match(lang, LANG_PATTERN, `'${lang}' is not a valid language code.`)
 
-  return withSrcDir((prefixWithSrcDir) => {
-    const translationFilePath = join(
-      prefixWithSrcDir(TRANSLATION_DIR_PATH),
-      lang + TRANSLATION_FILE_EXT,
-    )
+      return withSrcDir((prefixWithSrcDir) => {
+        const translationFilePath = join(
+          prefixWithSrcDir(TRANSLATION_DIR_PATH),
+          lang + TRANSLATION_FILE_EXT,
+        )
 
-    return parseJSONFile(translationFilePath)
-  })
-}
+        return parseJSONFile(translationFilePath)
+      })
+    }
+  )
+)

src/main.js

@@ -18,46 +18,18 @@ import {
   mergeObjectList,
   accessObjectProp,
 } from '#src/utils/object'
-import renderTemplate from '#src/adapter/renderTemplate/pug'
+import { renderTemplate } from '#src/adapter/pug'
 import { format } from 'node:util'
 import { render as renderPug } from 'pug'
 
-function parseData(parseJSONFile, withSrcDir, lang = null, envVars = []) {
-  return Promise.all([
-    parseProjectData(parseJSONFile, withSrcDir)
-      .then((data) => mergeDataWithEnvVars(
-        deepCloneObject,
-        transformObjectValues,
-        data,
-        envVars,
-      ))
-    ,
-    lang
-      ? (
-        parseProjectTranslations(parseJSONFile, withSrcDir, lang)
-          .then((dictionary) => ({
-            _: {
-              trans: (transKey, ...args) => (
-                format(
-                  accessObjectProp(dictionary, transKey),
-                  ...args,
-                )
-              )
-            },
-          }))
-      ) : {}
-    ,
-  ])
-    .then(cleanUpObjectList)
-    .then(mergeObjectList)
-}
-
-export default async function main(
+export default (async (
   srcDirPath,
   buildDirPath,
   lang = null,
   envVars = {},
-) {
+) => {
+  const _parseJSONFile = parseJSONFile(ifPathExists, readFile)
+
   await ifPathExists(buildDirPath, rmDir)
 
   const [withSrcDir, withBuildDir] = await Promise.all([
@@ -66,21 +38,45 @@ export default async function main(
   ])
 
   return (
-    parseData(
-      (filePath) => parseJSONFile(ifPathExists, readFile, filePath),
-      withSrcDir,
-      lang,
-      envVars,
-    )
+    Promise.all([
+      parseProjectData(_parseJSONFile, withSrcDir)
+        .then(
+          (data) => mergeDataWithEnvVars(
+            deepCloneObject,
+            transformObjectValues,
+          )(
+            data,
+            envVars,
+          )
+        )
+      ,
+      lang
+        ? (
+          parseProjectTranslations(_parseJSONFile, withSrcDir)(lang)
+            .then((dictionary) => ({
+              _: {
+                trans: (msgID, ...args) => (
+                  format(
+                    accessObjectProp(dictionary, msgID),
+                    ...args,
+                  )
+                )
+              },
+            }))
+        )
+        : {}
+      ,
+    ])
+      .then(cleanUpObjectList)
+      .then(mergeObjectList)
       .then((data) => (
         Promise.all([
           renderProjectIndex(
             withSrcDir,
             withBuildDir,
             writeFile,
-            (templateBasePath, data) => renderTemplate(renderPug, readFile, templateBasePath, data),
-            data,
-          ),
+            renderTemplate(renderPug, readFile),
+          )(data),
           copyProjectAssetsDir(
             withSrcDir,
             withBuildDir,
@@ -90,4 +86,4 @@ export default async function main(
         ])
       ))
   )
-}
+})