feat(comp-ref-path): limit path to known possibilities

NeuroML · Sep 10, 2023 · 38c99fd · 38c99fd
1 parent e48b7a6
commit 38c99fd
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/Schemas/NeuroML2/NeuroML_v2.3.xsd b/Schemas/NeuroML2/NeuroML_v2.3.xsd
@@ -144,13 +144,13 @@
  <xs:pattern value="[a-zA-Z0-9_:]*"/>
  </xs:restriction>
  </xs:simpleType>
- <xs:simpleType name="Nml2ComponentPath">
+ <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="/?(((\.\./)|(\./)|(\[[0-9]*\])|([a-zA-Z0-9][a-zA-Z0-9_]*))/?)*"/>
+ <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">
@@ -1366,8 +1366,8 @@
  <xs:extension base="BaseVoltageDepSynapse">
  <xs:attribute name="synapse1" type="NmlId" use="required"/>
  <xs:attribute name="synapse2" type="NmlId" use="required"/>
- <xs:attribute name="synapse1Path" type="Nml2ComponentPath" use="required"/>
- <xs:attribute name="synapse2Path" type="Nml2ComponentPath" use="required"/>
+ <xs:attribute name="synapse1Path" type="xs:string" use="required"/>
+ <xs:attribute name="synapse2Path" type="xs:string" use="required"/>
  </xs:extension>
  </xs:complexContent>
  </xs:complexType>
@@ -2778,7 +2778,7 @@
  <xs:element name="spike" type="Spike" minOccurs="0" maxOccurs="unbounded"/>
  </xs:sequence>
  <xs:attribute name="synapse" type="NmlId" use="required"/>
- <xs:attribute name="spikeTarget" type="Nml2ComponentPath" use="required"/>
+ <xs:attribute name="spikeTarget" type="xs:string" use="required"/>
  </xs:extension>
  </xs:complexContent>
  </xs:complexType>
@@ -2860,7 +2860,7 @@
  <xs:extension base="Standalone">
  <xs:attribute name="averageRate" type="Nml2Quantity_pertime" use="required"/>
  <xs:attribute name="synapse" type="xs:string" use="required"/>
- <xs:attribute name="spikeTarget" type="Nml2ComponentPath" use="required"/>
+ <xs:attribute name="spikeTarget" type="xs:string" use="required"/>
  </xs:extension>
  </xs:complexContent>
  </xs:complexType>
@@ -2883,7 +2883,7 @@
  <xs:attribute name="delay" type="Nml2Quantity_time" use="required"/>
  <xs:attribute name="duration" type="Nml2Quantity_time" use="required"/>
  <xs:attribute name="synapse" type="xs:string" use="required"/>
- <xs:attribute name="spikeTarget" type="Nml2ComponentPath" use="required"/>
+ <xs:attribute name="spikeTarget" type="xs:string" use="required"/>
  </xs:extension>
  </xs:complexContent>
  </xs:complexType>
@@ -3106,8 +3106,8 @@
  <xs:complexContent>
  <xs:extension base="BaseWithoutId">
  <xs:attribute name="neuroLexId" type="NeuroLexId" use="optional"/>
- <xs:attribute name="from" type="Nml2ComponentPath" use="required"/>
- <xs:attribute name="to" type="Nml2ComponentPath" 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>
@@ -3157,10 +3157,10 @@
  </xs:annotation>
  <xs:complexContent>
  <xs:extension base="BaseConnection">
- <xs:attribute name="preCellId" type="Nml2ComponentPath" 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="Nml2ComponentPath" 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>
@@ -3173,10 +3173,10 @@
  </xs:annotation>
  <xs:complexContent>
  <xs:extension base="BaseConnection">
- <xs:attribute name="preCell" type="Nml2ComponentPath" use="required"/>
+ <xs:attribute name="preCell" type="xs:string" use="required"/>
  <xs:attribute name="preSegment" type="NonNegativeInteger" default="0"/>
  <xs:attribute name="preFractionAlong" type="ZeroToOne" default="0.5"/>
- <xs:attribute name="postCell" type="Nml2ComponentPath" use="required"/>
+ <xs:attribute name="postCell" type="xs:string" use="required"/>
  <xs:attribute name="postSegment" type="NonNegativeInteger" default="0"/>
  <xs:attribute name="postFractionAlong" type="ZeroToOne" default="0.5"/>
  </xs:extension>
@@ -3318,9 +3318,9 @@
  </xs:annotation>
  <xs:complexContent>
  <xs:extension base="BaseWithoutId">
- <xs:attribute name="target" type="Nml2ComponentPath" use="required"/>
- <xs:attribute name="input" type="Nml2ComponentPath" use="required"/>
- <xs:attribute name="destination" type="Nml2ComponentPath"/>
+ <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>
@@ -3347,7 +3347,7 @@
  </xs:annotation>
  <xs:complexContent>
  <xs:extension base="BaseNonNegativeIntegerId">
- <xs:attribute name="target" type="Nml2ComponentPath" 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"/>