@kosatyi/ejs 0.0.23 → 0.0.25

package/dist/ejs.mjs

@@ -41,9 +41,9 @@ const isFunction = (v) => typeof v === 'function';
 const isString = (v) => typeof v === 'string';
 const isBoolean = (v) => typeof v === 'boolean';
 
-const isNode = new Function(
-    'try {return this===global;}catch(e){return false;}'
-);
+const isNodeEnv = Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
+
+const isNode = () => isNodeEnv;
 
 const symbolEntities = {
     "'": "'",
@@ -98,6 +98,14 @@ const getPath = (context, name) => {
     return [data, prop]
 };
 
+const ext = (path, defaults) => {
+    const ext = path.split('.').pop();
+    if (ext !== defaults) {
+        path = [path, defaults].join('.');
+    }
+    return path
+};
+
 const extend = (...args) => {
     const target = args.shift();
     return args
@@ -213,25 +221,25 @@ const tags = [
     {
         symbol: '-',
         format(value) {
-            return `'+\n${this.SAFE}(${value},1)+\n'`
+            return `')\n${this.BUFFER}(${this.SAFE}(${value},1))\n${this.BUFFER}('`
         },
     },
     {
         symbol: '=',
         format(value) {
-            return `'+\n${this.SAFE}(${value})+\n'`
+            return `')\n${this.BUFFER}(${this.SAFE}(${value}))\n${this.BUFFER}('`
         },
     },
     {
         symbol: '#',
         format(value) {
-            return `'+\n/**${value}**/+\n'`
+            return `')\n/**${value}**/\n${this.BUFFER}('`
         },
     },
     {
         symbol: '',
         format(value) {
-            return `')\n${value}\n${this.BUFFER}('`
+            return `')\n${value.trim()}\n${this.BUFFER}('`
         },
     },
 ];
@@ -247,13 +255,8 @@ const match = (regex, text, callback) => {
         return match
     });
 };
-/**
- *
- * @param {object} config
- * @return {function(*, *): Function}
- * @constructor
- */
-const Compiler = (config) => {
+
+const configureCompiler = (ejs, config) => {
     const withObject = config.withObject;
     const token = config.token;
     const vars = config.vars;
@@ -276,11 +279,7 @@ const Compiler = (config) => {
     const regex = new RegExp(matches.join('|').concat('|$'), 'g');
     const slurpStart = new RegExp([slurp.match, slurp.start].join(''), 'gm');
     const slurpEnd = new RegExp([slurp.end, slurp.match].join(''), 'gm');
-    /**
-     * @type function
-     * @name Compile
-     */
-    return function (content, path) {
+    return function compiler(content, path) {
         const { SCOPE, SAFE, BUFFER } = vars;
         content = content.replace(/[\r\n]+/g, '\n').replace(/^\s+|\s+$/gm, '');
         content = content
@@ -295,7 +294,7 @@ const Compiler = (config) => {
         });
         source += `');`;
         source = `try{${source}}catch(e){console.info(e)}`;
-        if(withObject) {
+        if (withObject) {
             source = `with(${SCOPE}){${source}}`;
         }
         source = `${BUFFER}.start();${source}return ${BUFFER}.end();`;
@@ -313,27 +312,38 @@ const Compiler = (config) => {
     }
 };
 
-const Wrapper = (config) => {
+const configureWrapper = (config) => {
     const name = config.export;
-    return function (list) {
-        let out = '(function(o){\n';
+    const useStrict = config.withObject !== true;
+    return function Wrapper(list) {
+        let out = '';
+        out += '(function(global,factory){';
+        out += 'typeof exports === "object" && typeof module !== "undefined" ?';
+        out += 'module.exports = factory():';
+        out += 'typeof define === "function" && define.amd ? define(factory):';
+        out += '(global = typeof globalThis !== "undefined" ? globalThis:';
+        out += 'global || self,global["' + name + '"] = factory())';
+        out += '})(this,(function(){';
+        if (useStrict) out += "'use strict';\n";
+        out += 'var list = {};\n';
         list.forEach((item) => {
             out +=
-                'o[' +
+                'list[' +
                 JSON.stringify(item.name) +
                 ']=' +
                 String(item.content) +
-                '\n';
+                ';\n';
         });
-        out += '})(window["' + name + '"] = window["' + name + '"] || {});\n';
+        out += 'return list;}));\n';
         return out
     }
 };
 
-const HttpRequest = (template) =>
-    window.fetch(template).then((response) => response.text());
+const httpRequest = (template) => {
+    return fetch(template).then((response) => response.text())
+};
 
-const FileSystem = (template) =>
+const fileSystem = (template) =>
     new Promise((resolve, reject) => {
         fs.readFile(template, (error, data) => {
             if (error) {
@@ -344,7 +354,7 @@ const FileSystem = (template) =>
         });
     });
 
-const Watcher = (path, cache) =>
+const enableWatcher = (path, cache) =>
     chokidar
         .watch('.', {
             cwd: path,
@@ -356,15 +366,14 @@ const Watcher = (path, cache) =>
             console.log('watcher error: ' + error);
         });
 
-const Template = (config, cache, compile) => {
+const configureTemplate = (ejs, config) => {
     const path = config.path;
-    config.token || {};
+    const { cache, compile } = ejs;
     const resolver = isFunction(config.resolver)
         ? config.resolver
         : isNode()
-        ? FileSystem
-        : HttpRequest;
-
+        ? fileSystem
+        : httpRequest;
     const normalize = (template) => {
         template = [path, template].join('/');
         template = template.replace(/\/\//g, '/');
@@ -377,7 +386,7 @@ const Template = (config, cache, compile) => {
         cache.set(template, content);
         return content
     };
-    const get = (template) => {
+    const template = (template) => {
         if (cache.exist(template)) {
             return cache.resolve(template)
         }
@@ -387,17 +396,14 @@ const Template = (config, cache, compile) => {
         return result(content, template)
     };
     if (config.watch && isNode()) {
-        Watcher(path, cache);
+        enableWatcher(path, cache);
     }
-    return get
+    return template
 };
 
 const resolve = (list) => Promise.all(list).then((list) => list.join(''));
-/**
- *
- * @return {function}
- */
-const Buffer = () => {
+
+const createBuffer = () => {
     let store = [],
         array = [];
     function buffer(value) {
@@ -415,7 +421,7 @@ const Buffer = () => {
         array = store.pop();
         return resolve(result)
     };
-    buffer.error = function(e){
+    buffer.error = function (e) {
         throw e
     };
     buffer.end = function () {
@@ -424,7 +430,7 @@ const Buffer = () => {
     return buffer
 };
 
-const configure = (config, methods) => {
+const configureScope = (ejs, config) => {
     const { EXTEND, LAYOUT, BLOCKS, BUFFER, MACRO } = config.vars;
     function Scope(data = {}) {
         this.initBlocks();
@@ -442,88 +448,88 @@ const configure = (config, methods) => {
             value: method,
             writable: false,
             configurable: false,
-            enumerable: false
+            enumerable: false,
         });
     };
     Scope.property(BUFFER, {
-        value: Buffer(),
+        value: createBuffer(),
         writable: false,
         configurable: false,
-        enumerable: false
+        enumerable: false,
     });
     Scope.property(BLOCKS, {
         value: {},
         writable: true,
         configurable: false,
-        enumerable: false
+        enumerable: false,
     });
     Scope.property(MACRO, {
         value: {},
         writable: true,
         configurable: false,
-        enumerable: false
+        enumerable: false,
     });
     Scope.property(LAYOUT, {
         value: false,
         writable: true,
         configurable: false,
-        enumerable: false
+        enumerable: false,
     });
     Scope.property(EXTEND, {
         value: false,
         writable: true,
         configurable: false,
-        enumerable: false
+        enumerable: false,
     });
-    Scope.method('initBlocks', function() {
+    Scope.method('initBlocks', function () {
         this[BLOCKS] = {};
     });
-    Scope.method('initMacro', function() {
+    Scope.method('initMacro', function () {
         this[MACRO] = {};
     });
-    Scope.method('getMacro', function() {
+    Scope.method('getMacro', function () {
         return this[MACRO]
     });
-    Scope.method('getBuffer', function() {
+    Scope.method('getBuffer', function () {
         return this[BUFFER]
     });
-    Scope.method('getBlocks', function() {
+    Scope.method('getBlocks', function () {
         return this[BLOCKS]
     });
-    Scope.method('setExtend', function(value) {
+    Scope.method('setExtend', function (value) {
         this[EXTEND] = value;
     });
-    Scope.method('getExtend', function() {
+    Scope.method('getExtend', function () {
         return this[EXTEND]
     });
-    Scope.method('setLayout', function(layout) {
+    Scope.method('setLayout', function (layout) {
         this[LAYOUT] = layout;
     });
-    Scope.method('getLayout', function() {
+    Scope.method('getLayout', function () {
         return this[LAYOUT]
     });
-    Scope.method('clone', function(exclude_blocks) {
+    Scope.method('clone', function (exclude_blocks) {
         const filter = [LAYOUT, EXTEND, BUFFER];
         if (exclude_blocks === true) {
             filter.push(BLOCKS);
         }
         return omit(this, filter)
     });
-    Scope.method('extend', function(layout) {
+    Scope.method('extend', function (layout) {
         this.setExtend(true);
         this.setLayout(layout);
     });
-    Scope.method('echo', function() {
+    Scope.method('echo', function () {
         const buffer = this.getBuffer();
         const params = [].slice.call(arguments);
-        params.forEach(function(item) {
+        params.forEach(function (item) {
             buffer(item);
         });
     });
-    Scope.method('fn', function(callback) {
+    Scope.method('fn', function (callback) {
         const buffer = this.getBuffer();
         const context = this;
-        return function() {
+        return function () {
             buffer.backup();
             if (isFunction(callback)) {
                 callback.apply(context, arguments);
@@ -531,30 +537,30 @@ const configure = (config, methods) => {
             return buffer.restore()
         }
     });
-    Scope.method('get', function(name,defaults) {
+    Scope.method('get', function (name, defaults) {
         const path = getPath(this, name);
         const result = path.shift();
         const prop = path.pop();
         return hasProp(result, prop) ? result[prop] : defaults
     });
-    Scope.method('set', function(name,value) {
+    Scope.method('set', function (name, value) {
         const path = getPath(this, name);
         const result = path.shift();
         const prop = path.pop();
         if (this.getExtend() && hasProp(result, prop)) {
             return result[prop]
         }
-        return result[prop] = value
+        return (result[prop] = value)
     });
-    Scope.method('macro', function(name, callback) {
+    Scope.method('macro', function (name, callback) {
         const list = this.getMacro();
         const macro = this.fn(callback);
         const context = this;
-        list[name] = function() {
+        list[name] = function () {
             return context.echo(macro.apply(undefined, arguments))
         };
     });
-    Scope.method('call', function(name) {
+    Scope.method('call', function (name) {
         const list = this.getMacro();
         const macro = list[name];
         const params = [].slice.call(arguments, 1);
@@ -562,13 +568,13 @@ const configure = (config, methods) => {
             return macro.apply(macro, params)
         }
     });
-    Scope.method('block',function(name,callback){
+    Scope.method('block', function (name, callback) {
         const blocks = this.getBlocks();
         blocks[name] = blocks[name] || [];
         blocks[name].push(this.fn(callback));
         if (this.getExtend()) return
         const list = Object.assign([], blocks[name]);
-        const current = function() {
+        const current = function () {
             return list.shift()
         };
         const next = () => {
@@ -583,55 +589,70 @@ const configure = (config, methods) => {
         };
         this.echo(current()(next()));
     });
-    Scope.method('include',function(path, data, cx){
+    Scope.method('include', function (path, data, cx) {
         const context = cx === false ? {} : this.clone(true);
         const params = extend(context, data || {});
         const promise = this.render(path, params);
         this.echo(promise);
     });
-    Scope.method('use',function(path, namespace){
+    Scope.method('use', function (path, namespace) {
         const promise = this.require(path);
-        this.echo(resolve$1(promise,function(exports){
-            const list = this.getMacro();
-            each(exports, function(macro, name) {
-                list[[namespace, name].join('.')] = macro;
-            });
-        },this));
+        this.echo(
+            resolve$1(
+                promise,
+                function (exports) {
+                    const list = this.getMacro();
+                    each(exports, function (macro, name) {
+                        list[[namespace, name].join('.')] = macro;
+                    });
+                },
+                this
+            )
+        );
     });
-    Scope.method('async',function(promise,callback){
+    Scope.method('async', function (promise, callback) {
         this.echo(
-            resolve$1(promise, function(data) {
-                return this.fn(callback)(data)
-            }, this)
+            resolve$1(
+                promise,
+                function (data) {
+                    return this.fn(callback)(data)
+                },
+                this
+            )
         );
     });
-    Scope.method('el',function(tag, attr, content){
+    Scope.method('el', function (tag, attr, content) {
         if (isFunction(content)) {
             content = this.fn(content)();
         }
         this.echo(
-            resolve$1(content, function(content) {
-                return element(tag, attr, content)
-            }, this)
+            resolve$1(
+                content,
+                function (content) {
+                    return element(tag, attr, content)
+                },
+                this
+            )
         );
     });
-    Scope.method('each',function(object, callback){
+    Scope.method('each', function (object, callback) {
         if (isString(object)) {
             object = this.get(object, []);
         }
         each(object, callback);
     });
-    Scope.helpers(methods);
     return Scope
 };
 
-function Cache(config) {
+const global = typeof globalThis !== 'undefined' ? globalThis : window || self;
+
+function configureCache(config) {
     const namespace = config.export;
     const list = {};
     const cache = {
         preload() {
             if (isNode() === false) {
-                this.load(window[namespace]);
+                this.load(global[namespace]);
             }
             return this
         },
@@ -659,51 +680,38 @@ function Cache(config) {
     return cache.preload()
 }
 
-function init(options) {
-    /**
-     * @type {Object}
-     */
+function create(options) {
     const config = {};
-    const helpers = {};
-    const ext = function (path, defaults) {
-        const ext = path.split('.').pop();
-        if (ext !== defaults) {
-            path = [path, defaults].join('.');
-        }
-        return path
-    };
-    const view = {
-        safeValue,
-        element,
+    const ejs = {
+        safeValue: safeValue,
+        element: element,
         output(path, scope) {
-            return view.template(path).then(function (template) {
+            return ejs.template(path).then(function (template) {
                 return template.call(scope, scope, scope.getBuffer(), safeValue)
             })
         },
         render(name, data) {
             const filepath = ext(name, config.extension);
-            const scope = new view.scope(data);
-            return view.output(filepath, scope).then((content) => {
+            const scope = new ejs.scope(data);
+            return ejs.output(filepath, scope).then((content) => {
                 if (scope.getExtend()) {
                     scope.setExtend(false);
                     const layout = scope.getLayout();
                     const data = scope.clone();
-                    return view.render(layout, data)
+                    return ejs.render(layout, data)
                 }
                 return content
             })
         },
         require(name) {
             const filepath = ext(name, config.extension);
-            const scope = new view.scope({});
-            return view.output(filepath, scope).then(() => {
+            const scope = new ejs.scope({});
+            return ejs.output(filepath, scope).then(() => {
                 return scope.getMacro()
             })
         },
         helpers(methods) {
-            methods = methods || {};
-            extend(helpers, methods);
-            view.scope.helpers(methods);
+            ejs.scope.helpers(methods);
         },
         configure(options) {
             config.export = typeProp(isString, defaults.export, options.export);
@@ -725,12 +733,12 @@ function init(options) {
             );
             config.token = extend({}, defaults.token, options.token);
             config.vars = extend({}, defaults.vars, options.vars);
-            view.scope = configure(config, helpers);
-            view.compile = Compiler(config);
-            view.wrapper = Wrapper(config);
-            view.cache = Cache(config);
-            view.template = Template(config, view.cache, view.compile);
-            return view
+            ejs.scope = configureScope(ejs, config);
+            ejs.compile = configureCompiler(ejs, config);
+            ejs.wrapper = configureWrapper(ejs);
+            ejs.cache = configureCache(ejs);
+            ejs.template = configureTemplate(ejs, config);
+            return ejs
         },
         __express(name, options, callback) {
             if (isFunction(options)) {
@@ -753,8 +761,8 @@ function init(options) {
             const filename = path.relative(viewPath, name);
             viewOptions.path = viewPath;
             viewOptions.cache = viewCache;
-            view.configure(viewOptions);
-            return view
+            ejs.configure(viewOptions);
+            return ejs
                 .render(filename, options)
                 .then((content) => {
                     callback(null, content);
@@ -764,24 +772,20 @@ function init(options) {
                 })
         },
     };
-    /**
-     *
-     */
-    view.configure(options || {});
-    /**
-     *
-     */
-    view.helpers({
+    ejs.configure(options || {});
+    ejs.helpers({
         require(name) {
-            return view.require(name, this)
+            return ejs.require(name, this)
         },
         render(name, data) {
-            return view.render(name, data)
+            return ejs.render(name, data)
         },
     });
-    return view
+    return ejs
 }
 
-var index = init();
+const instance = create();
+
+instance.create = create;
 
-export { index as default };
+export { instance as default };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@kosatyi/ejs",
   "description": "EJS Templates",
   "homepage": "https://github.com/kosatyi/ejs",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "main": "dist/ejs.cjs",
   "module": "dist/ejs.mjs",
   "browser": "dist/ejs.js",

package/dist/templates.js

@@ -1,2 +0,0 @@
-(function(o){
-})(window["ejs.precompiled"] = window["ejs.precompiled"] || {});