From 71233f4eb6854e820c7949144e86afa4d7981b22 Mon Sep 17 00:00:00 2001
From: Alexander Stein <alexander.stein@nist.gov>
Date: Wed, 9 Nov 2022 20:54:19 -0500
Subject: [PATCH] Fix JSON Schema generation for usnistgov/metaschema#240 and
 add tests.

---
 .../json-schema-gen/json-schema-gen.xspec     | 157 +++++++++++
 .../json-value-testing-mini-jsonschema.json   | 121 +++++++++
 ...value-testing-mini-metaschema-COMPOSED.xml | 244 ++++++++++++++++++
 .../json-value-testing-mini-metaschema.xml    | 187 ++++++++++++++
 .../schema-gen/make-json-schema-metamap.xsl   |  40 +--
 5 files changed, 733 insertions(+), 16 deletions(-)
 create mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
 create mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema.json
 create mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml
 create mode 100644 test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml

diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
new file mode 100644
index 000000000..cabd29c44
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- autogenerated 2021-12-14T16:02:57.305-05:00 following model in example-set.xspec-->
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+   xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+   xmlns:j="http://www.w3.org/2005/xpath-functions"
+   stylesheet="../../../toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl"
+   run-as="external" xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable">
+
+   <x:scenario label="When generating a JSON schema from composed Metaschema definitions">
+      <x:scenario label="if it has a defined field with no constraint and no allowed-values">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='unconstrained']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:unconstrained">
+               <string key="title">Unconstrained</string>
+               <string key="description">A field whose value is constrained only by its nominal datatype, 'token'.</string>
+               <string key="$id">#field_oscal-value-testing-mini_unconstrained</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+      
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target of '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-closed']"/>
+         <x:expect label="the resulting JSON Schema should have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed">
+               <string key="title">Constrained closed</string>
+               <string key="description">Because allow-other is 'no' an enumeration can be given in the JSON Schema.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-closed</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <array key="allOf">
+                        <map>
+                           <string key="$ref">#/definitions/TokenDatatype</string>
+                        </map>
+                        <map>
+                           <array key="enum">
+                              <string>one</string>
+                              <string>two</string>
+                              <string>three</string>
+                              <string>four</string>
+                           </array>
+                        </map>
+                     </array>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+   
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, no explicit target, and permissive enforcement of allow-other='yes'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-open']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-open">
+               <string key="title">Constrained open</string>
+               <string key="description">Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-open</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target other than '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-narrow']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-narrow">
+               <string key="title">Constrained narrow</string>
+               <string key="description">Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-narrow</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+   
+      <x:scenario label="if it has a defined field with a constraint, allowed-values, permissive enforcement of allow-other='yes' and explicit target other than '.'">
+         <x:context href="json-value-testing-mini-metaschema-COMPOSED.xml"
+            select="/*/m:define-field[@name='constrained-sortof']"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
+            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-sortof">
+               <string key="title">Constrained, sort of</string>
+               <string key="description">Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</string>
+               <string key="$id">#field_oscal-value-testing-mini_constrained-sortof</string>
+               <string key="type">object</string>
+               <map key="properties">
+                  <map key="some">
+                     <string key="title">Some Flag</string>
+                     <string key="description">Some flag some flag some flag.</string>
+                     <string key="$ref">#/definitions/StringDatatype</string>
+                  </map>
+                  <map key="token-value">
+                     <string key="$ref">#/definitions/TokenDatatype</string>
+                  </map>
+               </map>
+               <array key="required">
+                  <string>token-value</string>
+               </array>
+               <boolean key="additionalProperties">false</boolean>
+            </map>
+         </x:expect>
+      </x:scenario>
+   </x:scenario>
+</x:description>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema.json b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema.json
new file mode 100644
index 000000000..88d74fdab
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-jsonschema.json
@@ -0,0 +1,121 @@
+
+  { "$schema" : "http://json-schema.org/draft-07/schema#",
+    "$id" : "http://csrc.nist.gov/ns/oscal/0.1/oscal-value-testing-mini-schema.json",
+    "$comment" : "JSON value testing mini metaschema: JSON Schema",
+    "type" : "object",
+    "definitions" : 
+    { "oscal-value-testing-mini-oscal-value-testing-mini:root" : 
+      { "title" : "Root",
+        "description" : "Root root root.",
+        "$id" : "#assembly_oscal-value-testing-mini_root",
+        "type" : "object",
+        "properties" : 
+        { "unconstrained" : 
+          { "$ref" : "#field_oscal-value-testing-mini_unconstrained" },
+          "constrained-open" : 
+          { "$ref" : "#field_oscal-value-testing-mini_constrained-open" },
+          "constrained-closed" : 
+          { "$ref" : "#field_oscal-value-testing-mini_constrained-closed" },
+          "constrained-narrow" : 
+          { "$ref" : "#field_oscal-value-testing-mini_constrained-narrow" },
+          "constrained-sortof" : 
+          { "$ref" : "#field_oscal-value-testing-mini_constrained-sortof" } },
+        "additionalProperties" : false },
+      "oscal-value-testing-mini-oscal-value-testing-mini:unconstrained" : 
+      { "title" : "Unconstrained",
+        "description" : "A field whose value is constrained only by its nominal datatype, 'token'.",
+        "$id" : "#field_oscal-value-testing-mini_unconstrained",
+        "type" : "object",
+        "properties" : 
+        { "some" : 
+          { "title" : "Some Flag",
+            "description" : "Some flag some flag some flag.",
+            "$ref" : "#/definitions/StringDatatype" },
+          "token-value" : 
+          { "type" : "string" } },
+        "required" : 
+        [ "token-value" ],
+        "additionalProperties" : false },
+      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-open" : 
+      { "title" : "Constrained open",
+        "description" : "Because allow-other is 'yes' no enumeration can be given in the JSON Schema.",
+        "$id" : "#field_oscal-value-testing-mini_constrained-open",
+        "type" : "object",
+        "properties" : 
+        { "some" : 
+          { "title" : "Some Flag",
+            "description" : "Some flag some flag some flag.",
+            "$ref" : "#/definitions/StringDatatype" },
+          "token-value" : 
+          { "type" : "string" } },
+        "required" : 
+        [ "token-value" ],
+        "additionalProperties" : false },
+      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed" : 
+      { "title" : "Constrained closed",
+        "description" : "Because allow-other is 'no' an enumeration can be given in the JSON Schema.",
+        "$id" : "#field_oscal-value-testing-mini_constrained-closed",
+        "type" : "object",
+        "properties" : 
+        { "some" : 
+          { "title" : "Some Flag",
+            "description" : "Some flag some flag some flag.",
+            "$ref" : "#/definitions/StringDatatype" },
+          "token-value" : 
+          { "type" : "string" } },
+        "required" : 
+        [ "token-value" ],
+        "additionalProperties" : false,
+        "enum" : 
+        [ "one",
+          "two",
+          "three",
+          "four" ] },
+      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-narrow" : 
+      { "title" : "Constrained narrow",
+        "description" : "Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.",
+        "$id" : "#field_oscal-value-testing-mini_constrained-narrow",
+        "type" : "object",
+        "properties" : 
+        { "some" : 
+          { "title" : "Some Flag",
+            "description" : "Some flag some flag some flag.",
+            "$ref" : "#/definitions/StringDatatype" },
+          "token-value" : 
+          { "type" : "string" } },
+        "required" : 
+        [ "token-value" ],
+        "additionalProperties" : false,
+        "enum" : 
+        [ "one",
+          "two",
+          "three",
+          "four" ] },
+      "oscal-value-testing-mini-oscal-value-testing-mini:constrained-sortof" : 
+      { "title" : "Constrained, sort of",
+        "description" : "Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.",
+        "$id" : "#field_oscal-value-testing-mini_constrained-sortof",
+        "type" : "object",
+        "properties" : 
+        { "some" : 
+          { "title" : "Some Flag",
+            "description" : "Some flag some flag some flag.",
+            "$ref" : "#/definitions/StringDatatype" },
+          "token-value" : 
+          { "type" : "string" } },
+        "required" : 
+        [ "token-value" ],
+        "additionalProperties" : false },
+      "StringDatatype" : 
+      { "type" : "string",
+        "pattern" : "^\\S(.*\\S)?$" },
+      "TokenDatatype" : 
+      { "type" : "string",
+        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" } },
+    "properties" : 
+    { "root" : 
+      { "$ref" : "#assembly_oscal-value-testing-mini_root" } },
+    "required" : 
+    [ "root" ],
+    "additionalProperties" : false,
+    "maxProperties" : 1 }
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml
new file mode 100644
index 000000000..6f0e831fe
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            abstract="no"
+            module="oscal-value-testing-mini"
+            _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml">
+   <INFO info-type="objects-used">Seeing assembly#oscal-value-testing-mini:root, field#oscal-value-testing-mini:unconstrained, field#oscal-value-testing-mini:constrained-open, field#oscal-value-testing-mini:constrained-closed, field#oscal-value-testing-mini:constrained-narrow, field#oscal-value-testing-mini:constrained-sortof</INFO>
+   <schema-name>JSON value testing mini metaschema</schema-name>
+   <schema-version>0.1</schema-version>
+   <short-name>oscal-value-testing-mini</short-name>
+   <namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
+   <json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
+   <define-assembly _metaschema-xml-id="/assembly/oscal-value-testing-mini/root"
+                    _metaschema-json-id="/assembly/oscal-value-testing-mini/root"
+                    scope="global"
+                    name="root"
+                    module="oscal-value-testing-mini"
+                    _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                    _key-name="oscal-value-testing-mini:root"
+                    _using-root-name="root">
+      <formal-name>Root</formal-name>
+      <description>Root root root.</description>
+      <root-name>root</root-name>
+      <model>
+         <field _step="unconstrained"
+                _key="unconstrained"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/unconstrained"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/unconstrained"
+                max-occurs="1"
+                min-occurs="0"
+                ref="unconstrained"
+                _key-ref="oscal-value-testing-mini:unconstrained"
+                _using-name="unconstrained"
+                _in-xml-name="unconstrained"
+                _in-json-name="unconstrained"/>
+         <field _step="constrained-open"
+                _key="constrained-open"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-open"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-open"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-open"
+                _key-ref="oscal-value-testing-mini:constrained-open"
+                _using-name="constrained-open"
+                _in-xml-name="constrained-open"
+                _in-json-name="constrained-open"/>
+         <field _step="constrained-closed"
+                _key="constrained-closed"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-closed"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-closed"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-closed"
+                _key-ref="oscal-value-testing-mini:constrained-closed"
+                _using-name="constrained-closed"
+                _in-xml-name="constrained-closed"
+                _in-json-name="constrained-closed"/>
+         <field _step="constrained-narrow"
+                _key="constrained-narrow"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-narrow"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-narrow"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-narrow"
+                _key-ref="oscal-value-testing-mini:constrained-narrow"
+                _using-name="constrained-narrow"
+                _in-xml-name="constrained-narrow"
+                _in-json-name="constrained-narrow"/>
+         <field _step="constrained-sortof"
+                _key="constrained-sortof"
+                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-sortof"
+                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-sortof"
+                max-occurs="1"
+                min-occurs="0"
+                ref="constrained-sortof"
+                _key-ref="oscal-value-testing-mini:constrained-sortof"
+                _using-name="constrained-sortof"
+                _in-xml-name="constrained-sortof"
+                _in-json-name="constrained-sortof"/>
+      </model>
+   </define-assembly>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/unconstrained"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/unconstrained"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="unconstrained"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:unconstrained">
+      <formal-name>Unconstrained</formal-name>
+      <description>A field whose value is constrained only by its nominal datatype, 'token'.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/unconstrained/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/unconstrained/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-open"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-open"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-open"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-open">
+      <formal-name>Constrained open</formal-name>
+      <description>Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-open/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-open/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target="." allow-other="yes">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-closed"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-closed"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-closed"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-closed">
+      <formal-name>Constrained closed</formal-name>
+      <description>Because allow-other is 'no' an enumeration can be given in the JSON Schema.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-closed/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-closed/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target="." allow-other="no">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-narrow"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-narrow"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-narrow"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-narrow">
+      <formal-name>Constrained narrow</formal-name>
+      <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-narrow/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-narrow/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target=".[not(false())]" allow-other="no">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-sortof"
+                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-sortof"
+                 collapsible="no"
+                 as-type="token"
+                 scope="global"
+                 name="constrained-sortof"
+                 module="oscal-value-testing-mini"
+                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
+                 _key-name="oscal-value-testing-mini:constrained-sortof">
+      <formal-name>Constrained, sort of</formal-name>
+      <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+      <json-value-key>token-value</json-value-key>
+      <define-flag _step="some"
+                   _key="some"
+                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-sortof/some"
+                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-sortof/some"
+                   required="no"
+                   as-type="string"
+                   name="some"
+                   _using-name="some"
+                   _in-xml-name="some"
+                   _in-json-name="some">
+         <formal-name>Some Flag</formal-name>
+         <description>Some flag some flag some flag.</description>
+      </define-flag>
+      <constraint>
+         <allowed-values target=".[not(false())]" allow-other="yes">
+            <enum value="one"/>
+            <enum value="two"/>
+            <enum value="three"/>
+            <enum value="four"/>
+         </allowed-values>
+      </constraint>
+   </define-field>
+</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml
new file mode 100644
index 000000000..f6f3fa30f
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ${pdu}/build/metaschema/schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
+    <schema-name>JSON value testing mini metaschema</schema-name>
+    <schema-version>0.1</schema-version>
+    <short-name>oscal-value-testing-mini</short-name>
+    <namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
+    
+    
+<!--
+        XML looks like this:
+        
+        valid:
+        <root>
+        </root>
+             
+
+        not valid:
+        <root>
+             <value-required-since-token/>
+             <always-enumerated>ae5</always-enumerated>
+             <always-enumerated/>
+        </root>
+             
+    
+    -->
+    <define-assembly name="root">
+        <formal-name>Root</formal-name>
+        <description>Root root root.</description>
+        <root-name>root</root-name>
+        <model>
+            <field ref="unconstrained"/>
+            <field ref="constrained-open"/>
+            <field ref="constrained-closed"/>
+            <field ref="constrained-narrow"/>
+            <field ref="constrained-sortof"/>
+        </model>
+    </define-assembly>
+        <!--
+    fields to define
+    
+    unconstrained
+        no values enumerated
+    constrained-open
+      - allow-others='yes', values enumerated
+    constrained-closed
+      - allow-others='no', values enumerated
+    constrained-default
+      - same as constrained-closed
+    constrained-narrow
+      - allow-others='no', values enumerated on *some* cases
+    constrained-sortof
+      - allow-others='yes', values enumerated on *some* cases
+    
+    -->
+    
+    <define-field 
+        as-type="token"
+        name="unconstrained">
+        <formal-name>Unconstrained</formal-name>
+        <description>A field whose value is constrained only by its nominal datatype, 'token'.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+    </define-field>
+    
+    <!-- field constrained-open has allowed values, but allow-other="yes" so they are not exclusive -->
+    <define-field 
+        as-type="token"
+        name="constrained-open">
+        <formal-name>Constrained open</formal-name>
+        <description>Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target="." allow-other="yes">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+    
+    <!-- field constrained-closed has allowed values, exclusively - the 'normal' case -->
+    <define-field 
+        as-type="token"
+        name="constrained-closed">
+        <formal-name>Constrained closed</formal-name>
+        <description>Because allow-other is 'no' an enumeration can be given in the JSON Schema.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target="." allow-other="no">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+    
+    <!-- field constrained-narrow has allowed values, exclusively, but only on a subset of scoped elements -->
+    <define-field 
+        as-type="token"
+        name="constrained-narrow">
+        <formal-name>Constrained narrow</formal-name>
+        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target=".[not(false())]" allow-other="no">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+    
+    <!-- field constrained-sortof is like constrain-narrow, but allow-other is 'yes' -->
+    <define-field 
+        as-type="token"
+        name="constrained-sortof">
+        <formal-name>Constrained, sort of</formal-name>
+        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target=".[not(false())]" allow-other="yes">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+    
+
+
+    <!-- for field someties-requiring the enumeration should appear in the JSON Schema
+     only if the datatype requires at least one character (is not 'nullable') -->
+    <!--<define-field 
+        as-type="token"
+        name="value-required-since-token">
+        <formal-name>Field with required value property</formal-name>
+        <description>The value key here must be required iff the datatype requires a character;
+            permitting an empty string, the `nar-value` field should be optional (because 'nullable').</description>
+        <json-value-key>rst-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+    </define-field>-->
+    
+    <!--<define-field 
+        as-type="token"
+        name="value-not-required-since-string">
+        <formal-name>Field with optional value property</formal-name>
+        <description>The value key here must be optional since a string value can be empty (""),
+            providing for a syntax optimization in JSON representations (the value property can be dropped).</description>
+        <json-value-key>nrs-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+    </define-field>-->
+    
+    </METASCHEMA>
+
diff --git a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
index adf166264..a49102056 100644
--- a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
+++ b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
@@ -31,19 +31,13 @@
     <xsl:key name="flag-definition-by-name"     match="METASCHEMA/define-flag"     use="@_key-name"/>
     
     <!--Keys for retrieving datatypes:
-    
     <xsl:key name="typename-for-syntax"
-    
     -->
-    <!-- Produces composed metaschema (imports resolved) -->
-    <!--<xsl:import href="../nist-metaschema-COMPOSE.xsl"/>
-    <xsl:variable name="composed-metaschema" select="/"/>
     
-    <!-- bypasses composition to operate on the 'raw' metaschema for debugging -->
-    <!--<xsl:template mode="debug"  match="/METASCHEMA">
-        <xsl:apply-templates select="*"/>
-    </xsl:template>-->
-
+     <!--Produces composed metaschema (imports resolved)-->
+    <xsl:import href="../nist-metaschema-COMPOSE.xsl"/>
+    <xsl:variable name="composed-metaschema" select="/"/> 
+    
    
     <xsl:template match="/METASCHEMA" expand-text="true">
         
@@ -169,8 +163,7 @@
             </xsl:where-populated>
             <xsl:call-template name="require-or-allow"/>
             
-            <!-- allowed-values only present on fields -->
-            <xsl:apply-templates select="constraint/allowed-values"/>
+
     </xsl:template>
     
     <xsl:template match="define-field[exists(json-value-key-flag/@flag-ref)]">
@@ -200,8 +193,6 @@
                 <xsl:value-of
                     select="count($all-properties | self::define-field)"/>
             </number>
-            <!-- allowed-values only present on fields -->
-            <xsl:apply-templates select="constraint/allowed-values"/>
     </xsl:template>
     
     
@@ -256,7 +247,7 @@
     <!--<xsl:template match="allowed-values"/>-->
     <xsl:template match="allowed-values">
         <array key="enum">
-            <xsl:apply-templates/>
+            <xsl:apply-templates select="child::*"/>
         </array>
     </xsl:template>
     
@@ -376,7 +367,24 @@
         </xsl:variable>
         <xsl:if test="matches($this-key, '\S')">
             <map key="{$this-key}">
-                <string key="type">string</string>
+                <xsl:variable name="nominal-object-type" as="element()">
+                    <xsl:apply-templates select="." mode="object-type"/>
+                </xsl:variable>
+                <xsl:choose>
+                    <xsl:when test="constraint/allowed-values/@allow-other = 'no' and (constraint/allowed-values/@target = '.' or empty(constraint/allowed-values/@target))">
+                        <array key="allOf">
+                            <map>
+                                <xsl:sequence select="$nominal-object-type"/>
+                            </map>
+                            <map>
+                                <xsl:apply-templates select="constraint/allowed-values"/>
+                            </map>
+                        </array>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:sequence select="$nominal-object-type"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </map>
         </xsl:if>
     </xsl:template>