broccoli-typify - npm Package Compare versions

Comparing version 0.1.4 to 0.1.5

dist/broccoli-typescript.js

@@ -303,39 +303,24 @@ /// <reference path="../types/all.d.ts" />
             }
+            var candidatePaths = [];
             if (name === 'ember') {
-                // custom ember resolution while we stabilize the type definition
-                var first = _this.currentDirectory + "/node_modules/at-types-ember/index.d.ts", second = _this.currentDirectory + "/node_modules/@types/ember/index.d.ts";
-                if (fs.existsSync(first)) {
-                    return {
-                        resolvedFileName: first,
-                        isExternalLibraryImport: true
-                    };
-                }
-                if (fs.existsSync(second)) {
-                    return {
-                        resolvedFileName: second,
-                        isExternalLibraryImport: true
-                    };
-                }
+                // custom repo for ember resolution while we stabilize the type definition
+                candidatePaths.push(_this.currentDirectory + "/node_modules/at-types-ember/index.d.ts");
             }
-            else if (name.match(/\/config\/environment$/)) {
-                // magical ember import, need to move this in the ember-cli-typify
-                return {
-                    resolvedFileName: _this.localTypesFolder + "/ember-config-environment.d.ts",
-                    isExternalLibraryImport: true
-                };
+            if (name.match(/\/config\/environment$/)) {
+                candidatePaths.push(_this.localTypesFolder + "/ember-config-environment.d.ts");
             }
-            else if (name.indexOf('npm:') === 0) {
+            else {
                 // resolve npm: modules as loaded with ember-browserify.
                 // the end goal is to have all the types coming from npm @types,
                 // however we support a local-types for development.
-                var module_1 = name.split(':')[1], paths = [
-                    (_this.currentDirectory + "/node_modules/@types/" + module_1 + "/index.d.ts"),
-                    (_this.localTypesFolder + "/" + module_1 + "/index.d.ts")];
-                for (var i = 0; i < paths.length; i++) {
-                    if (fs.existsSync(paths[i])) {
-                        return {
-                            resolvedFileName: paths[i],
-                            isExternalLibraryImport: true
-                        };
-                    }
+                var module_1 = (name.indexOf('npm:') === 0) ? name.split(':')[1] : name;
+                candidatePaths.push(_this.localTypesFolder + "/" + module_1 + "/index.d.ts");
+                candidatePaths.push(_this.currentDirectory + "/node_modules/@types/" + module_1 + "/index.d.ts");
+            }
+            for (var i = 0; i < candidatePaths.length; i++) {
+                if (fs.existsSync(candidatePaths[i])) {
+                    return {
+                        resolvedFileName: candidatePaths[i],
+                        isExternalLibraryImport: true
+                    };
                 }
@@ -342,0 +327,0 @@ }

package.json

 {
   "name": "broccoli-typify",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Provide broccoli building blocks for typescript pipelines.",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/broccoli-typescript.ts

@@ -365,38 +365,23 @@ /// <reference path="../types/all.d.ts" />
       }
+      let candidatePaths: string[] = [];
 
       if (name === 'ember') {
-        // custom ember resolution while we stabilize the type definition
-        const first = `${this.currentDirectory}/node_modules/at-types-ember/index.d.ts`,
-          second = `${this.currentDirectory}/node_modules/@types/ember/index.d.ts`;
-        if (fs.existsSync(first)) {
-          return {
-            resolvedFileName: first,
-            isExternalLibraryImport: true
-          }
-        }
-        if (fs.existsSync(second)) {
-          return {
-            resolvedFileName: second,
-            isExternalLibraryImport: true
-          }
-        }
-      } else if (name.match(/\/config\/environment$/)) {
-        // magical ember import, need to move this in the ember-cli-typify
-        return {
-          resolvedFileName: `${this.localTypesFolder}/ember-config-environment.d.ts`,
-          isExternalLibraryImport: true
-        }
-      } else if (name.indexOf('npm:')===0) {
+        // custom repo for ember resolution while we stabilize the type definition
+        candidatePaths.push(`${this.currentDirectory}/node_modules/at-types-ember/index.d.ts`);
+      }
+      if (name.match(/\/config\/environment$/)) {
+        candidatePaths.push(`${this.localTypesFolder}/ember-config-environment.d.ts`);
+      } else {
         // resolve npm: modules as loaded with ember-browserify.
         // the end goal is to have all the types coming from npm @types,
         // however we support a local-types for development.
-        const module = name.split(':')[1], paths = [
-          `${this.currentDirectory}/node_modules/@types/${module}/index.d.ts`,
-          `${this.localTypesFolder}/${module}/index.d.ts`];
-        for( let i=0; i<paths.length; i++) {
-          if (fs.existsSync(paths[i])) {
-            return {
-              resolvedFileName: paths[i],
-              isExternalLibraryImport: true
-            }
+        const module = (name.indexOf('npm:')===0) ? name.split(':')[1] : name;
+        candidatePaths.push(`${this.localTypesFolder}/${module}/index.d.ts`);
+        candidatePaths.push(`${this.currentDirectory}/node_modules/@types/${module}/index.d.ts`);
+      }
+      for( let i=0; i<candidatePaths.length; i++) {
+        if (fs.existsSync(candidatePaths[i])) {
+          return {
+            resolvedFileName: candidatePaths[i],
+            isExternalLibraryImport: true
           }
@@ -403,0 +388,0 @@ }

No alert changes

Worsened metrics

Total package byte prevSize

117882

decreased by-0.89%

Lines of code

2662

decreased by-1.11%

No dependency changes