mirror of
https://github.com/pre-commit/pre-commit-hooks.git
synced 2026-04-07 04:26:52 +00:00
adds top keys list of keys in hashes to put at the top of a hash
This adds custom sorting to preferencially add a list of top keys at the start of any json hash in the json document
This commit is contained in:
parent
8e0d7bab60
commit
845a3d5bdf
2 changed files with 105 additions and 9 deletions
|
|
@ -6,17 +6,95 @@ from collections import OrderedDict
|
||||||
|
|
||||||
import simplejson
|
import simplejson
|
||||||
|
|
||||||
|
class SortableOrderedDict(OrderedDict):
|
||||||
|
"""Performs an in-place sort of the keys if you want."""
|
||||||
|
def sort(*args, **kwds):
|
||||||
|
self = args[0]
|
||||||
|
args = args[1:]
|
||||||
|
if 'key' not in kwds:
|
||||||
|
kwds['key'] = lambda x: x[0]
|
||||||
|
if len(args):
|
||||||
|
raise TypeError('expected no positional arguments got {0}'.format(len(args)))
|
||||||
|
sorted_od = sorted([x for x in self.items()], **kwds)
|
||||||
|
self.clear()
|
||||||
|
self.update(sorted_od)
|
||||||
|
|
||||||
def _get_pretty_format(contents, indent, sort_keys=True):
|
class TrackedSod(SortableOrderedDict):
|
||||||
return simplejson.dumps(
|
"""Tracks instances of the SortableOrderedDict."""
|
||||||
simplejson.loads(
|
_instances = []
|
||||||
contents,
|
def __init__(self, *args, **kwds):
|
||||||
object_pairs_hook=None if sort_keys else OrderedDict,
|
super(TrackedSod, self).__init__(*args, **kwds)
|
||||||
),
|
self.__track(self)
|
||||||
sort_keys=sort_keys,
|
|
||||||
indent=indent
|
|
||||||
) + "\n" # dumps don't end with a newline
|
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def __track(cls, obj):
|
||||||
|
cls._instances.append(obj)
|
||||||
|
|
||||||
|
|
||||||
|
def _get_pretty_format(contents, indent, sort_keys=True, top_keys=[]):
|
||||||
|
class KeyToCmp(object):
|
||||||
|
def __init__(self, obj, *args):
|
||||||
|
self.obj = obj[0]
|
||||||
|
def __lt__(self, other):
|
||||||
|
if self.obj in top_keys and other.obj in top_keys:
|
||||||
|
return top_keys.index(self.obj) < top_keys.index(other.obj)
|
||||||
|
elif self.obj in top_keys and other.obj not in top_keys:
|
||||||
|
return True
|
||||||
|
elif self.obj not in top_keys and other.obj in top_keys:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return self.obj < other.obj
|
||||||
|
def __gt__(self, other):
|
||||||
|
if self.obj in top_keys and other.obj in top_keys:
|
||||||
|
return top_keys.index(self.obj) > top_keys.index(other.obj)
|
||||||
|
elif self.obj in top_keys and other.obj not in top_keys:
|
||||||
|
return False
|
||||||
|
elif self.obj not in top_keys and other.obj in top_keys:
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
return self.obj > other.obj
|
||||||
|
def __eq__(self, other):
|
||||||
|
if self.obj in top_keys and other.obj in top_keys:
|
||||||
|
return top_keys.index(self.obj) == top_keys.index(other.obj)
|
||||||
|
elif self.obj in top_keys and other.obj not in top_keys:
|
||||||
|
return False
|
||||||
|
elif self.obj not in top_keys and other.obj in top_keys:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return self.obj == other.obj
|
||||||
|
def __le__(self, other):
|
||||||
|
if self.obj in top_keys and other.obj in top_keys:
|
||||||
|
return top_keys.index(self.obj) <= top_keys.index(other.obj)
|
||||||
|
elif self.obj in top_keys and other.obj not in top_keys:
|
||||||
|
return True
|
||||||
|
elif self.obj not in top_keys and other.obj in top_keys:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return self.obj <= other.obj
|
||||||
|
def __ge__(self, other):
|
||||||
|
if self.obj in top_keys and other.obj in top_keys:
|
||||||
|
return top_keys.index(self.obj) >= top_keys.index(other.obj)
|
||||||
|
elif self.obj in top_keys and other.obj not in top_keys:
|
||||||
|
return False
|
||||||
|
elif self.obj not in top_keys and other.obj in top_keys:
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
return self.obj >= other.obj
|
||||||
|
def __ne__(self, other):
|
||||||
|
if self.obj in top_keys and other.obj in top_keys:
|
||||||
|
return top_keys.index(self.obj) != top_keys.index(other.obj)
|
||||||
|
elif self.obj in top_keys and other.obj not in top_keys:
|
||||||
|
return False
|
||||||
|
elif self.obj not in top_keys and other.obj in top_keys:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return self.obj != other.obj
|
||||||
|
py_obj = simplejson.loads(contents, object_pairs_hook=TrackedSod)
|
||||||
|
if sort_keys:
|
||||||
|
for tsod in TrackedSod._instances:
|
||||||
|
tsod.sort(key=KeyToCmp)
|
||||||
|
# dumps don't end with a newline
|
||||||
|
return simplejson.dumps(py_obj, indent=indent) + "\n"
|
||||||
|
|
||||||
def _autofix(filename, new_contents):
|
def _autofix(filename, new_contents):
|
||||||
print("Fixing file {0}".format(filename))
|
print("Fixing file {0}".format(filename))
|
||||||
|
|
@ -43,6 +121,9 @@ def parse_indent(s):
|
||||||
'Negative integer supplied to construct JSON indentation delimiter. ',
|
'Negative integer supplied to construct JSON indentation delimiter. ',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def parse_topkeys(s):
|
||||||
|
# type: (str) -> array
|
||||||
|
return s.split(',')
|
||||||
|
|
||||||
def pretty_format_json(argv=None):
|
def pretty_format_json(argv=None):
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
|
|
@ -65,6 +146,13 @@ def pretty_format_json(argv=None):
|
||||||
default=False,
|
default=False,
|
||||||
help='Keep JSON nodes in the same order',
|
help='Keep JSON nodes in the same order',
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'--top-keys',
|
||||||
|
type=parse_topkeys,
|
||||||
|
dest='top_keys',
|
||||||
|
default=[],
|
||||||
|
help='Ordered list of keys to keep at the top of JSON hashes',
|
||||||
|
)
|
||||||
|
|
||||||
parser.add_argument('filenames', nargs='*', help='Filenames to fix')
|
parser.add_argument('filenames', nargs='*', help='Filenames to fix')
|
||||||
args = parser.parse_args(argv)
|
args = parser.parse_args(argv)
|
||||||
|
|
@ -78,6 +166,7 @@ def pretty_format_json(argv=None):
|
||||||
try:
|
try:
|
||||||
pretty_contents = _get_pretty_format(
|
pretty_contents = _get_pretty_format(
|
||||||
contents, args.indent, sort_keys=not args.no_sort_keys,
|
contents, args.indent, sort_keys=not args.no_sort_keys,
|
||||||
|
top_keys=args.top_keys
|
||||||
)
|
)
|
||||||
|
|
||||||
if contents != pretty_contents:
|
if contents != pretty_contents:
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,13 @@ def test_autofix_pretty_format_json(tmpdir):
|
||||||
ret = pretty_format_json([srcfile.strpath])
|
ret = pretty_format_json([srcfile.strpath])
|
||||||
assert ret == 0
|
assert ret == 0
|
||||||
|
|
||||||
|
def test_orderfile_get_pretty_format():
|
||||||
|
ret = pretty_format_json(['--top-keys=alist', get_resource_path('pretty_formatted_json.json')])
|
||||||
|
assert ret == 0
|
||||||
|
|
||||||
|
def test_orderfile_get_pretty_format():
|
||||||
|
ret = pretty_format_json(['--top-keys=blah', get_resource_path('pretty_formatted_json.json')])
|
||||||
|
assert ret == 1
|
||||||
|
|
||||||
def test_badfile_pretty_format_json():
|
def test_badfile_pretty_format_json():
|
||||||
ret = pretty_format_json([get_resource_path('ok_yaml.yaml')])
|
ret = pretty_format_json([get_resource_path('ok_yaml.yaml')])
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue