Merge pull request #216 from NeuroML/feat/add-path-regex

feat(schema): add simple type to restrict component reference paths
NeuroML · Sep 11, 2023 · 735ddc8 · 735ddc8
2 parents bdf170a + 38c99fd
commit 735ddc8
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/Schemas/NeuroML2/NeuroML_v2.3.xsd b/Schemas/NeuroML2/NeuroML_v2.3.xsd
@@ -144,6 +144,15 @@
  <xs:pattern value="[a-zA-Z0-9_:]*"/>
  </xs:restriction>
  </xs:simpleType>
+ <xs:simpleType name="Nml2PopulationReferencePath">
+ <xs:annotation>
+ <xs:documentation>A path referring to another component.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(\.\./)?([a-zA-Z_][a-zA-Z0-9_]*)((\[[0-9]+\])|(/[0-9]+)+((/[a-zA-Z_][a-zA-Z0-9_]*)?)/?)"/>
+ </xs:restriction>
+ </xs:simpleType>
  <xs:simpleType name="NonNegativeInteger">
  <xs:annotation>
  <xs:documentation>An attribute useful as id of segments, connections, etc: integer &gt;=0 only!</xs:documentation>
@@ -3097,9 +3106,9 @@
  <xs:complexContent>
  <xs:extension base="BaseWithoutId">
  <xs:attribute name="neuroLexId" type="NeuroLexId" use="optional"/>
- <xs:attribute name="from" type="xs:string" use="required"/>
- <xs:attribute name="to" type="xs:string" use="required"/>
- <xs:attribute name="synapse" type="xs:string" use="required"/>
+ <xs:attribute name="from" type="Nml2PopulationReferencePath" use="required"/>
+ <xs:attribute name="to" type="Nml2PopulationReferencePath" use="required"/>
+ <xs:attribute name="synapse" type="NmlId" use="required"/>
  <xs:attribute name="destination" type="NmlId" use="optional"/>
  </xs:extension>
  </xs:complexContent>
@@ -3148,10 +3157,10 @@
  </xs:annotation>
  <xs:complexContent>
  <xs:extension base="BaseConnection">
- <xs:attribute name="preCellId" type="xs:string" use="required"/>
+ <xs:attribute name="preCellId" type="Nml2PopulationReferencePath" use="required"/>
  <xs:attribute name="preSegmentId" type="NonNegativeInteger" default="0"/>
  <xs:attribute name="preFractionAlong" type="ZeroToOne" default="0.5"/>
- <xs:attribute name="postCellId" type="xs:string" use="required"/>
+ <xs:attribute name="postCellId" type="Nml2PopulationReferencePath" use="required"/>
  <xs:attribute name="postSegmentId" type="NonNegativeInteger" default="0"/>
  <xs:attribute name="postFractionAlong" type="ZeroToOne" default="0.5"/>
  </xs:extension>
@@ -3309,9 +3318,9 @@
  </xs:annotation>
  <xs:complexContent>
  <xs:extension base="BaseWithoutId">
- <xs:attribute name="target" type="xs:string" use="required"/>
- <xs:attribute name="input" type="xs:string" use="required"/>
- <xs:attribute name="destination" type="xs:string"/>
+ <xs:attribute name="target" type="Nml2PopulationReferencePath" use="required"/>
+ <xs:attribute name="input" type="NmlId" use="required"/>
+ <xs:attribute name="destination" type="NmlId"/>
  </xs:extension>
  </xs:complexContent>
  </xs:complexType>
@@ -3338,7 +3347,7 @@
  </xs:annotation>
  <xs:complexContent>
  <xs:extension base="BaseNonNegativeIntegerId">
- <xs:attribute name="target" type="xs:string" use="required"/>
+ <xs:attribute name="target" type="Nml2PopulationReferencePath" use="required"/>
  <xs:attribute name="destination" type="NmlId" use="required"/>
  <xs:attribute name="segmentId" type="NonNegativeInteger"/>
  <xs:attribute name="fractionAlong" type="ZeroToOne"/>