@yuneta/gobj-ui 6.1.0 → 6.1.2

package/src/schema_to_c.js

@@ -32,6 +32,7 @@ import {
     col_enum,
     topic_pkey2s,
     as_json,
+    is_empty_value,
 } from "./schema_model.js";
 
 
@@ -60,9 +61,12 @@ const COL_KEY_ORDER = [
  *  hand-written schema without looking foreign.  */
 const VERSION_KEYS = ["schema_version", "topic_version"];
 
-/*  Storage-only: they say where the record lives, not what it declares.  */
-const COL_SKIP = ["id", "value", "topics", "order", "__md_treedb__"];
-const TOPIC_SKIP = ["id", "value", "treedbs", "cols", "order", "__md_treedb__"];
+/*  Storage-only: they say where the record lives, not what it declares.
+ *  `_geometry` is here as a FIELD — where the graph editor put this
+ *  record's box — and it is not the same thing as a column NAMED
+ *  `_geometry`, which the .c literals do declare and which stays.  */
+const COL_SKIP = ["id", "value", "topics", "order", "_geometry", "__md_treedb__"];
+const TOPIC_SKIP = ["id", "value", "treedbs", "cols", "order", "_geometry", "__md_treedb__"];
 
 /*  Fields whose stored form may be the JSON text of the value.  */
 const JSON_FIELDS = ["enum", "hook", "default", "template", "properties", "pkey2s"];
@@ -149,10 +153,14 @@ function schema_to_json(treedb)
             if(TOPIC_SKIP.indexOf(key) >= 0) {
                 continue;
             }
-            if(value === null || value === undefined || value === "") {
+            if(is_empty_value(value)) {
                 continue;
             }
-            jn_topic[key] = JSON_FIELDS.indexOf(key) >= 0 ? as_json(value) : value;
+            let read = JSON_FIELDS.indexOf(key) >= 0 ? as_json(value) : value;
+            if(is_empty_value(read)) {
+                continue;
+            }
+            jn_topic[key] = read;
         }
         if(jn_topic.topic_version !== undefined) {
             jn_topic.topic_version = version(jn_topic.topic_version);
@@ -175,10 +183,14 @@ function schema_to_json(treedb)
                 if(COL_SKIP.indexOf(key) >= 0) {
                     continue;
                 }
-                if(value === null || value === undefined || value === "") {
+                if(is_empty_value(value)) {
                     continue;
                 }
-                jn_col[key] = JSON_FIELDS.indexOf(key) >= 0 ? as_json(value) : value;
+                let read = JSON_FIELDS.indexOf(key) >= 0 ? as_json(value) : value;
+                if(is_empty_value(read)) {
+                    continue;
+                }
+                jn_col[key] = read;
             }
             let flags = col_flags(col_record);
             if(flags.length > 0) {
@@ -187,8 +199,10 @@ function schema_to_json(treedb)
                 delete jn_col.flag;
             }
             let hook = col_hook(col_record);
-            if(hook) {
+            if(hook && !is_empty_value(hook)) {
                 jn_col.hook = hook;
+            } else {
+                delete jn_col.hook;
             }
             let e = col_enum(col_record);
             if(e.length > 0) {

package/src/schema_to_c.test.js

@@ -216,3 +216,50 @@ describe("the characters that cannot be written as themselves", () => {
             .toBe(header);
     });
 });
+
+describe("the empty collections the store answers with", () => {
+    /*  Found by running the editor against a real yuno: every `blob`
+        column that was never set came back as `{}` and was exported as
+        one, so a 4-topic schema printed 1229 lines of empty objects —
+        and `'hook': {}` in a literal is a hook the treedb builds and
+        nothing writes.  */
+    const model = build_schema_model({
+        treedbs: [{id: "treedb_x", schema_version: 1, _geometry: {}}],
+        topics: [{id: "treedb_x.t", value: "t", order: 1, pkey: "id",
+                  topic_version: 1, _geometry: {}, pkey2s: {},
+                  treedbs: ["treedbs^treedb_x^topics"]}],
+        cols: [{id: "treedb_x.t.id", value: "id", order: 1, header: "Id",
+                type: "string", flag: ["persistent"],
+                enum: {}, hook: {}, default: {}, template: {}, properties: {},
+                _geometry: {}, pkey2s: {},
+                topics: ["topics^treedb_x.t^cols"]}],
+    });
+    const json = schema_to_json(model.treedbs[0]);
+
+    test("an unset blob is left out, not exported as an empty object", () => {
+        for(const key of ["enum", "hook", "default", "template", "properties", "pkey2s"]) {
+            expect(key in json.topics[0].cols.id).toBe(false);
+        }
+    });
+
+    test("the record's own _geometry is storage and does not travel", () => {
+        expect("_geometry" in json.topics[0]).toBe(false);
+        expect("_geometry" in json.topics[0].cols.id).toBe(false);
+    });
+
+    test("a column NAMED _geometry is a real column and stays", () => {
+        /*  The .c literals declare one; only the FIELD is storage.  */
+        const with_geo = build_schema_model({
+            treedbs: [{id: "treedb_x", schema_version: 1}],
+            topics: [{id: "treedb_x.t", value: "t", treedbs: ["treedbs^treedb_x^topics"]}],
+            cols: [{id: "treedb_x.t._geometry", value: "_geometry", header: "Geometry",
+                    type: "blob", topics: ["topics^treedb_x.t^cols"]}],
+        });
+        expect(Object.keys(schema_to_json(with_geo.treedbs[0]).topics[0].cols))
+            .toEqual(["_geometry"]);
+    });
+
+    test("what is left still round-trips", () => {
+        expect(load_like_the_yuno(schema_to_c(model.treedbs[0]))).toEqual(json);
+    });
+});

package/src/schema_write_options.js

@@ -0,0 +1,60 @@
+/***********************************************************************
+ *          schema_write_options.js
+ *
+ *      The OPTIONS a schema write travels with, and why each one.
+ *
+ *      Three words decide whether a write does what it says, and all
+ *      three are easy to get wrong in a way that succeeds:
+ *
+ *      `create`    a node that is not there yet is written by
+ *                  `update-node` with this, not by `create-node`. The
+ *                  two are not the same call: only the update path
+ *                  carries `autolink`, and without a link a new column
+ *                  belongs to no topic.
+ *
+ *      `autolink`  turns the fkey carried IN THE RECORD into a link.
+ *                  It rewrites the node's links from the fkey fields
+ *                  the record has — so on a PARTIAL update, which
+ *                  carries none, it reads that as "no parents" and
+ *                  UNLINKS the node. Raising a topic's version with it
+ *                  on detached that topic from its treedb, and the
+ *                  write returned success. It goes with a create,
+ *                  where the record carries its fkey, and with nothing
+ *                  else.
+ *
+ *      `force`     a delete of a node something points at. A column is
+ *                  pointed at by the topic that owns it, which is not
+ *                  a reason to refuse.
+ *
+ *      Pure and tested, because the cost of getting it wrong is a
+ *      store that has to be repaired by hand, and nothing in the
+ *      answer says it happened.
+ *
+ *          Copyright (c) 2026, ArtGins.
+ *          All Rights Reserved.
+ ***********************************************************************/
+
+/***************************************************************
+ *  write_command(op) -> the treedb command that performs it
+ ***************************************************************/
+function write_command(op)
+{
+    return (op === "delete") ? "delete-node" : "update-node";
+}
+
+/***************************************************************
+ *  write_options(op) -> the options it travels with
+ ***************************************************************/
+function write_options(op)
+{
+    if(op === "delete") {
+        return {force: true};
+    }
+    if(op === "create") {
+        return {list_dict: true, create: true, autolink: true};
+    }
+    return {list_dict: true};
+}
+
+
+export {write_command, write_options};

package/src/schema_write_options.test.js

@@ -0,0 +1,65 @@
+/***********************************************************************
+ *          schema_write_options.test.js
+ *
+ *      The three words that decide whether a schema write does what it
+ *      says, pinned.
+ *
+ *      This file exists because of one afternoon: `autolink` on a
+ *      partial update detached a topic from its treedb — the version
+ *      was raised, the write answered success, and the topic vanished
+ *      from the schema. Nothing in the answer said so.
+ ***********************************************************************/
+import { describe, test, expect } from "vitest";
+import { write_command, write_options } from "./schema_write_options.js";
+
+
+describe("which command performs which write", () => {
+    test("a create goes through update-node, NOT create-node", () => {
+        /*  Only the update path carries `autolink`, and without a link a
+            new column belongs to no topic.  */
+        expect(write_command("create")).toBe("update-node");
+    });
+
+    test("an update goes through update-node", () => {
+        expect(write_command("update")).toBe("update-node");
+    });
+
+    test("a delete goes through delete-node", () => {
+        expect(write_command("delete")).toBe("delete-node");
+    });
+});
+
+describe("autolink goes with a create and with nothing else", () => {
+    test("a create asks for it — its record carries the fkey", () => {
+        const o = write_options("create");
+        expect(o.autolink).toBe(true);
+        expect(o.create).toBe(true);
+    });
+
+    test("an update NEVER asks for it", () => {
+        /*  The editor writes only what changed, so an update carries no
+            fkey — and autolink reads an absent fkey as "no parents".  */
+        expect(write_options("update").autolink).toBeUndefined();
+        expect(write_options("update").create).toBeUndefined();
+    });
+
+    test("a delete never asks for it either", () => {
+        expect(write_options("delete").autolink).toBeUndefined();
+    });
+});
+
+describe("the rest", () => {
+    test("a delete forces: a column is pointed at by its own topic", () => {
+        expect(write_options("delete")).toEqual({force: true});
+    });
+
+    test("reads come back as dicts, so a write answers in the same shape", () => {
+        expect(write_options("create").list_dict).toBe(true);
+        expect(write_options("update").list_dict).toBe(true);
+    });
+
+    test("an unknown op is treated as an update — the safe one", () => {
+        expect(write_options("")).toEqual({list_dict: true});
+        expect(write_options(undefined).autolink).toBeUndefined();
+    });
+});

package/src/yui_icons.css

@@ -349,3 +349,17 @@
     -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 384 512'%3E%3Cpath d='M192 0C192 0 48 176 48 304a144 144 0 1 0 288 0C336 176 192 0 192 0z'/%3E%3C/svg%3E");
     mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 384 512'%3E%3Cpath d='M192 0C192 0 48 176 48 304a144 144 0 1 0 288 0C336 176 192 0 192 0z'/%3E%3C/svg%3E");
 }
+
+/*  The drag handle of a reorderable row, and the icon of a treedb: both
+ *  are wanted by the schema editor and neither was in the set. A missing
+ *  glyph renders as a solid black square, so a mask is added rather than
+ *  a class referenced on hope.  */
+.yi-grip-vertical::before {
+    -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3Cpath d='M40 352l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zm192 0l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zM40 192l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zm192 0l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zM40 32l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zM232 32l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40z'/%3E%3C/svg%3E");
+    mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 320 512'%3E%3Cpath d='M40 352l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zm192 0l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zM40 192l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zm192 0l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zM40 32l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40zM232 32l48 0c22.1 0 40 17.9 40 40l0 48c0 22.1-17.9 40-40 40l-48 0c-22.1 0-40-17.9-40-40l0-48c0-22.1 17.9-40 40-40z'/%3E%3C/svg%3E");
+}
+
+.yi-database::before {
+    -webkit-mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath d='M448 80l0 48c0 44.2-100.3 80-224 80S0 172.2 0 128L0 80C0 35.8 100.3 0 224 0S448 35.8 448 80zM393.2 214.7c20.8-7.4 39.9-16.9 54.8-28.6L448 288c0 44.2-100.3 80-224 80S0 332.2 0 288L0 186.1c14.9 11.8 34 21.2 54.8 28.6C99.7 230.7 159.5 240 224 240s124.3-9.3 169.2-25.3zM0 346.1c14.9 11.8 34 21.2 54.8 28.6C99.7 390.7 159.5 400 224 400s124.3-9.3 169.2-25.3c20.8-7.4 39.9-16.9 54.8-28.6l0 85.9c0 44.2-100.3 80-224 80S0 476.2 0 432l0-85.9z'/%3E%3C/svg%3E");
+    mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'%3E%3Cpath d='M448 80l0 48c0 44.2-100.3 80-224 80S0 172.2 0 128L0 80C0 35.8 100.3 0 224 0S448 35.8 448 80zM393.2 214.7c20.8-7.4 39.9-16.9 54.8-28.6L448 288c0 44.2-100.3 80-224 80S0 332.2 0 288L0 186.1c14.9 11.8 34 21.2 54.8 28.6C99.7 230.7 159.5 240 224 240s124.3-9.3 169.2-25.3zM0 346.1c14.9 11.8 34 21.2 54.8 28.6C99.7 390.7 159.5 400 224 400s124.3-9.3 169.2-25.3c20.8-7.4 39.9-16.9 54.8-28.6l0 85.9c0 44.2-100.3 80-224 80S0 476.2 0 432l0-85.9z'/%3E%3C/svg%3E");
+}