flatpak-node-generator: Apply patch for lockfile v3 git sources

See flatpak/flatpak-builder-tools#382

Author: threema-danilo

packaging/flatpak/flatpak-builder-tools/flatpak_node_generator/providers/__init__.py

@@ -16,6 +16,7 @@
     'git': {},
     'git+http': {'scheme': 'http'},
     'git+https': {'scheme': 'https'},
+    'git+ssh': {'scheme': 'https'},
 }
 
 
@@ -33,6 +34,14 @@ def parse_git_source(self, version: str, from_: Optional[str] = None) -> GitSour
         if not new_url.netloc:
             path = new_url.path.split('/')
             new_url = new_url._replace(netloc=path[0], path='/'.join(path[1:]))
+        # Replace https://[email protected]:ianstormtaylor/to-camel-case.git
+        # with    https://[email protected]/ianstormtaylor/to-camel-case.git
+        # for git+ssh URLs
+        if ':' in new_url.netloc:
+            netloc_split = new_url.netloc.split(':')
+            new_url = new_url._replace(
+                netloc=netloc_split[0], path=f'/{netloc_split[1]}{new_url.path}'
+            )
 
         return GitSource(
             original=original_url.geturl(),

packaging/flatpak/flatpak-builder-tools/flatpak_node_generator/providers/npm.py

@@ -130,10 +130,7 @@ def _process_packages_v2(
                         integrity=integrity, resolved=info['resolved']
                     )
                 elif resolved_url.scheme.startswith('git+'):
-                    raise NotImplementedError(
-                        'Git sources in lockfile v2 format are not supported yet'
-                        f' (package {install_path} in {lockfile})'
-                    )
+                    source = self.parse_git_source(info['resolved'])
             else:
                 raise NotImplementedError(
                     f"Don't know how to handle package {install_path} in {lockfile}"
@@ -425,72 +422,79 @@ def _finalize(self) -> None:
         )
 
         if self.git_sources:
-            # Generate jq scripts to patch the package*.json files.
-            scripts = {
-                'package.json': r"""
-                    walk(
-                        if type == "object"
-                        then
-                            to_entries | map(
-                                if (.value | type == "string") and $data[.value]
-                                then .value = "git+file:\($buildroot)/\($data[.value])"
-                                else .
-                                end
-                            ) | from_entries
-                        else .
-                        end
-                    )
-                """,
-                'package-lock.json': r"""
-                    walk(
-                        if type == "object" and (.version | type == "string") and $data[.version]
-                        then
-                            .version = "git+file:\($buildroot)/\($data[.version])"
-                        else .
-                        end
-                    )
-                """,
-            }
+            # Generate jq script to patch the package.json file
+            script = r"""
+                        walk(
+                            if type == "object"
+                            then
+                                to_entries | map(
+                                    if (.value | type == "string") and $data[.value]
+                                    then .value = "git+file:\($buildroot)/\($data[.value])"
+                                    else .
+                                    end
+                                ) | from_entries
+                            else .
+                            end
+                        )
+                    """
 
             for lockfile, sources in self.git_sources.items():
                 prefix = self.relative_lockfile_dir(lockfile)
-                data: Dict[str, Dict[str, str]] = {
-                    'package.json': {},
-                    'package-lock.json': {},
-                }
+                data: Dict[str, str] = {}
 
                 for path, source in sources.items():
                     GIT_URL_PREFIX = 'git+'
 
                     new_version = f'{path}#{source.commit}'
-                    assert source.from_ is not None
-                    data['package.json'][source.from_] = new_version
-                    data['package-lock.json'][source.original] = new_version
-
-                    if source.from_.startswith(GIT_URL_PREFIX):
-                        data['package.json'][
-                            source.from_[len(GIT_URL_PREFIX) :]
-                        ] = new_version
-
-                    if source.original.startswith(GIT_URL_PREFIX):
-                        data['package-lock.json'][
-                            source.original[len(GIT_URL_PREFIX) :]
-                        ] = new_version
-
-                for filename, script in scripts.items():
-                    target = Path('$FLATPAK_BUILDER_BUILDDIR') / prefix / filename
-                    script = (
-                        textwrap.dedent(script.lstrip('\n')).strip().replace('\n', '')
-                    )
-                    json_data = json.dumps(data[filename])
-                    patch_commands[lockfile].append(
-                        'jq'
-                        ' --arg buildroot "$FLATPAK_BUILDER_BUILDDIR"'
-                        f' --argjson data {shlex.quote(json_data)}'
-                        f' {shlex.quote(script)} {target}'
-                        f' > {target}.new'
-                    )
-                    patch_commands[lockfile].append(f'mv {target}{{.new,}}')
+                    targets = []
+                    source_url = urllib.parse.urlparse(source.from_ or source.original)
+
+                    # https://github.com/npm/hosted-git-info
+                    hosted_git = [
+                        ('@github.com', 'github'),
+                        ('@bitbucket.org', 'bitbucket'),
+                        ('@gitlab.com', 'gitlab'),
+                        ('@gist.github.com', 'gist'),
+                        ('@git.sr.ht', 'sourcehut'),
+                    ]
+                    for domain, shortcut in hosted_git:
+                        if domain in source_url.netloc.lower():
+                            targets.append(
+                                f"{shortcut}:{source_url.path[1:].replace('.git', '')}"
+                                f'#{source_url.fragment}'
+                            )
+                            break
+
+                    if (
+                        source_url.scheme.startswith(GIT_URL_PREFIX + 'ssh')
+                        and ':' not in source_url.netloc
+                    ):
+                        path_match = re.compile(r'^/([^/]+)(.*)').match(source_url.path)
+                        if path_match:
+                            parent, child = path_match.groups()
+                            source_url = source_url._replace(
+                                netloc=f'{source_url.netloc}:{parent}', path=child
+                            )
+                    elif source_url.scheme.startswith(GIT_URL_PREFIX):
+                        targets.append(source_url.geturl()[len(GIT_URL_PREFIX) :])
+
+                    targets.append(source_url.geturl())
+                    for t in targets:
+                        data[t] = new_version
+                        data[t.replace('#' + source.commit, '')] = new_version
+
+                filename = 'package.json'
+                target = Path('$FLATPAK_BUILDER_BUILDDIR') / prefix / filename
+                script = textwrap.dedent(script.lstrip('\n')).strip().replace('\n', '')
+                json_data = json.dumps(data)
+                patch_commands[lockfile].append(
+                    'jq'
+                    ' --arg buildroot "$FLATPAK_BUILDER_BUILDDIR"'
+                    f' --argjson data {shlex.quote(json_data)}'
+                    f' {shlex.quote(script)} {target}'
+                    f' > {target}.new'
+                )
+                patch_commands[lockfile].append(f'mv {target}{{.new,}}')
 
         patch_all_commands: List[str] = []
         for lockfile in self.all_lockfiles: