Skip to content

Commit a5e10ee

Browse files
committed
Wording improvements from PR review
Define the condition for usin hrefSchema more clearly (I hope). Use consistent language around "locations" in a schema rather than introduce a new term "data sources" which is not defined. Attempt a better explanation of how to find values in the instance. I'm not entirely sure it's successful but at least it's different.
1 parent 29afd33 commit a5e10ee

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

jsonschema-hyperschema.xml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,13 +1441,15 @@ GET /foo/
14411441
<preamble>
14421442
This is the high-level algorithm as pseudocode. "T" comes from either
14431443
"href" or "anchor" within the LDO, or from "base" in a containing schema.
1444-
Pseudocode for each step follows.
1444+
Pseudocode for each step follows. "anchorOrHref" indicates which of the
1445+
two started the process (since "base" is always resolved in order to finish
1446+
resolving one or the other of those keywords).
14451447
</preamble>
14461448
<artwork>
14471449
<![CDATA[
14481450
templateData = populateDataFromInstance(T, ldo, instance)
14491451
1450-
if resolving "href" or "base" for "href" and ldo.hrefSchema exists:
1452+
if anchorOrHref == "href" and ldo.hrefSchema exists:
14511453
inputData = acceptInput(ldo, instance, templateData)
14521454
for varname in inputData:
14531455
templateData[varname] = inputData[varname]
@@ -1464,13 +1466,20 @@ R = rfc6570ResolutionAlgorithm(T, templateData)
14641466

14651467
<section title="Populating template data from the instance">
14661468
<t>
1467-
This step looks at various data sources in the instance:
1469+
This step looks at various locations in the instance for variable values.
1470+
For each variable:
14681471
<list>
1469-
<t>Use "templatePointers" to find values where appropriate</t>
1470-
<t>Look in the immediate instance for remaining values</t>
14711472
<t>
1472-
Either way, if there is a value there, put it in the
1473-
template resolution data set
1473+
Use "templatePointers" to find a value if the variable
1474+
appears in that keyword's value
1475+
</t>
1476+
<t>
1477+
Otherwise, look for a property names matching the variable in
1478+
the instance location to which the link is attached
1479+
</t>
1480+
<t>
1481+
In either case, if there is a value at the location, put it in
1482+
the template resolution data set
14741483
</t>
14751484
</list>
14761485
</t>

0 commit comments

Comments
 (0)