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:
parent
184841238b
commit
7b8a7836a4
22 changed files with 1129 additions and 361 deletions
|
|
@ -20,7 +20,7 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/jsonnet-bundler/jsonnet-bundler/spec"
|
||||
"github.com/jsonnet-bundler/jsonnet-bundler/spec/deps"
|
||||
)
|
||||
|
||||
func TestParseDependency(t *testing.T) {
|
||||
|
|
@ -34,7 +34,7 @@ func TestParseDependency(t *testing.T) {
|
|||
tests := []struct {
|
||||
name string
|
||||
path string
|
||||
want *spec.Dependency
|
||||
want *deps.Dependency
|
||||
}{
|
||||
{
|
||||
name: "Empty",
|
||||
|
|
@ -49,11 +49,13 @@ func TestParseDependency(t *testing.T) {
|
|||
{
|
||||
name: "GitHub",
|
||||
path: "github.com/jsonnet-bundler/jsonnet-bundler",
|
||||
want: &spec.Dependency{
|
||||
Name: "jsonnet-bundler",
|
||||
Source: spec.Source{
|
||||
GitSource: &spec.GitSource{
|
||||
Remote: "https://github.com/jsonnet-bundler/jsonnet-bundler",
|
||||
want: &deps.Dependency{
|
||||
Source: deps.Source{
|
||||
GitSource: &deps.Git{
|
||||
Scheme: deps.GitSchemeHTTPS,
|
||||
Host: "github.com",
|
||||
User: "jsonnet-bundler",
|
||||
Repo: "jsonnet-bundler",
|
||||
Subdir: "",
|
||||
},
|
||||
},
|
||||
|
|
@ -63,11 +65,13 @@ func TestParseDependency(t *testing.T) {
|
|||
{
|
||||
name: "SSH",
|
||||
path: "git+ssh://git@github.com:jsonnet-bundler/jsonnet-bundler.git",
|
||||
want: &spec.Dependency{
|
||||
Name: "jsonnet-bundler",
|
||||
Source: spec.Source{
|
||||
GitSource: &spec.GitSource{
|
||||
Remote: "git@github.com:jsonnet-bundler/jsonnet-bundler",
|
||||
want: &deps.Dependency{
|
||||
Source: deps.Source{
|
||||
GitSource: &deps.Git{
|
||||
Scheme: deps.GitSchemeSSH,
|
||||
Host: "github.com",
|
||||
User: "jsonnet-bundler",
|
||||
Repo: "jsonnet-bundler",
|
||||
Subdir: "",
|
||||
},
|
||||
},
|
||||
|
|
@ -77,10 +81,9 @@ func TestParseDependency(t *testing.T) {
|
|||
{
|
||||
name: "local",
|
||||
path: testFolder,
|
||||
want: &spec.Dependency{
|
||||
Name: "foobar",
|
||||
Source: spec.Source{
|
||||
LocalSource: &spec.LocalSource{
|
||||
want: &deps.Dependency{
|
||||
Source: deps.Source{
|
||||
LocalSource: &deps.Local{
|
||||
Directory: "test/jsonnet/foobar",
|
||||
},
|
||||
},
|
||||
|
|
@ -90,7 +93,7 @@ func TestParseDependency(t *testing.T) {
|
|||
}
|
||||
for _, tt := range tests {
|
||||
_ = t.Run(tt.name, func(t *testing.T) {
|
||||
dependency := parseDependency("", tt.path)
|
||||
dependency := deps.Parse("", tt.path)
|
||||
|
||||
if tt.path == "" {
|
||||
assert.Nil(t, dependency)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue