sdc_client 0.57.14 → 0.57.16

package/src/simpleDomControl/sdc_utils.js

@@ -4,7 +4,7 @@
  * @private
  */
 let _$body;
-const arg_names_reg = /([^\s,]+)/g;
+const arg_names_reg = /((?<=^|,\s*)[^\s,]+)/g;
 const commend_reg = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 
 /**

package/src/simpleDomControl/sdc_view.js

@@ -4,7 +4,7 @@ import {
   runControlFlowFunctions,
   updateEventAndTriggerOnRefresh
 } from "./sdc_controller.js";
-import {getUrlParam} from "./sdc_params.js";
+import {getUrlParam, prepareData} from "./sdc_params.js";
 import {app} from "./sdc_main.js";
 import {trigger} from "./sdc_events.js";
 
@@ -89,7 +89,7 @@ function replacePlaceholderController(controller, url, urlValues) {
  * @param {object} args - get args.
  * @param tag - a normalized tag-name as string.
  * @param hardReload - true if the file has to be reloaded every time.
- * @returns {Promise<Boolean>} - waits for the file to be loaded.
+ * @returns {Promise<jQuery|Boolean>} - waits for the file to be loaded.
  */
 function loadHTMLFile(path, args, tag, hardReload) {
   if (!path) {
@@ -136,7 +136,7 @@ function replaceAllTagElementsInContainer($container, parentController, process
  * correct URL. Also parses the url parameter
  *
  * @param {AbstractSDC} controller - controller object
- * @returns {string} - the correct URL with prefix.
+ * @returns {{url: String, args: Array}} - the correct URL with prefix.
  */
 function parseContentUrl(controller) {
   let url = controller.contentUrl;
@@ -187,7 +187,7 @@ export function getController($elem) {
 export function loadFilesFromController(controller) {
   let getElements = {args: {}};
   if (controller.contentUrl) {
-    getElements = parseContentUrl(controller, controller.contentUrl);
+    getElements = parseContentUrl(controller);
     controller.contentUrl = getElements.url;
   }
 
@@ -219,7 +219,7 @@ export function loadFilesFromController(controller) {
  */
 export function reloadHTMLController(controller) {
   if (controller.contentUrl) {
-    let getElements = parseContentUrl(controller, controller.contentUrl);
+    let getElements = parseContentUrl(controller);
     controller.contentUrl = getElements.url;
     return loadHTMLFile(controller.contentUrl, getElements.args, controller._tagName, controller.contentReload);
   }
@@ -330,14 +330,19 @@ function _reloadMethodHTML(controller, $dom, process) {
 
 
     if (typeof result === 'function') {
-      result = result.bind(controller)($this.data());
+      const newData = prepareData($this.data());
+      result = result.bind(controller)(newData);
     }
-    if (result !== undefined) {
+    if (result) {
       plist.push(Promise.resolve(result).then((x) => {
         let $newContent = $(`<div></div>`);
         $newContent.append(x);
-        $newContent = $this.clone().empty().append($newContent);
-        return app.reconcile(controller, $newContent, $this, process);
+
+        if ($this.html() === '') {
+          $this.append('<div></div>');
+        }
+
+        return app.reconcile(controller, $newContent, $this.children(), process);
       }));
     }
 
@@ -363,7 +368,7 @@ function getNodeKey(node) {
   return res.join('__');
 }
 
-function reconcileTree($element, id = [], parent = null) {
+function reconcileTree({$element, id = [], parent = null}) {
   id.push(getNodeKey($element));
   const obj = {
     $element,
@@ -372,21 +377,26 @@ function reconcileTree($element, id = [], parent = null) {
     idx: 0,
     getRealParent: () => parent,
     getIdx: function () {
-      this.idx = (this.getRealParent()?.getIdx() ?? -1) + $element.index() + 1;
+      this.idx = Math.max(0, (this.getRealParent()?.getIdx() ?? -1) + $element.index() + 1);
       return this.idx;
     },
     op: null,
     parent
   };
   obj.getIdx.bind(obj);
-  return [obj].concat($element.contents().toArray().map((x) => reconcileTree($(x), id.slice(), obj)).flat());
+  return [obj].concat($element.contents().toArray().map((x) => reconcileTree({
+    $element: $(x),
+    id: id.slice(),
+    parent: obj
+  })).flat());
 
 }
 
 
 export function reconcile($virtualNode, $realNode) {
-  const $old = reconcileTree($realNode);
-  const $new = reconcileTree($virtualNode);
+
+  const $old = reconcileTree({$element: $realNode});
+  const $new = reconcileTree({$element: $virtualNode});
   $old.map((x, i) => x.idx = i);
   $new.map((x, i) => x.idx = i);
   const depth = Math.max(...$new.concat($old).map(x => x.depth));
@@ -396,38 +406,40 @@ export function reconcile($virtualNode, $realNode) {
   window.OPS = op_steps;
 
   op_steps.forEach((op_step, i) => {
-    const {op, $element, idx} = op_step;
-
-    if (op.type === 'keep_counterpart') {
-      let cIdx = op.counterpart.getIdx();
-      if (cIdx !== idx) {
-        const elemBefore = op_step.getBefore();
-        if (!elemBefore) {
-          op_step.getRealParent().$element.prepend(op.counterpart.$element);
-        } else {
-          op.counterpart.$element.insertAfter(elemBefore.$element);
+      const {op, $element, idx} = op_step;
+
+      if (op.type === 'keep_counterpart') {
+        let cIdx = op.counterpart.getIdx();
+        if (cIdx !== idx) {
+          const elemBefore = op_step.getBefore();
+          if (!elemBefore) {
+            op_step.getRealParent().$element.prepend(op.counterpart.$element);
+          } else {
+            op.counterpart.$element.insertAfter(elemBefore.$element);
+          }
         }
-      }
 
-      syncAttributes(op.counterpart.$element, $element);
-      if ($element.hasClass(CONTROLLER_CLASS)) {
-        $element.data(DATA_CONTROLLER_KEY).$container = op.counterpart.$element;
-        $element.data(DATA_CONTROLLER_KEY, null);
-      }
+        syncAttributes(op.counterpart.$element, $element);
+        if ($element.hasClass(CONTROLLER_CLASS)) {
+          $element.data(DATA_CONTROLLER_KEY).$container = op.counterpart.$element;
+          $element.data(DATA_CONTROLLER_KEY, null);
+        }
 
-      toRemove.push($element);
-    } else if (op.type === 'delete') {
-      $element.safeRemove();
-    } else if (op.type === 'insert') {
-      const {after, target} = op_step.op;
-      if (after) {
-        $element.insertAfter(after.$element);
-      } else if (target) {
-        target.$element.prepend($element);
-      }
+        toRemove.push($element);
+      } else if (op.type === 'delete') {
+        $element.safeRemove();
+      } else if (op.type === 'insert') {
+        const {after, target} = op_step.op;
+        if (after) {
+          $element.insertAfter(after.$element);
+        } else if (target) {
+          target.$element.prepend($element);
+        }
 
+      }
     }
-  });
+  )
+  ;
 
   toRemove.forEach(($element) => $element.safeRemove());
 }
@@ -504,7 +516,7 @@ function lcbDiff(oldNodes, newNodes, depth) {
 
   function getBefore(element, idx) {
     const startDepth = element.depth;
-    while (idx >= 0 && element.depth >= startDepth) {
+    while (idx >= 1 && element.depth >= startDepth) {
       idx -= 1;
       element = newNodes[idx];
       if (element.depth === startDepth) {
@@ -563,7 +575,7 @@ export function refresh($dom, leafController, process = null) {
   $dom ??= leafController.$container;
 
   return replaceTagElementsInContainer(app.tagNames, $dom, leafController, process).then(() => {
-    reloadMethodHTML(leafController, $dom, refreshProcess).then(() => {
+    return reloadMethodHTML(leafController, $dom, refreshProcess).then(() => {
       if (!isRunningProcess) {
         updateEventAndTriggerOnRefresh(refreshProcess);
       }