vis-chronicle 0.0.2 → 0.0.3

package/README.md

@@ -2,7 +2,23 @@
 
 vis-chronicle is a tool to generate web-based timelines from Wikidata SPARQL queries. You feed the tool a specification JSON file that describes what items to put on the timeline. The tool gathers the needed data from Wikidata and produces a JSON file suitable for feeding directly to [vis-timeline](https://github.com/visjs/vis-timeline).
 
-[vis-chronicle-demo](https://github.com/BrianMacIntosh/vis-chronicle-demo) is a demo application using this tool.
+[vis-chronicle-demo](https://github.com/BrianMacIntosh/vis-chronicle-demo) is a demo application using this tool. View the output at https://brianmacintosh.github.io/vis-chronicle-demo/.
+
+## Installation
+
+`npm install vis-chronicle --save-dev`
+
+## Execution
+
+The tool can be run as a package script like `vis-chronicle ./src/timeline.json -v`.
+
+The tool takes these parameters on the command line:
+* (Mandatory) The name of the input file or directory. If a directory, all JSON files in the directory will be combined together.
+* (Optional) The name of the output file. Defaults to `intermediate/timeline.json`.
+* `-v[erbose]`: Print verbose output, including the actual queries being run.
+* `-skip-wd-cache`: Do not read anything from the local cache, query all data fresh.
+* `-q[uery-url]`: The URL of the SPARQL endpoint. Defaults to `https://query.wikidata.org/sparql`.
+* `-l[ang]`: Language priorities to use when fetching labels. Defaults to `en,mul`. See [SPARQL/SERVICE - Label](https://en.wikibooks.org/wiki/SPARQL/SERVICE_-_Label).
 
 ## Example
 
@@ -82,14 +98,7 @@ Item properties:
 	* `max`: The absolute maximum duration.
 	* `avg`: The average duration.
 
-## Parameters
-
-The tool can be run as a package script like `vis-chronicle ./src/timeline.json -v`.
-
-The tool takes these parameters on the command line:
-* (Mandatory) The name of the input file or directory. If a directory, all JSON files in the directory will be combined together.
-* (Optional) The name of the output file. Defaults to `intermediate/timeline.json`.
-* `-v[erbose]`: Print verbose output, including the actual queries being run.
-* `-skip-wd-cache`: Do not read anything from the local cache, query all data fresh.
-* `-q[uery-url]`: The URL of the SPARQL endpoint. Defaults to `https://query.wikidata.org/sparql`.
-* `-l[ang]`: Language priorities to use when fetching labels. Defaults to `en,mul`. See (SPARQL/SERVICE - Label)[https://en.wikibooks.org/wiki/SPARQL/SERVICE_-_Label].
+`chronicle` contains configuration for chronicle itself (not passed through to the output):
+* `defaultLabel`: Default format string to use for item labels without `label`. See `label`.
+* `maxUncertainTimePrecision`: Default `10` (month). Maximum Wikidata time precision to treat as uncertain. Cleans up tiny, artifacty uncertainty ranges.
+* `shareSuccessiveUncertainty`: Default `true`. If true, uncertain ends of successive items (related by P1365 'replaces' or P1366 'replaced by') can be truncated such that the items fit togther.

package/package.json

@@ -1,30 +1,34 @@
-{
-  "name": "vis-chronicle",
-  "version": "0.0.2",
-  "description": "Generates JSON for populating a vis.js timeline from Wikidata queries.",
-  "keywords": [
-	"wikidata", "visjs", "timeline"
-  ],
-  "homepage": "https://github.com/BrianMacIntosh/vis-chronicle",
-  "bugs": "https://github.com/BrianMacIntosh/vis-chronicle/issues",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/BrianMacIntosh/vis-chronicle.git"
-  },
-  "bin": {
-	"vis-chronicle": "src/fetch.js"
-  },
-  "scripts": {
-  },
-  "author": {
-	"name": "Brian MacIntosh",
-	"email": "brianamacintosh@gmail.com",
-	"url": "https://brianmacintosh.com"
-  },
-  "license": "ISC",
-  "dependencies": {
-  },
-  "devDependencies": {
-    "moment": "2.30.1"
-  }
-}
+{
+  "name": "vis-chronicle",
+  "version": "0.0.3",
+  "description": "Generates JSON for populating a vis.js timeline from Wikidata queries.",
+  "keywords": [
+	"wikidata", "visjs", "timeline"
+  ],
+  "homepage": "https://github.com/BrianMacIntosh/vis-chronicle",
+  "bugs": "https://github.com/BrianMacIntosh/vis-chronicle/issues",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/BrianMacIntosh/vis-chronicle.git"
+  },
+  "bin": {
+	"vis-chronicle": "src/fetch.js"
+  },
+  "exports": {
+	"./styles/style.css": "./styles/style.css",
+	".": "./src/index.js"
+  },
+  "scripts": {
+  },
+  "author": {
+	"name": "Brian MacIntosh",
+	"email": "brianamacintosh@gmail.com",
+	"url": "https://brianmacintosh.com"
+  },
+  "license": "ISC",
+  "dependencies": {
+  },
+  "devDependencies": {
+    "moment": "2.30.1"
+  }
+}

package/src/fetch.js

@@ -37,30 +37,8 @@ if (!outputFile)
 const moment = require('moment')
 const fs = require('fs');
 const wikidata = require('./wikidata.js')
+const renderer = require('./render.js')
 const mypath = require("./mypath.js")
-const globalData = require("./global-data.json")
-
-function postprocessDuration(duration)
-{
-	if (duration.min)
-		duration.min = moment.duration(duration.min)
-	if (duration.max)
-		duration.max = moment.duration(duration.max)
-	if (duration.avg)
-		duration.avg = moment.duration(duration.avg)
-	return duration
-}
-function postprocessGlobalData()
-{
-	for (const expectation of globalData.expectations)
-	{
-		if (expectation.duration)
-		{
-			postprocessDuration(expectation.duration)
-		}
-	}
-}
-postprocessGlobalData()
 
 wikidata.skipCache = values["skip-wd-cache"]
 wikidata.cacheBuster = values["cachebuster"]
@@ -69,8 +47,13 @@ wikidata.verboseLogging = values["verbose"]
 wikidata.setLang(values["lang"])
 wikidata.initialize()
 
-// produces a moment from a Wikidata time
-function wikidataToMoment(inTime)
+const wikidataToMomentPrecision = [
+	undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined,
+	'year', 'month', 'day', 'hour', 'minute', 'second'
+]
+
+// produces a range of moments {min,max} from a Wikidata time
+function wikidataToRange(inTime)
 {
 	if (!inTime || !inTime.value)
 	{
@@ -81,243 +64,62 @@ function wikidataToMoment(inTime)
 	// moment has trouble with negative years unless they're six digits
 	const date = moment.utc(inTime.value, 'YYYYYY-MM-DDThh:mm:ss')
 
-	//TODO: do something nice in the GUI to indicate imprecision of times
 	switch (inTime.precision)
 	{
-		case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9:
+		case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
 			const yearBase = Math.pow(10, 9 - inTime.precision)
-			const roundedYear = Math.round(date.year() / yearBase) * yearBase
-			return date.year(roundedYear).startOf('year')
-		case 10: // month precision
-			return date.startOf('month')
-		case 11: // day precision
-			return date.startOf('day')
-		case 12: // hour precision
-			return date.startOf('hour')
-		case 13: // minute precision
-			return date.startOf('minute')
-		case 14: // second precision
-			return date.startOf('second')
+			var roundedYear = Math.floor(date.year() / yearBase) * yearBase
+
+			// correct for lack of year 0 ("-19" is actually "-20 BC")
+			// and also for the fact that "-20 BC" is really on the positive side of e.g. -18
+			if (date.year() < 0) roundedYear += 2
+
+			return {
+				min: moment({year:roundedYear}),
+				max: moment({year:roundedYear + yearBase}).subtract(1, 'minute').endOf('year')
+			}
 		default:
-			throw `Unrecognized date precision ${inTime.precision}`
+			if (inTime.precision > wikidata.inputSpec.chronicle.maxUncertainTimePrecision)
+			{
+				const momentPrecision = wikidataToMomentPrecision[inTime.precision]
+				return { min: date.clone().startOf(momentPrecision), max: date.clone().startOf(momentPrecision) }
+			}
+			else if (inTime.precision < wikidataToMomentPrecision.length)
+			{
+				const momentPrecision = wikidataToMomentPrecision[inTime.precision]
+				return { min: date.clone().startOf(momentPrecision), max: date.clone().endOf(momentPrecision) }
+			}
+			else
+			{
+				throw `Unrecognized date precision ${inTime.precision}`
+			}
 	}
 }
 
-function getExpectation(item)
+function rangeUnionAdv(value, min, max)
 {
-	if (item.expectedDuration)
+	var aggregate = value ?? {}
+	if (min)
 	{
-		return { "duration": item.expectedDuration };
+		assert(min.min)
+		aggregate.min = aggregate.min ? moment.max(min.min, aggregate.min) : min.min
 	}
-
-	for (const expectation of globalData.expectations)
+	if (max)
 	{
-		if (expectation.startQuery && item.startQuery != expectation.startQuery)
-		{
-			continue;
-		}
-		if (expectation.endQuery && item.endQuery != expectation.endQuery)
-		{
-			continue;
-		}
-		if (expectation.startEndQuery && item.startEndQuery != expectation.startEndQuery)
-		{
-			continue;
-		}
-		return expectation;
+		assert(max.max)
+		aggregate.max = aggregate.max ? moment.min(max.max, aggregate.max) : max.max
 	}
-	assert(false) // expect at least a universal fallback expectation
-	return undefined
+	return aggregate
 }
 
-// produces JSON output from the queried data
-function produceOutput(items)
+function rangeUnion(a, b)
 {
-	const finalizeItem = function(item)
-	{
-		if (item.start)
-			item.start = item.start.format("YYYYYY-MM-DDThh:mm:ss")
-		if (item.end)
-			item.end = item.end.format("YYYYYY-MM-DDThh:mm:ss")
-		outputObject.items.push(item)
+	if (!a) return b
+	if (!b) return a
+	return {
+		min: a.min && b.min ? moment.min(a.min, b.min) : a.min || b.min,
+		max: a.max && b.max ? moment.max(a.max, b.max) : a.max || b.max
 	}
-
-	var outputObject = { items: [], groups: wikidata.inputSpec.groups, options: wikidata.inputSpec.options }
-	for (const item of items)
-	{
-		var outputItem = {
-			id: item.id,
-			content: item.label,
-			className: item.className,
-			comment: item.comment,
-			type: item.type
-		}
-		if (item.group)
-		{
-			outputItem.group = item.group
-			outputItem.subgroup = item.subgroup ? item.subgroup : item.entity
-		}
-
-		const isRangeType = !outputItem.type || outputItem.type == "range" || outputItem.type == "background"
-
-		// for debugging
-		outputItem.className = [ outputItem.className, item.entity ].join(' ')
-		
-		// look up duration expectations
-		const expectation = getExpectation(item)
-
-		assert(expectation && expectation.duration && expectation.duration.avg) // expect at least a universal fallback expectation
-
-		if (!item.start && !item.end
-			&& !item.start_min && !item.start_max
-			&& !item.end_min && !item.end_max)
-		{
-			console.warn(`Item ${item.id} has no date data at all.`)
-			continue
-		}
-		
-		outputItem.start = wikidataToMoment(item.start)
-		outputItem.end = wikidataToMoment(item.end)
-		const start_min = item.start_min ? wikidataToMoment(item.start_min) : outputItem.start
-		const start_max = item.start_max ? wikidataToMoment(item.start_max) : outputItem.start
-		const end_min = item.end_min ? wikidataToMoment(item.end_min) : outputItem.end
-		const end_max = item.end_max ? wikidataToMoment(item.end_max) : outputItem.end
-
-		// exclude items that violate itemRange constraints
-		//OPT: do this at an earlier stage? (e.g. when running the first query)
-		if (item.itemRange)
-		{
-			if (item.itemRange.min && moment(item.itemRange.min).isAfter(end_max))
-				continue
-			if (item.itemRange.max && moment(item.itemRange.max).isBefore(end_max))
-				continue
-		}
-
-		// no certainty at all
-		if (start_max >= end_min)
-		{
-			outputItem.className = [ outputItem.className, 'visc-uncertain' ].join(' ')
-			outputItem.start = start_min
-			outputItem.end = end_max
-
-			finalizeItem(outputItem)
-			continue
-		}
-
-		if (!isRangeType)
-		{
-			finalizeItem(outputItem)
-			continue
-		}
-
-		// handle end date
-		if (end_min && end_max && end_min < end_max)
-		{
-			// uncertain end
-
-			// find lower bound of uncertain region
-			var uncertainMin
-			if (item.end_min)
-				uncertainMin = end_min
-			else if (outputItem.end)
-				uncertainMin = outputItem.end
-			else
-				uncertainMin = outputItem.start //TODO: use min/max start
-			assert(uncertainMin)
-			
-			// add uncertain range
-			outputObject.items.push({
-				id: outputItem.id + "-unc-end",
-				className: [outputItem.className, "visc-uncertain", "visc-left-connection"].join(' '),
-				content: item.label ? "&nbsp;" : "",
-				start: uncertainMin.format("YYYYYY-MM-DDThh:mm:ss"),
-				end: end_max.format("YYYYYY-MM-DDThh:mm:ss"),
-				group: item.group,
-				subgroup: outputItem.subgroup
-			})
-
-			// adjust normal range to match
-			outputItem.end = uncertainMin
-			outputItem.className = [ outputItem.className, 'visc-right-connection' ].join(' ')
-		}
-		else if (!outputItem.end)
-		{
-			// open-ended end
-			const useMax = expectation.duration.max ? expectation.duration.max : moment(expectation.duration.avg.asMilliseconds() * 2)
-			if (outputItem.start.clone().add(useMax) < moment())
-			{
-				// 'max' is less than 'now'; it is likely this duration is not ongoing but has an unknown end
-				//TODO: accomodate wikidata special 'no value'
-				outputItem.end = outputItem.start.clone().add(expectation.duration.avg)
-			}
-			else
-			{
-				// 'now' is within 'max' and so it is a reasonable guess that this duration is ongoing
-				outputItem.end = moment()
-			}
-
-			const avgDuration = moment.duration(expectation.duration.avg) //HACK: TODO: consistently postprocess expectations, or don't
-			const actualDuration = moment.duration(outputItem.end.diff(outputItem.start))
-			var excessDuration = moment.duration(avgDuration.asMilliseconds()).subtract(actualDuration)
-			excessDuration = moment.duration(Math.max(excessDuration.asMilliseconds(), avgDuration.asMilliseconds() * 0.25))
-
-			// add a "tail" item after the end
-			outputObject.items.push({
-				id: outputItem.id + "-tail",
-				className: [outputItem.className, "visc-right-tail"].join(' '),
-				content: item.label ? "&nbsp;" : "",
-				start: outputItem.end.format("YYYYYY-MM-DDThh:mm:ss"),
-				end: outputItem.end.clone().add(excessDuration).format("YYYYYY-MM-DDThh:mm:ss"), //HACK: magic number
-				group: item.group,
-				subgroup: outputItem.subgroup
-			})
-
-			outputItem.className = [ outputItem.className, 'visc-right-connection' ].join(' ')
-		}
-		
-		// handle start date
-		if (start_min && start_max && start_max > start_min)
-		{
-			// uncertain start
-			
-			// find upper bound of uncertain region
-			var uncertainMax
-			if (item.start_max)
-				uncertainMax = start_max
-			else if (outputItem.start)
-				uncertainMax = outputItem.start
-			else
-				uncertainMax = outputItem.end //TODO: use min/max end
-			assert(uncertainMax)
-
-			// add uncertain range
-			outputObject.items.push({
-				id: outputItem.id + "-unc-start",
-				className: [outputItem.className, "visc-uncertain", "visc-right-connection"].join(' '),
-				content: item.label ? "&nbsp;" : "",
-				start: start_min.format("YYYYYY-MM-DDThh:mm:ss"),
-				end: uncertainMax.format("YYYYYY-MM-DDThh:mm:ss"),
-				group: item.group,
-				subgroup: outputItem.subgroup
-			})
-
-			// adjust normal range to match
-			outputItem.start = uncertainMax
-			outputItem.className = [ outputItem.className, 'visc-left-connection' ].join(' ')
-		}
-		else if (!outputItem.start)
-		{
-			// open-ended start
-			outputItem.start = outputItem.end.clone().subtract(expectation.duration.avg)
-			outputItem.className = [outputItem.className, "visc-open-left"].join(' ')
-		}
-		
-		//TODO: missing death dates inside expected duration: solid to NOW, fade after NOW
-		//TODO: accept expected durations and place uncertainly before/after those
-
-		finalizeItem(outputItem)
-	}
-	return JSON.stringify(outputObject, undefined, "\t") //TODO: configure space
 }
 
 async function entryPoint() {}
@@ -458,34 +260,91 @@ entryPoint()
 
 		const representativeItem = bundle[0]
 
-		const copyResult = function(result, func)
+		// Populates output items from a query result.
+		// Multiple values will be treated as multiple items.
+		// Also expects both start and end ranges.
+		const copyMultipleResult = function(result, func)
 		{
+			const aggregateHelper = function(item, entityResult)
+			{
+				var aggregateStart = rangeUnionAdv(
+					wikidataToRange(entityResult.start),
+					wikidataToRange(entityResult.start_min),
+					wikidataToRange(entityResult.start_max))
+				var aggregateEnd = rangeUnionAdv(
+					wikidataToRange(entityResult.end),
+					wikidataToRange(entityResult.end_min),
+					wikidataToRange(entityResult.end_max))
+
+				var aggregateResult = {
+					start_min: aggregateStart.min,
+					start_max: aggregateStart.max,
+					end_min: aggregateEnd.min,
+					end_max: aggregateEnd.max,
+					previous: entityResult.previous,
+					next: entityResult.next
+				}
+				func(item, aggregateResult)
+				item.finished = true
+			}
+
 			for (const entityId in result)
 			{
 				var entityResult = result[entityId]
+				if (!(entityResult instanceof Array)) entityResult = [ entityResult ]
 
 				// there may be multiple source items making the same query
 				for (const item of bundle)
 				{
 					if (item.entity == entityId)
 					{
-						if (entityResult instanceof Array)
+						// clone the item for each result beyond the first
+						for (var i = 1; i < entityResult.length; ++i)
 						{
-							// clone the item for each result beyond the first
-							for (var i = 1; i < entityResult.length; ++i)
-							{
-								const newItem = structuredClone(item)
-								newItem.id = `${newItem.id}-v${i}`
-								wikidata.inputSpec.items.push(newItem) //HACK: modifying original array
-								func(newItem, entityResult[i])
-								newItem.finished = true
-							}
-
-							// populate the first result into the original item
-							entityResult = entityResult[0]
+							const newItem = structuredClone(item)
+							newItem.id = `${newItem.id}-v${i}`
+
+							// clones get new subgroups so they are treated as separate objects for stacking
+							newItem.subgroup = `${item.subgroup ? item.subgroup : item.entity}-clone${i}`
+
+							wikidata.inputSpec.items.push(newItem) //HACK: modifying original array
+							aggregateHelper(newItem, entityResult[i])
 						}
-						
-						func(item, entityResult)
+
+						// populate the first result into the original item
+						aggregateHelper(item, entityResult[0])
+					}
+				}
+			}
+		}
+
+		// Populates output items from a query result.
+		// Multiple values will be treated as uncertainty.
+		const copySingleResult = function(result, func)
+		{
+			for (const entityId in result)
+			{
+				var entityResult = result[entityId]
+				if (!(entityResult instanceof Array)) entityResult = [ entityResult ]
+
+				var aggregateResult = {}
+				for (var i = 0; i < entityResult.length; ++i)
+				{
+					var selfAggregate = rangeUnionAdv(
+						wikidataToRange(entityResult[i].value),
+						wikidataToRange(entityResult[i].min),
+						wikidataToRange(entityResult[i].max))
+					aggregateResult = rangeUnion(aggregateResult, selfAggregate)
+					aggregateResult.previous = aggregateResult.previous ?? entityResult[i].previous //HACK: does not handle multiple values
+					aggregateResult.next = aggregateResult.previous ?? entityResult[i].next
+				}
+				
+				// there may be multiple source items making the same query
+				for (const item of bundle)
+				{
+					if (item.entity == entityId)
+					{
+						func(item, aggregateResult)
 						item.finished = true
 					}
 				}
@@ -495,7 +354,7 @@ entryPoint()
 		if (representativeItem.startEndQuery)
 		{
 			const result = await wikidata.runTimeQueryTerm(representativeItem.startEndQuery, bundle)
-			copyResult(result, function(item, result) {
+			copyMultipleResult(result, function(item, result) {
 				Object.assign(item, result)
 			})
 		}
@@ -504,19 +363,19 @@ entryPoint()
 			if (representativeItem.startQuery)
 			{
 				const result = await wikidata.runTimeQueryTerm(representativeItem.startQuery, bundle)
-				copyResult(result, function(item, result) {
-					item.start = result.value;
-					item.start_min = result.min;
-					item.start_max = result.max;
+				copySingleResult(result, function(item, result) {
+					item.start_min = result.min
+					item.start_max = result.max
+					item.previous = result.previous
 				})
 			}
 			if (representativeItem.endQuery)
 			{
 				const result = await wikidata.runTimeQueryTerm(representativeItem.endQuery, bundle)
-				copyResult(result, function(item, result) {
-					item.end = result.value;
-					item.end_min = result.min;
-					item.end_max = result.max;
+				copySingleResult(result, function(item, result) {
+					item.end_min = result.min
+					item.end_max = result.max
+					item.next = result.next
 				})
 			}
 		}
@@ -527,7 +386,7 @@ entryPoint()
 	await mypath.ensureDirectoryForFile(outputFile)
 
 	// write the output file
-	const output = produceOutput(wikidata.inputSpec.items)
+	const output = renderer.produceOutput(wikidata.inputSpec, wikidata.inputSpec.items)
 	await fs.writeFile(outputFile, output, err => {
 		if (err) {
 			console.error(`Error writing output file:`)

package/src/global-data.json

@@ -19,24 +19,42 @@
 			"start_max": "?_prop pqv:P8555 ?_start_max_value.",
 			"end": "?_prop pqv:P582 ?_end_value.",
 			"end_min": "?_prop pqv:P8554 ?_end_min_value.",
-			"end_max": "?_prop pqv:P12506 ?_end_max_value."
+			"end_max": "?_prop pqv:P12506 ?_end_max_value.",
+			"previous": "?_prop pq:P1365 ?_previous_value.",
+			"next": "?_prop pq:P1366 ?_next_value."
 		},
-		"positionJurisdictionHeldStartEnd": {
+		"positionHeldJurisdictionStartEnd": {
 			"general": "{entity} p:P39 ?_prop. ?_prop ps:P39 {position}; pq:P1001 {jurisdiction}.",
 			"start": "?_prop pqv:P580 ?_start_value.",
 			"start_min": "?_prop pqv:P1319 ?_start_min_value.",
 			"start_max": "?_prop pqv:P8555 ?_start_max_value.",
 			"end": "?_prop pqv:P582 ?_end_value.",
 			"end_min": "?_prop pqv:P8554 ?_end_min_value.",
-			"end_max": "?_prop pqv:P12506 ?_end_max_value."
+			"end_max": "?_prop pqv:P12506 ?_end_max_value.",
+			"previous": "?_prop pq:P1365 ?_previous_value.",
+			"next": "?_prop pq:P1366 ?_next_value."
+		},
+		"positionOrSubclassHeldJurisdictionStartEnd": {
+			"general": "{entity} p:P39 ?_prop. ?_prop ps:P39 [ wdt:P279* {position} ]; pq:P1001 {jurisdiction}.",
+			"start": "?_prop pqv:P580 ?_start_value.",
+			"start_min": "?_prop pqv:P1319 ?_start_min_value.",
+			"start_max": "?_prop pqv:P8555 ?_start_max_value.",
+			"end": "?_prop pqv:P582 ?_end_value.",
+			"end_min": "?_prop pqv:P8554 ?_end_min_value.",
+			"end_max": "?_prop pqv:P12506 ?_end_max_value.",
+			"previous": "?_prop pq:P1365 ?_previous_value.",
+			"next": "?_prop pq:P1366 ?_next_value."
 		}
 	},
 	"itemQueryTemplates":
 	{
 		"withPosition": "?_node wdt:P39 {position}.",
+		"withPositionJurisdiction": "?_node p:P39 [ ps:P39 {position}; pq:P1001 {jurisdiction} ].",
 
 		"humansWithPosition": "?_node wdt:P39 {position}. ?_node wdt:P31 wd:Q5.",
-		"humansWithPositionJurisdiction": "?_node p:P39 [ ps:P39 {position}; pq:P1001 {jurisdiction} ]. ?_node wdt:P31 wd:Q5."
+		"humansWithPositionJurisdiction": "?_node p:P39 [ ps:P39 {position}; pq:P1001 {jurisdiction} ]. ?_node wdt:P31 wd:Q5.",
+
+		"humansWithPositionOrSubclassJurisdiction": "?_node p:P39 [ ps:P39 [ wdt:P279* {position} ]; pq:P1001 {jurisdiction}]."
 	},
 	"expectations":
 	[
@@ -45,6 +63,18 @@
 			"endQuery": "#dateOfDeath",
 			"duration": { "avg": "P80Y", "max": "P150Y" }
 		},
+		{
+			"startEndQuery": "#positionHeldStartEnd",
+			"duration": { "max": "P150Y" }
+		},
+		{
+			"startEndQuery": "#positionHeldJurisdictionStartEnd",
+			"duration": { "max": "P150Y" }
+		},
+		{
+			"startEndQuery": "#positionOrSubclassHeldJurisdictionStartEnd",
+			"duration": { "max": "P150Y" }
+		},
 		{
 			"duration": { "avg": "P100Y" }
 		}

package/src/index.js

@@ -0,0 +1,7 @@
+
+module.exports = {
+
+	SparqlBuilder: require('./sparql-builder'),
+	Wikidata: require('./wikidata.js'),
+
+}