From 27112f16ff0eb917b47ffab7be97c639a17f0083 Mon Sep 17 00:00:00 2001
From: "A.J. Stein" <alexander.stein@nist.gov>
Date: Tue, 6 Dec 2022 22:45:11 -0500
Subject: [PATCH] Add Schematron for path checking and update incorrect paths.
 (#256)

---
 toolchains/xslt-M4/make-metaschema-css.xpl         |  2 +-
 toolchains/xslt-M4/make-metaschema-sandbox.xpl     | 14 ++------------
 .../make-metaschema-xml-to-supermodel-xslt.xpl     |  2 +-
 .../schema-gen/make-json-schema-metamap.xsl        |  2 +-
 .../xslt-M4/testing/test-xml-conversions.xpl       |  4 ++--
 toolchains/xslt-M4/validate/xproc-check.sch        | 11 +++++++++++
 6 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 toolchains/xslt-M4/validate/xproc-check.sch

diff --git a/toolchains/xslt-M4/make-metaschema-css.xpl b/toolchains/xslt-M4/make-metaschema-css.xpl
index 87ee86dcd..84a3610ef 100644
--- a/toolchains/xslt-M4/make-metaschema-css.xpl
+++ b/toolchains/xslt-M4/make-metaschema-css.xpl
@@ -28,7 +28,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-sandbox.xpl b/toolchains/xslt-M4/make-metaschema-sandbox.xpl
index 540d24e55..cdca6dcf8 100644
--- a/toolchains/xslt-M4/make-metaschema-sandbox.xpl
+++ b/toolchains/xslt-M4/make-metaschema-sandbox.xpl
@@ -48,7 +48,7 @@
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Import (subpipeline) -->
   
-  <p:import href="metaschema-compose.xpl"/>
+  <p:import href="compose/metaschema-compose.xpl"/>
   
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Pipeline -->
@@ -58,15 +58,5 @@
   <metaschema:metaschema-compose name="compose"/>
   
   <p:identity name="composed"/>
-  
-  <!--<p:identity  name="render-xml-model-map"/>-->
-  <p:xslt name="make-definition-map">
-    <p:input port="source">
-      <p:pipe port="result" step="composed"/>
-    </p:input>
-    <p:input port="stylesheet">
-      <p:document href="compose/make-definition-map.xsl"/>
-    </p:input>
-  </p:xslt>
-  
+ 
 </p:declare-step>
\ No newline at end of file
diff --git a/toolchains/xslt-M4/make-metaschema-xml-to-supermodel-xslt.xpl b/toolchains/xslt-M4/make-metaschema-xml-to-supermodel-xslt.xpl
index d02ff1f22..e41407146 100644
--- a/toolchains/xslt-M4/make-metaschema-xml-to-supermodel-xslt.xpl
+++ b/toolchains/xslt-M4/make-metaschema-xml-to-supermodel-xslt.xpl
@@ -49,7 +49,7 @@
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Import (subpipeline) -->
   
-  <p:import href="metaschema-compose.xpl"/>
+  <p:import href="compose/metaschema-compose.xpl"/>
   
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Pipeline -->
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 3a1200277..adf166264 100644
--- a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
+++ b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
@@ -36,7 +36,7 @@
     
     -->
     <!-- Produces composed metaschema (imports resolved) -->
-    <!--<xsl:import href="../lib/metaschema-compose.xsl"/>-->
+    <!--<xsl:import href="../nist-metaschema-COMPOSE.xsl"/>
     <xsl:variable name="composed-metaschema" select="/"/>
     
     <!-- bypasses composition to operate on the 'raw' metaschema for debugging -->
diff --git a/toolchains/xslt-M4/testing/test-xml-conversions.xpl b/toolchains/xslt-M4/testing/test-xml-conversions.xpl
index 56bb40452..321012491 100644
--- a/toolchains/xslt-M4/testing/test-xml-conversions.xpl
+++ b/toolchains/xslt-M4/testing/test-xml-conversions.xpl
@@ -75,7 +75,7 @@
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Import (subpipeline) -->
   
-  <p:import href="../metaschema-compose.xpl"/>
+  <p:import href="../compose/metaschema-compose.xpl"/>
   
   <!-- &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& &&& -->
   <!-- Pipeline -->
@@ -159,7 +159,7 @@
   <!--<p:identity name="serialize-json"/>-->
   <p:xslt name="serialize-json">
     <p:input port="stylesheet">
-      <p:document href="../lib/xpath-json-to-json.xsl"/>
+      <p:document href="../util/xpath-json-to-json.xsl"/>
     </p:input>
   </p:xslt>
   
diff --git a/toolchains/xslt-M4/validate/xproc-check.sch b/toolchains/xslt-M4/validate/xproc-check.sch
new file mode 100644
index 000000000..1b4de7e97
--- /dev/null
+++ b/toolchains/xslt-M4/validate/xproc-check.sch
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sch:schema xmlns:p="http://www.w3.org/ns/xproc"
+    xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2"
+    xmlns:sqf="http://www.schematron-quickfix.com/validator/process">
+    <sch:ns uri="http://www.w3.org/ns/xproc" prefix="p"/>
+    <sch:pattern>
+        <sch:rule context="//(p:document|p:import)/@href">
+            <sch:assert role="fatal" test="doc-available(resolve-uri(current(), document-uri(/)))" id="xpl-import-bad-href-target">No XML document at target location <sch:value-of select="resolve-uri(current(), document-uri(/))"/>.</sch:assert>
+        </sch:rule>
+    </sch:pattern>
+</sch:schema>