[oe-commits] [bitbake] 02/07: fetch2/npm: properly handle npm dependencies

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit 436d67fe7af89ecfbd11749a6ae1bc20e81f2cc8
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Wed Mar 9 17:22:13 2016 +1300

    fetch2/npm: properly handle npm dependencies
    
    The output of "npm view dependencies" isn't entirely JSON if there are
    multiple results, but the code here was just discarding the output if
    the entire thing didn't parse as JSON. Split the output into lines and
    iterate over it, parsing JSON fragments as we find them; this way we end
    up with the last package's dependencies since it'll be last in the
    output.
    
    Digging further, it seems that the dependencies field reported by "npm
    view" also includes optional dependencies. That wouldn't be a problem
    except some of these optional dependencies may be OS-specific; for
    example the "chokidar" module has "fsevents" in its optional
    dependencies, but fsevents only works on MacOS X (and is only needed
    there). If we erroneously pull in fsevents, not only is it unnecessary
    but it causes "npm shrinkwrap" to throw a tantrum. In the absence of a
    better approach, look at the os field and discard the module (along with
    any of its dependencies) if it isn't for Linux.
    
    As part of this, we can reduce the calls to npm view to one per package
    since we get the entire json output rather than querying twice for two
    separate fields. Overall the time taken has probably increased since we
    are being more thorough about dependencies, but it's not quite as bad as
    it could have been.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/npm.py | 64 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py
index df27669..3ff11e9 100644
--- a/lib/bb/fetch2/npm.py
+++ b/lib/bb/fetch2/npm.py
@@ -142,36 +142,62 @@ class Npm(FetchMethod):
 
         self._unpackdep(ud, ud.pkgname, workobj,  "%s/npmpkg" % destdir, dldir, d)
 
-    def _getdependencies(self, pkg, data, version, d, ud):
+    def _parse_view(self, output):
+        '''
+        Parse the output of npm view --json; the last JSON result
+        is assumed to be the one that we're interested in.
+        '''
+        pdata = None
+        outdeps = {}
+        datalines = []
+        bracelevel = 0
+        for line in output.splitlines():
+            if bracelevel:
+                datalines.append(line)
+            elif '{' in line:
+                datalines = []
+                datalines.append(line)
+            bracelevel = bracelevel + line.count('{') - line.count('}')
+        if datalines:
+            pdata = json.loads('\n'.join(datalines))
+        return pdata
+
+    def _getdependencies(self, pkg, data, version, d, ud, optional=False):
         pkgfullname = pkg
         if version != '*' and not '/' in version:
             pkgfullname += "@'%s'" % version
         logger.debug(2, "Calling getdeps on %s" % pkg)
-        fetchcmd = "npm view %s dist.tarball --registry %s" % (pkgfullname, ud.registry)
+        fetchcmd = "npm view %s --json --registry %s" % (pkgfullname, ud.registry)
         output = runfetchcmd(fetchcmd, d, True)
-        # npm may resolve multiple versions
-        outputarray = output.strip().splitlines()
-        if not outputarray:
+        pdata = self._parse_view(output)
+        if not pdata:
             raise FetchError("The command '%s' returned no output" % fetchcmd)
-        # we just take the latest version npm resolved
+        if optional:
+            pkg_os = pdata.get('os', None)
+            if pkg_os:
+                if not isinstance(pkg_os, list):
+                    pkg_os = [pkg_os]
+                if 'linux' not in pkg_os or '!linux' in pkg_os:
+                    logger.debug(2, "Skipping %s since it's incompatible with Linux" % pkg)
+                    return
         #logger.debug(2, "Output URL is %s - %s - %s" % (ud.basepath, ud.basename, ud.localfile))
-        outputurl = outputarray[len(outputarray)-1].rstrip()
-        if (len(outputarray) > 1):
-            # remove the preceding version/name from npm output and then the
-            # first and last quotes
-            outputurl = outputurl.split(" ")[1][1:-1]
+        outputurl = pdata['dist']['tarball']
         data[pkg] = {}
         data[pkg]['tgz'] = os.path.basename(outputurl)
         self._runwget(ud, d, "%s %s" % (self.basecmd, outputurl), False)
-        #fetchcmd = "npm view %s@%s dependencies --json" % (pkg, version)
-        fetchcmd = "npm view %s dependencies --json --registry %s" % (pkgfullname, ud.registry)
-        output = runfetchcmd(fetchcmd, d, True)
-        try:
-          depsfound = json.loads(output)
-        except:
-            # just assume there is no deps to be loaded here
-            return
+
+        dependencies = pdata.get('dependencies', {})
+        optionalDependencies = pdata.get('optionalDependencies', {})
+        depsfound = {}
+        optdepsfound = {}
         data[pkg]['deps'] = {}
+        for dep in dependencies:
+            if dep in optionalDependencies:
+                optdepsfound[dep] = dependencies[dep]
+            else:
+                depsfound[dep] = dependencies[dep]
+        for dep, version in optdepsfound.iteritems():
+            self._getdependencies(dep, data[pkg]['deps'], version, d, ud, optional=True)
         for dep, version in depsfound.iteritems():
             self._getdependencies(dep, data[pkg]['deps'], version, d, ud)
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.