app-bundler 0.1.16 → 0.2.1

package/lib/bundler.js

@@ -76,6 +76,10 @@ var _src_handlers_script_common_js_CommonJsPathResolver = {};
 var _src_handlers_script_common_js_CommonJsRewriter = {};
 var _src_handlers_script_common_js_ModuleWrapper = {};
 var _src_handlers_script_common_js_templates_Templates = {};
+var _src_handlers_script_copy_js_CopyJsBuilder = {};
+var _src_handlers_script_copy_js_CopyJsHandler = {};
+var _src_handlers_script_copy_js_CopyJsParser = {};
+var _src_handlers_script_copy_js_CopyJsRewriter = {};
 var _src_handlers_script_global_js_GlobalJsBuilder = {};
 var _src_handlers_script_global_js_GlobalJsHandler = {};
 var _src_handlers_script_global_js_GlobalJsParser = {};
@@ -130,7 +134,7 @@ let assert = require('assert');
 exports.assert = assert;
 let logger = require('atma-logger');
 exports.logger = logger;
-let io = g.io || require('atma-io');
+let io = (g.io || require('atma-io'));
 exports.io = io;
 /* Make compatible with previous atma-loaders */
 g.Class = require('atma-class');
@@ -164,8 +168,8 @@ var _src_utils_path;
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.path_toAbsolute = exports.path_removeQuery = exports.path_sliceQuery = exports.path_sliceHash = exports.path_combine = exports.path_toRelative = exports.path_isRelative = exports.path_resolveUrl = exports.path_normalize = exports.path_resolveCurrent = exports.path_withProtocol = exports.path_appendQuery = exports.path_getExtension = exports.path_getFile = exports.path_getDir = void 0;
-var isWeb = true;
+exports.path_toAbsolute = exports.path_changeExtension = exports.path_removeQuery = exports.path_sliceQuery = exports.path_sliceHash = exports.path_combine = exports.path_toRelative = exports.path_isRelative = exports.path_resolveUrl = exports.path_normalize = exports.path_resolveCurrent = exports.path_withProtocol = exports.path_appendQuery = exports.path_getExtension = exports.path_getFile = exports.path_getDir = void 0;
+let isWeb = true;
 function path_getDir(path) {
     return path.substring(0, path.lastIndexOf('/') + 1);
 }
@@ -185,17 +189,17 @@ function path_getFile(path) {
 exports.path_getFile = path_getFile;
 ;
 function path_getExtension(path) {
-    var query = path.indexOf('?');
+    let query = path.indexOf('?');
     if (query !== -1) {
         path = path.substring(0, query);
     }
-    var match = rgx_EXT.exec(path);
+    let match = rgx_EXT.exec(path);
     return match == null ? '' : match[1];
 }
 exports.path_getExtension = path_getExtension;
 ;
 function path_appendQuery(path, key, val) {
-    var conjunctor = path.indexOf('?') === -1 ? '?' : '&';
+    let conjunctor = path.indexOf('?') === -1 ? '?' : '&';
     return path + conjunctor + key + '=' + val;
 }
 exports.path_appendQuery = path_appendQuery;
@@ -205,7 +209,7 @@ function path_withProtocol(path) {
 }
 exports.path_withProtocol = path_withProtocol;
 ;
-var current_;
+let current_;
 function path_resolveCurrent() {
     if (current_ != null)
         return current_;
@@ -214,7 +218,7 @@ function path_resolveCurrent() {
 exports.path_resolveCurrent = path_resolveCurrent;
 ;
 function path_normalize(path) {
-    var path_ = path
+    let path_ = path
         .replace(/\\/g, '/')
         // remove double slashes, but not near protocol
         .replace(/([^:\/])\/{2,}/g, '$1/')
@@ -231,7 +235,7 @@ function path_normalize(path) {
 exports.path_normalize = path_normalize;
 ;
 function path_resolveUrl(path, base) {
-    var url = path_normalize(path);
+    let url = path_normalize(path);
     if (path_isRelative(url)) {
         return path_normalize(path_combine(base || path_resolveCurrent(), url));
     }
@@ -262,9 +266,9 @@ function path_toRelative(path, anchor, base) {
         return path_.substring(absolute_.length);
     }
     else {
-        var sub = '../';
+        let sub = '../';
         while (true) {
-            var folder = absolute_.replace(/[^\/]+\/?$/, '');
+            let folder = absolute_.replace(/[^\/]+\/?$/, '');
             if (folder === '' || folder === absolute_) {
                 break;
             }
@@ -280,7 +284,9 @@ function path_toRelative(path, anchor, base) {
 exports.path_toRelative = path_toRelative;
 ;
 function path_combine(...args) {
-    var out = '', imax = args.length, i = -1, x;
+    let out = '';
+    let imax = args.length;
+    let i = -1, x;
     while (++i < imax) {
         x = args[i];
         if (!x)
@@ -303,38 +309,54 @@ function path_combine(...args) {
 exports.path_combine = path_combine;
 ;
 function path_sliceHash(url) {
-    if (url == null)
+    if (url == null) {
         return null;
-    var i = url.indexOf('#');
-    if (i === -1)
+    }
+    let i = url.indexOf('#');
+    if (i === -1) {
         return null;
+    }
     return url.substring(i);
 }
 exports.path_sliceHash = path_sliceHash;
 ;
 function path_sliceQuery(url) {
-    if (url == null)
+    if (url == null) {
         return null;
-    var i = url.indexOf('?');
-    if (i === -1)
+    }
+    let i = url.indexOf('?');
+    if (i === -1) {
         return null;
+    }
     return url.substring(i);
 }
 exports.path_sliceQuery = path_sliceQuery;
 ;
 function path_removeQuery(url) {
-    if (url == null)
+    if (url == null) {
         return null;
-    var i = url.indexOf('#');
-    if (i !== -1)
+    }
+    let i = url.indexOf('#');
+    if (i !== -1) {
         url = url.substring(0, i);
-    var i = url.indexOf('?');
-    if (i !== -1)
+    }
+    i = url.indexOf('?');
+    if (i !== -1) {
         url = url.substring(0, i);
+    }
     return url;
 }
 exports.path_removeQuery = path_removeQuery;
 ;
+function path_changeExtension(path, ext) {
+    let str = ext ? '.' + ext : '';
+    let i = path.indexOf('.');
+    if (i === -1) {
+        return path + str;
+    }
+    return path.substring(0, i) + str;
+}
+exports.path_changeExtension = path_changeExtension;
 function path_toAbsolute(path, parentLocation, rootLocation) {
     path = path_normalize(path);
     if (path_isRelative(path) === false) {
@@ -353,11 +375,11 @@ function path_toAbsolute(path, parentLocation, rootLocation) {
 }
 exports.path_toAbsolute = path_toAbsolute;
 ;
-var _cwd;
+let _cwd;
 function cwd() {
     return _cwd || (_cwd = path_normalize(process.cwd()));
 }
-var rgx_PROTOCOL = /^(file|https?):/i, rgx_SUB_DIR = /[^\/\.]+\/\.\.\//, rgx_FILENAME = /\/[^\/]+\.\w+(\?.*)?(#.*)?$/, rgx_EXT = /\.(\w+)$/, rgx_win32Drive = /(^\/?\w{1}:)(\/|$)/;
+let rgx_PROTOCOL = /^(file|https?):/i, rgx_SUB_DIR = /[^\/\.]+\/\.\.\//, rgx_FILENAME = /\/[^\/]+\.\w+(\?.*)?(#.*)?$/, rgx_EXT = /\.(\w+)$/, rgx_win32Drive = /(^\/?\w{1}:)(\/|$)/;
 function path_win32Normalize(path) {
     path = path_normalize(path);
     if (path.substring(0, 5) === 'file:')
@@ -365,7 +387,7 @@ function path_win32Normalize(path) {
     return 'file://' + path;
 }
 function path_collapse(url_) {
-    var url = url_;
+    let url = url_;
     while (rgx_SUB_DIR.test(url)) {
         url = url.replace(rgx_SUB_DIR, '');
     }
@@ -1136,11 +1158,11 @@ class Include {
         }
     }
     include(type, mix) {
-        var pckg = mix;
-        if (typeof pckg === 'string' && arguments.length > 2) {
-            pckg = Array.prototype.slice.call(arguments, 1);
+        var pkg = mix;
+        if (typeof pkg === 'string' && arguments.length > 2) {
+            pkg = Array.prototype.slice.call(arguments, 1);
         }
-        Routes.each(type, pckg, (namespace, route) => {
+        Routes.each(type, pkg, (namespace, route) => {
             let item = new Include();
             item.type = type;
             item.url = atma_utils_1.class_Uri.combine(this.base, route.path);
@@ -1205,7 +1227,7 @@ exports.Include = Include;
 Include.groupByType = res_1.res_groupByType;
 Include.PathResolver = PathResolver;
 ;
-['js', 'css', 'load', 'lazy', 'mask'].forEach(type => {
+['js', 'css', 'load', 'lazy', 'mask', 'data'].forEach(type => {
     Include.prototype[type] = function () {
         var mix = arguments.length > 1 ? Array.from(arguments) : arguments[0];
         return this.include(type, mix);
@@ -1385,6 +1407,7 @@ const HandlersUtils_1 = _src_class_HandlersUtils;
 const npm_1 = _src_utils_npm;
 class Resource {
     constructor(includeData, parent, solution) {
+        var _a;
         this.parent = parent;
         this.solution = solution;
         this.resources = [];
@@ -1407,6 +1430,8 @@ class Resource {
         this.inPages = null;
         this.isCyclic = false;
         this.isMapped = false;
+        // when the path is like "/foo/bar/**.ts"
+        this.isGlob = false;
         this.meta = null;
         this.aliases = [];
         if (arguments.length === 0)
@@ -1433,6 +1458,7 @@ class Resource {
         this.asModules = [];
         this.inPages = [];
         this.source = null;
+        this.isGlob = /\*+\.\w+$/.test(includeData.url);
         if (includeData.bundle) {
             this.bundle = includeData.bundle;
         }
@@ -1457,8 +1483,19 @@ class Resource {
         if (includeData.url == null) {
             return;
         }
-        if (solution && solution.opts.mappings[includeData.url]) {
-            includeData.url = solution.opts.mappings[includeData.url];
+        let mappings = (_a = solution === null || solution === void 0 ? void 0 : solution.opts.mappings) !== null && _a !== void 0 ? _a : {};
+        if (mappings[includeData.url] != null) {
+            includeData.url = mappings[includeData.url];
+        }
+        else {
+            // Map resource by regex, for example the filename to another filename
+            for (let key in mappings) {
+                let rgx = new RegExp(key);
+                if (rgx.test(includeData.url)) {
+                    includeData.url = includeData.url.replace(rgx, mappings[key]);
+                    break;
+                }
+            }
         }
         let url;
         let pathResolver = HandlersUtils_1.HandlersUtils.findPathResolver(solution.handlers, includeData);
@@ -1474,7 +1511,11 @@ class Resource {
         }
         if (Include_1.Include.PathResolver.isNpm(includeData.url)) {
             this.aliases.push(includeData.url);
-            url = npm_1.Npm.resolveAppUrl(includeData.url, parent && parent.location, solution.opts.base);
+            let byNpmResolver = npm_1.Npm.resolveAppUrl(includeData.url, parent && parent.location, solution.opts.base);
+            if (byNpmResolver != null) {
+                // otherwise "url" could be previously resolved with pathResolver.resolve
+                url = byNpmResolver;
+            }
             if (url == null) {
                 // Fix. `resolveAppUrl` returns undefined on native nodejs modules
                 url = includeData.url;
@@ -1532,6 +1573,8 @@ class Resource {
         res.source = this.source;
         res.isCyclic = this.isCyclic;
         res.aliases = this.aliases;
+        res.isGlob = this.isGlob;
+        res.dependencies = this.dependencies;
         return res;
     }
     toTarget(solution, settings) {
@@ -1544,6 +1587,7 @@ class Resource {
         resource.inPages = this.inPages;
         resource.bundle = this.bundle;
         resource.aliases = this.aliases;
+        resource.isGlob = this.isGlob;
         if (solution.opts.version && ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.type) !== 'load') {
             resource.url += '?v=' + solution.opts.version;
         }
@@ -1628,7 +1672,7 @@ class Resource {
         if (modules.length === 1) {
             return modules[0];
         }
-        let arr = ['global', 'commonjs', 'amd', 'includejs', 'import'];
+        let arr = ['global', 'commonjs', 'amd', 'includejs', 'import', 'esm'];
         let name = arr.find(name => modules.indexOf(name) !== -1);
         if (name == null) {
             name = modules[0];
@@ -2329,6 +2373,18 @@ exports.FileActions = {
         }
         return global_1.io.File.readAsync(path, opts);
     },
+    async readDirectory(path, opts) {
+        let i = path.indexOf('*');
+        let patternI = path.lastIndexOf('/', i);
+        if (patternI === -1) {
+            throw new Error(`Invalid glob pattern: ${path}`);
+        }
+        let pattern = path.substring(patternI + 1);
+        let directory = path.substring(0, patternI + 1);
+        let files = await global_1.io.Directory.readFiles(directory, pattern);
+        let paths = files.map(x => x.uri.toString());
+        return paths;
+    },
     writeFile(path, content, opts) {
         return global_1.io.File.writeAsync(path, content, opts);
     },
@@ -2404,7 +2460,7 @@ class Configuration {
         }
     }
     defineMany(options) {
-        for (var key in options) {
+        for (let key in options) {
             this.define(key, options[key]);
         }
     }
@@ -2588,7 +2644,9 @@ class SolutionOpts extends SolutionOptsBase {
                 'scss': { type: 'css' },
                 'sass': { type: 'css' },
                 'html': { type: 'html' },
-                'json': { type: 'data' },
+                // will be embedded as data into the build
+                'json': { type: 'js' },
+                'yml': { type: 'js' },
                 'jpg': { type: 'asset' },
                 'png': { type: 'asset' },
                 'mp4': { type: 'asset' },
@@ -2952,13 +3010,17 @@ class OutputResources {
         this.resources = [];
         this.pagesInput = {};
     }
-    prepair(resources) {
+    prepare(resources) {
         this.resources = [];
         this.pagesInput = {};
         this.items = [];
-        this.rootInput = resources.pop();
-        this.rootOutput = this.rootInput.toTarget(this.solution);
-        this.rootOutput.content = this.rootInput.content;
+        let root = resources.pop();
+        let isGlob = root.isGlob;
+        if (isGlob !== true) {
+            this.rootOutput = root.toTarget(this.solution);
+            this.rootOutput.content = root.content;
+        }
+        this.rootInput = root;
         this.pagesInput = (0, res_1.res_groupByPageAndBundles)(resources, this.solution.opts);
         Object.keys(this.pagesInput).forEach(page => {
             Object.keys(this.pagesInput[page]).forEach(bundle => {
@@ -2971,20 +3033,22 @@ class OutputResources {
                         bundle,
                         type,
                         solution: this.solution,
-                        resources: arr
+                        resources: arr,
+                        isGlob: isGlob,
                     });
                     this.items.push(item);
                 });
-                if (byType['js'] == null) {
-                    let item = new OutputItem({
-                        page,
-                        bundle,
-                        type: 'js',
-                        solution: this.solution,
-                        resources: []
-                    });
-                    this.items.push(item);
-                }
+                // @TODO: Do we need empty output item?
+                // if (byType['js'] == null) {
+                //     let item = new OutputItem({
+                //         page,
+                //         bundle,
+                //         type: 'js',
+                //         solution: this.solution,
+                //         resources: []
+                //     });
+                //     this.items.push(item);
+                // }
             });
         });
     }
@@ -2992,7 +3056,7 @@ class OutputResources {
         return this.items.filter(x => x.page === page).map(x => x.resource);
     }
     getAll() {
-        var all = this
+        let all = this
             .items
             .map(x => x.resource)
             .filter(x => x.embed !== true)
@@ -3005,19 +3069,27 @@ class OutputResources {
 }
 exports.OutputResources = OutputResources;
 class OutputItem {
-    constructor({ page, bundle, type, solution, resources }) {
+    constructor(params) {
+        let { page, bundle, type, solution, resources, isGlob } = params;
         this.page = page;
         this.bundle = bundle;
         this.type = type;
-        var ext = solution.opts.getExtForType(type);
-        var filename = `${page}_${bundle}.${ext}`;
-        var resource = new Resource_1.Resource({
-            type: type,
-            url: filename,
-            bundle: bundle
-        }, null, solution);
-        this.resource = resource.toTarget(solution);
-        this.resources = resources || [];
+        this.resource = params.resource;
+        this.resources = resources !== null && resources !== void 0 ? resources : [];
+        if (this.resource == null) {
+            let ext = solution.opts.getExtForType(type);
+            let sfx = '';
+            if (isGlob === true) {
+                sfx = '_*';
+            }
+            let filename = `${page}_${bundle}${sfx}.${ext}`;
+            let resource = new Resource_1.Resource({
+                type: type,
+                url: filename,
+                bundle: bundle
+            }, null, solution);
+            this.resource = resource.toTarget(solution);
+        }
     }
 }
 exports.OutputItem = OutputItem;
@@ -3055,7 +3127,7 @@ exports.BaseHandler = void 0;
 class BaseHandler {
     constructor(solution) {
         this.solution = solution;
-        var { Parser, Rewriter, Builder, PathResolver } = this.constructor;
+        let { Parser, Rewriter, Builder, PathResolver } = this.constructor;
         this.parser = new Parser(solution, this);
         this.rewriter = new Rewriter(solution, this);
         this.builder = new Builder(solution, this);
@@ -3385,6 +3457,12 @@ class BaseParser {
         assert(solution instanceof Solution_1.Solution, 'Solution expected for Parser');
         assert(handler instanceof BaseHandler_1.BaseHandler, 'BaseHandler expected for the Parser');
     }
+    /** Usually we transpile on `atma-io` level. But in some cases the bundle may need to adjust the content.
+     *  For example the .json or .yml files should be serialized to export the content
+     */
+    transpile(content, resource) {
+        return Promise.resolve({ content });
+    }
     getDependencies(content, ownerResource) {
         throw new Error('Not implemented');
     }
@@ -3885,7 +3963,7 @@ class MaskParser extends BaseParser_1.BaseParser {
             // @NextIteration base will be handled in mask.Module.resolvePath
             // var base = mask.Module.cfg('base');
             // if (base) {
-            // 	path = path_combine(base, path);
+            //     path = path_combine(base, path);
             // }
         }
         return [this._createDependency(path, type, page)];
@@ -4010,12 +4088,15 @@ exports.AstUtil = void 0;
 const UglifyJS = require("uglify-js");
 let nope = function () {
     return true;
-}, variableOverrides = null, walk = function (node, fn) {
+};
+let variableOverrides = null;
+function walk(node, fn) {
     var walker = new UglifyJS.TreeWalker(function (node, descend) {
         return fn.call(this, node, descend);
     });
     node.walk(walker);
-}, findNode = function (node, fn, options = { scopeOnly: false }) {
+}
+function findNode(node, fn, options = { scopeOnly: false }) {
     var result, intop = true;
     walk(node, function (node) {
         if (options.scopeOnly && !intop) {
@@ -4032,11 +4113,13 @@ let nope = function () {
         return null;
     });
     return result;
-}, each = function (node, selector, fn) {
+}
+function each(node, selector, fn) {
     walk(node, function (node) {
         return selector(node) ? fn.call(this, node, selector) : null;
     });
-}, getVariableValue = function (scope, varName) {
+}
+function getVariableValue(scope, varName) {
     if (variableOverrides && varName in variableOverrides) {
         return variableOverrides[varName];
     }
@@ -4060,7 +4143,8 @@ let nope = function () {
         return evaluateNode(varDef.right, scope);
     }
     return null;
-}, evaluateNode = function (node, scope) {
+}
+function evaluateNode(node, scope) {
     if (scope == null) {
         console.warn('Evaluate Node: Scope is undefined', node);
     }
@@ -4110,7 +4194,8 @@ let nope = function () {
     //
     //console.warn('[includes parser]: Dynamic Expression', type, file, ':', info.line);
     return null;
-}, getArguments = function (args, scope) {
+}
+function getArguments(args, scope) {
     if (scope == null) {
         console.warn('getArguments: scope is undefined', args);
     }
@@ -4119,7 +4204,8 @@ let nope = function () {
         return evaluateNode(x, scope);
     });
     return cleanArgs(args);
-}, cleanArgs = function (args) {
+}
+function cleanArgs(args) {
     for (var i = 0, x, length = args.length; i < length; i++) {
         x = args[i];
         if (x == null) {
@@ -4157,7 +4243,8 @@ let nope = function () {
         }
     }
     return args;
-}, getPropertyChain = function (node, stack) {
+}
+function getPropertyChain(node, stack) {
     if ((node instanceof UglifyJS.AST_SymbolRef) == false) {
         console.warn('Current node is not a sumbol referencing');
     }
@@ -4171,10 +4258,12 @@ let nope = function () {
         break;
     }
     return chain;
-}, transform = function (node, fn) {
+}
+function transform(node, fn) {
     var transform = new UglifyJS.TreeTransformer(fn);
     node.transform(transform);
-};
+}
+;
 exports.AstUtil = {
     findNode: findNode,
     each: each,
@@ -4449,6 +4538,13 @@ const Include_1 = _src_class_Include;
 const BaseParser_1 = _src_handlers_base_BaseParser;
 const atma_utils_1 = require("atma-utils");
 class CommonJsParser extends BaseParser_1.BaseParser {
+    async transpile(content, resource) {
+        if (/\.(yml|json)([^\w]|$)/.test(resource.filename)) {
+            let str = typeof content !== 'string' ? JSON.stringify(content, null, '  ') : content;
+            str = `module.exports = ${str};`;
+            return { content: str };
+        }
+    }
     getDependencies(ast, ownerResource) {
         let info = {
             dependencies: []
@@ -5573,8 +5669,18 @@ const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
 class AmdJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
     buildRoot(resource, dependencies) {
     }
-    accepts(type) {
-        return false;
+    wrapModule(resource, outputItem) {
+        return resource.content;
+    }
+    accepts(resource) {
+        if (resource.type !== 'js') {
+            return false;
+        }
+        let module = resource.getModule();
+        if (module === 'root' && resource.solution.opts.package.module === 'amd') {
+            module = 'amd';
+        }
+        return module === 'amd';
     }
 }
 exports.AmdJsBuilder = AmdJsBuilder;
@@ -5659,12 +5765,12 @@ class ResourcePropMapping {
         this.resB = resB;
     }
     map(resource) {
-        var match = true;
-        for (var key in this.resA) {
-            var val = this.resA[key];
+        let match = true;
+        for (let key in this.resA) {
+            let val = this.resA[key];
             if (val == null)
                 continue;
-            var currentVal = resource[key];
+            let currentVal = resource[key];
             if (typeof val === 'function') {
                 match = val(currentVal);
             }
@@ -5674,13 +5780,14 @@ class ResourcePropMapping {
             if (typeof val === 'string' || typeof val === 'number') {
                 match = val === currentVal;
             }
-            if (match == false)
+            if (match == false) {
                 return resource;
+            }
         }
-        var clone = resource.clone();
-        for (var key in this.resB) {
-            var val = this.resB[key];
-            var currentVal = resource[key];
+        let clone = resource.clone();
+        for (let key in this.resB) {
+            let val = this.resB[key];
+            let currentVal = resource[key];
             if (typeof val === 'function') {
                 clone[key] = val(currentVal, resource);
                 continue;
@@ -5738,7 +5845,7 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
         }
     }
     getDependencies(ast, ownerResource) {
-        var info = {
+        let info = {
             type: null,
             url: null,
             dependencies: [],
@@ -5755,7 +5862,7 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
             function isIncludeSymbolRef(node) {
                 return AstUtil_1.AstUtil.is.type(node, 'AST_SymbolRef') && node.name == 'include';
             }
-            var scope = AstUtil_1.AstUtil.findNode(node, isIncludeSymbolRef).scope || ast;
+            let scope = AstUtil_1.AstUtil.findNode(node, isIncludeSymbolRef).scope || ast;
             this._process(info, node, scope);
             return true;
         });
@@ -5765,7 +5872,7 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
         return new atma_utils_1.class_Dfr().resolve(info);
     }
     _process(info, node, scope) {
-        var arr = [];
+        let arr = [];
         function isIncludeMethodCall(node) {
             return AstUtil_1.AstUtil.is.type(node, 'AST_Call') && node.start.value == 'include';
         }
@@ -5780,7 +5887,7 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
                 case 'routes':
                 case 'setBase':
                 case 'cfg':
-                    var pckg = {
+                    let pckg = {
                         type: node.expression.property,
                         args: AstUtil_1.AstUtil.getArguments(node.args, scope),
                     };
@@ -5812,7 +5919,7 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
                     break;
             }
         });
-        var include = new Include_1.Include();
+        let include = new Include_1.Include();
         arr.forEach(function (x) {
             include[x.type].apply(include, x.args);
         });
@@ -5822,28 +5929,28 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
         if (AstUtil_1.AstUtil.is.type(CallbackNode, 'AST_Function') == false) {
             return;
         }
-        var meta = info.meta.includejs, args = CallbackNode.argnames, responseObjectName = args.length > 0
+        let meta = info.meta.includejs, args = CallbackNode.argnames, responseObjectName = args.length > 0
             ? args[args.length - 1].name
             : null;
         if (responseObjectName) {
             meta.hasResponseObject = true;
-            var names = this._getPropertyAccessors(responseObjectName, CallbackNode);
+            let names = this._getPropertyAccessors(responseObjectName, CallbackNode);
             if (names) {
                 meta.responseAccessors = (meta.responseAccessors || []).concat(names);
             }
         }
     }
     /**
-     *	resolve %name%.propertyAccessor
+     *    resolve %name%.propertyAccessor
      */
     _getPropertyAccessors(name, Fn) {
-        var references = [];
+        let references = [];
         Fn.body.forEach(function (x) {
             function isSymbolName(node) {
                 return AstUtil_1.AstUtil.is.type(node, 'AST_SymbolRef') && node.name === name;
             }
             AstUtil_1.AstUtil.each(x, isSymbolName, function (node) {
-                var chain = AstUtil_1.AstUtil.getPropertyChain(node, this.stack);
+                let chain = AstUtil_1.AstUtil.getPropertyChain(node, this.stack);
                 if (chain) {
                     references.push(chain);
                 }
@@ -5852,16 +5959,16 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
         return references;
     }
     /**
-     *	aim to find all **.exports = X
+     *    aim to find all **.exports = X
      */
     _getPropertySetter(name, Fn) {
-        var result = null;
+        let result = null;
         Fn.body.forEach(function (x) {
             function isPropertyName(node) {
                 AstUtil_1.AstUtil.is.type(node, 'AST_Assign') && node.left.property === name;
             }
             AstUtil_1.AstUtil.each(x, isPropertyName, function (node) {
-                var arr = ['include', 'module', 'exports'];
+                let arr = ['include', 'module', 'exports'];
                 if (arr.indexOf(node.start.value) > -1) {
                     result = node;
                 }
@@ -5872,12 +5979,12 @@ class IncludeJsParser extends BaseParser_1.BaseParser {
 }
 exports.IncludeJsParser = IncludeJsParser;
 ;
-var IncludeJsMappings = [
+let IncludeJsMappings = [
     new ResourcePropMapping_1.ResourcePropMapping({
         asModules: (arr) => arr.indexOf('mask') > -1
     }, {
         asModules: (arr) => {
-            var i = arr.indexOf('mask');
+            let i = arr.indexOf('mask');
             arr[i] = 'includejs';
             return arr;
         }
@@ -5886,7 +5993,7 @@ var IncludeJsMappings = [
         asModules: (arr) => arr.indexOf('amd') > -1
     }, {
         asModules: (arr) => {
-            var i = arr.indexOf('amd');
+            let i = arr.indexOf('amd');
             arr[i] = 'includejs';
             return arr;
         }
@@ -6906,6 +7013,16 @@ class ImportJsParser extends BaseParser_1.BaseParser {
         /** @TODO: set to false and handle ast in ScriptParser */
         this.asText = true;
     }
+    async transpile(content, resource) {
+        if (/\.(yml|json)([^\w]|$)/.test(resource.filename)) {
+            let str = typeof content !== 'string' ? JSON.stringify(content, null, '  ') : content;
+            str = [
+                `const data = ${str};`,
+                `export default data;`
+            ].join('\n');
+            return { content: str };
+        }
+    }
     getDependencies(content, ownerResource) {
         if (Parser_1.Parser.supports(content) === false) {
             return null;
@@ -7557,6 +7674,10 @@ class ScriptParser extends BaseParser_1.BaseParser {
             new ImportJsHandler_1.ImportJsHandler.Parser(this.solution, this.handler),
         ];
     }
+    transpile(content, resource) {
+        let [common] = this.parsers;
+        return common.transpile(content, resource);
+    }
     getDependencies(content, ownerResource) {
         if (!content) {
             throw new Error(`Content is undefined for ${ownerResource.filename}`);
@@ -7590,7 +7711,8 @@ class ScriptParser extends BaseParser_1.BaseParser {
         dfrs.unshift(...asTextDfrs);
         return (0, async_1.async_whenAll)(dfrs).then(results => {
             let arr = (0, arr_1.arr_flattern)(results);
-            return ResourceInfo_1.ResourceInfo.merge(...arr);
+            let merged = ResourceInfo_1.ResourceInfo.merge(...arr);
+            return merged;
         });
     }
     accepts(type) {
@@ -8088,6 +8210,297 @@ MaskJsHandler.PathResolver = null;
 // end:source ./ModuleSimplified.js
 
 
+// source ./ModuleSimplified.js
+var _src_handlers_script_copy_js_CopyJsParser;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_copy_js_CopyJsParser != null ? _src_handlers_script_copy_js_CopyJsParser : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CopyJsParser = void 0;
+const BaseParser_1 = _src_handlers_base_BaseParser;
+class CopyJsParser extends BaseParser_1.BaseParser {
+    getDependencies(ast, ownerResource) {
+        return null;
+    }
+}
+exports.CopyJsParser = CopyJsParser;
+;
+//# sourceMappingURL=CopyJsParser.js.map
+//# sourceMappingURL=CopyJsParser.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_copy_js_CopyJsParser === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_copy_js_CopyJsParser) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_copy_js_CopyJsParser, module.exports);
+    } else {
+        _src_handlers_script_copy_js_CopyJsParser = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
+// source ./ModuleSimplified.js
+var _src_handlers_script_copy_js_CopyJsRewriter;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_copy_js_CopyJsRewriter != null ? _src_handlers_script_copy_js_CopyJsRewriter : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CopyJsRewriter = void 0;
+const BaseRewriter_1 = _src_handlers_base_BaseRewriter;
+class CopyJsRewriter extends BaseRewriter_1.BaseRewriter {
+    rewritePartial(content, ownerResource) {
+    }
+    rewriteResource(resource) {
+    }
+    accepts(type) {
+        return type === 'mask';
+    }
+}
+exports.CopyJsRewriter = CopyJsRewriter;
+;
+//# sourceMappingURL=CopyJsRewriter.js.map
+//# sourceMappingURL=CopyJsRewriter.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_copy_js_CopyJsRewriter === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_copy_js_CopyJsRewriter) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_copy_js_CopyJsRewriter, module.exports);
+    } else {
+        _src_handlers_script_copy_js_CopyJsRewriter = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
+// source ./ModuleSimplified.js
+var _src_handlers_script_copy_js_CopyJsBuilder;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_copy_js_CopyJsBuilder != null ? _src_handlers_script_copy_js_CopyJsBuilder : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CopyJsBuilder = void 0;
+const alot_1 = require("alot");
+const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
+const OutputResources_1 = _src_class_OutputResources;
+const atma_utils_1 = require("atma-utils");
+const path_1 = _src_utils_path;
+const Configuration_1 = _src_config_Configuration;
+/**
+ * Primary purpose of this builder is to copy source files to the output folder.
+ * Atma IO middlewares are used to compile/transpile the files.
+ *
+ * For now the accent is made for Typescript files.
+ */
+class CopyJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
+    wrapModule(resource, outputItem) {
+        let { content, dependencies } = resource;
+        let offset = 0;
+        dependencies && dependencies.filter(x => x.pos != null && (0, path_1.path_isRelative)(x.url)).forEach(dep => {
+            let resUrl = new atma_utils_1.class_Uri(resource.url);
+            let resDep = new atma_utils_1.class_Uri(dep.url);
+            let url = resUrl.combine(resDep).toLocalFile();
+            let start = dep.pos + offset + 1;
+            let c = content[start - 1];
+            let end = content.indexOf(c, start);
+            let oldLength = end - start;
+            let newLength = url.length;
+            content = content.substring(0, start) + url + content.substring(end);
+            offset += newLength - oldLength;
+        });
+        return content;
+    }
+    async buildRoot(root, outputDependencies) {
+        let outputResources = this.solution.outputResources;
+        outputResources.items = await (0, alot_1.default)(outputResources.items)
+            .mapManyAsync(async (item) => {
+            if (item.resource.isGlob !== true) {
+                return [item];
+            }
+            // Normal output
+            let copyItems = await (0, alot_1.default)(item.resources)
+                .mapMany(resource => {
+                return this.createOutputItems(item, resource);
+            })
+                .toArrayAsync();
+            return copyItems;
+        }).toArrayAsync();
+    }
+    getRootContent(root, outputDependencies) {
+        return root.content;
+    }
+    accepts(resource) {
+        if (resource.type !== 'js') {
+            return false;
+        }
+        return resource.isGlob === true;
+    }
+    async createOutputItems(parent, resource) {
+        var _a;
+        let solution = this.solution;
+        let rewriteToRelativeUrls = {};
+        if (((_a = resource.dependencies) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            let appBase = this.solution.opts.base;
+            (0, alot_1.default)(resource.dependencies)
+                .forEach(dep => {
+                if (dep.resource == null) {
+                    return;
+                }
+                if (dep.resource.filename.startsWith(appBase) === false) {
+                    // is project dependency
+                    return;
+                }
+                let relativePath = (0, path_1.path_toRelative)(dep.resource.filename, resource.filename);
+                if (relativePath == null || /(..\/)*?\/?node_modules/.test(relativePath)) {
+                    return;
+                }
+                relativePath = (0, path_1.path_changeExtension)(relativePath, null);
+                relativePath = relativePath.startsWith('.')
+                    ? relativePath
+                    : './' + relativePath;
+                rewriteToRelativeUrls[dep.url] = relativePath;
+            })
+                .toArray();
+            resource.content = rewriteUrls(resource.content, rewriteToRelativeUrls);
+        }
+        let result = [
+            createOutputItem(cloneWithExtension(resource, 'js'))
+        ];
+        let extra = [{
+                ext: 'ts.map',
+                output: 'js.map',
+            }, {
+                ext: 'd.ts',
+                output: 'd.ts',
+            }];
+        let readFile = Configuration_1.Configuration.Instance.get('readFile');
+        await (0, alot_1.default)(extra).forEachAsync(async (x) => {
+            let cloned = cloneWithExtension(resource, x.ext);
+            cloned.content = await readFile(cloned.filename);
+            cloned.content = rewriteUrls(cloned.content, rewriteToRelativeUrls);
+            result.push(createOutputItem(cloneWithExtension(cloned, x.output)));
+            if (x.ext === 'ts.map' && cloned.content != null) {
+                let outputItem = result[result.length - 1];
+                let source = resource.filename;
+                let target = outputItem.resource.filename;
+                let rel = (0, path_1.path_toRelative)(source, target);
+                outputItem.resource.content = outputItem.resource.content.replace(/"sources":\["[^"]+"\]/, `"sources":["${rel}"]`);
+            }
+        }).toArrayAsync({ threads: 1 });
+        function createOutputItem(resource) {
+            return new OutputResources_1.OutputItem({
+                page: parent.page,
+                bundle: parent.bundle,
+                type: parent.type,
+                solution: solution,
+                resources: [resource],
+                isGlob: false,
+                resource: resource.toTarget(solution)
+            });
+        }
+        function cloneWithExtension(resource, ext) {
+            let cloned = resource.clone();
+            cloned.filename = (0, path_1.path_changeExtension)(cloned.filename, ext);
+            cloned.url = (0, path_1.path_changeExtension)(cloned.url, ext);
+            return cloned;
+        }
+        function rewriteUrls(content, rewriteToRelativeUrls) {
+            for (let key in rewriteToRelativeUrls) {
+                content = content.replaceAll(key, rewriteToRelativeUrls[key]);
+            }
+            return content;
+        }
+        return result;
+    }
+}
+exports.CopyJsBuilder = CopyJsBuilder;
+;
+//# sourceMappingURL=CopyJsBuilder.js.map
+//# sourceMappingURL=CopyJsBuilder.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_copy_js_CopyJsBuilder === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_copy_js_CopyJsBuilder) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_copy_js_CopyJsBuilder, module.exports);
+    } else {
+        _src_handlers_script_copy_js_CopyJsBuilder = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
+// source ./ModuleSimplified.js
+var _src_handlers_script_copy_js_CopyJsHandler;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_copy_js_CopyJsHandler != null ? _src_handlers_script_copy_js_CopyJsHandler : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CopyJsHandler = void 0;
+const BaseHandler_1 = _src_handlers_base_BaseHandler;
+const CopyJsParser_1 = _src_handlers_script_copy_js_CopyJsParser;
+const CopyJsRewriter_1 = _src_handlers_script_copy_js_CopyJsRewriter;
+const CopyJsBuilder_1 = _src_handlers_script_copy_js_CopyJsBuilder;
+class CopyJsHandler extends BaseHandler_1.BaseHandler {
+}
+exports.CopyJsHandler = CopyJsHandler;
+CopyJsHandler.Parser = CopyJsParser_1.CopyJsParser;
+CopyJsHandler.Rewriter = CopyJsRewriter_1.CopyJsRewriter;
+CopyJsHandler.Builder = CopyJsBuilder_1.CopyJsBuilder;
+CopyJsHandler.PathResolver = null;
+;
+//# sourceMappingURL=CopyJsHandler.js.map
+//# sourceMappingURL=CopyJsHandler.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_copy_js_CopyJsHandler === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_copy_js_CopyJsHandler) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_copy_js_CopyJsHandler, module.exports);
+    } else {
+        _src_handlers_script_copy_js_CopyJsHandler = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
 // source ./ModuleSimplified.js
 var _src_handlers_script_ScriptBuilder;
 (function () {
@@ -8106,10 +8519,12 @@ const AmdJsHandler_1 = _src_handlers_script_amd_js_AmdJsHandler;
 const IncludeJsHandler_1 = _src_handlers_script_include_js_IncludeJsHandler;
 const MaskJsHandler_1 = _src_handlers_script_mask_js_MaskJsHandler;
 const ImportJsHandler_1 = _src_handlers_script_import_js_ImportJsHandler;
+const CopyJsHandler_1 = _src_handlers_script_copy_js_CopyJsHandler;
 class ScriptBuilder extends BaseBuilder_1.BaseBuilder {
     constructor() {
         super(...arguments);
         this.builders = [
+            new CopyJsHandler_1.CopyJsHandler.Builder(this.solution, this.handler),
             new GlobalJsHandler_1.GlobalJsHandler.Builder(this.solution, this.handler),
             new CommonJsHandler_1.CommonJsHandler.Builder(this.solution, this.handler),
             new AmdJsHandler_1.AmdJsHandler.Builder(this.solution, this.handler),
@@ -8130,8 +8545,9 @@ class ScriptBuilder extends BaseBuilder_1.BaseBuilder {
         else {
             const out = resArr.map(res => {
                 let builder = this.builders.find(x => x.accepts(res));
-                if (builder == null)
+                if (builder == null) {
                     throw new Error('Module Builder not found for ' + res.url);
+                }
                 return builder.wrapModule(res, outputItem, otherOutputItems);
             });
             code = out.join('\n');
@@ -10935,26 +11351,37 @@ exports.Parser = {
     getDependencies(resource, solution) {
         assert(resource != null, 'Resource is empty');
         assert(solution instanceof Solution_1.Solution, 'Solution is not passed');
-        var dfr = new atma_utils_1.class_Dfr;
+        let dfr = new atma_utils_1.class_Dfr;
         getDependenciesInternal(resource, solution)
-            .done(_runMiddlewares)
-            .fail(error => dfr.reject(error));
+            .then(_runMiddlewares, error => dfr.reject(error));
         function _runMiddlewares(deps) {
             getDependenciesExternal(deps, resource, solution)
                 .then((deps) => mapDeps(deps, solution))
                 .then((deps) => filterDynamicDeps(deps, solution))
-                .done(deps => dfr.resolve(deps))
-                .fail(error => dfr.reject(error));
+                .then(deps => dfr.resolve(deps), error => dfr.reject(error));
         }
         return dfr;
     }
 };
 function getDependenciesInternal(resource, solution) {
     assert(typeof resource.url === 'string', 'Path is expected');
-    var ext = (0, path_1.path_getExtension)(resource.url);
-    var handler = solution.handlers.find(x => x.parser.accepts(resource.type) || x.parser.accepts(ext));
+    if (resource.isGlob) {
+        let paths = resource.content;
+        let resInfos = paths.map(path => {
+            return {
+                type: resource.type,
+                url: path,
+                module: resource.module,
+                page: resource.page
+            };
+        });
+        let result = { dependencies: resInfos };
+        return (0, async_1.async_resolve)(result);
+    }
+    let ext = (0, path_1.path_getExtension)(resource.url);
+    let handler = solution.handlers.find(x => x.parser.accepts(resource.type) || x.parser.accepts(ext));
     if (handler == null) {
-        console.warn('GetDependenciesInternal: Skip uknown resource type', resource.type);
+        console.warn('GetDependenciesInternal: Skip unknown resource type', resource.type);
         return (0, async_1.async_resolve)({ dependencies: [] });
     }
     return handler.parser.getDependencies(resource.content, resource);
@@ -10969,7 +11396,7 @@ function filterDynamicDeps(info, solution) {
     return info;
 }
 function isDynamicDependency(dep, solution) {
-    var arr = solution.opts.dynamicDependencies;
+    let arr = solution.opts.dynamicDependencies;
     return arr.length !== 0 && arr.some(rgx => rgx.test(dep.url));
 }
 function mapDeps(info, solution) {
@@ -11153,7 +11580,8 @@ var ResourceLoader;
             this.solution = solution;
             this.promise = new atma_utils_1.class_Dfr;
         }
-        process() {
+        async process() {
+            var _a, _b;
             this
                 .solution
                 .reporter
@@ -11171,25 +11599,42 @@ var ResourceLoader;
                 this.processChildren();
                 return;
             }
-            let start = Date.now();
-            let reader = Configuration_1.Configuration.Instance.get('readFile');
-            reader(this.resource.filename, this.opts).then(content => {
+            try {
+                let start = Date.now();
+                let reader = this.resource.isGlob
+                    ? Configuration_1.Configuration.Instance.get('readDirectory')
+                    : Configuration_1.Configuration.Instance.get('readFile');
+                let content = await reader(this.resource.filename, this.opts);
+                let handler = this.solution.handlers.find(x => x.parser.accepts(this.resource.type));
+                if (((_a = handler === null || handler === void 0 ? void 0 : handler.parser) === null || _a === void 0 ? void 0 : _a.transpile) != null) {
+                    let result = await handler.parser.transpile(content, this.resource);
+                    content = (_b = result === null || result === void 0 ? void 0 : result.content) !== null && _b !== void 0 ? _b : content;
+                }
                 let end = Date.now();
-                this.solution.reporter.print((0, color_1.color)(` cyan<${end - start}> ms \n`));
+                this.solution.reporter.print((0, color_1.color)(` cyan<${end - start}> ms`));
                 this.resource.content = content;
+                if (this.resource.type === 'data') {
+                    this.solution.reporter.print('\n');
+                    this.promise.resolve(this);
+                    return;
+                }
                 this.processChildren();
-            }, error => {
+            }
+            catch (error) {
                 this.promise.reject(error);
-            });
+            }
         }
         processChildren() {
             if (this.shouldSkipChildren()) {
+                this.solution.reporter.print(` (skip deps)`);
                 this.promise.resolve(this);
                 return;
             }
             Parser_1.Parser
                 .getDependencies(this.resource, this.solution)
                 .then(result => {
+                var _a;
+                this.solution.reporter.print((0, color_1.color)(` cyan<${(_a = result.dependencies) === null || _a === void 0 ? void 0 : _a.length}> dep\n`));
                 this.loadChildren(result).catch(err => {
                     this.promise.reject(err);
                 });
@@ -11373,23 +11818,34 @@ var _src_utils_tree;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tree_async = void 0;
 const res_1 = _src_utils_res;
-let tree_async;
+const atma_utils_1 = require("atma-utils");
+function tree_async(workerInfo) {
+    let start = Date.now();
+    let dfr;
+    try {
+        dfr = workerInfo.action();
+    }
+    catch (error) {
+        console.error(error);
+        return atma_utils_1.class_Dfr.reject(error);
+    }
+    let reporter = workerInfo.reporter;
+    dfr.then(resources => {
+        let end = Date.now();
+        let seconds = ((end - start) / 1000).toFixed(2);
+        let treeInfo = (0, res_1.res_getTreeInfo)(resources);
+        reporter
+            .info(workerInfo.message(treeInfo, seconds));
+        reporter
+            .info(treeInfo.treeString);
+    }, err => {
+        console.error(err);
+        throw err;
+    });
+    return dfr;
+}
 exports.tree_async = tree_async;
-(function () {
-    exports.tree_async = tree_async = function (workerInfo) {
-        let start = Date.now(), dfr = workerInfo.action(), reporter = workerInfo.reporter;
-        dfr.done(resources => {
-            let end = Date.now();
-            let seconds = ((end - start) / 1000).toFixed(2);
-            let treeInfo = (0, res_1.res_getTreeInfo)(resources);
-            reporter
-                .info(workerInfo.message(treeInfo, seconds));
-            reporter
-                .info(treeInfo.treeString);
-        });
-        return dfr;
-    };
-}());
+;
 //# sourceMappingURL=tree.js.map
 //# sourceMappingURL=tree.ts.map;
 
@@ -11424,14 +11880,14 @@ exports.Builder = void 0;
 const Middlewares_1 = _src_class_Middlewares;
 const path_1 = _src_utils_path;
 const async_1 = _src_utils_async;
-const alot = require("alot");
+const alot_1 = require("alot");
 exports.Builder = {
     build(resources, solution) {
         return Middlewares_1._middlewares
             .run('buildResources', resources, solution)
             .then(arr => {
-            resources = arr || resources;
-            solution.outputResources.prepair(resources);
+            resources = arr !== null && arr !== void 0 ? arr : resources;
+            solution.outputResources.prepare(resources);
             return Middlewares_1._middlewares
                 .run('rewriteDependencies', resources, solution)
                 .then(() => rewriteDependenciesInternal(resources))
@@ -11441,9 +11897,9 @@ exports.Builder = {
                 .then(() => solution.outputResources.getAll());
         });
         function rewriteDependenciesInternal(resources) {
-            var dfrs = resources.map(resource => {
-                var ext = (0, path_1.path_getExtension)(resource.url);
-                var handler = solution.handlers.find(x => x.rewriter.accepts(ext));
+            let promises = resources.map(resource => {
+                let ext = (0, path_1.path_getExtension)(resource.url);
+                let handler = solution.handlers.find(x => x.rewriter.accepts(ext));
                 if (handler == null) {
                     handler = solution.handlers.find(x => x.rewriter.accepts(resource.type));
                 }
@@ -11452,12 +11908,14 @@ exports.Builder = {
                 }
                 return handler.rewriter.rewriteResource(resource);
             });
-            return (0, async_1.async_whenAll)(dfrs);
+            return (0, async_1.async_whenAll)(promises);
         }
         function rewriteRoot() {
             return (0, async_1.async_run)(() => {
-                var input = solution.outputResources.rootInput, output = solution.outputResources.rootOutput, ext = (0, path_1.path_getExtension)(input.url);
-                var handler = solution.handlers.find(x => x.rewriter.accepts(input.type) || x.rewriter.accepts(ext));
+                let input = solution.outputResources.rootInput;
+                let output = solution.outputResources.rootOutput;
+                let ext = (0, path_1.path_getExtension)(input.url);
+                let handler = solution.handlers.find(x => x.rewriter.accepts(input.type) || x.rewriter.accepts(ext));
                 if (handler == null || handler.rewriter.rewriteRoot == null) {
                     //throw new Error(`RootRewriter is not found for a resource ${input.url} and type ${input.type}`);
                     return;
@@ -11466,9 +11924,9 @@ exports.Builder = {
             });
         }
         function buildOutputItems() {
-            var items = solution.outputResources.items;
-            return alot(items).mapAsync(item => {
-                var otherOutputItems = items.filter(x => {
+            let items = solution.outputResources.items;
+            return (0, alot_1.default)(items).mapAsync(item => {
+                let otherOutputItems = items.filter(x => {
                     if (x === item)
                         return false;
                     if (x.page != item.page)
@@ -11489,8 +11947,8 @@ exports.Builder = {
             if (outputItem.resource.content) {
                 return;
             }
-            var ext = (0, path_1.path_getExtension)(outputItem.resource.url);
-            var handler = solution.handlers.find(x => x.builder.accepts(outputItem.type));
+            let ext = (0, path_1.path_getExtension)(outputItem.resource.url);
+            let handler = solution.handlers.find(x => x.builder.accepts(outputItem.type));
             if (handler == null) {
                 handler = solution.handlers.find(x => x.builder.accepts(ext));
             }
@@ -11500,10 +11958,11 @@ exports.Builder = {
             return handler.builder.createModule(outputItem, otherOutputItems);
         }
         function buildRoot() {
-            var main = solution.outputResources.rootOutput;
-            var dependencies = solution.outputResources.getForPage(solution.opts.mainPage);
-            var ext = (0, path_1.path_getExtension)(main.url);
-            var handler = solution.handlers.find(x => x.builder.accepts(main.type) || x.builder.accepts(ext));
+            var _a;
+            let main = (_a = solution.outputResources.rootOutput) !== null && _a !== void 0 ? _a : solution.outputResources.rootInput;
+            let dependencies = solution.outputResources.getForPage(solution.opts.mainPage);
+            let ext = (0, path_1.path_getExtension)(main.url);
+            let handler = solution.handlers.find(x => x.builder.accepts(main.type) || x.builder.accepts(ext));
             if (handler == null || handler.builder.buildRoot == null) {
                 throw new Error(`RootBuilder is not found for a resource ${main.url} and type ${main.type}`);
             }
@@ -11557,11 +12016,6 @@ const tree_1 = _src_utils_tree;
 const Builder_1 = _src_builder_Builder;
 const color_1 = _src_utils_color;
 class Bundler extends atma_utils_1.class_EventEmitter {
-    constructor(path, opts) {
-        super();
-        global.__$bundler = this;
-        this.solution = new Solution_1.Solution(path, opts);
-    }
     static clearCache() {
         Loader_1.Loader.clearCache();
         if (global_1.io.File.middleware) {
@@ -11577,8 +12031,15 @@ class Bundler extends atma_utils_1.class_EventEmitter {
     static get Config() {
         return Configuration_1.Configuration.Instance;
     }
+    constructor(path, opts) {
+        super();
+        global.__$bundler = this;
+        this.solution = new Solution_1.Solution(path, opts);
+    }
     getResourceTree(opts) {
-        var solution = this.solution, type = solution.opts.type, path = solution.path;
+        let solution = this.solution;
+        let type = solution.opts.type;
+        let path = solution.path;
         return Loader_1.Loader
             .load(type, path, opts, solution)
             .then(x => x.toJSON());
@@ -11587,7 +12048,9 @@ class Bundler extends atma_utils_1.class_EventEmitter {
         return new Bundler(path, opts).getResourceTree();
     }
     getResources(opts) {
-        var solution = this.solution, type = solution.opts.type, path = solution.path;
+        let solution = this.solution;
+        let type = solution.opts.type;
+        let path = solution.path;
         return Loader_1.Loader.load(type, path, opts, solution).then(resource => {
             return (0, res_1.res_flattern)(resource, solution.opts.dependencies).map(x => x);
         });
@@ -11596,16 +12059,28 @@ class Bundler extends atma_utils_1.class_EventEmitter {
         return new Bundler(path, opts).getResources();
     }
     build(opts) {
-        var solution = this.solution, type = solution.opts.type, path = solution.path, shouldRebuild = false, isBuilding = false, isRebuilding = false, rootResource = null, self = this;
+        let solution = this.solution;
+        let type = solution.opts.type;
+        let path = solution.path;
+        let shouldRebuild = false;
+        let isBuilding = false;
+        let isRebuilding = false;
+        let rootResource = null;
+        let self = this;
         function build(resource) {
             isBuilding = true;
-            var resources = (0, res_1.res_flattern)(resource, solution.opts.dependencies);
+            let resources = (0, res_1.res_flattern)(resource, solution.opts.dependencies);
             return (0, tree_1.tree_async)({
-                resources,
                 reporter: solution.reporter,
-                action: () => Builder_1.Builder.build(resources, solution),
-                message: (treeInfo, seconds) => (0, color_1.color)(`Created bold<yellow<${treeInfo.count}>> files in bold<yellow<${seconds}>> sec.`)
-            }).done(buildComplete).fail(buildFailed);
+                action: () => {
+                    return Builder_1.Builder.build(resources, solution);
+                },
+                message: (treeInfo, seconds) => {
+                    return (0, color_1.color)(`Created bold<yellow<${treeInfo.count}>> files in bold<yellow<${seconds}>> sec.`);
+                }
+            })
+                .done(buildComplete)
+                .fail(buildFailed);
         }
         function buildComplete(resources) {
             isBuilding = false;
@@ -11665,8 +12140,8 @@ class Bundler extends atma_utils_1.class_EventEmitter {
         return new Bundler(path, opts).build(opts);
     }
     static process(path, opts) {
-        var bundler = new Bundler(path, opts);
-        var solution = bundler.solution;
+        let bundler = new Bundler(path, opts);
+        let solution = bundler.solution;
         function builderComplete(resources) {
             resources.forEach(res => {
                 global_1.io.File.write(res.filename, res.content);
@@ -11697,8 +12172,8 @@ class Bundler extends atma_utils_1.class_EventEmitter {
             getDependencies(content, opts = { type: 'js' }) {
                 if (typeof opts === 'string')
                     opts = { type: opts };
-                var solution = new Solution_1.Solution('', opts);
-                var resource = new Resource_1.Resource({ type: opts.type, content: content }, null, solution);
+                let solution = new Solution_1.Solution('', opts);
+                let resource = new Resource_1.Resource({ type: opts.type, content: content }, null, solution);
                 return Parser_1.Parser.getDependencies(resource, solution);
             }
         };