Skip to content

Commit 19d162a

Browse files
authored
Group related canonicalizer rules (#731)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent d462d56 commit 19d162a

11 files changed

Lines changed: 2200 additions & 1938 deletions

src/alterschema/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ sourcemeta_library(NAMESPACE sourcemeta PROJECT blaze NAME alterschema
44
SOURCES alterschema.cc schema_rule.cc transformer.cc
55
# Canonicalizer
66
canonicalizer/additional_items_implicit.h
7-
canonicalizer/additional_properties_implicit.h
87
canonicalizer/comment_drop.h
98
canonicalizer/const_as_enum.h
109
canonicalizer/dependencies_to_any_of.h
@@ -28,7 +27,6 @@ sourcemeta_library(NAMESPACE sourcemeta PROJECT blaze NAME alterschema
2827
canonicalizer/exclusive_minimum_integer_to_minimum.h
2928
canonicalizer/extends_to_array.h
3029
canonicalizer/if_then_else_implicit.h
31-
canonicalizer/implicit_array_keywords.h
3230
canonicalizer/implicit_contains_keywords.h
3331
canonicalizer/implicit_object_keywords.h
3432
canonicalizer/items_implicit.h
@@ -39,13 +37,10 @@ sourcemeta_library(NAMESPACE sourcemeta PROJECT blaze NAME alterschema
3937
canonicalizer/min_items_given_min_contains.h
4038
canonicalizer/min_length_implicit.h
4139
canonicalizer/min_properties_covered_by_required.h
42-
canonicalizer/min_properties_implicit.h
4340
canonicalizer/minimum_can_equal_integer_fold.h
4441
canonicalizer/minimum_can_equal_true_drop.h
4542
canonicalizer/multiple_of_implicit.h
4643
canonicalizer/optional_property_implicit.h
47-
canonicalizer/properties_implicit.h
48-
canonicalizer/property_names_implicit.h
4944
canonicalizer/recursive_anchor_false_drop.h
5045
canonicalizer/required_property_implicit.h
5146
canonicalizer/type_array_to_any_of.h

src/alterschema/alterschema.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ auto WALK_UP_IN_PLACE_APPLICATORS(const JSON &root, const SchemaFrame &frame,
108108
}
109109

110110
#include "canonicalizer/additional_items_implicit.h"
111-
#include "canonicalizer/additional_properties_implicit.h"
112111
#include "canonicalizer/comment_drop.h"
113112
#include "canonicalizer/const_as_enum.h"
114113
#include "canonicalizer/dependencies_to_any_of.h"
@@ -132,7 +131,6 @@ auto WALK_UP_IN_PLACE_APPLICATORS(const JSON &root, const SchemaFrame &frame,
132131
#include "canonicalizer/exclusive_minimum_integer_to_minimum.h"
133132
#include "canonicalizer/extends_to_array.h"
134133
#include "canonicalizer/if_then_else_implicit.h"
135-
#include "canonicalizer/implicit_array_keywords.h"
136134
#include "canonicalizer/implicit_contains_keywords.h"
137135
#include "canonicalizer/implicit_object_keywords.h"
138136
#include "canonicalizer/items_implicit.h"
@@ -143,13 +141,10 @@ auto WALK_UP_IN_PLACE_APPLICATORS(const JSON &root, const SchemaFrame &frame,
143141
#include "canonicalizer/min_items_given_min_contains.h"
144142
#include "canonicalizer/min_length_implicit.h"
145143
#include "canonicalizer/min_properties_covered_by_required.h"
146-
#include "canonicalizer/min_properties_implicit.h"
147144
#include "canonicalizer/minimum_can_equal_integer_fold.h"
148145
#include "canonicalizer/minimum_can_equal_true_drop.h"
149146
#include "canonicalizer/multiple_of_implicit.h"
150147
#include "canonicalizer/optional_property_implicit.h"
151-
#include "canonicalizer/properties_implicit.h"
152-
#include "canonicalizer/property_names_implicit.h"
153148
#include "canonicalizer/recursive_anchor_false_drop.h"
154149
#include "canonicalizer/required_property_implicit.h"
155150
#include "canonicalizer/type_array_to_any_of.h"
@@ -277,8 +272,6 @@ auto add(SchemaTransformer &bundle, const AlterSchemaMode mode) -> void {
277272
bundle.add<UnevaluatedPropertiesToAdditionalProperties>();
278273
bundle.add<IfThenElseImplicit>();
279274
bundle.add<ImplicitObjectKeywords>();
280-
bundle.add<PropertyNamesImplicit>();
281-
bundle.add<ImplicitArrayKeywords>();
282275
bundle.add<ImplicitContainsKeywords>();
283276
bundle.add<ExtendsToArray>();
284277
bundle.add<DisallowToArrayOfSchemas>();
@@ -355,11 +348,9 @@ auto add(SchemaTransformer &bundle, const AlterSchemaMode mode) -> void {
355348
bundle.add<MinItemsGivenMinContains>();
356349
bundle.add<MinPropertiesCoveredByRequired>();
357350
bundle.add<MinLengthImplicit>();
358-
bundle.add<MinPropertiesImplicit>();
359351
bundle.add<MultipleOfImplicit>();
360352
bundle.add<DivisibleByImplicit>();
361353
bundle.add<MaxDecimalImplicit>();
362-
bundle.add<PropertiesImplicit>();
363354
bundle.add<ItemsImplicit>();
364355
}
365356

@@ -427,7 +418,6 @@ auto add(SchemaTransformer &bundle, const AlterSchemaMode mode) -> void {
427418
bundle.add<EmptyDependenciesDrop>();
428419
bundle.add<EmptyDependentSchemasDrop>();
429420
bundle.add<EmptyDependentRequiredDrop>();
430-
bundle.add<AdditionalPropertiesImplicit>();
431421
bundle.add<AdditionalItemsImplicit>();
432422
bundle.add<RequiredPropertyImplicit>();
433423
bundle.add<OptionalPropertyImplicit>();

src/alterschema/canonicalizer/additional_properties_implicit.h

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/alterschema/canonicalizer/implicit_array_keywords.h

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)