@yuneta/gobj-ui 7.23.46 → 7.23.47

package/README.md

@@ -1388,7 +1388,7 @@ backend** — asking is an action and belongs in the view's own FSM:
 
 | | |
 |---|---|
-| `yui_asset_id(ref)` / `yui_asset_ids(ref)` | the id(s) a column names. Reads a single-valued fkey (`"assets^<id>^as_foto"`), an array fkey, and an expanded ref (`{id}`). An empty column answers nothing rather than throwing |
+| `yui_asset_id(ref)` / `yui_asset_ids(ref)` | the id(s) a column names. A link comes back in whichever shape the READER asked for — the stored `"assets^<id>^as_foto"`, the bare `"<id>"` that `fkey_only_id` collapses it to, or an expanded `{id}` — and either alone or in a list, because an unset single-valued fkey is still an empty list. All of them are read; an empty column answers nothing rather than throwing |
 | `yui_asset_src(answer)` | the two shapes into one `src`. `null` when the answer carries neither — never an empty string, because `<img src="">` reloads the page in some browsers |
 | `yui_asset_element(answer, opts)` | the element, picked from the **content type the backend stored**: `<img>`, `<video>` or `<audio>`. Video and audio are assets too, and an `<img>` whose src is a film shows the broken box this exists to remove |
 | `yui_asset_missing(detail, opts)` | the marker, for when there is nothing to show |

package/dist/gobj-ui.cjs.js

@@ -67047,8 +67047,9 @@ function register_c_yui_period() {
 function ref_to_id(ref) {
 	if (!ref) return null;
 	if (typeof ref === "string") {
+		if (ref.indexOf("^") < 0) return ref;
 		const parts = ref.split("^");
-		return parts.length >= 2 ? parts[1] : null;
+		return parts.length >= 2 && parts[1] ? parts[1] : null;
 	}
 	if (typeof ref === "object" && typeof ref.id === "string") return ref.id;
 	return null;

package/dist/gobj-ui.es.js

@@ -67042,8 +67042,9 @@ function register_c_yui_period() {
 function ref_to_id(ref) {
 	if (!ref) return null;
 	if (typeof ref === "string") {
+		if (ref.indexOf("^") < 0) return ref;
 		const parts = ref.split("^");
-		return parts.length >= 2 ? parts[1] : null;
+		return parts.length >= 2 && parts[1] ? parts[1] : null;
 	}
 	if (typeof ref === "object" && typeof ref.id === "string") return ref.id;
 	return null;

package/package.json

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

package/src/yui_asset.js

@@ -22,10 +22,22 @@ import {
 import "./yui_asset.css";
 
 /*
- *  A treedb fkey is `topic^id^hook`, and a column holds either one of them
- *  (a single-valued fkey, like a device's photo) or a list (an array fkey,
- *  like the plans of a bay).  An expanded ref -- what `refs` options give
- *  back -- is an object carrying the id instead.
+ *  A column that holds a link comes back in one of THREE shapes, and which
+ *  one is the READER's choice, not the schema's:
+ *
+ *    "assets^<id>^as_foto"   the stored fkey, as it is persisted;
+ *    "<id>"                  what `fkey_only_id` collapses it to, which is
+ *                            what a caller asks for when it wants clean ids;
+ *    {id: "<id>", ...}       an expanded ref, from the `refs` options.
+ *
+ *  And a column holds either ONE of them (a single-valued fkey, like a
+ *  device's photo) or a LIST (an array fkey, like the plans of a bay) --
+ *  and an UNSET single-valued fkey still comes back as an empty list.
+ *
+ *  Reading only the first shape was a real bug: against a backend that
+ *  reads with `fkey_only_id` every link looked like no link at all.  The
+ *  `^` is what tells the two string shapes apart, and an id can never carry
+ *  one -- that is why the qualified key uses `.` and not `^`.
  */
 function ref_to_id(ref)
 {
@@ -33,8 +45,11 @@ function ref_to_id(ref)
         return null;
     }
     if(typeof ref === "string") {
+        if(ref.indexOf("^") < 0) {
+            return ref;             // already only the id
+        }
         const parts = ref.split("^");
-        return parts.length >= 2? parts[1]: null;
+        return parts.length >= 2 && parts[1]? parts[1]: null;
     }
     if(typeof ref === "object" && typeof ref.id === "string") {
         return ref.id;

package/src/yui_asset.test.js

@@ -27,6 +27,26 @@ test("reads every id out of an array fkey, in order", () => {
     expect(yui_asset_id(["assets^p1^as_plano", "assets^p2^as_plano"])).toBe("p1");
 });
 
+/*
+ *  `fkey_only_id` is a normal way to read a node -- yunovatios reads every
+ *  device that way -- and it collapses a link to the bare id. Reading only
+ *  the `topic^id^hook` form made every such link look like no link at all.
+ */
+test("reads a link collapsed by fkey_only_id, list or bare", () => {
+    expect(yui_asset_id(["7b09b140"])).toBe("7b09b140");
+    expect(yui_asset_id("7b09b140")).toBe("7b09b140");
+    expect(yui_asset_ids(["p1", "p2"])).toEqual(["p1", "p2"]);
+});
+
+/*
+ *  An UNSET single-valued fkey comes back as an EMPTY LIST, not as an empty
+ *  string: that is the shape of "this device has no photo".
+ */
+test("an unset single-valued fkey is an empty list", () => {
+    expect(yui_asset_id([])).toBe(null);
+    expect(yui_asset_ids([])).toEqual([]);
+});
+
 test("reads an EXPANDED ref, which is what the refs options give back", () => {
     expect(yui_asset_id({id: "abc123", content_type: "image/jpeg"})).toBe("abc123");
 });
@@ -41,9 +61,8 @@ test("an empty or malformed column yields nothing, and does not throw", () => {
     expect(yui_asset_ids("")).toEqual([]);
     expect(yui_asset_ids([])).toEqual([]);
     expect(yui_asset_id(null)).toBe(null);
-    expect(yui_asset_id("not-an-fkey")).toBe(null);
     expect(yui_asset_id({})).toBe(null);
-    expect(yui_asset_ids(["assets^ok^as_foto", "rubbish", null])).toEqual(["ok"]);
+    expect(yui_asset_ids(["assets^ok^as_foto", null, ""])).toEqual(["ok"]);
 });
 
 /*