@antora/content-classifier 3.0.0-alpha.9 → 3.0.0-beta.1

package/README.md

@@ -3,7 +3,7 @@
 The Content Classifier is a component in Antora responsible for organizing aggregated content into a virtual file catalog for use in an Antora documentation pipeline.
 
 [Antora](https://antora.org) is a modular static site generator designed for creating documentation sites from AsciiDoc documents.
-Its site generator pipeline aggregates documents from versioned content repositories and processes them using [Asciidoctor](https://asciidoctor.org).
+Its site generator aggregates documents from versioned content repositories and processes them using [Asciidoctor](https://asciidoctor.org).
 
 ## Copyright and License
 

package/lib/content-catalog.js

@@ -169,11 +169,11 @@ class ContentCatalog {
       ('/' + src.relative).indexOf('/_') < 0
     ) {
       publishable = true
-      versionSegment = computeVersionSegment.bind(this)(src.component, src.version)
+      versionSegment = computeVersionSegment.call(this, src.component, src.version)
       file.out = computeOut(src, family, versionSegment, this.htmlUrlExtensionStyle)
     }
     if (!file.pub && (publishable || family === 'nav')) {
-      if (versionSegment == null) versionSegment = computeVersionSegment.bind(this)(src.component, src.version)
+      if (versionSegment == null) versionSegment = computeVersionSegment.call(this, src.component, src.version)
       file.pub = computePub(src, file.out, family, versionSegment, this.htmlUrlExtensionStyle)
     }
     filesForFamily.set(key, file)
@@ -289,7 +289,7 @@ class ContentCatalog {
       componentVersion.url = startPage.pub.url
     } else {
       // QUESTION: should we warn if the default start page cannot be found?
-      const versionSegment = computeVersionSegment.bind(this)(name, version)
+      const versionSegment = computeVersionSegment.call(this, name, version)
       componentVersion.url = computePub(
         (startPageSrc = prepareSrc(Object.assign({}, indexPageId, { family: 'page' }))),
         computeOut(startPageSrc, startPageSrc.family, versionSegment, this.htmlUrlExtensionStyle),
@@ -302,7 +302,7 @@ class ContentCatalog {
     const symbolicVersionAlias = createSymbolicVersionAlias(
       name,
       version,
-      computeVersionSegment.bind(this)(name, version, 'alias'),
+      computeVersionSegment.call(this, name, version, 'alias'),
       this.latestVersionUrlSegmentStrategy
     )
     if (symbolicVersionAlias) this.addFile(symbolicVersionAlias)

package/lib/util/parse-resource-id.js

@@ -56,9 +56,16 @@ function parseResourceId (spec, ctx = {}, defaultFamily = 'page', permittedFamil
   }
 
   if (~relative.indexOf('/')) {
-    relative = relative
-      .split('/')
-      .filter((it) => it && it !== '.' && it !== '..')
+    const relativeSegments = relative.split('/')
+    let from
+    if (relativeSegments[0] === '.' && (from = ctx.relative)) {
+      relativeSegments[0] = from.substr(0, (from.lastIndexOf('/') + 1 || 1) - 1)
+    }
+    relative = relativeSegments
+      .reduce((accum, segment) => {
+        segment === '..' ? accum.pop() : (segment || '.') !== '.' && accum.push(segment)
+        return accum
+      }, [])
       .join('/')
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-classifier",
-  "version": "3.0.0-alpha.9",
+  "version": "3.0.0-beta.1",
   "description": "Organizes aggregated content into a virtual file catalog for use in an Antora documentation pipeline.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -16,12 +16,12 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@antora/logger": "3.0.0-alpha.9",
+    "@antora/logger": "3.0.0-beta.1",
     "mime-types": "~2.1",
     "vinyl": "~2.2"
   },
   "engines": {
-    "node": ">=10.17.0"
+    "node": ">=12.21.0"
   },
   "files": [
     "lib/"
@@ -34,5 +34,5 @@
     "static site",
     "web publishing"
   ],
-  "gitHead": "a504d6889819b548e8a5416a7194cbb6f9a93e93"
+  "gitHead": "7c5ef1ea93dd489af533c80a936c736013c41769"
 }