Move functions to utils.py #2929

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

src/packagedcode/npm.py

@@ -19,6 +19,8 @@
 from packagedcode import models
 from packagedcode.utils import combine_expressions
 from packagedcode.utils import normalize_vcs_url
+from packagedcode.utils import yield_dependencies_from_package_data
+from packagedcode.utils import yield_dependencies_from_package_resource
 import saneyaml
 
 """
@@ -36,29 +38,6 @@
 # TODO: add support for "lockfileVersion": 2 for package-lock.json and lockfileVersion: 3
 
 
-def yield_npm_dependencies_from_package_data(package_data, datafile_path, package_uid):
-    """
-    Yield a Dependency for each dependency from ``package_data.dependencies``
-    """
-    dependent_packages = package_data.dependencies
-    if dependent_packages:
-        yield from models.Dependency.from_dependent_packages(
-            dependent_packages=dependent_packages,
-            datafile_path=datafile_path,
-            datasource_id=package_data.datasource_id,
-            package_uid=package_uid,
-        )
-
-
-def yield_npm_dependencies_from_package_resource(resource, package_uid=None):
-    """
-    Yield a Dependency for each dependency from each package from``resource.package_data``
-    """
-    for pkg_data in resource.package_data:
-        pkg_data = models.PackageData.from_dict(pkg_data)
-        yield_npm_dependencies_from_package_data(pkg_data, resource.location, package_uid)
-
-
 class BaseNpmHandler(models.DatafileHandler):
 
     @classmethod
@@ -120,22 +99,22 @@ def assemble(cls, package_data, resource, codebase):
                 package_uid = None
 
             # in all cases yield possible dependencies
-            yield from yield_npm_dependencies_from_package_data(package_data, package_resource.path, package_uid)
+            yield from yield_dependencies_from_package_data(package_data, package_resource.path, package_uid)
 
             # we yield this as we do not want this further processed
             yield package_resource
 
             for sibling in package_resource.siblings(codebase):
                 if sibling.name in datafile_name_patterns:
-                    yield_npm_dependencies_from_package_resource(sibling, package_uid)
+                    yield_dependencies_from_package_resource(sibling, package_uid)
 
                     if package_uid not in sibling.for_packages:
                         sibling.for_packages.append(package_uid)
                         sibling.save(codebase)
                     yield sibling
         else:
             # we do not have a package.json
-            yield_npm_dependencies_from_package_resource(resource)
+            yield_dependencies_from_package_resource(resource)
 
     @classmethod
     def walk_npm(cls, resource, codebase, depth=0):

src/packagedcode/pypi.py

@@ -30,6 +30,8 @@
 from packagedcode import models
 from packagedcode.utils import build_description
 from packagedcode.utils import combine_expressions
+from packagedcode.utils import yield_dependencies_from_package_data
+from packagedcode.utils import yield_dependencies_from_package_resource
 
 # FIXME: we always want to use the external library rather than the built-in for now
 import importlib_metadata
@@ -118,29 +120,6 @@ def assign_package_to_resources(cls, package, resource, codebase):
         return models.DatafileHandler.assign_package_to_parent_tree(package, resource, codebase)
 
 
-def yield_dependencies_from_package_data(package_data, datafile_path, package_uid):
-    """
-    Yield a Dependency for each dependency from ``package_data.dependencies``
-    """
-    dependent_packages = package_data.dependencies
-    if dependent_packages:
-        yield from models.Dependency.from_dependent_packages(
-            dependent_packages=dependent_packages,
-            datafile_path=datafile_path,
-            datasource_id=package_data.datasource_id,
-            package_uid=package_uid,
-        )
-
-
-def yield_dependencies_from_package_resource(resource, package_uid=None):
-    """
-    Yield a Dependency for each dependency from each package from``resource.package_data``
-    """
-    for pkg_data in resource.package_data:
-        pkg_data = models.PackageData.from_dict(pkg_data)
-        yield_dependencies_from_package_data(pkg_data, resource.location, package_uid)
-
-
 class BaseExtractedPythonLayout(BasePypiHandler):
     """
     Base class for development repos, sdist tarballs and other related extracted

src/packagedcode/utils.py

@@ -184,3 +184,26 @@ def find_root_resource(path, resource, codebase):
     return resource
 
 
+def yield_dependencies_from_package_data(package_data, datafile_path, package_uid):
+    """
+    Yield a Dependency for each dependency from ``package_data.dependencies``
+    """
+    from packagedcode import models
+    dependent_packages = package_data.dependencies
+    if dependent_packages:
+        yield from models.Dependency.from_dependent_packages(
+            dependent_packages=dependent_packages,
+            datafile_path=datafile_path,
+            datasource_id=package_data.datasource_id,
+            package_uid=package_uid,
+        )
+
+
+def yield_dependencies_from_package_resource(resource, package_uid=None):
+    """
+    Yield a Dependency for each dependency from each package from``resource.package_data``
+    """
+    from packagedcode import models
+    for pkg_data in resource.package_data:
+        pkg_data = models.PackageData.from_dict(pkg_data)
+        yield_dependencies_from_package_data(pkg_data, resource.location, package_uid)