@yuneta/gobj-ui 7.26.21 → 7.26.23

package/dist/gobj-ui.cjs.js

@@ -25091,6 +25091,24 @@ function moved_orders(list) {
 	}
 	return writes;
 }
+/***************************************************************
+*  The TWO name rules of the treedb (SDK 7.26.9):
+*
+*      a TOPIC name is a directory and a key: not empty, not "."
+*      or "..", no '/' and no '`' (tranger2_name_is_identifier());
+*      a COLUMN name (a column id, a hook, an fkey) is only a key:
+*      not empty and no '`' (treedb_col_name_is_identifier()).
+*
+*  Said here as in C, so the editor refuses what the treedb will.
+***************************************************************/
+function topic_name_breaks_the_rule(name) {
+	let s = String(name === void 0 || name === null ? "" : name);
+	return s === "" || s === "." || s === ".." || s.includes("/") || s.includes("`");
+}
+function col_name_breaks_the_rule(name) {
+	let s = String(name === void 0 || name === null ? "" : name);
+	return s === "" || s.includes("`");
+}
 //#endregion
 //#region src/treedb_topic_keys.js
 /***********************************************************************
@@ -72670,6 +72688,8 @@ function validate_schema(treedb, options) {
 	if (treedb.topics.length === 0) add("warning", "schema has no topic", "", "", "");
 	for (let topic of treedb.topics) {
 		let col_names = topic.cols.map((c) => c.name);
+		if (topic_name_breaks_the_rule(topic.name)) add("error", "topic name breaks the name rule", topic.name, "", topic.name);
+		for (let col of topic.cols) if (col_name_breaks_the_rule(col.name)) add("error", "column name breaks the name rule", topic.name, col.name, col.name);
 		if (topic.cols.length === 0) add("error", "topic has no column", topic.name, "", "");
 		let pkey = topic.pkey || "id";
 		if (col_names.indexOf(pkey) < 0) add("error", "pkey names no column", topic.name, "", pkey);
@@ -72687,6 +72707,10 @@ function validate_schema(treedb, options) {
 				let hook = col_hook(col.record);
 				if (!hook || Object.keys(hook).length === 0) add("error", "hook has no mapping", topic.name, col.name, "");
 				else for (let [child_topic, fkey_col] of Object.entries(hook)) {
+					if (col_name_breaks_the_rule(fkey_col)) {
+						add("error", "column name breaks the name rule", topic.name, col.name, `${child_topic}.${fkey_col}`);
+						continue;
+					}
 					let child = topic_by_name[child_topic];
 					if (!child) {
 						add("error", "hook names no topic", topic.name, col.name, child_topic);
@@ -73594,6 +73618,52 @@ 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({
+			code: "topic name breaks the name rule",
+			topic: name,
+			col: ""
+		});
+		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 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: name || "",
+					col: in_col.name
+				});
+				if (col_name_breaks_the_rule(fkey_col)) conflicts.push({
+					code: "column name breaks the name rule",
+					topic: name || "",
+					col: in_col.name
+				});
+			}
+		}
+	}
+	if (conflicts.length > 0) return {
+		writes,
+		summary,
+		conflicts
+	};
 	let stored_topics = {};
 	for (let topic of treedb && treedb.topics || []) stored_topics[topic.name] = topic;
 	let seen_topics = {};
@@ -74324,6 +74394,7 @@ var PRIVATE_DATA$1 = {
 	dialog: null,
 	dialog_gen: 0,
 	dialog_kind: "",
+	dialog_content: null,
 	save_queue: null,
 	save_return: "",
 	save_wrote: false,
@@ -74387,14 +74458,27 @@ function mt_destroy$1(gobj) {
 *      Local Methods
 ***************************/
 /************************************************************
-*  THE name rule of timeranger2 and treedb
-*  (tranger2_name_is_identifier(), SDK 7.26.9): a topic or a column
-*  name is a directory and a key, so it cannot be "." or "..", nor hold
-*  '/' or the path delimiter '`'. Said here, before the backend answers
-*  a generic "cannot create topic".
+*  A name the treedb refuses (the two name rules of
+*  schema_model.js), said at once: the error carries its key as
+*  a LITERAL (so a consumer's validate-locales sees it), and the
+*  name field is marked aria-invalid for a reader.
 ************************************************************/
-function name_breaks_the_rule(name) {
-	return name === "." || name === ".." || name.includes("/") || name.includes("`");
+function refuse_bad_name(gobj, $message) {
+	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
@@ -75859,6 +75943,7 @@ function close_dialog(gobj) {
 	let dialog = priv.dialog;
 	priv.dialog = null;
 	priv.dialog_kind = "";
+	priv.dialog_content = null;
 	priv.export_view = null;
 	try {
 		dialog.close();
@@ -75871,6 +75956,7 @@ function open_dialog(gobj, $content, title, logical, title_prefix) {
 	close_dialog(gobj);
 	priv.dialog_gen = priv.model_gen;
 	priv.dialog_kind = logical;
+	priv.dialog_content = $content;
 	priv.dialog = yui_shell_show_modal(yui_shell_of(gobj), $content, {
 		dialog: true,
 		title,
@@ -75880,6 +75966,7 @@ function open_dialog(gobj, $content, title, logical, title_prefix) {
 		on_close: () => {
 			priv.dialog = null;
 			priv.dialog_kind = "";
+			priv.dialog_content = null;
 			priv.export_view = null;
 		}
 	});
@@ -77905,17 +77992,21 @@ 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;
 	}
-	if (kw.creating && name_breaks_the_rule(String(values.value).trim())) {
-		yui_shell_show_error(yui_shell_of(gobj), "a name cannot be . or .., nor hold / or `", { t: i18next.t });
-		return -1;
-	}
+	if (kw.creating && col_name_breaks_the_rule(String(values.value).trim())) return refuse_bad_name(gobj, (0, _yuneta_gobj_js.createElement2)([
+		"span",
+		{ i18n: "invalid column name" },
+		(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",
@@ -78163,17 +78254,21 @@ 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;
 		}
-		if (name_breaks_the_rule(name)) {
-			yui_shell_show_error(yui_shell_of(gobj), "a name cannot be . or .., nor hold / or `", { t: i18next.t });
-			return -1;
-		}
+		if (topic_name_breaks_the_rule(name)) return refuse_bad_name(gobj, (0, _yuneta_gobj_js.createElement2)([
+			"span",
+			{ i18n: "invalid topic name" },
+			(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

@@ -25086,6 +25086,24 @@ function moved_orders(list) {
 	}
 	return writes;
 }
+/***************************************************************
+*  The TWO name rules of the treedb (SDK 7.26.9):
+*
+*      a TOPIC name is a directory and a key: not empty, not "."
+*      or "..", no '/' and no '`' (tranger2_name_is_identifier());
+*      a COLUMN name (a column id, a hook, an fkey) is only a key:
+*      not empty and no '`' (treedb_col_name_is_identifier()).
+*
+*  Said here as in C, so the editor refuses what the treedb will.
+***************************************************************/
+function topic_name_breaks_the_rule(name) {
+	let s = String(name === void 0 || name === null ? "" : name);
+	return s === "" || s === "." || s === ".." || s.includes("/") || s.includes("`");
+}
+function col_name_breaks_the_rule(name) {
+	let s = String(name === void 0 || name === null ? "" : name);
+	return s === "" || s.includes("`");
+}
 //#endregion
 //#region src/treedb_topic_keys.js
 /***********************************************************************
@@ -72665,6 +72683,8 @@ function validate_schema(treedb, options) {
 	if (treedb.topics.length === 0) add("warning", "schema has no topic", "", "", "");
 	for (let topic of treedb.topics) {
 		let col_names = topic.cols.map((c) => c.name);
+		if (topic_name_breaks_the_rule(topic.name)) add("error", "topic name breaks the name rule", topic.name, "", topic.name);
+		for (let col of topic.cols) if (col_name_breaks_the_rule(col.name)) add("error", "column name breaks the name rule", topic.name, col.name, col.name);
 		if (topic.cols.length === 0) add("error", "topic has no column", topic.name, "", "");
 		let pkey = topic.pkey || "id";
 		if (col_names.indexOf(pkey) < 0) add("error", "pkey names no column", topic.name, "", pkey);
@@ -72682,6 +72702,10 @@ function validate_schema(treedb, options) {
 				let hook = col_hook(col.record);
 				if (!hook || Object.keys(hook).length === 0) add("error", "hook has no mapping", topic.name, col.name, "");
 				else for (let [child_topic, fkey_col] of Object.entries(hook)) {
+					if (col_name_breaks_the_rule(fkey_col)) {
+						add("error", "column name breaks the name rule", topic.name, col.name, `${child_topic}.${fkey_col}`);
+						continue;
+					}
 					let child = topic_by_name[child_topic];
 					if (!child) {
 						add("error", "hook names no topic", topic.name, col.name, child_topic);
@@ -73589,6 +73613,52 @@ 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({
+			code: "topic name breaks the name rule",
+			topic: name,
+			col: ""
+		});
+		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 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: name || "",
+					col: in_col.name
+				});
+				if (col_name_breaks_the_rule(fkey_col)) conflicts.push({
+					code: "column name breaks the name rule",
+					topic: name || "",
+					col: in_col.name
+				});
+			}
+		}
+	}
+	if (conflicts.length > 0) return {
+		writes,
+		summary,
+		conflicts
+	};
 	let stored_topics = {};
 	for (let topic of treedb && treedb.topics || []) stored_topics[topic.name] = topic;
 	let seen_topics = {};
@@ -74319,6 +74389,7 @@ var PRIVATE_DATA$1 = {
 	dialog: null,
 	dialog_gen: 0,
 	dialog_kind: "",
+	dialog_content: null,
 	save_queue: null,
 	save_return: "",
 	save_wrote: false,
@@ -74382,14 +74453,27 @@ function mt_destroy$1(gobj) {
 *      Local Methods
 ***************************/
 /************************************************************
-*  THE name rule of timeranger2 and treedb
-*  (tranger2_name_is_identifier(), SDK 7.26.9): a topic or a column
-*  name is a directory and a key, so it cannot be "." or "..", nor hold
-*  '/' or the path delimiter '`'. Said here, before the backend answers
-*  a generic "cannot create topic".
+*  A name the treedb refuses (the two name rules of
+*  schema_model.js), said at once: the error carries its key as
+*  a LITERAL (so a consumer's validate-locales sees it), and the
+*  name field is marked aria-invalid for a reader.
 ************************************************************/
-function name_breaks_the_rule(name) {
-	return name === "." || name === ".." || name.includes("/") || name.includes("`");
+function refuse_bad_name(gobj, $message) {
+	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
@@ -75854,6 +75938,7 @@ function close_dialog(gobj) {
 	let dialog = priv.dialog;
 	priv.dialog = null;
 	priv.dialog_kind = "";
+	priv.dialog_content = null;
 	priv.export_view = null;
 	try {
 		dialog.close();
@@ -75866,6 +75951,7 @@ function open_dialog(gobj, $content, title, logical, title_prefix) {
 	close_dialog(gobj);
 	priv.dialog_gen = priv.model_gen;
 	priv.dialog_kind = logical;
+	priv.dialog_content = $content;
 	priv.dialog = yui_shell_show_modal(yui_shell_of(gobj), $content, {
 		dialog: true,
 		title,
@@ -75875,6 +75961,7 @@ function open_dialog(gobj, $content, title, logical, title_prefix) {
 		on_close: () => {
 			priv.dialog = null;
 			priv.dialog_kind = "";
+			priv.dialog_content = null;
 			priv.export_view = null;
 		}
 	});
@@ -77900,17 +77987,21 @@ 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;
 	}
-	if (kw.creating && name_breaks_the_rule(String(values.value).trim())) {
-		yui_shell_show_error(yui_shell_of(gobj), "a name cannot be . or .., nor hold / or `", { t });
-		return -1;
-	}
+	if (kw.creating && col_name_breaks_the_rule(String(values.value).trim())) return refuse_bad_name(gobj, createElement2([
+		"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 });
 		return -1;
 	}
+	mark_name_field(gobj, false);
 	close_dialog(gobj);
 	return queue_writes(gobj, [{
 		op: kw.creating ? "create" : "update",
@@ -78158,17 +78249,21 @@ 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;
 		}
-		if (name_breaks_the_rule(name)) {
-			yui_shell_show_error(yui_shell_of(gobj), "a name cannot be . or .., nor hold / or `", { t });
-			return -1;
-		}
+		if (topic_name_breaks_the_rule(name)) return refuse_bad_name(gobj, createElement2([
+			"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 });
 			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.21",
+  "version": "7.26.23",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_yui_schema_editor.js

@@ -140,6 +140,8 @@ import {
     parse_fkey_ref,
     next_order,
     moved_orders,
+    topic_name_breaks_the_rule,
+    col_name_breaks_the_rule,
 } from "./schema_model.js";
 import {validate_schema, validate_model, has_errors} from "./schema_validate.js";
 import {topic_descs} from "./schema_descs.js";
@@ -250,6 +252,7 @@ let PRIVATE_DATA = {
     dialog:         null,
     dialog_gen:     0,      /*  the model_gen the open dialog was built on  */
     dialog_kind:    "",     /*  the logical class of the open dialog  */
+    dialog_content: null,   /*  the content of the open dialog (its name field is marked)  */
 
     /*  A write, or a plan of them, in flight  */
     save_queue:     null,
@@ -362,15 +365,36 @@ function mt_destroy(gobj)
 
 
 /************************************************************
- *  THE name rule of timeranger2 and treedb
- *  (tranger2_name_is_identifier(), SDK 7.26.9): a topic or a column
- *  name is a directory and a key, so it cannot be "." or "..", nor hold
- *  '/' or the path delimiter '`'. Said here, before the backend answers
- *  a generic "cannot create topic".
+ *  A name the treedb refuses (the two name rules of
+ *  schema_model.js), said at once: the error carries its key as
+ *  a LITERAL (so a consumer's validate-locales sees it), and the
+ *  name field is marked aria-invalid for a reader.
  ************************************************************/
-function name_breaks_the_rule(name)
+function refuse_bad_name(gobj, $message)
 {
-    return name === "." || name === ".." || name.includes("/") || name.includes("`");
+    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) {
+        return;
+    }
+    if(invalid) {
+        $value.setAttribute("aria-invalid", "true");
+    } else {
+        $value.removeAttribute("aria-invalid");
+    }
 }
 
 /***************************************************************
@@ -1870,6 +1894,7 @@ function close_dialog(gobj)
     let dialog = priv.dialog;
     priv.dialog = null;
     priv.dialog_kind = "";
+    priv.dialog_content = null;
     priv.export_view = null;
     try {
         dialog.close();
@@ -1885,6 +1910,7 @@ function open_dialog(gobj, $content, title, logical, title_prefix)
     close_dialog(gobj);
     priv.dialog_gen = priv.model_gen;
     priv.dialog_kind = logical;
+    priv.dialog_content = $content;
     priv.dialog = yui_shell_show_modal(yui_shell_of(gobj), $content, {
         dialog:        true,
         title:         title,
@@ -1894,6 +1920,7 @@ function open_dialog(gobj, $content, title, logical, title_prefix)
         on_close:      () => {
             priv.dialog = null;
             priv.dialog_kind = "";
+            priv.dialog_content = null;
             priv.export_view = null;
         }
     });
@@ -4035,17 +4062,20 @@ 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;
     }
-    if(kw.creating && name_breaks_the_rule(String(values.value).trim())) {
-        yui_shell_show_error(yui_shell_of(gobj), "a name cannot be . or .., nor hold / or `", {t: t});
-        return -1;
+    if(kw.creating && col_name_breaks_the_rule(String(values.value).trim())) {
+        return refuse_bad_name(gobj, createElement2(
+            ["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, [{
@@ -4346,17 +4376,20 @@ 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;
         }
-        if(name_breaks_the_rule(name)) {
-            yui_shell_show_error(yui_shell_of(gobj), "a name cannot be . or .., nor hold / or `", {t: t});
-            return -1;
+        if(topic_name_breaks_the_rule(name)) {
+            return refuse_bad_name(gobj, createElement2(
+                ["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

@@ -1716,3 +1716,60 @@ describe("the reason a load failed", () => {
         expect($detail.getAttribute("data-i18n")).toBe("cannot reach the treedb");
     });
 });
+
+
+/*
+ *  The two name rules (REV-CLOUD V14.2): a name the treedb refuses is
+ *  said at once, with its key, and nothing is written; a '/' in a column
+ *  is not refused (a column is a key, not a directory).
+ */
+describe("names the treedb refuses", () => {
+    test("a column x`y is refused with its key; kids/all is written", () => {
+        const {editor, host} = build("names_col", "db/users");
+        gobj_send_event(editor, "EV_SAVE_COLUMN", {
+            creating: true, topic: "users", values: {value: "x`y", type: "string"}
+        }, host);
+        expect(take("update-node").length).toBe(0);
+        expect(shown.length).toBe(1);
+        expect(shown[0].getAttribute("data-i18n")).toBe("invalid column name");
+        start_a_write(editor, host, "kids/all");
+    });
+
+    test("a topic a/b or .. is refused with its key", () => {
+        const {editor, host} = build("names_topic", "db");
+        for(const name of ["a/b", ".."]) {
+            shown.length = 0;
+            gobj_send_event(editor, "EV_SAVE_TOPIC", {
+                creating: true, topic: "", values: {value: name}
+            }, host);
+            expect(take("update-node").length).toBe(0);
+            expect(shown.length).toBe(1);
+            expect(shown[0].getAttribute("data-i18n")).toBe("invalid topic name");
+        }
+    });
+});
+
+
+/*
+ *  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("ok_name");
+        expect($value.getAttribute("aria-invalid")).toBe(null);
+        take("update-node");
+    });
+});

package/src/schema_import.js

@@ -31,6 +31,8 @@ import {
     as_json,
     is_empty_value,
     fkey_ref,
+    topic_name_breaks_the_rule,
+    col_name_breaks_the_rule,
 } from "./schema_model.js";
 
 
@@ -204,6 +206,54 @@ function plan_import(treedb, incoming, options)
         return {writes: writes, summary: summary, conflicts: conflicts};
     }
 
+    /*
+     *  Names the treedb refuses (the two name rules of schema_model.js)
+     *  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});
+            }
+            /*  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)) {
+                    if(topic_name_breaks_the_rule(child_topic)) {
+                        conflicts.push({code: "topic name breaks the name rule",
+                                        topic: name || "", col: in_col.name});
+                    }
+                    if(col_name_breaks_the_rule(fkey_col)) {
+                        conflicts.push({code: "column name breaks the name rule",
+                                        topic: name || "", col: in_col.name});
+                    }
+                }
+            }
+        }
+    }
+    if(conflicts.length > 0) {
+        return {writes: writes, summary: summary, conflicts: conflicts};
+    }
+
     let stored_topics = {};
     for(let topic of ((treedb && treedb.topics) || [])) {
         stored_topics[topic.name] = topic;

package/src/schema_import.test.js

@@ -253,3 +253,60 @@ describe("the empty collections the store answers with", () => {
         expect(plan_import(stored, incoming).writes).toEqual([]);
     });
 });
+
+
+describe("names the treedb refuses stop the plan before any write (REV-CLOUD V14.2)", () => {
+    test("a topic a/b, a topic .., a column x`y: conflicts, no writes", () => {
+        let plan = plan_import(null, {
+            id: "db", schema_version: "1",
+            topics: [
+                {id: "a/b", pkey: "id", cols: {id: {id: "id", type: "string"}}},
+                {id: "..", pkey: "id", cols: {id: {id: "id", type: "string"}}},
+                {id: "ok", pkey: "id", cols: {"id": {id: "id", type: "string"},
+                                               "x`y": {id: "x`y", type: "string"}}},
+            ]
+        });
+        expect(plan.writes).toEqual([]);
+        let codes = plan.conflicts.map((c) => c.code);
+        expect(codes.filter((c) => c === "topic name breaks the name rule").length).toBe(2);
+        expect(codes).toContain("column name breaks the name rule");
+    });
+
+    test("a '/' in a column and a leading '.' in a topic are imported", () => {
+        let plan = plan_import(null, {
+            id: "db", schema_version: "1",
+            topics: [{id: ".hidden", pkey: "id",
+                      cols: {"id": {id: "id", type: "string"}, "kids/all": {id: "kids/all", type: "dict"}}}]
+        });
+        expect(plan.conflicts).toEqual([]);
+        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");
+    });
+});

package/src/schema_model.js

@@ -515,8 +515,32 @@ function moved_orders(list)
     return writes;
 }
 
+/***************************************************************
+ *  The TWO name rules of the treedb (SDK 7.26.9):
+ *
+ *      a TOPIC name is a directory and a key: not empty, not "."
+ *      or "..", no '/' and no '`' (tranger2_name_is_identifier());
+ *      a COLUMN name (a column id, a hook, an fkey) is only a key:
+ *      not empty and no '`' (treedb_col_name_is_identifier()).
+ *
+ *  Said here as in C, so the editor refuses what the treedb will.
+ ***************************************************************/
+function topic_name_breaks_the_rule(name)
+{
+    let s = String(name === undefined || name === null ? "" : name);
+    return s === "" || s === "." || s === ".." || s.includes("/") || s.includes("`");
+}
+
+function col_name_breaks_the_rule(name)
+{
+    let s = String(name === undefined || name === null ? "" : name);
+    return s === "" || s.includes("`");
+}
+
 
 export {
+    topic_name_breaks_the_rule,
+    col_name_breaks_the_rule,
     DEFAULT_ORDER,
     REF_SEP,
     parse_fkey_ref,

package/src/schema_model.test.js

@@ -256,3 +256,22 @@ describe("is_empty_value — what the store answers when a blob was never set",
         expect(is_empty_value(false)).toBe(false);
     });
 });
+
+
+describe("the two name rules", async () => {
+    const { topic_name_breaks_the_rule, col_name_breaks_the_rule } = await import("./schema_model.js");
+    test("as C: topic = tranger2_name_is_identifier(), column = treedb_col_name_is_identifier()", () => {
+        for(let n of ["", ".", "..", "a/b", "a`b"]) {
+            expect(topic_name_breaks_the_rule(n)).toBe(true);
+        }
+        for(let n of ["users", ".hidden", "a.b"]) {
+            expect(topic_name_breaks_the_rule(n)).toBe(false);
+        }
+        for(let n of ["", "a`b"]) {
+            expect(col_name_breaks_the_rule(n)).toBe(true);
+        }
+        for(let n of ["id", "kids/all", "..", ".x"]) {
+            expect(col_name_breaks_the_rule(n)).toBe(false);
+        }
+    });
+});

package/src/schema_validate.js

@@ -32,6 +32,8 @@ import {
     col_hook,
     col_enum,
     topic_pkey2s,
+    topic_name_breaks_the_rule,
+    col_name_breaks_the_rule,
 } from "./schema_model.js";
 
 
@@ -100,6 +102,16 @@ function validate_schema(treedb, options)
     for(let topic of treedb.topics) {
         let col_names = topic.cols.map(c => c.name);
 
+        /*  A name the treedb refuses: the topic is left out when it opens.  */
+        if(topic_name_breaks_the_rule(topic.name)) {
+            add("error", "topic name breaks the name rule", topic.name, "", topic.name);
+        }
+        for(let col of topic.cols) {
+            if(col_name_breaks_the_rule(col.name)) {
+                add("error", "column name breaks the name rule", topic.name, col.name, col.name);
+            }
+        }
+
         if(topic.cols.length === 0) {
             add("error", "topic has no column", topic.name, "", "");
         }
@@ -143,6 +155,11 @@ function validate_schema(treedb, options)
                     add("error", "hook has no mapping", topic.name, col.name, "");
                 } else {
                     for(let [child_topic, fkey_col] of Object.entries(hook)) {
+                        if(col_name_breaks_the_rule(fkey_col)) {
+                            add("error", "column name breaks the name rule", topic.name, col.name,
+                                `${child_topic}.${fkey_col}`);
+                            continue;
+                        }
                         let child = topic_by_name[child_topic];
                         if(!child) {
                             add("error", "hook names no topic", topic.name, col.name,

package/src/schema_validate.test.js

@@ -287,3 +287,36 @@ describe("only one hook may name a fkey column", () => {
         expect(dup[0].severity).toBe("error");
     });
 });
+
+
+describe("the two name rules (REV-CLOUD V14.2)", () => {
+    test("a column with the delimiter is an error; a '/' in a column is fine", () => {
+        let bad = validate_schema(schema({extra_col:
+            {id: "db.users.x`y", value: "x`y", order: 3, type: "string",
+             flag: ["persistent"], topics: ["topics^db.users^cols"]}}));
+        expect(codes(bad)).toContain("column name breaks the name rule");
+        let fine = validate_schema(schema({extra_col:
+            {id: "db.users.kids/all", value: "kids/all", order: 3, type: "string",
+             flag: ["persistent"], topics: ["topics^db.users^cols"]}}));
+        expect(codes(fine)).not.toContain("column name breaks the name rule");
+    });
+
+    test("a topic named with '/' or '..' is an error; a leading '.' is not", () => {
+        for(let [name, wanted] of [["a/b", true], ["..", true], [".hidden", false]]) {
+            let treedb = build_schema_model({
+                treedbs: [{id: "db", schema_version: 1}],
+                topics: [{id: `db.${name}`, value: name, order: 1, pkey: "id",
+                          topic_version: 1, treedbs: ["treedbs^db^topics"]}],
+                cols: [{id: `db.${name}.id`, value: "id", order: 1, type: "string",
+                        flag: ["persistent"], topics: [`topics^db.${name}^cols`]}],
+            }).treedbs[0];
+            expect(codes(validate_schema(treedb)).includes("topic name breaks the name rule"))
+                .toBe(wanted);
+        }
+    });
+
+    test("a hook mapping to an fkey column with the delimiter is an error", () => {
+        let found = validate_schema(schema({hook: {users: "dep`artments"}}));
+        expect(codes(found)).toContain("column name breaks the name rule");
+    });
+});