@thegetty/quire-cli 1.0.0-rc.12 → 1.0.0-rc.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thegetty/quire-cli",
   "description": "Quire command-line interface",
-  "version": "1.0.0-rc.12",
+  "version": "1.0.0-rc.14",
   "author": "Getty Digital",
   "license": "SEE LICENSE IN https://github.com/thegetty/quire/blob/main/LICENSE",
   "bugs": {

package/src/commands/pdf.js

@@ -4,7 +4,6 @@ import fs from 'fs-extra'
 import libPdf from '#lib/pdf/index.js'
 import open from 'open'
 import path from 'node:path'
-import { validateUserConfig } from '../../../11ty/_plugins/globalData/validator.js'
 import yaml from 'js-yaml'
 
 /**
@@ -12,32 +11,33 @@ import yaml from 'js-yaml'
  *  
  * @param {path} string - file path to config file
  * 
- * @todo refactor loading configs to a separate module,
- * which uses the same validator(s) as the build proceess
- * 
  * @return {Object|undefined} User configuration object or undefined
+ * 
+ * @todo consider hardcoding a version check against .quire / project's package.json ver
  */
-function loadConfig(confPath) {
-  if (!fs.existsSync(confPath)) {
+async function loadConfig(configPath) {
+  if (!fs.existsSync(configPath)) {
     return undefined
   }
 
-  const data = fs.readFileSync(confPath)
+  const data = fs.readFileSync(configPath)
   let config = yaml.load(data)
 
-  // NB: Schemas may be project specific so the CLI must loads from project root rather than package root
+  // NB: Schemas and validators are specific to the 11ty version of the project being built
   const schemaPath = path.join(projectRoot,'_plugins','schemas','config.json')
+  const validatorPath = path.join(projectRoot, '_plugins', 'globalData', 'validator.js')
 
-  // TODO: Check the project version string for whether we should check the schema
-  if (fs.existsSync(schemaPath)) {
+  if (fs.existsSync(schemaPath) && fs.existsSync(validatorPath)) {
 
-    const sch = fs.readFileSync(schemaPath)
-    const schema = JSON.parse(sch)      
+    const { validateUserConfig } = await import(validatorPath)
+  
+    const schemaJSON = fs.readFileSync(schemaPath)
+    const schema = JSON.parse(schemaJSON)
 
     try {
-      config = validateUserConfig('config',config,{config: schema})    
-    } catch (err) {
-      console.error(err)
+      config = validateUserConfig('config', config, { config: schema })
+    } catch (error) {
+      console.error(error)
       process.exit(1)
     }
   }
@@ -45,8 +45,6 @@ function loadConfig(confPath) {
   return config
 }
 
-const quireConfig = loadConfig(path.join(projectRoot,'content','_data','config.yaml'))
-
 /**
  * Quire CLI `pdf` Command
  *
@@ -74,7 +72,6 @@ export default class PDFCommand extends Command {
   }
 
   constructor() {
-    const config = loadConfig(path.join(projectRoot,'content','_data','config.yaml'))
     super(PDFCommand.definition)
   }
 
@@ -86,7 +83,9 @@ export default class PDFCommand extends Command {
     const publicationInput = path.join(projectRoot, paths.output, 'pdf.html')
     const coversInput = path.join(projectRoot, paths.output, 'pdf-covers.html')
 
-    if (quireConfig===undefined) {
+    const quireConfig = await loadConfig(path.join(projectRoot,'content','_data','config.yaml'))
+
+    if (quireConfig === undefined) {
       console.error(`[quire pdf]: ERROR Unable to find a configuration file at ${path.join(projectRoot,'content','_data','config.yaml')}\nIs the command being run in a quire project?`)
       process.exit(1)
     }
@@ -96,7 +95,9 @@ export default class PDFCommand extends Command {
       process.exit(1)
     }
 
-    const output = quireConfig.pdf !== undefined ? path.join(paths.output, quireConfig.pdf.outputDir, `${quireConfig.pdf.filename}.pdf`) : path.join(projectRoot, `${options.lib}.pdf`)
+    const output = quireConfig.pdf !== undefined
+      ? path.join(paths.output, quireConfig.pdf.outputDir, `${quireConfig.pdf.filename}.pdf`)
+      : path.join(projectRoot, `${options.lib}.pdf`)
 
     const pdfLib = await libPdf(options.lib, { ...options, pdfConfig: quireConfig.pdf })
     await pdfLib(publicationInput, coversInput, output)