Better separate strategies from converter.

digitalbazaar · Aug 13, 2024 · 500105f · 500105f
1 parent c8d6cb0
commit 500105f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/lib/Compressor.js b/lib/Compressor.js
@@ -52,11 +52,10 @@ export class Compressor {
     return activeCtx;
   }
 
-  convertValue({termType, value, termInfo}) {
+  convertValue({termType, value, termInfo, converter}) {
     if(typeof value === 'object') {
       return;
     }
-    const {converter} = this;
     return ValueEncoder.createEncoder({value, converter, termInfo, termType});
   }
 

diff --git a/lib/Converter.js b/lib/Converter.js
@@ -31,12 +31,9 @@ export class Converter {
     this.contextLoader = contextLoader;
     this.initialActiveCtx = new ActiveContext({contextLoader});
 
-    // FIXME: expose differently
+    // FIXME: consider moving to strategies for better separation of concerns
     this.typeTableEncodedAsBytesSet = legacy ?
       LEGACY_TYPE_TABLE_ENCODED_AS_BYTES : TYPE_TABLE_ENCODED_AS_BYTES;
-
-    // FIXME: eliminate cyclical reference
-    strategy.converter = this;
   }
 
   /**
@@ -137,7 +134,9 @@ export class Converter {
     activeCtx = await strategy.convertContexts({activeCtx, input, output});
 
     // get unique `@type` (and alias) values for the input
-    const objectTypes = strategy.getObjectTypes({activeCtx, input, output});
+    const objectTypes = strategy.getObjectTypes({
+      activeCtx, input, output, converter: this
+    });
 
     // apply type-scoped contexts
     activeCtx = await activeCtx.applyTypeScopedContexts({objectTypes});
@@ -173,7 +172,9 @@ export class Converter {
       return null;
     }
     // convert value via strategy if possible
-    let output = this.strategy.convertValue({termType, value, termInfo});
+    let output = this.strategy.convertValue({
+      termType, value, termInfo, converter: this
+    });
     if(output !== undefined) {
       return output;
     }

diff --git a/lib/Decompressor.js b/lib/Decompressor.js
@@ -73,11 +73,10 @@ export class Decompressor {
     return activeCtx.applyEmbeddedContexts({obj: output});
   }
 
-  convertValue({termType, value, termInfo}) {
+  convertValue({termType, value, termInfo, converter}) {
     if(value instanceof Map) {
       return;
     }
-    const {converter} = this;
     const decoder = ValueDecoder.createDecoder({
       value, converter, termInfo, termType
     });
@@ -103,10 +102,9 @@ export class Decompressor {
     return entries.sort(_sortEntriesByTerm);
   }
 
-  getObjectTypes({activeCtx, input}) {
+  getObjectTypes({activeCtx, input, converter}) {
     const objectTypes = new Set();
     // must decode object types to get their original values
-    const {converter} = this;
     const typeTerms = activeCtx.getTypeTerms();
     for(const typeTerm of typeTerms) {
       // check for encoded singular and plural term IDs