@yuneta/gobj-ui 7.23.195 → 7.23.197

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.23.195",
+  "version": "7.23.197",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_yui_schema_editor.js

@@ -19,13 +19,15 @@
  *      fkey, the order of a new sibling, the version that publishes
  *      the change.
  *
- *      THE VERSION IS THE POINT, not a detail. A topic whose columns
- *      changed and whose `topic_version` did not is a topic whose
- *      persisted `topic_cols.json` masks the whole edit: the restart
- *      succeeds and nothing moved. Nothing in the store says so, and
- *      the log that would is on the node. So every write here raises
- *      the version of the topic it touched, and the toolbar says which
- *      topics are waiting for a restart.
+ *      AN EDIT IS A DRAFT. A write here moves no version and reaches no
+ *      treedb: the host SAVES it (C_TREEDB's save-schema raises the
+ *      topic_version of what changed and the schema_version, once) and
+ *      APPLIES it (apply-schema + a restart of the owning yuno). Until
+ *      the owner's design of M36 (2026-09-21 review) every write here
+ *      raised both versions, so an edit half made was already the
+ *      schema of the next start. The topic list marks what this session
+ *      wrote and has not saved; the host's EV_REFRESH after a save is
+ *      what forgets it.
  *
  *      WHAT ELSE IS HERE, and why each is here and not somewhere else:
  *
@@ -572,21 +574,23 @@ function start_measuring(gobj)
 }
 
 /***************************************************************
- *  "This topic was written and its version did not move."
+ *  "This topic was written in this session and is not saved."
  *
- *  ONE predicate, because it is asked in two places -- the topic
- *  list draws a chip with it and the column view draws a banner --
- *  and two copies of a rule is how they drift.
+ *  An edit is a DRAFT: it moves no version and reaches no treedb
+ *  until the host saves it (C_TREEDB's save-schema, which raises the
+ *  versions of what changed) -- and the save makes the host send
+ *  EV_REFRESH, whose reload is what forgets the drafts.
+ *
+ *  ONE predicate, because it is asked in three places -- the topic
+ *  list draws a chip with it, the column view a banner, the export
+ *  a warning -- and copies of a rule are how they drift.
  ***************************************************************/
-function needs_version_bump(written, baseline, topic)
+function topic_is_draft(written, topic)
 {
-    if(!topic || !written || !baseline) {
-        return false;
-    }
-    if(!written[topic.id]) {
+    if(!topic || !written) {
         return false;
     }
-    return String(baseline[topic.id]) === String(topic.topic_version);
+    return written[topic.id]? true: false;
 }
 
 /***************************************************************
@@ -1041,7 +1045,7 @@ function render_topics(gobj, $body)
     let twice = repeated_names(treedb.topics);
     let $rows = [];
     for(let topic of treedb.topics) {
-        let pending = needs_version_bump(priv.written, priv.baseline, topic);
+        let pending = topic_is_draft(priv.written, topic);
         /*  Two topics of one name: the id is what tells them apart, and
          *  it is what the url has to carry — addressing by name would
          *  open the first one whichever row was clicked.  */
@@ -1192,7 +1196,7 @@ function render_columns(gobj, $body)
      *  The version banner: the one thing that makes
      *  an edit succeed and change nothing.
      *----------------------------------------------*/
-    let $banner = version_banner(gobj, topic);
+    let $banner = draft_banner(gobj, topic);
     if($banner) {
         $wrap.appendChild($banner);
     }
@@ -1235,48 +1239,34 @@ function render_columns(gobj, $body)
 }
 
 /***************************************************************
- *  "This topic changed and its version did not."
+ *  "This topic has changes that are not saved."
  *
- *  Only shown when it is TRUE — the topic was written in this
- *  session and its `topic_version` still reads what it read when
- *  the model loaded. Every write this view makes raises it, so
- *  the banner is for the case where something else did not: an
- *  edit made from the raw tables, or a bump undone by hand.
+ *  A draft, not an error: the edit is in __system__ and moves no
+ *  version, so the treedb does not see it until the host saves it
+ *  (and applies it). The banner says so and offers nothing -- the
+ *  save is the host's, one level up, because it publishes the whole
+ *  treedb and not one topic.
  ***************************************************************/
-function version_banner(gobj, topic)
+function draft_banner(gobj, topic)
 {
     let priv = gobj.priv;
 
-    if(!needs_version_bump(priv.written, priv.baseline, topic)) {
+    if(!topic_is_draft(priv.written, topic)) {
         return null;
     }
     if(is_readonly(gobj)) {
         return null;
     }
 
-    let $banner = createElement2(
-        ["div", {class: "SCHEMA_VERSION_BANNER notification is-warning is-light p-3 mb-3 " +
+    return createElement2(
+        ["div", {class: "SCHEMA_DRAFT_BANNER notification is-warning is-light p-3 mb-3 " +
                         "is-flex is-align-items-center", style: "gap:.5rem;"}, [
             ["span", {class: "icon"}, [["i", {class: "yi-triangle-exclamation"}]]],
-            ["span", {class: "SCHEMA_VERSION_TEXT is-size-7", i18n: "version not raised"},
-                t("version not raised")],
-            ["button", {class: "SCHEMA_VERSION_BUMP button is-warning",
-                        type: "button",
-                        style: "margin-left:auto;",
-                        title: t("raise the version"), "aria-label": t("raise the version"),
-                        "data-i18n-title": "raise the version",
-                        "data-i18n-aria-label": "raise the version"}, [
-                ["span", {class: "icon"}, [["i", {class: "yi-circle-up"}]]],
-                ["span", {i18n: "raise"}, t("raise")]
-            ]]
+            ["span", {class: "SCHEMA_DRAFT_TEXT is-size-7",
+                      i18n: "unsaved schema changes: save to publish them"},
+                t("unsaved schema changes: save to publish them")]
         ]]
     );
-    let $bump = $banner.querySelector(".SCHEMA_VERSION_BUMP");
-    $bump.addEventListener("click", (evt) => {
-        evt.stopPropagation();
-        gobj_send_event(gobj, "EV_BUMP_VERSION", {topic: topic.name}, gobj);
-    });
-    return $banner;
 }
 
 /***************************************************************
@@ -2001,6 +1991,8 @@ function open_report(gobj, findings, treedb_id)
  ***************************************************************/
 function open_export(gobj, treedb)
 {
+    let priv = gobj.priv;
+    let drafts = treedb.topics.some((topic) => topic_is_draft(priv.written, topic));
     let c_text = schema_to_c(treedb);
     let json_text = JSON.stringify(schema_to_json(treedb), null, 4);
 
@@ -2017,11 +2009,20 @@ function open_export(gobj, treedb)
             ["p", {class: "SCHEMA_EXPORT_HELP help mb-2",
                    i18n: "an edit made here works and lives in no source: this is what to paste back"},
                 t("an edit made here works and lives in no source: this is what to paste back")],
+            drafts
+                ? ["p", {class: "SCHEMA_EXPORT_DRAFTS notification is-warning is-light p-2 mb-2 is-size-7",
+                         i18n: "unsaved changes: save first, so the literal carries the versions that publish it"},
+                    t("unsaved changes: save first, so the literal carries the versions that publish it")]
+                : ["span", {}, ""],
             ["textarea", {class: "SCHEMA_EXPORT_TEXT textarea is-small is-family-monospace",
-                          rows: "18", readonly: "readonly", spellcheck: "false"}, c_text],
+                          rows: "18", readonly: "readonly", spellcheck: "false",
+                          title: t("schema"), "data-i18n-title": "schema",
+                          "aria-label": t("schema"), "data-i18n-aria-label": "schema"}, c_text],
             ["div", {class: "SCHEMA_EXPORT_ACTIONS is-flex mt-3",
                      style: "gap:.5rem; justify-content:flex-end;"}, [
-                ["button", {class: "SCHEMA_EXPORT_COPY button", type: "button"}, [
+                ["button", {class: "SCHEMA_EXPORT_COPY button", type: "button",
+                            title: t("copy"), "data-i18n-title": "copy",
+                            "aria-label": t("copy"), "data-i18n-aria-label": "copy"}, [
                     ["span", {class: "icon"}, [["i", {class: "yi-copy"}]]],
                     ["span", {i18n: "copy"}, t("copy")]
                 ]]
@@ -2240,51 +2241,6 @@ function open_orphans(gobj)
 
 
 
-/***************************************************************
- *  THE TWO VERSIONS A SCHEMA EDIT HAS TO RAISE, and why both.
- *
- *  `topic_version` is what publishes a change of a topic's
- *  columns: leave it and the persisted `topic_cols.json` masks
- *  the edit, the restart succeeds and nothing moved.
- *
- *  `schema_version` is what publishes the schema as a whole —
- *  "the stored one wins on ties, and the incoming one has to be
- *  strictly newer to take over" (c_treedb.c). It is safe to
- *  raise: re-projection from C compares `c_schema_version`, the
- *  version of the LITERAL, precisely so that an edit made here
- *  survives every start until a newer literal arrives.
- *
- *  So every write that changes a schema carries both, and the
- *  operator is never asked to remember either.
- ***************************************************************/
-function version_writes(gobj, topic)
-{
-    let treedb = current_treedb(gobj);
-    let writes = [];
-
-    if(topic) {
-        let version = Number(topic.topic_version);
-        if(!isFinite(version)) {
-            version = 0;
-        }
-        writes.push({
-            op: "update", topic_name: T_TOPICS,
-            record: {id: topic.id, topic_version: version + 1}
-        });
-    }
-    if(treedb) {
-        let version = Number(treedb.schema_version);
-        if(!isFinite(version)) {
-            version = 0;
-        }
-        writes.push({
-            op: "update", topic_name: T_TREEDBS,
-            record: {id: treedb.id, schema_version: version + 1}
-        });
-    }
-    return writes;
-}
-
 /***************************************************************
  *  WHERE THE COLUMNS WERE before this session started moving them.
  *
@@ -2968,7 +2924,7 @@ function ac_save_column(gobj, event, kw, src)
         op:         kw.creating ? "create" : "update",
         topic_name: T_COLS,
         record:     column_record(gobj, topic, col, values)
-    }].concat(version_writes(gobj, topic)));
+    }]);
 }
 
 function ac_delete_column(gobj, event, kw, src)
@@ -3026,7 +2982,7 @@ function ac_move_column(gobj, event, kw, src)
     if(writes.length === 0) {
         return 0;       /*  dropped where it already was  */
     }
-    return queue_writes(gobj, writes.concat(version_writes(gobj, topic)));
+    return queue_writes(gobj, writes);
 }
 
 /***************************************************************
@@ -3055,7 +3011,7 @@ function ac_undo_order(gobj, event, kw, src)
     }
     /*  Spent: what it named is where the columns are about to be. */
     delete priv.order_undo[topic.id];
-    return queue_writes(gobj, writes.concat(version_writes(gobj, topic)));
+    return queue_writes(gobj, writes);
 }
 
 /***************************************************************
@@ -3127,7 +3083,7 @@ function ac_save_topic(gobj, event, kw, src)
         op:         kw.creating ? "create" : "update",
         topic_name: T_TOPICS,
         record:     topic_record(gobj, treedb, topic, values)
-    }].concat(version_writes(gobj, null)));
+    }]);
 }
 
 function ac_delete_topic(gobj, event, kw, src)
@@ -3148,25 +3104,6 @@ function ac_delete_topic(gobj, event, kw, src)
     return 0;
 }
 
-/***************************************************************
- *  Raising a version by hand: what the banner offers when
- *  something else wrote the topic and left its version alone.
- ***************************************************************/
-function ac_bump_version(gobj, event, kw, src)
-{
-    let priv = gobj.priv;
-    let topic = find_topic(priv.model, priv.treedb_id, kw.topic);
-
-    if(refuse_if_readonly(gobj, event)) {
-        return -1;
-    }
-    if(!topic) {
-        log_error(`${gobj_short_name(gobj)}: ${event} names no topic: ${kw.topic}`);
-        return -1;
-    }
-    return queue_writes(gobj, version_writes(gobj, topic));
-}
-
 /***************************************************************
  *  Deleting a leftover.
  ***************************************************************/
@@ -3339,7 +3276,7 @@ function ac_confirmed(gobj, event, kw, src)
             return {op: "delete", topic_name: T_COLS, record: {id: col.id}};
         });
         writes.push({op: "delete", topic_name: T_TOPICS, record: {id: topic.id}});
-        return queue_writes(gobj, writes.concat(version_writes(gobj, null)));
+        return queue_writes(gobj, writes);
     }
     if(kw.what === "column") {
         let topic = find_topic(priv.model, priv.treedb_id, kw.topic);
@@ -3350,7 +3287,7 @@ function ac_confirmed(gobj, event, kw, src)
         }
         return queue_writes(gobj, [{
             op: "delete", topic_name: T_COLS, record: {id: col.id}
-        }].concat(version_writes(gobj, topic)));
+        }]);
     }
 
     log_error(`${gobj_short_name(gobj)}: ${event} of nothing this view asked about: ${kw.what}`);
@@ -3450,8 +3387,7 @@ function create_gclass(gclass_name)
             ["EV_DELETE_COLUMN",    ac_delete_column,       null],
             ["EV_SAVE_COLUMN",      ac_save_column,         null],
             ["EV_MOVE_COLUMN",      ac_move_column,         null],
-            ["EV_UNDO_ORDER",       ac_undo_order,          null],
-            ["EV_BUMP_VERSION",     ac_bump_version,        null]
+            ["EV_UNDO_ORDER",       ac_undo_order,          null]
         ])],
 
         /*  A write, or a plan of them, in flight. Only the answers and
@@ -3494,7 +3430,6 @@ function create_gclass(gclass_name)
         ["EV_SAVE_COLUMN",          0],
         ["EV_MOVE_COLUMN",          0],
         ["EV_UNDO_ORDER",           0],
-        ["EV_BUMP_VERSION",         0],
         ["EV_VALIDATE",             0],
         ["EV_EXPORT",               0],
         ["EV_IMPORT",               0],
@@ -3549,5 +3484,5 @@ export {
     register_c_yui_schema_editor,
     /*  Exported for its test: the rule that decides whether a topic still
      *  owes a version bump, which is asked in two places.  */
-    needs_version_bump
+    topic_is_draft
 };

package/src/schema_to_c.js

@@ -19,13 +19,19 @@
  *      Two outputs, because they answer different questions:
  *        schema_to_json() — the schema as a value: to diff, to keep, to
  *                           feed back in.
- *        schema_to_c()    — the same value as the literal: single
- *                           quotes, `\n\` continuations, padded, ready
- *                           to paste.
+ *        schema_to_c()    — the same value as the WHOLE file
+ *                           `treedb_schema_<db>.c`: the graph of the
+ *                           schema as a comment (schema_to_diagram()),
+ *                           then the literal — single quotes, `\n\`
+ *                           continuations, padded. The file holds that
+ *                           and nothing else, so an export replaces it
+ *                           whole. json_to_c() does the same from the
+ *                           literal's own JSON.
  *
  *          Copyright (c) 2026, ArtGins.
  *          All Rights Reserved.
  ***********************************************************************/
+import { schema_to_diagram } from "./schema_to_diagram.js";
 import {
     col_flags,
     col_hook,
@@ -326,15 +332,25 @@ function c_pair(lines, key, value, indent, trailing)
 /***************************************************************
  *  schema_to_c(treedb, options) -> the C source text
  *
- *      options {var_name, pad}
- *          var_name  the array's name; defaults to
- *                    `treedb_schema_<treedb id without its prefix>`
- *          pad       column of the `\n\` continuation
+ *      options {var_name, pad, with_diagram}
+ *          var_name      the array's name; defaults to
+ *                        `treedb_schema_<treedb id without its prefix>`
+ *          pad           column of the `\n\` continuation
+ *          with_diagram  the graph as a comment above the array
+ *                        (default true)
  ***************************************************************/
 function schema_to_c(treedb, options)
+{
+    return json_to_c(schema_to_json(treedb), options);
+}
+
+/***************************************************************
+ *  json_to_c(json, options) -> the C source text, from the schema
+ *  as its literal holds it. Same options as schema_to_c().
+ ***************************************************************/
+function json_to_c(json, options)
 {
     let opts = options || {};
-    let json = schema_to_json(treedb);
 
     if(!json) {
         return "";
@@ -368,7 +384,30 @@ function schema_to_c(treedb, options)
         return `${line}${padding}\\n\\`;
     });
 
-    return `static char ${name}[]= "\\\n${body.join("\n")}\n";\n`;
+    let literal = `static char ${name}[]= "\\\n${body.join("\n")}\n";\n`;
+    if(opts.with_diagram === false) {
+        return literal;
+    }
+    return c_diagram_comment(schema_to_diagram(json)) + "\n" + literal;
+}
+
+/***************************************************************
+ *  The diagram as the comment that heads the file.
+ ***************************************************************/
+function c_diagram_comment(diagram)
+{
+    let lines = [
+        "/*",
+        "    Generated from the literal below by schema_to_diagram() (gobj-ui).",
+        "    This file holds this comment and the literal, nothing else: replace",
+        "    it whole with an export of the schema editor.",
+        "",
+    ];
+    for(let line of diagram.split("\n")) {
+        lines.push(line ? "    " + line : "");
+    }
+    lines.push("*/");
+    return lines.join("\n") + "\n";
 }
 
 
@@ -378,4 +417,5 @@ export {
     COL_KEY_ORDER,
     schema_to_json,
     schema_to_c,
+    json_to_c,
 };

package/src/schema_to_c.test.js

@@ -12,7 +12,8 @@
  ***********************************************************************/
 import { describe, test, expect } from "vitest";
 import { build_schema_model } from "./schema_model.js";
-import { schema_to_json, schema_to_c } from "./schema_to_c.js";
+import { schema_to_json, schema_to_c, json_to_c } from "./schema_to_c.js";
+import { schema_to_diagram } from "./schema_to_diagram.js";
 
 
 /***************************************************************
@@ -134,7 +135,24 @@ describe("schema_to_json", () => {
 });
 
 describe("schema_to_c — the round trip", () => {
-    const source = schema_to_c(TREEDB);
+    const file = schema_to_c(TREEDB);
+    const source = file.slice(file.indexOf("static char"));
+
+    test("the file is the diagram as a comment, then the literal, nothing else", () => {
+        expect(file.startsWith("/*\n")).toBe(true);
+        const close = file.indexOf("\n*/\n");
+        expect(close).toBeGreaterThan(0);
+        expect(file.slice(close + 4)).toBe("\n" + source);
+        expect(file).toContain(schema_to_diagram(schema_to_json(TREEDB)).split("\n")[0]);
+    });
+
+    test("without the diagram it is the literal alone", () => {
+        expect(schema_to_c(TREEDB, {with_diagram: false})).toBe(source);
+    });
+
+    test("json_to_c() writes the same file from the literal's JSON", () => {
+        expect(json_to_c(schema_to_json(TREEDB))).toBe(file);
+    });
 
     test("it is a C array declaration with the conventional name", () => {
         expect(source.startsWith("static char treedb_schema_sample[]= \"\\\n")).toBe(true);
@@ -153,7 +171,7 @@ describe("schema_to_c — the round trip", () => {
     });
 
     test("the caller can name the array and set the continuation column", () => {
-        const custom = schema_to_c(TREEDB, {var_name: "my_schema", pad: 40});
+        const custom = schema_to_c(TREEDB, {var_name: "my_schema", pad: 40, with_diagram: false});
         expect(custom.startsWith("static char my_schema[]=")).toBe(true);
         expect(load_like_the_yuno(custom)).toEqual(schema_to_json(TREEDB));
     });