cmd/cue: support different jsonschema strictness modes

This wires up the support for jsonschema strictness modes in
internal/filetypes to the actual jsonschema logic.

Signed-off-by: Roger Peppe <[email protected]>
Change-Id: I215346425aea3afb4145d6aac4052822d5bab0a7
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1200924
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: rogpeppe

Diff for: cmd/cue/cmd/flags.go

@@ -79,7 +79,7 @@ func addGlobalFlags(f *pflag.FlagSet) {
 	f.BoolP(string(flagIgnore), "i", false,
 		"proceed in the presence of errors")
 	f.Bool(string(flagStrict), false,
-		"report errors for lossy mappings")
+		"report errors for lossy mappings (deprecated: use \"jsonschema+strict:\" filetype instead; see cue help filetypes)")
 	f.BoolP(string(flagVerbose), "v", false,
 		"print information about progress")
 	f.BoolP(string(flagAllErrors), "E", false, "print all available errors")

Diff for: cmd/cue/cmd/help.go

@@ -609,6 +609,19 @@ defaults as requested.
     graph       Like data, but allow references.
     schema      Export data and definitions.
 
+The following tags are only valid in combination with other tags,
+and influence the functioning of the codec. The tag they are
+valid with is mentioned in parentheses at the end.
+
+    strictFeatures	report errors for lossy mappings (jsonschema)
+    strictKeywords	report errors for unknown keywords (jsonschema)
+    strict			report errors for either of the above (jsonschema)
+
+The above flags also accept a boolean flag value (e.g. true, 1, false, 0)
+to set them explicitly. For example:
+
+	jsonschema+strictKeywords=0+strictFeatures=1
+
 Many commands also support the --out and --outfile/-o flags.
 The --out flag specifies the output type using a qualifier
 (without the ':'). The -o flag specifies an output file

Diff for: cmd/cue/cmd/testdata/script/def_jsonschema.txtar

@@ -10,6 +10,14 @@ exec cue def jsonschema: bad.json
 ! exec cue def jsonschema: bad.json --strict
 cmp stderr expect-stderr
 
+! exec cue def jsonschema+strict: bad.json
+cmp stderr expect-stderr
+
+# With only strict features, it should error only for the
+# unimplemented feature and not for the unknown keyword.
+! exec cue def jsonschema+strictFeatures: bad.json
+cmp stderr expect-stderr-strict-features
+
 ! exec cue export data.yaml schema.json
 cmp stderr expect-stderr2
 
@@ -62,12 +70,19 @@ import "strings"
 
 -- bad.json --
 {
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "number",
-  "foo": "bar"
+  "$dynamicAnchor": "bar",
+  "foo": true
 }
 -- expect-stderr --
+keyword "$dynamicAnchor" not yet implemented:
+    ./bad.json:4:3
 unknown keyword "foo":
-    ./bad.json:3:3
+    ./bad.json:5:3
+-- expect-stderr-strict-features --
+keyword "$dynamicAnchor" not yet implemented:
+    ./bad.json:4:3
 -- data.yaml --
 age: twenty
 

Diff for: cmd/cue/cmd/testdata/script/help_cmd.txtar

@@ -167,7 +167,7 @@ Global Flags:
   -E, --all-errors   print all available errors
   -i, --ignore       proceed in the presence of errors
   -s, --simplify     simplify output
-      --strict       report errors for lossy mappings
+      --strict       report errors for lossy mappings (deprecated: use "jsonschema+strict:" filetype instead; see cue help filetypes)
       --trace        trace computation
   -v, --verbose      print information about progress
 
@@ -182,6 +182,6 @@ Global Flags:
   -E, --all-errors   print all available errors
   -i, --ignore       proceed in the presence of errors
   -s, --simplify     simplify output
-      --strict       report errors for lossy mappings
+      --strict       report errors for lossy mappings (deprecated: use "jsonschema+strict:" filetype instead; see cue help filetypes)
       --trace        trace computation
   -v, --verbose      print information about progress

Diff for: cmd/cue/cmd/testdata/script/help_cmd_flags.txtar

@@ -145,6 +145,6 @@ Global Flags:
   -E, --all-errors   print all available errors
   -i, --ignore       proceed in the presence of errors
   -s, --simplify     simplify output
-      --strict       report errors for lossy mappings
+      --strict       report errors for lossy mappings (deprecated: use "jsonschema+strict:" filetype instead; see cue help filetypes)
       --trace        trace computation
   -v, --verbose      print information about progress

Diff for: internal/encoding/encoding.go

@@ -137,7 +137,7 @@ type Config struct {
 	PkgName string // package name for files to generate
 
 	Force     bool // overwrite existing files
-	Strict    bool
+	Strict    bool // strict mode for jsonschema (deprecated)
 	Stream    bool // potentially write more than one document per file
 	AllErrors bool
 
@@ -287,7 +287,15 @@ func jsonSchemaFunc(cfg *Config, f *build.File) interpretFunc {
 		cfg := &jsonschema.Config{
 			PkgName: cfg.PkgName,
 
-			Strict: cfg.Strict,
+			// Note: we don't populate Strict because then we'd
+			// be ignoring the values of the other tags when it's true,
+			// and there's (deliberately) nothing that Strict does that
+			// cannot be described by the other two keywords.
+			// The strictKeywords and strictFeatures tags are
+			// set by internal/filetypes from the strict tag when appropriate.
+
+			StrictKeywords: cfg.Strict || f.BoolTags["strictKeywords"],
+			StrictFeatures: cfg.Strict || f.BoolTags["strictFeatures"],
 		}
 		file, err = jsonschema.Extract(v, cfg)
 		// TODO: simplify currently erases file line info. Reintroduce after fix.