app-bundler 0.2.5 → 0.2.7

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: []
@@ -4956,39 +4984,20 @@ var __register, __require, require;
 // end:source ./UMD.js
 `,
     ESM: `
-// source ./UMD.js
-(function (factory) {
+// source ./ESM.js
+$CUSTOM_IMPORTS_CODE$
 
-    var _name = '%NAME%',
-        _global = typeof window === 'undefined' ? global : window,
-        _module = {
-            exports: {}
-        };
-
-    factory(_module, _module.exports, _global);
-
-    if (typeof module === 'object' && module.exports) {
-        module.exports = _module.exports;
-    }
-
-    if (typeof define === 'function' && define.amd) {
-        define([], function () {
-            return _module.exports;
-        });
-        return;
-    }
-    
-    if (_name) {
-        _global[_name] = _module.exports;
-    }
+var module = {
+    exports: {}
+};
 
-}(function (module, exports, global) {
+$MODULE$
 
-    %MODULE%
+export default module.exports;
 
-}));
+$CUSTOM_EXPORTS_CODE$
 
-// end:source ./UMD.js
+// end:source ./ESM.js
 `,
     Style: `
 // source ./Style.js
@@ -5244,7 +5253,7 @@ class ModuleWrapper {
         this.solution = solution;
     }
     wrap(body) {
-        var wrapper = this.solution.opts.package.moduleWrapper;
+        let wrapper = this.solution.opts.package.moduleWrapper;
         switch (wrapper) {
             case 'script':
                 body = this.wrapSimple(body);
@@ -5277,18 +5286,43 @@ class ModuleWrapper {
             .replace('%BUNDLE%', () => body);
     }
     wrapWithUMD(body) {
-        var opts = this.solution.opts.package;
-        var name = opts.moduleName || '';
+        let opts = this.solution.opts.package;
+        let name = opts.moduleName || '';
         return Templates_1.Templates
             .UMD
             .replace('%MODULE%', () => body)
             .replace('%NAME%', () => name);
     }
     wrapWithESM(body) {
-        var opts = this.solution.opts.package;
-        var exportsCode = opts.moduleExportsCode || '';
+        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 Templates_1.Templates
             .ESM
+            .replace('$CUSTOM_IMPORTS_CODE$', () => importsCode)
             .replace('$CUSTOM_EXPORTS_CODE$', () => exportsCode)
             .replace('$MODULE$', () => body);
     }
@@ -6851,13 +6885,13 @@ const ResourceInfo_1 = _src_class_ResourceInfo;
 let Rgx = {
     Imports: {
         full: {
-            rgx: /^[ \t]*import\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
+            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[1];
+                $import.path = match.groups.path;
                 return $import;
             }
         },
@@ -6873,6 +6907,17 @@ let Rgx = {
                 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) {
@@ -7056,17 +7101,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;
         }
@@ -7725,6 +7771,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
         };
@@ -7784,6 +7834,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 () {
@@ -7797,18 +7921,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) {
@@ -8413,6 +8539,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;
                 }
@@ -8420,17 +8549,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',
@@ -8442,8 +8571,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];
@@ -8470,9 +8605,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;
         }
@@ -11435,7 +11577,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) {

package/lib/cli.js

@@ -82,6 +82,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 = {};
@@ -170,7 +171,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);
@@ -352,9 +353,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) {
@@ -1087,13 +1095,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;
 ;
@@ -1102,7 +1110,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);
@@ -2621,19 +2629,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' },
@@ -3008,6 +3018,7 @@ class OutputResources {
         this.items = [];
         this.resources = [];
         this.pagesInput = {};
+        this.dynamicDependencies = [];
     }
     prepare(resources) {
         this.resources = [];
@@ -3051,6 +3062,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);
     }
@@ -4537,13 +4564,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: []
@@ -4958,39 +4986,20 @@ var __register, __require, require;
 // end:source ./UMD.js
 `,
     ESM: `
-// source ./UMD.js
-(function (factory) {
+// source ./ESM.js
+$CUSTOM_IMPORTS_CODE$
 
-    var _name = '%NAME%',
-        _global = typeof window === 'undefined' ? global : window,
-        _module = {
-            exports: {}
-        };
-
-    factory(_module, _module.exports, _global);
-
-    if (typeof module === 'object' && module.exports) {
-        module.exports = _module.exports;
-    }
-
-    if (typeof define === 'function' && define.amd) {
-        define([], function () {
-            return _module.exports;
-        });
-        return;
-    }
-    
-    if (_name) {
-        _global[_name] = _module.exports;
-    }
+var module = {
+    exports: {}
+};
 
-}(function (module, exports, global) {
+$MODULE$
 
-    %MODULE%
+export default module.exports;
 
-}));
+$CUSTOM_EXPORTS_CODE$
 
-// end:source ./UMD.js
+// end:source ./ESM.js
 `,
     Style: `
 // source ./Style.js
@@ -5246,7 +5255,7 @@ class ModuleWrapper {
         this.solution = solution;
     }
     wrap(body) {
-        var wrapper = this.solution.opts.package.moduleWrapper;
+        let wrapper = this.solution.opts.package.moduleWrapper;
         switch (wrapper) {
             case 'script':
                 body = this.wrapSimple(body);
@@ -5279,18 +5288,43 @@ class ModuleWrapper {
             .replace('%BUNDLE%', () => body);
     }
     wrapWithUMD(body) {
-        var opts = this.solution.opts.package;
-        var name = opts.moduleName || '';
+        let opts = this.solution.opts.package;
+        let name = opts.moduleName || '';
         return Templates_1.Templates
             .UMD
             .replace('%MODULE%', () => body)
             .replace('%NAME%', () => name);
     }
     wrapWithESM(body) {
-        var opts = this.solution.opts.package;
-        var exportsCode = opts.moduleExportsCode || '';
+        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 Templates_1.Templates
             .ESM
+            .replace('$CUSTOM_IMPORTS_CODE$', () => importsCode)
             .replace('$CUSTOM_EXPORTS_CODE$', () => exportsCode)
             .replace('$MODULE$', () => body);
     }
@@ -6853,13 +6887,13 @@ const ResourceInfo_1 = _src_class_ResourceInfo;
 let Rgx = {
     Imports: {
         full: {
-            rgx: /^[ \t]*import\s*['"]([^'"]+)['"][\t ;]*[\r\n]{0,2}/gm,
+            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[1];
+                $import.path = match.groups.path;
                 return $import;
             }
         },
@@ -6875,6 +6909,17 @@ let Rgx = {
                 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) {
@@ -7058,17 +7103,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;
         }
@@ -7727,6 +7773,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
         };
@@ -7786,6 +7836,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 () {
@@ -7799,18 +7923,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) {
@@ -8415,6 +8541,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;
                 }
@@ -8422,17 +8551,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',
@@ -8444,8 +8573,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];
@@ -8472,9 +8607,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;
         }
@@ -11437,7 +11579,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "app-bundler",
-    "version": "0.2.5",
+    "version": "0.2.7",
     "description": "",
     "main": "lib/bundler.js",
     "bin": {