Commit 065263a

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 ac20697 commit 065263aCopy full SHA for 065263a

File tree

1 file changed

+16

-7

lines changed

jsonschema-hyperschema.xml

1 file changed

+16

-7

lines changed

`‎jsonschema-hyperschema.xml`

Lines changed: 16 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -974,13 +974,15 @@`
`974`	`974`	`<preamble>`
`975`	`975`	`This is the high-level algorithm as pseudocode. "T" comes from either`
`976`	`976`	`"href" or "anchor" within the LDO, or from "base" in a containing schema.`
`977`		`- Pseudocode for each step follows.`
	`977`	`+ Pseudocode for each step follows. "anchorOrHref" indicates which of the`
	`978`	`+ two started the process (since "base" is always resolved in order to finish`
	`979`	`+ resolving one or the other of those keywords).`
`978`	`980`	`</preamble>`
`979`	`981`	`<artwork>`
`980`	`982`	`<![CDATA[`
`981`	`983`	`templateData = populateDataFromInstance(T, ldo, instance)`
`982`	`984`
`983`		`-if resolving "href" or "base" for "href" and ldo.hrefSchema exists:`
	`985`	`+if anchorOrHref == "href" and ldo.hrefSchema exists:`
`984`	`986`	`inputData = acceptInput(ldo, instance, templateData)`
`985`	`987`	`for varname in inputData:`
`986`	`988`	`templateData[varname] = inputData[varname]`
`@@ -997,13 +999,20 @@ R = rfc6570ResolutionAlgorithm(T, templateData)`
`997`	`999`
`998`	`1000`	`<section title="Populating template data from the instance">`
`999`	`1001`	`<t>`
`1000`		`- This step looks at various data sources in the instance:`
	`1002`	`+ This step looks at various locations in the instance for variable values.`
	`1003`	`+ For each variable:`
`1001`	`1004`	`<list style="numbers">`
`1002`		`- <t>Use "templatePointers" to find values where appropriate</t>`
`1003`		`- <t>Look in the immediate instance for remaining values</t>`
`1004`	`1005`	`<t>`
`1005`		`- Either way, if there is a value there, put it in the`
`1006`		`- template resolution data set`
	`1006`	`+ Use "templatePointers" to find a value if the variable`
	`1007`	`+ appears in that keyword's value`
	`1008`	`+ </t>`
	`1009`	`+ <t>`
	`1010`	`+ Otherwise, look for a property names matching the variable in`
	`1011`	`+ the instance location to which the link is attached`
	`1012`	`+ </t>`
	`1013`	`+ <t>`
	`1014`	`+ In either case, if there is a value at the location, put it in`
	`1015`	`+ the template resolution data set`
`1007`	`1016`	`</t>`
`1008`	`1017`	`</list>`
`1009`	`1018`	`</t>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 065263a

File tree

1 file changed

1 file changed

`‎jsonschema-hyperschema.xml`

0 commit comments