vis-chronicle 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-chronicle",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Generates JSON for populating a vis.js timeline from Wikidata queries.",
   "keywords": [
     "wikidata",

package/src/fetch.js

@@ -131,7 +131,7 @@ entryPoint()
 	{
 		if (item.id)
 		{
-			if (itemIds.has(item.id))
+			if (!itemIds.has(item.id))
 			{
 				itemIds.add(item.id)
 			}

package/src/relativeDates.js

@@ -1,6 +1,7 @@
 
 const moment = require('moment')
 const { toJewishDate, toGregorianDate, getIndexByJewishMonth } = require("jewish-date");
+const wikidata = require('./wikidata');
 
 function momentToHDate(inMoment)
 {
@@ -26,23 +27,19 @@ function durationToWikidataPrecision(duration)
 // Flattens a relative date string into a hard date string
 module.exports = function flattenRelativeDate(wikidataCache, dateString)
 {
+	if (dateString == '') return null
+
 	// parse out relative date components
-	const relSplit = []
-	const relExp = /[\+>][A-Za-z0-9\-]+/g
-	var lastSep = 0
-	while (true)
+	var relSplit
+	var match = dateString.match(wikidata.pathQueryRegex)
+	if (match)
 	{
-		var match = relExp.exec(dateString)
-		if (match)
-		{
-			relSplit.push(dateString.substring(lastSep, match.index))
-		}
-		else
-		{
-			relSplit.push(dateString.substring(lastSep))
-			break
-		}
-		lastSep = match.index
+		relSplit = match.slice(1)
+	}
+	else
+	{
+		console.error(`Failed to parse relative date '${dateString}'.`)
+		return null
 	}
 
 	if (!relSplit[0])
@@ -70,7 +67,12 @@ module.exports = function flattenRelativeDate(wikidataCache, dateString)
 			for (var i = 1; i < relSplit.length; i++)
 			{
 				const component = relSplit[i]
-				if (component[0] == "+")
+				if (!component)
+				{
+					// empty group from regex
+					continue
+				}
+				else if (component[0] == "+")
 				{
 					const momentDelta = moment.duration(component.substring(1))
 					momentDate = momentDate.add(momentDelta)

package/src/render.js

@@ -35,6 +35,18 @@ function momentSafeMax(a, b)
 	return a ? (b ? moment.max(a, b) : a) : b
 }
 
+// Copies properties that should be untouched by the renderer from 'from' to 'to'
+function copyItemUntouchedProps(from, to)
+{
+	to.align = from.align
+	to.selectable = from.selectable
+	to.style = from.style
+	to.title = from.title
+	to.limitSize = from.limitSize
+	to.editable = from.editable
+	to.wikidata = from.entity
+}
+
 const renderer = {}
 
 renderer.getExpectation = function(item)
@@ -197,9 +209,9 @@ renderer.produceOutput = function(inputSpec, items)
 			content: item.label,
 			className: item.className,
 			comment: item.comment,
-			type: item.type,
-			wikidata: item.entity
+			type: item.type
 		}
+		copyItemUntouchedProps(item, outputItem)
 		if (item.group)
 		{
 			outputItem.group = item.group
@@ -287,9 +299,9 @@ renderer.produceOutput = function(inputSpec, items)
 					start: uncertainMin,
 					end: item.end_max,
 					group: item.group,
-					subgroup: outputItem.subgroup,
-					wikidata: item.entity
+					subgroup: outputItem.subgroup
 				}
+				copyItemUntouchedProps(item, uncertainElement)
 				outputObject.items.push(uncertainElement)
 
 				if (permitBgOverlay)
@@ -344,9 +356,9 @@ renderer.produceOutput = function(inputSpec, items)
 				start: outputItem.end,
 				end: tailEnd,
 				group: item.group,
-				subgroup: outputItem.subgroup,
-				wikidata: item.entity
+				subgroup: outputItem.subgroup
 			})
+			copyItemUntouchedProps(item, outputObject)
 
 			outputItem.className = [ outputItem.className, 'visc-right-connection' ].join(' ')
 		}
@@ -367,9 +379,9 @@ renderer.produceOutput = function(inputSpec, items)
 					start: outputItem.end,
 					end: tailEnd,
 					group: item.group,
-					subgroup: outputItem.subgroup,
-					wikidata: item.entity
+					subgroup: outputItem.subgroup
 				})
+				copyItemUntouchedProps(item, outputObject)
 
 				outputItem.className = [ outputItem.className, 'visc-right-connection' ].join(' ')
 			}
@@ -410,9 +422,9 @@ renderer.produceOutput = function(inputSpec, items)
 					start: item.start_min,
 					end: uncertainMax,
 					group: item.group,
-					subgroup: outputItem.subgroup,
-					wikidata: item.entity
+					subgroup: outputItem.subgroup
 				}
+				copyItemUntouchedProps(item, uncertainElement)
 				outputObject.items.push(uncertainElement)
 
 				if (permitBgOverlay)

package/src/wikidata.js

@@ -41,6 +41,8 @@ const wikidata = module.exports = {
 	rankNormal: "http://wikiba.se/ontology#NormalRank",
 	rankPreferred: "http://wikiba.se/ontology#PreferredRank",
 
+	pathQueryRegex: /^(Q[0-9]+(?::P[0-9]+)?(?::Q[0-9]+:P[0-9]+)?)([\+>](?:[A-Za-z]+(?:![0-9]+)?|P\-?[0-9A-Z]+)+)*$/,
+
 	initialize: function()
 	{
 		const chroniclePackage = require("../package.json")
@@ -499,21 +501,22 @@ const wikidata = module.exports = {
 		const wdQualifiers = new Set()
 		for (const query of queries)
 		{
-			if (query.startsWith("Q"))
+			const match = query.match(/^(Q[0-9]+(?::P[0-9]+)?(?::Q[0-9]+:P[0-9]+)?)([\+>](?:[A-Za-z]+(?:![0-9]+)?|P\-?[0-9A-Z]+)+)*$/)
+			if (match && match[1])
 			{
-				const relSplit = query.split(/[\+>]/) // handle relative date
-				const split = relSplit[0].split(':')
+				const root = match[1]
+				const split = root.split(':')
 				if (split.length == 1)
 				{
-					wdStandaloneIds.add(relSplit[0])
+					wdStandaloneIds.add(root)
 				}
 				else if (split.length == 2)
 				{
-					wdProperties.add(relSplit[0])
+					wdProperties.add(root)
 				}
 				else if (split.length == 4)
 				{
-					wdQualifiers.add(relSplit[0])
+					wdQualifiers.add(root)
 				}
 				else
 				{