GH #1652 If $type is undefined, don't nest (#1729)

* GH #1652 If $type is undefined, don't nest

* Make flow-lib XQuery consistent with SJS change

Author: ryanjdew

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/flow-lib.sjs

@@ -386,7 +386,7 @@ function instanceToCanonicalJson(entityInstance) {
       if (key === '$attachments' || key === '$type' || key === '$version') {
       } else {
         let instanceProperty = entityInstance[key];
-         if (instanceProperty instanceof Array) {
+        if (instanceProperty instanceof Array) {
           let a = [];
           let i = 0;
           for (i = 0; i < instanceProperty.length; i++) {
@@ -405,7 +405,11 @@ function instanceToCanonicalJson(entityInstance) {
     }
   }
   let rootObject = {};
-  rootObject[entityInstance['$type']] = o;
+  if (entityInstance['$type'] != undefined) {
+    rootObject[entityInstance['$type']] = o;
+  } else {
+    rootObject = o;
+  }
   return rootObject;
 }
 

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/4/impl/flow-lib.xqy

@@ -529,7 +529,6 @@ declare function flow:make-legacy-envelope($content, $headers, $triples, $data-f
 declare function flow:instance-to-canonical-json(
   $entity-instance as map:map) as json:object
 {
-  let $root-object := json:object()
   let $o :=
     if ( map:contains($entity-instance, "$ref") ) then
       map:get($entity-instance, "$ref")
@@ -569,7 +568,13 @@ declare function flow:instance-to-canonical-json(
       )
       return
         $o
-  let $_ := map:put($root-object, map:get($entity-instance, "$type"), $o)
+  let $root-object :=
+    if (map:contains($entity-instance, "$type")) then
+      let $object := json:object()
+      let $_ := map:put($object, map:get($entity-instance, "$type"), $o)
+      return $object
+    else
+      $o
   return
     $root-object
 };