added ops argument to engine

Author: redexp

README.md

@@ -146,7 +146,7 @@ const express = require('express');
 const app = express();
 const engine = require('express-engine-jsx');
 
-server.set('views', '/path/to/views');
+server.set('views', './path/to/views');
 server.set('view engine', 'jsx');
 server.engine('jsx', engine);
 
@@ -167,17 +167,18 @@ const engine = require('express-engine-jsx');
 It's a function which takes three arguments:
 
  * `path` - path to jsx file
- * `locals` - object with properties which will be local variables in jsx file
+ * `props` - object with properties which will be local variables in jsx file. `locals` property will be visible for all deep components. Properties of `locals` object will be as local variables in all deep components.   
+ * `options` - optional, object which overwrites any of next three [global options](#options) `doctype`, `replace`, `renderer`
  * `callback` - optional, Node style callback which will receive result of `options.renderer` as second argument
 
-If you pass to `engine` only path and locals then it will return html.
+If you pass to `engine` arguments without callback then it will return result of `renderer` of [global options](#options).
 ```js
 engine('/path/to/view', {prop: 'value'}, (err, html) => console.log(html));
 
 const html = engine('/path/to/view', {prop: 'value'});
 ```
 
-Also, it has method `engine.setOptions(options)` which can modify [options](#options)
+Also, it has method `engine.setOptions(options)` which can modify [global options](#options)
 
 ### options
 

index.d.ts

@@ -4,24 +4,14 @@ import {ParserOptions} from '@babel/parser/typings/babel-parser';
 import {BabylonOptions} from 'babylon';
 import {createElement, Context} from 'react';
 
-declare function engine(path: string, params: object, cb: HtmlCallback): void;
+declare function engine(path: string, params: Params, ops: Ops, cb: HtmlCallback): void;
+declare function engine(path: string, params: Params, cb: HtmlCallback): void;
 declare function engine(path: string, cb: HtmlCallback): void;
-declare function engine(path: string, params?: object): HtmlResult;
+declare function engine(path: string, params?: Params, ops?: Ops): HtmlResult;
 
 type HtmlCallback = (err: null|Error, html: HtmlResult) => void;
 
 declare namespace engine {
-    interface Options {
-        DEV?: boolean,
-        doctype?: string,
-        renderer?: (node: ReturnType<typeof createElement>) => HtmlResult,
-        replace?: (html: HtmlResult, params: object) => HtmlResult,
-        templatePath?: string,
-        parserOptions?: ParserOptions,
-        sourceMap?: boolean,
-        addOnChange?: boolean,
-    }
-
     interface ConvertOptions {
         path?: string,
         sourceMap?: boolean,
@@ -51,5 +41,25 @@ declare namespace engine {
 
 export = engine;
 
+interface Params {
+    locals?: object,
+    _locals?: object,
+    settings?: object,
+    [prop: string]: any,
+}
+
 type JsxCode = string | Buffer;
-type HtmlResult = string | Stream;
+type HtmlResult = string | Stream;
+
+interface Options {
+    DEV?: boolean,
+    doctype?: string,
+    renderer?: (node: ReturnType<typeof createElement>) => HtmlResult,
+    replace?: (html: HtmlResult, params: object) => HtmlResult,
+    templatePath?: string,
+    parserOptions?: ParserOptions,
+    sourceMap?: boolean,
+    addOnChange?: boolean,
+}
+
+type Ops = Pick<Options, 'renderer' | 'replace' | 'doctype'>;

index.js

@@ -8,10 +8,15 @@ const Context = require('./Context');
 
 module.exports = engine;
 
-function engine(path, params = {}, cb = null) {
+function engine(path, params = {}, ops = null, cb = null) {
 	if (typeof params === 'function') {
 		cb = params;
 		params = {};
+		ops = null;
+	}
+	else if (typeof ops === 'function') {
+		cb = ops;
+		ops = null;
 	}
 
 	const Component = requireJSX(path.replace(/\.jsx$/, ''));
@@ -21,7 +26,7 @@ function engine(path, params = {}, cb = null) {
 		settings: params.settings,
 	};
 
-	const {renderer, replace, doctype} = options;
+	const {renderer, replace, doctype} = Object.assign({}, options, ops);
 
 	try {
 		var html = renderer(