app-bundler 0.2.6 → 0.2.8

package/lib/bundler.js

@@ -80,6 +80,7 @@ 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_data_DataInliner = {};
 var _src_handlers_script_global_js_GlobalJsBuilder = {};
 var _src_handlers_script_global_js_GlobalJsHandler = {};
 var _src_handlers_script_global_js_GlobalJsParser = {};
@@ -168,7 +169,7 @@ var _src_utils_path;
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: 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;
+exports.path_toAbsolute = exports.path_hasExtension = 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);
@@ -350,9 +351,16 @@ exports.path_removeQuery = path_removeQuery;
 ;
 function path_changeExtension(path, ext) {
     let str = ext ? '.' + ext : '';
+    if (path_hasExtension(path) === false) {
+        return `${path}${str}`;
+    }
     return path.replace(/(\.\w+)+$/, str);
 }
 exports.path_changeExtension = path_changeExtension;
+function path_hasExtension(path) {
+    return /\.\w+$/.test(path);
+}
+exports.path_hasExtension = path_hasExtension;
 function path_toAbsolute(path, parentLocation, rootLocation) {
     path = path_normalize(path);
     if (path_isRelative(path) === false) {
@@ -1085,13 +1093,13 @@ function async_whenAll(mix) {
 }
 exports.async_whenAll = async_whenAll;
 ;
-function async_resolve(...args) {
-    return (new atma_utils_1.class_Dfr()).resolve(...args);
+function async_resolve(result) {
+    return (new atma_utils_1.class_Dfr()).resolve(result);
 }
 exports.async_resolve = async_resolve;
 ;
-function async_reject(...args) {
-    return (new atma_utils_1.class_Dfr()).reject(...args);
+function async_reject(error) {
+    return (new atma_utils_1.class_Dfr()).reject(error);
 }
 exports.async_reject = async_reject;
 ;
@@ -1100,7 +1108,7 @@ function async_run(fn) {
         var result = fn();
         if (result && result.then)
             return result;
-        return async_resolve();
+        return async_resolve(null);
     }
     return atma_utils_1.class_Dfr.run((resolve, reject) => {
         fn(resolve, reject);
@@ -2619,19 +2627,21 @@ class SolutionOpts extends SolutionOptsBase {
             outputSources: '{output}/build/{build}',
             outputAssets: '{output}/build/{build}/assets',
             outputShareBase: null,
+            outputExtension: 'js',
             package: {
                 module: 'commonjs',
                 modules: ['commonjs', 'includejs', 'global', 'import'],
                 type: 'module',
                 types: ['module', 'bundle'],
                 moduleWrapper: 'iif',
-                moduleWrappers: ['umd', 'iif', 'script', 'custom'],
+                moduleWrappers: ['umd', 'esm', 'iif', 'script', 'custom'],
                 moduleName: '',
                 import: null,
             },
             extensions: {
                 '': { type: 'js' },
                 'js': { type: 'js' },
+                'mjs': { type: 'js' },
                 'es6': { type: 'js' },
                 'jsx': { type: 'js' },
                 'ts': { type: 'js' },
@@ -3006,6 +3016,7 @@ class OutputResources {
         this.items = [];
         this.resources = [];
         this.pagesInput = {};
+        this.dynamicDependencies = [];
     }
     prepare(resources) {
         this.resources = [];
@@ -3049,6 +3060,22 @@ class OutputResources {
             });
         });
     }
+    addDynamicDependency(dep) {
+        let has = this.dynamicDependencies.some(x => x.url === dep.url);
+        if (has === false) {
+            this.dynamicDependencies.push(dep);
+        }
+    }
+    remove(resource) {
+        for (let i = 0; i < this.items.length; i++) {
+            let item = this.items[i];
+            let itemResource = item.resources.find(x => x.filename === resource.filename);
+            if (itemResource !== null) {
+                let idx = item.resources.indexOf(itemResource);
+                item.resources.splice(idx, 1);
+            }
+        }
+    }
     getForPage(page) {
         return this.items.filter(x => x.page === page).map(x => x.resource);
     }
@@ -4535,13 +4562,14 @@ 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 };
-        }
-    }
+    // async transpile(content: any, resource: Resource): Promise<{ content: string; }> {
+    //     // we will inline the content instead
+    //     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: []
@@ -4957,8 +4985,11 @@ var __register, __require, require;
 `,
     ESM: `
 // source ./ESM.js
+$CUSTOM_IMPORTS_CODE$
+
+var exports = {};
 var module = {
-    exports: {}
+    exports: exports
 };
 
 $MODULE$
@@ -5207,90 +5238,89 @@ exports.template_stringifyContent = template_stringifyContent;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_common_js_ModuleWrapper;
+var _src_handlers_script_import_js_utils;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_common_js_ModuleWrapper != null ? _src_handlers_script_common_js_ModuleWrapper : {};
+    var exports = _src_handlers_script_import_js_utils != null ? _src_handlers_script_import_js_utils : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleWrapper = void 0;
-const Templates_1 = _src_handlers_script_common_js_templates_Templates;
-class ModuleWrapper {
-    constructor(solution) {
-        this.solution = solution;
-    }
-    wrap(body) {
-        var wrapper = this.solution.opts.package.moduleWrapper;
-        switch (wrapper) {
-            case 'script':
-                body = this.wrapSimple(body);
-                break;
-            case 'iif':
-                body = this.wrapWithIIF(body);
-                break;
-            case 'umd':
-                body = this.wrapWithUMD(body);
-                break;
-            case 'esm':
-                body = this.wrapWithESM(body);
-                break;
-            case 'custom':
-                body = this.wrapWithCustom(body);
-                break;
-            default:
-                throw new Error('Uknown module wrapper: ' + wrapper);
-        }
-        return body;
-    }
-    wrapSimple(body) {
-        return Templates_1.Templates
-            .RootModule
-            .replace('%BUNDLE%', () => body);
-    }
-    wrapWithIIF(body) {
-        return Templates_1.Templates
-            .RootModuleWrapped
-            .replace('%BUNDLE%', () => body);
-    }
-    wrapWithUMD(body) {
-        var opts = this.solution.opts.package;
-        var name = opts.moduleName || '';
-        return Templates_1.Templates
-            .UMD
-            .replace('%MODULE%', () => body)
-            .replace('%NAME%', () => name);
+exports.u_asString = exports.u_readFile = exports.u_getFilesFromPath = exports.u_makeIndent = exports.u_getIndent = exports.u_getNewLine = void 0;
+function u_getNewLine(str, io) {
+    var match = /(\r\n)|(\r)|(\n)/.exec(str);
+    return (match && match[0]) || io.env.newLine;
+}
+exports.u_getNewLine = u_getNewLine;
+;
+function u_getIndent(str) {
+    var match = /^[ \t]+/.exec(str);
+    return match && match[0] || '';
+}
+exports.u_getIndent = u_getIndent;
+;
+function u_makeIndent(str, indent, io) {
+    if (!indent || !str)
+        return str;
+    let newline = u_getNewLine(str, io);
+    return str
+        .split(newline)
+        .map(line => indent + line)
+        .join(newline);
+}
+exports.u_makeIndent = u_makeIndent;
+;
+function u_getFilesFromPath(path, io) {
+    var file = new io.File(path);
+    if (file.exists() === false) {
+        console.error('File not found', file.uri.toLocalFile());
+        return [];
     }
-    wrapWithESM(body) {
-        var opts = this.solution.opts.package;
-        var exportsCode = opts.moduleExportsCode || '';
-        return Templates_1.Templates
-            .ESM
-            .replace('$CUSTOM_EXPORTS_CODE$', () => exportsCode)
-            .replace('$MODULE$', () => body);
+    return [file];
+}
+exports.u_getFilesFromPath = u_getFilesFromPath;
+;
+function u_readFile(io, file, indent, insertFileName) {
+    var content = file.read().toString();
+    var newline = u_getNewLine(content, io);
+    if (indent) {
+        content = content
+            .split(newline)
+            .map(line => indent + line)
+            .join(newline);
     }
-    wrapWithCustom(body) {
-        let opts = this.solution.opts.package;
-        let template = Templates_1.Templates.load(opts.moduleWrapperCustomPath);
-        return template
-            .replace('/**MODULE**/', () => body);
+    if (insertFileName) {
+        content = indent
+            + '// source '
+            + file.uri.file
+            + newline
+            + content;
     }
+    return content;
 }
-exports.ModuleWrapper = ModuleWrapper;
-//# sourceMappingURL=ModuleWrapper.js.map
-//# sourceMappingURL=ModuleWrapper.ts.map;
+exports.u_readFile = u_readFile;
+;
+function u_asString(str) {
+    str = str
+        .replace(/[\n\r]/g, '\\n')
+        .replace(/"/g, '\\"');
+    return `"${str}"`;
+}
+exports.u_asString = u_asString;
+;
+//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_common_js_ModuleWrapper === module.exports) {
+    if (_src_handlers_script_import_js_utils === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_common_js_ModuleWrapper) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_common_js_ModuleWrapper, module.exports);
+    } else if (__isObj(_src_handlers_script_import_js_utils) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_import_js_utils, module.exports);
     } else {
-        _src_handlers_script_common_js_ModuleWrapper = module.exports;
+        _src_handlers_script_import_js_utils = module.exports;
     }
 
     ;
@@ -5300,215 +5330,107 @@ exports.ModuleWrapper = ModuleWrapper;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_common_js_CommonJsBuilder;
+var _src_handlers_script_import_js_Dictionary;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_common_js_CommonJsBuilder != null ? _src_handlers_script_common_js_CommonJsBuilder : {};
+    var exports = _src_handlers_script_import_js_Dictionary != null ? _src_handlers_script_import_js_Dictionary : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonJsBuilder = void 0;
-const CommonJsBuilderSimplified_1 = _src_handlers_script_common_js_CommonJsBuilderSimplified;
-const Templates_1 = _src_handlers_script_common_js_templates_Templates;
-const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
-const template_1 = _src_utils_template;
-const ModuleWrapper_1 = _src_handlers_script_common_js_ModuleWrapper;
-class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
-    constructor(solution, handler) {
-        super(solution, handler);
-        this.solution = solution;
-        this.handler = handler;
-        var opts = this.solution.opts.package.commonjs;
-        if (opts && opts.output === 'simplified') {
-            this.wrapModule = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.wrapModule;
-            this.getRootContent = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.getRootContent;
-            this.getHeaderContent = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.getHeaderContent;
-        }
+exports.Dictionary = void 0;
+class Dictionary {
+    constructor() {
+        this.hash = {};
+        this.arr = [];
     }
-    accepts(resource) {
-        if (resource.type !== 'js') {
-            return false;
-        }
-        let module = resource.getModule();
-        if (module == null || module === 'root') {
-            module = this.solution.opts.package.module;
+    add(...arr) {
+        for (let i = 0; i < arr.length; i++) {
+            let x = arr[i];
+            if (this.hash[x.id] != null) {
+                continue;
+            }
+            this.hash[x.id] = x;
+            this.arr.push(x);
         }
-        return module === 'commonjs';
     }
-    wrapModule(resource, outputItem, outputItems, setts) {
-        var opts = this.solution.iteration;
-        if (opts.commonjs == null) {
-            opts.commonjs = {
-                addHeading: true,
-                hasHeading: false
-            };
-        }
-        ;
-        var body = '';
-        if (opts.commonjs.hasHeading === false && opts.commonjs.addHeading === true) {
-            opts.commonjs.hasHeading = true;
-            body = this.getHeaderContent();
+    insert(x, i) {
+        if (this.hash[x.id] != null) {
+            this.remove(x);
         }
-        var { url, content } = resource;
-        var module = Templates_1.Templates
-            .Module
-            .replace('%MODULE_PATH%', () => url)
-            .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;
+        this.hash[x.id] = x;
+        this.arr.splice(i, 0, x);
     }
-    getHeaderContent() {
-        var mainUrl = this.solution.outputResources.rootInput.url;
-        return Templates_1.Templates
-            .Header
-            .replace('%ROOT_DIR%', () => mainUrl);
+    has(x) {
+        return this.hash[x.id] != null;
     }
-    buildRoot(root, outputDependencies) {
-        outputDependencies.forEach(x => x.embed = true);
-        let content = this.getRootContent(root, outputDependencies);
-        let body = outputDependencies
-            .map(x => {
-            let content = x.content;
-            if (x.type === 'css') {
-                content = (0, template_1.template_interpolate)(Templates_1.Templates.Style, { body: (0, template_1.template_stringifyContent)(content), url: x.url });
-            }
-            if (x.type === 'mask') {
-                content = (0, template_1.template_interpolate)(Templates_1.Templates.Mask, { body: (0, template_1.template_stringifyContent)(content), url: x.url });
+    indexOf(x) {
+        for (let i = 0; i < this.arr.length; i++) {
+            if (this.arr[i].id === x.id) {
+                return i;
             }
-            return content;
-        })
-            .concat([content])
-            .join('\n');
-        var wrapper = new ModuleWrapper_1.ModuleWrapper(this.solution);
-        root.content = wrapper.wrap(body);
+        }
+        return -1;
     }
-    getRootContent(root, outputDependencies) {
-        return root.content;
+    remove(x) {
+        delete this.hash[x.id];
+        let i = this.arr.findIndex(module => module.id === x.id);
+        this.arr.splice(i, 1);
     }
-}
-exports.CommonJsBuilder = CommonJsBuilder;
-;
-//# sourceMappingURL=CommonJsBuilder.js.map
-//# sourceMappingURL=CommonJsBuilder.ts.map;
-
-    function __isObj(x) {
-        return x != null && typeof x === 'object' && x.constructor === Object;
-    }
-    if (_src_handlers_script_common_js_CommonJsBuilder === module.exports) {
-        // do nothing if
-    } else if (__isObj(_src_handlers_script_common_js_CommonJsBuilder) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_common_js_CommonJsBuilder, module.exports);
-    } else {
-        _src_handlers_script_common_js_CommonJsBuilder = module.exports;
-    }
-
-    ;
-}());
-
-// end:source ./ModuleSimplified.js
-
-
-// source ./ModuleSimplified.js
-var _src_handlers_script_common_js_CommonJsPathResolver;
-(function () {
-    // ensure AMD is not active for the model, so that any UMD exports as commonjs
-    var define = null;
-    var exports = _src_handlers_script_common_js_CommonJsPathResolver != null ? _src_handlers_script_common_js_CommonJsPathResolver : {};
-    var module = { exports: exports };
-
-    "use strict";
-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;
-class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
-    accepts(includeData) {
-        if (includeData.type !== 'js' || includeData.module !== 'commonjs') {
-            return false;
-        }
-        if (!/^[\w\-/]+$/.test(includeData.url)) {
-            return false;
-        }
-        if (nodeCoreModules.indexOf(includeData.url) !== -1) {
-            return false;
-        }
-        return true;
-    }
-    resolve(includeData, parentResource) {
-        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
-        if (filename) {
-            let url = this.solution.opts.toAppUrl(filename);
-            this.solution.opts.mappings[includeData.url] = url;
-        }
-        return filename;
-    }
-}
-exports.CommonJsPathResolver = CommonJsPathResolver;
-;
-const nodeCoreModules = [
-    'assert', 'buffer', 'child_process', 'cluster', 'console', 'constants',
-    'crypto', 'dgram', 'dns', 'domain', 'events', 'fs', 'http', 'https', 'module', 'net', 'os', 'path',
-    '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';
+    removeByFn(fn) {
+        let handled = new Dictionary();
+        while (true) {
+            let i = -1, length = this.arr.length;
+            while (++i < length) {
+                let x = this.arr[i];
+                if (handled.has(x)) {
+                    continue;
+                }
+                handled.add(x);
+                if (fn(x)) {
+                    this.arr.splice(i, 1);
+                    delete this.hash[x.id];
+                }
+                break;
+            }
+            if (i === length) {
+                break;
             }
-            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';
-                    }
+    }
+    forEach(fn) {
+        let handled = new Dictionary();
+        while (true) {
+            let i = -1, length = this.arr.length;
+            while (++i < length) {
+                let x = this.arr[i];
+                if (handled.has(x)) {
+                    continue;
                 }
-                return path + '.js';
+                handled.add(x);
+                fn(x, i);
+                break;
+            }
+            if (i === length) {
+                break;
             }
-            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);
-}
-//# sourceMappingURL=CommonJsPathResolver.js.map
-//# sourceMappingURL=CommonJsPathResolver.ts.map;
+exports.Dictionary = Dictionary;
+//# sourceMappingURL=Dictionary.js.map
+//# sourceMappingURL=Dictionary.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_common_js_CommonJsPathResolver === module.exports) {
+    if (_src_handlers_script_import_js_Dictionary === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_common_js_CommonJsPathResolver) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_common_js_CommonJsPathResolver, module.exports);
+    } else if (__isObj(_src_handlers_script_import_js_Dictionary) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_import_js_Dictionary, module.exports);
     } else {
-        _src_handlers_script_common_js_CommonJsPathResolver = module.exports;
+        _src_handlers_script_import_js_Dictionary = module.exports;
     }
 
     ;
@@ -5518,41 +5440,35 @@ function hasExt(path) {
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_common_js_CommonJsHandler;
+var _src_handlers_script_import_js_String;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_common_js_CommonJsHandler != null ? _src_handlers_script_common_js_CommonJsHandler : {};
+    var exports = _src_handlers_script_import_js_String != null ? _src_handlers_script_import_js_String : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonJsHandler = void 0;
-const CommonJsParser_1 = _src_handlers_script_common_js_CommonJsParser;
-const CommonJsRewriter_1 = _src_handlers_script_common_js_CommonJsRewriter;
-const CommonJsBuilder_1 = _src_handlers_script_common_js_CommonJsBuilder;
-const CommonJsPathResolver_1 = _src_handlers_script_common_js_CommonJsPathResolver;
-const BaseHandler_1 = _src_handlers_base_BaseHandler;
-class CommonJsHandler extends BaseHandler_1.BaseHandler {
-}
-exports.CommonJsHandler = CommonJsHandler;
-CommonJsHandler.Parser = CommonJsParser_1.CommonJsParser;
-CommonJsHandler.Rewriter = CommonJsRewriter_1.CommonJsRewriter;
-CommonJsHandler.Builder = CommonJsBuilder_1.CommonJsBuilder;
-CommonJsHandler.PathResolver = CommonJsPathResolver_1.CommonJsPathResolver;
-;
-//# sourceMappingURL=CommonJsHandler.js.map
-//# sourceMappingURL=CommonJsHandler.ts.map;
+exports.String = void 0;
+var String;
+(function (String) {
+    function replace(str, i, length, ins = '') {
+        return str.substring(0, i) + ins + str.substring(i + length);
+    }
+    String.replace = replace;
+})(String = exports.String || (exports.String = {}));
+//# sourceMappingURL=String.js.map
+//# sourceMappingURL=String.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_common_js_CommonJsHandler === module.exports) {
+    if (_src_handlers_script_import_js_String === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_common_js_CommonJsHandler) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_common_js_CommonJsHandler, module.exports);
+    } else if (__isObj(_src_handlers_script_import_js_String) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_import_js_String, module.exports);
     } else {
-        _src_handlers_script_common_js_CommonJsHandler = module.exports;
+        _src_handlers_script_import_js_String = module.exports;
     }
 
     ;
@@ -5562,112 +5478,255 @@ CommonJsHandler.PathResolver = CommonJsPathResolver_1.CommonJsPathResolver;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_amd_js_AmdJsParser;
+var _src_handlers_script_import_js_ModuleFile;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_amd_js_AmdJsParser != null ? _src_handlers_script_amd_js_AmdJsParser : {};
+    var exports = _src_handlers_script_import_js_ModuleFile != null ? _src_handlers_script_import_js_ModuleFile : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AmdJsParser = void 0;
-const BaseParser_1 = _src_handlers_base_BaseParser;
-const AstUtil_1 = _src_handlers_script_utils_AstUtil;
-const atma_utils_1 = require("atma-utils");
-const Include_1 = _src_class_Include;
-class AmdJsParser extends BaseParser_1.BaseParser {
-    getDependencies(ast, ownerResource) {
-        let info = {
-            dependencies: []
-        };
-        AstUtil_1.AstUtil.each(ast, AstUtil_1.AstUtil.is.amdFunction, (node, descend) => {
-            let scope = node.scope || ast;
-            let deps = this._process(node, scope);
-            if (deps) {
-                info.dependencies.push(...deps);
-            }
-            return true;
-        });
-        return new atma_utils_1.class_Dfr().resolve(info);
+exports.ModuleFile = exports.IImporterOptions = void 0;
+const io = require("atma-io");
+const utils_1 = _src_handlers_script_import_js_utils;
+const Dictionary_1 = _src_handlers_script_import_js_Dictionary;
+const String_1 = _src_handlers_script_import_js_String;
+class IImporterOptions {
+    constructor() {
+        this.removeUnusedExports = true;
+        this.wrapper = 'iif';
+        this.lazy = null;
     }
-    _process(node, scope) {
-        if (node.args.length < 2) {
-            return;
-        }
-        let args = AstUtil_1.AstUtil.getArguments(node.args, scope);
-        let res = new Include_1.Include();
-        let dependencies = args.find(x => Array.isArray(x));
-        if (dependencies == null) {
-            return;
+}
+exports.IImporterOptions = IImporterOptions;
+class ModuleFile {
+    constructor(content, file) {
+        this.content = content;
+        this.file = file;
+        this.outer = new Dictionary_1.Dictionary();
+        this.scoped = new Dictionary_1.Dictionary();
+        this.imports = [];
+        this.exports = [];
+        this.scopedVars = [];
+        this.id = file.uri.toLocalFile();
+        this.path = file.uri.toRelativeString(io.env.currentDir);
+    }
+    hasDeep(x, ignore, hash = new Dictionary_1.Dictionary()) {
+        function check(arr) {
+            for (let i = 0; i < arr.length; i++) {
+                let module = arr[i];
+                if (module == ignore || hash.has(module)) {
+                    continue;
+                }
+                hash.add(module);
+                let has = module.hasDeep(x, ignore, hash);
+                if (has) {
+                    return true;
+                }
+            }
+            return false;
         }
-        let groups = Include_1.Include.groupByType(dependencies, this.solution.opts);
-        for (let type in groups) {
-            res[type].apply(res, groups[type]);
+        if (this.id === x.id) {
+            return true;
         }
-        res.includes.forEach(x => x.module = 'amd');
-        let ignore = ['exports', 'require'];
-        res.includes = res.includes.filter(x => ignore.indexOf(x.url) === -1);
-        return res.includes;
+        return check(this.outer.arr) || check(this.scoped.arr);
     }
-}
-exports.AmdJsParser = AmdJsParser;
-;
-//# sourceMappingURL=AmdJsParser.js.map
-//# sourceMappingURL=AmdJsParser.ts.map;
-
-    function __isObj(x) {
-        return x != null && typeof x === 'object' && x.constructor === Object;
-    }
-    if (_src_handlers_script_amd_js_AmdJsParser === module.exports) {
-        // do nothing if
-    } else if (__isObj(_src_handlers_script_amd_js_AmdJsParser) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_amd_js_AmdJsParser, module.exports);
-    } else {
-        _src_handlers_script_amd_js_AmdJsParser = module.exports;
-    }
-
-    ;
-}());
-
-// end:source ./ModuleSimplified.js
-
-
-// source ./ModuleSimplified.js
-var _src_handlers_script_amd_js_AmdJsRewriter;
-(function () {
-    // ensure AMD is not active for the model, so that any UMD exports as commonjs
-    var define = null;
-    var exports = _src_handlers_script_amd_js_AmdJsRewriter != null ? _src_handlers_script_amd_js_AmdJsRewriter : {};
-    var module = { exports: exports };
-
-    "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AmdJsRewriter = void 0;
-const BaseRewriter_1 = _src_handlers_base_BaseRewriter;
-class AmdJsRewriter extends BaseRewriter_1.BaseRewriter {
-    rewritePartial(content, ownerResource) {
+    getAllModules() {
+        let dict = new Dictionary_1.Dictionary();
+        function add(module) {
+            if (dict.has(module)) {
+                return;
+            }
+            dict.add(module);
+            module.outer.forEach(add);
+            module.scoped.forEach(add);
+        }
+        add(this);
+        return dict.arr;
     }
-    rewriteResource(resource) {
+    static getAllImports(modules) {
+        let arr = [];
+        modules.filter(x => x.imports != null).forEach(x => arr.push(...x.imports));
+        return arr;
+        // function read (module: ModuleFile, stack: ModuleFile[] = []): ImportNode[] {
+        //     if (stack.includes(module) || module.imports == null) {
+        //         return [];
+        //     }
+        //     stack.push(module);
+        //     let arr = [...module.imports];
+        //     module.imports.forEach(x => arr.push(...read(x.module, stack)));
+        //     return arr;
+        // }
+        // return read(this);
     }
-    accepts(type) {
-        return type === 'mask';
+    toScript(parents = [], options, indent = '') {
+        let newLine = (0, utils_1.u_getNewLine)(this.content, io);
+        let outerContent = this
+            .outer
+            .arr
+            .map(x => x.toScript([...parents, this], options))
+            .map(x => x.replace(/[\s]*$/, ''))
+            .join(newLine);
+        let scopedContent = this
+            .scoped
+            .arr
+            .map(x => x.toScript([...parents, this], options))
+            .map(x => x.replace(/[\s]*$/, ''))
+            .join(newLine);
+        let scopedRefs = this
+            .scopedVars
+            .filter(x => !options.removeUnusedExports || x.dependents.length > 0)
+            .map(x => `    ${x.ref}`)
+            .join(`,${newLine}`);
+        if (scopedRefs) {
+            scopedRefs = String_1.String.replace(scopedRefs, 0, 3, 'var');
+            scopedRefs += ';';
+            scopedContent = scopedRefs + newLine + scopedContent;
+        }
+        let content = this.content;
+        // normalize exports
+        this.exports.reverse().forEach(x => {
+            if (options.removeUnusedExports && x.dependents.length === 0) {
+                let str = content.substring(x.position, x.position + x.length);
+                str = str.replace(/\s*export\s*/g, '');
+                content = String_1.String.replace(content, x.position, x.length, str);
+                return;
+            }
+            switch (x.type) {
+                case 'ref':
+                    content = String_1.String.replace(content, x.position, x.length, x.ref);
+                    break;
+                case 'function':
+                    content = String_1.String.replace(content, x.position, x.length, `${x.ref} = function `);
+                    break;
+                case 'named':
+                    content = String_1.String.replace(content, x.position, x.length, '');
+                    break;
+                case 'scoped':
+                    if (x.length > 0) {
+                        content = String_1.String.replace(content, x.position, x.length, '');
+                    }
+                    break;
+            }
+        });
+        // remove imports
+        this.imports.reverse().forEach(x => {
+            content = String_1.String.replace(content, x.position, x.length, '');
+        });
+        // create var declaration
+        let externalRefs = '';
+        if (this.exports.length > 0) {
+            this
+                .exports
+                .filter(x => {
+                return x.dependents.length > 0 || options.removeUnusedExports === false;
+            })
+                .forEach(x => {
+                /** Remove local scoped var declaration and make it global scoped */
+                if (x.type === 'scoped') {
+                    let rgx = new RegExp(`\\b(var|let|const|function)\\s+${x.ref}`);
+                    content = content.replace(rgx, x.ref);
+                }
+                return x;
+            });
+            externalRefs = this
+                .exports
+                .reverse()
+                .filter(x => {
+                if (x.builder.movedToOuter) {
+                    return false;
+                }
+                if (options.removeUnusedExports === false) {
+                    return true;
+                }
+                if (x.dependents.length === 0) {
+                    console.warn(`Module ${this.id} has unused export ${x.ref}`);
+                    return false;
+                }
+                return true;
+            })
+                .filter(x => {
+                let exportInOuter = parents
+                    .some(p => {
+                    let parentsExport = p.exports.find(e => e.hasExport(x.ref));
+                    if (parentsExport == null) {
+                        return false;
+                    }
+                    if (options.removeUnusedExports && parentsExport.dependents.length === 0) {
+                        return false;
+                    }
+                    return true;
+                });
+                return exportInOuter === false;
+            })
+                .map(x => `    ${x.ref}`)
+                .join(`,${newLine}`);
+            if (externalRefs.length > 0) {
+                externalRefs = String_1.String.replace(externalRefs, 0, 3, 'var');
+                externalRefs += ';';
+            }
+        }
+        const SPACE = '\t';
+        let indentScopedContent = `${(0, utils_1.u_makeIndent)(scopedContent || '', SPACE, io)}`;
+        let indentContent = `${(0, utils_1.u_makeIndent)(content, SPACE, io)}`;
+        let scopeLess = parents.length === 0 && options.wrapper !== 'iif';
+        content = [
+            `${outerContent}` || '',
+            `${externalRefs}` || '',
+            !scopeLess && (indentScopedContent || indentContent) ? `(function(){` : '',
+            indentScopedContent,
+            indentContent,
+            !scopeLess && (indentScopedContent || indentContent) ? `}());` : ''
+        ]
+            .filter(x => !!x)
+            .join(newLine);
+        return (0, utils_1.u_makeIndent)(content, indent, io);
+    }
+    toImportsJson() {
+        function toJSON(module) {
+            var json = {
+                id: module.id,
+                imports: null
+            };
+            if (module.imports) {
+                json.imports = module.imports.map(x => toJSON(x.module));
+            }
+            return json;
+        }
+        return toJSON(this);
+    }
+    toModulesJson() {
+        function toJSON(module) {
+            let json = {
+                id: module.id,
+                outer: module.outer.arr.map(x => toJSON(x)),
+                scoped: module.scoped.arr.map(x => toJSON(x))
+            };
+            if (json.outer.length === 0) {
+                delete json.outer;
+            }
+            if (json.scoped.length === 0) {
+                delete json.scoped;
+            }
+            return json;
+        }
+        return toJSON(this);
     }
 }
-exports.AmdJsRewriter = AmdJsRewriter;
-;
-//# sourceMappingURL=AmdJsRewriter.js.map
-//# sourceMappingURL=AmdJsRewriter.ts.map;
+exports.ModuleFile = ModuleFile;
+//# sourceMappingURL=ModuleFile.js.map
+//# sourceMappingURL=ModuleFile.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_amd_js_AmdJsRewriter === module.exports) {
+    if (_src_handlers_script_import_js_ModuleFile === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_amd_js_AmdJsRewriter) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_amd_js_AmdJsRewriter, module.exports);
+    } else if (__isObj(_src_handlers_script_import_js_ModuleFile) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_import_js_ModuleFile, module.exports);
     } else {
-        _src_handlers_script_amd_js_AmdJsRewriter = module.exports;
+        _src_handlers_script_import_js_ModuleFile = module.exports;
     }
 
     ;
@@ -5677,91 +5736,208 @@ exports.AmdJsRewriter = AmdJsRewriter;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_amd_js_AmdJsBuilder;
+var _src_handlers_script_import_js_Parser;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_amd_js_AmdJsBuilder != null ? _src_handlers_script_amd_js_AmdJsBuilder : {};
+    var exports = _src_handlers_script_import_js_Parser != null ? _src_handlers_script_import_js_Parser : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AmdJsBuilder = void 0;
-const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
-class AmdJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
-    buildRoot(resource, dependencies) {
-    }
-    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;
-;
-//# sourceMappingURL=AmdJsBuilder.js.map
-//# sourceMappingURL=AmdJsBuilder.ts.map;
-
-    function __isObj(x) {
-        return x != null && typeof x === 'object' && x.constructor === Object;
-    }
-    if (_src_handlers_script_amd_js_AmdJsBuilder === module.exports) {
-        // do nothing if
-    } else if (__isObj(_src_handlers_script_amd_js_AmdJsBuilder) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_amd_js_AmdJsBuilder, module.exports);
-    } else {
-        _src_handlers_script_amd_js_AmdJsBuilder = module.exports;
-    }
-
-    ;
-}());
-
-// end:source ./ModuleSimplified.js
-
-
-// source ./ModuleSimplified.js
-var _src_handlers_script_amd_js_AmdJsHandler;
-(function () {
-    // ensure AMD is not active for the model, so that any UMD exports as commonjs
-    var define = null;
-    var exports = _src_handlers_script_amd_js_AmdJsHandler != null ? _src_handlers_script_amd_js_AmdJsHandler : {};
-    var module = { exports: exports };
-
-    "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AmdJsHandler = void 0;
-const AmdJsParser_1 = _src_handlers_script_amd_js_AmdJsParser;
-const AmdJsRewriter_1 = _src_handlers_script_amd_js_AmdJsRewriter;
-const AmdJsBuilder_1 = _src_handlers_script_amd_js_AmdJsBuilder;
-const BaseHandler_1 = _src_handlers_base_BaseHandler;
-class AmdJsHandler extends BaseHandler_1.BaseHandler {
+exports.Parser = void 0;
+const ModuleFile_1 = _src_handlers_script_import_js_ModuleFile;
+const ResourceInfo_1 = _src_class_ResourceInfo;
+let Rgx = {
+    Imports: {
+        full: {
+            rgx: /^[ \t]*import\s*(\*\s+as\s+\w+\s+from\s+)?['"](?<path>[^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
+            map(match) {
+                let $import = new ResourceInfo_1.ImportNode();
+                $import.position = match.index;
+                $import.length = match[0].length;
+                $import.type = 'full';
+                $import.path = match.groups.path;
+                return $import;
+            }
+        },
+        refs: {
+            rgx: /^[ \t]*import\s*\{([^}]+)}\s*from\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
+            map(match) {
+                let $import = new ResourceInfo_1.ImportNode();
+                $import.position = match.index;
+                $import.length = match[0].length;
+                $import.type = 'refs';
+                $import.path = match[2];
+                $import.refs = match[1].split(',').map(x => x.trim());
+                return $import;
+            }
+        },
+        defaults: {
+            rgx: /^[ \t]*import\s+(?<def>\w+)\s+from\s*['"](?<path>[^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
+            map(match) {
+                let $import = new ResourceInfo_1.ImportNode();
+                $import.position = match.index;
+                $import.length = match[0].length;
+                $import.type = 'full';
+                $import.path = match.groups.path;
+                return $import;
+            }
+        },
+        exportAll: {
+            rgx: /^[ \t]*export\s+\*\s+from\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
+            map(match) {
+                let $import = new ResourceInfo_1.ImportNode();
+                $import.position = match.index;
+                $import.length = match[0].length;
+                $import.type = 'exportAll';
+                $import.path = match[1];
+                $import.exportAll = true;
+                return $import;
+            }
+        },
+        exportRefs: {
+            rgx: /^[ \t]*export\s*\{([^}]+)}\s*from\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
+            map(match) {
+                let $import = new ResourceInfo_1.ImportNode();
+                $import.position = match.index;
+                $import.length = match[0].length;
+                $import.type = 'exportRefs';
+                $import.path = match[2];
+                $import.refs = match[1].split(',').map(x => x.trim());
+                $import.exportRefs = true;
+                return $import;
+            }
+        }
+    },
+    Exports: {
+        ref: {
+            rgx: /^[ \t]*export\s*(const|let|var)\s+([\w\d_$]+)(?=\s*[^\w\d_$;])/gm,
+            map(match) {
+                let $export = new ResourceInfo_1.ExportNode();
+                $export.position = match.index;
+                $export.length = match[0].length;
+                $export.type = 'ref';
+                $export.ref = match[2];
+                return $export;
+            }
+        },
+        named: {
+            rgx: /^[ \t]*export\s*(const|let|var)\s+([\w\d_$]+)(?=\s*[;])/gm,
+            map(match) {
+                let $export = new ResourceInfo_1.ExportNode();
+                $export.position = match.index;
+                $export.length = match[0].length;
+                $export.type = 'named';
+                $export.ref = match[2];
+                return $export;
+            }
+        },
+        scoped: {
+            rgx: /^[ \t]*export\s*\{([^}]+)}\s*;?(?!\s*from)/gm,
+            map(match) {
+                let refs = match[1].split(',').map(x => x.trim());
+                let $export = new ResourceInfo_1.ExportNode();
+                $export.position = match.index;
+                $export.length = match[0].length;
+                $export.type = 'scoped';
+                $export.ref = refs[0];
+                let other = refs.slice(1).map(ref => {
+                    let $export = new ResourceInfo_1.ExportNode();
+                    $export.position = match.index;
+                    $export.length = 0;
+                    $export.type = 'scoped';
+                    $export.ref = ref;
+                    return $export;
+                });
+                return [$export, ...other];
+            }
+        },
+        function: {
+            rgx: /^[ \t]*export\s*function\s+([\w\d_$]+)/gm,
+            map(match) {
+                let $export = new ResourceInfo_1.ExportNode();
+                $export.position = match.index;
+                $export.length = match[0].length;
+                $export.type = 'function';
+                $export.ref = match[1];
+                return $export;
+            }
+        }
+    }
+};
+class Parser {
+    static supports(content) {
+        for (let type in Rgx) {
+            for (let key in Rgx[type]) {
+                let rgx = Rgx[type][key].rgx;
+                rgx.lastIndex = 0;
+                if (rgx.test(content)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    static parse(content, file) {
+        let module = new ModuleFile_1.ModuleFile(content, file);
+        if (Parser.supports(content) === false) {
+            return module;
+        }
+        for (let key in Rgx.Imports) {
+            let x = Rgx.Imports[key];
+            x.rgx.lastIndex = 0;
+            for (let match = x.rgx.exec(content); match != null; match = x.rgx.exec(content)) {
+                let result = x.map(match, content);
+                if (Array.isArray(result)) {
+                    module.imports.push(...result);
+                }
+                else {
+                    module.imports.push(result);
+                }
+            }
+        }
+        for (let key in Rgx.Exports) {
+            let x = Rgx.Exports[key];
+            x.rgx.lastIndex = 0;
+            for (let match = x.rgx.exec(content); match != null; match = x.rgx.exec(content)) {
+                let result = x.map(match, content);
+                if (Array.isArray(result)) {
+                    module.exports.push(...result);
+                }
+                else {
+                    module.exports.push(result);
+                }
+            }
+        }
+        module.imports.forEach(m => m.parent = module);
+        module.imports.filter(x => x.type === 'exportRefs').forEach(imp => {
+            imp.refs.forEach(ref => {
+                let exp = new ResourceInfo_1.ExportNode();
+                exp.position = 0;
+                exp.length = 0;
+                exp.ref = ref;
+                module.exports.push(exp);
+            });
+        });
+        module.imports.sort((a, b) => a.position < b.position ? -1 : 1);
+        module.exports.sort((a, b) => a.position < b.position ? -1 : 1);
+        return module;
+    }
 }
-exports.AmdJsHandler = AmdJsHandler;
-AmdJsHandler.Parser = AmdJsParser_1.AmdJsParser;
-AmdJsHandler.Rewriter = AmdJsRewriter_1.AmdJsRewriter;
-AmdJsHandler.Builder = AmdJsBuilder_1.AmdJsBuilder;
-AmdJsHandler.PathResolver = null;
-;
-//# sourceMappingURL=AmdJsHandler.js.map
-//# sourceMappingURL=AmdJsHandler.ts.map;
+exports.Parser = Parser;
+//# sourceMappingURL=Parser.js.map
+//# sourceMappingURL=Parser.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_amd_js_AmdJsHandler === module.exports) {
+    if (_src_handlers_script_import_js_Parser === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_amd_js_AmdJsHandler) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_amd_js_AmdJsHandler, module.exports);
+    } else if (__isObj(_src_handlers_script_import_js_Parser) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_import_js_Parser, module.exports);
     } else {
-        _src_handlers_script_amd_js_AmdJsHandler = module.exports;
+        _src_handlers_script_import_js_Parser = module.exports;
     }
 
     ;
@@ -5771,70 +5947,124 @@ AmdJsHandler.PathResolver = null;
 
 
 // source ./ModuleSimplified.js
-var _src_class_ResourcePropMapping;
+var _src_handlers_script_common_js_ModuleWrapper;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_class_ResourcePropMapping != null ? _src_class_ResourcePropMapping : {};
+    var exports = _src_handlers_script_common_js_ModuleWrapper != null ? _src_handlers_script_common_js_ModuleWrapper : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResourcePropMapping = void 0;
-class ResourcePropMapping {
-    constructor(resA, resB) {
-        this.resA = resA;
-        this.resB = resB;
+exports.ModuleWrapper = void 0;
+const global_1 = _src_global;
+const Templates_1 = _src_handlers_script_common_js_templates_Templates;
+const Parser_1 = _src_handlers_script_import_js_Parser;
+class ModuleWrapper {
+    constructor(solution) {
+        this.solution = solution;
     }
-    map(resource) {
-        let match = true;
-        for (let key in this.resA) {
-            let val = this.resA[key];
-            if (val == null)
-                continue;
-            let currentVal = resource[key];
-            if (typeof val === 'function') {
-                match = val(currentVal);
-            }
-            if (val instanceof RegExp) {
-                match = val.exec(currentVal) != null;
-            }
-            if (typeof val === 'string' || typeof val === 'number') {
-                match = val === currentVal;
-            }
-            if (match == false) {
-                return resource;
-            }
+    wrap(body) {
+        let wrapper = this.solution.opts.package.moduleWrapper;
+        switch (wrapper) {
+            case 'script':
+                body = this.wrapSimple(body);
+                break;
+            case 'iif':
+                body = this.wrapWithIIF(body);
+                break;
+            case 'umd':
+                body = this.wrapWithUMD(body);
+                break;
+            case 'esm':
+                body = this.wrapWithESM(body);
+                break;
+            case 'custom':
+                body = this.wrapWithCustom(body);
+                break;
+            default:
+                throw new Error('Uknown module wrapper: ' + wrapper);
         }
-        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;
-            }
-            if (typeof val === 'string' || typeof val === 'boolean') {
-                clone[key] = val;
-                continue;
-            }
+        return body;
+    }
+    wrapSimple(body) {
+        return Templates_1.Templates
+            .RootModule
+            .replace('%BUNDLE%', () => body);
+    }
+    wrapWithIIF(body) {
+        return Templates_1.Templates
+            .RootModuleWrapped
+            .replace('%BUNDLE%', () => body);
+    }
+    wrapWithUMD(body) {
+        let opts = this.solution.opts.package;
+        let name = opts.moduleName || '';
+        return Templates_1.Templates
+            .UMD
+            .replace('%MODULE%', () => body)
+            .replace('%NAME%', () => name);
+    }
+    wrapWithESM(body) {
+        let opts = this.solution.opts.package;
+        let exportsCode = opts.moduleExportsCode || '';
+        let importsCode = opts.moduleImportsCode || '';
+        let deps = this.solution.outputResources.dynamicDependencies;
+        if (deps.length > 0) {
+            let arr = deps.map(dep => {
+                let key = `bundlerDynamic_${dep.url.replace(/[^\w]/g, '_')}`;
+                return {
+                    url: dep.url,
+                    key
+                };
+            });
+            let strImports = arr.map(item => `import ${item.key} from '${item.url}';`).join('\n');
+            let strCollection = `const bundlerDynamicRepository = {};\n`
+                + arr.map(item => `bundlerDynamicRepository['${item.url}'] = ${item.key};`)
+                    .join('\n');
+            let strRequire = [
+                `var bundlerOriginalRequire = require || function (url) { throw new Error('Not found: ' + url); };`,
+                `var require = function (url) { return bundlerDynamicRepository[url] || bundlerOriginalRequire(url); };`
+            ].join('\n');
+            importsCode = [
+                strImports,
+                strCollection,
+                strRequire
+            ].join('\n');
         }
-        return clone;
+        let rootPath = this.solution.path;
+        let rootContentRaw = global_1.io.File.read(rootPath, { cached: false, skipHooks: true, encoding: 'utf8' });
+        let module = Parser_1.Parser.parse(rootContentRaw, new global_1.io.File(this.solution.path));
+        let exportsBefore = module.exports.map(x => {
+            return `export const ${x.ref} = module.exports.${x.ref};`;
+        }).join('\n');
+        exportsCode = `${exportsBefore}\n${exportsCode}`;
+        return Templates_1.Templates
+            .ESM
+            .replace('$CUSTOM_IMPORTS_CODE$', () => importsCode)
+            .replace('$CUSTOM_EXPORTS_CODE$', () => exportsCode)
+            .replace('$MODULE$', () => body);
+    }
+    wrapWithCustom(body) {
+        let opts = this.solution.opts.package;
+        let template = Templates_1.Templates.load(opts.moduleWrapperCustomPath);
+        return template
+            .replace('/**MODULE**/', () => body);
     }
 }
-exports.ResourcePropMapping = ResourcePropMapping;
-//# sourceMappingURL=ResourcePropMapping.js.map
-//# sourceMappingURL=ResourcePropMapping.ts.map;
+exports.ModuleWrapper = ModuleWrapper;
+//# sourceMappingURL=ModuleWrapper.js.map
+//# sourceMappingURL=ModuleWrapper.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_class_ResourcePropMapping === module.exports) {
+    if (_src_handlers_script_common_js_ModuleWrapper === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_class_ResourcePropMapping) && __isObj(module.exports)) {
-        Object.assign(_src_class_ResourcePropMapping, module.exports);
+    } else if (__isObj(_src_handlers_script_common_js_ModuleWrapper) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_common_js_ModuleWrapper, module.exports);
     } else {
-        _src_class_ResourcePropMapping = module.exports;
+        _src_handlers_script_common_js_ModuleWrapper = module.exports;
     }
 
     ;
@@ -5844,200 +6074,108 @@ exports.ResourcePropMapping = ResourcePropMapping;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_include_js_IncludeJsParser;
+var _src_handlers_script_common_js_CommonJsBuilder;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_include_js_IncludeJsParser != null ? _src_handlers_script_include_js_IncludeJsParser : {};
+    var exports = _src_handlers_script_common_js_CommonJsBuilder != null ? _src_handlers_script_common_js_CommonJsBuilder : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncludeJsParser = void 0;
-const AstUtil_1 = _src_handlers_script_utils_AstUtil;
-const Include_1 = _src_class_Include;
-const ResourcePropMapping_1 = _src_class_ResourcePropMapping;
-const BaseParser_1 = _src_handlers_base_BaseParser;
-const atma_utils_1 = require("atma-utils");
-class IncludeJsParser extends BaseParser_1.BaseParser {
+exports.CommonJsBuilder = void 0;
+const CommonJsBuilderSimplified_1 = _src_handlers_script_common_js_CommonJsBuilderSimplified;
+const Templates_1 = _src_handlers_script_common_js_templates_Templates;
+const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
+const template_1 = _src_utils_template;
+const ModuleWrapper_1 = _src_handlers_script_common_js_ModuleWrapper;
+class CommonJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
     constructor(solution, handler) {
         super(solution, handler);
-        if (this.solution.opts.package.module === 'includejs') {
-            this.solution.opts.mappers.push(...IncludeJsMappings);
+        this.solution = solution;
+        this.handler = handler;
+        var opts = this.solution.opts.package.commonjs;
+        if (opts && opts.output === 'simplified') {
+            this.wrapModule = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.wrapModule;
+            this.getRootContent = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.getRootContent;
+            this.getHeaderContent = CommonJsBuilderSimplified_1.CommonJsBuilderSimplified.getHeaderContent;
         }
     }
-    getDependencies(ast, ownerResource) {
-        let info = {
-            type: null,
-            url: null,
-            dependencies: [],
-            meta: {
-                includejs: {
-                    hasIncludes: false,
-                    hasExports: false,
-                    hasResponseObject: false,
-                    responseAccessors: null,
-                }
-            }
-        };
-        AstUtil_1.AstUtil.each(ast, AstUtil_1.AstUtil.is.includeFunction, (node, descend) => {
-            function isIncludeSymbolRef(node) {
-                return AstUtil_1.AstUtil.is.type(node, 'AST_SymbolRef') && node.name == 'include';
-            }
-            let scope = AstUtil_1.AstUtil.findNode(node, isIncludeSymbolRef).scope || ast;
-            this._process(info, node, scope);
-            return true;
-        });
-        if (this._getPropertySetter('exports', ast) != null) {
-            info.meta.includejs.hasExports = true;
+    accepts(resource) {
+        if (resource.type !== 'js') {
+            return false;
         }
-        return new atma_utils_1.class_Dfr().resolve(info);
-    }
-    _process(info, node, scope) {
-        let arr = [];
-        function isIncludeMethodCall(node) {
-            return AstUtil_1.AstUtil.is.type(node, 'AST_Call') && node.start.value == 'include';
+        let module = resource.getModule();
+        if (module == null || module === 'root') {
+            module = this.solution.opts.package.module;
         }
-        ;
-        AstUtil_1.AstUtil.each(node, isIncludeMethodCall, (node) => {
-            switch (node.expression && node.expression.property) {
-                case 'js':
-                case 'css':
-                case 'load':
-                case 'lazy':
-                case 'mask':
-                case 'routes':
-                case 'setBase':
-                case 'cfg':
-                    let pckg = {
-                        type: node.expression.property,
-                        args: AstUtil_1.AstUtil.getArguments(node.args, scope),
-                    };
-                    if (pckg.args.length > 0) {
-                        arr.unshift(pckg);
-                    }
-                    info.meta.includejs.hasIncludes = true;
-                    break;
-                case 'done':
-                case 'ready':
-                    this._processIncludeCallback(info, node.args && node.args[0]);
-                    break;
-                case 'instance':
-                case 'embed':
-                case 'plugin':
-                case 'ajax':
-                case 'promise':
-                case 'client':
-                case 'server':
-                case 'use':
-                case 'getPending':
-                case 'getResource':
-                case 'getResourceById':
-                case 'getResources':
-                case 'apply':
-                    break;
-                default:
-                    this.solution.reporter.warn('getIncludes: Unknown function call', node.expression);
-                    break;
-            }
-        });
-        let include = new Include_1.Include();
-        arr.forEach(function (x) {
-            include[x.type].apply(include, x.args);
-        });
-        info.dependencies.push(...include.includes);
+        return module === 'commonjs';
     }
-    _processIncludeCallback(info, CallbackNode) {
-        if (AstUtil_1.AstUtil.is.type(CallbackNode, 'AST_Function') == false) {
-            return;
+    wrapModule(resource, outputItem, outputItems, setts) {
+        var opts = this.solution.iteration;
+        if (opts.commonjs == null) {
+            opts.commonjs = {
+                addHeading: true,
+                hasHeading: false
+            };
         }
-        let meta = info.meta.includejs, args = CallbackNode.argnames, responseObjectName = args.length > 0
-            ? args[args.length - 1].name
-            : null;
-        if (responseObjectName) {
-            meta.hasResponseObject = true;
-            let names = this._getPropertyAccessors(responseObjectName, CallbackNode);
-            if (names) {
-                meta.responseAccessors = (meta.responseAccessors || []).concat(names);
-            }
+        ;
+        var 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
+            .Module
+            .replace('%MODULE_PATH%', () => url)
+            .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;
     }
-    /**
-     *    resolve %name%.propertyAccessor
-     */
-    _getPropertyAccessors(name, Fn) {
-        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) {
-                let chain = AstUtil_1.AstUtil.getPropertyChain(node, this.stack);
-                if (chain) {
-                    references.push(chain);
-                }
-            });
-        });
-        return references;
+    getHeaderContent() {
+        var mainUrl = this.solution.outputResources.rootInput.url;
+        return Templates_1.Templates
+            .Header
+            .replace('%ROOT_DIR%', () => mainUrl);
     }
-    /**
-     *    aim to find all **.exports = X
-     */
-    _getPropertySetter(name, Fn) {
-        let result = null;
-        Fn.body.forEach(function (x) {
-            function isPropertyName(node) {
-                AstUtil_1.AstUtil.is.type(node, 'AST_Assign') && node.left.property === name;
+    buildRoot(root, outputDependencies) {
+        outputDependencies.forEach(x => x.embed = true);
+        let content = this.getRootContent(root, outputDependencies);
+        let body = outputDependencies
+            .map(x => {
+            let content = x.content;
+            if (x.type === 'css') {
+                content = (0, template_1.template_interpolate)(Templates_1.Templates.Style, { body: (0, template_1.template_stringifyContent)(content), url: x.url });
             }
-            AstUtil_1.AstUtil.each(x, isPropertyName, function (node) {
-                let arr = ['include', 'module', 'exports'];
-                if (arr.indexOf(node.start.value) > -1) {
-                    result = node;
-                }
-            });
-        });
-        return result;
+            if (x.type === 'mask') {
+                content = (0, template_1.template_interpolate)(Templates_1.Templates.Mask, { body: (0, template_1.template_stringifyContent)(content), url: x.url });
+            }
+            return content;
+        })
+            .concat([content])
+            .join('\n');
+        var wrapper = new ModuleWrapper_1.ModuleWrapper(this.solution);
+        root.content = wrapper.wrap(body);
+    }
+    getRootContent(root, outputDependencies) {
+        return root.content;
     }
 }
-exports.IncludeJsParser = IncludeJsParser;
+exports.CommonJsBuilder = CommonJsBuilder;
 ;
-let IncludeJsMappings = [
-    new ResourcePropMapping_1.ResourcePropMapping({
-        asModules: (arr) => arr.indexOf('mask') > -1
-    }, {
-        asModules: (arr) => {
-            let i = arr.indexOf('mask');
-            arr[i] = 'includejs';
-            return arr;
-        }
-    }),
-    new ResourcePropMapping_1.ResourcePropMapping({
-        asModules: (arr) => arr.indexOf('amd') > -1
-    }, {
-        asModules: (arr) => {
-            let i = arr.indexOf('amd');
-            arr[i] = 'includejs';
-            return arr;
-        }
-    }),
-    new ResourcePropMapping_1.ResourcePropMapping({
-        type: 'mask'
-    }, {
-        type: 'load'
-    })
-];
-//# sourceMappingURL=IncludeJsParser.js.map
-//# sourceMappingURL=IncludeJsParser.ts.map;
+//# sourceMappingURL=CommonJsBuilder.js.map
+//# sourceMappingURL=CommonJsBuilder.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_include_js_IncludeJsParser === module.exports) {
+    if (_src_handlers_script_common_js_CommonJsBuilder === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_include_js_IncludeJsParser) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_include_js_IncludeJsParser, module.exports);
+    } else if (__isObj(_src_handlers_script_common_js_CommonJsBuilder) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_common_js_CommonJsBuilder, module.exports);
     } else {
-        _src_handlers_script_include_js_IncludeJsParser = module.exports;
+        _src_handlers_script_common_js_CommonJsBuilder = module.exports;
     }
 
     ;
@@ -6047,193 +6185,104 @@ let IncludeJsMappings = [
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_include_js_IncludeJsBuilder;
+var _src_handlers_script_common_js_CommonJsPathResolver;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_include_js_IncludeJsBuilder != null ? _src_handlers_script_include_js_IncludeJsBuilder : {};
+    var exports = _src_handlers_script_common_js_CommonJsPathResolver != null ? _src_handlers_script_common_js_CommonJsPathResolver : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncludeJsBuilder = void 0;
-const arr_1 = _src_utils_arr;
-const Include_1 = _src_class_Include;
-const res_1 = _src_utils_res;
-const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
-class IncludeJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
-    wrapScriptlessModule(otherOutputItems) {
-        var allResources = (0, arr_1.arr_flattern)(otherOutputItems.map(x => x.resources));
-        var jsResources = allResources.filter(x => this.accepts(x));
-        var cssResources = allResources.filter(x => x.type === 'css');
-        var loadResources = allResources.filter(x => x.type === 'load');
-        var jsRegister = this._serializeRegister(jsResources, 'js');
-        var cssRegister = this._serializeRegister(cssResources, 'css');
-        var loadRegister = this._serializeRegister(loadResources, 'load');
-        return `
-            ${jsRegister}
-            ${cssRegister}
-            ${loadRegister}
-        `;
-    }
-    isMainBuilder(solution) {
-        const KEY = 'includejs';
-        const packageInfo = solution.opts.package;
-        return packageInfo.module === KEY || packageInfo.moduleName === KEY;
-    }
-    wrapModule(resource, outputItem, otherOutputItems) {
-        var opts = this.solution.opts;
-        var page = (0, res_1.res_getPage)(resource, opts);
-        var iteration = this.solution.iteration;
-        if (iteration.includejs == null) {
-            iteration.includejs = {};
-        }
-        if (iteration.includejs[page] == null) {
-            iteration.includejs[page] = {
-                addHeading: true,
-                hasHeading: false,
-                lastItem: null
-            };
-        }
-        var builderOpts = iteration.includejs[page];
-        var body = '';
-        if (builderOpts.hasHeading === false && builderOpts.addHeading === true) {
-            builderOpts.hasHeading = true;
-            body = this._createHeading(builderOpts, resource, outputItem, otherOutputItems);
-        }
-        let content = resource.content;
-        let url = resource.toTargetUrl(this.solution);
-        let aliases = resource.aliases == null ? 'null' : '[' + resource.aliases.map(x => `'${x}'`).join(',') + ']';
-        body += `include.setCurrent({ url: '${url}', aliases: ${aliases} });\n`;
-        body += content;
-        body += `\ninclude.getResourceById('${url}', 'js').readystatechanged(3);`;
-        if (builderOpts.hasHeading && builderOpts.lastItem === resource) {
-            body += `\ninclude.resumeStack();`;
+exports.CommonJsPathResolver = void 0;
+const BasePathResolver_1 = _src_handlers_base_BasePathResolver;
+const path_1 = _src_utils_path;
+const global_1 = _src_global;
+class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
+    accepts(includeData) {
+        if (includeData.type !== 'js' || includeData.module !== 'commonjs') {
+            return false;
         }
-        return body;
-    }
-    accepts(resource) {
-        if (resource.type !== 'js') {
+        if (!/^[\w\-/]+$/.test(includeData.url)) {
             return false;
         }
-        const module = resource.getModule();
-        return module === 'includejs';
-    }
-    _createHeading(builderOpts, resource, outputItem, otherOutputItems) {
-        var outputItems = [outputItem, ...otherOutputItems];
-        var allResources = (0, arr_1.arr_flattern)(outputItems.map(x => x.resources));
-        var jsResources = allResources.filter(x => this.accepts(x));
-        var cssResources = allResources.filter(x => x.type === 'css');
-        var loadResources = allResources.filter(x => x.type === 'load');
-        builderOpts.lastItem = jsResources[jsResources.length - 1];
-        var jsRegister = this._serializeRegister(jsResources, 'js');
-        var cssRegister = this._serializeRegister(cssResources, 'css');
-        var loadRegister = this._serializeRegister(loadResources, 'load');
-        var version = this._serializeVersion();
-        var config = this._serializeConfig();
-        var heading = `
-            ${version}
-            ${config}
-            include.pauseStack();
-            ${jsRegister}
-            ${cssRegister}
-            ${loadRegister}
-        `;
-        return heading;
-    }
-    _serializeVersion() {
-        var v = this.solution.opts.version;
-        if (!v)
-            return '';
-        return `include.cfg('version', '${v}');`;
-    }
-    _serializeConfig() {
-        var opts = Include_1.Include.getConfig();
-        var json = JSON.stringify(opts);
-        if (json === '{}')
-            return '';
-        return `include.cfg(${json});`;
-    }
-    _serializeRegister(resources, type) {
-        var paths = resources
-            .filter(x => x.type === type)
-            .map(x => {
-            return {
-                type: type,
-                url: x.toTargetUrl(this.solution)
-            };
-        });
-        if (paths.length === 0) {
-            return '';
+        if (nodeCoreModules.indexOf(includeData.url) !== -1) {
+            return false;
         }
-        var json = JSON.stringify({
-            [type]: paths
-        });
-        return `
-            include.register(${json});
-        `;
-    }
-}
-exports.IncludeJsBuilder = IncludeJsBuilder;
-;
-//# sourceMappingURL=IncludeJsBuilder.js.map
-//# sourceMappingURL=IncludeJsBuilder.ts.map;
-
-    function __isObj(x) {
-        return x != null && typeof x === 'object' && x.constructor === Object;
-    }
-    if (_src_handlers_script_include_js_IncludeJsBuilder === module.exports) {
-        // do nothing if
-    } else if (__isObj(_src_handlers_script_include_js_IncludeJsBuilder) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_include_js_IncludeJsBuilder, module.exports);
-    } else {
-        _src_handlers_script_include_js_IncludeJsBuilder = module.exports;
-    }
-
-    ;
-}());
-
-// end:source ./ModuleSimplified.js
-
-
-// source ./ModuleSimplified.js
-var _src_handlers_script_include_js_IncludeJsRewriter;
-(function () {
-    // ensure AMD is not active for the model, so that any UMD exports as commonjs
-    var define = null;
-    var exports = _src_handlers_script_include_js_IncludeJsRewriter != null ? _src_handlers_script_include_js_IncludeJsRewriter : {};
-    var module = { exports: exports };
-
-    "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncludeJsRewriter = void 0;
-const BaseRewriter_1 = _src_handlers_base_BaseRewriter;
-class IncludeJsRewriter extends BaseRewriter_1.BaseRewriter {
-    rewritePartial(content, ownerResource) {
+        return true;
     }
-    rewriteResource(resource) {
-        if (resource.getModule() === 'global' && resource && resource.meta && resource.meta.includejs && resource.meta.includejs.hasIncludes) {
-            resource.asModules = ['includejs'];
+    resolve(includeData, parentResource) {
+        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
+        if (filename) {
+            let url = this.solution.opts.toAppUrl(filename);
+            this.solution.opts.mappings[includeData.url] = url;
         }
-    }
-    accepts(type) {
-        return type === 'js';
+        return filename;
     }
 }
-exports.IncludeJsRewriter = IncludeJsRewriter;
+exports.CommonJsPathResolver = CommonJsPathResolver;
 ;
-//# sourceMappingURL=IncludeJsRewriter.js.map
-//# sourceMappingURL=IncludeJsRewriter.ts.map;
-
+const nodeCoreModules = [
+    'assert', 'buffer', 'child_process', 'cluster', 'console', 'constants',
+    'crypto', 'dgram', 'dns', 'domain', 'events', 'fs', 'http', 'https', 'module', 'net', 'os', 'path',
+    '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);
+}
+//# sourceMappingURL=CommonJsPathResolver.js.map
+//# sourceMappingURL=CommonJsPathResolver.ts.map;
+
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_include_js_IncludeJsRewriter === module.exports) {
+    if (_src_handlers_script_common_js_CommonJsPathResolver === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_include_js_IncludeJsRewriter) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_include_js_IncludeJsRewriter, module.exports);
+    } else if (__isObj(_src_handlers_script_common_js_CommonJsPathResolver) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_common_js_CommonJsPathResolver, module.exports);
     } else {
-        _src_handlers_script_include_js_IncludeJsRewriter = module.exports;
+        _src_handlers_script_common_js_CommonJsPathResolver = module.exports;
     }
 
     ;
@@ -6243,71 +6292,41 @@ exports.IncludeJsRewriter = IncludeJsRewriter;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_include_js_IncludeJsHandler;
+var _src_handlers_script_common_js_CommonJsHandler;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_include_js_IncludeJsHandler != null ? _src_handlers_script_include_js_IncludeJsHandler : {};
+    var exports = _src_handlers_script_common_js_CommonJsHandler != null ? _src_handlers_script_common_js_CommonJsHandler : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IncludeJsHandler = void 0;
-const Templates_1 = _src_handlers_script_common_js_templates_Templates;
-const Include_1 = _src_class_Include;
-const IncludeJsParser_1 = _src_handlers_script_include_js_IncludeJsParser;
-const IncludeJsBuilder_1 = _src_handlers_script_include_js_IncludeJsBuilder;
+exports.CommonJsHandler = void 0;
+const CommonJsParser_1 = _src_handlers_script_common_js_CommonJsParser;
+const CommonJsRewriter_1 = _src_handlers_script_common_js_CommonJsRewriter;
+const CommonJsBuilder_1 = _src_handlers_script_common_js_CommonJsBuilder;
+const CommonJsPathResolver_1 = _src_handlers_script_common_js_CommonJsPathResolver;
 const BaseHandler_1 = _src_handlers_base_BaseHandler;
-const IncludeJsRewriter_1 = _src_handlers_script_include_js_IncludeJsRewriter;
-class IncludeJsHandler extends BaseHandler_1.BaseHandler {
-    constructor(solution) {
-        super(solution);
-        // if (this.solution.opts.package.module === 'includejs') {
-        //     this.registerMappings_();
-        // }
-    }
-    accepts(resource) {
-        if (resource.type !== 'js') {
-            return false;
-        }
-        var module = resource.getModule();
-        if (module == null || module === 'root')
-            module = this.solution.opts.package.module;
-        return module === 'includejs';
-    }
-    rewriteRoot(root, dependencies) {
-        dependencies.forEach(x => x.embed = true);
-        var body = dependencies
-            .map(x => x.content)
-            .concat([root.content])
-            .join('\n');
-        body = Templates_1.Templates.RootModule.replace('%BUNDLE%', () => body);
-        root.content = body;
-    }
-    resolvePath(includeData, parent) {
-        return Include_1.Include
-            .PathResolver
-            .resolveBasic(includeData.url, includeData.type, parent);
-    }
+class CommonJsHandler extends BaseHandler_1.BaseHandler {
 }
-exports.IncludeJsHandler = IncludeJsHandler;
-IncludeJsHandler.Parser = IncludeJsParser_1.IncludeJsParser;
-IncludeJsHandler.Rewriter = IncludeJsRewriter_1.IncludeJsRewriter;
-IncludeJsHandler.Builder = IncludeJsBuilder_1.IncludeJsBuilder;
-IncludeJsHandler.PathResolver = null;
+exports.CommonJsHandler = CommonJsHandler;
+CommonJsHandler.Parser = CommonJsParser_1.CommonJsParser;
+CommonJsHandler.Rewriter = CommonJsRewriter_1.CommonJsRewriter;
+CommonJsHandler.Builder = CommonJsBuilder_1.CommonJsBuilder;
+CommonJsHandler.PathResolver = CommonJsPathResolver_1.CommonJsPathResolver;
 ;
-//# sourceMappingURL=IncludeJsHandler.js.map
-//# sourceMappingURL=IncludeJsHandler.ts.map;
+//# sourceMappingURL=CommonJsHandler.js.map
+//# sourceMappingURL=CommonJsHandler.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_include_js_IncludeJsHandler === module.exports) {
+    if (_src_handlers_script_common_js_CommonJsHandler === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_include_js_IncludeJsHandler) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_include_js_IncludeJsHandler, module.exports);
+    } else if (__isObj(_src_handlers_script_common_js_CommonJsHandler) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_common_js_CommonJsHandler, module.exports);
     } else {
-        _src_handlers_script_include_js_IncludeJsHandler = module.exports;
+        _src_handlers_script_common_js_CommonJsHandler = module.exports;
     }
 
     ;
@@ -6317,89 +6336,69 @@ IncludeJsHandler.PathResolver = null;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_import_js_utils;
+var _src_handlers_script_amd_js_AmdJsParser;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_import_js_utils != null ? _src_handlers_script_import_js_utils : {};
+    var exports = _src_handlers_script_amd_js_AmdJsParser != null ? _src_handlers_script_amd_js_AmdJsParser : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.u_asString = exports.u_readFile = exports.u_getFilesFromPath = exports.u_makeIndent = exports.u_getIndent = exports.u_getNewLine = void 0;
-function u_getNewLine(str, io) {
-    var match = /(\r\n)|(\r)|(\n)/.exec(str);
-    return (match && match[0]) || io.env.newLine;
-}
-exports.u_getNewLine = u_getNewLine;
-;
-function u_getIndent(str) {
-    var match = /^[ \t]+/.exec(str);
-    return match && match[0] || '';
-}
-exports.u_getIndent = u_getIndent;
-;
-function u_makeIndent(str, indent, io) {
-    if (!indent || !str)
-        return str;
-    let newline = u_getNewLine(str, io);
-    return str
-        .split(newline)
-        .map(line => indent + line)
-        .join(newline);
-}
-exports.u_makeIndent = u_makeIndent;
-;
-function u_getFilesFromPath(path, io) {
-    var file = new io.File(path);
-    if (file.exists() === false) {
-        console.error('File not found', file.uri.toLocalFile());
-        return [];
-    }
-    return [file];
-}
-exports.u_getFilesFromPath = u_getFilesFromPath;
-;
-function u_readFile(io, file, indent, insertFileName) {
-    var content = file.read().toString();
-    var newline = u_getNewLine(content, io);
-    if (indent) {
-        content = content
-            .split(newline)
-            .map(line => indent + line)
-            .join(newline);
+exports.AmdJsParser = void 0;
+const BaseParser_1 = _src_handlers_base_BaseParser;
+const AstUtil_1 = _src_handlers_script_utils_AstUtil;
+const atma_utils_1 = require("atma-utils");
+const Include_1 = _src_class_Include;
+class AmdJsParser extends BaseParser_1.BaseParser {
+    getDependencies(ast, ownerResource) {
+        let info = {
+            dependencies: []
+        };
+        AstUtil_1.AstUtil.each(ast, AstUtil_1.AstUtil.is.amdFunction, (node, descend) => {
+            let scope = node.scope || ast;
+            let deps = this._process(node, scope);
+            if (deps) {
+                info.dependencies.push(...deps);
+            }
+            return true;
+        });
+        return new atma_utils_1.class_Dfr().resolve(info);
     }
-    if (insertFileName) {
-        content = indent
-            + '// source '
-            + file.uri.file
-            + newline
-            + content;
+    _process(node, scope) {
+        if (node.args.length < 2) {
+            return;
+        }
+        let args = AstUtil_1.AstUtil.getArguments(node.args, scope);
+        let res = new Include_1.Include();
+        let dependencies = args.find(x => Array.isArray(x));
+        if (dependencies == null) {
+            return;
+        }
+        let groups = Include_1.Include.groupByType(dependencies, this.solution.opts);
+        for (let type in groups) {
+            res[type].apply(res, groups[type]);
+        }
+        res.includes.forEach(x => x.module = 'amd');
+        let ignore = ['exports', 'require'];
+        res.includes = res.includes.filter(x => ignore.indexOf(x.url) === -1);
+        return res.includes;
     }
-    return content;
-}
-exports.u_readFile = u_readFile;
-;
-function u_asString(str) {
-    str = str
-        .replace(/[\n\r]/g, '\\n')
-        .replace(/"/g, '\\"');
-    return `"${str}"`;
 }
-exports.u_asString = u_asString;
+exports.AmdJsParser = AmdJsParser;
 ;
-//# sourceMappingURL=utils.js.map
-//# sourceMappingURL=utils.ts.map;
+//# sourceMappingURL=AmdJsParser.js.map
+//# sourceMappingURL=AmdJsParser.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_import_js_utils === module.exports) {
+    if (_src_handlers_script_amd_js_AmdJsParser === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_import_js_utils) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_import_js_utils, module.exports);
+    } else if (__isObj(_src_handlers_script_amd_js_AmdJsParser) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_amd_js_AmdJsParser, module.exports);
     } else {
-        _src_handlers_script_import_js_utils = module.exports;
+        _src_handlers_script_amd_js_AmdJsParser = module.exports;
     }
 
     ;
@@ -6409,107 +6408,91 @@ exports.u_asString = u_asString;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_import_js_Dictionary;
+var _src_handlers_script_amd_js_AmdJsRewriter;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_import_js_Dictionary != null ? _src_handlers_script_import_js_Dictionary : {};
+    var exports = _src_handlers_script_amd_js_AmdJsRewriter != null ? _src_handlers_script_amd_js_AmdJsRewriter : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Dictionary = void 0;
-class Dictionary {
-    constructor() {
-        this.hash = {};
-        this.arr = [];
+exports.AmdJsRewriter = void 0;
+const BaseRewriter_1 = _src_handlers_base_BaseRewriter;
+class AmdJsRewriter extends BaseRewriter_1.BaseRewriter {
+    rewritePartial(content, ownerResource) {
     }
-    add(...arr) {
-        for (let i = 0; i < arr.length; i++) {
-            let x = arr[i];
-            if (this.hash[x.id] != null) {
-                continue;
-            }
-            this.hash[x.id] = x;
-            this.arr.push(x);
-        }
-    }
-    insert(x, i) {
-        if (this.hash[x.id] != null) {
-            this.remove(x);
-        }
-        this.hash[x.id] = x;
-        this.arr.splice(i, 0, x);
+    rewriteResource(resource) {
     }
-    has(x) {
-        return this.hash[x.id] != null;
+    accepts(type) {
+        return type === 'mask';
     }
-    indexOf(x) {
-        for (let i = 0; i < this.arr.length; i++) {
-            if (this.arr[i].id === x.id) {
-                return i;
-            }
-        }
-        return -1;
+}
+exports.AmdJsRewriter = AmdJsRewriter;
+;
+//# sourceMappingURL=AmdJsRewriter.js.map
+//# sourceMappingURL=AmdJsRewriter.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_amd_js_AmdJsRewriter === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_amd_js_AmdJsRewriter) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_amd_js_AmdJsRewriter, module.exports);
+    } else {
+        _src_handlers_script_amd_js_AmdJsRewriter = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
+// source ./ModuleSimplified.js
+var _src_handlers_script_amd_js_AmdJsBuilder;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_amd_js_AmdJsBuilder != null ? _src_handlers_script_amd_js_AmdJsBuilder : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AmdJsBuilder = void 0;
+const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
+class AmdJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
+    buildRoot(resource, dependencies) {
     }
-    remove(x) {
-        delete this.hash[x.id];
-        let i = this.arr.findIndex(module => module.id === x.id);
-        this.arr.splice(i, 1);
+    wrapModule(resource, outputItem) {
+        return resource.content;
     }
-    removeByFn(fn) {
-        let handled = new Dictionary();
-        while (true) {
-            let i = -1, length = this.arr.length;
-            while (++i < length) {
-                let x = this.arr[i];
-                if (handled.has(x)) {
-                    continue;
-                }
-                handled.add(x);
-                if (fn(x)) {
-                    this.arr.splice(i, 1);
-                    delete this.hash[x.id];
-                }
-                break;
-            }
-            if (i === length) {
-                break;
-            }
+    accepts(resource) {
+        if (resource.type !== 'js') {
+            return false;
         }
-    }
-    forEach(fn) {
-        let handled = new Dictionary();
-        while (true) {
-            let i = -1, length = this.arr.length;
-            while (++i < length) {
-                let x = this.arr[i];
-                if (handled.has(x)) {
-                    continue;
-                }
-                handled.add(x);
-                fn(x, i);
-                break;
-            }
-            if (i === length) {
-                break;
-            }
+        let module = resource.getModule();
+        if (module === 'root' && resource.solution.opts.package.module === 'amd') {
+            module = 'amd';
         }
+        return module === 'amd';
     }
 }
-exports.Dictionary = Dictionary;
-//# sourceMappingURL=Dictionary.js.map
-//# sourceMappingURL=Dictionary.ts.map;
+exports.AmdJsBuilder = AmdJsBuilder;
+;
+//# sourceMappingURL=AmdJsBuilder.js.map
+//# sourceMappingURL=AmdJsBuilder.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_import_js_Dictionary === module.exports) {
+    if (_src_handlers_script_amd_js_AmdJsBuilder === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_import_js_Dictionary) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_import_js_Dictionary, module.exports);
+    } else if (__isObj(_src_handlers_script_amd_js_AmdJsBuilder) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_amd_js_AmdJsBuilder, module.exports);
     } else {
-        _src_handlers_script_import_js_Dictionary = module.exports;
+        _src_handlers_script_amd_js_AmdJsBuilder = module.exports;
     }
 
     ;
@@ -6519,35 +6502,40 @@ exports.Dictionary = Dictionary;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_import_js_String;
+var _src_handlers_script_amd_js_AmdJsHandler;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_import_js_String != null ? _src_handlers_script_import_js_String : {};
+    var exports = _src_handlers_script_amd_js_AmdJsHandler != null ? _src_handlers_script_amd_js_AmdJsHandler : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.String = void 0;
-var String;
-(function (String) {
-    function replace(str, i, length, ins = '') {
-        return str.substring(0, i) + ins + str.substring(i + length);
-    }
-    String.replace = replace;
-})(String = exports.String || (exports.String = {}));
-//# sourceMappingURL=String.js.map
-//# sourceMappingURL=String.ts.map;
+exports.AmdJsHandler = void 0;
+const AmdJsParser_1 = _src_handlers_script_amd_js_AmdJsParser;
+const AmdJsRewriter_1 = _src_handlers_script_amd_js_AmdJsRewriter;
+const AmdJsBuilder_1 = _src_handlers_script_amd_js_AmdJsBuilder;
+const BaseHandler_1 = _src_handlers_base_BaseHandler;
+class AmdJsHandler extends BaseHandler_1.BaseHandler {
+}
+exports.AmdJsHandler = AmdJsHandler;
+AmdJsHandler.Parser = AmdJsParser_1.AmdJsParser;
+AmdJsHandler.Rewriter = AmdJsRewriter_1.AmdJsRewriter;
+AmdJsHandler.Builder = AmdJsBuilder_1.AmdJsBuilder;
+AmdJsHandler.PathResolver = null;
+;
+//# sourceMappingURL=AmdJsHandler.js.map
+//# sourceMappingURL=AmdJsHandler.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_import_js_String === module.exports) {
+    if (_src_handlers_script_amd_js_AmdJsHandler === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_import_js_String) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_import_js_String, module.exports);
+    } else if (__isObj(_src_handlers_script_amd_js_AmdJsHandler) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_amd_js_AmdJsHandler, module.exports);
     } else {
-        _src_handlers_script_import_js_String = module.exports;
+        _src_handlers_script_amd_js_AmdJsHandler = module.exports;
     }
 
     ;
@@ -6557,255 +6545,273 @@ var String;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_import_js_ModuleFile;
+var _src_class_ResourcePropMapping;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_import_js_ModuleFile != null ? _src_handlers_script_import_js_ModuleFile : {};
+    var exports = _src_class_ResourcePropMapping != null ? _src_class_ResourcePropMapping : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleFile = exports.IImporterOptions = void 0;
-const io = require("atma-io");
-const utils_1 = _src_handlers_script_import_js_utils;
-const Dictionary_1 = _src_handlers_script_import_js_Dictionary;
-const String_1 = _src_handlers_script_import_js_String;
-class IImporterOptions {
-    constructor() {
-        this.removeUnusedExports = true;
-        this.wrapper = 'iif';
-        this.lazy = null;
-    }
-}
-exports.IImporterOptions = IImporterOptions;
-class ModuleFile {
-    constructor(content, file) {
-        this.content = content;
-        this.file = file;
-        this.outer = new Dictionary_1.Dictionary();
-        this.scoped = new Dictionary_1.Dictionary();
-        this.imports = [];
-        this.exports = [];
-        this.scopedVars = [];
-        this.id = file.uri.toLocalFile();
-        this.path = file.uri.toRelativeString(io.env.currentDir);
+exports.ResourcePropMapping = void 0;
+class ResourcePropMapping {
+    constructor(resA, resB) {
+        this.resA = resA;
+        this.resB = resB;
     }
-    hasDeep(x, ignore, hash = new Dictionary_1.Dictionary()) {
-        function check(arr) {
-            for (let i = 0; i < arr.length; i++) {
-                let module = arr[i];
-                if (module == ignore || hash.has(module)) {
-                    continue;
-                }
-                hash.add(module);
-                let has = module.hasDeep(x, ignore, hash);
-                if (has) {
-                    return true;
-                }
+    map(resource) {
+        let match = true;
+        for (let key in this.resA) {
+            let val = this.resA[key];
+            if (val == null)
+                continue;
+            let currentVal = resource[key];
+            if (typeof val === 'function') {
+                match = val(currentVal);
+            }
+            if (val instanceof RegExp) {
+                match = val.exec(currentVal) != null;
+            }
+            if (typeof val === 'string' || typeof val === 'number') {
+                match = val === currentVal;
+            }
+            if (match == false) {
+                return resource;
             }
-            return false;
-        }
-        if (this.id === x.id) {
-            return true;
         }
-        return check(this.outer.arr) || check(this.scoped.arr);
-    }
-    getAllModules() {
-        let dict = new Dictionary_1.Dictionary();
-        function add(module) {
-            if (dict.has(module)) {
-                return;
+        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;
+            }
+            if (typeof val === 'string' || typeof val === 'boolean') {
+                clone[key] = val;
+                continue;
             }
-            dict.add(module);
-            module.outer.forEach(add);
-            module.scoped.forEach(add);
         }
-        add(this);
-        return dict.arr;
+        return clone;
     }
-    static getAllImports(modules) {
-        let arr = [];
-        modules.filter(x => x.imports != null).forEach(x => arr.push(...x.imports));
-        return arr;
-        // function read (module: ModuleFile, stack: ModuleFile[] = []): ImportNode[] {
-        //     if (stack.includes(module) || module.imports == null) {
-        //         return [];
-        //     }
-        //     stack.push(module);
-        //     let arr = [...module.imports];
-        //     module.imports.forEach(x => arr.push(...read(x.module, stack)));
-        //     return arr;
-        // }
-        // return read(this);
-    }
-    toScript(parents = [], options, indent = '') {
-        let newLine = (0, utils_1.u_getNewLine)(this.content, io);
-        let outerContent = this
-            .outer
-            .arr
-            .map(x => x.toScript([...parents, this], options))
-            .map(x => x.replace(/[\s]*$/, ''))
-            .join(newLine);
-        let scopedContent = this
-            .scoped
-            .arr
-            .map(x => x.toScript([...parents, this], options))
-            .map(x => x.replace(/[\s]*$/, ''))
-            .join(newLine);
-        let scopedRefs = this
-            .scopedVars
-            .filter(x => !options.removeUnusedExports || x.dependents.length > 0)
-            .map(x => `    ${x.ref}`)
-            .join(`,${newLine}`);
-        if (scopedRefs) {
-            scopedRefs = String_1.String.replace(scopedRefs, 0, 3, 'var');
-            scopedRefs += ';';
-            scopedContent = scopedRefs + newLine + scopedContent;
+}
+exports.ResourcePropMapping = ResourcePropMapping;
+//# sourceMappingURL=ResourcePropMapping.js.map
+//# sourceMappingURL=ResourcePropMapping.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_class_ResourcePropMapping === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_class_ResourcePropMapping) && __isObj(module.exports)) {
+        Object.assign(_src_class_ResourcePropMapping, module.exports);
+    } else {
+        _src_class_ResourcePropMapping = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
+// source ./ModuleSimplified.js
+var _src_handlers_script_include_js_IncludeJsParser;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_include_js_IncludeJsParser != null ? _src_handlers_script_include_js_IncludeJsParser : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IncludeJsParser = void 0;
+const AstUtil_1 = _src_handlers_script_utils_AstUtil;
+const Include_1 = _src_class_Include;
+const ResourcePropMapping_1 = _src_class_ResourcePropMapping;
+const BaseParser_1 = _src_handlers_base_BaseParser;
+const atma_utils_1 = require("atma-utils");
+class IncludeJsParser extends BaseParser_1.BaseParser {
+    constructor(solution, handler) {
+        super(solution, handler);
+        if (this.solution.opts.package.module === 'includejs') {
+            this.solution.opts.mappers.push(...IncludeJsMappings);
         }
-        let content = this.content;
-        // normalize exports
-        this.exports.reverse().forEach(x => {
-            if (options.removeUnusedExports && x.dependents.length === 0) {
-                let str = content.substring(x.position, x.position + x.length);
-                str = str.replace(/\s*export\s*/g, '');
-                content = String_1.String.replace(content, x.position, x.length, str);
-                return;
+    }
+    getDependencies(ast, ownerResource) {
+        let info = {
+            type: null,
+            url: null,
+            dependencies: [],
+            meta: {
+                includejs: {
+                    hasIncludes: false,
+                    hasExports: false,
+                    hasResponseObject: false,
+                    responseAccessors: null,
+                }
             }
-            switch (x.type) {
-                case 'ref':
-                    content = String_1.String.replace(content, x.position, x.length, x.ref);
+        };
+        AstUtil_1.AstUtil.each(ast, AstUtil_1.AstUtil.is.includeFunction, (node, descend) => {
+            function isIncludeSymbolRef(node) {
+                return AstUtil_1.AstUtil.is.type(node, 'AST_SymbolRef') && node.name == 'include';
+            }
+            let scope = AstUtil_1.AstUtil.findNode(node, isIncludeSymbolRef).scope || ast;
+            this._process(info, node, scope);
+            return true;
+        });
+        if (this._getPropertySetter('exports', ast) != null) {
+            info.meta.includejs.hasExports = true;
+        }
+        return new atma_utils_1.class_Dfr().resolve(info);
+    }
+    _process(info, node, scope) {
+        let arr = [];
+        function isIncludeMethodCall(node) {
+            return AstUtil_1.AstUtil.is.type(node, 'AST_Call') && node.start.value == 'include';
+        }
+        ;
+        AstUtil_1.AstUtil.each(node, isIncludeMethodCall, (node) => {
+            switch (node.expression && node.expression.property) {
+                case 'js':
+                case 'css':
+                case 'load':
+                case 'lazy':
+                case 'mask':
+                case 'routes':
+                case 'setBase':
+                case 'cfg':
+                    let pckg = {
+                        type: node.expression.property,
+                        args: AstUtil_1.AstUtil.getArguments(node.args, scope),
+                    };
+                    if (pckg.args.length > 0) {
+                        arr.unshift(pckg);
+                    }
+                    info.meta.includejs.hasIncludes = true;
                     break;
-                case 'function':
-                    content = String_1.String.replace(content, x.position, x.length, `${x.ref} = function `);
+                case 'done':
+                case 'ready':
+                    this._processIncludeCallback(info, node.args && node.args[0]);
                     break;
-                case 'named':
-                    content = String_1.String.replace(content, x.position, x.length, '');
+                case 'instance':
+                case 'embed':
+                case 'plugin':
+                case 'ajax':
+                case 'promise':
+                case 'client':
+                case 'server':
+                case 'use':
+                case 'getPending':
+                case 'getResource':
+                case 'getResourceById':
+                case 'getResources':
+                case 'apply':
                     break;
-                case 'scoped':
-                    if (x.length > 0) {
-                        content = String_1.String.replace(content, x.position, x.length, '');
-                    }
+                default:
+                    this.solution.reporter.warn('getIncludes: Unknown function call', node.expression);
                     break;
             }
         });
-        // remove imports
-        this.imports.reverse().forEach(x => {
-            content = String_1.String.replace(content, x.position, x.length, '');
+        let include = new Include_1.Include();
+        arr.forEach(function (x) {
+            include[x.type].apply(include, x.args);
         });
-        // create var declaration
-        let externalRefs = '';
-        if (this.exports.length > 0) {
-            this
-                .exports
-                .filter(x => {
-                return x.dependents.length > 0 || options.removeUnusedExports === false;
-            })
-                .forEach(x => {
-                /** Remove local scoped var declaration and make it global scoped */
-                if (x.type === 'scoped') {
-                    let rgx = new RegExp(`\\b(var|let|const|function)\\s+${x.ref}`);
-                    content = content.replace(rgx, x.ref);
-                }
-                return x;
-            });
-            externalRefs = this
-                .exports
-                .reverse()
-                .filter(x => {
-                if (x.builder.movedToOuter) {
-                    return false;
-                }
-                if (options.removeUnusedExports === false) {
-                    return true;
-                }
-                if (x.dependents.length === 0) {
-                    console.warn(`Module ${this.id} has unused export ${x.ref}`);
-                    return false;
-                }
-                return true;
-            })
-                .filter(x => {
-                let exportInOuter = parents
-                    .some(p => {
-                    let parentsExport = p.exports.find(e => e.hasExport(x.ref));
-                    if (parentsExport == null) {
-                        return false;
-                    }
-                    if (options.removeUnusedExports && parentsExport.dependents.length === 0) {
-                        return false;
-                    }
-                    return true;
-                });
-                return exportInOuter === false;
-            })
-                .map(x => `    ${x.ref}`)
-                .join(`,${newLine}`);
-            if (externalRefs.length > 0) {
-                externalRefs = String_1.String.replace(externalRefs, 0, 3, 'var');
-                externalRefs += ';';
-            }
-        }
-        const SPACE = '\t';
-        let indentScopedContent = `${(0, utils_1.u_makeIndent)(scopedContent || '', SPACE, io)}`;
-        let indentContent = `${(0, utils_1.u_makeIndent)(content, SPACE, io)}`;
-        let scopeLess = parents.length === 0 && options.wrapper !== 'iif';
-        content = [
-            `${outerContent}` || '',
-            `${externalRefs}` || '',
-            !scopeLess && (indentScopedContent || indentContent) ? `(function(){` : '',
-            indentScopedContent,
-            indentContent,
-            !scopeLess && (indentScopedContent || indentContent) ? `}());` : ''
-        ]
-            .filter(x => !!x)
-            .join(newLine);
-        return (0, utils_1.u_makeIndent)(content, indent, io);
+        info.dependencies.push(...include.includes);
     }
-    toImportsJson() {
-        function toJSON(module) {
-            var json = {
-                id: module.id,
-                imports: null
-            };
-            if (module.imports) {
-                json.imports = module.imports.map(x => toJSON(x.module));
+    _processIncludeCallback(info, CallbackNode) {
+        if (AstUtil_1.AstUtil.is.type(CallbackNode, 'AST_Function') == false) {
+            return;
+        }
+        let meta = info.meta.includejs, args = CallbackNode.argnames, responseObjectName = args.length > 0
+            ? args[args.length - 1].name
+            : null;
+        if (responseObjectName) {
+            meta.hasResponseObject = true;
+            let names = this._getPropertyAccessors(responseObjectName, CallbackNode);
+            if (names) {
+                meta.responseAccessors = (meta.responseAccessors || []).concat(names);
             }
-            return json;
         }
-        return toJSON(this);
     }
-    toModulesJson() {
-        function toJSON(module) {
-            let json = {
-                id: module.id,
-                outer: module.outer.arr.map(x => toJSON(x)),
-                scoped: module.scoped.arr.map(x => toJSON(x))
-            };
-            if (json.outer.length === 0) {
-                delete json.outer;
+    /**
+     *    resolve %name%.propertyAccessor
+     */
+    _getPropertyAccessors(name, Fn) {
+        let references = [];
+        Fn.body.forEach(function (x) {
+            function isSymbolName(node) {
+                return AstUtil_1.AstUtil.is.type(node, 'AST_SymbolRef') && node.name === name;
             }
-            if (json.scoped.length === 0) {
-                delete json.scoped;
+            AstUtil_1.AstUtil.each(x, isSymbolName, function (node) {
+                let chain = AstUtil_1.AstUtil.getPropertyChain(node, this.stack);
+                if (chain) {
+                    references.push(chain);
+                }
+            });
+        });
+        return references;
+    }
+    /**
+     *    aim to find all **.exports = X
+     */
+    _getPropertySetter(name, Fn) {
+        let result = null;
+        Fn.body.forEach(function (x) {
+            function isPropertyName(node) {
+                AstUtil_1.AstUtil.is.type(node, 'AST_Assign') && node.left.property === name;
             }
-            return json;
-        }
-        return toJSON(this);
+            AstUtil_1.AstUtil.each(x, isPropertyName, function (node) {
+                let arr = ['include', 'module', 'exports'];
+                if (arr.indexOf(node.start.value) > -1) {
+                    result = node;
+                }
+            });
+        });
+        return result;
     }
 }
-exports.ModuleFile = ModuleFile;
-//# sourceMappingURL=ModuleFile.js.map
-//# sourceMappingURL=ModuleFile.ts.map;
+exports.IncludeJsParser = IncludeJsParser;
+;
+let IncludeJsMappings = [
+    new ResourcePropMapping_1.ResourcePropMapping({
+        asModules: (arr) => arr.indexOf('mask') > -1
+    }, {
+        asModules: (arr) => {
+            let i = arr.indexOf('mask');
+            arr[i] = 'includejs';
+            return arr;
+        }
+    }),
+    new ResourcePropMapping_1.ResourcePropMapping({
+        asModules: (arr) => arr.indexOf('amd') > -1
+    }, {
+        asModules: (arr) => {
+            let i = arr.indexOf('amd');
+            arr[i] = 'includejs';
+            return arr;
+        }
+    }),
+    new ResourcePropMapping_1.ResourcePropMapping({
+        type: 'mask'
+    }, {
+        type: 'load'
+    })
+];
+//# sourceMappingURL=IncludeJsParser.js.map
+//# sourceMappingURL=IncludeJsParser.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_import_js_ModuleFile === module.exports) {
+    if (_src_handlers_script_include_js_IncludeJsParser === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_import_js_ModuleFile) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_import_js_ModuleFile, module.exports);
+    } else if (__isObj(_src_handlers_script_include_js_IncludeJsParser) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_include_js_IncludeJsParser, module.exports);
     } else {
-        _src_handlers_script_import_js_ModuleFile = module.exports;
+        _src_handlers_script_include_js_IncludeJsParser = module.exports;
     }
 
     ;
@@ -6815,197 +6821,267 @@ exports.ModuleFile = ModuleFile;
 
 
 // source ./ModuleSimplified.js
-var _src_handlers_script_import_js_Parser;
+var _src_handlers_script_include_js_IncludeJsBuilder;
 (function () {
     // ensure AMD is not active for the model, so that any UMD exports as commonjs
     var define = null;
-    var exports = _src_handlers_script_import_js_Parser != null ? _src_handlers_script_import_js_Parser : {};
+    var exports = _src_handlers_script_include_js_IncludeJsBuilder != null ? _src_handlers_script_include_js_IncludeJsBuilder : {};
     var module = { exports: exports };
 
     "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Parser = void 0;
-const ModuleFile_1 = _src_handlers_script_import_js_ModuleFile;
-const ResourceInfo_1 = _src_class_ResourceInfo;
-let Rgx = {
-    Imports: {
-        full: {
-            rgx: /^[ \t]*import\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
-            map(match) {
-                let $import = new ResourceInfo_1.ImportNode();
-                $import.position = match.index;
-                $import.length = match[0].length;
-                $import.type = 'full';
-                $import.path = match[1];
-                return $import;
-            }
-        },
-        refs: {
-            rgx: /^[ \t]*import\s*\{([^}]+)}\s*from\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
-            map(match) {
-                let $import = new ResourceInfo_1.ImportNode();
-                $import.position = match.index;
-                $import.length = match[0].length;
-                $import.type = 'refs';
-                $import.path = match[2];
-                $import.refs = match[1].split(',').map(x => x.trim());
-                return $import;
-            }
-        },
-        exportAll: {
-            rgx: /^[ \t]*export\s+\*\s+from\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
-            map(match) {
-                let $import = new ResourceInfo_1.ImportNode();
-                $import.position = match.index;
-                $import.length = match[0].length;
-                $import.type = 'exportAll';
-                $import.path = match[1];
-                $import.exportAll = true;
-                return $import;
-            }
-        },
-        exportRefs: {
-            rgx: /^[ \t]*export\s*\{([^}]+)}\s*from\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
-            map(match) {
-                let $import = new ResourceInfo_1.ImportNode();
-                $import.position = match.index;
-                $import.length = match[0].length;
-                $import.type = 'exportRefs';
-                $import.path = match[2];
-                $import.refs = match[1].split(',').map(x => x.trim());
-                $import.exportRefs = true;
-                return $import;
-            }
+exports.IncludeJsBuilder = void 0;
+const arr_1 = _src_utils_arr;
+const Include_1 = _src_class_Include;
+const res_1 = _src_utils_res;
+const BaseScriptBuilder_1 = _src_handlers_script_base_BaseScriptBuilder;
+class IncludeJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
+    wrapScriptlessModule(otherOutputItems) {
+        var allResources = (0, arr_1.arr_flattern)(otherOutputItems.map(x => x.resources));
+        var jsResources = allResources.filter(x => this.accepts(x));
+        var cssResources = allResources.filter(x => x.type === 'css');
+        var loadResources = allResources.filter(x => x.type === 'load');
+        var jsRegister = this._serializeRegister(jsResources, 'js');
+        var cssRegister = this._serializeRegister(cssResources, 'css');
+        var loadRegister = this._serializeRegister(loadResources, 'load');
+        return `
+            ${jsRegister}
+            ${cssRegister}
+            ${loadRegister}
+        `;
+    }
+    isMainBuilder(solution) {
+        const KEY = 'includejs';
+        const packageInfo = solution.opts.package;
+        return packageInfo.module === KEY || packageInfo.moduleName === KEY;
+    }
+    wrapModule(resource, outputItem, otherOutputItems) {
+        var opts = this.solution.opts;
+        var page = (0, res_1.res_getPage)(resource, opts);
+        var iteration = this.solution.iteration;
+        if (iteration.includejs == null) {
+            iteration.includejs = {};
         }
-    },
-    Exports: {
-        ref: {
-            rgx: /^[ \t]*export\s*(const|let|var)\s+([\w\d_$]+)(?=\s*[^\w\d_$;])/gm,
-            map(match) {
-                let $export = new ResourceInfo_1.ExportNode();
-                $export.position = match.index;
-                $export.length = match[0].length;
-                $export.type = 'ref';
-                $export.ref = match[2];
-                return $export;
-            }
-        },
-        named: {
-            rgx: /^[ \t]*export\s*(const|let|var)\s+([\w\d_$]+)(?=\s*[;])/gm,
-            map(match) {
-                let $export = new ResourceInfo_1.ExportNode();
-                $export.position = match.index;
-                $export.length = match[0].length;
-                $export.type = 'named';
-                $export.ref = match[2];
-                return $export;
-            }
-        },
-        scoped: {
-            rgx: /^[ \t]*export\s*\{([^}]+)}\s*;?(?!\s*from)/gm,
-            map(match) {
-                let refs = match[1].split(',').map(x => x.trim());
-                let $export = new ResourceInfo_1.ExportNode();
-                $export.position = match.index;
-                $export.length = match[0].length;
-                $export.type = 'scoped';
-                $export.ref = refs[0];
-                let other = refs.slice(1).map(ref => {
-                    let $export = new ResourceInfo_1.ExportNode();
-                    $export.position = match.index;
-                    $export.length = 0;
-                    $export.type = 'scoped';
-                    $export.ref = ref;
-                    return $export;
-                });
-                return [$export, ...other];
-            }
-        },
-        function: {
-            rgx: /^[ \t]*export\s*function\s+([\w\d_$]+)/gm,
-            map(match) {
-                let $export = new ResourceInfo_1.ExportNode();
-                $export.position = match.index;
-                $export.length = match[0].length;
-                $export.type = 'function';
-                $export.ref = match[1];
-                return $export;
-            }
+        if (iteration.includejs[page] == null) {
+            iteration.includejs[page] = {
+                addHeading: true,
+                hasHeading: false,
+                lastItem: null
+            };
+        }
+        var builderOpts = iteration.includejs[page];
+        var body = '';
+        if (builderOpts.hasHeading === false && builderOpts.addHeading === true) {
+            builderOpts.hasHeading = true;
+            body = this._createHeading(builderOpts, resource, outputItem, otherOutputItems);
+        }
+        let content = resource.content;
+        let url = resource.toTargetUrl(this.solution);
+        let aliases = resource.aliases == null ? 'null' : '[' + resource.aliases.map(x => `'${x}'`).join(',') + ']';
+        body += `include.setCurrent({ url: '${url}', aliases: ${aliases} });\n`;
+        body += content;
+        body += `\ninclude.getResourceById('${url}', 'js').readystatechanged(3);`;
+        if (builderOpts.hasHeading && builderOpts.lastItem === resource) {
+            body += `\ninclude.resumeStack();`;
+        }
+        return body;
+    }
+    accepts(resource) {
+        if (resource.type !== 'js') {
+            return false;
+        }
+        const module = resource.getModule();
+        return module === 'includejs';
+    }
+    _createHeading(builderOpts, resource, outputItem, otherOutputItems) {
+        var outputItems = [outputItem, ...otherOutputItems];
+        var allResources = (0, arr_1.arr_flattern)(outputItems.map(x => x.resources));
+        var jsResources = allResources.filter(x => this.accepts(x));
+        var cssResources = allResources.filter(x => x.type === 'css');
+        var loadResources = allResources.filter(x => x.type === 'load');
+        builderOpts.lastItem = jsResources[jsResources.length - 1];
+        var jsRegister = this._serializeRegister(jsResources, 'js');
+        var cssRegister = this._serializeRegister(cssResources, 'css');
+        var loadRegister = this._serializeRegister(loadResources, 'load');
+        var version = this._serializeVersion();
+        var config = this._serializeConfig();
+        var heading = `
+            ${version}
+            ${config}
+            include.pauseStack();
+            ${jsRegister}
+            ${cssRegister}
+            ${loadRegister}
+        `;
+        return heading;
+    }
+    _serializeVersion() {
+        var v = this.solution.opts.version;
+        if (!v)
+            return '';
+        return `include.cfg('version', '${v}');`;
+    }
+    _serializeConfig() {
+        var opts = Include_1.Include.getConfig();
+        var json = JSON.stringify(opts);
+        if (json === '{}')
+            return '';
+        return `include.cfg(${json});`;
+    }
+    _serializeRegister(resources, type) {
+        var paths = resources
+            .filter(x => x.type === type)
+            .map(x => {
+            return {
+                type: type,
+                url: x.toTargetUrl(this.solution)
+            };
+        });
+        if (paths.length === 0) {
+            return '';
         }
+        var json = JSON.stringify({
+            [type]: paths
+        });
+        return `
+            include.register(${json});
+        `;
     }
-};
-class Parser {
-    static supports(content) {
-        for (let type in Rgx) {
-            for (let key in Rgx[type]) {
-                let rgx = Rgx[type][key].rgx;
-                rgx.lastIndex = 0;
-                if (rgx.test(content)) {
-                    return true;
-                }
-            }
-        }
-        return false;
+}
+exports.IncludeJsBuilder = IncludeJsBuilder;
+;
+//# sourceMappingURL=IncludeJsBuilder.js.map
+//# sourceMappingURL=IncludeJsBuilder.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_include_js_IncludeJsBuilder === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_include_js_IncludeJsBuilder) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_include_js_IncludeJsBuilder, module.exports);
+    } else {
+        _src_handlers_script_include_js_IncludeJsBuilder = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
+// source ./ModuleSimplified.js
+var _src_handlers_script_include_js_IncludeJsRewriter;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_include_js_IncludeJsRewriter != null ? _src_handlers_script_include_js_IncludeJsRewriter : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IncludeJsRewriter = void 0;
+const BaseRewriter_1 = _src_handlers_base_BaseRewriter;
+class IncludeJsRewriter extends BaseRewriter_1.BaseRewriter {
+    rewritePartial(content, ownerResource) {
     }
-    static parse(content, file) {
-        let module = new ModuleFile_1.ModuleFile(content, file);
-        if (Parser.supports(content) === false) {
-            return module;
-        }
-        for (let key in Rgx.Imports) {
-            let x = Rgx.Imports[key];
-            x.rgx.lastIndex = 0;
-            for (let match = x.rgx.exec(content); match != null; match = x.rgx.exec(content)) {
-                let result = x.map(match, content);
-                if (Array.isArray(result)) {
-                    module.imports.push(...result);
-                }
-                else {
-                    module.imports.push(result);
-                }
-            }
+    rewriteResource(resource) {
+        if (resource.getModule() === 'global' && resource && resource.meta && resource.meta.includejs && resource.meta.includejs.hasIncludes) {
+            resource.asModules = ['includejs'];
         }
-        for (let key in Rgx.Exports) {
-            let x = Rgx.Exports[key];
-            x.rgx.lastIndex = 0;
-            for (let match = x.rgx.exec(content); match != null; match = x.rgx.exec(content)) {
-                let result = x.map(match, content);
-                if (Array.isArray(result)) {
-                    module.exports.push(...result);
-                }
-                else {
-                    module.exports.push(result);
-                }
-            }
+    }
+    accepts(type) {
+        return type === 'js';
+    }
+}
+exports.IncludeJsRewriter = IncludeJsRewriter;
+;
+//# sourceMappingURL=IncludeJsRewriter.js.map
+//# sourceMappingURL=IncludeJsRewriter.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_include_js_IncludeJsRewriter === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_include_js_IncludeJsRewriter) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_include_js_IncludeJsRewriter, module.exports);
+    } else {
+        _src_handlers_script_include_js_IncludeJsRewriter = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
+// source ./ModuleSimplified.js
+var _src_handlers_script_include_js_IncludeJsHandler;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_include_js_IncludeJsHandler != null ? _src_handlers_script_include_js_IncludeJsHandler : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IncludeJsHandler = void 0;
+const Templates_1 = _src_handlers_script_common_js_templates_Templates;
+const Include_1 = _src_class_Include;
+const IncludeJsParser_1 = _src_handlers_script_include_js_IncludeJsParser;
+const IncludeJsBuilder_1 = _src_handlers_script_include_js_IncludeJsBuilder;
+const BaseHandler_1 = _src_handlers_base_BaseHandler;
+const IncludeJsRewriter_1 = _src_handlers_script_include_js_IncludeJsRewriter;
+class IncludeJsHandler extends BaseHandler_1.BaseHandler {
+    constructor(solution) {
+        super(solution);
+        // if (this.solution.opts.package.module === 'includejs') {
+        //     this.registerMappings_();
+        // }
+    }
+    accepts(resource) {
+        if (resource.type !== 'js') {
+            return false;
         }
-        module.imports.forEach(m => m.parent = module);
-        module.imports.filter(x => x.type === 'exportRefs').forEach(imp => {
-            imp.refs.forEach(ref => {
-                let exp = new ResourceInfo_1.ExportNode();
-                exp.position = 0;
-                exp.length = 0;
-                exp.ref = ref;
-                module.exports.push(exp);
-            });
-        });
-        module.imports.sort((a, b) => a.position < b.position ? -1 : 1);
-        module.exports.sort((a, b) => a.position < b.position ? -1 : 1);
-        return module;
+        var module = resource.getModule();
+        if (module == null || module === 'root')
+            module = this.solution.opts.package.module;
+        return module === 'includejs';
+    }
+    rewriteRoot(root, dependencies) {
+        dependencies.forEach(x => x.embed = true);
+        var body = dependencies
+            .map(x => x.content)
+            .concat([root.content])
+            .join('\n');
+        body = Templates_1.Templates.RootModule.replace('%BUNDLE%', () => body);
+        root.content = body;
+    }
+    resolvePath(includeData, parent) {
+        return Include_1.Include
+            .PathResolver
+            .resolveBasic(includeData.url, includeData.type, parent);
     }
 }
-exports.Parser = Parser;
-//# sourceMappingURL=Parser.js.map
-//# sourceMappingURL=Parser.ts.map;
+exports.IncludeJsHandler = IncludeJsHandler;
+IncludeJsHandler.Parser = IncludeJsParser_1.IncludeJsParser;
+IncludeJsHandler.Rewriter = IncludeJsRewriter_1.IncludeJsRewriter;
+IncludeJsHandler.Builder = IncludeJsBuilder_1.IncludeJsBuilder;
+IncludeJsHandler.PathResolver = null;
+;
+//# sourceMappingURL=IncludeJsHandler.js.map
+//# sourceMappingURL=IncludeJsHandler.ts.map;
 
     function __isObj(x) {
         return x != null && typeof x === 'object' && x.constructor === Object;
     }
-    if (_src_handlers_script_import_js_Parser === module.exports) {
+    if (_src_handlers_script_include_js_IncludeJsHandler === module.exports) {
         // do nothing if
-    } else if (__isObj(_src_handlers_script_import_js_Parser) && __isObj(module.exports)) {
-        Object.assign(_src_handlers_script_import_js_Parser, module.exports);
+    } else if (__isObj(_src_handlers_script_include_js_IncludeJsHandler) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_include_js_IncludeJsHandler, module.exports);
     } else {
-        _src_handlers_script_import_js_Parser = module.exports;
+        _src_handlers_script_include_js_IncludeJsHandler = module.exports;
     }
 
     ;
@@ -7035,17 +7111,18 @@ 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) {
+    // async transpile(content: any, resource: Resource): Promise<{ content: string; }> {
+    //     // we will inline the content instead
+    //     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 };
+    //     }
+    // }
+    async getDependencies(content, ownerResource) {
         if (Parser_1.Parser.supports(content) === false) {
             return null;
         }
@@ -7704,6 +7781,10 @@ class ScriptParser extends BaseParser_1.BaseParser {
         if (!content) {
             throw new Error(`Content is undefined for ${ownerResource.filename}`);
         }
+        if (typeof content !== 'string') {
+            // The data content is loaded as json
+            return Promise.resolve({ dependencies: [] });
+        }
         let opts = {
             filename: ownerResource.filename
         };
@@ -7763,6 +7844,80 @@ exports.ScriptParser = ScriptParser;
 // end:source ./ModuleSimplified.js
 
 
+// source ./ModuleSimplified.js
+var _src_handlers_script_data_DataInliner;
+(function () {
+    // ensure AMD is not active for the model, so that any UMD exports as commonjs
+    var define = null;
+    var exports = _src_handlers_script_data_DataInliner != null ? _src_handlers_script_data_DataInliner : {};
+    var module = { exports: exports };
+
+    "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataInliner = void 0;
+const BaseRewriter_1 = _src_handlers_base_BaseRewriter;
+class DataInliner extends BaseRewriter_1.BaseRewriter {
+    rewriteRoot(resourceInput, resourceOutput) {
+    }
+    rewritePartial(content, ownerResource) {
+    }
+    async rewriteResource(resource) {
+        for (let res of resource.dependencies) {
+            if (/(json|yml)$/.test(res.url) === false) {
+                continue;
+            }
+            if (res.import != null) {
+                await this.rewriteImport(resource, res);
+                continue;
+            }
+            console.error('CJS not implemented');
+        }
+    }
+    accepts(type) {
+        return type === 'js';
+    }
+    rewriteImport(resource, dep) {
+        let rgx = new RegExp(`import\\s+(?<name>[\\w_$]+)\\s+from\\s+['"]${dep.url}['"];?`);
+        let match = rgx.exec(resource.content);
+        if (match == null) {
+            console.error(`No data import found for ${dep.url} in ${resource.filename}`);
+            return;
+        }
+        let name = match.groups.name;
+        let json = dep.resource.content;
+        if (typeof json !== 'string') {
+            json = JSON.stringify(json);
+        }
+        let code = `const ${name} = ${json}`;
+        let content = resource.content.replace(match[0], code);
+        resource.content = content;
+        let i = resource.dependencies.indexOf(dep);
+        resource.dependencies.splice(i, 1);
+        this.solution.outputResources.remove(dep.resource);
+    }
+}
+exports.DataInliner = DataInliner;
+;
+//# sourceMappingURL=DataInliner.js.map
+//# sourceMappingURL=DataInliner.ts.map;
+
+    function __isObj(x) {
+        return x != null && typeof x === 'object' && x.constructor === Object;
+    }
+    if (_src_handlers_script_data_DataInliner === module.exports) {
+        // do nothing if
+    } else if (__isObj(_src_handlers_script_data_DataInliner) && __isObj(module.exports)) {
+        Object.assign(_src_handlers_script_data_DataInliner, module.exports);
+    } else {
+        _src_handlers_script_data_DataInliner = module.exports;
+    }
+
+    ;
+}());
+
+// end:source ./ModuleSimplified.js
+
+
 // source ./ModuleSimplified.js
 var _src_handlers_script_ScriptRewriter;
 (function () {
@@ -7776,18 +7931,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScriptRewriter = void 0;
 const IncludeJsHandler_1 = _src_handlers_script_include_js_IncludeJsHandler;
 const BaseRewriter_1 = _src_handlers_base_BaseRewriter;
+const DataInliner_1 = _src_handlers_script_data_DataInliner;
 class ScriptRewriter extends BaseRewriter_1.BaseRewriter {
     constructor() {
         super(...arguments);
         this.rewriters = [
-            new IncludeJsHandler_1.IncludeJsHandler.Rewriter(this.solution, this.handler)
+            new IncludeJsHandler_1.IncludeJsHandler.Rewriter(this.solution, this.handler),
+            new DataInliner_1.DataInliner(this.solution, this.handler),
         ];
     }
     rewritePartial(content, ownerResource) {
     }
     rewriteResource(resource) {
-        this.rewriters.forEach(rewriter => {
-            rewriter.rewriteResource(resource);
+        return this.rewriters.map(rewriter => {
+            return rewriter.rewriteResource(resource);
         });
     }
     accepts(type) {
@@ -8392,6 +8549,9 @@ class CopyJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
                     return;
                 }
                 if (dep.resource.filename.startsWith(appBase) === false) {
+                    // if (path_hasExtension(dep.url) === false) {
+                    //     rewriteToRelativeUrls[dep.url] = dep.url + '.' + this.solution.opts.outputExtension;
+                    // }
                     // is project dependency
                     return;
                 }
@@ -8399,17 +8559,17 @@ class CopyJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
                 if (relativePath == null || /(..\/)*?\/?node_modules/.test(relativePath)) {
                     return;
                 }
-                relativePath = (0, path_1.path_changeExtension)(relativePath, null);
+                relativePath = (0, path_1.path_changeExtension)(relativePath, this.solution.opts.outputExtension);
                 relativePath = relativePath.startsWith('.')
                     ? relativePath
                     : './' + relativePath;
                 rewriteToRelativeUrls[dep.url] = relativePath;
             })
                 .toArray();
-            resource.content = rewriteUrls(resource.content, rewriteToRelativeUrls);
+            resource.content = rewriteUrls(resource, rewriteToRelativeUrls);
         }
         let result = [
-            createOutputItem(cloneWithExtension(resource, 'js'))
+            createOutputItem(cloneWithExtension(resource, this.solution.opts.outputExtension))
         ];
         let extra = [{
                 ext: 'ts.map',
@@ -8421,8 +8581,14 @@ class CopyJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
         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);
+            try {
+                cloned.content = await readFile(cloned.filename);
+            }
+            catch (e) {
+                console.error(`Error loading ${resource.filename} from ${parent.resource.filename}`);
+                throw e;
+            }
+            cloned.content = rewriteUrls(cloned, rewriteToRelativeUrls);
             result.push(createOutputItem(cloneWithExtension(cloned, x.output)));
             if (x.ext === 'ts.map' && cloned.content != null) {
                 let outputItem = result[result.length - 1];
@@ -8449,9 +8615,16 @@ class CopyJsBuilder extends BaseScriptBuilder_1.BaseScriptBuilder {
             cloned.url = (0, path_1.path_changeExtension)(cloned.url, ext);
             return cloned;
         }
-        function rewriteUrls(content, rewriteToRelativeUrls) {
+        function rewriteUrls(resource, rewriteToRelativeUrls) {
+            let content = resource.content;
+            if (content == null) {
+                console.error(`<rewrite urls> No content for ${resource.filename}`);
+                return '';
+            }
             for (let key in rewriteToRelativeUrls) {
-                content = content.replaceAll(key, rewriteToRelativeUrls[key]);
+                content = content
+                    .replaceAll(`"${key}"`, `"${rewriteToRelativeUrls[key]}"`)
+                    .replaceAll(`'${key}'`, `'${rewriteToRelativeUrls[key]}'`);
             }
             return content;
         }
@@ -11414,7 +11587,13 @@ function getDependenciesExternal(deps, resource, solution) {
         .then(() => deps);
 }
 function filterDynamicDeps(info, solution) {
-    info.dependencies = info.dependencies.filter(dep => isDynamicDependency(dep, solution) === false);
+    info.dependencies = info.dependencies.filter(dep => {
+        let isDynamic = isDynamicDependency(dep, solution);
+        if (isDynamic) {
+            solution.outputResources.addDynamicDependency(dep);
+        }
+        return isDynamic === false;
+    });
     return info;
 }
 function isDynamicDependency(dep, solution) {