@vinctus/oql 1.1.5 → 1.1.7

package/main.js

@@ -3539,10 +3539,10 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   }));
                   var self = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$100, pred));
                   if (($n(self).size__I() > 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x233).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                   };
                   if (($n(self).size__I() < 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x233).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                   };
                   var key$2 = $n(x232).Lcom_vinctus_oql_Ident__f_s;
                   var targetentity = $n($as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$2))).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
@@ -3570,10 +3570,10 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   }));
                   var target = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$110, pred$1));
                   if (($n(target).size__I() > 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x233).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x232).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
                   };
                   if (($n(target).size__I() < 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x233).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x232).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
                   };
                   var $$x4 = $n(x238);
                   var $$x3 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
@@ -3680,10 +3680,10 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                       }));
                       var attrs = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$141, pred$2));
                       if (($n(attrs).size__I() > 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x213).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x213).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x213).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       if (($n(attrs).size__I() < 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x213).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x213).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x213).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       var entity$3 = $n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                       var attribute = $as_Lcom_vinctus_oql_Attribute($n(attrs).head__O());
@@ -3778,10 +3778,10 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                       }));
                       var attrs$2 = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$170, pred$3));
                       if (($n(attrs$2).size__I() > 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x203).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x203).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x203).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       if (($n(attrs$2).size__I() < 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x203).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x203).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x203).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       var entity$5 = $n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                       var attribute$1 = $as_Lcom_vinctus_oql_Attribute($n(attrs$2).head__O());
@@ -4809,31 +4809,28 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
     if ((!$n(rs$1).next__Z())) {
       $m_s_sys_package$().error__T__E("insert: empty result set")
     };
-    matchResult5: {
-      var $$x12;
-      var x44 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
-      var x = $m_s_None$();
-      if ((x === x44)) {
-        var this$44 = $n(obj);
-        var factory = $m_sci_VectorMap$();
-        var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
-        var $$x12 = $as_sci_VectorMap(factory$1.fromSpecific__sc_IterableOnce__O(this$44));
-        break matchResult5
-      };
-      if ((x44 instanceof $c_s_Some)) {
-        var pk$1 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x44)).s_Some__f_value);
-        var this$46 = $n(obj);
-        var factory$2 = $m_sci_VectorMap$();
-        var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
-        var this$49 = $n($as_sci_MapOps(factory$3.fromSpecific__sc_IterableOnce__O(this$46)));
-        var self = $n(pk$1).Lcom_vinctus_oql_Attribute__f_name;
-        var y$2 = $n($n(rs$1).get__I__Lcom_vinctus_oql_OQLResultSetValue(0)).value__O();
-        var $$x12 = $as_sci_VectorMap(this$49.updated__O__O__sci_MapOps(self, y$2));
-        break matchResult5
-      };
-      throw new $c_s_MatchError(x44)
+    var x44 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
+    var x = $m_s_None$();
+    if ((x === x44)) {
+      var this$44 = $n(obj);
+      var factory = $m_sci_VectorMap$();
+      var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
+      return $as_sci_VectorMap(factory$1.fromSpecific__sc_IterableOnce__O(this$44))
+    };
+    if ((x44 instanceof $c_s_Some)) {
+      var pk$1 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x44)).s_Some__f_value);
+      var this$47 = $m_sci_VectorMap$();
+      var $$x12 = $m_sr_ScalaRunTime$();
+      var self = $n(pk$1).Lcom_vinctus_oql_Attribute__f_name;
+      var y$2 = $n($n(rs$1).get__I__Lcom_vinctus_oql_OQLResultSetValue(0)).value__O();
+      var elems$2 = $n($$x12).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self, y$2)]));
+      var this$48 = $n(this$47.from__sc_IterableOnce__sci_VectorMap(elems$2));
+      var this$50 = $n($f_sci_StrictOptimizedMapOps__concat__sc_IterableOnce__sci_MapOps(this$48, obj));
+      var factory$2 = $m_sci_VectorMap$();
+      var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
+      return $as_sci_VectorMap(factory$3.fromSpecific__sc_IterableOnce__O(this$50))
     };
-    return new $c_Lcom_vinctus_sjs\uff3futils_DynamicMap($$x12)
+    throw new $c_s_MatchError(x44)
   })), this.Lcom_vinctus_oql_Mutation__f_ec)
 });
 $c_Lcom_vinctus_oql_Mutation.prototype.delete__O__s_concurrent_Future = (function(id) {
@@ -4874,7 +4871,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.link__O__T__O__s_concurrent_Future = (fun
         var self$1 = $n(x63).Lcom_vinctus_oql_Attribute__f_name;
         var elems = $n($$x2).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([$$x1, new $c_T2(self$1, id2)]));
         return $n($n($$x3).insert__sc_Map__s_concurrent_Future(this$16.from__sc_IterableOnce__sci_Map(elems))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$3) => {
-          $as_Lcom_vinctus_sjs\uff3futils_DynamicMap(_$3)
+          $as_sci_VectorMap(_$3)
         })), this.Lcom_vinctus_oql_Mutation__f_ec)
       }
     };
@@ -4925,9 +4922,6 @@ $c_Lcom_vinctus_oql_Mutation.prototype.unlink__O__T__O__s_concurrent_Future = (f
   throw new $c_s_MatchError(x64)
 });
 $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future = (function(id, updates) {
-  if ($n(updates).isEmpty__Z()) {
-    $m_s_sys_package$().error__T__E(("update: empty update: " + id))
-  };
   var this$1 = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option());
   if ((!this$1.isEmpty__Z())) {
     var arg1 = this$1.get__O();
@@ -4976,36 +4970,48 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
     })))));
     $n($$x2).error__T__E(((("extrinsic properties not found in entity '" + $$x1) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$11, "", ", ", "")))
   };
-  var pairs = $as_sc_Map($n(updates).map__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$2) => {
+  var updatesWithoutUndefined = $as_sc_Map($n(updates).filterNot__F1__O(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
     if ((x$1$3 !== null)) {
-      var k = $as_T($n(x$1$3).T2__f__1);
+      $as_T($n(x$1$3).T2__f__1);
       var v = $n(x$1$3).T2__f__2;
-      if ($is_sci_Map(v)) {
-        matchResult9: {
+      return $m_sr_BoxesRunTime$().equals__O__O__Z(v, (void 0))
+    };
+    throw new $c_s_MatchError(x$1$3)
+  }))));
+  if ($n(updatesWithoutUndefined).isEmpty__Z()) {
+    $m_s_sys_package$().error__T__E(("update: empty update: " + id))
+  };
+  var pairs = $as_sc_Map($n(updatesWithoutUndefined).map__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
+    var x$1$4 = $as_T2(x$1$3$1);
+    if ((x$1$4 !== null)) {
+      var k$1 = $as_T($n(x$1$4).T2__f__1);
+      var v$1 = $n(x$1$4).T2__f__2;
+      if ($is_sci_Map(v$1)) {
+        matchResult10: {
           var v1;
-          var x90 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
-          if ((x90 !== null)) {
-            var this$14 = $n(x90);
-            var this$15 = $n(x90);
-            var this$16 = $n(x90);
-            var this$17 = $n(x90);
-            var this$18 = $n(x90);
-            var x96 = this$18.Lcom_vinctus_oql_Attribute__f_typ;
-            if ((x96 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-              var x$1$4 = $as_Lcom_vinctus_oql_ManyToOneType(x96);
-              var this$20 = $n(x$1$4);
-              var x99 = this$20.Lcom_vinctus_oql_ManyToOneType__f_entity;
-              var v1 = $n($as_sci_Map(v)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x99).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
-              break matchResult9
+          var x93 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k$1));
+          if ((x93 !== null)) {
+            var this$14 = $n(x93);
+            var this$15 = $n(x93);
+            var this$16 = $n(x93);
+            var this$17 = $n(x93);
+            var this$18 = $n(x93);
+            var x99 = this$18.Lcom_vinctus_oql_Attribute__f_typ;
+            if ((x99 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+              var x$1$5 = $as_Lcom_vinctus_oql_ManyToOneType(x99);
+              var this$20 = $n(x$1$5);
+              var x102 = this$20.Lcom_vinctus_oql_ManyToOneType__f_entity;
+              var v1 = $n($as_sci_Map(v$1)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x102).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
+              break matchResult10
             }
           };
-          $m_s_sys_package$().error__T__E((((("attribute '" + k) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
+          $m_s_sys_package$().error__T__E((((("attribute '" + k$1) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
         }
       } else {
-        var v1 = v
+        var v1 = v$1
       };
-      var attr = $as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k));
+      var attr = $as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k$1));
       var self = $n(attr).Lcom_vinctus_oql_Attribute__f_column;
       var $$x4 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
       var x = $n(attr).Lcom_vinctus_oql_Attribute__f_typ;
@@ -5020,18 +5026,18 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
       var y = $n($$x4).render__O__s_Option__T(v1, $$x3);
       return new $c_T2(self, y)
     };
-    throw new $c_s_MatchError(x$1$3)
+    throw new $c_s_MatchError(x$1$4)
   }))));
   var command = $ct_scm_StringBuilder__(new $c_scm_StringBuilder());
   command.append__T__scm_StringBuilder((("UPDATE " + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_table) + "\n"));
-  var this$25 = $n($as_sc_IterableOnceOps($n(pairs).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
-    var x$1$5 = $as_T2(x$1$3$1);
-    if ((x$1$5 !== null)) {
-      var k$1 = $as_T($n(x$1$5).T2__f__1);
-      var v$1 = $as_T($n(x$1$5).T2__f__2);
-      return ((k$1 + " = ") + v$1)
+  var this$25 = $n($as_sc_IterableOnceOps($n(pairs).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$4$1) => {
+    var x$1$6 = $as_T2(x$1$4$1);
+    if ((x$1$6 !== null)) {
+      var k$2 = $as_T($n(x$1$6).T2__f__1);
+      var v$2 = $as_T($n(x$1$6).T2__f__2);
+      return ((k$2 + " = ") + v$2)
     };
-    throw new $c_s_MatchError(x$1$5)
+    throw new $c_s_MatchError(x$1$6)
   })))));
   command.append__T__scm_StringBuilder((("  SET " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$25, "", ", ", "")) + "\n"));
   command.append__T__scm_StringBuilder((((("  WHERE " + $n($as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + " = ") + $n(this.Lcom_vinctus_oql_Mutation__f_oql).render__O__s_Option__T(id, $n(this.Lcom_vinctus_oql_Mutation__f_oql).render$default$2__s_Option())) + "\n"));
@@ -5039,27 +5045,27 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
   var this$26 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
   return $n($n($n(this$26.Lcom_vinctus_oql_AbstractOQL__f_ds).connect__Lcom_vinctus_oql_OQLConnection()).command__T__s_concurrent_Future($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content)).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$6) => {
     $as_Lcom_vinctus_oql_OQLResultSet(_$6);
-    var x106 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
+    var x109 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
     var x$3 = $m_s_None$();
-    if ((x$3 === x106)) {
-      var this$28 = $n(updates);
+    if ((x$3 === x109)) {
+      var this$28 = $n(updatesWithoutUndefined);
       var factory = $m_sci_VectorMap$();
       var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
       return $as_sci_VectorMap(factory$1.fromSpecific__sc_IterableOnce__O(this$28))
     };
-    if ((x106 instanceof $c_s_Some)) {
-      var pk$1 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x106)).s_Some__f_value);
+    if ((x109 instanceof $c_s_Some)) {
+      var pk$1 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x109)).s_Some__f_value);
       var this$31 = $m_sci_VectorMap$();
       var $$x5 = $m_sr_ScalaRunTime$();
       var self$1 = $n(pk$1).Lcom_vinctus_oql_Attribute__f_name;
       var elems = $n($$x5).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self$1, id)]));
       var this$32 = $n(this$31.from__sc_IterableOnce__sci_VectorMap(elems));
-      var this$34 = $n($f_sci_StrictOptimizedMapOps__concat__sc_IterableOnce__sci_MapOps(this$32, updates));
+      var this$34 = $n($f_sci_StrictOptimizedMapOps__concat__sc_IterableOnce__sci_MapOps(this$32, updatesWithoutUndefined));
       var factory$2 = $m_sci_VectorMap$();
       var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
       return $as_sci_VectorMap(factory$3.fromSpecific__sc_IterableOnce__O(this$34))
     };
-    throw new $c_s_MatchError(x106)
+    throw new $c_s_MatchError(x109)
   })), this.Lcom_vinctus_oql_Mutation__f_ec)
 });
 $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future = (function(updates) {
@@ -5073,7 +5079,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
     return ((x$1$1 !== null) && ($as_sc_Map($n(x$1$1).T2__f__2), true))
   })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
-    matchResult14: {
+    matchResult15: {
       if ((x$1$3 !== null)) {
         var u$1 = $as_sc_Map($n(x$1$3).T2__f__2);
         var x = $n(u$1).keySet__sc_Set();
@@ -5082,7 +5088,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
           var this$2 = $n(u$1);
           $n($$x1).error__T__E(("update: key set mismatch: " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$2, "{", ", ", "}")))
         };
-        break matchResult14
+        break matchResult15
       };
       throw new $c_s_MatchError(x$1$3)
     }
@@ -5101,15 +5107,15 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
   var attrs = $as_sci_Map($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).filter__F1__O(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
     var x$1$4 = $as_T2(x$1$3$1);
     if ((x$1$4 !== null)) {
-      var x117 = $as_Lcom_vinctus_oql_Attribute($n(x$1$4).T2__f__2);
-      if ((x117 !== null)) {
-        var this$5 = $n(x117);
-        var this$6 = $n(x117);
-        var this$7 = $n(x117);
-        var this$8 = $n(x117);
-        var this$9 = $n(x117);
-        var x123 = this$9.Lcom_vinctus_oql_Attribute__f_typ;
-        if ($n(x123).isColumnType__Z()) {
+      var x120 = $as_Lcom_vinctus_oql_Attribute($n(x$1$4).T2__f__2);
+      if ((x120 !== null)) {
+        var this$5 = $n(x120);
+        var this$6 = $n(x120);
+        var this$7 = $n(x120);
+        var this$8 = $n(x120);
+        var this$9 = $n(x120);
+        var x126 = this$9.Lcom_vinctus_oql_Attribute__f_typ;
+        if ($n(x126).isColumnType__Z()) {
           return true
         }
       }
@@ -5148,22 +5154,22 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
           var k = $as_T($n(x$1$6).T2__f__1);
           var v = $n(x$1$6).T2__f__2;
           if ($is_sci_Map(v)) {
-            matchResult16: {
+            matchResult17: {
               var v1;
-              var x124 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
-              if ((x124 !== null)) {
-                var this$16 = $n(x124);
-                var this$17 = $n(x124);
-                var this$18 = $n(x124);
-                var this$19 = $n(x124);
-                var this$20 = $n(x124);
-                var x130 = this$20.Lcom_vinctus_oql_Attribute__f_typ;
-                if ((x130 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                  var x$1$7 = $as_Lcom_vinctus_oql_ManyToOneType(x130);
+              var x127 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
+              if ((x127 !== null)) {
+                var this$16 = $n(x127);
+                var this$17 = $n(x127);
+                var this$18 = $n(x127);
+                var this$19 = $n(x127);
+                var this$20 = $n(x127);
+                var x133 = this$20.Lcom_vinctus_oql_Attribute__f_typ;
+                if ((x133 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                  var x$1$7 = $as_Lcom_vinctus_oql_ManyToOneType(x133);
                   var this$22 = $n(x$1$7);
-                  var x133 = this$22.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                  var v1 = $n($as_sci_Map(v)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x133).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
-                  break matchResult16
+                  var x136 = this$22.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                  var v1 = $n($as_sci_Map(v)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x136).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
+                  break matchResult17
                 }
               };
               $m_s_sys_package$().error__T__E((((("attribute '" + k) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
@@ -5488,53 +5494,53 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getCount__sjs_js_
   var f = $n($n($p_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__check__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(this)).Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_oql).count__Lcom_vinctus_oql_OQLQuery__T__Lcom_vinctus_oql_Fixed__s_concurrent_Future(this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_q, null, this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_com$vinctus$oql$QueryBuilder_JS_NodePG$$fixed);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.cond = (function(arg) {
-  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getOne = (function() {
+  return this.getOne__sjs_js_Promise()
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.order = (function(arg, arg$2) {
-  var prep0 = $as_T(arg);
-  var prep1 = $as_T(arg$2);
-  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
+  "get": (function() {
+    return this.select$default$2__O()
+  }),
+  "configurable": true
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
   return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.offset = (function(arg) {
-  var prep0 = $uI(arg);
-  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
-});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.query = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.query$default$2__O() : rest[0]);
   return this.query__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.select = (function(arg, ...rest) {
-  var prep0 = $as_T(arg);
-  var prep1 = ((rest[0] === (void 0)) ? this.select$default$2__O() : rest[0]);
-  return this.select__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
-});
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
-  "get": (function() {
-    return this.select$default$2__O()
-  }),
-  "configurable": true
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.cond = (function(arg) {
+  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg)
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getCount = (function() {
   return this.getCount__sjs_js_Promise()
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getMany = (function() {
-  return this.getMany__sjs_js_Promise()
-});
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getOne = (function() {
-  return this.getOne__sjs_js_Promise()
-});
 Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "query$default$2", {
   "get": (function() {
     return this.query$default$2__O()
   }),
   "configurable": true
 });
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getMany = (function() {
+  return this.getMany__sjs_js_Promise()
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.select = (function(arg, ...rest) {
+  var prep0 = $as_T(arg);
+  var prep1 = ((rest[0] === (void 0)) ? this.select$default$2__O() : rest[0]);
+  return this.select__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.order = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  var prep1 = $as_T(arg$2);
+  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.offset = (function(arg) {
+  var prep0 = $uI(arg);
+  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
+});
 var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG = new $TypeData().initClass({
   Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG: 0
 }, false, "com.vinctus.oql.QueryBuilder_JS_NodePG", {
@@ -5692,31 +5698,29 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount__sjs_js_Pro
   var f = $n($n($p_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__check__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(this)).Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_oql).count__Lcom_vinctus_oql_OQLQuery__T__Lcom_vinctus_oql_Fixed__s_concurrent_Future(this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_q, null, this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_com$vinctus$oql$QueryBuilder_JS_RDB$$fixed);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.cond = (function(arg) {
-  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg)
-});
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.order = (function(arg, arg$2) {
-  var prep0 = $as_T(arg);
-  var prep1 = $as_T(arg$2);
-  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getOne = (function() {
+  return this.getOne__sjs_js_Promise()
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
   return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.offset = (function(arg) {
-  var prep0 = $uI(arg);
-  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
-});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.query = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.query$default$2__O() : rest[0]);
   return this.query__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.select = (function(arg, ...rest) {
-  var prep0 = $as_T(arg);
-  var prep1 = ((rest[0] === (void 0)) ? this.select$default$2__O() : rest[0]);
-  return this.select__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.cond = (function(arg) {
+  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount = (function() {
+  return this.getCount__sjs_js_Promise()
+});
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "query$default$2", {
+  "get": (function() {
+    return this.query$default$2__O()
+  }),
+  "configurable": true
 });
 Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "select$default$2", {
   "get": (function() {
@@ -5724,20 +5728,22 @@ Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototyp
   }),
   "configurable": true
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount = (function() {
-  return this.getCount__sjs_js_Promise()
-});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getMany = (function() {
   return this.getMany__sjs_js_Promise()
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getOne = (function() {
-  return this.getOne__sjs_js_Promise()
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.select = (function(arg, ...rest) {
+  var prep0 = $as_T(arg);
+  var prep1 = ((rest[0] === (void 0)) ? this.select$default$2__O() : rest[0]);
+  return this.select__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
 });
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "query$default$2", {
-  "get": (function() {
-    return this.query$default$2__O()
-  }),
-  "configurable": true
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.order = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  var prep1 = $as_T(arg$2);
+  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.offset = (function(arg) {
+  var prep0 = $uI(arg);
+  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
 });
 var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB = new $TypeData().initClass({
   Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB: 0
@@ -6855,6 +6861,7 @@ $c_Lcom_vinctus_oql_package$.prototype.printError__s_util_parsing_input_Position
   } else {
     $n($m_s_Console$().err__Ljava_io_PrintStream()).println__T__V((((($n(pos).line__I() + ": ") + msg) + "\n") + $n(pos).longString__T()))
   };
+  $m_Lcom_vinctus_oql_package$().Lcom_vinctus_oql_package$__f_parsingError = true;
   return null
 });
 $c_Lcom_vinctus_oql_package$.prototype.hex__C__I = (function(c) {
@@ -6952,8 +6959,8 @@ $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.jsArray__O__Z = (function(v) {
 $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.jsObject__O__Z = (function(v) {
   return ((((($as_T((typeof v)) === "object") && (v !== null)) && (!(v instanceof $c_RTLong))) && (!$uZ((v instanceof Date)))) && (!$m_Lcom_vinctus_sjs\uff3futils_package$().jsArray__O__Z(v)))
 });
-$c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__O = (function(a) {
-  if ((a === (void 0))) {
+$c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__Z__O = (function(a, undefinedToNull) {
+  if ((undefinedToNull && (a === (void 0)))) {
     return null
   } else if ($m_Lcom_vinctus_sjs\uff3futils_package$().jsObject__O__Z(a)) {
     var this$8 = new $c_sjs_js_WrappedDictionary$DictionaryIterator(a);
@@ -6962,7 +6969,7 @@ $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__O = (function(a) {
       if ((x$1$1 !== null)) {
         var k = $as_T($n(x$1$1).T2__f__1);
         var v = $n(x$1$1).T2__f__2;
-        var _2 = $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(v);
+        var _2 = $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(v, undefinedToNull);
         return new $c_T2(k, _2)
       };
       throw new $c_s_MatchError(x$1$1)
@@ -6973,7 +6980,7 @@ $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__O = (function(a) {
     return factory$1.fromSpecific__sc_IterableOnce__O(this$10)
   } else if ($m_Lcom_vinctus_sjs\uff3futils_package$().jsArray__O__Z(a)) {
     var this$13 = new $c_sjs_js_ArrayOps$ArrayIterator(a);
-    var f$1 = new $c_sjsr_AnonFunction1(((_$1) => $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(_$1)));
+    var f$1 = new $c_sjsr_AnonFunction1(((_$1) => $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(_$1, undefinedToNull)));
     var this$14 = new $c_sc_Iterator$$anon$9(this$13, f$1);
     $m_sci_List$();
     return $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(this$14)
@@ -29681,7 +29688,7 @@ function $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG() {
 }
 $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype = $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype;
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsInsert__sjs_js_Dictionary__sjs_js_Promise = (function(obj) {
-  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(obj)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(obj, true)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsDelete__sjs_js_Any__sjs_js_Promise = (function(e) {
@@ -29753,7 +29760,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsUpdate__sjs_js_Any_
   } else {
     var $$x1 = e
   };
-  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(updates)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(updates, false)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsBulkUpdate__sjs_js_Array__sjs_js_Promise = (function(updates) {
@@ -29773,7 +29780,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsBulkUpdate__sjs_js_
     };
     var array = $m_sjs_js_ArrayOps$().tail$extension__sjs_js_Array__sjs_js_Array(u);
     var a = $m_sjs_js_ArrayOps$().head$extension__sjs_js_Array__O(array);
-    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(a));
+    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(a, true));
     return new $c_T2(self, y)
   });
   if ((this$15 === $m_sci_Nil$())) {
@@ -29795,25 +29802,25 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsBulkUpdate__sjs_js_
   var f$1 = this.bulkUpdate__sci_List__s_concurrent_Future($$x1);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f$1, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.update = (function(arg, arg$2) {
-  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.link = (function(arg, arg$2, arg$3) {
+  var prep1 = $as_T(arg$2);
+  return this.jsLink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.unlink = (function(arg, arg$2, arg$3) {
   var prep1 = $as_T(arg$2);
   return this.jsUnlink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.delete = (function(arg) {
-  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.bulkUpdate = (function(arg) {
+  return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.insert = (function(arg) {
   return this.jsInsert__sjs_js_Dictionary__sjs_js_Promise(arg)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.bulkUpdate = (function(arg) {
-  return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.update = (function(arg, arg$2) {
+  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.link = (function(arg, arg$2, arg$3) {
-  var prep1 = $as_T(arg$2);
-  return this.jsLink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.delete = (function(arg) {
+  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
 });
 var $d_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG = new $TypeData().initClass({
   Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG: 0
@@ -29840,7 +29847,7 @@ function $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB() {
 }
 $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype = $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype;
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsInsert__sjs_js_Dictionary__sjs_js_Promise = (function(obj) {
-  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(obj)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(obj, true)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsDelete__sjs_js_Any__sjs_js_Promise = (function(e) {
@@ -29912,7 +29919,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsUpdate__sjs_js_Any__sj
   } else {
     var $$x1 = e
   };
-  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(updates)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(updates, true)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsBulkUpdate__sjs_js_Array__sjs_js_Promise = (function(updates) {
@@ -29932,7 +29939,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsBulkUpdate__sjs_js_Arr
     };
     var array = $m_sjs_js_ArrayOps$().tail$extension__sjs_js_Array__sjs_js_Array(u);
     var a = $m_sjs_js_ArrayOps$().head$extension__sjs_js_Array__O(array);
-    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(a));
+    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(a, true));
     return new $c_T2(self, y)
   });
   if ((this$15 === $m_sci_Nil$())) {
@@ -29954,25 +29961,25 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsBulkUpdate__sjs_js_Arr
   var f$1 = this.bulkUpdate__sci_List__s_concurrent_Future($$x1);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f$1, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.update = (function(arg, arg$2) {
-  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.link = (function(arg, arg$2, arg$3) {
+  var prep1 = $as_T(arg$2);
+  return this.jsLink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.unlink = (function(arg, arg$2, arg$3) {
   var prep1 = $as_T(arg$2);
   return this.jsUnlink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.delete = (function(arg) {
-  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.bulkUpdate = (function(arg) {
+  return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.insert = (function(arg) {
   return this.jsInsert__sjs_js_Dictionary__sjs_js_Promise(arg)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.bulkUpdate = (function(arg) {
-  return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.update = (function(arg, arg$2) {
+  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.link = (function(arg, arg$2, arg$3) {
-  var prep1 = $as_T(arg$2);
-  return this.jsLink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.delete = (function(arg) {
+  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
 });
 var $d_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB = new $TypeData().initClass({
   Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB: 0
@@ -30262,8 +30269,8 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity = (function(arg) {
   var prep0 = $as_T(arg);
   return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG(prep0)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
-  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
+  this.showQuery__V()
 });
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30272,6 +30279,9 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg,
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryMany__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
+  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
+});
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.raw = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
   return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
@@ -30290,9 +30300,6 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg,
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryOne__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
-  this.showQuery__V()
-});
 var $d_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS: 0
 }, false, "com.vinctus.oql.OQL_NodePG_JS", {
@@ -30502,8 +30509,12 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.entity = (function(arg) {
   var prep0 = $as_T(arg);
   return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB(prep0)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
-  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg, arg$2)
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.showQuery = (function() {
+  this.showQuery__V()
+});
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.rawMulti = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.rawMulti__T__sjs_js_Promise(prep0)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30512,13 +30523,16 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryMany = (function(arg, ..
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryMany__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
-  var prep0 = $as_T(arg);
-  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
+  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg, arg$2)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.create = (function() {
   return this.jsCreate__sjs_js_Promise()
 });
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
+});
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.count = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30526,10 +30540,6 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.count = (function(arg, ...res
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsCount__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.rawMulti = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.rawMulti__T__sjs_js_Promise(prep0)
-});
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30537,9 +30547,6 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (function(arg, ...
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryOne__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.showQuery = (function() {
-  this.showQuery__V()
-});
 var $d_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS: 0
 }, false, "com.vinctus.oql.OQL_RDB_JS", {
@@ -113477,93 +113484,6 @@ var $d_scm_CheckedIndexedSeqView$Map = new $TypeData().initClass({
   scm_CheckedIndexedSeqView: 1
 });
 $c_scm_CheckedIndexedSeqView$Map.prototype.$classData = $d_scm_CheckedIndexedSeqView$Map;
-function $p_Lcom_vinctus_sjs\uff3futils_DynamicMap__quoted__O__T($thiz, a) {
-  if (((typeof a) === "string")) {
-    var s = $as_T(a);
-    return (("\"" + s) + "\"")
-  } else {
-    return ("" + a)
-  }
-}
-/** @constructor */
-function $c_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj) {
-  this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj = null;
-  this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj = obj
-}
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype = new $h_sci_AbstractMap();
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.constructor = $c_Lcom_vinctus_sjs\uff3futils_DynamicMap;
-/** @constructor */
-function $h_Lcom_vinctus_sjs\uff3futils_DynamicMap() {
-  /*<skip>*/
-}
-$h_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype = $c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype;
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.removed__T__Lcom_vinctus_sjs\uff3futils_DynamicMap = (function(key) {
-  return new $c_Lcom_vinctus_sjs\uff3futils_DynamicMap($as_sci_Map($n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).removed__O__sci_MapOps(key)))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.get__T__s_Option = (function(key) {
-  return $n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).get__O__s_Option(key)
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.iterator__sc_Iterator = (function() {
-  return $n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).iterator__sc_Iterator()
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.updated__T__O__Lcom_vinctus_sjs\uff3futils_DynamicMap = (function(key, value) {
-  return new $c_Lcom_vinctus_sjs\uff3futils_DynamicMap($as_sci_Map($n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).updated__O__O__sci_MapOps(key, value)))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.toString__T = (function() {
-  var this$2 = $n($as_sc_IterableOnceOps($n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).map__F1__O(new $c_sjsr_AnonFunction1(((x$1) => {
-    var x$1$1 = $as_T2(x$1);
-    if ((x$1$1 !== null)) {
-      var k = $as_T($n(x$1$1).T2__f__1);
-      var v = $n(x$1$1).T2__f__2;
-      return ((k + ": ") + $p_Lcom_vinctus_sjs\uff3futils_DynamicMap__quoted__O__T(this, v))
-    };
-    throw new $c_s_MatchError(x$1$1)
-  })))));
-  return $f_sc_IterableOnceOps__mkString__T__T__T__T(this$2, "{", ", ", "}")
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.removed__O__sci_MapOps = (function(key) {
-  return this.removed__T__Lcom_vinctus_sjs\uff3futils_DynamicMap($as_T(key))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.get__O__s_Option = (function(key) {
-  return this.get__T__s_Option($as_T(key))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.updated__O__O__sci_MapOps = (function(key, value) {
-  return this.updated__T__O__Lcom_vinctus_sjs\uff3futils_DynamicMap($as_T(key), value)
-});
-function $as_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj) {
-  return (((obj instanceof $c_Lcom_vinctus_sjs\uff3futils_DynamicMap) || (obj === null)) ? obj : $throwClassCastException(obj, "com.vinctus.sjs_utils.DynamicMap"))
-}
-function $isArrayOf_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lcom_vinctus_sjs\uff3futils_DynamicMap)))
-}
-function $asArrayOf_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj, depth) {
-  return (($isArrayOf_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lcom.vinctus.sjs_utils.DynamicMap;", depth))
-}
-var $d_Lcom_vinctus_sjs\uff3futils_DynamicMap = new $TypeData().initClass({
-  Lcom_vinctus_sjs\uff3futils_DynamicMap: 0
-}, false, "com.vinctus.sjs_utils.DynamicMap", {
-  Lcom_vinctus_sjs\uff3futils_DynamicMap: 1,
-  sci_AbstractMap: 1,
-  sc_AbstractMap: 1,
-  sc_AbstractIterable: 1,
-  O: 1,
-  sc_Iterable: 1,
-  sc_IterableOnce: 1,
-  sc_IterableOps: 1,
-  sc_IterableOnceOps: 1,
-  sc_IterableFactoryDefaults: 1,
-  sc_Map: 1,
-  sc_MapOps: 1,
-  s_PartialFunction: 1,
-  F1: 1,
-  sc_MapFactoryDefaults: 1,
-  s_Equals: 1,
-  sci_Map: 1,
-  sci_Iterable: 1,
-  sci_MapOps: 1,
-  s_Dynamic: 1
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.$classData = $d_Lcom_vinctus_sjs\uff3futils_DynamicMap;
 /** @constructor */
 function $c_sci_Map$EmptyMap$() {
   /*<skip>*/
@@ -113824,6 +113744,9 @@ $c_sci_Map$Map1.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map1.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map1.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map1.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -113964,6 +113887,9 @@ $c_sci_Map$Map2.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map2.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map2.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map2.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -114141,6 +114067,9 @@ $c_sci_Map$Map3.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map3.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map3.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map3.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -114348,6 +114277,9 @@ $c_sci_Map$Map4.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map4.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map4.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map4.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -115715,6 +115647,9 @@ $c_sci_HashMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_HashMap.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_HashMap(pred, false)
 });
+$c_sci_HashMap.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_HashMap(pred, true)
+});
 $c_sci_HashMap.prototype.mapFactory__sc_MapFactory = (function() {
   return $m_sci_HashMap$()
 });
@@ -115971,6 +115906,9 @@ $c_sci_TreeSeqMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_TreeSeqMap.prototype.filter__F1__O = (function(pred) {
   return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, false)
 });
+$c_sci_TreeSeqMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_sci_TreeSeqMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -116327,6 +116265,9 @@ $c_sci_VectorMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_VectorMap.prototype.filter__F1__O = (function(pred) {
   return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, false)
 });
+$c_sci_VectorMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_sci_VectorMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -117090,6 +117031,9 @@ $c_sci_ListMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_ListMap.prototype.filter__F1__O = (function(pred) {
   return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, false)
 });
+$c_sci_ListMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_sci_ListMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -120973,6 +120917,9 @@ $c_scm_HashMap.prototype.collect__s_PartialFunction__O = (function(pf) {
 $c_scm_HashMap.prototype.zip__sc_IterableOnce__O = (function(that) {
   return $f_sc_StrictOptimizedIterableOps__zip__sc_IterableOnce__O(this, that)
 });
+$c_scm_HashMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_scm_HashMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -124850,6 +124797,9 @@ $c_scm_LinkedHashMap.prototype.collect__s_PartialFunction__O = (function(pf) {
 $c_scm_LinkedHashMap.prototype.zip__sc_IterableOnce__O = (function(that) {
   return $f_sc_StrictOptimizedIterableOps__zip__sc_IterableOnce__O(this, that)
 });
+$c_scm_LinkedHashMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_scm_LinkedHashMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });