CLI improvements:

* add `processing_mode` for reader and writer
* add `expandContext` for reader
* move `compactArrays` to writer
* move `frame` from writer to `frame` command.
* add filter for expand, compact, flatten and so that they are only applicable when output-format is jsonld.
* remove `context` option for expand command.

Author: gkellogg

lib/json/ld/format.rb

@@ -53,6 +53,7 @@ def self.cli_commands
           description: "Expand JSON-LD or parsed RDF",
           parse: false,
           help: "expand [--context <context-file>] files ...",
+          filter: {output_format: :jsonld},  # Only shows output format set
           lambda: ->(files, options) do
             out = options[:output] || $stdout
             out.set_encoding(Encoding::UTF_8) if RUBY_PLATFORM == "java"
@@ -80,11 +81,15 @@ def self.cli_commands
                 end
               end
             end
-          end
+          end,
+          options: [
+            RDF::CLI::Option.new(symbol: :context, on: [])
+          ]
         },
         compact: {
           description: "Compact JSON-LD or parsed RDF",
           parse: false,
+          filter: {output_format: :jsonld},  # Only shows output format set
           help: "compact --context <context-file> files ...",
           lambda: ->(files, options) do
             raise ArgumentError, "Compacting requires a context" unless options[:context]
@@ -115,12 +120,22 @@ def self.cli_commands
                 end
               end
             end
-          end
+          end,
+          options: [
+            RDF::CLI::Option.new(
+              symbol: :context,
+              datatype: RDF::URI,
+              control: :url2,
+              required: true,
+              on: ["--context CONTEXT"],
+              description: "Context to use when compacting.") {|arg| RDF::URI(arg)},
+          ]
         },
         flatten: {
           description: "Flatten JSON-LD or parsed RDF",
           parse: false,
           help: "flatten [--context <context-file>] files ...",
+          filter: {output_format: :jsonld},  # Only shows output format set
           lambda: ->(files, options) do
             out = options[:output] || $stdout
             out.set_encoding(Encoding::UTF_8) if RUBY_PLATFORM == "java"
@@ -155,6 +170,7 @@ def self.cli_commands
           description: "Frame JSON-LD or parsed RDF",
           parse: false,
           help: "frame --frame <frame-file>  files ...",
+          filter: {output_format: :jsonld},  # Only shows output format set
           lambda: ->(files, options) do
             raise ArgumentError, "Framing requires a frame" unless options[:frame]
             out = options[:output] || $stdout
@@ -184,7 +200,16 @@ def self.cli_commands
                 end
               end
             end
-          end
+          end,
+          options: [
+            RDF::CLI::Option.new(
+              symbol: :frame,
+              datatype: RDF::URI,
+              control: :url2,
+              required: true,
+              on: ["--frame FRAME", :REQUIRED],
+              description: "Frame to use when serializing.") {|arg| RDF::URI(arg)}
+          ]
         },
       }
     end

lib/json/ld/reader.rb

@@ -15,10 +15,17 @@ class Reader < RDF::Reader
     def self.options
       super + [
         RDF::CLI::Option.new(
-          symbol: :compactArrays,
-          datatype: TrueClass,
-          on: ["--compact-arrays"],
-          description: "Replaces arrays with just one element with that element during compaction.") {true},
+          symbol: :expandContext,
+          control: :url2,
+          datatype: RDF::URI,
+          on: ["--expand-context CONTEXT"],
+          description: "Context to use when expanding.") {|arg| RDF::URI(arg)},
+        RDF::CLI::Option.new(
+          symbol: :processing_mode,
+          datatype: %w(json-ld-1.0 json-ld-1.1),
+          control: :radio,
+          on: ["--processingMode MODE", %w(json-ld-1.0 json-ld-1.1)],
+          description: "Set Processing Mode (json-ld-1.0 or json-ld-1.1)"),
       ]
     end
 

lib/json/ld/writer.rb

@@ -75,31 +75,37 @@ def self.options
         RDF::CLI::Option.new(
           symbol: :compactArrays,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--compact-arrays"],
           description: "Replaces arrays with just one element with that element during compaction.") {true},
         RDF::CLI::Option.new(
           symbol: :compactToRelative,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--compact-to-relative"],
           description: "Creates document relative IRIs when compacting, if `true`, otherwise leaves expanded. Default is `true` use --no-compact-to-relative to disable.") {true},
         RDF::CLI::Option.new(
           symbol: :context,
           datatype: RDF::URI,
+          control: :url2,
           on: ["--context CONTEXT"],
-          description: "Context to use when serializing. Constructed context for native serialization.") {|arg| RDF::URI(arg)},
+          description: "Context to use when compacting.") {|arg| RDF::URI(arg)},
         RDF::CLI::Option.new(
-          symbol: :frame,
-          datatype: RDF::URI,
-          on: ["--frame FRAME"],
-          description: "Frame to use when serializing.") {|arg| RDF::URI(arg)},
+          symbol: :processing_mode,
+          datatype: %w(json-ld-1.0 json-ld-1.1),
+          control: :radio,
+          on: ["--processingMode MODE", %w(json-ld-1.0 json-ld-1.1)],
+          description: "Set Processing Mode (json-ld-1.0 or json-ld-1.1)"),
         RDF::CLI::Option.new(
           symbol: :stream,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--stream"],
           description: "Do not attempt to optimize graph presentation, suitable for streaming large graphs.") {true},
         RDF::CLI::Option.new(
           symbol: :useRdfType,
           datatype: TrueClass,
+          control: :checkbox,
           on: ["--use-rdf-type"],
           description: "Treat `rdf:type` like a normal property instead of using `@type`.") {true},
       ]