@yuneta/gobj-ui 7.26.22 → 7.26.24

package/dist/gobj-ui.cjs.js

@@ -73618,6 +73618,11 @@ function plan_import(treedb, incoming, options) {
 			conflicts
 		};
 	}
+	if (topic_name_breaks_the_rule(treedb_id)) conflicts.push({
+		code: "treedb name breaks the name rule",
+		topic: "",
+		col: ""
+	});
 	for (let in_topic of incoming.topics) {
 		let name = (in_topic || {}).id;
 		if (name && topic_name_breaks_the_rule(name)) conflicts.push({
@@ -73625,11 +73630,40 @@ function plan_import(treedb, incoming, options) {
 			topic: name,
 			col: ""
 		});
-		for (let in_col of incoming_cols(in_topic || {})) if (col_name_breaks_the_rule(in_col.name)) conflicts.push({
-			code: "column name breaks the name rule",
-			topic: name || "",
-			col: in_col.name
-		});
+		let cols = (in_topic || {}).cols;
+		if (Array.isArray(cols)) {
+			for (let c of cols) if (!c || !c.id) conflicts.push({
+				code: "column has no name",
+				topic: name || "",
+				col: ""
+			});
+		}
+		for (let in_col of incoming_cols(in_topic || {})) {
+			if (col_name_breaks_the_rule(in_col.name)) conflicts.push({
+				code: "column name breaks the name rule",
+				topic: name || "",
+				col: in_col.name
+			});
+			let inner_id = (in_col.col || {}).id;
+			if (typeof inner_id === "string" && inner_id !== in_col.name && col_name_breaks_the_rule(inner_id)) conflicts.push({
+				code: "column name breaks the name rule",
+				topic: name || "",
+				col: inner_id
+			});
+			let hook = (in_col.col || {}).hook;
+			if (hook && typeof hook === "object" && !Array.isArray(hook)) for (let [child_topic, fkey_col] of Object.entries(hook)) {
+				if (topic_name_breaks_the_rule(child_topic)) conflicts.push({
+					code: "topic name breaks the name rule",
+					topic: child_topic,
+					col: ""
+				});
+				if (col_name_breaks_the_rule(fkey_col)) conflicts.push({
+					code: "column name breaks the name rule",
+					topic: child_topic,
+					col: String(fkey_col)
+				});
+			}
+		}
 	}
 	if (conflicts.length > 0) return {
 		writes,
@@ -74436,12 +74470,22 @@ function mt_destroy$1(gobj) {
 *  name field is marked aria-invalid for a reader.
 ************************************************************/
 function refuse_bad_name(gobj, $message) {
-	let priv = gobj.priv;
-	let $value = priv.dialog_content ? priv.dialog_content.querySelector("[data-name=\"value\"]") : null;
-	if ($value) $value.setAttribute("aria-invalid", "true");
+	mark_name_field(gobj, true);
 	yui_shell_show_error(yui_shell_of(gobj), $message, { t: i18next.t });
 	return -1;
 }
+/************************************************************
+*  The name field says whether the LAST save refused its name:
+*  set by every refusal of the name (empty, a rule, a duplicate),
+*  cleared by a save that gets past them.
+************************************************************/
+function mark_name_field(gobj, invalid) {
+	let priv = gobj.priv;
+	let $value = priv.dialog_content ? priv.dialog_content.querySelector("[data-name=\"value\"]") : null;
+	if (!$value) return;
+	if (invalid) $value.setAttribute("aria-invalid", "true");
+	else $value.removeAttribute("aria-invalid");
+}
 /***************************************************************
 *  The frame: a toolbar that never changes place, a notice line
 *  for what the whole view has to say, and one body the screens
@@ -76925,13 +76969,19 @@ function render_import_plan(gobj, plan) {
 			"div",
 			{ class: "SCHEMA_IMPORT_CONFLICTS notification is-danger is-light p-3" },
 			plan.conflicts.map((conflict) => {
+				let where = conflict.col ? `${conflict.topic}.${conflict.col}` : conflict.topic;
 				return [
 					"p",
-					{
-						class: "SCHEMA_IMPORT_CONFLICT is-size-7",
-						i18n: conflict.code
-					},
-					(0, i18next.t)(conflict.code)
+					{ class: "SCHEMA_IMPORT_CONFLICT is-size-7" },
+					[[
+						"span",
+						{ i18n: conflict.code },
+						(0, i18next.t)(conflict.code)
+					], where ? [
+						"code",
+						{ class: "SCHEMA_IMPORT_CONFLICT_NAME ml-2" },
+						text_node(where)
+					] : null].filter(Boolean)
 				];
 			})
 		]));
@@ -77954,6 +78004,7 @@ function ac_save_column(gobj, event, kw, src) {
 	}
 	let values = kw.values || {};
 	if (kw.creating && (0, _yuneta_gobj_js.empty_string)(String(values.value || "").trim())) {
+		mark_name_field(gobj, true);
 		yui_shell_show_error(yui_shell_of(gobj), "a column needs a name", { t: i18next.t });
 		return -1;
 	}
@@ -77963,9 +78014,11 @@ function ac_save_column(gobj, event, kw, src) {
 		(0, i18next.t)("invalid column name")
 	]));
 	if (kw.creating && find_col(priv.model, priv.treedb_id, kw.topic, String(values.value).trim())) {
+		mark_name_field(gobj, true);
 		yui_shell_show_error(yui_shell_of(gobj), "that column is already there", { t: i18next.t });
 		return -1;
 	}
+	mark_name_field(gobj, false);
 	close_dialog(gobj);
 	return queue_writes(gobj, [{
 		op: kw.creating ? "create" : "update",
@@ -78213,6 +78266,7 @@ function ac_save_topic(gobj, event, kw, src) {
 	if (kw.creating) {
 		let name = String(values.value || "").trim();
 		if ((0, _yuneta_gobj_js.empty_string)(name)) {
+			mark_name_field(gobj, true);
 			yui_shell_show_error(yui_shell_of(gobj), "a topic needs a name", { t: i18next.t });
 			return -1;
 		}
@@ -78222,9 +78276,11 @@ function ac_save_topic(gobj, event, kw, src) {
 			(0, i18next.t)("invalid topic name")
 		]));
 		if (find_topic(priv.model, priv.treedb_id, name)) {
+			mark_name_field(gobj, true);
 			yui_shell_show_error(yui_shell_of(gobj), "that topic is already there", { t: i18next.t });
 			return -1;
 		}
+		mark_name_field(gobj, false);
 	}
 	close_dialog(gobj);
 	return queue_writes(gobj, [{

package/dist/gobj-ui.es.js

@@ -73613,6 +73613,11 @@ function plan_import(treedb, incoming, options) {
 			conflicts
 		};
 	}
+	if (topic_name_breaks_the_rule(treedb_id)) conflicts.push({
+		code: "treedb name breaks the name rule",
+		topic: "",
+		col: ""
+	});
 	for (let in_topic of incoming.topics) {
 		let name = (in_topic || {}).id;
 		if (name && topic_name_breaks_the_rule(name)) conflicts.push({
@@ -73620,11 +73625,40 @@ function plan_import(treedb, incoming, options) {
 			topic: name,
 			col: ""
 		});
-		for (let in_col of incoming_cols(in_topic || {})) if (col_name_breaks_the_rule(in_col.name)) conflicts.push({
-			code: "column name breaks the name rule",
-			topic: name || "",
-			col: in_col.name
-		});
+		let cols = (in_topic || {}).cols;
+		if (Array.isArray(cols)) {
+			for (let c of cols) if (!c || !c.id) conflicts.push({
+				code: "column has no name",
+				topic: name || "",
+				col: ""
+			});
+		}
+		for (let in_col of incoming_cols(in_topic || {})) {
+			if (col_name_breaks_the_rule(in_col.name)) conflicts.push({
+				code: "column name breaks the name rule",
+				topic: name || "",
+				col: in_col.name
+			});
+			let inner_id = (in_col.col || {}).id;
+			if (typeof inner_id === "string" && inner_id !== in_col.name && col_name_breaks_the_rule(inner_id)) conflicts.push({
+				code: "column name breaks the name rule",
+				topic: name || "",
+				col: inner_id
+			});
+			let hook = (in_col.col || {}).hook;
+			if (hook && typeof hook === "object" && !Array.isArray(hook)) for (let [child_topic, fkey_col] of Object.entries(hook)) {
+				if (topic_name_breaks_the_rule(child_topic)) conflicts.push({
+					code: "topic name breaks the name rule",
+					topic: child_topic,
+					col: ""
+				});
+				if (col_name_breaks_the_rule(fkey_col)) conflicts.push({
+					code: "column name breaks the name rule",
+					topic: child_topic,
+					col: String(fkey_col)
+				});
+			}
+		}
 	}
 	if (conflicts.length > 0) return {
 		writes,
@@ -74431,12 +74465,22 @@ function mt_destroy$1(gobj) {
 *  name field is marked aria-invalid for a reader.
 ************************************************************/
 function refuse_bad_name(gobj, $message) {
-	let priv = gobj.priv;
-	let $value = priv.dialog_content ? priv.dialog_content.querySelector("[data-name=\"value\"]") : null;
-	if ($value) $value.setAttribute("aria-invalid", "true");
+	mark_name_field(gobj, true);
 	yui_shell_show_error(yui_shell_of(gobj), $message, { t });
 	return -1;
 }
+/************************************************************
+*  The name field says whether the LAST save refused its name:
+*  set by every refusal of the name (empty, a rule, a duplicate),
+*  cleared by a save that gets past them.
+************************************************************/
+function mark_name_field(gobj, invalid) {
+	let priv = gobj.priv;
+	let $value = priv.dialog_content ? priv.dialog_content.querySelector("[data-name=\"value\"]") : null;
+	if (!$value) return;
+	if (invalid) $value.setAttribute("aria-invalid", "true");
+	else $value.removeAttribute("aria-invalid");
+}
 /***************************************************************
 *  The frame: a toolbar that never changes place, a notice line
 *  for what the whole view has to say, and one body the screens
@@ -76920,13 +76964,19 @@ function render_import_plan(gobj, plan) {
 			"div",
 			{ class: "SCHEMA_IMPORT_CONFLICTS notification is-danger is-light p-3" },
 			plan.conflicts.map((conflict) => {
+				let where = conflict.col ? `${conflict.topic}.${conflict.col}` : conflict.topic;
 				return [
 					"p",
-					{
-						class: "SCHEMA_IMPORT_CONFLICT is-size-7",
-						i18n: conflict.code
-					},
-					t(conflict.code)
+					{ class: "SCHEMA_IMPORT_CONFLICT is-size-7" },
+					[[
+						"span",
+						{ i18n: conflict.code },
+						t(conflict.code)
+					], where ? [
+						"code",
+						{ class: "SCHEMA_IMPORT_CONFLICT_NAME ml-2" },
+						text_node(where)
+					] : null].filter(Boolean)
 				];
 			})
 		]));
@@ -77949,6 +77999,7 @@ function ac_save_column(gobj, event, kw, src) {
 	}
 	let values = kw.values || {};
 	if (kw.creating && empty_string(String(values.value || "").trim())) {
+		mark_name_field(gobj, true);
 		yui_shell_show_error(yui_shell_of(gobj), "a column needs a name", { t });
 		return -1;
 	}
@@ -77958,9 +78009,11 @@ function ac_save_column(gobj, event, kw, src) {
 		t("invalid column name")
 	]));
 	if (kw.creating && find_col(priv.model, priv.treedb_id, kw.topic, String(values.value).trim())) {
+		mark_name_field(gobj, true);
 		yui_shell_show_error(yui_shell_of(gobj), "that column is already there", { t });
 		return -1;
 	}
+	mark_name_field(gobj, false);
 	close_dialog(gobj);
 	return queue_writes(gobj, [{
 		op: kw.creating ? "create" : "update",
@@ -78208,6 +78261,7 @@ function ac_save_topic(gobj, event, kw, src) {
 	if (kw.creating) {
 		let name = String(values.value || "").trim();
 		if (empty_string(name)) {
+			mark_name_field(gobj, true);
 			yui_shell_show_error(yui_shell_of(gobj), "a topic needs a name", { t });
 			return -1;
 		}
@@ -78217,9 +78271,11 @@ function ac_save_topic(gobj, event, kw, src) {
 			t("invalid topic name")
 		]));
 		if (find_topic(priv.model, priv.treedb_id, name)) {
+			mark_name_field(gobj, true);
 			yui_shell_show_error(yui_shell_of(gobj), "that topic is already there", { t });
 			return -1;
 		}
+		mark_name_field(gobj, false);
 	}
 	close_dialog(gobj);
 	return queue_writes(gobj, [{

package/package.json

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

package/src/c_yui_schema_editor.js

@@ -371,15 +371,30 @@ function mt_destroy(gobj)
  *  name field is marked aria-invalid for a reader.
  ************************************************************/
 function refuse_bad_name(gobj, $message)
+{
+    mark_name_field(gobj, true);
+    yui_shell_show_error(yui_shell_of(gobj), $message, {t: t});
+    return -1;
+}
+
+/************************************************************
+ *  The name field says whether the LAST save refused its name:
+ *  set by every refusal of the name (empty, a rule, a duplicate),
+ *  cleared by a save that gets past them.
+ ************************************************************/
+function mark_name_field(gobj, invalid)
 {
     let priv = gobj.priv;
     let $value = priv.dialog_content?
         priv.dialog_content.querySelector('[data-name="value"]') : null;
-    if($value) {
+    if(!$value) {
+        return;
+    }
+    if(invalid) {
         $value.setAttribute("aria-invalid", "true");
+    } else {
+        $value.removeAttribute("aria-invalid");
     }
-    yui_shell_show_error(yui_shell_of(gobj), $message, {t: t});
-    return -1;
 }
 
 /***************************************************************
@@ -2669,8 +2684,15 @@ function render_import_plan(gobj, plan)
         $pane.appendChild(createElement2(
             ["div", {class: "SCHEMA_IMPORT_CONFLICTS notification is-danger is-light p-3"},
                 plan.conflicts.map((conflict) => {
-                    return ["p", {class: "SCHEMA_IMPORT_CONFLICT is-size-7", i18n: conflict.code},
-                        t(conflict.code)];
+                    /*  What the conflict is about, said: two bad entries of
+                     *  one hook map were two identical lines.  */
+                    let where = conflict.col
+                        ? `${conflict.topic}.${conflict.col}`
+                        : conflict.topic;
+                    return ["p", {class: "SCHEMA_IMPORT_CONFLICT is-size-7"}, [
+                        ["span", {i18n: conflict.code}, t(conflict.code)],
+                        where ? ["code", {class: "SCHEMA_IMPORT_CONFLICT_NAME ml-2"}, text_node(where)] : null
+                    ].filter(Boolean)];
                 })]
         ));
         if(priv.import_run) {
@@ -4047,6 +4069,7 @@ function ac_save_column(gobj, event, kw, src)
 
     let values = kw.values || {};
     if(kw.creating && empty_string(String(values.value || "").trim())) {
+        mark_name_field(gobj, true);
         yui_shell_show_error(yui_shell_of(gobj), "a column needs a name", {t: t});
         return -1;
     }
@@ -4055,9 +4078,11 @@ function ac_save_column(gobj, event, kw, src)
             ["span", {i18n: "invalid column name"}, t("invalid column name")]));
     }
     if(kw.creating && find_col(priv.model, priv.treedb_id, kw.topic, String(values.value).trim())) {
+        mark_name_field(gobj, true);
         yui_shell_show_error(yui_shell_of(gobj), "that column is already there", {t: t});
         return -1;
     }
+    mark_name_field(gobj, false);
 
     close_dialog(gobj);
     return queue_writes(gobj, [{
@@ -4358,6 +4383,7 @@ function ac_save_topic(gobj, event, kw, src)
     if(kw.creating) {
         let name = String(values.value || "").trim();
         if(empty_string(name)) {
+            mark_name_field(gobj, true);
             yui_shell_show_error(yui_shell_of(gobj), "a topic needs a name", {t: t});
             return -1;
         }
@@ -4366,9 +4392,11 @@ function ac_save_topic(gobj, event, kw, src)
                 ["span", {i18n: "invalid topic name"}, t("invalid topic name")]));
         }
         if(find_topic(priv.model, priv.treedb_id, name)) {
+            mark_name_field(gobj, true);
             yui_shell_show_error(yui_shell_of(gobj), "that topic is already there", {t: t});
             return -1;
         }
+        mark_name_field(gobj, false);
     }
 
     close_dialog(gobj);

package/src/schema_editor_reload.wiring.test.js

@@ -1748,3 +1748,30 @@ describe("names the treedb refuses", () => {
         }
     });
 });
+
+
+/*
+ *  The name field says whether the LAST save refused its name (REV-CLOUD
+ *  V15.4): set by every refusal of the name, cleared by a save that gets
+ *  past them. It was set by the rule only, and never cleared.
+ */
+describe("aria-invalid of the name field", () => {
+    test("set by a bad name and by a duplicate, cleared by a good one", () => {
+        const {editor, host} = build("aria_topic", "db");
+        gobj_send_event(editor, "EV_ADD_TOPIC", {}, host);
+        const form = modals[modals.length - 1];
+        const $value = form.$content.querySelector('[data-name="value"]');
+        const save = (name) => {
+            gobj_send_event(editor, "EV_SAVE_TOPIC", {
+                creating: true, topic: "", values: {value: name}
+            }, host);
+        };
+        save("a/b");
+        expect($value.getAttribute("aria-invalid")).toBe("true");
+        save("users");      // a duplicate: the topic is there
+        expect($value.getAttribute("aria-invalid")).toBe("true");
+        save("ok_name");
+        expect($value.getAttribute("aria-invalid")).toBe(null);
+        take("update-node");
+    });
+});

package/src/schema_import.js

@@ -211,15 +211,53 @@ function plan_import(treedb, incoming, options)
      *  stop the plan BEFORE any write: run through, the backend refused
      *  them half way, with the writes before them already done.
      */
+    if(topic_name_breaks_the_rule(treedb_id)) {
+        /*  The treedb is a directory too (treedb_open_db() refuses it)  */
+        conflicts.push({code: "treedb name breaks the name rule", topic: "", col: ""});
+    }
     for(let in_topic of incoming.topics) {
         let name = (in_topic || {}).id;
         if(name && topic_name_breaks_the_rule(name)) {
             conflicts.push({code: "topic name breaks the name rule", topic: name, col: ""});
         }
+        let cols = (in_topic || {}).cols;
+        if(Array.isArray(cols)) {
+            /*  incoming_cols() drops a column with no id: said, not dropped  */
+            for(let c of cols) {
+                if(!c || !c.id) {
+                    conflicts.push({code: "column has no name", topic: name || "", col: ""});
+                }
+            }
+        }
         for(let in_col of incoming_cols(in_topic || {})) {
             if(col_name_breaks_the_rule(in_col.name)) {
                 conflicts.push({code: "column name breaks the name rule", topic: name || "", col: in_col.name});
             }
+            /*  A dict column carries its id twice: the key (what is
+             *  imported) and its own `id`. One that breaks the rule is said
+             *  too, not imported under the key in silence.  */
+            let inner_id = (in_col.col || {}).id;
+            if(typeof inner_id === "string" && inner_id !== in_col.name &&
+                    col_name_breaks_the_rule(inner_id)) {
+                conflicts.push({code: "column name breaks the name rule", topic: name || "", col: inner_id});
+            }
+            /*  The hook map names a child topic and its fkey column: names
+             *  the treedb refuses too, even when no column declares them.  */
+            let hook = (in_col.col || {}).hook;
+            if(hook && typeof hook === "object" && !Array.isArray(hook)) {
+                for(let [child_topic, fkey_col] of Object.entries(hook)) {
+                    /*  The conflict names the BAD name (the child topic, its
+                     *  fkey), not the hook column that maps to it.  */
+                    if(topic_name_breaks_the_rule(child_topic)) {
+                        conflicts.push({code: "topic name breaks the name rule",
+                                        topic: child_topic, col: ""});
+                    }
+                    if(col_name_breaks_the_rule(fkey_col)) {
+                        conflicts.push({code: "column name breaks the name rule",
+                                        topic: child_topic, col: String(fkey_col)});
+                    }
+                }
+            }
         }
     }
     if(conflicts.length > 0) {

package/src/schema_import.test.js

@@ -282,3 +282,50 @@ describe("names the treedb refuses stop the plan before any write (REV-CLOUD V14
         expect(plan.writes.length).toBeGreaterThan(0);
     });
 });
+
+
+describe("the import reads the hook map and the treedb id (REV-CLOUD V15.4)", () => {
+    test("a hook to an fkey x`y or to a topic a/b that no column declares: conflicts", () => {
+        let plan = plan_import(null, {
+            id: "db", schema_version: "1",
+            topics: [{id: "p", pkey: "id", cols: {
+                "id": {id: "id", type: "string"},
+                "kids": {id: "kids", type: "dict", flag: ["hook"], hook: {"k": "x`y", "a/b": "pid"}},
+            }}]
+        });
+        expect(plan.writes).toEqual([]);
+        let codes = plan.conflicts.map((c) => c.code);
+        expect(codes).toContain("column name breaks the name rule");
+        expect(codes).toContain("topic name breaks the name rule");
+    });
+
+    test("a treedb a/b, and a column with no id in an array: conflicts, not dropped", () => {
+        let plan = plan_import(null, {
+            id: "a/b", schema_version: "1",
+            topics: [{id: "t", pkey: "id", cols: [{id: "id", type: "string"}, {id: "", type: "string"}]}]
+        });
+        expect(plan.writes).toEqual([]);
+        let codes = plan.conflicts.map((c) => c.code);
+        expect(codes).toContain("treedb name breaks the name rule");
+        expect(codes).toContain("column has no name");
+    });
+});
+
+
+describe("a conflict names the bad name (REV-CLOUD V16.5)", () => {
+    test("the child topic and the fkey of a hook map, and a dict column's inner id", () => {
+        let plan = plan_import(null, {
+            id: "db", schema_version: "1",
+            topics: [{id: "p", pkey: "id", cols: {
+                "id": {id: "id", type: "string"},
+                "kids": {id: "kids", type: "dict", flag: ["hook"], hook: {"a/b": "x`y"}},
+                "good": {id: "go`od", type: "string"},
+            }}]
+        });
+        expect(plan.writes).toEqual([]);
+        let named = plan.conflicts.map((c) => `${c.code}|${c.topic}|${c.col}`);
+        expect(named).toContain("topic name breaks the name rule|a/b|");
+        expect(named).toContain("column name breaks the name rule|a/b|x`y");
+        expect(named).toContain("column name breaks the name rule|p|go`od");
+    });
+});