Fix binding path for "any" type does not validate correctly, re #16

jsonx-org · May 13, 2024 · 84a10a1 · 84a10a1
1 parent ebe6c19
commit 84a10a1
Show file tree

Hide file tree

Showing 5 changed files with 327 additions and 336 deletions.
diff --git a/schema-0.5/binding-0.5.jsd b/schema-0.5/binding-0.5.jsd
@@ -8,7 +8,7 @@
   },
   "typeIdentifier": {
     "@": "string",
-    "@pattern": "(([a-zA-Z_$][a-zA-Z\\d_$]*)\\.)*[a-zA-Z_$][a-zA-Z\\d_$]*(\\[\\])?"
+    "@pattern": "(([a-zA-Z_$][a-zA-Z\\d_$]*)\\.)*[a-zA-Z_$][a-zA-Z\\d_$]*(<.*>)?(\\[\\])?"
   },
   "methodIdentifier": {
     "@": "string",
@@ -101,7 +101,7 @@
   },
   "any": {
     "@": "object",
-    "@extends": "fieldBindings",
+    "@extends": "typeFieldBindings",
     "@properties": {
       "@": {
         "@": "string",

diff --git a/schema-0.5/binding-0.5.jsdx b/schema-0.5/binding-0.5.jsdx
@@ -29,7 +29,7 @@
   <import namespace="http://www.jsonx.org/include-0.5.jsdx" schemaLocation="http://www.jsonx.org/include-0.5.jsdx"><xi:include href="http://www.jsonx.org/include-0.5.jsdx"/></import>
 
   <string name="nonEmptyString" pattern="\S|\S.*\S"/>
-  <string name="typeIdentifier" pattern="(([a-zA-Z_$][a-zA-Z\d_$]*)\.)*[a-zA-Z_$][a-zA-Z\d_$]*(\[\])?"/>
+  <string name="typeIdentifier" pattern="(([a-zA-Z_$][a-zA-Z\d_$]*)\.)*[a-zA-Z_$][a-zA-Z\d_$]*(&lt;.*&gt;)?(\[\])?"/> <!-- FIXME: The generic section is loosely enforced -->
   <string name="methodIdentifier" pattern="(([a-zA-Z_$][a-zA-Z\d_$]*)\.)*[a-zA-Z_$][a-zA-Z\d_$]*(\.&lt;init&gt;)?"/>
   <string name="fieldIdentifier" pattern="[a-zA-Z_$][a-zA-Z\d_$]*"/>
 
@@ -59,7 +59,7 @@
     <property names="\S|\S.*\S" xsi:type="any" types="codecTypeFieldBinding" nullable="false"/>
   </object>
 
-  <object name="any" extends="fieldBindings">
+  <object name="any" extends="typeFieldBindings">
     <property name="@" xsi:type="string" pattern="any" nullable="false"/>
   </object>