sdc_client 0.158.9 → 0.160.0

package/src/simpleDomControl/sdc_server_call.js

@@ -6,7 +6,22 @@ let IS_CONNECTING = false;
 let SDC_SOCKET = null;
 let OPEN_REQUESTS = {};
 
+/**
+ * Server methods receive the arguments as keyword arguments, so they must be an
+ * object. Other values are passed as ``arg0``.
+ */
+function normalizeArgs(args) {
+  if (args === undefined || args === null) {
+    return {};
+  }
+  if (typeof args !== "object" || Array.isArray(args)) {
+    return { arg0: args };
+  }
+  return args;
+}
+
 export function callServer(app, controller, parsedContentUrl, funcName, args) {
+  args = normalizeArgs(args);
   if (window.SERVER_CALL_VIA_WEB_SOCKET) {
     return socketCallServer(app, controller, funcName, args);
   } else {
@@ -29,9 +44,6 @@ export function close() {
 }
 
 function postCallServer(parsedContentUrl, funcName, args) {
-  if (typeof args !== "object" && Array.isArray(args) && args === null) {
-    args = { arg0: args };
-  }
   args = {
     data: JSON.stringify(args),
     _sdc_func_name: funcName,
@@ -145,12 +157,17 @@ function _handle_response(data) {
     }
 
     if (data.type && data.type === "sdc_recall") {
+      // Like over HTTP: msg/header in the return value of the server method show a message.
+      const { data: returnData } = data;
+      if (returnData && typeof returnData === "object" && (returnData.msg || returnData.header)) {
+        trigger("pushMsg", returnData.header || "", returnData.msg || "");
+      }
       if (data.id && OPEN_REQUESTS[data.id]) {
         OPEN_REQUESTS[data.id][0](data.data);
         delete OPEN_REQUESTS[data.id];
       }
     } else if (data.type && data.type === "sdc_event") {
-      let event = data.event;
+      let { event } = data;
       if (event) {
         trigger(event, data.payload);
       }

package/src/simpleDomControl/sdc_test_utils.js

@@ -25,7 +25,6 @@ function setDefaults() {
 }
 
 function getCookie(name) {
-  let cookieValue = null;
   if (document.cookie && document.cookie !== "") {
     const cookies = document.cookie.split(";");
     for (let i = 0; i < cookies.length; i++) {

package/src/simpleDomControl/sdc_utils.js

@@ -1,4 +1,4 @@
-import {SdcModel, SdcQuerySet} from "../index.js";
+import { SdcModel, SdcQuerySet } from "../index.js";
 
 /**
  * Reference to the HTML body.
@@ -193,7 +193,7 @@ function progressHandlingFunction(e) {
 
     $progressContainer
       .find(".progress-bar")
-      .css({width: percentVal})
+      .css({ width: percentVal })
       .text(percentVal);
   }
 }
@@ -331,7 +331,7 @@ function parseHiddenInputs(value) {
 }
 
 export function getValueFromField(formItem) {
-  let {type, name} = formItem;
+  let { type, name } = formItem;
   if (name && name !== "") {
     if (type === "hidden") {
       return parseHiddenInputs($(formItem).val());
@@ -350,12 +350,64 @@ export function getValueFromField(formItem) {
   return null;
 }
 
+const pad2 = (n) => String(n).padStart(2, "0");
+
+/**
+ * Convert a Date, a date string or a timestamp into a valid Date.
+ * A date-only string ("YYYY-MM-DD") is read as local midnight, not UTC,
+ * so the day does not shift in time zones west of UTC.
+ *
+ * @param {*} value
+ * @returns {?Date} null if the value is empty or not a valid date
+ */
+export function toDate(value) {
+  if (value === null || value === undefined || value === "") {
+    return null;
+  }
+  let date;
+  if (value instanceof Date) {
+    date = value;
+  } else if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}$/.test(value)) {
+    const [y, m, d] = value.split("-").map(Number);
+    date = new Date(y, m - 1, d);
+  } else {
+    date = new Date(value);
+  }
+  return isNaN(date.getTime()) ? null : date;
+}
+
+/**
+ * @param {*} value
+ * @returns {string} "YYYY-MM-DD" in local time, or "" if not a valid date
+ */
+export function formatDate(value) {
+  const date = toDate(value);
+  if (!date) {
+    return "";
+  }
+  return `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`;
+}
+
+/**
+ * @param {*} value
+ * @returns {string} "YYYY-MM-DDTHH:MM" in local time, or "" if not a valid date
+ */
+export function formatDateTimeLocal(value) {
+  const date = toDate(value);
+  if (!date) {
+    return "";
+  }
+  return `${formatDate(date)}T${pad2(date.getHours())}:${pad2(date.getMinutes())}`;
+}
 
 export function setValueInField(formItem, value) {
-  let {type, name} = formItem;
+  let { type, name } = formItem;
   if (name && name !== "") {
-
-    if (type === "checkbox") {
+    if (type === "datetime-local") {
+      formItem.value = formatDateTimeLocal(value);
+    } else if (type === "date") {
+      formItem.value = formatDate(value);
+    } else if (type === "checkbox") {
       formItem.checked = !!value;
     } else if (type === "file") {
       if (value instanceof File) {
@@ -368,7 +420,7 @@ export function setValueInField(formItem, value) {
     } else if (value instanceof SdcModel) {
       $(formItem).val(value.id);
     } else if (value instanceof SdcQuerySet) {
-      $(formItem).val(`[${value.getIds().join(',')}]`);
+      $(formItem).val(`[${value.getIds().join(",")}]`);
     } else {
       if (value === null) {
         value = "";

package/src/simpleDomControl/sdc_view.js

@@ -72,7 +72,7 @@ function findSdcTgs($container, tagNameList, parentController) {
  */
 function replacePlaceholderController(controller, url, urlValues) {
   for (let key_idx in controller._urlParams) {
-    if (controller._urlParams.hasOwnProperty(key_idx)) {
+    if (Object.hasOwn(controller._urlParams, key_idx)) {
       let key = controller._urlParams[key_idx];
       let re = RegExp("%\\(" + key + "\\)\\w", "gm");
       const val = urlValues[key];
@@ -516,7 +516,22 @@ export function reconcile($virtualNode, $realNode) {
   toRemove.forEach(($element) => $element.safeRemove());
 }
 
+/**
+ * Replace the event listeners added by sdcDom (JSX on* props) on a kept node
+ * with the listeners of its new virtual counterpart.
+ */
+function syncListeners(real, virtual) {
+  if (!real || !virtual || (!real._sdcListeners && !virtual._sdcListeners)) {
+    return;
+  }
+  (real._sdcListeners ?? []).forEach(([type, fn]) => real.removeEventListener(type, fn));
+  const listeners = virtual._sdcListeners ?? [];
+  listeners.forEach(([type, fn]) => real.addEventListener(type, fn));
+  real._sdcListeners = listeners;
+}
+
 function syncAttributes($real, $virtual) {
+  syncListeners($real[0], $virtual[0]);
   const realAttrs = $real[0].attributes ?? [];
   const virtualAttrs = $virtual[0].attributes ?? [];
   // Remove missing attrs

package/.github/workflows/node.js.yml

@@ -1,38 +0,0 @@
-# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
-
-name: Node.js CI
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-
-    - name: Install dependencies (npm)
-      run: |
-        npm i -g yarn
-        yarn install
-
-    - name: Run Tests
-      run: |
-        yarn test
-      

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,17 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="myValues">
-        <value>
-          <list size="1">
-            <item index="0" class="java.lang.String" itemvalue="keydown" />
-          </list>
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-    <inspection_tool class="JSHint" enabled="true" level="ERROR" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Poetry (SimpleDomControlClient)" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/SimpleDomControlClient.iml" filepath="$PROJECT_DIR$/SimpleDomControlClient.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>