mirror of
https://github.com/TECHNOFAB11/jsonnet-bundler.git
synced 2025-12-11 23:50:05 +01:00
* 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.
83 lines
2.3 KiB
Go
83 lines
2.3 KiB
Go
// Copyright 2018 jsonnet-bundler authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package spec
|
|
|
|
import (
|
|
"encoding/json"
|
|
"sort"
|
|
|
|
"github.com/jsonnet-bundler/jsonnet-bundler/spec/deps"
|
|
)
|
|
|
|
// JsonnetFile is the structure of a `.json` file describing a set of jsonnet
|
|
// dependencies. It is used for both, the jsonnetFile and the lockFile.
|
|
type JsonnetFile struct {
|
|
// List of dependencies
|
|
Dependencies map[string]deps.Dependency
|
|
|
|
// Symlink files to old location
|
|
LegacyImports bool
|
|
}
|
|
|
|
// New returns a new JsonnetFile with the dependencies map initialized
|
|
func New() JsonnetFile {
|
|
return JsonnetFile{
|
|
Dependencies: make(map[string]deps.Dependency),
|
|
LegacyImports: true,
|
|
}
|
|
}
|
|
|
|
// jsonFile is the json representation of a JsonnetFile, which is different for
|
|
// compatibility reasons.
|
|
type jsonFile struct {
|
|
Dependencies []deps.Dependency `json:"dependencies"`
|
|
LegacyImports bool `json:"legacyImports"`
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals a `jsonFile`'s json into a JsonnetFile
|
|
func (jf *JsonnetFile) UnmarshalJSON(data []byte) error {
|
|
var s jsonFile
|
|
s.LegacyImports = jf.LegacyImports // adpot default
|
|
|
|
if err := json.Unmarshal(data, &s); err != nil {
|
|
return err
|
|
}
|
|
|
|
jf.Dependencies = make(map[string]deps.Dependency)
|
|
for _, d := range s.Dependencies {
|
|
jf.Dependencies[d.Name()] = d
|
|
}
|
|
jf.LegacyImports = s.LegacyImports
|
|
return nil
|
|
}
|
|
|
|
// MarshalJSON serializes a JsonnetFile into json of the format of a `jsonFile`
|
|
func (jf JsonnetFile) MarshalJSON() ([]byte, error) {
|
|
var s jsonFile
|
|
s.LegacyImports = jf.LegacyImports
|
|
for _, d := range jf.Dependencies {
|
|
s.Dependencies = append(s.Dependencies, d)
|
|
}
|
|
|
|
sort.SliceStable(s.Dependencies, func(i int, j int) bool {
|
|
return s.Dependencies[i].Name() < s.Dependencies[j].Name()
|
|
})
|
|
|
|
if s.Dependencies == nil {
|
|
s.Dependencies = make([]deps.Dependency, 0, 0)
|
|
}
|
|
|
|
return json.Marshal(s)
|
|
}
|