vis-chronicle 1.2.3 → 1.2.4

package/package.json

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

package/src/relativeDates.js

@@ -56,6 +56,23 @@ module.exports = function flattenRelativeDate(wikidataCache, dateString)
 		const cacheEntry = wikidataCache[relSplit[0]]
 		if (relSplit.length > 1)
 		{
+			// break up operators
+			const dateOperators = []
+			var opStartIndex = 0
+			const operatorString = relSplit[1]
+			if (operatorString.length > 0)
+			{
+				for (var i = 1; i < operatorString.length; i++)
+				{
+					if (operatorString[i] == '+' || operatorString[i] == '>')
+					{
+						dateOperators.push(operatorString.substring(opStartIndex, i))
+						opStartIndex = i
+					}
+				}
+				dateOperators.push(operatorString.substring(opStartIndex, i))
+			}
+
 			// handle relative segments of date
 			// About precision:
 			// - The actual value is assumed to lie in a range the size of the precision
@@ -64,9 +81,8 @@ module.exports = function flattenRelativeDate(wikidataCache, dateString)
 			var momentDate = moment(cacheEntry.value, 'YYYYYY-MM-DDThh:mm:ss')
 			var precision = cacheEntry.precision
 			//console.log(momentDate)
-			for (var i = 1; i < relSplit.length; i++)
+			for (const component of dateOperators)
 			{
-				const component = relSplit[i]
 				if (!component)
 				{
 					// empty group from regex

package/src/wikidata.js

@@ -41,7 +41,7 @@ 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]+)+)*$/,
+	pathQueryRegex: /^(Q[0-9]+(?::P[0-9]+)?(?::Q[0-9]+:P[0-9]+)?)((?:[\+>](?:[A-Za-z]+(?:![0-9]+)?|P\-?[0-9A-Z]+)+)*)$/,
 
 	initialize: function()
 	{