mirror of
https://github.com/TECHNOFAB11/jsonnet-bundler.git
synced 2025-12-11 23:50:05 +01:00
feat: absolute imports (#63)
* feat: go-like import style jb now creates a directory structure inside of vendor/ that is similar to how go does (github.com/grafana/jsonnet-libs). This is reflected in the final import paths, which means they will be go-like * refactor(spec/deps): named regexs * feat: make goImportStyle configurable Defaults to off, can be enabled in `jsonnetfile.json` * fix: integration test * doc: license headers * fix(deps): remove GO_IMPORT_STYLE not an option anymore, will always do so and symlink * feat: symlink to legacy location * feat: allow to disable legacy links * fix(test): legacyImports in integration tests * fix(spec): test * fix: respect legacyName aliases It was possible to alias packages by changing `name` previously. While names are now absolute (and computed), legacy links should still respect old aliases to avoid breaking code. * fix(test): integration * fix(init): keep legacyImports enabled for now * feat: rewrite imports adds a command to automatically rewrite imports from legacy to absolute style * fix(tool): rewrite confused by prefixing packages When a package was a prefix of another one, it broke. Fixed that by using a proper regular expression. Added a test to make sure it works as expected * Update cmd/jb/init.go * fix: exclude local packages from legacy linking They actually still use the old style, which is fine. LegacyLinking messed them up, but from now on it just ignores symlinks that match a localPackage.
This commit is contained in:
Tom
GitHub
parent
184841238b
commit
7b8a7836a4
22 changed files with 1129 additions and 361 deletions
161
cmd/jb/main.go
161
cmd/jb/main.go
|
|
@ -17,32 +17,16 @@ package main
|
|||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
|
||||
"github.com/fatih/color"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/jsonnet-bundler/jsonnet-bundler/spec"
|
||||
)
|
||||
|
||||
const (
|
||||
installActionName = "install"
|
||||
updateActionName = "update"
|
||||
initActionName = "init"
|
||||
)
|
||||
|
||||
var (
|
||||
gitSSHRegex = regexp.MustCompile(`git\+ssh://git@([^:]+):([^/]+)/([^/]+).git`)
|
||||
gitSSHWithVersionRegex = regexp.MustCompile(`git\+ssh://git@([^:]+):([^/]+)/([^/]+).git@(.*)`)
|
||||
gitSSHWithPathRegex = regexp.MustCompile(`git\+ssh://git@([^:]+):([^/]+)/([^/]+).git/(.*)`)
|
||||
gitSSHWithPathAndVersionRegex = regexp.MustCompile(`git\+ssh://git@([^:]+):([^/]+)/([^/]+).git/(.*)@(.*)`)
|
||||
|
||||
githubSlugRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)")
|
||||
githubSlugWithVersionRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)@(.*)")
|
||||
githubSlugWithPathRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/(.*)")
|
||||
githubSlugWithPathAndVersionRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/(.*)@(.*)")
|
||||
rewriteActionName = "rewrite"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
@ -69,6 +53,8 @@ func Main() int {
|
|||
|
||||
updateCmd := a.Command(updateActionName, "Update all dependencies.")
|
||||
|
||||
rewriteCmd := a.Command(rewriteActionName, "Automatically rewrite legacy imports to absolute ones")
|
||||
|
||||
command, err := a.Parse(os.Args[1:])
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, errors.Wrapf(err, "Error parsing commandline arguments"))
|
||||
|
|
@ -88,148 +74,11 @@ func Main() int {
|
|||
return installCommand(workdir, cfg.JsonnetHome, *installCmdURIs)
|
||||
case updateCmd.FullCommand():
|
||||
return updateCommand(workdir, cfg.JsonnetHome)
|
||||
case rewriteCmd.FullCommand():
|
||||
return rewriteCommand(workdir, cfg.JsonnetHome)
|
||||
default:
|
||||
installCommand(workdir, cfg.JsonnetHome, []string{})
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
func parseDependency(dir, uri string) *spec.Dependency {
|
||||
if uri == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
if githubSlugRegex.MatchString(uri) {
|
||||
return parseGithubDependency(uri)
|
||||
}
|
||||
|
||||
if gitSSHRegex.MatchString(uri) {
|
||||
return parseGitSSHDependency(uri)
|
||||
}
|
||||
|
||||
return parseLocalDependency(dir, uri)
|
||||
}
|
||||
|
||||
func parseGitSSHDependency(p string) *spec.Dependency {
|
||||
subdir := ""
|
||||
host := ""
|
||||
org := ""
|
||||
repo := ""
|
||||
version := "master"
|
||||
|
||||
switch {
|
||||
case gitSSHWithPathAndVersionRegex.MatchString(p):
|
||||
matches := gitSSHWithPathAndVersionRegex.FindStringSubmatch(p)
|
||||
host = matches[1]
|
||||
org = matches[2]
|
||||
repo = matches[3]
|
||||
subdir = matches[4]
|
||||
version = matches[5]
|
||||
case gitSSHWithPathRegex.MatchString(p):
|
||||
matches := gitSSHWithPathRegex.FindStringSubmatch(p)
|
||||
host = matches[1]
|
||||
org = matches[2]
|
||||
repo = matches[3]
|
||||
subdir = matches[4]
|
||||
case gitSSHWithVersionRegex.MatchString(p):
|
||||
matches := gitSSHWithVersionRegex.FindStringSubmatch(p)
|
||||
host = matches[1]
|
||||
org = matches[2]
|
||||
repo = matches[3]
|
||||
version = matches[4]
|
||||
default:
|
||||
matches := gitSSHRegex.FindStringSubmatch(p)
|
||||
host = matches[1]
|
||||
org = matches[2]
|
||||
repo = matches[3]
|
||||
}
|
||||
|
||||
return &spec.Dependency{
|
||||
Name: repo,
|
||||
Source: spec.Source{
|
||||
GitSource: &spec.GitSource{
|
||||
Remote: fmt.Sprintf("git@%s:%s/%s", host, org, repo),
|
||||
Subdir: subdir,
|
||||
},
|
||||
},
|
||||
Version: version,
|
||||
}
|
||||
}
|
||||
|
||||
func parseGithubDependency(p string) *spec.Dependency {
|
||||
if !githubSlugRegex.MatchString(p) {
|
||||
return nil
|
||||
}
|
||||
|
||||
name := ""
|
||||
user := ""
|
||||
repo := ""
|
||||
subdir := ""
|
||||
version := "master"
|
||||
|
||||
if githubSlugWithPathRegex.MatchString(p) {
|
||||
if githubSlugWithPathAndVersionRegex.MatchString(p) {
|
||||
matches := githubSlugWithPathAndVersionRegex.FindStringSubmatch(p)
|
||||
user = matches[1]
|
||||
repo = matches[2]
|
||||
subdir = matches[3]
|
||||
version = matches[4]
|
||||
name = path.Base(subdir)
|
||||
} else {
|
||||
matches := githubSlugWithPathRegex.FindStringSubmatch(p)
|
||||
user = matches[1]
|
||||
repo = matches[2]
|
||||
subdir = matches[3]
|
||||
name = path.Base(subdir)
|
||||
}
|
||||
} else {
|
||||
if githubSlugWithVersionRegex.MatchString(p) {
|
||||
matches := githubSlugWithVersionRegex.FindStringSubmatch(p)
|
||||
user = matches[1]
|
||||
repo = matches[2]
|
||||
name = repo
|
||||
version = matches[3]
|
||||
} else {
|
||||
matches := githubSlugRegex.FindStringSubmatch(p)
|
||||
user = matches[1]
|
||||
repo = matches[2]
|
||||
name = repo
|
||||
}
|
||||
}
|
||||
|
||||
return &spec.Dependency{
|
||||
Name: name,
|
||||
Source: spec.Source{
|
||||
GitSource: &spec.GitSource{
|
||||
Remote: fmt.Sprintf("https://github.com/%s/%s", user, repo),
|
||||
Subdir: subdir,
|
||||
},
|
||||
},
|
||||
Version: version,
|
||||
}
|
||||
}
|
||||
|
||||
func parseLocalDependency(dir, p string) *spec.Dependency {
|
||||
clean := filepath.Clean(p)
|
||||
abs := filepath.Join(dir, clean)
|
||||
|
||||
info, err := os.Stat(abs)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if !info.IsDir() {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &spec.Dependency{
|
||||
Name: info.Name(),
|
||||
Source: spec.Source{
|
||||
LocalSource: &spec.LocalSource{
|
||||
Directory: clean,
|
||||
},
|
||||
},
|
||||
Version: "",
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue