pacc 4.34.0 → 4.34.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "4.34.0",
+  "version": "4.34.2",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/attributes.mjs

@@ -1,5 +1,5 @@
 import { getAttribute } from "./settergetter.mjs";
-import { types } from "./types.mjs";
+import { types, oneOfType } from "./types.mjs";
 
 /**
  * Create attributes from its definition.
@@ -13,7 +13,7 @@ export function prepareAttributesDefinitions(
 ) {
   for (const [path, def] of attributeIterator(newDefinitions)) {
     if (typeof def.type === "string") {
-      def.type = types[def.type] || types.base;
+      def.type = oneOfType(def.type);
     }
   }
 

package/src/types.mjs

@@ -39,17 +39,33 @@ export function addType(type) {
 }
 
 export function oneOfType(definition) {
+  const aggregate = list =>
+    list.reduce(
+      (a, c) => a.union(c?.members ?? new Set([types[c] ?? c])),
+      new Set()
+    );
+
   if (Array.isArray(definition)) {
-    return addType({
-      name: definition.map(t => t.name).join("|"),
-      members: new Set(definition)
-    });
+    const name = definition
+      .map(t => t.name ?? t)
+      .sort()
+      .join("|");
+
+    return (
+      types[name] ||
+      addType({
+        name,
+        members: aggregate(definition)
+      })
+    );
   } else {
+    const parts = definition.split("|").sort();
+    const name = parts.join("|");
     return (
-      types[definition] ||
+      types[name] ||
       addType({
-        name: definition,
-        members: new Set(definition.split("|").map(t => types[t]))
+        name,
+        members: aggregate(parts.map(t => types[t]))
       })
     );
   }