1- import Future = require( "fibers/future" ) ;
2- import * as npm from "npm" ;
1+ import * as path from "path" ;
32
43interface INpmOpts {
54 config ?: any ;
@@ -8,35 +7,12 @@ interface INpmOpts {
87}
98
109export class NodePackageManager implements INodePackageManager {
11- constructor ( private $childProcess : IChildProcess ,
10+ constructor ( private $fs : IFileSystem ,
11+ private $errors : IErrors ,
12+ private $childProcess : IChildProcess ,
1213 private $logger : ILogger ,
1314 private $options : IOptions ) { }
1415
15- public getCache ( ) : string {
16- return npm . cache ;
17- }
18-
19- public load ( config ?: any ) : IFuture < void > {
20- if ( npm . config . loaded ) {
21- let data = npm . config . sources . cli . data ;
22- Object . keys ( data ) . forEach ( k => delete data [ k ] ) ;
23- if ( config ) {
24- _ . assign ( data , config ) ;
25- }
26- return Future . fromResult ( ) ;
27- } else {
28- let future = new Future < void > ( ) ;
29- npm . load ( config , ( err : Error ) => {
30- if ( err ) {
31- future . throw ( err ) ;
32- } else {
33- future . return ( ) ;
34- }
35- } ) ;
36- return future ;
37- }
38- }
39-
4016 public install ( packageName : string , pathToSave : string , config ?: any ) : IFuture < any > {
4117 return ( ( ) => {
4218 if ( this . $options . disableNpmInstall ) {
@@ -48,30 +24,54 @@ export class NodePackageManager implements INodePackageManager {
4824 }
4925
5026 try {
51- return this . loadAndExecute ( "install" , [ pathToSave , packageName ] , { config : config } ) . wait ( ) ;
27+ let jsonContentBefore = this . $fs . readJson ( path . join ( pathToSave , "package.json" ) ) . wait ( ) ;
28+ let dependenciesBefore : Array < string > = [ ] ;
29+ if ( jsonContentBefore && jsonContentBefore . dependencies ) {
30+ for ( let name in jsonContentBefore . dependencies ) {
31+ dependenciesBefore . push ( name ) ;
32+ }
33+ }
34+
35+ let flags = this . getFlagsString ( config , true ) ;
36+ let params = [ "install" ] ;
37+ if ( packageName !== pathToSave ) {
38+ params . push ( packageName ) ; //because npm install ${pwd} on mac tries to install itself as a dependency (windows and linux have no such issues)
39+ }
40+ params = params . concat ( flags ) ;
41+ this . $childProcess . spawnFromEvent ( "npm" , params , "close" , { cwd : pathToSave } ) . wait ( ) ;
42+
43+ let jsonContentAfter = this . $fs . readJson ( path . join ( pathToSave , "package.json" ) ) . wait ( ) ;
44+ let dependenciesAfter : Array < string > = [ ] ;
45+ if ( jsonContentAfter && jsonContentAfter . dependencies ) {
46+ for ( let name in jsonContentAfter . dependencies ) {
47+ dependenciesAfter . push ( name ) ;
48+ }
49+ }
50+
51+ /** This diff is done in case the installed pakcage is a URL address, a path to local directory or a .tgz file
52+ * in these cases we don't have the package name and we can't rely on "npm install --json"" option
53+ * to get the project name because we have to parse the output from the stdout and we have no controll over it (so other messages may be mangled in stdout)
54+ * The solution is to compare package.json project dependencies before and after install and get the name of the installed package,
55+ * even if it's installed through local path or URL. If command installes more than one package, only the package originally installed is returned.
56+ */
57+ let diff = _ ( jsonContentAfter . dependencies )
58+ . omitBy ( ( val : string , key : string ) => jsonContentBefore && jsonContentBefore . dependencies && jsonContentBefore . dependencies [ key ] && jsonContentBefore . dependencies [ key ] === val )
59+ . keys ( )
60+ . value ( ) ;
61+
62+ if ( diff . length <= 0 && dependenciesBefore . length === dependenciesAfter . length && packageName !== pathToSave ) {
63+ this . $errors . failWithoutHelp ( `The plugin ${ packageName } ) ;
64+ }
65+ if ( diff . length <= 0 && dependenciesBefore . length !== dependenciesAfter . length ) {
66+ this . $errors . failWithoutHelp ( `Couldn't install package correctly` ) ;
67+ }
68+
69+ return diff ;
5270 } catch ( err ) {
53- if ( err . code === "EPEERINVALID" ) {
71+ if ( err . message && err . message . indexOf ( "EPEERINVALID" ) !== - 1 ) {
5472 // Not installed peer dependencies are treated by npm 2 as errors, but npm 3 treats them as warnings.
5573 // We'll show them as warnings and let the user install them in case they are needed.
56- // The strucutre of the error object in such case is:
57- // { [Error: The package @angular /[email protected] does not satisfy its siblings' peerDependencies requirements!] 58- // code: 'EPEERINVALID',
59- // packageName: '@angular/core',
60- // packageVersion: '2.1.0-beta.0',
61- // peersDepending:
62- // { '@angular /[email protected] ': '2.1.0-beta.0', 63- // '@angular/[email protected] ': '2.1.0-beta.0', 64- // '@angular/[email protected] ': '2.1.0-beta.0', 65- // '@angular/[email protected] ': '2.1.0-beta.0', 66- // '@angular/[email protected] ': '2.1.0-beta.0', 67- // '@angular/[email protected] ': '2.1.0-beta.0', 68- // '@angular/[email protected] ': '2.1.0-beta.0', 69- // '@angular/[email protected] ': '2.1.0-beta.0', 70- // '@ngrx/[email protected] ': '^2.0.0', 71- // '@ngrx/[email protected] ': '^2.0.0', 72- // '[email protected] ': '~2.0.0' } } 7374 this . $logger . warn ( err . message ) ;
74- this . $logger . trace ( "Required peerDependencies are: " , err . peersDepending ) ;
7575 } else {
7676 // All other errors should be handled by the caller code.
7777 throw err ;
@@ -81,66 +81,39 @@ export class NodePackageManager implements INodePackageManager {
8181 }
8282
8383 public uninstall ( packageName : string , config ?: any , path ?: string ) : IFuture < any > {
84- return this . loadAndExecute ( "uninstall" , [ [ packageName ] ] , { config, path } ) ;
85- }
86-
87- public search ( filter : string [ ] , silent : boolean ) : IFuture < any > {
88- let args = ( < any [ ] > ( [ filter ] || [ ] ) ) . concat ( silent ) ;
89- return this . loadAndExecute ( "search" , args ) ;
90- }
91-
92- public cache ( packageName : string , version : string , config ?: any ) : IFuture < IDependencyData > {
93- // function cache (pkg, ver, where, scrub, cb)
94- return this . loadAndExecute ( "cache" , [ packageName , version , undefined , false ] , { subCommandName : "add" , config : config } ) ;
95- }
96-
97- public cacheUnpack ( packageName : string , version : string , unpackTarget ?: string ) : IFuture < void > {
98- // function unpack (pkg, ver, unpackTarget, dMode, fMode, uid, gid, cb)
99- return this . loadAndExecute ( "cache" , [ packageName , version , unpackTarget , null , null , null , null ] , { subCommandName : "unpack" } ) ;
84+ let flags = this . getFlagsString ( config , false ) ;
85+ return this . $childProcess . exec ( `npm uninstall ${ packageName } ${ flags } , { cwd : path } ) ;
10086 }
10187
102- public view ( packageName : string , propertyName : string ) : IFuture < any > {
103- return this . loadAndExecute ( "view" , [ [ packageName , propertyName ] , [ false ] ] ) ;
88+ public search ( filter : string [ ] , config : any ) : IFuture < any > {
89+ let args = ( < any [ ] > ( [ filter ] || [ ] ) ) . concat ( config . silent ) ;
90+ return this . $childProcess . exec ( `npm search ${ args . join ( " " ) } ) ;
10491 }
10592
106- public executeNpmCommand ( npmCommandName : string , currentWorkingDirectory : string ) : IFuture < any > {
107- return this . $childProcess . exec ( npmCommandName , { cwd : currentWorkingDirectory } ) ;
108- }
109-
110- private loadAndExecute ( commandName : string , args : any [ ] , opts ?: INpmOpts ) : IFuture < any > {
93+ public view ( packageName : string , config : any ) : IFuture < any > {
11194 return ( ( ) => {
112- opts = opts || { } ;
113- this . load ( opts . config ) . wait ( ) ;
114- return this . executeCore ( commandName , args , opts ) . wait ( ) ;
95+ let flags = this . getFlagsString ( config , false ) ;
96+ let viewResult = this . $childProcess . exec ( `npm view ${ packageName } ${ flags } ` ) . wait ( ) ;
97+ return JSON . parse ( viewResult ) ;
11598 } ) . future < any > ( ) ( ) ;
11699 }
117100
118- private executeCore ( commandName : string , args : any [ ] , opts ?: INpmOpts ) : IFuture < any > {
119- let future = new Future < any > ( ) ;
120- let oldNpmPath : string = undefined ;
121- let callback = ( err : Error , data : any ) => {
122- if ( oldNpmPath ) {
123- ( < any > npm ) . prefix = oldNpmPath ;
124- }
125-
126- if ( err ) {
127- future . throw ( err ) ;
128- } else {
129- future . return ( data ) ;
101+ private getFlagsString ( config : any , asArray : boolean ) : any {
102+ let array :Array < string > = [ ] ;
103+ for ( let flag in config ) {
104+ if ( config [ flag ] ) {
105+ if ( flag === "dist-tags" || flag === "versions" ) {
106+ array . push ( ` ${ flag } ) ;
107+ continue ;
108+ }
109+ array . push ( `--${ flag } ) ;
130110 }
131- } ;
132- args . push ( callback ) ;
133-
134- if ( opts && opts . path ) {
135- oldNpmPath = npm . prefix ;
136- ( < any > npm ) . prefix = opts . path ;
111+ }
112+ if ( asArray ) {
113+ return array ;
137114 }
138115
139- let subCommandName : string = opts . subCommandName ;
140- let command = subCommandName ? npm . commands [ commandName ] [ subCommandName ] : npm . commands [ commandName ] ;
141- command . apply ( this , args ) ;
142-
143- return future ;
116+ return array . join ( " " ) ;
144117 }
145118}
146119$injector . register ( "npm" , NodePackageManager ) ;
0 commit comments