@yuneta/gobj-ui 7.26.31 → 7.26.33

package/src/c_g6_nodes_tree.js

@@ -5295,10 +5295,12 @@ function name_form_control(parent, control)
     }
     control.id = 'g6-form-control-' + (++form_control_seq);
     label.htmlFor = control.id;
-    control.setAttribute('title', t(key));
-    control.setAttribute('data-i18n-title', key);
-    control.setAttribute('aria-label', t(key));
-    control.setAttribute('data-i18n-aria-label', key);
+    /*  The label's own key, read back from its DOM: it was read where the
+     *  label was built  */
+    control.setAttribute('title', t(/* i18n: data */ key));
+    control.setAttribute('data-i18n-title', /* i18n: data */ key);
+    control.setAttribute('aria-label', t(/* i18n: data */ key));
+    control.setAttribute('data-i18n-aria-label', /* i18n: data */ key);
 }
 
 function create_form_color_input(parent, value, onInput)

package/src/c_yui_form.js

@@ -803,11 +803,12 @@ function build_html_form(gobj, $form, prefix, template)
             : [field_desc.name];
         const NO_I18N = "\x00";
         html_field_conf.label = t(label_keys, {defaultValue: field_desc.header});
+        /*  A column of the template: the host's schema, data  */
         html_field_conf.label_i18n =
-            (t(field_desc.name, {defaultValue: NO_I18N}) !== NO_I18N)
+            (t(/* i18n: data */ field_desc.name, {defaultValue: NO_I18N}) !== NO_I18N)
                 ? field_desc.name
                 : null;
-        html_field_conf.placeholder = field_desc.placeholder?t(field_desc.placeholder):'';
+        html_field_conf.placeholder = field_desc.placeholder?t(/* i18n: data */ field_desc.placeholder):'';
 
         let placeholders = gobj_read_attr(gobj, "placeholders");
         if(placeholders[key]) {
@@ -2249,7 +2250,7 @@ function template2columns(gobj, columns, template, sub_elements)
         let validator = [];
         let column = {
             field: field_desc.name,
-            title: t(field_desc.header || field_desc.name),
+            title: t(/* i18n: data */ field_desc.header || field_desc.name),    // the host's schema
             titleFormatter: text_title_formatter,
             editable: get_editable_state,
             editor: false,
@@ -2626,7 +2627,7 @@ function mark_field_validity($input)
     if($h) {
         let key = field_validation_key($input);
         if(key) {
-            $h.setAttribute('data-i18n', key);
+            $h.setAttribute('data-i18n', /* i18n: C_YUI_FORM_I18N_KEYS, FORM_JSON_FIELD_I18N_KEYS */ key);
         } else {
             $h.removeAttribute('data-i18n');    // the browser's own sentence
         }
@@ -2766,10 +2767,13 @@ function get_form_values(gobj, $form)
                 break;
 
             case "fieldset":
-                /*
-                 *  HACK: really this is the path of the value.
-                 *  We are navigating by a tree data structure; this is one node, not a leaf.
-                 */
+                /*  A NODE of the template, not a leaf: its value is the
+                 *  dict its own fields fill, and they come after it in the
+                 *  document. No json anybody typed, so it skips the
+                 *  conversion below, which handed its null on (7.26.8 to
+                 *  7.26.32): the fields found no dict to write into and the
+                 *  save stored the node as null.  */
+                value = {};
                 break;
 
             case "table":
@@ -2810,7 +2814,9 @@ function get_form_values(gobj, $form)
                 break;
         }
 
-        value = form_value_2_treedb_value(gobj, field_desc, value);
+        if(tag !== "fieldset") {
+            value = form_value_2_treedb_value(gobj, field_desc, value);
+        }
         let path;
         if(empty_string(prefix)) {
             path = name;

package/src/c_yui_treedb_graph.js

@@ -1367,7 +1367,9 @@ function answer_print_tranger_refused(gobj, path, answer)
 
 /************************************************************
  *  The text of a transport's refusal: gobj_command() answers a string,
- *  a command response or a number.
+ *  a command response or a number. Data only ("" when it says
+ *  nothing): the caller writes its own key as the fallback, where
+ *  validate-locales reads it.
  ************************************************************/
 function refusal_text(ret)
 {
@@ -1377,7 +1379,7 @@ function refusal_text(ret)
     if(ret && typeof ret === "object" && typeof ret.comment === "string" && ret.comment) {
         return ret.comment;
     }
-    return "print-tranger failed";
+    return "";
 }
 
 /************************************************************
@@ -1412,7 +1414,8 @@ function request_print_tranger(gobj, path)
         }, gobj);
     if(ret) {
         log_error(ret);
-        answer_print_tranger_refused(gobj, path, {error: /* i18n: data */ refusal_text(ret)});
+        answer_print_tranger_refused(gobj, path,
+            {error: /* i18n: data */ refusal_text(ret) || "print-tranger failed"});
         return;
     }
     if(path) {

package/src/c_yui_treedb_topics.js

@@ -2230,7 +2230,9 @@ function answer_print_tranger_refused(gobj, path, answer)
 
 /************************************************************
  *  The text of a transport's refusal: gobj_command() answers a string,
- *  a command response or a number.
+ *  a command response or a number. Data only ("" when it says
+ *  nothing): the caller writes its own key as the fallback, where
+ *  validate-locales reads it.
  ************************************************************/
 function refusal_text(ret)
 {
@@ -2240,7 +2242,7 @@ function refusal_text(ret)
     if(ret && typeof ret === "object" && typeof ret.comment === "string" && ret.comment) {
         return ret.comment;
     }
-    return "print-tranger failed";
+    return "";
 }
 
 /************************************************************
@@ -2274,7 +2276,8 @@ function request_print_tranger(gobj, path)
         }, gobj);
     if(ret) {
         log_error(ret);
-        answer_print_tranger_refused(gobj, path, {error: /* i18n: data */ refusal_text(ret)});
+        answer_print_tranger_refused(gobj, path,
+            {error: /* i18n: data */ refusal_text(ret) || "print-tranger failed"});
         return;
     }
     if(path) {

package/src/form_template_field.wiring.test.js

@@ -0,0 +1,160 @@
+/***********************************************************************
+ *          form_template_field.wiring.test.js
+ *
+ *      A `template` field of a C_YUI_FORM in 'exec' mode is a sub-form
+ *      (a <fieldset>): a NODE of the record, whose value is the dict its
+ *      own fields fill. From 7.26.8 to 7.26.32 the node went through the
+ *      json conversion, which handed its null on: the fields below found
+ *      no dict to write into (kw_set_dict_value() refuses a null segment)
+ *      and the save stored the node as null -- the alarm colours of a
+ *      device in estadodelaire, wiped by every save of its settings.
+ *      Driven through the real gclass on a document double, with the
+ *      template of those settings.
+ *
+ *          Copyright (c) 2026, ArtGins.
+ *          All Rights Reserved.
+ ***********************************************************************/
+import {describe, test, expect, beforeAll, beforeEach} from "vitest";
+import {install_dom_double} from "../test/dom_double.js";
+
+install_dom_double();
+
+if(typeof globalThis.ResizeObserver === "undefined") {
+    globalThis.ResizeObserver = class {
+        observe() {}
+        unobserve() {}
+        disconnect() {}
+    };
+}
+
+const {
+    SDATA_END, gclass_create,
+    gobj_start_up, gobj_create_yuno, gobj_create_pure_child,
+    gobj_start, gobj_send_event, gobj_read_attr,
+    set_log_callback,
+} = await import("@yuneta/gobj-js");
+const {register_c_yui_form} = await import("./c_yui_form.js");
+
+const saved = [];
+const logged = [];
+let yuno = null;
+
+/*  The settings template of an estadodelaire device type, cut down to
+ *  the sub-form and one field beside it.  */
+const TEMPLATE = {
+    template_version: {
+        type: "integer",
+        default: 7,
+        flag: ["hidden", "persistent"]
+    },
+    alarm_colors: {
+        type: "object",
+        flag: ["writable", "persistent", "template"],
+        template: {
+            active_not_validated: {
+                type: "string",
+                default: "red",
+                flag: ["writable", "persistent", "color"]
+            },
+            active_validated: {
+                type: "string",
+                default: "#e5a50a",
+                flag: ["writable", "persistent", "color"]
+            },
+            not_active_not_validated: {
+                type: "string",
+                default: "Fuchsia",
+                flag: ["writable", "persistent", "color"]
+            }
+        }
+    }
+};
+
+beforeAll(async () => {
+    const i18next = (await import("i18next")).default;
+    await i18next.init({lng: "en", resources: {}});
+    gobj_start_up(null, null, null, null, null, null, null);
+    set_log_callback((level, msg) => {
+        logged.push({level: String(level), msg: String(msg)});
+    });
+    gclass_create("C_TEST_FORM_HOST", [], [["ST_IDLE", []]], {}, 0, [SDATA_END()], {}, 0, 0, 0, 0);
+    gclass_create(
+        "C_TEST_FORM_APP",
+        [["EV_SAVE_RECORD", 0], ["EV_RECORD_CHANGED", 0]],
+        [["ST_IDLE", [
+            ["EV_SAVE_RECORD", (gobj, event, kw) => {
+                saved.push(kw);
+                return 0;
+            }, null],
+            ["EV_RECORD_CHANGED", () => 0, null],
+        ]]],
+        {}, 0, [SDATA_END()], {}, 0, 0, 0, 0
+    );
+    register_c_yui_form();
+    yuno = gobj_create_yuno("form_template_yuno", "C_TEST_FORM_HOST", {});
+    gobj_start(yuno);
+});
+
+beforeEach(() => {
+    saved.length = 0;
+    logged.length = 0;
+});
+
+let seq = 0;
+
+function build(record)
+{
+    const app = gobj_create_pure_child(`tapp${++seq}`, "C_TEST_FORM_APP", {}, yuno);
+    gobj_start(app);
+    const form = gobj_create_pure_child(`tform${seq}`, "C_YUI_FORM", {
+        template: TEMPLATE,
+        record: record,
+        editable: true,
+    }, app);
+    gobj_start(form);
+    const $c = gobj_read_attr(form, "$container");
+    expect($c.querySelector("fieldset")).toBeTruthy();     // exec mode: a sub-form
+    return form;
+}
+
+function errors()
+{
+    return logged.filter(l => /error/i.test(l.level) || /ERROR/.test(l.msg));
+}
+
+describe("a template field in exec mode (a sub-form)", () => {
+    test("is saved as the dict its fields fill", () => {
+        const form = build({
+            template_version: 7,
+            alarm_colors: {
+                active_not_validated: "#ff0000",
+                active_validated: "#e5a50a",
+                not_active_not_validated: "#ff00ff"
+            }
+        });
+        gobj_send_event(form, "EV_SAVE_RECORD", {}, form);
+        expect(saved.length).toBe(1);
+        expect(saved[0].alarm_colors).toEqual({
+            active_not_validated: "#ff0000",
+            active_validated: "#e5a50a",
+            not_active_not_validated: "#ff00ff"
+        });
+        expect(saved[0].template_version).toBe(7);
+        expect(errors()).toEqual([]);
+    });
+
+    test("left null by a save before the fix, comes back with its defaults", () => {
+        const form = build({
+            template_version: 7,
+            alarm_colors: null
+        });
+        gobj_send_event(form, "EV_SAVE_RECORD", {}, form);
+        expect(saved.length).toBe(1);
+        expect(saved[0].alarm_colors).toEqual({
+            active_not_validated: "red",
+            active_validated: "#e5a50a",
+            not_active_not_validated: "Fuchsia"
+        });
+        expect(errors()).toEqual([]);
+    });
+});

package/src/i18n_key_functions.js

@@ -30,7 +30,8 @@
  *                                           of the array `actions`
  *                          A position may also hold DOM or nothing: only
  *                          a string there is a key. DOM is an array (a
- *                          createElement2 spec), a call of createElement2(),
+ *                          createElement2 spec; an array of string
+ *                          literals is none), a call of createElement2(),
  *                          createOneHtml() or html_markup() of gobj-js, of
  *                          text_node() of gobj-ui, of document.createElement()
  *                          and the like, a const bound to one, a plain `let`
@@ -39,43 +40,64 @@
  *
  *          What is read at a position: a string literal, a template with
  *          no `${}`, every branch of a `?:`, `||`, `??` (the right one of
- *          `&&`), and what the reader follows -- a const to its value, a
- *          property of a const object, the element of a const array a
- *          `.map()` or a for...of walks (and what a destructuring reads
- *          from it), String(x) and `${x}` as x, the default of a parameter,
- *          a call of a function of the same module whose every return is
- *          one of these. A `let`, a parameter or data is not read: its keys
- *          are published in an exported `<NAME>_I18N_KEYS` array, and the
- *          call is MARKED with a comment right before what it hands over,
- *          `i18n: <NAME>_I18N_KEYS` (the list) or `i18n: data` (no key a
- *          list can hold). A marked `let` is held to its marker: every
- *          literal it is given is read and must be in the list, and one
- *          given nothing but literals fails (write it as a const, which the
- *          reader follows). A `data` marker on what the reader follows to
- *          keys and nothing else -- a literal, a const or a branch that is
- *          one, a call that returns literals -- fails too: it claims data
- *          where the reader reads a key.
+ *          `&&`), and what the reader follows -- a const to its value (what
+ *          a destructuring reads from it too), an import of a const or a
+ *          function of a module the reader reads, a property of a const
+ *          object or of a copy of one (`{...o}`), the element of a const
+ *          array a `.map()` or a for...of walks (and what a destructuring
+ *          reads from it), String(x) and `${x}` as x, the default of a
+ *          parameter, a call of a function -- of the module or imported --
+ *          whose every return is one of these (read once; a recursion is
+ *          not followed). A `let`, a parameter or data is not read: its
+ *          keys are published in an exported `<NAME>_I18N_KEYS` array (an
+ *          `export const`, never mutated), and the call is MARKED with a
+ *          comment right before what it hands over, `i18n: <NAME>_I18N_KEYS`
+ *          (the list) or `i18n: data` (no key a list can hold). A marked
+ *          `let` is held to its marker: every literal it is given is read
+ *          and must be in the list, and one given nothing but literals fails
+ *          (write it as a const, which the reader follows). A `data` marker
+ *          on what the reader follows to keys and nothing else -- a
+ *          literal, a const or a branch that is one, a call that returns
+ *          literals -- fails too: it claims data where the reader reads a
+ *          key; and so does one that would hide a key the reader does not
+ *          read: a call whose returns mix keys with data, an array of
+ *          string literals.
+ *
+ *          A call reaches a function of this table however it names it:
+ *          its name, an import under any name, a re-export, a const alias,
+ *          a map (`API.info(...)`), `.call()`, `.apply()`.
  *
  *          The rule, per CALL: a key position given anything else than a
  *          literal (or DOM, or nothing), a const the reader follows, a key
  *          position of the enclosing table function handed on, or a marked
- *          value fails, with the file and the line; a TRANSLATED text,
- *          t("..."), fails even marked (it would be translated again, and
- *          never change language). A test (i18n_key_functions.test.js)
- *          holds the library to it, and validate-locales an app's own code.
- *          Publishing a list exempts no module.
+ *          value fails, with the file and the line; a TRANSLATED text --
+ *          t("..."), tr(), an alias of t, `t?.()`, `t.call()` -- fails even
+ *          marked (it would be translated again, and never change
+ *          language). A test (i18n_key_functions.test.js) holds the library
+ *          to it, and validate-locales an app's own code. Publishing a list
+ *          exempts no module.
  *
- *          The table is COMPLETE, and the same test proves it: it finds
- *          every function of the library that hands one of its parameters
- *          -- or what it reads from one, `opts.title`, a destructured
- *          `{label}`, each `items[].name` -- to t(), to an `i18n`, `code` or
- *          `data-i18n*` value, or to a key position of a function of this
- *          table (REV-CLOUD V21.4.1: up to 7.26.28 it lacked 39 such
- *          functions, and 6 entries lacked positions).
+ *          The table is COMPLETE and CORRECT, and the same test proves both
+ *          (REV-CLOUD V21.4.1, V22): it finds every function of the library
+ *          that hands one of its parameters -- or what it reads from one:
+ *          `opts.title`, `opts?.title`, a destructured `{label}` (in the
+ *          parameter or in the body), each `items[].name`, `arguments[1]`,
+ *          `rest[0]`, a copy `{...opts}` -- to a translator, to an `i18n`,
+ *          `code` or `data-i18n*` value (`el.dataset.i18nTitle` included),
+ *          or to a key position of a function of this table, and fails on
+ *          a function missing here; and the same search, started from NO
+ *          table, must find every entry here, at every position, with the
+ *          same `exported`: an entry nothing forwards to fails. A function
+ *          that hands a parameter on through what no position can name --
+ *          `k.toLowerCase()`, a concatenation or a template, an iteration
+ *          of `Object.entries(opts)`, a rest parameter walked, `arguments`
+ *          by a computed index, a parameter an array pattern destructures
+ *          -- fails too, unless it marks it where it hands it.
  *          One called by name goes here, with that position. One nothing
  *          calls by name -- an FSM action, a callback, a method -- has no
  *          call to read: it marks what it hands on, where it hands it. What
- *          a gobj keeps in its `priv` is its own state, never a position.
+ *          a gobj keeps in its `priv`, and what is read from a parameter
+ *          `gobj` (its attrs), is its own state, never a position.
  *
  *          Copyright (c) 2026, ArtGins.
  *          All Rights Reserved.
@@ -140,6 +162,7 @@ export const I18N_KEY_FUNCTIONS = Object.freeze([
         keys: ["0.id", "0.roll.label", "0.spec", "0.spec.id"]},
     {module: "c_yui_period.js", name: "build_mode_button", exported: false,
         keys: ["1.id", "1.roll.label", "1.spec", "1.spec.id"]},
+    {module: "yui_table_select.js", name: "paint_label", exported: false, keys: ["1"]},
     {module: "c_yui_form.js", name: "cell_icon", exported: false, keys: ["1"]},
     {module: "c_yui_form.js", name: "name_form_control", exported: false, keys: ["1.label_i18n", "1.label"]},
     {module: "c_yui_form.js", name: "create_form_field", exported: false,
@@ -183,7 +206,7 @@ export const I18N_KEY_FUNCTIONS = Object.freeze([
     {module: "c_yui_schema_editor.js", name: "render_import_plan", exported: false,
         keys: ["1.conflicts[].code", "1.writes[].op"]},
     {module: "schema_validate.js", name: "add", exported: false, keys: ["1"]},
-    {module: "c_g6_nodes_tree.js", name: "create_floating_icon", exported: false, keys: ["4"]},
+    {module: "c_g6_nodes_tree.js", name: "create_floating_icon", exported: true, keys: ["4"]},
     {module: "c_g6_nodes_tree.js", name: "show_dual_icons", exported: false, keys: ["3", "5"]},
     {module: "c_g6_nodes_tree.js", name: "create_form_label", exported: false, keys: ["1"]},
     {module: "c_g6_nodes_tree.js", name: "create_form_select", exported: false, keys: ["1[].i18n"]},