@alizarin/clm 2.0.0-alpha.98 → 2.0.0-beta.3

package/dist/clm.js

@@ -157,7 +157,7 @@ var ReferenceValueViewModel = class c extends String {
 			let c = this._pendingLookup, l = await RDM.retrieveCollection(c.collectionId), u = null;
 			if (c.type === "uuid" ? (u = getReferenceValueFromCollection(l, c.uuid), u || console.error("Could not find reference for UUID", c.uuid, "in collection", c.collectionId)) : c.type === "label" && (u = getReferenceValueByLabelFromCollection(l, c.label), u || console.error("Could not find reference for label", c.label, "in collection", c.collectionId)), u && (this._resolvedRef = new StaticReference(u), this._tile && this._nodeid)) {
 				let e = this._tile.data.get(this._nodeid);
-				Array.isArray(e) || this._tile.data.set(this._nodeid, this._resolvedRef.toJSON());
+				Array.isArray(e) && e.length <= 1 ? this._tile.data.set(this._nodeid, [this._resolvedRef.toJSON()]) : Array.isArray(e) || this._tile.data.set(this._nodeid, [this._resolvedRef.toJSON()]);
 			}
 			return this._resolvedRef;
 		})(), this._resolutionPromise) : null;
@@ -184,13 +184,17 @@ var ReferenceValueViewModel = class c extends String {
 		} : null;
 	}
 	async __asTileData() {
-		let e = await this._resolvePending();
-		return e && typeof e.toJSON == "function" ? e.toJSON() : e;
+		let e = await this._resolvePending(), c = e && typeof e.toJSON == "function" ? e.toJSON() : e;
+		return c ? [c] : null;
 	}
 	static async __create(e, l, u, d) {
 		let f = l.nodeid, p = l.config?.controlledList || l.config?.rdmCollection;
 		if (!p) throw Error(`Node ${l.alias} (${l.nodeid}) missing controlledList or rdmCollection in config`);
 		if (e && (e.data.has(f) || e.data.set(f, null), u !== null)) {
+			if (Array.isArray(u)) {
+				if (u.length === 1) u = u[0];
+				else if (u.length === 0) return null;
+			}
 			if (u instanceof Promise) return u.then((u) => c.__create(e, l, u, d));
 			if (typeof u == "string") if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.exec(u)) {
 				let l = {
@@ -198,10 +202,10 @@ var ReferenceValueViewModel = class c extends String {
 					uuid: u,
 					collectionId: p
 				};
-				return e.data.set(f, {
+				return e.data.set(f, [{
 					__needs_rdm_lookup: !0,
 					uuid: u
-				}), new c(null, l, e, f, p);
+				}]), new c(null, l, e, f, p);
 			} else throw Error(`Set references using values from collections, not strings: ${u}`);
 			else if (typeof u == "object" && u && u.__needs_rdm_lookup && u.uuid) {
 				let l = {
@@ -209,20 +213,20 @@ var ReferenceValueViewModel = class c extends String {
 					uuid: u.uuid,
 					collectionId: p
 				};
-				return e.data.set(f, u), new c(null, l, e, f, p);
+				return e.data.set(f, [u]), new c(null, l, e, f, p);
 			} else if (typeof u == "object" && u && u.__needs_rdm_label_lookup && u.label) {
 				let l = u.controlledList || p, d = {
 					type: "label",
 					label: u.label,
 					collectionId: l
 				};
-				return e.data.set(f, u), new c(null, d, e, f, l);
+				return e.data.set(f, [u]), new c(null, d, e, f, l);
 			} else if (Array.isArray(u) && u.length > 0 && "labels" in u[0]) {
 				let l = new StaticReference(u[0]);
-				return e.data.set(f, l.toJSON()), new c(l, void 0, void 0, void 0, p);
+				return e.data.set(f, [l.toJSON()]), new c(l, void 0, void 0, void 0, p);
 			} else if (typeof u == "object" && u && "labels" in u) {
 				let l = new StaticReference(u);
-				return e.data.set(f, l.toJSON()), new c(l, void 0, void 0, void 0, p);
+				return e.data.set(f, [l.toJSON()]), new c(l, void 0, void 0, void 0, p);
 			} else throw Error("Could not set reference from this data: " + JSON.stringify(u));
 		}
 		return !e || !u ? null : new c(u, void 0, void 0, void 0, p);
@@ -283,4 +287,9 @@ var ReferenceValueViewModel = class c extends String {
 		return f && f.multiValue ? ReferenceListViewModel.__create(e, l, u, d) : ReferenceValueViewModel.__create(e, l, u, d);
 	}
 };
-viewModels.CUSTOM_DATATYPES.set("reference", ReferenceMergedDataType), registerResolvableDatatype("reference");
+viewModels.CUSTOM_DATATYPES.set("reference", ReferenceMergedDataType), registerResolvableDatatype("reference"), (async () => {
+	try {
+		let e = await import("@alizarin/napi"), c = await import("@alizarin/clm-napi");
+		e.registerExtensionHandler(c.referenceHandlerPtr());
+	} catch {}
+})();

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@alizarin/clm",
-  "version": "2.0.0-alpha.98",
+  "version": "2.0.0-beta.3",
   "description": "Alizarin display serializers for CLM reference datatypes",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/flaxandteal/alizarin",
-    "directory": "ext/js/@alizarin/clm"
+    "directory": "ext/clm/js"
   },
   "author": "Phil Weir <phil.weir@flaxandteal.co.uk>",
   "type": "module",
@@ -20,13 +20,23 @@
     "dev": "vite",
     "build": "vite build && tsc -p tsconfig.build.json",
     "preview": "vite preview",
-    "test": "cd ../../../.. && npm test -- ext/js/@alizarin/clm/tests/clm.test.ts"
+    "test": "cd ../../.. && npm test -- ext/clm/js/tests/clm.test.ts"
   },
   "peerDependencies": {
-    "alizarin": "2.0.0-alpha.98"
+    "alizarin": "2.0.0-beta.3",
+    "@alizarin/napi": "2.0.0-beta.1",
+    "@alizarin/clm-napi": "2.0.0-beta.1"
+  },
+  "peerDependenciesMeta": {
+    "@alizarin/napi": {
+      "optional": true
+    },
+    "@alizarin/clm-napi": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "alizarin": "file:../../../..",
+    "alizarin": "file:../../..",
     "typescript": "~5.9.3",
     "vite": "npm:rolldown-vite@7.2.5"
   },