@rse/nunjucks-cli 1.3.0 → 1.4.0

package/README.md

@@ -48,6 +48,7 @@ Options
 $ nunjucks
   [-h|--help] [-V|--version]
   [-c|--config <config-file>]
+  [-C|--option <key>=<value>]
   [-d|--defines <context-file>]
   [-D|--define <key>=<value>]
   [-e|--extension <module-name>]
@@ -60,7 +61,9 @@ $ nunjucks
 - `-V`|`--version`:<br/>
   show program version information.
 - `-c`|`--config` `<config-file>`:<br/>
-  load Nunjucks configuration YAML file
+  load Nunjucks configuration YAML file.
+- `-C`|`--option` `<key>=<value>`:<br/>
+  set Nunjucks configuration option.
 - `-d`|`--defines` `<context-file>`:<br/>
   load context definition YAML file.
 - `-D`|`--define` `<key>=<value>`:<br/>

package/nunjucks.js

@@ -24,6 +24,7 @@ const argv = yargs
         "[-h|--help] " +
         "[-V|--version] " +
         "[-c|--config <config-file>] " +
+        "[-C|--option <key>=<value>] " +
         "[-d|--defines <context-file>] " +
         "[-D|--define <key>=<value>] " +
         "[-e|--extension <module-name>] " +
@@ -33,13 +34,19 @@ const argv = yargs
     .help("h").alias("h", "help").default("h", false).describe("h", "show usage help")
     .boolean("V").alias("V", "version").describe("V", "show program version information")
     .string("c").nargs("c", 1).alias("c", "config").describe("c", "load Nunjucks configuration YAML file")
+    .array("C").nargs("C", 1).alias("C", "option").describe("C", "set Nunjucks configuration option")
     .string("d").nargs("d", 1).alias("d", "defines").describe("d", "load context definition YAML file")
-    .string("D").nargs("D", 1).alias("D", "define").describe("D", "set context definition key/value")
+    .array("D").nargs("D", 1).alias("D", "define").describe("D", "set context definition key/value")
     .array("e").nargs("e", 1).alias("e", "extension").describe("e", "load Nunjucks JavaScript extension module")
     .string("o").nargs("o", 1).alias("o", "output").default("o", "-").describe("o", "save output file")
     .strict()
     .showHelpOnFail(true)
     .demand(0)
+    .parserConfiguration({
+        "short-option-groups": true,
+        "parse-numbers":       true,
+        "boolean-negation":    true
+    })
     .parse(process.argv.slice(2))
 
 /*  handle special version request  */
@@ -103,8 +110,6 @@ context.env = process.env
 
 /*  add context defines  */
 if (argv.define) {
-    if (typeof argv.define === "string")
-        argv.define = [ argv.define ]
     argv.define.forEach((define) => {
         let [ , key, val ] = define.match(/^([^=]+)(?:=(.*))?$/)
         if (val === undefined)
@@ -124,8 +129,12 @@ if (argv.config) {
         process.exit(1)
     }
 }
+if (argv.options) {
+    console.log(argv.options)
+    options = Object.assign(options, argv.options)
+}
 options = Object.assign({}, {
-    autoescape:       true,
+    autoescape:       false,
     throwOnUndefined: false,
     trimBlocks:       true,
     lstripBlocks:     true,
@@ -139,12 +148,14 @@ const env = nunjucks.configure(inputFile, options)
 /*  load external extension files  */
 if (typeof argv.extension === "object" && argv.extension instanceof Array) {
     for (let extension of argv.extension) {
-        let modpath = null
-        try {
-            modpath = require.resolve(extension)
-        }
-        catch (ex) {
-            modpath = null
+        let modpath = path.resolve(extension)
+        if (!fs.existsSync(modpath)) {
+            try {
+                modpath = require.resolve(extension)
+            }
+            catch (ex) {
+                modpath = null
+            }
         }
         if (modpath === null) {
             console.error(chalk.red(`nunjucks: ERROR: failed to find extension module: ${extension}`))

package/package.json

@@ -1,7 +1,7 @@
 {
     "name":                       "@rse/nunjucks-cli",
     "publishConfig":              { "access": "public" },
-    "version":                    "1.3.0",
+    "version":                    "1.4.0",
     "description":                "Nunjucks Template Rendering Command-Line Interface",
     "author": {
         "name":                   "Dr. Ralf S. Engelschall",
@@ -29,7 +29,7 @@
         "eslint":                 "8.47.0",
         "eslint-config-standard": "17.1.0",
         "eslint-plugin-promise":  "6.1.1",
-        "eslint-plugin-import":   "2.28.0",
+        "eslint-plugin-import":   "2.28.1",
         "eslint-plugin-node":     "11.1.0"
     },
     "upd":                        [ "!chalk" ],