indent items in csharp arrays (#117)

* Add args template for arrays * indent items in csharp arrays * move .join logic for arrays to args template
mongodb-js · Jun 25, 2021 · 92e2607 · 92e2607
1 parent 1b18430
commit 92e2607
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 28 deletions.
diff --git a/packages/bson-transpilers/codegeneration/javascript/Visitor.js b/packages/bson-transpilers/codegeneration/javascript/Visitor.js
@@ -207,7 +207,10 @@ class Visitor extends ECMAScriptVisitor {
         return arg !== ',';
       });
       if (ctx.type.argsTemplate) { // NOTE: not currently being used anywhere.
-        args = ctx.type.argsTemplate(visitedElements, ctx.indentDepth);
+        args = visitedElements.map((arg, index) => {
+          const last = !visitedElements[index + 1];
+          return ctx.type.argsTemplate(arg, ctx.indentDepth, last);
+        }).join('');
       } else {
         args = visitedElements.join(', ');
       }

diff --git a/packages/bson-transpilers/lib/symbol-table/javascripttocsharp.js b/packages/bson-transpilers/lib/symbol-table/javascripttocsharp.js
diff --git a/packages/bson-transpilers/lib/symbol-table/javascripttojava.js b/packages/bson-transpilers/lib/symbol-table/javascripttojava.js
diff --git a/packages/bson-transpilers/lib/symbol-table/javascripttopython.js b/packages/bson-transpilers/lib/symbol-table/javascripttopython.js
diff --git a/packages/bson-transpilers/lib/symbol-table/javascripttoshell.js b/packages/bson-transpilers/lib/symbol-table/javascripttoshell.js
diff --git a/packages/bson-transpilers/lib/symbol-table/shelltocsharp.js b/packages/bson-transpilers/lib/symbol-table/shelltocsharp.js
diff --git a/packages/bson-transpilers/lib/symbol-table/shelltojava.js b/packages/bson-transpilers/lib/symbol-table/shelltojava.js
diff --git a/packages/bson-transpilers/lib/symbol-table/shelltojavascript.js b/packages/bson-transpilers/lib/symbol-table/shelltojavascript.js
diff --git a/packages/bson-transpilers/lib/symbol-table/shelltopython.js b/packages/bson-transpilers/lib/symbol-table/shelltopython.js
diff --git a/packages/bson-transpilers/symbols/basic_types.yaml b/packages/bson-transpilers/symbols/basic_types.yaml
@@ -42,6 +42,7 @@ BasicTypes:
         <<: *__type
         id: "_array"
         template: *ArrayTypeTemplate
+        argsTemplate: *ArrayTypeArgsTemplate
     _object: &ObjectType
         <<: *__type
         id: "_object"

diff --git a/packages/bson-transpilers/symbols/csharp/templates.yaml b/packages/bson-transpilers/symbols/csharp/templates.yaml
@@ -56,7 +56,14 @@ Templates:
               return 'new BsonArray()'
             }
 
-            return `new BsonArray${initialIndent}{${indent}${literal}${initialIndent}}`;
+            return `new BsonArray${initialIndent}{${literal}${initialIndent}}`;
+        }
+    ArrayTypeArgsTemplate: &ArrayTypeArgsTemplate !!js/function >
+        (arg, depth, last) => {
+            const indent = '\n' + '    '.repeat(depth);
+            const arr = arg.split(', new').join(`, ${indent}new`)
+
+            return last ? `${indent}${arr}` : `${indent}${arr},`;
         }
     NullTypeTemplate: &NullTypeTemplate !!js/function >
         () => {

diff --git a/packages/bson-transpilers/symbols/java/templates.yaml b/packages/bson-transpilers/symbols/java/templates.yaml
@@ -78,6 +78,7 @@ Templates:
 
             return `Arrays.asList(${arr})`;
         }
+    ArrayTypeArgsTemplate: &ArrayTypeArgsTemplate null
     NullTypeTemplate: &NullTypeTemplate null
     UndefinedTypeTemplate: &UndefinedTypeTemplate !!js/function >
         () => {

diff --git a/packages/bson-transpilers/symbols/javascript/templates.yaml b/packages/bson-transpilers/symbols/javascript/templates.yaml
@@ -33,6 +33,7 @@ Templates:
 
             return `[${indent}${literal}${closingIndent}]`;
         }
+    ArrayTypeArgsTemplate: &ArrayTypeArgsTemplate null
     NullTypeTemplate: &NullTypeTemplate !!js/function >
         () => {
             return 'null';

diff --git a/packages/bson-transpilers/symbols/python/templates.yaml b/packages/bson-transpilers/symbols/python/templates.yaml
@@ -75,6 +75,7 @@ Templates:
 
             return `[${indent}${literal}${closingIndent}]`;
         }
+    ArrayTypeArgsTemplate: &ArrayTypeArgsTemplate null
     NullTypeTemplate: &NullTypeTemplate !!js/function >
         () => {
             return 'None';

diff --git a/packages/bson-transpilers/symbols/shell/templates.yaml b/packages/bson-transpilers/symbols/shell/templates.yaml
@@ -44,6 +44,7 @@ Templates:
 
             return `[${indent}${literal}${closingIndent}]`;
         }
+    ArrayTypeArgsTemplate: &ArrayTypeArgsTemplate null
     NullTypeTemplate: &NullTypeTemplate !!js/function >
         () => {
             return 'null';

diff --git a/packages/bson-transpilers/test/json/success/javascript/bson-constructors.json b/packages/bson-transpilers/test/json/success/javascript/bson-constructors.json
@@ -290,7 +290,7 @@
         "javascript": "{x: ['1', '2']}",
         "python": "{\n    'x': [\n        '1', '2'\n    ]\n}",
         "java": "new Document(\"x\", Arrays.asList(\"1\", \"2\"))",
-        "csharp": "new BsonDocument(\"x\", new BsonArray\n    {\n        \"1\", \"2\"\n    })",
+        "csharp": "new BsonDocument(\"x\", new BsonArray\n    {\n        \"1\",\n        \"2\"\n    })",
         "shell": "{\n  x: [\n    '1', '2'\n  ]\n}"
       },
       {
@@ -338,7 +338,7 @@
         "javascript": "{ status: 'A', $or: [{ qty: { $lt: 30 } }, { item: { $regex: '^p' } }] }",
         "python": "{\n    'status': 'A', \n    '$or': [\n        {\n            'qty': {\n                '$lt': 30\n            }\n        }, {\n            'item': {\n                '$regex': '^p'\n            }\n        }\n    ]\n}",
         "java": "new Document(\"status\", \"A\")\n    .append(\"$or\", Arrays.asList(new Document(\"qty\", \n        new Document(\"$lt\", 30L)), \n        new Document(\"item\", \n        new Document(\"$regex\", \"^p\"))))",
-        "csharp": "new BsonDocument\n{\n    { \"status\", \"A\" }, \n    { \"$or\", new BsonArray\n    {\n        new BsonDocument(\"qty\", new BsonDocument(\"$lt\", 30)), new BsonDocument(\"item\", new BsonDocument(\"$regex\", \"^p\"))\n    } }\n}",
+        "csharp": "new BsonDocument\n{\n    { \"status\", \"A\" }, \n    { \"$or\", new BsonArray\n    {\n        new BsonDocument(\"qty\", \n        new BsonDocument(\"$lt\", 30)),\n        new BsonDocument(\"item\", \n        new BsonDocument(\"$regex\", \"^p\"))\n    } }\n}",
         "shell": "{\n  status: 'A', \n  $or: [\n    {\n      qty: {\n        $lt: 30\n      }\n    }, {\n      item: {\n        $regex: '^p'\n      }\n    }\n  ]\n}"
       }
 
@@ -349,39 +349,39 @@
         "javascript": "['1', '2']",
         "python": "[\n    '1', '2'\n]",
         "java": "Arrays.asList(\"1\", \"2\")",
-        "csharp": "new BsonArray\n{\n    \"1\", \"2\"\n}",
+        "csharp": "new BsonArray\n{\n    \"1\",\n    \"2\"\n}",
         "shell": "[\n  '1', '2'\n]"
       },
       {
         "description": "array with trailing comma",
         "javascript": "['1', '2',]",
         "python": "[\n    '1', '2'\n]",
         "java": "Arrays.asList(\"1\", \"2\")",
-        "csharp": "new BsonArray\n{\n    \"1\", \"2\"\n}",
+        "csharp": "new BsonArray\n{\n    \"1\",\n    \"2\"\n}",
         "shell": "[\n  '1', '2'\n]"
       },
       {
         "description": "Array with subdoc",
         "javascript": "['1', { settings: 'http2' }]",
         "python": "[\n    '1', {\n        'settings': 'http2'\n    }\n]",
         "java": "Arrays.asList(\"1\", \n    new Document(\"settings\", \"http2\"))",
-        "csharp": "new BsonArray\n{\n    \"1\", new BsonDocument(\"settings\", \"http2\")\n}",
+        "csharp": "new BsonArray\n{\n    \"1\",\n    new BsonDocument(\"settings\", \"http2\")\n}",
         "shell": "[\n  '1', {\n    settings: 'http2'\n  }\n]"
       },
       {
         "description": "nested array with nested subdoc",
         "javascript": "{\"pipeline\": [ { $match: { $expr: { \"$eq\": [ \"$manager\", \"$$me\" ] } } }, { $project: { managers : 0 } }, { $sort: { startQuarter: 1, notes:1, job_code: 1 } } ]}" ,
         "python": "{\n    'pipeline': [\n        {\n            '$match': {\n                '$expr': {\n                    '$eq': [\n                        '$manager', '$$me'\n                    ]\n                }\n            }\n        }, {\n            '$project': {\n                'managers': 0\n            }\n        }, {\n            '$sort': {\n                'startQuarter': 1, \n                'notes': 1, \n                'job_code': 1\n            }\n        }\n    ]\n}",
         "java": "new Document(\"pipeline\", Arrays.asList(new Document(\"$match\", \n        new Document(\"$expr\", \n        new Document(\"$eq\", Arrays.asList(\"$manager\", \"$$me\")))), \n        new Document(\"$project\", \n        new Document(\"managers\", 0L)), \n        new Document(\"$sort\", \n        new Document(\"startQuarter\", 1L)\n                .append(\"notes\", 1L)\n                .append(\"job_code\", 1L))))",
-        "csharp": "new BsonDocument(\"pipeline\", new BsonArray\n    {\n        new BsonDocument(\"$match\", new BsonDocument(\"$expr\", new BsonDocument(\"$eq\", new BsonArray\n                    {\n                        \"$manager\", \"$$me\"\n                    }))), new BsonDocument(\"$project\", new BsonDocument(\"managers\", 0)), new BsonDocument(\"$sort\", new BsonDocument\n            {\n                { \"startQuarter\", 1 }, \n                { \"notes\", 1 }, \n                { \"job_code\", 1 }\n            })\n    })",
+        "csharp": "new BsonDocument(\"pipeline\", new BsonArray\n    {\n        new BsonDocument(\"$match\", \n        new BsonDocument(\"$expr\", \n        new BsonDocument(\"$eq\", \n        new BsonArray\n                    {\n                        \"$manager\",\n                        \"$$me\"\n                    }))),\n        new BsonDocument(\"$project\", \n        new BsonDocument(\"managers\", 0)),\n        new BsonDocument(\"$sort\", \n        new BsonDocument\n            {\n                { \"startQuarter\", 1 }, \n                { \"notes\", 1 }, \n                { \"job_code\", 1 }\n            })\n    })",
         "shell": "{\n  \"pipeline\": [\n    {\n      $match: {\n        $expr: {\n          \"$eq\": [\n            \"$manager\", \"$$me\"\n          ]\n        }\n      }\n    }, {\n      $project: {\n        managers: 0\n      }\n    }, {\n      $sort: {\n        startQuarter: 1, \n        notes: 1, \n        job_code: 1\n      }\n    }\n  ]\n}"
       },
       {
         "description": "Array with subarray",
         "javascript": "['1', ['2', '3']]",
         "python": "[\n    '1', [\n        '2', '3'\n    ]\n]",
         "java": "Arrays.asList(\"1\", Arrays.asList(\"2\", \"3\"))",
-        "csharp": "new BsonArray\n{\n    \"1\", new BsonArray\n    {\n        \"2\", \"3\"\n    }\n}",
+        "csharp": "new BsonArray\n{\n    \"1\",\n    new BsonArray\n    {\n        \"2\",\n        \"3\"\n    }\n}",
         "shell": "[\n  '1', [\n    '2', '3'\n  ]\n]"
       },
       {
@@ -399,7 +399,7 @@
         "javascript": "[,'1', '2',]",
         "python": "[\n    None, '1', '2'\n]",
         "java": "Arrays.asList(new BsonUndefined(), \"1\", \"2\")",
-        "csharp": "new BsonArray\n{\n    BsonUndefined.Value, \"1\", \"2\"\n}",
+        "csharp": "new BsonArray\n{\n    BsonUndefined.Value,\n    \"1\",\n    \"2\"\n}",
         "shell": "[\n  undefined, '1', '2'\n]"
       },
       {
@@ -415,15 +415,15 @@
         "javascript": "[,,]",
         "python": "[\n    None, None\n]",
         "java": "Arrays.asList(new BsonUndefined(), \n    new BsonUndefined())",
-        "csharp": "new BsonArray\n{\n    BsonUndefined.Value, BsonUndefined.Value\n}",
+        "csharp": "new BsonArray\n{\n    BsonUndefined.Value,\n    BsonUndefined.Value\n}",
         "shell": "[\n  undefined, undefined\n]"
       },
       {
         "description": "Array with elision in the middle",
         "javascript": "['1',,,,'2']",
         "python": "[\n    '1', None, None, None, '2'\n]",
         "java": "Arrays.asList(\"1\", \n    new BsonUndefined(), \n    new BsonUndefined(), \n    new BsonUndefined(), \"2\")",
-        "csharp": "new BsonArray\n{\n    \"1\", BsonUndefined.Value, BsonUndefined.Value, BsonUndefined.Value, \"2\"\n}",
+        "csharp": "new BsonArray\n{\n    \"1\",\n    BsonUndefined.Value,\n    BsonUndefined.Value,\n    BsonUndefined.Value,\n    \"2\"\n}",
         "shell": "[\n  '1', undefined, undefined, undefined, '2'\n]"
       }
     ],

diff --git a/packages/bson-transpilers/test/json/success/shell/bson-constructors.json b/packages/bson-transpilers/test/json/success/shell/bson-constructors.json
@@ -256,7 +256,7 @@
         "javascript": "{\n  x: [\n    1, 2\n  ]\n}",
         "python": "{\n    'x': [\n        1, 2\n    ]\n}",
         "java": "new Document(\"x\", Arrays.asList(1L, 2L))",
-        "csharp": "new BsonDocument(\"x\", new BsonArray\n    {\n        1, 2\n    })",
+        "csharp": "new BsonDocument(\"x\", new BsonArray\n    {\n        1,\n        2\n    })",
         "shell": "{x: [1,2]}"
       },
       {
@@ -298,31 +298,31 @@
         "javascript": "[\n  1, 2\n]",
         "python": "[\n    1, 2\n]",
         "java": "Arrays.asList(1L, 2L)",
-        "csharp": "new BsonArray\n{\n    1, 2\n}",
+        "csharp": "new BsonArray\n{\n    1,\n    2\n}",
         "shell": "[1, 2]"
       },
       {
         "description": "array with trailing comma",
         "javascript": "[\n  1, 2\n]",
         "python": "[\n    1, 2\n]",
         "java": "Arrays.asList(1L, 2L)",
-        "csharp": "new BsonArray\n{\n    1, 2\n}",
+        "csharp": "new BsonArray\n{\n    1,\n    2\n}",
         "shell": "[1, 2,]"
       },
       {
         "description": "Array with subdoc",
         "javascript": "[\n  1, {\n    settings: 'http2'\n  }\n]",
         "python": "[\n    1, {\n        'settings': 'http2'\n    }\n]",
         "java": "Arrays.asList(1L, \n    new Document(\"settings\", \"http2\"))",
-        "csharp": "new BsonArray\n{\n    1, new BsonDocument(\"settings\", \"http2\")\n}",
+        "csharp": "new BsonArray\n{\n    1,\n    new BsonDocument(\"settings\", \"http2\")\n}",
         "shell": "[1, { settings: 'http2' }]"
       },
       {
         "description": "Array with subarray",
         "javascript": "[\n  1, [\n    2, 3\n  ]\n]",
         "python": "[\n    1, [\n        2, 3\n    ]\n]",
         "java": "Arrays.asList(1L, Arrays.asList(2L, 3L))",
-        "csharp": "new BsonArray\n{\n    1, new BsonArray\n    {\n        2, 3\n    }\n}",
+        "csharp": "new BsonArray\n{\n    1,\n    new BsonArray\n    {\n        2,\n        3\n    }\n}",
         "shell": "[1, [2, 3]]"
       },
       {
@@ -340,7 +340,7 @@
         "javascript": "[\n  undefined, 1, 2\n]",
         "python": "[\n    None, 1, 2\n]",
         "java": "Arrays.asList(new BsonUndefined(), 1L, 2L)",
-        "csharp": "new BsonArray\n{\n    BsonUndefined.Value, 1, 2\n}",
+        "csharp": "new BsonArray\n{\n    BsonUndefined.Value,\n    1,\n    2\n}",
         "shell": "[,1, 2,]"
       },
       {
@@ -356,15 +356,15 @@
         "javascript": "[\n  undefined, undefined\n]",
         "python": "[\n    None, None\n]",
         "java": "Arrays.asList(new BsonUndefined(), \n    new BsonUndefined())",
-        "csharp": "new BsonArray\n{\n    BsonUndefined.Value, BsonUndefined.Value\n}",
+        "csharp": "new BsonArray\n{\n    BsonUndefined.Value,\n    BsonUndefined.Value\n}",
         "shell": "[,,]"
       },
       {
         "description": "Array with elision in the middle",
         "javascript": "[\n  1, undefined, undefined, undefined, 2\n]",
         "python": "[\n    1, None, None, None, 2\n]",
         "java": "Arrays.asList(1L, \n    new BsonUndefined(), \n    new BsonUndefined(), \n    new BsonUndefined(), 2L)",
-        "csharp": "new BsonArray\n{\n    1, BsonUndefined.Value, BsonUndefined.Value, BsonUndefined.Value, 2\n}",
+        "csharp": "new BsonArray\n{\n    1,\n    BsonUndefined.Value,\n    BsonUndefined.Value,\n    BsonUndefined.Value,\n    2\n}",
         "shell": "[1,,,,2]"
       }
     ]