functions may return null in collections of entities (#105)

oasis-tcs · Nov 6, 2024 · a40b845 · a40b845
1 parent fbdbc32
commit a40b845
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 65 deletions.
diff --git a/lib/xml2json.js b/lib/xml2json.js
@@ -1730,17 +1730,6 @@ module.exports.xml2json = function (
       if (node.attributes[name]) {
         switch (name) {
           case "Nullable":
-            if (
-              target.$Collection &&
-              target.$Type === "Edm.EntityType" &&
-              node.local === "ReturnType"
-            ) {
-              reportError(
-                `Element ${node.local}, Type=Collection(Edm.EntityType) with Nullable attribute`,
-                parser
-              );
-              break;
-            }
             if (node.attributes[name].value === "true") target.$Nullable = true;
             break;
           case "Abstract":

diff --git a/test/xml2json.test.js b/test/xml2json.test.js
@@ -590,6 +590,44 @@ describe("Edge cases", function () {
       });
     }
   });
+
+  it("Nullable collection of entities in ReturnType", function () {
+    const xml = `<Edmx Version="4.01" xmlns="http://docs.oasis-open.org/odata/ns/edmx">
+      <DataServices>
+        <Schema Namespace="n" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+          <Function Name="f">
+            <ReturnType Type="Collection(Edm.EntityType)" Nullable="false"/>
+          </Function>
+          <Function Name="g">
+            <ReturnType Type="Collection(n.bar)" Nullable="false"/>
+          </Function>
+          <EntityType Name="bar" />
+        </Schema>
+      </DataServices>
+    </Edmx>`;
+
+    const messages = [];
+    const json = csdl.xml2json(xml, { messages });
+    assert.deepStrictEqual(json, {
+      $Version: "4.01",
+      n: {
+        f: [
+          {
+            $Kind: "Function",
+            $ReturnType: { $Collection: true, $Type: "Edm.EntityType" },
+          },
+        ],
+        g: [
+          {
+            $Kind: "Function",
+            $ReturnType: { $Collection: true, $Type: "n.bar" },
+          },
+        ],
+        bar: { $Kind: "EntityType" },
+      },
+    });
+    assert.deepStrictEqual(messages, []);
+  });
 });
 
 describe("Error cases", function () {
@@ -965,60 +1003,6 @@ describe("Error cases", function () {
     }
   });
 
-  it("forbidden Nullable in ReturnType", function () {
-    const xml = `<Edmx Version="4.01" xmlns="http://docs.oasis-open.org/odata/ns/edmx">
-      <DataServices>
-        <Schema Namespace="n" xmlns="http://docs.oasis-open.org/odata/ns/edm">
-          <Function Name="f">
-            <ReturnType Type="Collection(Edm.EntityType)" Nullable="false"/>
-          </Function>
-        </Schema>
-      </DataServices>
-    </Edmx>`;
-
-    const messages = [];
-    const json = csdl.xml2json(xml, { messages });
-    assert.deepStrictEqual(json, {
-      $Version: "4.01",
-      n: {
-        f: [
-          {
-            $Kind: "Function",
-            $ReturnType: { $Collection: true, $Type: "Edm.EntityType" },
-          },
-        ],
-      },
-    });
-    assert.deepStrictEqual(messages, [
-      {
-        message:
-          "Element ReturnType, Type=Collection(Edm.EntityType) with Nullable attribute",
-        parser: {
-          construct:
-            '<ReturnType Type="Collection(Edm.EntityType)" Nullable="false"/>',
-          line: 5,
-          column: 76,
-        },
-      },
-    ]);
-
-    try {
-      csdl.xml2json(xml, { strict: true });
-      assert.fail("should not get here");
-    } catch (e) {
-      assert.strictEqual(
-        e.message.split("\n")[0],
-        "Element ReturnType, Type=Collection(Edm.EntityType) with Nullable attribute"
-      );
-      assert.deepStrictEqual(e.parser, {
-        construct:
-          '<ReturnType Type="Collection(Edm.EntityType)" Nullable="false"/>',
-        line: 5,
-        column: 76,
-      });
-    }
-  });
-
   it("misplaced element", function () {
     const xml = `<Edmx Version="4.0" xmlns="http://docs.oasis-open.org/odata/ns/edmx">
       <Schema Namespace="n">