@antora/content-classifier 3.2.0-rc.1 → 3.2.0-rc.2

package/lib/content-catalog.js

@@ -143,11 +143,11 @@ class ContentCatalog {
     return componentVersion
   }
 
-  addFile (file) {
+  addFile (file, create = true) {
     const src = file.src
     const family = src.family
     let filesForFamily
-    if ((filesForFamily = this[$files].get(family)) == null) this[$files].set(family, (filesForFamily = new Map()))
+    if (!(filesForFamily = this[$files].get(family))) this[$files].set(family, (filesForFamily = new Map()))
     const key = generateKey(src)
     if (filesForFamily.has(key)) {
       if (family === 'alias') {
@@ -161,8 +161,7 @@ class ContentCatalog {
       }
       throw new Error(`Duplicate ${family}: ${generateResourceSpec(src)}${LOG_WRAP}${details}`)
     }
-    if (!(file.created && File.isVinyl(file))) file = this.createFile(file)
-    filesForFamily.set(key, file)
+    filesForFamily.set(key, create ? (file = this.createFile(file)) : file)
     return file
   }
 
@@ -170,10 +169,10 @@ class ContentCatalog {
     const src = file.src
     let { componentVersion, family } = src
     if (componentVersion) delete src.componentVersion
-    // NOTE: assume that if the file is not a vinyl object, the src likely needs to be prepared
+    // NOTE: assume that if the file is not a vinyl object, the src likely needs to be inflated
     // a vinyl object is one indication the file was created and prepared by the content aggregator
-    // an alternate approach would be to call inflateSrc if the path property is not set
     if (!File.isVinyl(file)) {
+      if (typeof file.contents === 'string') file.contents = Buffer.from(file.contents)
       inflateSrc(src)
       file = new File(file)
     }
@@ -228,8 +227,7 @@ class ContentCatalog {
 
   removeFile (file) {
     const src = file.src
-    const filesForFamily = this[$files].get(src.family)
-    return filesForFamily ? filesForFamily.delete(generateKey(src)) : false
+    return this[$files].get(src.family)?.delete(generateKey(src)) || false
   }
 
   findBy (criteria) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-classifier",
-  "version": "3.2.0-rc.1",
+  "version": "3.2.0-rc.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)",
@@ -31,8 +31,8 @@
     "#constants": "./lib/constants.js"
   },
   "dependencies": {
-    "@antora/asciidoc-loader": "3.2.0-rc.1",
-    "@antora/logger": "3.2.0-rc.1",
+    "@antora/asciidoc-loader": "3.2.0-rc.2",
+    "@antora/logger": "3.2.0-rc.2",
     "mime-types": "~3.0",
     "vinyl": "~3.0"
   },