app-bundler 0.1.5 → 0.1.6

package/lib/bundler.js

@@ -5285,9 +5285,9 @@ class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
         return true;
     }
     resolve(includeData, parentResource) {
-        var filename = nodeModuleResolve(includeData.url, parentResource.directory);
+        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
         if (filename) {
-            var url = this.solution.opts.toAppUrl(filename);
+            let url = this.solution.opts.toAppUrl(filename);
             this.solution.opts.mappings[includeData.url] = url;
         }
         return filename;
@@ -5302,32 +5302,39 @@ const nodeCoreModules = [
     'tls', 'tty', 'url', 'util', 'vm', 'zlib'
 ];
 function nodeModuleResolve(path, location_) {
-    var location = location_.replace(/[\\\/]+$/, '');
-    var name = /^([\w\-]+)/.exec(path)[0];
-    var resource = path.substring(name.length + 1);
-    if (resource && hasExt(resource) === false) {
-        resource += '.js';
-    }
-    var current = location;
-    var root_ = current + '/node_modules/' + name + '/';
+    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) {
-        var nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
-        var pckg = nodeModules + 'package.json';
+        let nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
+        let pckg = nodeModules + 'package.json';
         if (global_1.io.File.exists(pckg) === false) {
-            var next = current.replace(/[^\/\\]+[\/\\]?$/, '');
+            let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
             if (next === current) {
                 return root_ + 'package.json';
             }
             current = next;
             continue;
         }
-        var json = global_1.io.File.read(pckg);
+        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 (resource) {
-            return nodeModules + resource;
-        }
         if (json.main) {
             return (0, path_1.path_combine)(nodeModules, json.main);
         }

package/lib/cli.js

@@ -5287,9 +5287,9 @@ class CommonJsPathResolver extends BasePathResolver_1.BasePathResolver {
         return true;
     }
     resolve(includeData, parentResource) {
-        var filename = nodeModuleResolve(includeData.url, parentResource.directory);
+        let filename = nodeModuleResolve(includeData.url, parentResource.directory);
         if (filename) {
-            var url = this.solution.opts.toAppUrl(filename);
+            let url = this.solution.opts.toAppUrl(filename);
             this.solution.opts.mappings[includeData.url] = url;
         }
         return filename;
@@ -5304,32 +5304,39 @@ const nodeCoreModules = [
     'tls', 'tty', 'url', 'util', 'vm', 'zlib'
 ];
 function nodeModuleResolve(path, location_) {
-    var location = location_.replace(/[\\\/]+$/, '');
-    var name = /^([\w\-]+)/.exec(path)[0];
-    var resource = path.substring(name.length + 1);
-    if (resource && hasExt(resource) === false) {
-        resource += '.js';
-    }
-    var current = location;
-    var root_ = current + '/node_modules/' + name + '/';
+    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) {
-        var nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
-        var pckg = nodeModules + 'package.json';
+        let nodeModules = (0, path_1.path_combine)(current, '/node_modules/' + name + '/');
+        let pckg = nodeModules + 'package.json';
         if (global_1.io.File.exists(pckg) === false) {
-            var next = current.replace(/[^\/\\]+[\/\\]?$/, '');
+            let next = current.replace(/[^\/\\]+[\/\\]?$/, '');
             if (next === current) {
                 return root_ + 'package.json';
             }
             current = next;
             continue;
         }
-        var json = global_1.io.File.read(pckg);
+        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 (resource) {
-            return nodeModules + resource;
-        }
         if (json.main) {
             return (0, path_1.path_combine)(nodeModules, json.main);
         }

package/package.json

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