@contrast/assess 1.9.0 → 1.10.0

package/lib/dataflow/tag-utils.js

@@ -44,7 +44,7 @@ function atomicAppend(firstTagRanges, secondTagRanges, offset) {
 
 function atomicSubset(tags, subsetStart, len) {
   const ret = [];
-  const subsetStop = subsetStart + len;
+  const subsetStop = subsetStart + len - 1;
 
   for (let idx = 0; idx < tags.length - 1; idx += 2) {
     const tagStart = tags[idx];
@@ -119,6 +119,42 @@ function atomicMerge(firstTagRanges, secondTagRanges) {
   return finalMergedRanges;
 }
 
+function atomicExclude(tags, exclusionRange) {
+  const ret = [];
+  const [exclusionStart, exclusionStop] = exclusionRange;
+
+  for (let idx = 0; idx < tags.length - 1; idx += 2) {
+    const tagStart = tags[idx];
+    const tagStop = tags[idx + 1];
+
+    if (tagStop < exclusionStart) {
+      ret.push(tagStart, tagStop);
+      // exlusion is below - continue to check next range
+      continue;
+    }
+
+    if (tagStart > exclusionStop) {
+      ret.push(...tags.slice(idx));
+      // all other ranges are above exclusion so we can stop
+      break;
+    }
+
+    if (exclusionStart <= tagStart && exclusionStop < tagStop) {
+      ret.push(exclusionStop + 1, tagStop);
+    }
+
+    if (exclusionStart > tagStart) {
+      ret.push(tagStart, exclusionStart - 1);
+
+      if (exclusionStop < tagStop) {
+        ret.push(exclusionStop + 1, tagStop);
+      }
+    }
+  }
+
+  return ret;
+}
+
 function createAppendTags(firstTags, secondTags, offset) {
   const ret = Object.create(null);
   const firstTagsObject = ensureObject(firstTags);
@@ -204,10 +240,43 @@ function createMergedTags(firstTags, secondTags) {
   return Object.keys(ret).length ? ret : null;
 }
 
+function createTagsWithExclusion(tags, exclusionRange) {
+  if (!exclusionRange.length) return;
+
+  const ret = Object.create(null);
+  const tagsObject = ensureObject(tags);
+
+  for (const tagName of Object.keys(tagsObject)) {
+    const newTagRanges = atomicExclude(ensureTagsImmutable(tagsObject, tagName), exclusionRange);
+
+    newTagRanges.length && (ret[tagName] = newTagRanges);
+  }
+
+  return Object.keys(ret).length ? ret : null;
+}
+
+function createAdjustedQueryTags(path, tags, value, argString) {
+  let idx = -1;
+  for (const str of [...path, value]) {
+    // This is the case where the argument is an array
+    if (str === 0) continue;
+
+    idx = argString.indexOf(str, idx);
+    if (idx == -1) {
+      idx = -1;
+      break;
+    }
+  }
+
+  return idx > 0 ? createAppendTags([], tags, idx) : [...tags];
+}
+
 module.exports = {
   createSubsetTags,
   createAppendTags,
   createFullLengthCopyTags,
   createMergedTags,
+  createTagsWithExclusion,
+  createAdjustedQueryTags,
   createOverlappingTags
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/assess",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   "dependencies": {
     "@contrast/distringuish": "^4.1.0",
     "@contrast/scopes": "1.4.0",
-    "@contrast/common": "1.12.0",
+    "@contrast/common": "1.13.0",
     "parseurl": "^1.3.3"
   }
 }