@player-tools/xlr-sdk 0.4.2--canary.69.1573 → 0.4.2-next.1

package/dist/index.cjs.js

@@ -14,22 +14,6 @@ var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var ts__default = /*#__PURE__*/_interopDefaultLegacy(ts);
 
-var __defProp$3 = Object.defineProperty;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
-    }
-  return a;
-};
 class BasicXLRRegistry {
   constructor() {
     this.typeMap = new Map();
@@ -38,7 +22,7 @@ class BasicXLRRegistry {
   }
   get(id) {
     const value = this.typeMap.get(id);
-    return value ? __spreadValues$3({}, value) : void 0;
+    return value ? JSON.parse(JSON.stringify(value)) : void 0;
   }
   add(type, plugin, capability) {
     this.typeMap.set(type.name, type);
@@ -137,10 +121,21 @@ class XLRValidator {
           return validationIssues;
         }
       }
+      let message;
+      if (xlrNode.name) {
+        message = `Does not match any of the expected types for type: '${xlrNode.name}'`;
+      } else if (xlrNode.title) {
+        message = `Does not match any of the expected types for property: '${xlrNode.title}'`;
+      } else {
+        message = `Does not match any of the types ${xlrNode.or.map((node) => {
+          var _a2, _b;
+          return (_b = (_a2 = node.name) != null ? _a2 : node.title) != null ? _b : "<unnamed type>";
+        }).join(" | ")}`;
+      }
       validationIssues.push({
         type: "value",
         node: rootNode,
-        message: `Does not match any of the expected types for type: '${xlrNode.name}'`
+        message
       });
     } else if (xlrNode.type === "and") {
       const effectiveType = __spreadValues$2(__spreadValues$2({}, this.computeIntersectionType(xlrNode.and)), xlrNode.name ? { name: xlrNode.name } : {});
@@ -382,10 +377,16 @@ var __spreadValues$1 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+const isMatchingCapability = (capability, capabilitiesToMatch) => {
+  if (Array.isArray(capabilitiesToMatch)) {
+    return capabilitiesToMatch.includes(capability);
+  }
+  return capability === capabilitiesToMatch;
+};
 function simpleTransformGenerator(typeToTransform, capabilityToTransform, functionToRun) {
   const walker = (n, capability) => {
     var _a;
-    if (capability === capabilityToTransform) {
+    if (isMatchingCapability(capability, capabilityToTransform)) {
       let node = __spreadValues$1({}, n);
       if (node.type === typeToTransform) {
         node = functionToRun(node);
@@ -399,8 +400,16 @@ function simpleTransformGenerator(typeToTransform, capabilityToTransform, functi
             node: walker(value.node, capability)
           };
         }
-        return __spreadProps$1(__spreadValues$1({}, node), {
-          properties: __spreadValues$1({}, newObjectProperties),
+        return __spreadProps$1(__spreadValues$1(__spreadProps$1(__spreadValues$1({}, node), {
+          properties: __spreadValues$1({}, newObjectProperties)
+        }), xlrUtils.isGenericNamedType(node) ? {
+          genericTokens: node.genericTokens.map((token) => {
+            return __spreadProps$1(__spreadValues$1({}, token), {
+              constraints: token.constraints ? walker(token.constraints, capability) : void 0,
+              default: token.default ? walker(token.default, capability) : void 0
+            });
+          })
+        } : {}), {
           extends: node.extends ? walker(node.extends, capability) : void 0,
           additionalProperties: node.additionalProperties ? walker(node.additionalProperties, capability) : false
         });
@@ -421,9 +430,9 @@ function simpleTransformGenerator(typeToTransform, capabilityToTransform, functi
         });
       }
       if (node.type === "ref") {
-        return __spreadProps$1(__spreadValues$1({}, node), {
+        return __spreadValues$1(__spreadValues$1({}, node), node.genericArguments ? {
           genericArguments: (_a = node.genericArguments) == null ? void 0 : _a.map((arg) => walker(arg, capability))
-        });
+        } : {});
       }
       if (node.type === "tuple") {
         return __spreadProps$1(__spreadValues$1({}, node), {
@@ -517,10 +526,15 @@ class XLRSDK {
     this.validator = new XLRValidator(this.getType.bind(this));
     this.tsWriter = new xlrConverters.TSWriter();
     this.computedNodeCache = new Map();
+    this.externalTransformFunctions = new Map();
   }
   loadDefinitionsFromDisk(inputPath, filters, transforms) {
     var _a;
     this.computedNodeCache.clear();
+    const transformsToRun = [
+      ...this.externalTransformFunctions.values(),
+      ...transforms != null ? transforms : []
+    ];
     const manifest = JSON.parse(fs__default["default"].readFileSync(path__default["default"].join(inputPath, "xlr", "manifest.json")).toString(), (key, value) => {
       if (typeof value === "object" && value !== null) {
         if (key === "capabilities") {
@@ -536,7 +550,7 @@ class XLRSDK {
         var _a2;
         if (!(filters == null ? void 0 : filters.typeFilter) || !extensionName.match(filters == null ? void 0 : filters.typeFilter)) {
           const cType = JSON.parse(fs__default["default"].readFileSync(path__default["default"].join(inputPath, "xlr", `${extensionName}.json`)).toString());
-          const effectiveType = (_a2 = transforms == null ? void 0 : transforms.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), cType)) != null ? _a2 : cType;
+          const effectiveType = (_a2 = transformsToRun == null ? void 0 : transformsToRun.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), cType)) != null ? _a2 : cType;
           this.registry.add(effectiveType, manifest.pluginName, capabilityName);
         }
       });
@@ -546,6 +560,10 @@ class XLRSDK {
     return __async(this, null, function* () {
       var _a;
       this.computedNodeCache.clear();
+      const transformsToRun = [
+        ...this.externalTransformFunctions.values(),
+        ...transforms != null ? transforms : []
+      ];
       (_a = Object.keys(manifest.capabilities)) == null ? void 0 : _a.forEach((capabilityName) => {
         if ((filters == null ? void 0 : filters.capabilityFilter) && capabilityName.match(filters == null ? void 0 : filters.capabilityFilter))
           return;
@@ -553,20 +571,26 @@ class XLRSDK {
         capabilityList.forEach((extension) => {
           var _a2;
           if (!(filters == null ? void 0 : filters.typeFilter) || !extension.name.match(filters == null ? void 0 : filters.typeFilter)) {
-            const effectiveType = (_a2 = transforms == null ? void 0 : transforms.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), extension)) != null ? _a2 : extension;
+            const effectiveType = (_a2 = transformsToRun == null ? void 0 : transformsToRun.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), extension)) != null ? _a2 : extension;
             this.registry.add(effectiveType, manifest.pluginName, capabilityName);
           }
         });
       });
     });
   }
+  addTransformFunction(name, fn) {
+    this.externalTransformFunctions.set(name, fn);
+  }
+  removeTransformFunction(name) {
+    this.externalTransformFunctions.delete(name);
+  }
   getType(id, options) {
     let type = this.registry.get(id);
     if ((options == null ? void 0 : options.getRawType) === true || !type) {
       return type;
     }
     if (this.computedNodeCache.has(id)) {
-      return this.computedNodeCache.get(id);
+      return JSON.parse(JSON.stringify(this.computedNodeCache.get(id)));
     }
     type = xlrUtils.fillInGenerics(this.resolveType(type));
     this.computedNodeCache.set(id, type);
@@ -616,10 +640,22 @@ class XLRSDK {
           throw new Error(`Error resolving ${objectNode.name}: can't find extended type ${refName}`);
         }
         extendedType = xlrUtils.resolveReferenceNode(objectNode.extends, extendedType);
-        return __spreadProps(__spreadValues({}, xlrUtils.computeEffectiveObject(extendedType, objectNode, false)), {
+        if (extendedType.type === "object") {
+          return __spreadProps(__spreadValues({}, xlrUtils.computeEffectiveObject(extendedType, objectNode, false)), {
+            name: objectNode.name,
+            description: objectNode.description
+          });
+        }
+        return {
           name: objectNode.name,
-          description: objectNode.description
-        });
+          type: "and",
+          and: [
+            __spreadProps(__spreadValues({}, objectNode), {
+              extends: void 0
+            }),
+            extendedType
+          ]
+        };
       }
       return objectNode;
     })(type, "any");

package/dist/index.d.ts

@@ -62,6 +62,7 @@ declare class XLRSDK {
     private validator;
     private tsWriter;
     private computedNodeCache;
+    private externalTransformFunctions;
     constructor(customRegistry?: XLRRegistry);
     /**
      * Loads definitions from a path on the filesystem
@@ -79,6 +80,14 @@ declare class XLRSDK {
      * @param transforms - any transforms to apply to the types being loaded
      */
     loadDefinitionsFromModule(manifest: TSManifest, filters?: Omit<Filters, 'pluginFilter'>, transforms?: Array<TransformFunction>): Promise<void>;
+    /**
+     * Statically load transform function that should be applied to every XLR bundle that is imported
+     */
+    addTransformFunction(name: string, fn: TransformFunction): void;
+    /**
+     * Remove any transform function loaded via the `addTransformFunction` method by name
+     */
+    removeTransformFunction(name: string): void;
     /**
      * Returns a Type that has been previously loaded
      *
@@ -142,6 +151,6 @@ declare class XLRSDK {
  * Helper function for simple transforms
  * Walks an XLR tree looking for the specified node type calls the supplied function when called
  */
-declare function simpleTransformGenerator<T extends NodeTypeStrings = NodeTypeStrings>(typeToTransform: T, capabilityToTransform: string, functionToRun: (input: NodeTypeMap[T]) => NodeTypeMap[T]): TransformFunction;
+declare function simpleTransformGenerator<T extends NodeTypeStrings = NodeTypeStrings>(typeToTransform: T, capabilityToTransform: string | Array<string>, functionToRun: (input: NodeTypeMap[T]) => NodeTypeMap[T]): TransformFunction;
 
 export { BasicXLRRegistry, ExportTypes, Filters, GetTypeOptions, TypeMetadata, ValidationError, XLRRegistry, XLRSDK, simpleTransformGenerator };

package/dist/index.esm.js

@@ -1,25 +1,9 @@
-import { isPrimitiveTypeNode, resolveConditional, makePropertyMap, resolveReferenceNode, computeEffectiveObject, fillInGenerics } from '@player-tools/xlr-utils';
+import { isPrimitiveTypeNode, resolveConditional, makePropertyMap, resolveReferenceNode, computeEffectiveObject, isGenericNamedType, fillInGenerics } from '@player-tools/xlr-utils';
 import { TSWriter } from '@player-tools/xlr-converters';
 import fs from 'fs';
 import path from 'path';
 import ts from 'typescript';
 
-var __defProp$3 = Object.defineProperty;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
-    }
-  return a;
-};
 class BasicXLRRegistry {
   constructor() {
     this.typeMap = new Map();
@@ -28,7 +12,7 @@ class BasicXLRRegistry {
   }
   get(id) {
     const value = this.typeMap.get(id);
-    return value ? __spreadValues$3({}, value) : void 0;
+    return value ? JSON.parse(JSON.stringify(value)) : void 0;
   }
   add(type, plugin, capability) {
     this.typeMap.set(type.name, type);
@@ -127,10 +111,21 @@ class XLRValidator {
           return validationIssues;
         }
       }
+      let message;
+      if (xlrNode.name) {
+        message = `Does not match any of the expected types for type: '${xlrNode.name}'`;
+      } else if (xlrNode.title) {
+        message = `Does not match any of the expected types for property: '${xlrNode.title}'`;
+      } else {
+        message = `Does not match any of the types ${xlrNode.or.map((node) => {
+          var _a2, _b;
+          return (_b = (_a2 = node.name) != null ? _a2 : node.title) != null ? _b : "<unnamed type>";
+        }).join(" | ")}`;
+      }
       validationIssues.push({
         type: "value",
         node: rootNode,
-        message: `Does not match any of the expected types for type: '${xlrNode.name}'`
+        message
       });
     } else if (xlrNode.type === "and") {
       const effectiveType = __spreadValues$2(__spreadValues$2({}, this.computeIntersectionType(xlrNode.and)), xlrNode.name ? { name: xlrNode.name } : {});
@@ -372,10 +367,16 @@ var __spreadValues$1 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+const isMatchingCapability = (capability, capabilitiesToMatch) => {
+  if (Array.isArray(capabilitiesToMatch)) {
+    return capabilitiesToMatch.includes(capability);
+  }
+  return capability === capabilitiesToMatch;
+};
 function simpleTransformGenerator(typeToTransform, capabilityToTransform, functionToRun) {
   const walker = (n, capability) => {
     var _a;
-    if (capability === capabilityToTransform) {
+    if (isMatchingCapability(capability, capabilityToTransform)) {
       let node = __spreadValues$1({}, n);
       if (node.type === typeToTransform) {
         node = functionToRun(node);
@@ -389,8 +390,16 @@ function simpleTransformGenerator(typeToTransform, capabilityToTransform, functi
             node: walker(value.node, capability)
           };
         }
-        return __spreadProps$1(__spreadValues$1({}, node), {
-          properties: __spreadValues$1({}, newObjectProperties),
+        return __spreadProps$1(__spreadValues$1(__spreadProps$1(__spreadValues$1({}, node), {
+          properties: __spreadValues$1({}, newObjectProperties)
+        }), isGenericNamedType(node) ? {
+          genericTokens: node.genericTokens.map((token) => {
+            return __spreadProps$1(__spreadValues$1({}, token), {
+              constraints: token.constraints ? walker(token.constraints, capability) : void 0,
+              default: token.default ? walker(token.default, capability) : void 0
+            });
+          })
+        } : {}), {
           extends: node.extends ? walker(node.extends, capability) : void 0,
           additionalProperties: node.additionalProperties ? walker(node.additionalProperties, capability) : false
         });
@@ -411,9 +420,9 @@ function simpleTransformGenerator(typeToTransform, capabilityToTransform, functi
         });
       }
       if (node.type === "ref") {
-        return __spreadProps$1(__spreadValues$1({}, node), {
+        return __spreadValues$1(__spreadValues$1({}, node), node.genericArguments ? {
           genericArguments: (_a = node.genericArguments) == null ? void 0 : _a.map((arg) => walker(arg, capability))
-        });
+        } : {});
       }
       if (node.type === "tuple") {
         return __spreadProps$1(__spreadValues$1({}, node), {
@@ -507,10 +516,15 @@ class XLRSDK {
     this.validator = new XLRValidator(this.getType.bind(this));
     this.tsWriter = new TSWriter();
     this.computedNodeCache = new Map();
+    this.externalTransformFunctions = new Map();
   }
   loadDefinitionsFromDisk(inputPath, filters, transforms) {
     var _a;
     this.computedNodeCache.clear();
+    const transformsToRun = [
+      ...this.externalTransformFunctions.values(),
+      ...transforms != null ? transforms : []
+    ];
     const manifest = JSON.parse(fs.readFileSync(path.join(inputPath, "xlr", "manifest.json")).toString(), (key, value) => {
       if (typeof value === "object" && value !== null) {
         if (key === "capabilities") {
@@ -526,7 +540,7 @@ class XLRSDK {
         var _a2;
         if (!(filters == null ? void 0 : filters.typeFilter) || !extensionName.match(filters == null ? void 0 : filters.typeFilter)) {
           const cType = JSON.parse(fs.readFileSync(path.join(inputPath, "xlr", `${extensionName}.json`)).toString());
-          const effectiveType = (_a2 = transforms == null ? void 0 : transforms.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), cType)) != null ? _a2 : cType;
+          const effectiveType = (_a2 = transformsToRun == null ? void 0 : transformsToRun.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), cType)) != null ? _a2 : cType;
           this.registry.add(effectiveType, manifest.pluginName, capabilityName);
         }
       });
@@ -536,6 +550,10 @@ class XLRSDK {
     return __async(this, null, function* () {
       var _a;
       this.computedNodeCache.clear();
+      const transformsToRun = [
+        ...this.externalTransformFunctions.values(),
+        ...transforms != null ? transforms : []
+      ];
       (_a = Object.keys(manifest.capabilities)) == null ? void 0 : _a.forEach((capabilityName) => {
         if ((filters == null ? void 0 : filters.capabilityFilter) && capabilityName.match(filters == null ? void 0 : filters.capabilityFilter))
           return;
@@ -543,20 +561,26 @@ class XLRSDK {
         capabilityList.forEach((extension) => {
           var _a2;
           if (!(filters == null ? void 0 : filters.typeFilter) || !extension.name.match(filters == null ? void 0 : filters.typeFilter)) {
-            const effectiveType = (_a2 = transforms == null ? void 0 : transforms.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), extension)) != null ? _a2 : extension;
+            const effectiveType = (_a2 = transformsToRun == null ? void 0 : transformsToRun.reduce((typeAccumulator, transformFn) => transformFn(typeAccumulator, capabilityName), extension)) != null ? _a2 : extension;
             this.registry.add(effectiveType, manifest.pluginName, capabilityName);
           }
         });
       });
     });
   }
+  addTransformFunction(name, fn) {
+    this.externalTransformFunctions.set(name, fn);
+  }
+  removeTransformFunction(name) {
+    this.externalTransformFunctions.delete(name);
+  }
   getType(id, options) {
     let type = this.registry.get(id);
     if ((options == null ? void 0 : options.getRawType) === true || !type) {
       return type;
     }
     if (this.computedNodeCache.has(id)) {
-      return this.computedNodeCache.get(id);
+      return JSON.parse(JSON.stringify(this.computedNodeCache.get(id)));
     }
     type = fillInGenerics(this.resolveType(type));
     this.computedNodeCache.set(id, type);
@@ -606,10 +630,22 @@ class XLRSDK {
           throw new Error(`Error resolving ${objectNode.name}: can't find extended type ${refName}`);
         }
         extendedType = resolveReferenceNode(objectNode.extends, extendedType);
-        return __spreadProps(__spreadValues({}, computeEffectiveObject(extendedType, objectNode, false)), {
+        if (extendedType.type === "object") {
+          return __spreadProps(__spreadValues({}, computeEffectiveObject(extendedType, objectNode, false)), {
+            name: objectNode.name,
+            description: objectNode.description
+          });
+        }
+        return {
           name: objectNode.name,
-          description: objectNode.description
-        });
+          type: "and",
+          and: [
+            __spreadProps(__spreadValues({}, objectNode), {
+              extends: void 0
+            }),
+            extendedType
+          ]
+        };
       }
       return objectNode;
     })(type, "any");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/xlr-sdk",
-  "version": "0.4.2--canary.69.1573",
+  "version": "0.4.2-next.1",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -9,9 +9,9 @@
     "typescript": "4.8.4"
   },
   "dependencies": {
-    "@player-tools/xlr": "0.4.2--canary.69.1573",
-    "@player-tools/xlr-utils": "0.4.2--canary.69.1573",
-    "@player-tools/xlr-converters": "0.4.2--canary.69.1573",
+    "@player-tools/xlr": "0.4.2-next.1",
+    "@player-tools/xlr-utils": "0.4.2-next.1",
+    "@player-tools/xlr-converters": "0.4.2-next.1",
     "jsonc-parser": "^2.3.1",
     "@types/node": "^16.11.12",
     "@types/fs-extra": "^9.0.13",

package/src/registry/basic-registry.ts

@@ -18,7 +18,7 @@ export class BasicXLRRegistry implements XLRRegistry {
   /** Returns a copy of the XLR to guard against unexpected type modification */
   get(id: string): NamedType<NodeType> | undefined {
     const value = this.typeMap.get(id);
-    return value ? { ...value } : undefined;
+    return value ? JSON.parse(JSON.stringify(value)) : undefined;
   }
 
   add(type: NamedType<NodeType>, plugin: string, capability: string): void {

package/src/sdk.ts

@@ -2,6 +2,7 @@ import type {
   Manifest,
   NamedType,
   NodeType,
+  ObjectNode,
   ObjectType,
   TransformFunction,
   TSManifest,
@@ -37,12 +38,14 @@ export class XLRSDK {
   private validator: XLRValidator;
   private tsWriter: TSWriter;
   private computedNodeCache: Map<string, NodeType>;
+  private externalTransformFunctions: Map<string, TransformFunction>;
 
   constructor(customRegistry?: XLRRegistry) {
     this.registry = customRegistry ?? new BasicXLRRegistry();
     this.validator = new XLRValidator(this.getType.bind(this));
     this.tsWriter = new TSWriter();
     this.computedNodeCache = new Map();
+    this.externalTransformFunctions = new Map();
   }
 
   /**
@@ -59,6 +62,11 @@ export class XLRSDK {
   ) {
     this.computedNodeCache.clear();
 
+    const transformsToRun = [
+      ...this.externalTransformFunctions.values(),
+      ...(transforms ?? []),
+    ];
+
     const manifest = JSON.parse(
       fs.readFileSync(path.join(inputPath, 'xlr', 'manifest.json')).toString(),
       (key: unknown, value: unknown) => {
@@ -89,7 +97,7 @@ export class XLRSDK {
               .toString()
           );
           const effectiveType =
-            transforms?.reduce(
+            transformsToRun?.reduce(
               (typeAccumulator: NamedType<NodeType>, transformFn) =>
                 transformFn(
                   typeAccumulator,
@@ -118,6 +126,11 @@ export class XLRSDK {
   ) {
     this.computedNodeCache.clear();
 
+    const transformsToRun = [
+      ...this.externalTransformFunctions.values(),
+      ...(transforms ?? []),
+    ];
+
     Object.keys(manifest.capabilities)?.forEach((capabilityName) => {
       if (
         filters?.capabilityFilter &&
@@ -131,7 +144,7 @@ export class XLRSDK {
           !extension.name.match(filters?.typeFilter)
         ) {
           const effectiveType =
-            transforms?.reduce(
+            transformsToRun?.reduce(
               (typeAccumulator: NamedType<NodeType>, transformFn) =>
                 transformFn(
                   typeAccumulator,
@@ -146,6 +159,20 @@ export class XLRSDK {
     });
   }
 
+  /**
+   * Statically load transform function that should be applied to every XLR bundle that is imported
+   */
+  public addTransformFunction(name: string, fn: TransformFunction): void {
+    this.externalTransformFunctions.set(name, fn);
+  }
+
+  /**
+   * Remove any transform function loaded via the `addTransformFunction` method by name
+   */
+  public removeTransformFunction(name: string): void {
+    this.externalTransformFunctions.delete(name);
+  }
+
   /**
    * Returns a Type that has been previously loaded
    *
@@ -163,7 +190,9 @@ export class XLRSDK {
     }
 
     if (this.computedNodeCache.has(id)) {
-      return this.computedNodeCache.get(id) as NamedType<NodeType> | undefined;
+      return JSON.parse(JSON.stringify(this.computedNodeCache.get(id))) as
+        | NamedType<NodeType>
+        | undefined;
     }
 
     type = fillInGenerics(this.resolveType(type)) as NamedType;
@@ -285,15 +314,30 @@ export class XLRSDK {
           objectNode.extends,
           extendedType as NamedType<ObjectType>
         ) as NamedType;
+        if (extendedType.type === 'object') {
+          return {
+            ...computeEffectiveObject(
+              extendedType as ObjectType,
+              objectNode as ObjectType,
+              false
+            ),
+            name: objectNode.name,
+            description: objectNode.description,
+          };
+        }
+
+        // if the merge isn't straightforward, defer until validation time for now
         return {
-          ...computeEffectiveObject(
-            extendedType as ObjectType,
-            objectNode as ObjectType,
-            false
-          ),
           name: objectNode.name,
-          description: objectNode.description,
-        };
+          type: 'and',
+          and: [
+            {
+              ...objectNode,
+              extends: undefined,
+            },
+            extendedType,
+          ],
+        } as unknown as ObjectNode;
       }
 
       return objectNode;

package/src/utils.ts

@@ -9,6 +9,18 @@ import type {
   ObjectProperty,
   RefNode,
 } from '@player-tools/xlr';
+import { isGenericNamedType } from '@player-tools/xlr-utils';
+
+const isMatchingCapability = (
+  capability: string,
+  capabilitiesToMatch: string | Array<string>
+): boolean => {
+  if (Array.isArray(capabilitiesToMatch)) {
+    return capabilitiesToMatch.includes(capability);
+  }
+
+  return capability === capabilitiesToMatch;
+};
 
 /**
  * Helper function for simple transforms
@@ -18,7 +30,7 @@ export function simpleTransformGenerator<
   T extends NodeTypeStrings = NodeTypeStrings
 >(
   typeToTransform: T,
-  capabilityToTransform: string,
+  capabilityToTransform: string | Array<string>,
   functionToRun: (input: NodeTypeMap[T]) => NodeTypeMap[T]
 ): TransformFunction {
   /** walker for an XLR tree to touch every node */
@@ -27,7 +39,7 @@ export function simpleTransformGenerator<
     capability: string
   ) => {
     // Run transform on base node before running on children
-    if (capability === capabilityToTransform) {
+    if (isMatchingCapability(capability, capabilityToTransform)) {
       let node = { ...n };
       if (node.type === typeToTransform) {
         node = functionToRun(node as unknown as NodeTypeMap[T]);
@@ -44,9 +56,25 @@ export function simpleTransformGenerator<
           };
         }
 
+        // need to walk generic tokens
         return {
           ...node,
           properties: { ...newObjectProperties },
+          ...(isGenericNamedType(node)
+            ? {
+                genericTokens: node.genericTokens.map((token) => {
+                  return {
+                    ...token,
+                    constraints: token.constraints
+                      ? walker(token.constraints, capability)
+                      : undefined,
+                    default: token.default
+                      ? walker(token.default, capability)
+                      : undefined,
+                  };
+                }),
+              }
+            : {}),
           extends: node.extends
             ? (walker(node.extends, capability) as RefNode)
             : undefined,
@@ -80,9 +108,13 @@ export function simpleTransformGenerator<
       if (node.type === 'ref') {
         return {
           ...node,
-          genericArguments: node.genericArguments?.map((arg) =>
-            walker(arg, capability)
-          ),
+          ...(node.genericArguments
+            ? {
+                genericArguments: node.genericArguments?.map((arg) =>
+                  walker(arg, capability)
+                ),
+              }
+            : {}),
         };
       }
 

package/src/validator.ts

@@ -70,10 +70,22 @@ export class XLRValidator {
         }
       }
 
+      let message: string;
+
+      if (xlrNode.name) {
+        message = `Does not match any of the expected types for type: '${xlrNode.name}'`;
+      } else if (xlrNode.title) {
+        message = `Does not match any of the expected types for property: '${xlrNode.title}'`;
+      } else {
+        message = `Does not match any of the types ${xlrNode.or
+          .map((node) => node.name ?? node.title ?? '<unnamed type>')
+          .join(' | ')}`;
+      }
+
       validationIssues.push({
         type: 'value',
         node: rootNode,
-        message: `Does not match any of the expected types for type: '${xlrNode.name}'`,
+        message,
       });
     } else if (xlrNode.type === 'and') {
       const effectiveType = {