app-bundler 0.2.15 → 0.2.17

package/lib/bundler.js

@@ -1310,7 +1310,8 @@ const global_1 = _src_global;
 const atma_io_1 = require("atma-io");
 var Npm;
 (function (Npm) {
-    function resolveAppUrl(path, currentLocation, base) {
+    function resolveAppUrl(path, currentLocation, opts) {
+        let base = opts.base;
         let name = /^(@?[^\\\/]+)/.exec(path)[0];
         let resource = path.substring(name.length + 1);
         while (path != null) {
@@ -1329,14 +1330,9 @@ var Npm;
                 dirname = (0, path_1.path_combine)(dirname, `/${subPackage}`, '/');
                 resource = resource.substring(subPackage.length + 1);
             }
-            if (resource === '') {
-                let pkg = (0, path_1.path_combine)(dirname, 'package.json');
-                let json = global_1.io.File.read(pkg);
-                if (json) {
-                    resource = json.main;
-                }
-            }
-            let filename = combineMain(dirname, resource);
+            let pkg = (0, path_1.path_combine)(dirname, 'package.json');
+            let json = global_1.io.File.read(pkg);
+            let filename = resolveAppUrlFromPackageJson(dirname, json, resource, opts);
             if (base) {
                 if (base.endsWith('/') === false) {
                     // Base path must be a folder
@@ -1353,6 +1349,89 @@ var Npm;
         return null;
     }
     Npm.resolveAppUrl = resolveAppUrl;
+    function resolveAppUrlFromPackageJson(pkgDir, pkg, subPath, opts) {
+        var _a;
+        if (pkg.main == null && pkg.exports == null) {
+            return combineMain(pkgDir, subPath);
+        }
+        if (pkg.exports == null) {
+            return combineMain(pkgDir, subPath || pkg.main);
+        }
+        if (typeof pkg.exports === 'string') {
+            return combineMain(pkgDir, subPath || pkg.exports);
+        }
+        const moduleExportsMap = 'require';
+        const conditionExportsMap = (_a = opts.package.platform) !== null && _a !== void 0 ? _a : 'node';
+        let libraryFilePath = fromExports(pkg.exports, subPath, {
+            moduleExports: moduleExportsMap,
+            conditionExports: conditionExportsMap,
+            pkgDir,
+        });
+        return combineMain(pkgDir, libraryFilePath);
+    }
+    Npm.resolveAppUrlFromPackageJson = resolveAppUrlFromPackageJson;
+    function fromExports(exports, subPath, opts) {
+        var _a;
+        if (exports == null) {
+            throw new Error(`Invalid exports for ${subPath}`);
+        }
+        if (typeof exports === 'object') {
+            exports = extractConditional(exports, opts);
+        }
+        if (typeof exports === 'object') {
+            // TExportsMap
+            let map = exports;
+            if (!subPath) {
+                let dot = '.';
+                if (map[dot] == null) {
+                    throw new Error(`Missing default "." export in exports for ${JSON.stringify(exports)}`);
+                }
+                return extractConditional(map[dot], opts);
+            }
+            for (let tpl in exports) {
+                let mapped = extractConditional(exports[tpl], opts);
+                if (typeof mapped !== 'string') {
+                    throw new Error(`Invalid conditional exports for ${JSON.stringify(exports)} in ${(_a = opts.pkgDir) !== null && _a !== void 0 ? _a : subPath}`);
+                }
+                if (tpl.startsWith('./')) {
+                    tpl = tpl.substring(2);
+                    if (tpl === '*') {
+                        return mapped.replace('*', subPath);
+                    }
+                    let globIndex = tpl.indexOf('*');
+                    if (globIndex === -1 && tpl === subPath) {
+                        return mapped;
+                    }
+                    if (globIndex > -1) {
+                        let tplPfx = tpl.substring(0, globIndex).replace(/\/+$/, '');
+                        if (subPath.startsWith(tplPfx)) {
+                            let subPathSfx = subPath.replace(tplPfx, '');
+                            return mapped.replace('*', subPathSfx);
+                        }
+                    }
+                }
+            }
+        }
+        if (typeof exports === 'string') {
+            return exports;
+        }
+        throw new Error(`Path can't be mapped ${JSON.stringify(exports)}`);
+    }
+    function extractConditional(exports, opts) {
+        if (exports == null || typeof exports !== 'object') {
+            return exports;
+        }
+        if (opts.conditionExports in exports) {
+            return extractConditional(exports[opts.conditionExports], opts);
+        }
+        if (opts.moduleExports in exports) {
+            return extractConditional(exports[opts.moduleExports], opts);
+        }
+        if ('default' in exports) {
+            return extractConditional(exports['default'], opts);
+        }
+        return exports;
+    }
     function combineMain(directory, filename) {
         filename !== null && filename !== void 0 ? filename : (filename = 'index.js');
         let path = (0, path_1.path_combine)(directory, filename);
@@ -1515,7 +1594,7 @@ class Resource {
         }
         if (Include_1.Include.PathResolver.isNpm(includeData.url)) {
             this.aliases.push(includeData.url);
-            let byNpmResolver = 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);
             if (byNpmResolver != null) {
                 // otherwise "url" could be previously resolved with pathResolver.resolve
                 url = byNpmResolver;
@@ -1525,6 +1604,15 @@ class Resource {
                 url = includeData.url;
             }
         }
+        if (includeData.route != null) {
+            let { path, alias } = includeData.route;
+            if (path && Include_1.Include.PathResolver.isNpm(path) && this.aliases.includes(path) === false) {
+                this.aliases.push(path);
+            }
+            if (alias && Include_1.Include.PathResolver.isNpm(alias) && this.aliases.includes(alias) === false) {
+                this.aliases.push(alias);
+            }
+        }
         let mappedUrl = this.solution.mapUrl(url);
         if (mappedUrl != url) {
             console.log(`URL mapped: ${url} => ${mappedUrl}`);
@@ -4697,10 +4785,10 @@ const global_1 = _src_global;
 exports.Templates = {
     Module: `
 // source ./Module.js
-__register("%MODULE_PATH%", function(require, module, exports, __filename, __dirname){
-	%MODULE%
+__register(%MODULE_PATH%, %MODULE_ALIASES%, function(require, module, exports, __filename, __dirname){
+    %MODULE%
 
-	%FOOTER%
+    %FOOTER%
 });
 
 // end:source ./Module.js
@@ -4734,6 +4822,7 @@ var ___VAR_ID___;
 `,
     Header: `
 // source ./Header.js
+
 var __register, __require, require;
 
 (function(){
@@ -4875,31 +4964,49 @@ var __register, __require, require;
 
     var __global = typeof global !== 'undefined' && global ? global : window;
     var __nativeRequire = __global.require || require;
-    var __originalRequire = function (path_) {
-        var location = this.location;
-        var path = path_resolveUrl(path_, location);
-
-        if (modules[path]) {
-            return modules[path].runOnce();
+    var __bundlerRequire = function (path_) {
+        var arr = [
+            path_resolveUrl(path_, this.location)
+        ];
+        if (typeof include !== 'undefined' && typeof include.resolvePath === 'function') {
+            arr.push(include.resolvePath(path_));
+        }
+        if (/^[@\\w]/.test(path_)) {
+            arr.push(path_);
+        }
+        for (var i = 0; i < arr.length; i++) {
+            if (arr[i] in modules) {
+                return modules[arr[i]].runOnce();
+            }
         }
-        var pathWithoutExt = path.replace(/\\.\\w+$/, '').toLowerCase();
+
         for (var key in modules) {
             var $pathWithoutExt = key.replace(/\\.\\w+$/, '').toLowerCase();
-            if ($pathWithoutExt === pathWithoutExt) {
-                let module = modules[path] = modules[key];
-                return module.runOnce();
+            for (var i = 0; i < arr.length; i++) {
+                var path = arr[i];
+                var pathWithoutExt = path.replace(/\\.\\w+$/, '').toLowerCase();
+                if ($pathWithoutExt === pathWithoutExt) {
+                    let module = modules[path] = modules[key];
+                    return module.runOnce();
+                }
             }
         }
 
         return __nativeRequire(path_);
     };
 
-    __register = function (path, factory) {
+    __register = function (path, aliases, factory) {
         var filename = path_resolveUrl(path);
-        modules[filename] = new Module(filename, factory);
+        var module = new Module(filename, factory);
+        modules[filename] = module;
+        if (aliases) {
+            aliases.forEach(alias => {
+                modules[alias] = module;
+            })
+        }
     };
 
-    __require =__originalRequire.bind({ location: path_getDir(path_resolveUrl('%ROOT_DIR%')) });
+    __require =__bundlerRequire.bind({ location: path_getDir(path_resolveUrl('%ROOT_DIR%')) });
 
     var modules = {};
     var Module = function(filename, factory){
@@ -4912,7 +5019,7 @@ var __register, __require, require;
         if (this.exports != null) {
             return this.exports;
         }
-        var require = __originalRequire.bind({
+        var require = __bundlerRequire.bind({
             location: this.dirname
         });
         this.exports = {};
@@ -4928,7 +5035,7 @@ var __register, __require, require;
 
     require = __require;
 
-    if (__nativeRequire == null) {
+    if (__global.require != null) {
         __global.require = __require;
     }
 }());
@@ -6105,7 +6212,7 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         super(solution, handler);
         this.solution = solution;
         this.handler = handler;
-        var opts = this.solution.opts.package.commonjs;
+        let opts = this.solution.opts.package.commonjs;
         if (opts && opts.output === 'simplified') {
             this.wrapModule = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.wrapModule;
             this.getRootContent = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.getRootContent;
@@ -6123,7 +6230,7 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         return module === 'commonjs';
     }
     wrapModule(resource, outputItem, outputItems, setts) {
-        var opts = this.solution.iteration;
+        let opts = this.solution.iteration;
         if (opts.commonjs == null) {
             opts.commonjs = {
                 addHeading: true,
@@ -6131,21 +6238,22 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
             };
         }
         ;
-        var body = '';
+        let body = '';
         if (opts.commonjs.hasHeading === false && opts.commonjs.addHeading === true) {
             opts.commonjs.hasHeading = true;
             body = this.getHeaderContent();
         }
-        var { url, content } = resource;
-        var module = Templates_1.Templates
+        let { url, content, aliases } = resource;
+        let module = Templates_1.Templates
             .Module
-            .replace('%MODULE_PATH%', () => url)
+            .replace('%MODULE_PATH%', () => `"${url}"`)
+            .replace('%MODULE_ALIASES%', JSON.stringify(aliases !== null && aliases !== void 0 ? aliases : []))
             .replace('%MODULE%', () => content)
             .replace('%FOOTER%', () => { var _a, _b; return ((_b = (_a = setts === null || setts === void 0 ? void 0 : setts.partials) === null || _a === void 0 ? void 0 : _a.footer) !== null && _b !== void 0 ? _b : ''); });
         return body + module;
     }
     getHeaderContent() {
-        var mainUrl = this.solution.outputResources.rootInput.url;
+        let mainUrl = this.solution.outputResources.rootInput.url;
         return Templates_1.Templates
             .Header
             .replace('%ROOT_DIR%', () => mainUrl);
@@ -6166,7 +6274,7 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         })
             .concat([content])
             .join('\n');
-        var wrapper = new ModuleWrapper_1.ModuleWrapper(this.solution);
+        let wrapper = new ModuleWrapper_1.ModuleWrapper(this.solution);
         root.content = wrapper.wrap(body);
     }
     getRootContent(root, outputDependencies) {
@@ -6207,8 +6315,7 @@ var _src_handlers_script_common_js_CommonJsPathResolver;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonJsPathResolver = void 0;
 const BasePathResolver_1 = _src_handlers_base_BasePathResolver;
-const path_1 = _src_utils_path;
-const global_1 = _src_global;
+const npm_1 = _src_utils_npm;
 class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
     accepts(includeData) {
         if (includeData.type !== 'js' || includeData.module !== 'commonjs') {
@@ -6223,7 +6330,7 @@ class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
         return true;
     }
     resolve(includeData, parentResource) {
-        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
+        let filename = npm_1.Npm.resolveAppUrl(includeData.url, parentResource.directory, this.solution.opts);
         if (filename) {
             let url = this.solution.opts.toAppUrl(filename);
             this.solution.opts.mappings[includeData.url] = url;
@@ -6239,49 +6346,49 @@ const nodeCoreModules = [
     'process', 'punycode', 'querystring', 'readline', 'repl', 'stream', 'string_decoder', 'sys', 'timers',
     'tls', 'tty', 'url', 'util', 'vm', 'zlib'
 ];
-function nodeModuleResolve(path, location_) {
-    let location = location_.replace(/[\\\/]+$/, '');
-    let name = /^([\w\-]+)/.exec(path)[0];
-    let resource = path.substring(name.length + 1);
-    let current = location;
-    let root_ = current + '/node_modules/' + name + '/';
-    while (true) {
-        let nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
-        let pckg = nodeModules + 'package.json';
-        if (global_1.io.File.exists(pckg) === false) {
-            let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
-            if (next === current) {
-                return root_ + 'package.json';
-            }
-            current = next;
-            continue;
-        }
-        if (resource) {
-            let path = nodeModules + resource;
-            if (hasExt(path) === false) {
-                let likelyTs = path.includes('/src/');
-                if (likelyTs) {
-                    if (global_1.io.File.exists(path + '.ts')) {
-                        return path + '.ts';
-                    }
-                }
-                return path + '.js';
-            }
-            return path;
-        }
-        let json = global_1.io.File.read(pckg);
-        if (typeof json === 'string') {
-            json = JSON.parse(json);
-        }
-        if (json.main) {
-            return (0, path_1.path_combine)(nodeModules, json.main);
-        }
-        return nodeModules + 'index.js';
-    }
-}
-function hasExt(path) {
-    return /\.[\w]{1,8}($|\?)/.test(path);
-}
+// function nodeModuleResolve(path, location_){
+//     let location = location_.replace(/[\\\/]+$/, '');
+//     let name = /^([\w\-]+)/.exec(path)[0];
+//     let resource = path.substring(name.length + 1);
+//     let current = location;
+//     let root_ = current + '/node_modules/' + name + '/';
+//     while (true)  {
+//         let nodeModules = path_combine(current, '/node_modules/' + name + '/');
+//         let pkg = nodeModules + 'package.json';
+//         if (io.File.exists(pkg) === false) {
+//             let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
+//             if (next === current) {
+//                 return root_ + 'package.json';
+//             }
+//             current = next;
+//             continue;
+//         }
+//         if (resource) {
+//             let path = nodeModules + resource;
+//             if (hasExt(path) === false) {
+//                 let likelyTs = path.includes('/src/');
+//                 if (likelyTs) {
+//                     if (io.File.exists(path + '.ts')) {
+//                         return path + '.ts';
+//                     }
+//                 }
+//                 return path + '.js';
+//             }
+//             return path;
+//         }
+//         let json = io.File.read(pkg);
+//         if (typeof json === 'string') {
+//             json = JSON.parse(json);
+//         }
+//         if (json.main) {
+//             return path_combine(nodeModules, json.main)
+//         }
+//         return nodeModules + 'index.js';
+//     }
+// }
+// function hasExt(path) {
+//     return /\.[\w]{1,8}($|\?)/.test(path);
+// }
 //# sourceMappingURL=CommonJsPathResolver.js.map
 //# sourceMappingURL=CommonJsPathResolver.ts.map;
 
@@ -7873,8 +7980,11 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
     rewritePartial(content, ownerResource) {
     }
     async rewriteResource(resource) {
+        if (resource.dependencies == null) {
+            return;
+        }
         for (let res of resource.dependencies) {
-            if (/(json|yml)$/.test(res.url) === false) {
+            if (/\.(json|yml)$/.test(res.url) === false) {
                 continue;
             }
             if (res.import != null) {
@@ -7905,6 +8015,7 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
         let i = resource.dependencies.indexOf(dep);
         resource.dependencies.splice(i, 1);
         this.solution.outputResources.remove(dep.resource);
+        this.solution.reporter.info(`Inlining import data from ${dep.url}`);
     }
     rewriteRequire(resource, dep) {
         let rgx = new RegExp(`require\\s*\\(\\s*['"]${dep.url}['"]\\s*\\)\\s*;?`);
@@ -7923,6 +8034,7 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
         let i = resource.dependencies.indexOf(dep);
         resource.dependencies.splice(i, 1);
         this.solution.outputResources.remove(dep.resource);
+        this.solution.reporter.info(`Inlining require data from ${dep.url}`);
     }
 }
 exports.DataInliner = DataInliner;
@@ -11749,6 +11861,13 @@ var ResourceLoader;
             loader.process();
         }
         else {
+            // Merge aliases to the current cached resource
+            if (resource.aliases.length > 0) {
+                loader.resource.aliases = (0, alot_1.default)([
+                    ...loader.resource.aliases,
+                    ...resource.aliases
+                ]).distinct().toArray();
+            }
             // Try to find the resource in ancestors
             let res = tryGetCyclicRoot(resource);
             if (res != null) {
@@ -12138,8 +12257,8 @@ exports.Builder = {
                 .then(buildRoot)
                 .then(() => solution.outputResources.getAll());
         });
-        function rewriteDependenciesInternal(resources) {
-            let promises = resources.map(resource => {
+        async function rewriteDependenciesInternal(resources) {
+            await (0, alot_1.default)(resources).forEachAsync(async (resource, i) => {
                 let ext = (0, path_1.path_getExtension)(resource.url);
                 let handler = solution.handlers.find(x => x.rewriter.accepts(ext));
                 if (handler == null) {
@@ -12148,9 +12267,8 @@ exports.Builder = {
                 if (handler == null) {
                     throw Error('Rewriter not found for the resource: ' + resource.url);
                 }
-                return handler.rewriter.rewriteResource(resource);
-            });
-            return (0, async_1.async_whenAll)(promises);
+                await handler.rewriter.rewriteResource(resource);
+            }).toArrayAsync({ threads: 1 });
         }
         function rewriteRoot() {
             return (0, async_1.async_run)(() => {

package/lib/cli.js

@@ -1312,7 +1312,8 @@ const global_1 = _src_global;
 const atma_io_1 = require("atma-io");
 var Npm;
 (function (Npm) {
-    function resolveAppUrl(path, currentLocation, base) {
+    function resolveAppUrl(path, currentLocation, opts) {
+        let base = opts.base;
         let name = /^(@?[^\\\/]+)/.exec(path)[0];
         let resource = path.substring(name.length + 1);
         while (path != null) {
@@ -1331,14 +1332,9 @@ var Npm;
                 dirname = (0, path_1.path_combine)(dirname, `/${subPackage}`, '/');
                 resource = resource.substring(subPackage.length + 1);
             }
-            if (resource === '') {
-                let pkg = (0, path_1.path_combine)(dirname, 'package.json');
-                let json = global_1.io.File.read(pkg);
-                if (json) {
-                    resource = json.main;
-                }
-            }
-            let filename = combineMain(dirname, resource);
+            let pkg = (0, path_1.path_combine)(dirname, 'package.json');
+            let json = global_1.io.File.read(pkg);
+            let filename = resolveAppUrlFromPackageJson(dirname, json, resource, opts);
             if (base) {
                 if (base.endsWith('/') === false) {
                     // Base path must be a folder
@@ -1355,6 +1351,89 @@ var Npm;
         return null;
     }
     Npm.resolveAppUrl = resolveAppUrl;
+    function resolveAppUrlFromPackageJson(pkgDir, pkg, subPath, opts) {
+        var _a;
+        if (pkg.main == null && pkg.exports == null) {
+            return combineMain(pkgDir, subPath);
+        }
+        if (pkg.exports == null) {
+            return combineMain(pkgDir, subPath || pkg.main);
+        }
+        if (typeof pkg.exports === 'string') {
+            return combineMain(pkgDir, subPath || pkg.exports);
+        }
+        const moduleExportsMap = 'require';
+        const conditionExportsMap = (_a = opts.package.platform) !== null && _a !== void 0 ? _a : 'node';
+        let libraryFilePath = fromExports(pkg.exports, subPath, {
+            moduleExports: moduleExportsMap,
+            conditionExports: conditionExportsMap,
+            pkgDir,
+        });
+        return combineMain(pkgDir, libraryFilePath);
+    }
+    Npm.resolveAppUrlFromPackageJson = resolveAppUrlFromPackageJson;
+    function fromExports(exports, subPath, opts) {
+        var _a;
+        if (exports == null) {
+            throw new Error(`Invalid exports for ${subPath}`);
+        }
+        if (typeof exports === 'object') {
+            exports = extractConditional(exports, opts);
+        }
+        if (typeof exports === 'object') {
+            // TExportsMap
+            let map = exports;
+            if (!subPath) {
+                let dot = '.';
+                if (map[dot] == null) {
+                    throw new Error(`Missing default "." export in exports for ${JSON.stringify(exports)}`);
+                }
+                return extractConditional(map[dot], opts);
+            }
+            for (let tpl in exports) {
+                let mapped = extractConditional(exports[tpl], opts);
+                if (typeof mapped !== 'string') {
+                    throw new Error(`Invalid conditional exports for ${JSON.stringify(exports)} in ${(_a = opts.pkgDir) !== null && _a !== void 0 ? _a : subPath}`);
+                }
+                if (tpl.startsWith('./')) {
+                    tpl = tpl.substring(2);
+                    if (tpl === '*') {
+                        return mapped.replace('*', subPath);
+                    }
+                    let globIndex = tpl.indexOf('*');
+                    if (globIndex === -1 && tpl === subPath) {
+                        return mapped;
+                    }
+                    if (globIndex > -1) {
+                        let tplPfx = tpl.substring(0, globIndex).replace(/\/+$/, '');
+                        if (subPath.startsWith(tplPfx)) {
+                            let subPathSfx = subPath.replace(tplPfx, '');
+                            return mapped.replace('*', subPathSfx);
+                        }
+                    }
+                }
+            }
+        }
+        if (typeof exports === 'string') {
+            return exports;
+        }
+        throw new Error(`Path can't be mapped ${JSON.stringify(exports)}`);
+    }
+    function extractConditional(exports, opts) {
+        if (exports == null || typeof exports !== 'object') {
+            return exports;
+        }
+        if (opts.conditionExports in exports) {
+            return extractConditional(exports[opts.conditionExports], opts);
+        }
+        if (opts.moduleExports in exports) {
+            return extractConditional(exports[opts.moduleExports], opts);
+        }
+        if ('default' in exports) {
+            return extractConditional(exports['default'], opts);
+        }
+        return exports;
+    }
     function combineMain(directory, filename) {
         filename !== null && filename !== void 0 ? filename : (filename = 'index.js');
         let path = (0, path_1.path_combine)(directory, filename);
@@ -1517,7 +1596,7 @@ class Resource {
         }
         if (Include_1.Include.PathResolver.isNpm(includeData.url)) {
             this.aliases.push(includeData.url);
-            let byNpmResolver = 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);
             if (byNpmResolver != null) {
                 // otherwise "url" could be previously resolved with pathResolver.resolve
                 url = byNpmResolver;
@@ -1527,6 +1606,15 @@ class Resource {
                 url = includeData.url;
             }
         }
+        if (includeData.route != null) {
+            let { path, alias } = includeData.route;
+            if (path && Include_1.Include.PathResolver.isNpm(path) && this.aliases.includes(path) === false) {
+                this.aliases.push(path);
+            }
+            if (alias && Include_1.Include.PathResolver.isNpm(alias) && this.aliases.includes(alias) === false) {
+                this.aliases.push(alias);
+            }
+        }
         let mappedUrl = this.solution.mapUrl(url);
         if (mappedUrl != url) {
             console.log(`URL mapped: ${url} => ${mappedUrl}`);
@@ -4699,10 +4787,10 @@ const global_1 = _src_global;
 exports.Templates = {
     Module: `
 // source ./Module.js
-__register("%MODULE_PATH%", function(require, module, exports, __filename, __dirname){
-	%MODULE%
+__register(%MODULE_PATH%, %MODULE_ALIASES%, function(require, module, exports, __filename, __dirname){
+    %MODULE%
 
-	%FOOTER%
+    %FOOTER%
 });
 
 // end:source ./Module.js
@@ -4736,6 +4824,7 @@ var ___VAR_ID___;
 `,
     Header: `
 // source ./Header.js
+
 var __register, __require, require;
 
 (function(){
@@ -4877,31 +4966,49 @@ var __register, __require, require;
 
     var __global = typeof global !== 'undefined' && global ? global : window;
     var __nativeRequire = __global.require || require;
-    var __originalRequire = function (path_) {
-        var location = this.location;
-        var path = path_resolveUrl(path_, location);
-
-        if (modules[path]) {
-            return modules[path].runOnce();
+    var __bundlerRequire = function (path_) {
+        var arr = [
+            path_resolveUrl(path_, this.location)
+        ];
+        if (typeof include !== 'undefined' && typeof include.resolvePath === 'function') {
+            arr.push(include.resolvePath(path_));
+        }
+        if (/^[@\\w]/.test(path_)) {
+            arr.push(path_);
+        }
+        for (var i = 0; i < arr.length; i++) {
+            if (arr[i] in modules) {
+                return modules[arr[i]].runOnce();
+            }
         }
-        var pathWithoutExt = path.replace(/\\.\\w+$/, '').toLowerCase();
+
         for (var key in modules) {
             var $pathWithoutExt = key.replace(/\\.\\w+$/, '').toLowerCase();
-            if ($pathWithoutExt === pathWithoutExt) {
-                let module = modules[path] = modules[key];
-                return module.runOnce();
+            for (var i = 0; i < arr.length; i++) {
+                var path = arr[i];
+                var pathWithoutExt = path.replace(/\\.\\w+$/, '').toLowerCase();
+                if ($pathWithoutExt === pathWithoutExt) {
+                    let module = modules[path] = modules[key];
+                    return module.runOnce();
+                }
             }
         }
 
         return __nativeRequire(path_);
     };
 
-    __register = function (path, factory) {
+    __register = function (path, aliases, factory) {
         var filename = path_resolveUrl(path);
-        modules[filename] = new Module(filename, factory);
+        var module = new Module(filename, factory);
+        modules[filename] = module;
+        if (aliases) {
+            aliases.forEach(alias => {
+                modules[alias] = module;
+            })
+        }
     };
 
-    __require =__originalRequire.bind({ location: path_getDir(path_resolveUrl('%ROOT_DIR%')) });
+    __require =__bundlerRequire.bind({ location: path_getDir(path_resolveUrl('%ROOT_DIR%')) });
 
     var modules = {};
     var Module = function(filename, factory){
@@ -4914,7 +5021,7 @@ var __register, __require, require;
         if (this.exports != null) {
             return this.exports;
         }
-        var require = __originalRequire.bind({
+        var require = __bundlerRequire.bind({
             location: this.dirname
         });
         this.exports = {};
@@ -4930,7 +5037,7 @@ var __register, __require, require;
 
     require = __require;
 
-    if (__nativeRequire == null) {
+    if (__global.require != null) {
         __global.require = __require;
     }
 }());
@@ -6107,7 +6214,7 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         super(solution, handler);
         this.solution = solution;
         this.handler = handler;
-        var opts = this.solution.opts.package.commonjs;
+        let opts = this.solution.opts.package.commonjs;
         if (opts && opts.output === 'simplified') {
             this.wrapModule = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.wrapModule;
             this.getRootContent = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.getRootContent;
@@ -6125,7 +6232,7 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         return module === 'commonjs';
     }
     wrapModule(resource, outputItem, outputItems, setts) {
-        var opts = this.solution.iteration;
+        let opts = this.solution.iteration;
         if (opts.commonjs == null) {
             opts.commonjs = {
                 addHeading: true,
@@ -6133,21 +6240,22 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
             };
         }
         ;
-        var body = '';
+        let body = '';
         if (opts.commonjs.hasHeading === false && opts.commonjs.addHeading === true) {
             opts.commonjs.hasHeading = true;
             body = this.getHeaderContent();
         }
-        var { url, content } = resource;
-        var module = Templates_1.Templates
+        let { url, content, aliases } = resource;
+        let module = Templates_1.Templates
             .Module
-            .replace('%MODULE_PATH%', () => url)
+            .replace('%MODULE_PATH%', () => `"${url}"`)
+            .replace('%MODULE_ALIASES%', JSON.stringify(aliases !== null && aliases !== void 0 ? aliases : []))
             .replace('%MODULE%', () => content)
             .replace('%FOOTER%', () => { var _a, _b; return ((_b = (_a = setts === null || setts === void 0 ? void 0 : setts.partials) === null || _a === void 0 ? void 0 : _a.footer) !== null && _b !== void 0 ? _b : ''); });
         return body + module;
     }
     getHeaderContent() {
-        var mainUrl = this.solution.outputResources.rootInput.url;
+        let mainUrl = this.solution.outputResources.rootInput.url;
         return Templates_1.Templates
             .Header
             .replace('%ROOT_DIR%', () => mainUrl);
@@ -6168,7 +6276,7 @@ class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         })
             .concat([content])
             .join('\n');
-        var wrapper = new ModuleWrapper_1.ModuleWrapper(this.solution);
+        let wrapper = new ModuleWrapper_1.ModuleWrapper(this.solution);
         root.content = wrapper.wrap(body);
     }
     getRootContent(root, outputDependencies) {
@@ -6209,8 +6317,7 @@ var _src_handlers_script_common_js_CommonJsPathResolver;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonJsPathResolver = void 0;
 const BasePathResolver_1 = _src_handlers_base_BasePathResolver;
-const path_1 = _src_utils_path;
-const global_1 = _src_global;
+const npm_1 = _src_utils_npm;
 class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
     accepts(includeData) {
         if (includeData.type !== 'js' || includeData.module !== 'commonjs') {
@@ -6225,7 +6332,7 @@ class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
         return true;
     }
     resolve(includeData, parentResource) {
-        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
+        let filename = npm_1.Npm.resolveAppUrl(includeData.url, parentResource.directory, this.solution.opts);
         if (filename) {
             let url = this.solution.opts.toAppUrl(filename);
             this.solution.opts.mappings[includeData.url] = url;
@@ -6241,49 +6348,49 @@ const nodeCoreModules = [
     'process', 'punycode', 'querystring', 'readline', 'repl', 'stream', 'string_decoder', 'sys', 'timers',
     'tls', 'tty', 'url', 'util', 'vm', 'zlib'
 ];
-function nodeModuleResolve(path, location_) {
-    let location = location_.replace(/[\\\/]+$/, '');
-    let name = /^([\w\-]+)/.exec(path)[0];
-    let resource = path.substring(name.length + 1);
-    let current = location;
-    let root_ = current + '/node_modules/' + name + '/';
-    while (true) {
-        let nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
-        let pckg = nodeModules + 'package.json';
-        if (global_1.io.File.exists(pckg) === false) {
-            let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
-            if (next === current) {
-                return root_ + 'package.json';
-            }
-            current = next;
-            continue;
-        }
-        if (resource) {
-            let path = nodeModules + resource;
-            if (hasExt(path) === false) {
-                let likelyTs = path.includes('/src/');
-                if (likelyTs) {
-                    if (global_1.io.File.exists(path + '.ts')) {
-                        return path + '.ts';
-                    }
-                }
-                return path + '.js';
-            }
-            return path;
-        }
-        let json = global_1.io.File.read(pckg);
-        if (typeof json === 'string') {
-            json = JSON.parse(json);
-        }
-        if (json.main) {
-            return (0, path_1.path_combine)(nodeModules, json.main);
-        }
-        return nodeModules + 'index.js';
-    }
-}
-function hasExt(path) {
-    return /\.[\w]{1,8}($|\?)/.test(path);
-}
+// function nodeModuleResolve(path, location_){
+//     let location = location_.replace(/[\\\/]+$/, '');
+//     let name = /^([\w\-]+)/.exec(path)[0];
+//     let resource = path.substring(name.length + 1);
+//     let current = location;
+//     let root_ = current + '/node_modules/' + name + '/';
+//     while (true)  {
+//         let nodeModules = path_combine(current, '/node_modules/' + name + '/');
+//         let pkg = nodeModules + 'package.json';
+//         if (io.File.exists(pkg) === false) {
+//             let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
+//             if (next === current) {
+//                 return root_ + 'package.json';
+//             }
+//             current = next;
+//             continue;
+//         }
+//         if (resource) {
+//             let path = nodeModules + resource;
+//             if (hasExt(path) === false) {
+//                 let likelyTs = path.includes('/src/');
+//                 if (likelyTs) {
+//                     if (io.File.exists(path + '.ts')) {
+//                         return path + '.ts';
+//                     }
+//                 }
+//                 return path + '.js';
+//             }
+//             return path;
+//         }
+//         let json = io.File.read(pkg);
+//         if (typeof json === 'string') {
+//             json = JSON.parse(json);
+//         }
+//         if (json.main) {
+//             return path_combine(nodeModules, json.main)
+//         }
+//         return nodeModules + 'index.js';
+//     }
+// }
+// function hasExt(path) {
+//     return /\.[\w]{1,8}($|\?)/.test(path);
+// }
 //# sourceMappingURL=CommonJsPathResolver.js.map
 //# sourceMappingURL=CommonJsPathResolver.ts.map;
 
@@ -7875,8 +7982,11 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
     rewritePartial(content, ownerResource) {
     }
     async rewriteResource(resource) {
+        if (resource.dependencies == null) {
+            return;
+        }
         for (let res of resource.dependencies) {
-            if (/(json|yml)$/.test(res.url) === false) {
+            if (/\.(json|yml)$/.test(res.url) === false) {
                 continue;
             }
             if (res.import != null) {
@@ -7907,6 +8017,7 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
         let i = resource.dependencies.indexOf(dep);
         resource.dependencies.splice(i, 1);
         this.solution.outputResources.remove(dep.resource);
+        this.solution.reporter.info(`Inlining import data from ${dep.url}`);
     }
     rewriteRequire(resource, dep) {
         let rgx = new RegExp(`require\\s*\\(\\s*['"]${dep.url}['"]\\s*\\)\\s*;?`);
@@ -7925,6 +8036,7 @@ class DataInliner extends BaseRewriter_1.BaseRewriter {
         let i = resource.dependencies.indexOf(dep);
         resource.dependencies.splice(i, 1);
         this.solution.outputResources.remove(dep.resource);
+        this.solution.reporter.info(`Inlining require data from ${dep.url}`);
     }
 }
 exports.DataInliner = DataInliner;
@@ -11751,6 +11863,13 @@ var ResourceLoader;
             loader.process();
         }
         else {
+            // Merge aliases to the current cached resource
+            if (resource.aliases.length > 0) {
+                loader.resource.aliases = (0, alot_1.default)([
+                    ...loader.resource.aliases,
+                    ...resource.aliases
+                ]).distinct().toArray();
+            }
             // Try to find the resource in ancestors
             let res = tryGetCyclicRoot(resource);
             if (res != null) {
@@ -12140,8 +12259,8 @@ exports.Builder = {
                 .then(buildRoot)
                 .then(() => solution.outputResources.getAll());
         });
-        function rewriteDependenciesInternal(resources) {
-            let promises = resources.map(resource => {
+        async function rewriteDependenciesInternal(resources) {
+            await (0, alot_1.default)(resources).forEachAsync(async (resource, i) => {
                 let ext = (0, path_1.path_getExtension)(resource.url);
                 let handler = solution.handlers.find(x => x.rewriter.accepts(ext));
                 if (handler == null) {
@@ -12150,9 +12269,8 @@ exports.Builder = {
                 if (handler == null) {
                     throw Error('Rewriter not found for the resource: ' + resource.url);
                 }
-                return handler.rewriter.rewriteResource(resource);
-            });
-            return (0, async_1.async_whenAll)(promises);
+                await handler.rewriter.rewriteResource(resource);
+            }).toArrayAsync({ threads: 1 });
         }
         function rewriteRoot() {
             return (0, async_1.async_run)(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "app-bundler",
-    "version": "0.2.15",
+    "version": "0.2.17",
     "description": "",
     "main": "lib/bundler.js",
     "bin": {
@@ -9,7 +9,8 @@
     "scripts": {
         "test": "atma test",
         "watch": "atma run tools/build --watch",
-        "build": "atma run tools/build && atma run tools/build --cli",
+        "build": "atma run tools/build && atma run tools/build --cli && npm run cp",
+        "cp": "copy \"lib\\cli.js\" \"D:\\eth\\0xweb\\node_modules\\app-bundler\\lib\\cli.js\"",
         "server": "atma server",
         "release": "echo \"Run atma pub -m \"message\"\""
     },