Migrating schema generation tools to new/improved composition pipeline

wendellpiez · May 18, 2021 · a2b31bc · a2b31bc
1 parent 059807d
commit a2b31bc
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 14 deletions.
diff --git a/toolchains/xslt-M4/compose/metaschema-compose.xpl b/toolchains/xslt-M4/compose/metaschema-compose.xpl
@@ -42,6 +42,8 @@
 
   document @key-name and @key-ref as implementation details, not as part of Metaschema spec
     
+  //p:xslt/p:input[@port='stylesheet']/p:document/
+  <transform version="3.0">{ string(@href) }</transform>
   -->
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Ports -->

diff --git a/toolchains/xslt-M4/make-metaschema-json-schema.xpl b/toolchains/xslt-M4/make-metaschema-json-schema.xpl
@@ -33,7 +33,7 @@
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Import (subpipeline) -->
 
-  <p:import href="metaschema-compose.xpl"/>
+  <p:import href="compose/metaschema-compose.xpl"/>
 
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Pipeline -->

diff --git a/toolchains/xslt-M4/make-metaschema-xsd.xpl b/toolchains/xslt-M4/make-metaschema-xsd.xpl
@@ -38,7 +38,7 @@
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Import (subpipeline) -->
 
-  <p:import href="metaschema-compose.xpl"/>
+  <p:import href="compose/metaschema-compose.xpl"/>
 
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Pipeline -->

diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-SCHEMA.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-SCHEMA.xsl
@@ -29,9 +29,13 @@
     <!-- The $transformation-sequence declares transformations to be applied in order. -->
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
-        <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-build-refs.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-trim-extra-modules.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-prune-unused-definitions.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-resolve-use-names.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-resolve-sibling-names.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
+
         <nm:transform version="3.0">schema-gen/make-json-schema-metamap.xsl</nm:transform>
         <nm:transform version="3.0">lib/xpath-json-to-json.xsl</nm:transform>
     </xsl:variable>

diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl
@@ -61,10 +61,13 @@
   <!-- The $transformation-sequence declares transformations to be applied in order. -->
   <xsl:variable name="produce-json-converter">
     <!-- first compose the metaschema -->
-    <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
-    <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-    <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
-    <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-collect.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-build-refs.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-trim-extra-modules.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-prune-unused-definitions.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-resolve-use-names.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-resolve-sibling-names.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-digest.xsl</nm:transform>
 
     <!-- next produce definition map -->
     <nm:transform version="3.0">compose/make-model-map.xsl</nm:transform>

diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl
@@ -55,10 +55,13 @@
   <!-- The $transformation-sequence declares transformations to be applied in order. -->
   <xsl:variable name="produce-xml-converter">
     <!-- first compose the metaschema -->
-    <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
-    <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-    <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
-    <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-collect.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-build-refs.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-trim-extra-modules.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-prune-unused-definitions.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-resolve-use-names.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-resolve-sibling-names.xsl</nm:transform>
+    <nm:transform version="3.0">metaschema-digest.xsl</nm:transform>
 
     <!-- next produce definition map -->
     <nm:transform version="3.0">compose/make-model-map.xsl</nm:transform>

diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-XSD.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-XSD.xsl
@@ -29,9 +29,13 @@
     <!-- The $transformation-sequence declares transformations to be applied in order. -->
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
-        <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-build-refs.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-trim-extra-modules.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-prune-unused-definitions.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-resolve-use-names.xsl</nm:transform>
+        <nm:transform version="3.0">compose/metaschema-resolve-sibling-names.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
+
         <nm:transform version="3.0">schema-gen/make-metaschema-xsd.xsl</nm:transform>
         <nm:transform version="3.0">schema-gen/configure-namespaces.xsl</nm:transform>
     </xsl:variable>