@data-client/core 0.14.24 → 0.15.0-beta-20251006024044-92bd01c4976f2921993b8c9f1e4dbb87af87ba7b

package/lib/types.d.ts

@@ -31,7 +31,7 @@ export interface State<T> {
             readonly errorPolicy?: 'hard' | 'soft' | undefined;
         };
     };
-    readonly entityMeta: {
+    readonly entitiesMeta: {
         readonly [entityKey: string]: {
             readonly [pk: string]: {
                 readonly fetchedAt: number;

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhF,cAAc,cAAc,CAAC;AAE7B,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,CAAC;AAErD,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC;AAExB;;;GAGG;AACH,MAAM,WAAW,KAAK,CAAC,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,CAAA;SAAE,GAAG,SAAS,CAAC;KACxE,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE;QAClB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;KACzD,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG;YACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;YAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;YAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;YAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACpD,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAC5B,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG;gBACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;aAC5B,CAAC;SACH,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC9D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,MAAM,WAAW,OAAO,CAAC,OAAO,GAAG,WAAW;IAC5C,gEAAgE;IAChE,aAAa,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IACtC,6DAA6D;IAC7D,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACjC,0DAA0D;IAC1D,OAAO,IAAI,IAAI,CAAC;IAChB,uDAAuD;IACvD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CACpC;AAED,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EACV,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEhF,cAAc,cAAc,CAAC;AAE7B,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,CAAC;AAErD,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC;AAExB;;;GAGG;AACH,MAAM,WAAW,KAAK,CAAC,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,CAAC,CAAA;SAAE,GAAG,SAAS,CAAC;KACxE,CAAC;IACF,QAAQ,CAAC,SAAS,EAAE;QAClB,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;KACzD,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG;YACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;YAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;YAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;YAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACpD,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,YAAY,EAAE;QACrB,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG;YAC5B,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG;gBACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;aAC5B,CAAC;SACH,CAAC;KACH,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC9D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;GAKG;AACH,MAAM,WAAW,OAAO,CAAC,OAAO,GAAG,WAAW;IAC5C,gEAAgE;IAChE,aAAa,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;IACtC,6DAA6D;IAC7D,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACjC,0DAA0D;IAC1D,OAAO,IAAI,IAAI,CAAC;IAChB,uDAAuD;IACvD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CACpC;AAED,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC"}

package/lib/types.js

@@ -12,4 +12,4 @@ export * from './actions.js';
  * @see https://dataclient.io/docs/api/Manager
  */
 export {};
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL3R5cGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vcm1hbGl6ZWRJbmRleCB9IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUge1xuICBVcGRhdGVGdW5jdGlvbixcbiAgQWJzdHJhY3RJbnN0YW5jZVR5cGUsXG59IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUgeyBFcnJvclR5cGVzIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCB0eXBlIHtcbiAgQWN0aW9uVHlwZXMsXG4gIFNldFJlc3BvbnNlQWN0aW9uLFxuICBPcHRpbWlzdGljQWN0aW9uLFxufSBmcm9tICcuL2FjdGlvbnMuanMnO1xuaW1wb3J0IHR5cGUgeyBEaXNwYXRjaCwgTWlkZGxld2FyZSwgTWlkZGxld2FyZUFQSSB9IGZyb20gJy4vbWlkZGxld2FyZVR5cGVzLmpzJztcblxuZXhwb3J0ICogZnJvbSAnLi9hY3Rpb25zLmpzJztcblxuZXhwb3J0IHR5cGUgeyBBYnN0cmFjdEluc3RhbmNlVHlwZSwgVXBkYXRlRnVuY3Rpb24gfTtcblxuZXhwb3J0IHR5cGUgUEsgPSBzdHJpbmc7XG5cbi8qKiBOb3JtYWxpemVkIHN0YXRlIGZvciBSZWFjdGl2ZSBEYXRhIENsaWVudFxuICpcbiAqIEBzZWUgaHR0cHM6Ly9kYXRhY2xpZW50LmlvL2RvY3MvY29uY2VwdHMvbm9ybWFsaXphdGlvblxuICovXG5leHBvcnQgaW50ZXJmYWNlIFN0YXRlPFQ+IHtcbiAgcmVhZG9ubHkgZW50aXRpZXM6IHtcbiAgICByZWFkb25seSBbZW50aXR5S2V5OiBzdHJpbmddOiB7IHJlYWRvbmx5IFtwazogc3RyaW5nXTogVCB9IHwgdW5kZWZpbmVkO1xuICB9O1xuICByZWFkb25seSBlbmRwb2ludHM6IHtcbiAgICByZWFkb25seSBba2V5OiBzdHJpbmddOiB1bmtub3duIHwgUEtbXSB8IFBLIHwgdW5kZWZpbmVkO1xuICB9O1xuICByZWFkb25seSBpbmRleGVzOiBOb3JtYWxpemVkSW5kZXg7XG4gIHJlYWRvbmx5IG1ldGE6IHtcbiAgICByZWFkb25seSBba2V5OiBzdHJpbmddOiB7XG4gICAgICByZWFkb25seSBkYXRlOiBudW1iZXI7XG4gICAgICByZWFkb25seSBmZXRjaGVkQXQ6IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGV4cGlyZXNBdDogbnVtYmVyO1xuICAgICAgcmVhZG9ubHkgcHJldkV4cGlyZXNBdD86IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGVycm9yPzogRXJyb3JUeXBlcztcbiAgICAgIHJlYWRvbmx5IGludmFsaWRhdGVkPzogYm9vbGVhbjtcbiAgICAgIHJlYWRvbmx5IGVycm9yUG9saWN5PzogJ2hhcmQnIHwgJ3NvZnQnIHwgdW5kZWZpbmVkO1xuICAgIH07XG4gIH07XG4gIHJlYWRvbmx5IGVudGl0eU1ldGE6IHtcbiAgICByZWFkb25seSBbZW50aXR5S2V5OiBzdHJpbmddOiB7XG4gICAgICByZWFkb25seSBbcGs6IHN0cmluZ106IHtcbiAgICAgICAgcmVhZG9ubHkgZmV0Y2hlZEF0OiBudW1iZXI7XG4gICAgICAgIHJlYWRvbmx5IGRhdGU6IG51bWJlcjtcbiAgICAgICAgcmVhZG9ubHkgZXhwaXJlc0F0OiBudW1iZXI7XG4gICAgICB9O1xuICAgIH07XG4gIH07XG4gIHJlYWRvbmx5IG9wdGltaXN0aWM6IChTZXRSZXNwb25zZUFjdGlvbiB8IE9wdGltaXN0aWNBY3Rpb24pW107XG4gIHJlYWRvbmx5IGxhc3RSZXNldDogbnVtYmVyO1xufVxuXG4vKiogU2luZ2xldG9ucyB0aGF0IGhhbmRsZSBnbG9iYWwgc2lkZS1lZmZlY3RzXG4gKlxuICogS2luZCBvZiBsaWtlIHVzZUVmZmVjdCgpIGZvciB0aGUgY2VudHJhbCBkYXRhIHN0b3JlXG4gKlxuICogQHNlZSBodHRwczovL2RhdGFjbGllbnQuaW8vZG9jcy9hcGkvTWFuYWdlclxuICovXG5leHBvcnQgaW50ZXJmYWNlIE1hbmFnZXI8QWN0aW9ucyA9IEFjdGlvblR5cGVzPiB7XG4gIC8qKiBAc2VlIGh0dHBzOi8vZGF0YWNsaWVudC5pby9kb2NzL2FwaS9NYW5hZ2VyI2dldG1pZGRsZXdhcmUgKi9cbiAgZ2V0TWlkZGxld2FyZT8oKTogTWlkZGxld2FyZTxBY3Rpb25zPjtcbiAgLyoqIEBzZWUgaHR0cHM6Ly9kYXRhY2xpZW50LmlvL2RvY3MvYXBpL01hbmFnZXIjbWlkZGxld2FyZSAqL1xuICBtaWRkbGV3YXJlPzogTWlkZGxld2FyZTxBY3Rpb25zPjtcbiAgLyoqIEBzZWUgaHR0cHM6Ly9kYXRhY2xpZW50LmlvL2RvY3MvYXBpL01hbmFnZXIjY2xlYW51cCAqL1xuICBjbGVhbnVwKCk6IHZvaWQ7XG4gIC8qKiBAc2VlIGh0dHBzOi8vZGF0YWNsaWVudC5pby9kb2NzL2FwaS9NYW5hZ2VyI2luaXQgKi9cbiAgaW5pdD86IChzdGF0ZTogU3RhdGU8YW55PikgPT4gdm9pZDtcbn1cblxuZXhwb3J0IHR5cGUgeyBEaXNwYXRjaCwgTWlkZGxld2FyZSwgTWlkZGxld2FyZUFQSSB9O1xuIl0sIm1hcHBpbmdzIjoiQUFjQSxjQUFjLGNBQWM7O0FBTTVCO0FBQ0E7QUFDQTtBQUNBOztBQWlDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFMQSIsImlnbm9yZUxpc3QiOltdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6W10sInNvdXJjZXMiOlsiLi4vc3JjL3R5cGVzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5vcm1hbGl6ZWRJbmRleCB9IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUge1xuICBVcGRhdGVGdW5jdGlvbixcbiAgQWJzdHJhY3RJbnN0YW5jZVR5cGUsXG59IGZyb20gJ0BkYXRhLWNsaWVudC9ub3JtYWxpenInO1xuaW1wb3J0IHR5cGUgeyBFcnJvclR5cGVzIH0gZnJvbSAnQGRhdGEtY2xpZW50L25vcm1hbGl6cic7XG5cbmltcG9ydCB0eXBlIHtcbiAgQWN0aW9uVHlwZXMsXG4gIFNldFJlc3BvbnNlQWN0aW9uLFxuICBPcHRpbWlzdGljQWN0aW9uLFxufSBmcm9tICcuL2FjdGlvbnMuanMnO1xuaW1wb3J0IHR5cGUgeyBEaXNwYXRjaCwgTWlkZGxld2FyZSwgTWlkZGxld2FyZUFQSSB9IGZyb20gJy4vbWlkZGxld2FyZVR5cGVzLmpzJztcblxuZXhwb3J0ICogZnJvbSAnLi9hY3Rpb25zLmpzJztcblxuZXhwb3J0IHR5cGUgeyBBYnN0cmFjdEluc3RhbmNlVHlwZSwgVXBkYXRlRnVuY3Rpb24gfTtcblxuZXhwb3J0IHR5cGUgUEsgPSBzdHJpbmc7XG5cbi8qKiBOb3JtYWxpemVkIHN0YXRlIGZvciBSZWFjdGl2ZSBEYXRhIENsaWVudFxuICpcbiAqIEBzZWUgaHR0cHM6Ly9kYXRhY2xpZW50LmlvL2RvY3MvY29uY2VwdHMvbm9ybWFsaXphdGlvblxuICovXG5leHBvcnQgaW50ZXJmYWNlIFN0YXRlPFQ+IHtcbiAgcmVhZG9ubHkgZW50aXRpZXM6IHtcbiAgICByZWFkb25seSBbZW50aXR5S2V5OiBzdHJpbmddOiB7IHJlYWRvbmx5IFtwazogc3RyaW5nXTogVCB9IHwgdW5kZWZpbmVkO1xuICB9O1xuICByZWFkb25seSBlbmRwb2ludHM6IHtcbiAgICByZWFkb25seSBba2V5OiBzdHJpbmddOiB1bmtub3duIHwgUEtbXSB8IFBLIHwgdW5kZWZpbmVkO1xuICB9O1xuICByZWFkb25seSBpbmRleGVzOiBOb3JtYWxpemVkSW5kZXg7XG4gIHJlYWRvbmx5IG1ldGE6IHtcbiAgICByZWFkb25seSBba2V5OiBzdHJpbmddOiB7XG4gICAgICByZWFkb25seSBkYXRlOiBudW1iZXI7XG4gICAgICByZWFkb25seSBmZXRjaGVkQXQ6IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGV4cGlyZXNBdDogbnVtYmVyO1xuICAgICAgcmVhZG9ubHkgcHJldkV4cGlyZXNBdD86IG51bWJlcjtcbiAgICAgIHJlYWRvbmx5IGVycm9yPzogRXJyb3JUeXBlcztcbiAgICAgIHJlYWRvbmx5IGludmFsaWRhdGVkPzogYm9vbGVhbjtcbiAgICAgIHJlYWRvbmx5IGVycm9yUG9saWN5PzogJ2hhcmQnIHwgJ3NvZnQnIHwgdW5kZWZpbmVkO1xuICAgIH07XG4gIH07XG4gIHJlYWRvbmx5IGVudGl0aWVzTWV0YToge1xuICAgIHJlYWRvbmx5IFtlbnRpdHlLZXk6IHN0cmluZ106IHtcbiAgICAgIHJlYWRvbmx5IFtwazogc3RyaW5nXToge1xuICAgICAgICByZWFkb25seSBmZXRjaGVkQXQ6IG51bWJlcjtcbiAgICAgICAgcmVhZG9ubHkgZGF0ZTogbnVtYmVyO1xuICAgICAgICByZWFkb25seSBleHBpcmVzQXQ6IG51bWJlcjtcbiAgICAgIH07XG4gICAgfTtcbiAgfTtcbiAgcmVhZG9ubHkgb3B0aW1pc3RpYzogKFNldFJlc3BvbnNlQWN0aW9uIHwgT3B0aW1pc3RpY0FjdGlvbilbXTtcbiAgcmVhZG9ubHkgbGFzdFJlc2V0OiBudW1iZXI7XG59XG5cbi8qKiBTaW5nbGV0b25zIHRoYXQgaGFuZGxlIGdsb2JhbCBzaWRlLWVmZmVjdHNcbiAqXG4gKiBLaW5kIG9mIGxpa2UgdXNlRWZmZWN0KCkgZm9yIHRoZSBjZW50cmFsIGRhdGEgc3RvcmVcbiAqXG4gKiBAc2VlIGh0dHBzOi8vZGF0YWNsaWVudC5pby9kb2NzL2FwaS9NYW5hZ2VyXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgTWFuYWdlcjxBY3Rpb25zID0gQWN0aW9uVHlwZXM+IHtcbiAgLyoqIEBzZWUgaHR0cHM6Ly9kYXRhY2xpZW50LmlvL2RvY3MvYXBpL01hbmFnZXIjZ2V0bWlkZGxld2FyZSAqL1xuICBnZXRNaWRkbGV3YXJlPygpOiBNaWRkbGV3YXJlPEFjdGlvbnM+O1xuICAvKiogQHNlZSBodHRwczovL2RhdGFjbGllbnQuaW8vZG9jcy9hcGkvTWFuYWdlciNtaWRkbGV3YXJlICovXG4gIG1pZGRsZXdhcmU/OiBNaWRkbGV3YXJlPEFjdGlvbnM+O1xuICAvKiogQHNlZSBodHRwczovL2RhdGFjbGllbnQuaW8vZG9jcy9hcGkvTWFuYWdlciNjbGVhbnVwICovXG4gIGNsZWFudXAoKTogdm9pZDtcbiAgLyoqIEBzZWUgaHR0cHM6Ly9kYXRhY2xpZW50LmlvL2RvY3MvYXBpL01hbmFnZXIjaW5pdCAqL1xuICBpbml0PzogKHN0YXRlOiBTdGF0ZTxhbnk+KSA9PiB2b2lkO1xufVxuXG5leHBvcnQgdHlwZSB7IERpc3BhdGNoLCBNaWRkbGV3YXJlLCBNaWRkbGV3YXJlQVBJIH07XG4iXSwibWFwcGluZ3MiOiJBQWNBLGNBQWMsY0FBYzs7QUFNNUI7QUFDQTtBQUNBO0FBQ0E7O0FBaUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUxBIiwiaWdub3JlTGlzdCI6W119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-client/core",
-  "version": "0.14.24",
+  "version": "0.15.0-beta-20251006024044-92bd01c4976f2921993b8c9f1e4dbb87af87ba7b",
   "description": "Async State Management without the Management. REST, GraphQL, SSE, Websockets, Fetch",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -125,13 +125,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.0",
-    "@data-client/normalizr": "^0.14.22",
+    "@data-client/normalizr": "0.15.0-beta-20251006024044-92bd01c4976f2921993b8c9f1e4dbb87af87ba7b",
     "flux-standard-action": "^2.1.1"
   },
   "devDependencies": {
     "@anansi/browserslist-config": "^1.4.2",
     "@data-client/endpoint": "workspace:*",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "30.0.0",
     "@types/node": "^22.0.0",
     "rollup-plugins": "workspace:*"
   }

package/src/controller/Controller.ts

@@ -172,7 +172,7 @@ export default class Controller<
     ...args: readonly [...Parameters<E>]
   ): E['schema'] extends undefined | null ? ReturnType<E> | ResolveType<E>
   : Promise<Denormalize<E['schema']>> | Denormalize<E['schema']> => {
-    const { data, expiresAt, expiryStatus } = this.getResponse(
+    const { data, expiresAt, expiryStatus } = this.getResponseMeta(
       endpoint,
       ...args,
       this.getState(),
@@ -514,13 +514,7 @@ export default class Controller<
     const input =
       shouldQuery ?
         // nothing in endpoints cache, so try querying if we have a schema to do so
-        this.memo.buildQueryKey(
-          schema,
-          args,
-          state.entities as any,
-          state.indexes,
-          key,
-        )
+        this.memo.buildQueryKey(schema, args, state, key)
       : cacheEndpoints;
 
     if (!isActive) {
@@ -540,17 +534,16 @@ export default class Controller<
     } else if (!schema || !schemaHasEntity(schema)) {
       return {
         data: cacheEndpoints,
-        expiryStatus:
-          meta?.invalidated ? ExpiryStatus.Invalid
-          : cacheEndpoints && !endpoint.invalidIfStale ? ExpiryStatus.Valid
-          : ExpiryStatus.InvalidIfStale,
+        expiryStatus: this.getExpiryStatus(
+          !cacheEndpoints,
+          !!endpoint.invalidIfStale,
+          meta,
+        ),
         expiresAt: expiresAt || 0,
         countRef: this.gcPolicy.createCountRef({ key }),
       };
     }
 
-    // second argument is false if any entities are missing
-
     const { data, paths } = this.memo.denormalize(
       schema,
       input,
@@ -558,18 +551,23 @@ export default class Controller<
       args,
     ) as { data: any; paths: EntityPath[] };
 
-    // note: isInvalid can only be true if shouldQuery is true
-    if (!expiresAt && isInvalid) expiresAt = 1;
+    if (!expiresAt) {
+      // note: isInvalid can only be true if shouldQuery is true
+      if (isInvalid) expiresAt = 1;
+      // fallback to entity expiry time
+      else expiresAt = entityExpiresAt(paths, state.entitiesMeta);
+    }
 
-    return this.getSchemaResponse(
+    return {
       data,
-      key,
-      paths,
-      state.entityMeta,
+      expiryStatus: this.getExpiryStatus(
+        typeof data === 'symbol',
+        !!endpoint.invalidIfStale || isInvalid,
+        meta,
+      ),
       expiresAt,
-      endpoint.invalidIfStale || isInvalid,
-      meta,
-    );
+      countRef: this.gcPolicy.createCountRef({ key, paths }),
+    };
   }
 
   /**
@@ -580,7 +578,7 @@ export default class Controller<
     schema: S,
     ...rest: readonly [
       ...SchemaArgs<S>,
-      Pick<State<unknown>, 'entities' | 'entityMeta'>,
+      Pick<State<unknown>, 'entities' | 'indexes'>,
     ]
   ): DenormalizeNullable<S> | undefined {
     const state = rest[rest.length - 1] as State<any>;
@@ -589,7 +587,8 @@ export default class Controller<
       .slice(0, rest.length - 1)
       .map(ensurePojo) as SchemaArgs<S>;
 
-    return this.memo.query(schema, args, state.entities as any, state.indexes);
+    const { data } = this.memo.query(schema, args, state);
+    return typeof data === 'symbol' ? undefined : data;
   }
 
   /**
@@ -600,7 +599,7 @@ export default class Controller<
     schema: S,
     ...rest: readonly [
       ...SchemaArgs<S>,
-      Pick<State<unknown>, 'entities' | 'entityMeta'>,
+      Pick<State<unknown>, 'entities' | 'indexes'>,
     ]
   ): {
     data: DenormalizeNullable<S> | undefined;
@@ -612,68 +611,27 @@ export default class Controller<
       .slice(0, rest.length - 1)
       .map(ensurePojo) as SchemaArgs<S>;
 
-    // TODO: breaking: Switch back to this.memo.query(schema, args, state.entities as any, state.indexes) to do
-    // this logic
-    const input = this.memo.buildQueryKey(
-      schema,
-      args,
-      state.entities as any,
-      state.indexes,
-      JSON.stringify(args),
-    );
-
-    if (!input) {
-      return { data: undefined, countRef: () => () => undefined };
-    }
+    const { data, paths } = this.memo.query(schema, args, state);
 
-    const { data, paths } = this.memo.denormalize(
-      schema,
-      input,
-      state.entities,
-      args,
-    );
     return {
-      data: typeof data === 'symbol' ? undefined : (data as any),
+      data: typeof data === 'symbol' ? undefined : data,
       countRef: this.gcPolicy.createCountRef({ paths }),
     };
   }
 
-  private getSchemaResponse<T>(
-    data: T,
-    key: string,
-    paths: EntityPath[],
-    entityMeta: State<unknown>['entityMeta'],
-    expiresAt: number,
+  private getExpiryStatus(
+    invalidData: boolean,
     invalidIfStale: boolean,
     meta: { error?: unknown; invalidated?: unknown } = {},
-  ): {
-    data: T;
-    expiryStatus: ExpiryStatus;
-    expiresAt: number;
-    countRef: () => () => void;
-  } {
-    const invalidDenormalize = typeof data === 'symbol';
-
-    // fallback to entity expiry time
-    if (!expiresAt) {
-      expiresAt = entityExpiresAt(paths, entityMeta);
-    }
-
+  ) {
     // https://dataclient.io/docs/concepts/expiry-policy#expiry-status
     // we don't track the difference between stale or fresh because that is tied to triggering
     // conditions
-    const expiryStatus =
-      meta?.invalidated || (invalidDenormalize && !meta?.error) ?
-        ExpiryStatus.Invalid
-      : invalidDenormalize || invalidIfStale ? ExpiryStatus.InvalidIfStale
-      : ExpiryStatus.Valid;
-
-    return {
-      data,
-      expiryStatus,
-      expiresAt,
-      countRef: this.gcPolicy.createCountRef({ key, paths }),
-    };
+    return (
+      meta.invalidated || (invalidData && !meta.error) ? ExpiryStatus.Invalid
+      : invalidData || invalidIfStale ? ExpiryStatus.InvalidIfStale
+      : ExpiryStatus.Valid
+    );
   }
 }
 
@@ -681,7 +639,7 @@ export default class Controller<
 // earliest expiry dictates age
 function entityExpiresAt(
   paths: EntityPath[],
-  entityMeta: {
+  entitiesMeta: {
     readonly [entityKey: string]: {
       readonly [pk: string]: {
         readonly date: number;
@@ -692,8 +650,8 @@ function entityExpiresAt(
   },
 ) {
   let expiresAt = Infinity;
-  for (const { pk, key } of paths) {
-    const entityExpiry = entityMeta[key]?.[pk]?.expiresAt;
+  for (const { key, pk } of paths) {
+    const entityExpiry = entitiesMeta[key]?.[pk]?.expiresAt;
     // expiresAt will always resolve to false with any comparison
     if (entityExpiry < expiresAt) expiresAt = entityExpiry;
   }

package/src/controller/__tests__/Controller.ts

@@ -46,7 +46,7 @@ describe('Controller', () => {
         endpoints: {
           [fetchKey]: result,
         },
-        entityMeta: createEntityMeta(entities),
+        entitiesMeta: createEntityMeta(entities),
         meta: {
           [fetchKey]: {
             date: Date.now(),
@@ -85,7 +85,7 @@ describe('Controller', () => {
         endpoints: {
           [fetchKey]: result,
         },
-        entityMeta: createEntityMeta(entities),
+        entitiesMeta: createEntityMeta(entities),
         meta: {
           [fetchKey]: {
             date: 0,

package/src/controller/__tests__/__snapshots__/get.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`Controller.get() Query+All based on args 1`] = `
 [
@@ -53,6 +53,39 @@ Group {
 }
 `;
 
+exports[`Controller.get() Union based on args with function schemaAttribute 1`] = `
+User {
+  "id": "1",
+  "type": "users",
+  "username": "bob",
+}
+`;
+
+exports[`Controller.get() Union based on args with function schemaAttribute 2`] = `
+Group {
+  "groupname": "fast",
+  "id": "2",
+  "memberCount": 5,
+  "type": "groups",
+}
+`;
+
+exports[`Controller.get() indexes query Entity based on index 1`] = `
+User {
+  "id": "1",
+  "staff": false,
+  "username": "bob",
+}
+`;
+
+exports[`Controller.get() indexes query indexes after empty state 1`] = `
+User {
+  "id": "1",
+  "staff": false,
+  "username": "bob",
+}
+`;
+
 exports[`Controller.get() query All should get all entities 1`] = `
 [
   Tacos {
@@ -105,13 +138,6 @@ exports[`Controller.get() query Collection based on args 2`] = `
 ]
 `;
 
-exports[`Controller.get() query Entity based on index 1`] = `
-User {
-  "id": "1",
-  "username": "bob",
-}
-`;
-
 exports[`Controller.get() query Entity based on pk 1`] = `
 Tacos {
   "id": "1",

package/src/controller/__tests__/__snapshots__/getResponse.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`Controller.getResponse() denormalizes schema with extra members but not set 1`] = `
 {

package/src/controller/__tests__/get.ts

@@ -1,6 +1,7 @@
 import { Entity, schema } from '@data-client/endpoint';
 
 import { initialState } from '../../state/reducer/createReducer';
+import { State } from '../../types';
 import Controller from '../Controller';
 
 class Tacos extends Entity {
@@ -46,37 +47,113 @@ describe('Controller.get()', () => {
     () => controller.get(Tacos, { doesnotexist: 5 }, state);
   });
 
-  it('query Entity based on index', () => {
+  describe('indexes', () => {
     class User extends Entity {
       id = '';
       username = '';
+      staff = false;
 
       static indexes = ['username'] as const;
     }
+    it('query Entity based on index', () => {
+      const controller = new Controller();
+      const state: State<unknown> = {
+        ...initialState,
+        entities: {
+          User: {
+            '1': { id: '1', username: 'bob' },
+            '2': { id: '2', username: 'george' },
+          },
+        },
+        indexes: {
+          User: {
+            username: {
+              bob: '1',
+              george: '2',
+            },
+          },
+        },
+      };
 
-    const controller = new Controller();
-    const state = {
-      ...initialState,
-      entities: {
-        User: {
-          '1': { id: '1', username: 'bob' },
+      const bob = controller.get(User, { username: 'bob' }, state);
+      expect(bob).toBeDefined();
+      expect(bob).toBeInstanceOf(User);
+      expect(bob).toMatchSnapshot();
+      // stability
+      expect(controller.get(User, { username: 'bob' }, state)).toBe(bob);
+      // should be same as id lookup
+      expect(controller.get(User, { id: '1' }, state)).toBe(bob);
+      // update index
+      let nextState: State<unknown> = {
+        ...state,
+        entities: {
+          ...state.entities,
+          User: {
+            ...state.entities.User,
+            '1': { id: '1', username: 'george' },
+            '2': { id: '2', username: 'bob' },
+          },
         },
-      },
-      indexes: {
-        User: {
-          username: {
-            bob: '1',
+        indexes: {
+          ...state.indexes,
+          User: {
+            ...state.indexes.User,
+            username: {
+              ...state.indexes.User.username,
+              bob: '2',
+              george: '1',
+            },
           },
         },
-      },
-    };
+      };
+      expect(controller.get(User, { username: 'bob' }, nextState)).not.toBe(
+        bob,
+      );
+      nextState = {
+        ...state,
+        entities: {
+          ...state.entities,
+          User: {
+            ...state.entities.User,
+            '1': { id: '1', username: 'bob', staff: true },
+          },
+        },
+      };
+      // update entity keep index
+      const nextBob = controller.get(User, { username: 'bob' }, nextState);
+      expect(nextBob).not.toBe(bob);
+      expect(nextBob).toBeDefined();
+      expect(nextBob).toBeInstanceOf(User);
+      expect(nextBob?.staff).toBe(true);
+    });
 
-    const bob = controller.get(User, { username: 'bob' }, state);
-    expect(bob).toBeDefined();
-    expect(bob).toBeInstanceOf(User);
-    expect(bob).toMatchSnapshot();
-    // should be same as id lookup
-    expect(bob).toBe(controller.get(User, { id: '1' }, state));
+    it('query indexes after empty state', () => {
+      const controller = new Controller();
+      expect(
+        controller.get(User, { username: 'bob' }, initialState),
+      ).toBeUndefined();
+      const state: State<unknown> = {
+        ...initialState,
+        entities: {
+          User: {
+            '1': { id: '1', username: 'bob' },
+            '2': { id: '2', username: 'george' },
+          },
+        },
+        indexes: {
+          User: {
+            username: {
+              bob: '1',
+              george: '2',
+            },
+          },
+        },
+      };
+      const bob = controller.get(User, { username: 'bob' }, state);
+      expect(bob).toBeDefined();
+      expect(bob).toBeInstanceOf(User);
+      expect(bob).toMatchSnapshot();
+    });
   });
 
   it('query Collection based on args', () => {
@@ -218,11 +295,11 @@ describe('Controller.get()', () => {
       id: string = '';
     }
     class User extends IDEntity {
-      type = 'user';
+      type = 'users';
       username: string = '';
     }
     class Group extends IDEntity {
-      type = 'group';
+      type = 'groups';
       groupname: string = '';
       memberCount = 0;
     }
@@ -272,6 +349,70 @@ describe('Controller.get()', () => {
     // @ts-expect-error
     () => controller.get(queryPerson, { id: '1', doesnotexist: 5 }, state);
   });
+
+  it('Union based on args with function schemaAttribute', () => {
+    class IDEntity extends Entity {
+      id: string = '';
+    }
+    class User extends IDEntity {
+      type = 'user';
+      username: string = '';
+    }
+    class Group extends IDEntity {
+      type = 'group';
+      groupname: string = '';
+      memberCount = 0;
+    }
+    const queryPerson = new schema.Union(
+      {
+        users: User,
+        groups: Group,
+      },
+      (value: { type: 'users' | 'groups' }) => value.type,
+    );
+    const controller = new Controller();
+    const state = {
+      ...initialState,
+      entities: {
+        User: {
+          '1': { id: '1', type: 'users', username: 'bob' },
+        },
+        Group: {
+          '2': { id: '2', type: 'groups', groupname: 'fast', memberCount: 5 },
+        },
+      },
+    };
+    const user = controller.get(queryPerson, { id: '1', type: 'users' }, state);
+    expect(user).toBeDefined();
+    expect(user).toBeInstanceOf(User);
+    expect(user).toMatchSnapshot();
+    const group = controller.get(
+      queryPerson,
+      { id: '2', type: 'groups' },
+      state,
+    );
+    expect(group).toBeDefined();
+    expect(group).toBeInstanceOf(Group);
+    expect(group).toMatchSnapshot();
+
+    // should maintain referential equality
+    expect(user).toBe(
+      controller.get(queryPerson, { id: '1', type: 'users' }, state),
+    );
+
+    // these are the 'fallback case' where it cannot determine type discriminator, so just enumerates
+    () => controller.get(queryPerson, { id: '1' }, state);
+    // @ts-expect-error
+    () => controller.get(queryPerson, { id: '1', type: 'notrealtype' }, state);
+    // @ts-expect-error
+    () => controller.get(queryPerson, { id: { bob: 5 }, type: 'users' }, state);
+    // @ts-expect-error
+    expect(controller.get(queryPerson, 5, state)).toBeUndefined();
+    // @ts-expect-error
+    () => controller.get(queryPerson, { doesnotexist: 5 }, state);
+    // @ts-expect-error
+    () => controller.get(queryPerson, { id: '1', doesnotexist: 5 }, state);
+  });
 });
 
 describe('Snapshot.getQueryMeta()', () => {

package/src/controller/__tests__/getResponse.ts

@@ -152,7 +152,7 @@ describe('Controller.getResponse()', () => {
     const state = {
       ...initialState,
       entities,
-      entityMeta: {
+      entitiesMeta: {
         Tacos: {
           1: { date: 1000000, expiresAt: 1100000, fetchedAt: 1000000 },
           2: { date: 2000000, expiresAt: 2100000, fetchedAt: 2000000 },

package/src/index.ts

@@ -16,6 +16,9 @@ export type {
   EndpointExtraOptions,
   Queryable,
   SchemaArgs,
+  Mergeable,
+  IQueryDelegate,
+  INormalizeDelegate,
   NI,
 } from '@data-client/normalizr';
 export { ExpiryStatus } from '@data-client/normalizr';
@@ -23,6 +26,7 @@ export {
   default as NetworkManager,
   ResetError,
 } from './manager/NetworkManager.js';
+export type { FetchingMeta } from './manager/NetworkManager.js';
 export * from './state/GCPolicy.js';
 export {
   default as createReducer,