@antora/content-classifier 3.1.0 → 3.1.2

package/lib/classify-content.js

@@ -21,10 +21,9 @@ function classifyContent (playbook, aggregate, siteAsciiDocConfig = {}) {
   const contentCatalog = new ContentCatalog(playbook)
   aggregate
     .reduce((accum, componentVersionData) => {
-      const { name, version } = componentVersionData
-      // drop startPage to defer registration of start page
       // drop files since they aren't needed to register component version
-      const { files, startPage, ...descriptor } = Object.assign({}, componentVersionData, {
+      // drop startPage to defer registration of start page
+      const { name, version, files, startPage, ...descriptor } = Object.assign({}, componentVersionData, {
         asciidoc: resolveAsciiDocConfig(siteAsciiDocConfig, componentVersionData),
       })
       return new Map(accum).set(

package/lib/content-catalog.js

@@ -54,6 +54,8 @@ class ContentCatalog {
    * component version. A true value is a special case to tell this method to register the default start page and is
    * intended for testing.
    * @param {String} [descriptor.title=name] - The title for this component version.
+   *
+   * @returns {Object} The constructed component version object.
    */
   registerComponentVersion (name, version, descriptor = {}) {
     const { asciidoc, displayVersion, prerelease, startPage: startPageSpec, title } = descriptor
@@ -333,9 +335,11 @@ class ContentCatalog {
     const rel = this.resolvePage(startPageSpec)
     if (rel) {
       if (this.getById(ROOT_INDEX_PAGE_ID)) return
-      const indexAlias = this.getById(ROOT_INDEX_ALIAS_ID)
-      if (indexAlias) return indexAlias.synthetic ? Object.assign(indexAlias, { rel }) : undefined
-      return this.addFile({ src: Object.assign({}, ROOT_INDEX_ALIAS_ID), rel, synthetic: true })
+      const rootIndexAlias = this.getById(ROOT_INDEX_ALIAS_ID)
+      if (rootIndexAlias) return rootIndexAlias.synthetic ? Object.assign(rootIndexAlias, { rel }) : undefined
+      if (rel.pub.url === (this.htmlUrlExtensionStyle === 'default' ? '/index.html' : '/')) return
+      const src = Object.assign({}, ROOT_INDEX_ALIAS_ID)
+      return this.addFile({ src, rel, synthetic: true }, { version: src.version })
     } else if (rel === false) {
       logger.warn('Start page specified for site has invalid syntax: %s', startPageSpec)
     } else if (startPageSpec.lastIndexOf(':') > startPageSpec.indexOf(':')) {
@@ -400,7 +404,7 @@ class ContentCatalog {
    * @param {ContentCatalog} catalog - The content catalog in which to resolve the page file.
    * @param {Object} [ctx={}] - The context to use to qualified the contextual page ID.
    *
-   * @return {File} The virtual file to which the contextual page ID spec refers, or undefined if the
+   * @returns {File} The virtual file to which the contextual page ID spec refers, or undefined if the
    * file cannot be resolved.
    */
   resolvePage (spec, context = {}) {

package/lib/util/resolve-resource.js

@@ -21,7 +21,7 @@ const parseResourceId = require('./parse-resource-id')
  *   The value "page" is used if not specified. This value is always used instead of family value provided by the ctx.
  * @param {Array<String>} [permittedFamilies=undefined] - An optional array of family names to allow.
  *
- * @return {File} The virtual file to which the contextual resource ID spec refers, undefined if
+ * @returns {File} The virtual file to which the contextual resource ID spec refers, undefined if
  * the file cannot be resolved, or false if the resource ID spec is invalid.
  */
 function resolveResource (spec, catalog, ctx = {}, defaultFamily = undefined, permittedFamilies = undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-classifier",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "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)",
@@ -27,8 +27,8 @@
     "#constants": "./lib/constants.js"
   },
   "dependencies": {
-    "@antora/asciidoc-loader": "3.1.0",
-    "@antora/logger": "3.1.0",
+    "@antora/asciidoc-loader": "3.1.2",
+    "@antora/logger": "3.1.2",
     "mime-types": "~2.1",
     "vinyl": "~2.2"
   },