Merge remote-tracking branch 'origin/main' into 1.35-releases

Author: Anemy

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **compass**.
-This document was automatically generated on Tue Dec 20 2022.
+This document was automatically generated on Tue Jan 03 2023.
 
 ## List of dependencies
 

package-lock.json

@@ -41,10 +41,16 @@ Output a compiled string given input and output languages.
 - __codeString:__ The code string you would like to be compiled to your
   selected output language.
 
-### importsString = transpiler\[inputLang\]\[outputLang\].getImports()
+### importsString = transpiler\[inputLang\]\[outputLang\].getImports(mode, driverSyntax)
 Output a string containing the set of import statements for the generated code
 to compile. These are all the packages that the compiled code could use so that
 the transpiler output will be runnable.
+- __inputLang:__ Input language of the code string. `shell` and `javascript`
+  are currently supported.
+- __outputLang:__ The language you would like the output to be. `java`,
+  `python`, `shell`, `javascript`, and `csharp` are currently supported.
+- __mode:__ Either 'Query' for the `.find()` method or 'Pipeline' for `.aggregate()`.
+- __driverSyntax:__ Whether or not you want to include Driver Syntax into your output string.
 
 ### catch (error)
 Any transpiler errors that occur will be thrown. To catch them, wrap the

packages/bson-transpilers/README.md

@@ -87,11 +87,11 @@ module.exports = (ANTLRVisitor) => class CodeGenerationVisitor extends ANTLRVisi
    * PUBLIC: As code is generated, any classes that require imports are tracked
    * in this.Imports. Each class has a "code" defined in the symbol table.
    * The imports are then generated based on the output language templates.
-   *
+   * @param {String} mode
    * @param {Boolean} driverSyntax (optional)
-   *  @return {String} - The list of imports in the target language.
+   * @return {String} - The list of imports in the target language.
    */
-  getImports(driverSyntax) {
+  getImports(mode, driverSyntax) {
     const importTemplate = this.Imports.import.template ?
       this.Imports.import.template :
       (s) => (
@@ -107,18 +107,16 @@ module.exports = (ANTLRVisitor) => class CodeGenerationVisitor extends ANTLRVisi
         }
       });
     this.requiredImports.driver = !!driverSyntax;
-    const imports = Object.keys(this.requiredImports)
-      .filter((code) => {
-        return (
-          this.requiredImports[code] &&
-          this.Imports[code] &&
-          this.Imports[code].template
-        );
-      })
-      .reduce((obj, c) => {
-        obj[c] = this.Imports[c].template(this.requiredImports[c]);
-        return obj;
-      }, {});
+    const imports = {};
+    for (const code of Object.keys(this.requiredImports)) {
+      if (
+        this.requiredImports[code] &&
+        this.Imports[code] &&
+        this.Imports[code].template
+      ) {
+        imports[code] = this.Imports[code].template(this.requiredImports[code], mode);
+      }
+    }
     return importTemplate(imports);
   }
 

packages/bson-transpilers/codegeneration/CodeGenerationVisitor.js

@@ -184,8 +184,8 @@ const getTranspiler = (loadTree, visitor, generator, symbols) => {
       return transpiler.Syntax.driver.bind(transpiler.getState())(result);
     },
     compile: compile,
-    getImports: (driverSyntax) => {
-      return transpiler.getImports(driverSyntax);
+    getImports: (mode, driverSyntax) => {
+      return transpiler.getImports(mode, driverSyntax);
     }
   };
 };