@osdk/client 2.2.0-beta.3 → 2.2.0-beta.4

package/build/esm/observable/internal/testUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.js","names":["pDefer","afterEach","beforeEach","expect","vi","vitest","createClientMockHelper","client","fn","mockApplyActionOnce","d","mockReturnValueOnce","applyAction","x","promise","type","addedLinks","addedObjects","deletedLinksCount","deletedObjectsCount","editedObjectTypes","modifiedObjects","mockFetchOneOnce","fetchOne","a","r","$primaryKey","createDefer","subscriptions","s","unsubscribe","push","expectSingleListCallAndClear","subFn","resolvedList","isFakeTimers","runOnlyPendingTimers","toHaveBeenCalledExactlyOnceWith","objectContaining","mockClear","expectSingleObjectCallAndClear","object","status","any","String","waitForCall","times","waitFor","toHaveBeenCalledTimes","createSubscriptionHelper","mockSingleSubCallback","ret","Object","assign","expectLoadingAndLoaded","q","toHaveBeenNthCalledWith","loading","loaded","mockListSubCallback","cacheEntryContaining","cacheKey","value","toBeOneOf","anything","undefined","lastUpdated","nonOptionalValue","src","key","objectPayloadContaining","isOptimistic","Boolean","listPayloadContaining","fetchMore","Function","hasMore","applyCustomMatchers","extend","toBeGreaterThan","e","pass","message"],"sources":["testUtils.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  ActionDefinition,\n  ActionEditResponse,\n  ObjectSet,\n  ObjectTypeDefinition,\n  Osdk,\n  OsdkBase,\n} from \"@osdk/api\";\nimport type { DeferredPromise } from \"p-defer\";\nimport pDefer from \"p-defer\";\nimport type { Mock } from \"vitest\";\nimport { afterEach, beforeEach, expect, vi, vitest } from \"vitest\";\nimport type { ActionSignatureFromDef } from \"../../actions/applyAction.js\";\nimport type { Client } from \"../../Client.js\";\nimport type { ListPayload } from \"../ListPayload.js\";\nimport type { ObjectPayload } from \"../ObjectPayload.js\";\nimport type { Status, Unsubscribable } from \"../ObservableClient.js\";\nimport type { Entry } from \"./Layer.js\";\n\nexport interface MockClientHelper {\n  client: Mock<Client> & Client;\n\n  mockApplyActionOnce: () => DeferredPromise<Partial<ActionEditResponse>>;\n\n  mockFetchOneOnce: <Q extends ObjectTypeDefinition>() => DeferredPromise<\n    Partial<\n      Osdk.Instance<Q>\n    >\n  >;\n}\n\nexport function createClientMockHelper(): MockClientHelper {\n  const client = vitest.fn<typeof client>() as unknown as Mock<Client> & Client;\n\n  function mockFetchOneOnce<\n    X extends Partial<OsdkBase<any>>,\n  >(): DeferredPromise<X> {\n    const d = pDefer<X>();\n\n    client.mockReturnValueOnce(\n      {\n        fetchOne: async (a) => {\n          const r = await d.promise;\n          return { ...r, $primaryKey: a };\n        },\n      } as Pick<ObjectSet<ObjectTypeDefinition>, \"fetchOne\">,\n    );\n    return d;\n  }\n\n  function mockApplyActionOnce(): DeferredPromise<\n    Partial<ActionEditResponse>\n  > {\n    const d = pDefer<Partial<ActionEditResponse>>();\n\n    client.mockReturnValueOnce(\n      {\n        applyAction: async (_args): Promise<ActionEditResponse> => {\n          const x = await d.promise;\n          return {\n            type: \"edits\",\n            addedLinks: x.addedLinks ?? [],\n            addedObjects: x.addedObjects ?? [],\n            deletedLinksCount: x.deletedLinksCount ?? 0,\n            deletedObjectsCount: x.deletedObjectsCount ?? 0,\n            editedObjectTypes: x.editedObjectTypes ?? [],\n            modifiedObjects: x.modifiedObjects ?? [],\n          };\n        },\n      } as Pick<\n        ActionSignatureFromDef<ActionDefinition>,\n        \"applyAction\"\n      >,\n    );\n    return d;\n  }\n\n  return {\n    client,\n    mockApplyActionOnce,\n    mockFetchOneOnce,\n  };\n}\n\nexport function createDefer() {\n  let subscriptions: Unsubscribable[];\n\n  beforeEach(() => {\n    subscriptions = [];\n  });\n\n  afterEach(() => {\n    for (const s of subscriptions) {\n      s.unsubscribe();\n    }\n    subscriptions = [];\n  });\n\n  return function defer(x: Unsubscribable): Unsubscribable {\n    subscriptions.push(x);\n    return x;\n  };\n}\n\nexport function expectSingleListCallAndClear<T extends ObjectTypeDefinition>(\n  subFn: Mock<(e: ListPayload | undefined) => void>,\n  resolvedList: Osdk.Instance<T>[],\n): void {\n  if (vitest.isFakeTimers()) {\n    vitest.runOnlyPendingTimers();\n  }\n  expect(subFn).toHaveBeenCalledExactlyOnceWith(\n    expect.objectContaining({\n      resolvedList,\n    }),\n  );\n  subFn.mockClear();\n}\n\nexport function expectSingleObjectCallAndClear<T extends ObjectTypeDefinition>(\n  subFn: Mock<(e: ObjectPayload | undefined) => void>,\n  object: Osdk.Instance<T>,\n  status?: Status,\n): void {\n  expect(subFn).toHaveBeenCalledExactlyOnceWith(\n    expect.objectContaining({\n      object,\n      status: status ?? expect.any(String),\n    }),\n  );\n  subFn.mockClear();\n}\n\nexport async function waitForCall(\n  subFn: Mock<(e: any) => void>,\n  times: number = 1,\n): Promise<void> {\n  await vi.waitFor(() => {\n    expect(subFn).toHaveBeenCalledTimes(times);\n  });\n  expect(subFn).toHaveBeenCalledTimes(times);\n}\n\nfunction createSubscriptionHelper() {\n}\n\nexport function mockSingleSubCallback():\n  & Mock<\n    (e: ObjectPayload | undefined) => void\n  >\n  & {\n    // expectLoaded: (value: unknown) => Promise<void>;\n    // expectLoading: (value: unknown) => Promise<void>;\n    expectLoadingAndLoaded: (q: {\n      loading?: unknown;\n      loaded: unknown;\n    }) => Promise<void>;\n  }\n{\n  const ret = vitest.fn((e: ObjectPayload | undefined) => {});\n\n  //   async function expectLoaded(value: unknown) {\n  //     await waitForCall(ret);\n  //     // as long as we get the loaded call we are happy\n  //     expect(ret).toHaveBeenLastCalledWith(\n  //       cacheEntryContaining({\n  //         value,\n  //         status: \"loaded\",\n  //       }),\n  //     );\n  //     ret.mockClear();\n  //   }\n\n  //   async function expectLoading(value: unknown) {\n  //     await waitForCall(ret);\n  //     // as long as we get the loaded call we are happy\n  //     expect(ret).toHaveBeenCalledExactlyOnceWith(\n  //       cacheEntryContaining({\n  //         value,\n  //         status: \"loading\",\n  //       }),\n  //     );\n  //     ret.mockClear();\n  //   }\n\n  return Object.assign(ret, {\n    // expectLoaded,\n    // expectLoading,\n    expectLoadingAndLoaded: async (\n      q: { loading?: unknown; loaded: unknown },\n    ) => {\n      await waitForCall(ret, 2);\n\n      // as long as we get the loaded call we are happy\n      expect(ret).toHaveBeenNthCalledWith(\n        1,\n        q.loading,\n      );\n      expect(ret).toHaveBeenNthCalledWith(\n        2,\n        q.loaded,\n      );\n      expect(ret).toHaveBeenCalledTimes(2);\n      ret.mockClear();\n    },\n  });\n}\n\nexport function mockListSubCallback(): Mock<\n  (x: ListPayload | undefined) => void\n> {\n  return vitest.fn(\n    (x: ListPayload | undefined) => {},\n  );\n}\n\nexport function cacheEntryContaining(x: Partial<Entry<any>>): Entry<any> {\n  return {\n    cacheKey: x.cacheKey ?? expect.any(Object),\n    value: \"value\" in x\n      ? x.value\n      : expect.toBeOneOf([expect.anything(), undefined]),\n    status: x.status ?? expect.anything(),\n    lastUpdated: x.lastUpdated ?? expect.anything(),\n  };\n}\n\nfunction nonOptionalValue<T extends object, K extends keyof T>(\n  src: T,\n  key: K,\n): NonNullable<T[K]> {\n  return key in src\n    ? src[key]\n    : expect.toBeOneOf([expect.anything(), undefined]);\n}\n\nexport function objectPayloadContaining(\n  x: Partial<ObjectPayload>,\n): ObjectPayload {\n  return {\n    object: nonOptionalValue(x, \"object\"),\n    isOptimistic: expect.any(Boolean),\n    status: x.status ?? expect.anything(),\n    lastUpdated: x.lastUpdated ?? expect.anything(),\n  };\n}\n\nexport function listPayloadContaining(\n  x: Partial<ListPayload>,\n): ListPayload {\n  return {\n    fetchMore: x.fetchMore ?? expect.any(Function),\n    hasMore: x.hasMore ?? expect.any(Boolean),\n    resolvedList: x.resolvedList ?? expect.anything(),\n    isOptimistic: expect.any(Boolean),\n    status: x.status ?? expect.anything(),\n    lastUpdated: x.lastUpdated ?? expect.anything(),\n  };\n}\n\nexport function applyCustomMatchers(): void {\n  expect.extend({\n    toBeGreaterThan: (r: number, e: number) => {\n      return {\n        pass: r > e,\n        message: () => `expected ${r} to be greater than ${e} (lastUpdated)`,\n      };\n    },\n  });\n}\n\ninterface CustomMatchers<R = any> {\n  toBeGreaterThan: (n: number) => R;\n}\n\ninterface CustomAsymmetricMatchers<R = any> {\n  toBeGreaterThan: (n: number) => R;\n}\n\ndeclare module \"vitest\" {\n  interface Assertion<T = any> extends CustomMatchers<T> {}\n  interface AsymmetricMatchersContaining extends CustomAsymmetricMatchers {}\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAWA,OAAOA,MAAM,MAAM,SAAS;AAE5B,SAASC,SAAS,EAAEC,UAAU,EAAEC,MAAM,EAAEC,EAAE,EAAEC,MAAM,QAAQ,QAAQ;AAoBlE,OAAO,SAASC,sBAAsBA,CAAA,EAAqB;EACzD,MAAMC,MAAM,GAAGF,MAAM,CAACG,EAAE,CAAgB,CAAqC;EA6C7E,OAAO;IACLD,MAAM;IACNE,mBAAmB,EA7BrB,SAAAA,CAAA,EAEE;MACA,MAAMC,CAAC,GAAGV,MAAM,CAA8B,CAAC;MAE/CO,MAAM,CAACI,mBAAmB,CACxB;QACEC,WAAW,EAAE,MAAAA,CAAA,KAA8C;UACzD,MAAMC,CAAC,GAAG,MAAMH,CAAC,CAACI,OAAO;UACzB,OAAO;YACLC,IAAI,EAAE,OAAO;YACbC,UAAU,EAAEH,CAAC,CAACG,UAAU,IAAI,EAAE;YAC9BC,YAAY,EAAEJ,CAAC,CAACI,YAAY,IAAI,EAAE;YAClCC,iBAAiB,EAAEL,CAAC,CAACK,iBAAiB,IAAI,CAAC;YAC3CC,mBAAmB,EAAEN,CAAC,CAACM,mBAAmB,IAAI,CAAC;YAC/CC,iBAAiB,EAAEP,CAAC,CAACO,iBAAiB,IAAI,EAAE;YAC5CC,eAAe,EAAER,CAAC,CAACQ,eAAe,IAAI;UACxC,CAAC;QACH;MACF,CAIF,CAAC;MACD,OAAOX,CAAC;IACV,CAIqB;IACnBY,gBAAgB,EA9ClB,SAAAA,CAAA,EAEwB;MACtB,MAAMZ,CAAC,GAAGV,MAAM,CAAI,CAAC;MAErBO,MAAM,CAACI,mBAAmB,CACxB;QACEY,QAAQ,EAAE,MAAOC,CAAC,IAAK;UACrB,MAAMC,CAAC,GAAG,MAAMf,CAAC,CAACI,OAAO;UACzB,OAAO;YAAE,GAAGW,CAAC;YAAEC,WAAW,EAAEF;UAAE,CAAC;QACjC;MACF,CACF,CAAC;MACD,OAAOd,CAAC;IACV;EAiCA,CAAC;AACH;AAEA,OAAO,SAASiB,WAAWA,CAAA,EAAG;EAC5B,IAAIC,aAA+B;EAEnC1B,UAAU,CAAC,MAAM;IACf0B,aAAa,GAAG,EAAE;EACpB,CAAC,CAAC;EAEF3B,SAAS,CAAC,MAAM;IACd,KAAK,MAAM4B,CAAC,IAAID,aAAa,EAAE;MAC7BC,CAAC,CAACC,WAAW,CAAC,CAAC;IACjB;IACAF,aAAa,GAAG,EAAE;EACpB,CAAC,CAAC;EAEF,OAAO,UAAef,CAAiB,EAAkB;IACvDe,aAAa,CAACG,IAAI,CAAClB,CAAC,CAAC;IACrB,OAAOA,CAAC;EACV,CAAC;AACH;AAEA,OAAO,SAASmB,4BAA4BA,CAC1CC,KAAiD,EACjDC,YAAgC,EAC1B;EACN,IAAI7B,MAAM,CAAC8B,YAAY,CAAC,CAAC,EAAE;IACzB9B,MAAM,CAAC+B,oBAAoB,CAAC,CAAC;EAC/B;EACAjC,MAAM,CAAC8B,KAAK,CAAC,CAACI,+BAA+B,CAC3ClC,MAAM,CAACmC,gBAAgB,CAAC;IACtBJ;EACF,CAAC,CACH,CAAC;EACDD,KAAK,CAACM,SAAS,CAAC,CAAC;AACnB;AAEA,OAAO,SAASC,8BAA8BA,CAC5CP,KAAmD,EACnDQ,MAAwB,EACxBC,MAAe,EACT;EACNvC,MAAM,CAAC8B,KAAK,CAAC,CAACI,+BAA+B,CAC3ClC,MAAM,CAACmC,gBAAgB,CAAC;IACtBG,MAAM;IACNC,MAAM,EAAEA,MAAM,IAAIvC,MAAM,CAACwC,GAAG,CAACC,MAAM;EACrC,CAAC,CACH,CAAC;EACDX,KAAK,CAACM,SAAS,CAAC,CAAC;AACnB;AAEA,OAAO,eAAeM,WAAWA,CAC/BZ,KAA6B,EAC7Ba,KAAa,GAAG,CAAC,EACF;EACf,MAAM1C,EAAE,CAAC2C,OAAO,CAAC,MAAM;IACrB5C,MAAM,CAAC8B,KAAK,CAAC,CAACe,qBAAqB,CAACF,KAAK,CAAC;EAC5C,CAAC,CAAC;EACF3C,MAAM,CAAC8B,KAAK,CAAC,CAACe,qBAAqB,CAACF,KAAK,CAAC;AAC5C;AAEA,SAASG,wBAAwBA,CAAA,EAAG,CACpC;AAEA,OAAO,SAASC,qBAAqBA,CAAA,EAYrC;EACE,MAAMC,GAAG,GAAG9C,MAAM,CAACG,EAAE,CAAC,MAAkC,CAAC,CAAC,CAAC;;EAE3D;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA,OAAO4C,MAAM,CAACC,MAAM,CAACF,GAAG,EAAE;IACxB;IACA;IACAG,sBAAsB,EAAE,MACtBC,CAAyC,IACtC;MACH,MAAMV,WAAW,CAACM,GAAG,EAAE,CAAC,CAAC;;MAEzB;MACAhD,MAAM,CAACgD,GAAG,CAAC,CAACK,uBAAuB,CACjC,CAAC,EACDD,CAAC,CAACE,OACJ,CAAC;MACDtD,MAAM,CAACgD,GAAG,CAAC,CAACK,uBAAuB,CACjC,CAAC,EACDD,CAAC,CAACG,MACJ,CAAC;MACDvD,MAAM,CAACgD,GAAG,CAAC,CAACH,qBAAqB,CAAC,CAAC,CAAC;MACpCG,GAAG,CAACZ,SAAS,CAAC,CAAC;IACjB;EACF,CAAC,CAAC;AACJ;AAEA,OAAO,SAASoB,mBAAmBA,CAAA,EAEjC;EACA,OAAOtD,MAAM,CAACG,EAAE,CACd,MAAgC,CAAC,CACnC,CAAC;AACH;AAEA,OAAO,SAASoD,oBAAoBA,CAAC/C,CAAsB,EAAc;EACvE,OAAO;IACLgD,QAAQ,EAAEhD,CAAC,CAACgD,QAAQ,IAAI1D,MAAM,CAACwC,GAAG,CAACS,MAAM,CAAC;IAC1CU,KAAK,EAAE,OAAO,IAAIjD,CAAC,GACfA,CAAC,CAACiD,KAAK,GACP3D,MAAM,CAAC4D,SAAS,CAAC,CAAC5D,MAAM,CAAC6D,QAAQ,CAAC,CAAC,EAAEC,SAAS,CAAC,CAAC;IACpDvB,MAAM,EAAE7B,CAAC,CAAC6B,MAAM,IAAIvC,MAAM,CAAC6D,QAAQ,CAAC,CAAC;IACrCE,WAAW,EAAErD,CAAC,CAACqD,WAAW,IAAI/D,MAAM,CAAC6D,QAAQ,CAAC;EAChD,CAAC;AACH;AAEA,SAASG,gBAAgBA,CACvBC,GAAM,EACNC,GAAM,EACa;EACnB,OAAOA,GAAG,IAAID,GAAG,GACbA,GAAG,CAACC,GAAG,CAAC,GACRlE,MAAM,CAAC4D,SAAS,CAAC,CAAC5D,MAAM,CAAC6D,QAAQ,CAAC,CAAC,EAAEC,SAAS,CAAC,CAAC;AACtD;AAEA,OAAO,SAASK,uBAAuBA,CACrCzD,CAAyB,EACV;EACf,OAAO;IACL4B,MAAM,EAAE0B,gBAAgB,CAACtD,CAAC,EAAE,QAAQ,CAAC;IACrC0D,YAAY,EAAEpE,MAAM,CAACwC,GAAG,CAAC6B,OAAO,CAAC;IACjC9B,MAAM,EAAE7B,CAAC,CAAC6B,MAAM,IAAIvC,MAAM,CAAC6D,QAAQ,CAAC,CAAC;IACrCE,WAAW,EAAErD,CAAC,CAACqD,WAAW,IAAI/D,MAAM,CAAC6D,QAAQ,CAAC;EAChD,CAAC;AACH;AAEA,OAAO,SAASS,qBAAqBA,CACnC5D,CAAuB,EACV;EACb,OAAO;IACL6D,SAAS,EAAE7D,CAAC,CAAC6D,SAAS,IAAIvE,MAAM,CAACwC,GAAG,CAACgC,QAAQ,CAAC;IAC9CC,OAAO,EAAE/D,CAAC,CAAC+D,OAAO,IAAIzE,MAAM,CAACwC,GAAG,CAAC6B,OAAO,CAAC;IACzCtC,YAAY,EAAErB,CAAC,CAACqB,YAAY,IAAI/B,MAAM,CAAC6D,QAAQ,CAAC,CAAC;IACjDO,YAAY,EAAEpE,MAAM,CAACwC,GAAG,CAAC6B,OAAO,CAAC;IACjC9B,MAAM,EAAE7B,CAAC,CAAC6B,MAAM,IAAIvC,MAAM,CAAC6D,QAAQ,CAAC,CAAC;IACrCE,WAAW,EAAErD,CAAC,CAACqD,WAAW,IAAI/D,MAAM,CAAC6D,QAAQ,CAAC;EAChD,CAAC;AACH;AAEA,OAAO,SAASa,mBAAmBA,CAAA,EAAS;EAC1C1E,MAAM,CAAC2E,MAAM,CAAC;IACZC,eAAe,EAAEA,CAACtD,CAAS,EAAEuD,CAAS,KAAK;MACzC,OAAO;QACLC,IAAI,EAAExD,CAAC,GAAGuD,CAAC;QACXE,OAAO,EAAEA,CAAA,KAAM,YAAYzD,CAAC,uBAAuBuD,CAAC;MACtD,CAAC;IACH;EACF,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"file":"testUtils.js","names":["Chalk","pDefer","invariant","afterEach","beforeEach","expect","vi","vitest","additionalContext","chalk","mockLog","args","console","log","yellow","createTestLogger","bindings","options","colors","debug","cyan","bgCyan","info","green","bgGreen","trace","gray","bgGray","error","red","bgRed","warn","bgYellow","fatal","redBright","bgRedBright","createLogMethod","name","fn","hasData","obj","more","slice","msgPrefix","methodName","magenta","Object","keys","length","child","theseBindings","theseOptions","level","undefined","isLevelEnabled","createClientMockHelper","client","logger","mockImplementation","localLogger","Error","e","where","deadObjectSet","whereArgs","fetchPage","fetchArgs","fetchOne","baseUrl","ontologyRid","objectFactory","objectFactory2","ontologyProvider","getActionDefinition","getInterfaceDefinition","getObjectDefinition","getQueryDefinition","tokenProvider","objectSetFactory","fetch","clientCacheKey","requestContext","mockApplyActionOnce","d","mockReturnValueOnce","applyAction","x","promise","type","addedLinks","addedObjects","deletedLinksCount","deletedObjectsCount","editedObjectTypes","modifiedObjects","mockFetchOneOnce","expectedId","a","process","env","NODE_ENV","r","$primaryKey","mockObjectFactory2Once","mocked","mockFetchPageOnce","objectSet","fetchPageArgs","clause","createDefer","subscriptions","s","unsubscribe","push","expectSingleListCallAndClear","subFn","resolvedList","payloadOptions","isFakeTimers","runOnlyPendingTimers","toHaveBeenCalledExactlyOnceWith","listPayloadContaining","mockClear","expectSingleObjectCallAndClear","object","status","objectContaining","any","String","waitForCall","times","waitFor","toHaveBeenCalledTimes","createSubscriptionHelper","mockSingleSubCallback","ret","assign","expectLoadingAndLoaded","q","toHaveBeenNthCalledWith","loading","loaded","mockListSubCallback","cacheEntryContaining","cacheKey","value","toBeOneOf","anything","lastUpdated","nonOptionalValue","src","key","objectPayloadContaining","isOptimistic","Boolean","fetchMore","Function","hasMore","applyCustomMatchers","extend","toBeGreaterThan","pass","message"],"sources":["testUtils.ts"],"sourcesContent":["/*\n * Copyright 2025 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  ActionDefinition,\n  ActionEditResponse,\n  ObjectOrInterfaceDefinition,\n  ObjectSet,\n  ObjectTypeDefinition,\n  Osdk,\n  OsdkBase,\n  PageResult,\n  WhereClause,\n} from \"@osdk/api\";\nimport { Chalk } from \"chalk\";\nimport type { DeferredPromise } from \"p-defer\";\nimport pDefer from \"p-defer\";\nimport invariant from \"tiny-invariant\";\nimport type { Mock } from \"vitest\";\nimport { afterEach, beforeEach, expect, vi, vitest } from \"vitest\";\nimport type { ActionSignatureFromDef } from \"../../actions/applyAction.js\";\nimport type { Client } from \"../../Client.js\";\nimport { additionalContext } from \"../../Client.js\";\nimport type { LogFn, Logger } from \"../../Logger.js\";\nimport type { ListPayload } from \"../ListPayload.js\";\nimport type { ObjectPayload } from \"../ObjectPayload.js\";\nimport type { Status, Unsubscribable } from \"../ObservableClient.js\";\nimport type { Entry } from \"./Layer.js\";\n\nconst chalk = new Chalk(); // new Chalk({ level: 3 });\n\nexport interface MockClientHelper {\n  client: Mock<Client> & Client;\n\n  mockApplyActionOnce: () => DeferredPromise<Partial<ActionEditResponse>>;\n\n  mockFetchOneOnce: <Q extends ObjectTypeDefinition>(\n    expectedId?: string | number | boolean,\n  ) => DeferredPromise<\n    Partial<\n      Osdk.Instance<Q>\n    >\n  >;\n\n  mockObjectFactory2Once: () => DeferredPromise<\n    Osdk.Instance<ObjectOrInterfaceDefinition, never, any, {}>[]\n  >;\n\n  mockFetchPageOnce: <\n    Q extends ObjectTypeDefinition,\n  >(\n    expected?: {\n      where: WhereClause<any>;\n      orderBy: Record<string, \"asc\" | \"desc\" | undefined>;\n    },\n  ) => DeferredPromise<\n    PageResult<Partial<Osdk.Instance<Q>>>\n  >;\n}\n\nfunction mockLog(...args: any[]) {\n  // eslint-disable-next-line no-console\n  console.log(\n    chalk.yellow(\"mockClient\"),\n    ...args,\n  );\n}\n// interface LogFn {\n//   (obj: unknown, msg?: string, ...args: any[]): void;\n//   (msg: string, ...args: any[]): void;\n// }\n\nexport function createTestLogger(\n  bindings: Record<string, any>,\n  options?: { level?: string; msgPrefix?: string },\n): Logger {\n  const colors = {\n    debug: [chalk.cyan, chalk.bgCyan],\n    info: [chalk.green, chalk.bgGreen],\n    trace: [chalk.gray, chalk.bgGray],\n    error: [chalk.red, chalk.bgRed],\n    warn: [chalk.yellow, chalk.bgYellow],\n    fatal: [chalk.redBright, chalk.bgRedBright],\n  } as const;\n  function createLogMethod(\n    name: \"debug\" | \"error\" | \"info\" | \"warn\" | \"fatal\" | \"trace\",\n  ) {\n    return vi.fn<LogFn>(\n      (\n        ...args: [\n          obj: unknown,\n          ...args1: any[],\n        ] | [\n          ...args2: any[],\n        ]\n      ) => {\n        const hasData = typeof args[0] !== \"string\";\n        const obj: Record<string, unknown> = hasData ? args[0] as any : {};\n        const more: any[] = hasData ? args.slice(1) : args.slice(0);\n\n        // eslint-disable-next-line no-console\n        console.log(\n          `${colors[name][1](name)}${\n            options?.msgPrefix ? \" \" + colors[name][0](options.msgPrefix) : \"\"\n          }${obj.methodName ? ` .${chalk.magenta(obj.methodName)}()` : \"\"}`,\n          ...more,\n        );\n        if (bindings && Object.keys(bindings).length > 0) {\n          // eslint-disable-next-line no-console\n          console.log(bindings);\n        }\n      },\n    ) as LogFn;\n  }\n  return {\n    debug: createLogMethod(\"debug\"),\n    error: createLogMethod(\"error\"),\n    info: createLogMethod(\"info\"),\n    warn: createLogMethod(\"warn\"),\n    fatal: createLogMethod(\"fatal\"),\n    child: vi.fn<Logger[\"child\"]>((theseBindings, theseOptions) =>\n      createTestLogger({\n        ...bindings,\n        ...theseBindings,\n      }, {\n        level: (theseOptions ?? options)?.level,\n        msgPrefix: options?.msgPrefix || theseOptions?.msgPrefix\n          ? `${options?.msgPrefix ? `${options.msgPrefix} ` : \"\"}${\n            theseOptions?.msgPrefix || \"\"\n          }`\n          : undefined,\n      })\n    ),\n    trace: createLogMethod(\"trace\"),\n    isLevelEnabled: vi.fn((args) => true),\n  };\n}\n\nexport function createClientMockHelper(): MockClientHelper {\n  const client = vitest.fn<typeof client>() as unknown as Mock<Client> & Client;\n\n  const logger = createTestLogger({});\n\n  // this is just a fallback for when there is nothing set so we can track whats up\n  client.mockImplementation((...args: any[]) => {\n    const localLogger = logger.child({}, { msgPrefix: \"fallback mock client\" });\n    try {\n      throw new Error(\"IN THE FALLBACK MOCK CLIENT IMPLEMENTATION\");\n    } catch (e) {\n      localLogger.error(\"Just for the stack trace\", e);\n    }\n\n    let where;\n    const deadObjectSet = {\n      where: (...whereArgs: any[]) => {\n        localLogger.trace(\"where\", whereArgs);\n        where = whereArgs;\n        return deadObjectSet;\n      },\n      fetchPage: (...fetchArgs: any[]) => {\n        localLogger.trace(\"etchPage\", where!, fetchArgs);\n        throw new Error(\"NO\");\n      },\n      fetchOne: (...fetchArgs: any[]) => {\n        localLogger.trace(\"fetchOne\", fetchArgs);\n\n        throw new Error(\"NO\");\n      },\n    };\n    return deadObjectSet;\n  });\n\n  client[additionalContext] = {\n    baseUrl: \"http://localhost:8080\",\n    ontologyRid: \"ri.something\",\n    objectFactory: vitest.fn(),\n    objectFactory2: vitest.fn(),\n    ontologyProvider: {\n      getActionDefinition: vitest.fn(),\n      getInterfaceDefinition: vitest.fn(),\n      getObjectDefinition: vitest.fn(),\n      getQueryDefinition: vitest.fn(),\n    },\n    tokenProvider: vitest.fn(),\n    objectSetFactory: vitest.fn(),\n    fetch: vitest.fn(),\n    clientCacheKey: {} as any,\n    requestContext: {},\n    logger,\n  };\n\n  function mockObjectFactory2Once() {\n    const d = pDefer<\n      Osdk.Instance<ObjectOrInterfaceDefinition, never, any, {}>[]\n    >();\n    vi.mocked(client[additionalContext].objectFactory2).mockReturnValueOnce(\n      d.promise,\n    );\n    return d;\n  }\n\n  function mockFetchPageOnce<\n    X extends PageResult<\n      Osdk.Instance<ObjectTypeDefinition>\n    >,\n  >(): DeferredPromise<X> {\n    const d = pDefer<X>();\n\n    const objectSet: ObjectSet<ObjectTypeDefinition> = {\n      fetchPage: async (fetchPageArgs) => {\n        mockLog(\"fetchPage\", fetchPageArgs);\n        const r = await d.promise;\n        return { ...r, $primaryKey: fetchPageArgs };\n      },\n      where: (clause) => {\n        mockLog(\"where\", clause);\n        return objectSet;\n      },\n    } as Pick<\n      ObjectSet<ObjectTypeDefinition>,\n      \"fetchPage\" | \"where\"\n    > as ObjectSet<ObjectTypeDefinition>;\n\n    client.mockReturnValueOnce(objectSet);\n    return d;\n  }\n\n  function mockFetchOneOnce<\n    X extends Partial<OsdkBase<any>>,\n  >(expectedId?: string | number | boolean): DeferredPromise<X> {\n    const d = pDefer<X>();\n\n    client.mockReturnValueOnce(\n      {\n        fetchOne: async (a) => {\n          mockLog(\"fetchOne\", a);\n          invariant(\n            expectedId === undefined || a === expectedId,\n            \"expected id to match\",\n          );\n          const r = await d.promise;\n          return { ...r, $primaryKey: a };\n        },\n      } as Pick<ObjectSet<ObjectTypeDefinition>, \"fetchOne\">,\n    );\n    return d;\n  }\n\n  function mockApplyActionOnce(): DeferredPromise<\n    Partial<ActionEditResponse>\n  > {\n    const d = pDefer<Partial<ActionEditResponse>>();\n\n    client.mockReturnValueOnce(\n      {\n        applyAction: async (_args): Promise<ActionEditResponse> => {\n          const x = await d.promise;\n          return {\n            type: \"edits\",\n            addedLinks: x.addedLinks ?? [],\n            addedObjects: x.addedObjects ?? [],\n            deletedLinksCount: x.deletedLinksCount ?? 0,\n            deletedObjectsCount: x.deletedObjectsCount ?? 0,\n            editedObjectTypes: x.editedObjectTypes ?? [],\n            modifiedObjects: x.modifiedObjects ?? [],\n          };\n        },\n      } as Pick<\n        ActionSignatureFromDef<ActionDefinition>,\n        \"applyAction\"\n      >,\n    );\n    return d;\n  }\n\n  return {\n    client,\n    mockApplyActionOnce,\n    mockFetchOneOnce,\n    mockObjectFactory2Once,\n    mockFetchPageOnce,\n  };\n}\n\nexport function createDefer() {\n  let subscriptions: Unsubscribable[];\n\n  beforeEach(() => {\n    subscriptions = [];\n  });\n\n  afterEach(() => {\n    for (const s of subscriptions) {\n      s.unsubscribe();\n    }\n    subscriptions = [];\n  });\n\n  return function defer(x: Unsubscribable): Unsubscribable {\n    subscriptions.push(x);\n    return x;\n  };\n}\n\nexport function expectSingleListCallAndClear<T extends ObjectTypeDefinition>(\n  subFn: Mock<(e: ListPayload | undefined) => void>,\n  resolvedList: Osdk.Instance<T>[],\n  payloadOptions: Omit<Partial<ListPayload>, \"resolvedList\"> = {},\n): void {\n  if (vitest.isFakeTimers()) {\n    vitest.runOnlyPendingTimers();\n  }\n  expect(subFn).toHaveBeenCalledExactlyOnceWith(\n    listPayloadContaining({\n      ...payloadOptions,\n      resolvedList,\n    }),\n  );\n  subFn.mockClear();\n}\n\nexport function expectSingleObjectCallAndClear<T extends ObjectTypeDefinition>(\n  subFn: Mock<(e: ObjectPayload | undefined) => void>,\n  object: Osdk.Instance<T>,\n  status?: Status,\n): void {\n  expect(subFn).toHaveBeenCalledExactlyOnceWith(\n    expect.objectContaining({\n      object,\n      status: status ?? expect.any(String),\n    }),\n  );\n  subFn.mockClear();\n}\n\nexport async function waitForCall(\n  subFn: Mock<(e: any) => void>,\n  times: number = 1,\n): Promise<void> {\n  try {\n    await vi.waitFor(() => {\n      expect(subFn).toHaveBeenCalledTimes(times);\n    });\n  } catch (e) {\n    // we don't need the error, it will retrigger on the next line\n    // and that provides better behavior in the vitest vscode\n    // plugin. This places the error in the test itself instead of\n    // only in this file\n  }\n  expect(subFn).toHaveBeenCalledTimes(times);\n}\n\nfunction createSubscriptionHelper() {\n}\n\nexport function mockSingleSubCallback():\n  & Mock<\n    (e: ObjectPayload | undefined) => void\n  >\n  & {\n    // expectLoaded: (value: unknown) => Promise<void>;\n    // expectLoading: (value: unknown) => Promise<void>;\n    expectLoadingAndLoaded: (q: {\n      loading?: unknown;\n      loaded: unknown;\n    }) => Promise<void>;\n  }\n{\n  const ret = vitest.fn((e: ObjectPayload | undefined) => {});\n\n  //   async function expectLoaded(value: unknown) {\n  //     await waitForCall(ret);\n  //     // as long as we get the loaded call we are happy\n  //     expect(ret).toHaveBeenLastCalledWith(\n  //       cacheEntryContaining({\n  //         value,\n  //         status: \"loaded\",\n  //       }),\n  //     );\n  //     ret.mockClear();\n  //   }\n\n  //   async function expectLoading(value: unknown) {\n  //     await waitForCall(ret);\n  //     // as long as we get the loaded call we are happy\n  //     expect(ret).toHaveBeenCalledExactlyOnceWith(\n  //       cacheEntryContaining({\n  //         value,\n  //         status: \"loading\",\n  //       }),\n  //     );\n  //     ret.mockClear();\n  //   }\n\n  return Object.assign(ret, {\n    // expectLoaded,\n    // expectLoading,\n    expectLoadingAndLoaded: async (\n      q: { loading?: unknown; loaded: unknown },\n    ) => {\n      await waitForCall(ret, 2);\n\n      // as long as we get the loaded call we are happy\n      expect(ret).toHaveBeenNthCalledWith(\n        1,\n        q.loading,\n      );\n      expect(ret).toHaveBeenNthCalledWith(\n        2,\n        q.loaded,\n      );\n      expect(ret).toHaveBeenCalledTimes(2);\n      ret.mockClear();\n    },\n  });\n}\n\nexport function mockListSubCallback(): Mock<\n  (x: ListPayload | undefined) => void\n> {\n  return vitest.fn(\n    (x: ListPayload | undefined) => {},\n  );\n}\n\nexport function cacheEntryContaining(x: Partial<Entry<any>>): Entry<any> {\n  return {\n    cacheKey: x.cacheKey ?? expect.any(Object),\n    value: \"value\" in x\n      ? x.value\n      : expect.toBeOneOf([expect.anything(), undefined]),\n    status: x.status ?? expect.anything(),\n    lastUpdated: x.lastUpdated ?? expect.anything(),\n  };\n}\n\nfunction nonOptionalValue<T extends object, K extends keyof T>(\n  src: T,\n  key: K,\n): NonNullable<T[K]> {\n  return key in src\n    ? src[key]\n    : expect.toBeOneOf([expect.anything(), undefined]);\n}\n\nexport function objectPayloadContaining(\n  x: Partial<ObjectPayload>,\n): ObjectPayload {\n  return {\n    object: nonOptionalValue(x, \"object\"),\n    isOptimistic: expect.any(Boolean),\n    status: x.status ?? expect.anything(),\n    lastUpdated: x.lastUpdated ?? expect.anything(),\n  };\n}\n\nexport function listPayloadContaining(\n  x: Partial<ListPayload>,\n): ListPayload {\n  return {\n    fetchMore: x.fetchMore ?? expect.any(Function),\n    hasMore: x.hasMore ?? expect.any(Boolean),\n    resolvedList: x.resolvedList ?? expect.anything(),\n    isOptimistic: expect.any(Boolean),\n    status: x.status ?? expect.anything(),\n    lastUpdated: x.lastUpdated ?? expect.anything(),\n  };\n}\n\nexport function applyCustomMatchers(): void {\n  expect.extend({\n    toBeGreaterThan: (r: number, e: number) => {\n      return {\n        pass: r > e,\n        message: () => `expected ${r} to be greater than ${e} (lastUpdated)`,\n      };\n    },\n  });\n}\n\ninterface CustomMatchers<R = any> {\n  toBeGreaterThan: (n: number) => R;\n}\n\ninterface CustomAsymmetricMatchers<R = any> {\n  toBeGreaterThan: (n: number) => R;\n}\n\ndeclare module \"vitest\" {\n  interface Assertion<T = any> extends CustomMatchers<T> {}\n  interface AsymmetricMatchersContaining extends CustomAsymmetricMatchers {}\n}\n"],"mappings":"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","ignoreList":[]}

package/build/esm/util/UserAgent.js

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export const USER_AGENT = `osdk-client/${"2.2.0-beta.3"}`;
+export const USER_AGENT = `osdk-client/${"2.2.0-beta.4"}`;
 //# sourceMappingURL=UserAgent.js.map

package/build/types/Logger.d.ts

@@ -11,8 +11,7 @@ export interface Logger {
 		msgPrefix?: string
 	}): Logger;
 }
-interface LogFn {
+export interface LogFn {
 	(obj: unknown, msg?: string, ...args: any[]): void;
 	(msg: string, ...args: any[]): void;
 }
-export {};

package/build/types/Logger.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,iBAAiB,OAAO;CACtB,OAAO;CACP,OAAO;CACP,OAAO;CACP,OAAO;CACP,MAAM;CACN,MAAM;CAEN,eAAeA;CAEf,MACEC,UAAU,qBACVC,UAAU;EAAE;EAAgB;CAAoB,IAC/C;AACJ;UAES,MAAM;EACbC,cAAcC,cAAc,GAAG;EAC/BC,aAAa,GAAG;AAClB","names":["level: string","bindings: Record<string, any>","options?: { level?: string; msgPrefix?: string }","obj: unknown","msg?: string","msg: string"],"sources":["../../src/Logger.ts"],"version":3,"file":"Logger.d.ts"}
+{"mappings":"AAgBA,iBAAiB,OAAO;CACtB,OAAO;CACP,OAAO;CACP,OAAO;CACP,OAAO;CACP,MAAM;CACN,MAAM;CAEN,eAAeA;CAEf,MACEC,UAAU,qBACVC,UAAU;EAAE;EAAgB;CAAoB,IAC/C;AACJ;AAED,iBAAiB,MAAM;EACpBC,cAAcC,cAAc,GAAG;EAC/BC,aAAa,GAAG;AAClB","names":["level: string","bindings: Record<string, any>","options?: { level?: string; msgPrefix?: string }","obj: unknown","msg?: string","msg: string"],"sources":["../../src/Logger.ts"],"version":3,"file":"Logger.d.ts"}

package/build/types/observable/ObservableClient.d.ts

@@ -12,7 +12,7 @@ export declare namespace ObservableClient {
 		optimisticUpdate?: (ctx: OptimisticBuilder) => void;
 	}
 }
-export interface QueryOptions {
+export interface CommonObserveOptions {
 	dedupeInterval?: number;
 }
 export interface ObserveOptions {
@@ -21,12 +21,19 @@ export interface ObserveOptions {
 export interface ObserveObjectOptions<T extends ObjectTypeDefinition> extends ObserveOptions {
 	select?: PropertyKeys<T>[];
 }
-export interface ListQueryOptions extends QueryOptions {
+export type OrderBy<Q extends ObjectTypeDefinition> = { [K in PropertyKeys<Q>]? : "asc" | "desc" | undefined };
+export interface ObserveListOptions<Q extends ObjectTypeDefinition> extends CommonObserveOptions, ObserveOptions {
+	objectType: Q["apiName"] | Q;
+	where?: WhereClause<Q>;
 	pageSize?: number;
+	orderBy?: OrderBy<Q>;
+	invalidationMode?: "in-place" | "wait" | "reset";
+	expectedLength?: number;
+	streamUpdates?: boolean;
 }
 export interface ObservableClient {
 	observeObject<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>, options: ObserveOptions, subFn: SubFn<ObjectPayload>): Unsubscribable;
-	observeList<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, where: WhereClause<T>, options: ObserveOptions & ListQueryOptions, subFn: SubFn<ListPayload>): Unsubscribable;
+	observeList<T extends ObjectTypeDefinition>(options: ObserveListOptions<T>, subFn: SubFn<ListPayload>): Unsubscribable;
 	applyAction: <Q extends ActionDefinition<any>>(action: Q, args: Parameters<ActionSignatureFromDef<Q>["applyAction"]>[0], opts?: ObservableClient.ApplyActionOptions) => Promise<unknown>;
 	canonicalizeWhereClause: <T extends ObjectTypeDefinition>(where: WhereClause<T>) => Canonical<WhereClause<T>>;
 }

package/build/types/observable/ObservableClient.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,kBACA,sBACA,gBACA,cACA,mBACK,WAAY;AACnB,cAAc,8BAA8B,2BAA4B;AACxE,cAAc,cAAc,cAAe;AAC3C,cAAc,iBAAiB,yBAA0B;AAGzD,cAAc,mBAAmB,kBAAmB;AACpD,cAAc,qBAAqB,oBAAqB;AACxD,cAAc,yBAAyB,wBAAyB;AAChE,cAAc,aAAa,YAAa;AAExC,YAAY,SAAS,SAAS,YAAY,WAAW;AAErD,yBAAiB;WACE,mBAAmB;EAClC,oBAAoBA,KAAK;CAC1B;;AAEH,iBAAiB,aAAa;CAC5B;AACD;AAED,iBAAiB,eAAe;CAC9B,OAAO,YAAY;AACpB;AAED,iBAAiB,qBAAqB,UAAU,8BACtC,eACV;CACE,SAAS,aAAa;AACvB;AAED,iBAAiB,yBAAyB,aAAa;CACrD;AACD;AAED,iBAAiB,iBAAiB;CAChC,cAAc,UAAU,sBACtBC,SAAS,EAAE,aAAa,GACxBC,IAAI,eAAe,IACnBC,SAAS,gBACTC,OAAO,MAAM,iBACZ;CAEH,YAAY,UAAU,sBACpBH,SAAS,EAAE,aAAa,GACxBI,OAAO,YAAY,IACnBC,SAAS,iBAAiB,kBAC1BC,OAAO,MAAM,eACZ;CAEH,cAAc,UAAU,uBACtBC,QAAQ,GACRC,MAAM,WAAW,uBAAuB,GAAG,gBAAgB,IAC3DC,OAAO,iBAAiB,uBACrB;CAEL,0BAA0B,UAAU,sBAClCL,OAAO,YAAY,OAChB,UAAU,YAAY;AAC5B;AAED,OAAO,iBAAS,uBAAuBM,QAAQ,SAAS;AAIxD,iBAAiB,eAAe;CAC9B;AACD","names":["ctx: OptimisticBuilder","apiName: T[\"apiName\"] | T","pk: PrimaryKeyType<T>","options: ObserveOptions","subFn: SubFn<ObjectPayload>","where: WhereClause<T>","options: ObserveOptions & ListQueryOptions","subFn: SubFn<ListPayload>","action: Q","args: Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]","opts?: ObservableClient.ApplyActionOptions","client: Client"],"sources":["../../../src/observable/ObservableClient.ts"],"version":3,"file":"ObservableClient.d.ts"}
+{"mappings":"AAgBA,cACE,kBACA,sBACA,gBACA,cACA,mBACK,WAAY;AACnB,cAAc,8BAA8B,2BAA4B;AACxE,cAAc,cAAc,cAAe;AAC3C,cAAc,iBAAiB,yBAA0B;AAGzD,cAAc,mBAAmB,kBAAmB;AACpD,cAAc,qBAAqB,oBAAqB;AACxD,cAAc,yBAAyB,wBAAyB;AAChE,cAAc,aAAa,YAAa;AAExC,YAAY,SAAS,SAAS,YAAY,WAAW;AAErD,yBAAiB;WACE,mBAAmB;EAClC,oBAAoBA,KAAK;CAC1B;;AAGH,iBAAiB,qBAAqB;CACpC;AACD;AAED,iBAAiB,eAAe;CAC9B,OAAO,YAAY;AACpB;AAED,iBAAiB,qBAAqB,UAAU,8BACtC,eACV;CACE,SAAS,aAAa;AACvB;AAED,YAAY,QAAQ,UAAU,2BAC3B,KAAK,aAAa,OAAM,QAAQ;AAGnC,iBAAiB,mBAAmB,UAAU,8BACpC,sBAAsB,eAChC;CACE,YAAY,EAAE,aAAa;CAC3B,QAAQ,YAAY;CACpB;CACA,UAAU,QAAQ;CAClB,mBAAmB,aAAa,SAAS;CACzC;CACA;AACD;AAED,iBAAiB,iBAAiB;CAChC,cAAc,UAAU,sBACtBC,SAAS,EAAE,aAAa,GACxBC,IAAI,eAAe,IACnBC,SAAS,gBACTC,OAAO,MAAM,iBACZ;CAEH,YAAY,UAAU,sBACpBC,SAAS,mBAAmB,IAC5BC,OAAO,MAAM,eACZ;CAEH,cAAc,UAAU,uBACtBC,QAAQ,GACRC,MAAM,WAAW,uBAAuB,GAAG,gBAAgB,IAC3DC,OAAO,iBAAiB,uBACrB;CAEL,0BAA0B,UAAU,sBAClCC,OAAO,YAAY,OAChB,UAAU,YAAY;AAC5B;AAED,OAAO,iBAAS,uBAAuBC,QAAQ,SAAS;AAIxD,iBAAiB,eAAe;CAC9B;AACD","names":["ctx: OptimisticBuilder","apiName: T[\"apiName\"] | T","pk: PrimaryKeyType<T>","options: ObserveOptions","subFn: SubFn<ObjectPayload>","options: ObserveListOptions<T>","subFn: SubFn<ListPayload>","action: Q","args: Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]","opts?: ObservableClient.ApplyActionOptions","where: WhereClause<T>","client: Client"],"sources":["../../../src/observable/ObservableClient.ts"],"version":3,"file":"ObservableClient.d.ts"}

package/build/types/observable/internal/ActionApplication.d.ts

@@ -0,0 +1,9 @@
+import type { ActionDefinition } from "@osdk/api";
+import type { ActionSignatureFromDef } from "../../actions/applyAction.js";
+import type { Store } from "./Store.js";
+export declare class ActionApplication {
+	#private;
+	private store;
+	constructor(store: Store);
+	applyAction: <Q extends ActionDefinition<any>>(action: Q, args: Parameters<ActionSignatureFromDef<Q>["applyAction"]>[0], opts?: Store.ApplyActionOptions) => Promise<unknown>;
+}

package/build/types/observable/internal/ActionApplication.d.ts.map

@@ -0,0 +1 @@
+{"mappings":"AAgBA,cAAc,wBAA4C,WAAY;AAEtE,cAAc,8BAA8B,8BAA+B;AAI3E,cAAc,aAAa,YAAa;AAIxC,OAAO,cAAM,kBAAkB;;CACjB;CAAZ,YAAoBA,OAAO;CAE3B,cAAc,UAAU,uBACtBC,QAAQ,GACRC,MAAM,WAAW,uBAAuB,GAAG,gBAAgB,IAC3DC,OAAO,MAAM,uBACV;AA0FN","names":["store: Store","action: Q","args: Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]","opts?: Store.ApplyActionOptions"],"sources":["../../../../src/observable/internal/ActionApplication.ts"],"version":3,"file":"ActionApplication.d.ts"}

package/build/types/observable/internal/CacheKeys.d.ts

@@ -1,8 +1,9 @@
 import type { CacheKey } from "./CacheKey.js";
+import type { OrderByCanonicalizer } from "./Store.js";
 import type { WhereClauseCanonicalizer } from "./WhereClauseCanonicalizer.js";
 export declare class CacheKeys {
 	#private;
-	constructor(whereCanonicalizer: WhereClauseCanonicalizer, onCreate: (cacheKey: CacheKey) => void);
+	constructor(whereCanonicalizer: WhereClauseCanonicalizer, orderByCanonicalizer: OrderByCanonicalizer, onCreate: (cacheKey: CacheKey) => void);
 	get<K extends CacheKey<string, any, any>>(type: K["type"], ...args: K["__cacheKey"]["args"]): K;
 	remove<K extends CacheKey<string, any, any>>(cacheKey: K): void;
 }

package/build/types/observable/internal/CacheKeys.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAmBA,cAAc,gBAAgB,eAAgB;AAG9C,cAAc,gCAAgC,+BAAgC;AAE9E,OAAO,cAAM,UAAU;;CAgBrB,YACEA,oBAAoB,0BACpBC,WAAWC,UAAU;CAwDvB,IAAI,UAAU,4BACZC,MAAM,EAAE,SACR,GAAG,MAAM,EAAE,cAAc,UACxB;CAMH,OAAO,UAAU,4BACfC,UAAU;AAIb","names":["whereCanonicalizer: WhereClauseCanonicalizer","onCreate: (cacheKey: CacheKey) => void","cacheKey: CacheKey","type: K[\"type\"]","cacheKey: K"],"sources":["../../../../src/observable/internal/CacheKeys.ts"],"version":3,"file":"CacheKeys.d.ts"}
+{"mappings":"AAmBA,cAAc,gBAAgB,eAAgB;AAG9C,cAAc,4BAA4B,YAAa;AACvD,cAAc,gCAAgC,+BAAgC;AAI9E,OAAO,cAAM,UAAU;;CAgBrB,YACEA,oBAAoB,0BACpBC,sBAAsB,sBACtBC,WAAWC,UAAU;CA4DvB,IAAI,UAAU,4BACZC,MAAM,EAAE,SACR,GAAG,MAAM,EAAE,cAAc,UACxB;CAMH,OAAO,UAAU,4BACfC,UAAU;AAIb","names":["whereCanonicalizer: WhereClauseCanonicalizer","orderByCanonicalizer: OrderByCanonicalizer","onCreate: (cacheKey: CacheKey) => void","cacheKey: CacheKey","type: K[\"type\"]","cacheKey: K"],"sources":["../../../../src/observable/internal/CacheKeys.ts"],"version":3,"file":"CacheKeys.d.ts"}

package/build/types/observable/internal/ChangedObjects.d.ts

@@ -1,7 +1,11 @@
 import type { ObjectTypeDefinition, Osdk } from "@osdk/api";
 import { MultiMap } from "mnemonist";
-export interface ChangedObjects {
+import type { ListCacheKey } from "./ListQuery.js";
+export interface Changes {
 	modifiedObjects: MultiMap<string, Osdk.Instance<ObjectTypeDefinition>>;
 	addedObjects: MultiMap<string, Osdk.Instance<ObjectTypeDefinition>>;
+	addedLists: Set<ListCacheKey>;
+	modifiedLists: Set<ListCacheKey>;
 }
-export declare function createChangedObjects(): ChangedObjects;
+export declare function createChangedObjects(): Changes;
+export declare function DEBUG_ONLY__changesToString(changes: Changes): string;

package/build/types/observable/internal/ChangedObjects.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,sBAAsB,YAAY,WAAY;AAC5D,SAAS,gBAAgB,WAAY;AAErC,iBAAiB,eAAe;CAC9B,iBAAiB,iBAAiB,KAAK,SAAS;CAChD,cAAc,iBAAiB,KAAK,SAAS;AAC9C;AAED,OAAO,iBAAS,wBAAwB","names":[],"sources":["../../../../src/observable/internal/ChangedObjects.ts"],"version":3,"file":"ChangedObjects.d.ts"}
+{"mappings":"AAgBA,cAAc,sBAAsB,YAAY,WAAY;AAC5D,SAAS,gBAAgB,WAAY;AAErC,cAAc,oBAAoB,gBAAiB;AAEnD,iBAAiB,QAAQ;CACvB,iBAAiB,iBAAiB,KAAK,SAAS;CAChD,cAAc,iBAAiB,KAAK,SAAS;CAC7C,YAAY,IAAI;CAChB,eAAe,IAAI;AACpB;AAED,OAAO,iBAAS,wBAAwB;AAYxC,OAAO,iBAAS,4BAA4BA,SAAS","names":["changes: Changes"],"sources":["../../../../src/observable/internal/ChangedObjects.ts"],"version":3,"file":"ChangedObjects.d.ts"}

package/build/types/observable/internal/Layer.d.ts

@@ -15,5 +15,5 @@ export declare class Entry<K extends CacheKey<any, any, any>> {
 	value: K["__cacheKey"]["value"] | undefined;
 	lastUpdated: number;
 	status: "init" | "loading" | "loaded" | "error";
-	constructor(cacheKey: K, value: K["__cacheKey"]["value"], lastUpdated: number);
+	constructor(cacheKey: K, value: K["__cacheKey"]["value"], lastUpdated: number, status?: "init" | "loading" | "loaded" | "error");
 }

package/build/types/observable/internal/Layer.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAAc,gBAAgB,eAAgB;AAc9C,OAAO,cAAM,MAAM;;CAKjB,YAAYA,QAAQ,mBAAmBC;CAKvC,IAAI,eAAe;CAInB,IAAI;CAIJ,SAASA,mBAAmB;CAI5B,YAAYA,mBAAmB;CAa/B,WAAW,kBAAkB,4BAA4B;CAIzD,AAAO,IAAI,UAAU,gCACnBC,UAAU,IACT,MAAM;CAKT,AAAO,IAAI,UAAU,gCACnBA,UAAU,GACVC,OAAO,MAAM;AAIhB;AAED,OAAO,cAAM,MAAM,UAAU,yBAAyB;CACpD,SAAS,UAAU;CACnB,OAAO,EAAE,cAAc;CACvB;CACA,QAAQ,SAAS,YAAY,WAAW;CAExC,YACED,UAAU,GACVE,OAAO,EAAE,cAAc,UACvBC;AAOH","names":["parent: Layer | undefined","layerId: unknown","cacheKey: K","value: Entry<K>","value: K[\"__cacheKey\"][\"value\"]","lastUpdated: number"],"sources":["../../../../src/observable/internal/Layer.ts"],"version":3,"file":"Layer.d.ts"}
+{"mappings":"AAgBA,cAAc,gBAAgB,eAAgB;AAc9C,OAAO,cAAM,MAAM;;CAKjB,YAAYA,QAAQ,mBAAmBC;CAKvC,IAAI,eAAe;CAInB,IAAI;CAIJ,SAASA,mBAAmB;CAI5B,YAAYA,mBAAmB;CAc/B,WAAW,kBAAkB,4BAA4B;CAIzD,AAAO,IAAI,UAAU,gCACnBC,UAAU,IACT,MAAM;CAKT,AAAO,IAAI,UAAU,gCACnBA,UAAU,GACVC,OAAO,MAAM;AAIhB;AAED,OAAO,cAAM,MAAM,UAAU,yBAAyB;CACpD,SAAS,UAAU;CACnB,OAAO,EAAE,cAAc;CACvB;CACA,QAAQ,SAAS,YAAY,WAAW;CAExC,YACED,UAAU,GACVE,OAAO,EAAE,cAAc,UACvBC,qBACAC,SAAQ,SAAS,YAAY,WAAW;AAO3C","names":["parent: Layer | undefined","layerId: unknown","cacheKey: K","value: Entry<K>","value: K[\"__cacheKey\"][\"value\"]","lastUpdated: number","status: \"init\" | \"loading\" | \"loaded\" | \"error\""],"sources":["../../../../src/observable/internal/Layer.ts"],"version":3,"file":"Layer.d.ts"}

package/build/types/observable/internal/ListQuery.d.ts

@@ -1,40 +1,41 @@
-import type { ObjectTypeDefinition, Osdk, WhereClause } from "@osdk/api";
+import type { ObjectTypeDefinition, WhereClause } from "@osdk/api";
 import { type Connectable, type Observable } from "rxjs";
 import type { ListPayload } from "../ListPayload.js";
-import type { QueryOptions, Status } from "../ObservableClient.js";
-import type { CacheKey } from "./CacheKey.js";
+import type { CommonObserveOptions, Status } from "../ObservableClient.js";
+import { type CacheKey } from "./CacheKey.js";
 import type { Canonical } from "./Canonical.js";
-import type { ChangedObjects } from "./ChangedObjects.js";
-import { Entry } from "./Layer.js";
-import type { ObjectCacheKey, ObjectEntry } from "./ObjectQuery.js";
+import { type Changes } from "./ChangedObjects.js";
+import type { Entry } from "./Layer.js";
+import type { ObjectCacheKey } from "./ObjectQuery.js";
 import type { OptimisticId } from "./OptimisticId.js";
 import { Query } from "./Query.js";
 import type { BatchContext, Store, SubjectPayload } from "./Store.js";
-export interface ListEntry extends Entry<ListCacheKey> {}
 interface ListStorageData {
 	data: ObjectCacheKey[];
 }
-export interface ListCacheKey extends CacheKey<"list", ListStorageData, ListQuery, [apiName: string, whereClause: WhereClause<ObjectTypeDefinition>]> {}
-export interface ListQueryOptions extends QueryOptions {
+export interface ListCacheKey extends CacheKey<"list", ListStorageData, ListQuery, [apiName: string, whereClause: Canonical<WhereClause<ObjectTypeDefinition>>, orderByClause: Canonical<Record<string, "asc" | "desc" | undefined>>]> {}
+export interface ListQueryOptions extends CommonObserveOptions {
 	pageSize?: number;
 }
 export declare class ListQuery extends Query<ListCacheKey, ListPayload, ListQueryOptions> {
 	#private;
-	constructor(store: Store, subject: Observable<SubjectPayload<ListCacheKey>>, type: string, whereClause: Canonical<WhereClause<ObjectTypeDefinition>>, cacheKey: ListCacheKey, opts: ListQueryOptions);
+	constructor(store: Store, subject: Observable<SubjectPayload<ListCacheKey>>, objectType: string, whereClause: Canonical<WhereClause<ObjectTypeDefinition>>, orderBy: Canonical<Record<string, "asc" | "desc" | undefined>>, cacheKey: ListCacheKey, opts: ListQueryOptions);
+	get canonicalWhere(): Canonical<WhereClause<ObjectTypeDefinition>>;
 	protected _createConnectable(subject: Observable<SubjectPayload<ListCacheKey>>): Connectable<ListPayload>;
 	_preFetch(): void;
 	_fetch(): Promise<void>;
 	fetchMore: () => Promise<unknown>;
 	/**
-	* Caller is responsible for removing the layer
-	*
-	* @param changedObjects
+	* Note: This method is not async because I want it to return right after it
+	*       finishes the synchronous updates. The promise that is returned
+	*       will resolve after the revalidation is complete.
+	* @param changes
 	* @param optimisticId
-	* @returns
+	* @returns If revalidation is needed, a promise that resolves after the
+	*          revalidation is complete. Otherwise, undefined.
 	*/
-	maybeUpdate(changedObjects: ChangedObjects, optimisticId: OptimisticId): boolean;
-	maybeRevalidate(changedObjects: ChangedObjects): Promise<unknown>;
-	updateList(values: Array<Osdk.Instance<ObjectTypeDefinition> | ObjectEntry>, append: boolean, status: Status, batch: BatchContext): Entry<ListCacheKey>;
+	maybeUpdateAndRevalidate: (changes: Changes, optimisticId: OptimisticId | undefined) => Promise<void> | undefined;
+	updateList(objectCacheKeys: Array<ObjectCacheKey>, append: boolean, status: Status, batch: BatchContext): Entry<ListCacheKey>;
 	writeToStore(data: ListStorageData, status: Status, batch: BatchContext): Entry<ListCacheKey>;
 	_dispose(): void;
 }

package/build/types/observable/internal/ListQuery.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAEE,sBACA,MACA,mBACK,WAAY;AAEnB,cAIO,kBAIA,kBAIA,MAAO;AAGd,cAAc,mBAAmB,mBAAoB;AACrD,cAAc,cAAc,cAAc,wBAAyB;AACnE,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,iBAAiB,gBAAiB;AAChD,cAAc,sBAAsB,qBAAsB;AAC1D,SAAS,aAAa,YAAa;AAEnC,cAAc,gBAAgB,mBAAmB,kBAAmB;AACpE,cAAc,oBAAoB,mBAAoB;AACtD,SAAS,aAAa,YAAa;AACnC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,iBAAiB,kBAAkB,MAAM,cAAc,CAAE;UAG/C,gBAAgB;CACxB,MAAM;AACP;AAED,iBAAiB,qBACf,SACE,QACA,iBACA,YAEE,iBACA,aAAa,YAAY,wBAG/B,CAAE;AAEF,iBAAiB,yBAAyB,aAAa;CACrD;AACD;AAED,OAAO,cAAM,kBAAkB,MAC7B,cACA,aACA,kBACA;;CAaA,YACEA,OAAO,OACPC,SAAS,WAAW,eAAe,gBACnCC,cACAC,aAAa,UAAU,YAAY,wBACnCC,UAAU,cACVC,MAAM;CAeR,UAAU,mBACRJ,SAAS,WAAW,eAAe,iBAClC,YAAY;CA+Bf;CAIA,AAAM,UAAU;CAgChB,iBAAgB;;;;;;;;CAwEhB,YACEK,gBAAgB,gBAChBC,cAAc;CAoDhB,gBACED,gBAAgB,iBACf;CA2BH,WACEE,QAAQ,MAAM,KAAK,SAAS,wBAAwB,cACpDC,iBACAC,QAAQ,QACRC,OAAO,eACN,MAAM;CA6CT,aACEC,MAAM,iBACNF,QAAQ,QACRC,OAAO,eACN,MAAM;CAaT;AAYD;AAED,OAAO,iBAAS,eACdE,UAAU,UACVC,mBACC,YAAY","names":["store: Store","subject: Observable<SubjectPayload<ListCacheKey>>","type: string","whereClause: Canonical<WhereClause<ObjectTypeDefinition>>","cacheKey: ListCacheKey","opts: ListQueryOptions","changedObjects: ChangedObjects","optimisticId: OptimisticId","values: Array<Osdk.Instance<ObjectTypeDefinition> | ObjectEntry>","append: boolean","status: Status","batch: BatchContext","data: ListStorageData","cacheKey: CacheKey","apiName?: string"],"sources":["../../../../src/observable/internal/ListQuery.ts"],"version":3,"file":"ListQuery.d.ts"}
+{"mappings":"AAgBA,cAEE,sBAEA,mBACK,WAAY;AAEnB,cAIO,kBAGA,kBAKA,MAAO;AAGd,cAAc,mBAAmB,mBAAoB;AACrD,cAAc,sBAAsB,cAAc,wBAAyB;AAC3E,cACO,gBAEA,eAAgB;AACvB,cAAc,iBAAiB,gBAAiB;AAChD,cAAc,eAA4C,qBAAsB;AAChF,cAAc,aAAa,YAAa;AAExC,cAAc,sBAAsB,kBAAmB;AACvD,cAAc,oBAAoB,mBAAoB;AACtD,SAAS,aAAa,YAAa;AACnC,cAAc,cAAc,OAAO,sBAAsB,YAAa;UAE5D,gBAAgB;CACxB,MAAM;AACP;AAED,iBAAiB,qBACf,SACE,QACA,iBACA,YAEE,iBACA,aAAa,UAAU,YAAY,wBACnC,eAAe,UAAU,eAAe,QAAQ,uBAGtD,CAAE;AAEF,iBAAiB,yBAAyB,qBAAqB;CAC7D;AACD;AAED,OAAO,cAAM,kBAAkB,MAC7B,cACA,aACA,kBACA;;CAcA,YACEA,OAAO,OACPC,SAAS,WAAW,eAAe,gBACnCC,oBACAC,aAAa,UAAU,YAAY,wBACnCC,SAAS,UAAU,eAAe,QAAQ,sBAC1CC,UAAU,cACVC,MAAM;CA0BR,IAAI,kBAAkB,UAAU,YAAY;CAI5C,UAAU,mBACRL,SAAS,WAAW,eAAe,iBAClC,YAAY;CA+Bf;CAIA,AAAM,UAAU;CAgChB,iBAAgB;;;;;;;;;;CAkFhB,2BACEM,SAAS,SACTC,cAAc,6BACb;CAwKH,WACEC,iBAAiB,MAAM,iBACvBC,iBACAC,QAAQ,QACRC,OAAO,eACN,MAAM;CA6FT,aACEC,MAAM,iBACNF,QAAQ,QACRC,OAAO,eACN,MAAM;CAmBT;AAYD;AAED,OAAO,iBAAS,eACdE,UAAU,UACVC,mBACC,YAAY","names":["store: Store","subject: Observable<SubjectPayload<ListCacheKey>>","objectType: string","whereClause: Canonical<WhereClause<ObjectTypeDefinition>>","orderBy: Canonical<Record<string, \"asc\" | \"desc\" | undefined>>","cacheKey: ListCacheKey","opts: ListQueryOptions","changes: Changes","optimisticId: OptimisticId | undefined","objectCacheKeys: Array<ObjectCacheKey>","append: boolean","status: Status","batch: BatchContext","data: ListStorageData","cacheKey: CacheKey","apiName?: string"],"sources":["../../../../src/observable/internal/ListQuery.ts"],"version":3,"file":"ListQuery.d.ts"}

package/build/types/observable/internal/ObjectQuery.d.ts

@@ -1,7 +1,7 @@
 import type { ObjectTypeDefinition, Osdk, PrimaryKeyType } from "@osdk/api";
 import type { Connectable, Observable, Subject } from "rxjs";
 import type { ObjectPayload } from "../ObjectPayload.js";
-import type { QueryOptions, Status } from "../ObservableClient.js";
+import type { CommonObserveOptions, Status } from "../ObservableClient.js";
 import type { CacheKey } from "./CacheKey.js";
 import type { Entry } from "./Layer.js";
 import { Query } from "./Query.js";
@@ -9,9 +9,9 @@ import type { BatchContext, Store, SubjectPayload } from "./Store.js";
 export interface ObjectEntry extends Entry<ObjectCacheKey> {}
 type ObjectStorageData = Osdk.Instance<ObjectTypeDefinition>;
 export interface ObjectCacheKey extends CacheKey<"object", ObjectStorageData, ObjectQuery, [string, pk: PrimaryKeyType<ObjectTypeDefinition>]> {}
-export declare class ObjectQuery extends Query<ObjectCacheKey, ObjectPayload, QueryOptions> {
+export declare class ObjectQuery extends Query<ObjectCacheKey, ObjectPayload, CommonObserveOptions> {
 	#private;
-	constructor(store: Store, subject: Subject<SubjectPayload<ObjectCacheKey>>, type: string, pk: PrimaryKeyType<ObjectTypeDefinition>, cacheKey: ObjectCacheKey, opts: QueryOptions);
+	constructor(store: Store, subject: Subject<SubjectPayload<ObjectCacheKey>>, type: string, pk: PrimaryKeyType<ObjectTypeDefinition>, cacheKey: ObjectCacheKey, opts: CommonObserveOptions);
 	protected _createConnectable(subject: Observable<SubjectPayload<ObjectCacheKey>>): Connectable<ObjectPayload>;
 	_fetch(): Promise<void>;
 	writeToStore(data: Osdk.Instance<ObjectTypeDefinition>, status: Status, batch: BatchContext): Entry<ObjectCacheKey>;

package/build/types/observable/internal/ObjectQuery.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cAEE,sBACA,MACA,sBACK,WAAY;AAEnB,cAAc,aAAa,YAAY,eAAe,MAAO;AAE7D,cAAc,qBAAqB,qBAAsB;AACzD,cAAc,cAAc,cAAc,wBAAyB;AACnE,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,aAAa,YAAa;AACxC,SAAS,aAAa,YAAa;AACnC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,iBAAiB,oBAAoB,MAAM,gBAAgB,CAAE;KAExD,oBAAoB,KAAK,SAAS;AAEvC,iBAAiB,uBACf,SACE,UACA,mBACA,sBACS,IAAI,eAAe,wBAEhC,CAAE;AAEF,OAAO,cAAM,oBAAoB,MAC/B,gBACA,eACA,cACA;;CAIA,YACEA,OAAO,OACPC,SAAS,QAAQ,eAAe,kBAChCC,cACAC,IAAI,eAAe,uBACnBC,UAAU,gBACVC,MAAM;CAYR,UAAU,mBACRC,SAAS,WAAW,eAAe,mBAClC,YAAY;CAwBf,AAAM,UAAU;CAehB,aACEC,MAAM,KAAK,SAAS,uBACpBC,QAAQ,QACRC,OAAO,eACN,MAAM;AAkBV","names":["store: Store","subject: Subject<SubjectPayload<ObjectCacheKey>>","type: string","pk: PrimaryKeyType<ObjectTypeDefinition>","cacheKey: ObjectCacheKey","opts: QueryOptions","subject: Observable<SubjectPayload<ObjectCacheKey>>","data: Osdk.Instance<ObjectTypeDefinition>","status: Status","batch: BatchContext"],"sources":["../../../../src/observable/internal/ObjectQuery.ts"],"version":3,"file":"ObjectQuery.d.ts"}
+{"mappings":"AAgBA,cAEE,sBACA,MACA,sBACK,WAAY;AAEnB,cAAc,aAAa,YAAY,eAAe,MAAO;AAG7D,cAAc,qBAAqB,qBAAsB;AACzD,cAAc,sBAAsB,cAAc,wBAAyB;AAC3E,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,aAAa,YAAa;AACxC,SAAS,aAAa,YAAa;AACnC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,iBAAiB,oBAAoB,MAAM,gBAAgB,CAAE;KAExD,oBAAoB,KAAK,SAAS;AAEvC,iBAAiB,uBACf,SACE,UACA,mBACA,sBACS,IAAI,eAAe,wBAEhC,CAAE;AAEF,OAAO,cAAM,oBAAoB,MAC/B,gBACA,eACA,sBACA;;CAIA,YACEA,OAAO,OACPC,SAAS,QAAQ,eAAe,kBAChCC,cACAC,IAAI,eAAe,uBACnBC,UAAU,gBACVC,MAAM;CAqBR,UAAU,mBACRC,SAAS,WAAW,eAAe,mBAClC,YAAY;CAwBf,AAAM,UAAU;CAmBhB,aACEC,MAAM,KAAK,SAAS,uBACpBC,QAAQ,QACRC,OAAO,eACN,MAAM;AAyBV","names":["store: Store","subject: Subject<SubjectPayload<ObjectCacheKey>>","type: string","pk: PrimaryKeyType<ObjectTypeDefinition>","cacheKey: ObjectCacheKey","opts: CommonObserveOptions","subject: Observable<SubjectPayload<ObjectCacheKey>>","data: Osdk.Instance<ObjectTypeDefinition>","status: Status","batch: BatchContext"],"sources":["../../../../src/observable/internal/ObjectQuery.ts"],"version":3,"file":"ObjectQuery.d.ts"}

package/build/types/observable/internal/OptimisticJob.d.ts

@@ -1,11 +1,11 @@
 import type { OptimisticBuilder } from "../OptimisticBuilder.js";
-import type { ChangedObjects } from "./ChangedObjects.js";
+import { type Changes } from "./ChangedObjects.js";
 import { type OptimisticId } from "./OptimisticId.js";
 import type { Store } from "./Store.js";
 export declare class OptimisticJob {
 	#private;
 	context: OptimisticBuilder;
-	getResult: () => Promise<ChangedObjects>;
+	getResult: () => Promise<Changes>;
 	constructor(store: Store, optimisticId: OptimisticId);
 }
 export declare function runOptimisticJob(store: Store, optimisticUpdate: undefined | ((ctx: OptimisticBuilder) => void)): () => Promise<void>;

package/build/types/observable/internal/OptimisticJob.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAmBA,cAAc,yBAAyB,yBAA0B;AACjE,cAAc,sBAAsB,qBAAsB;AAC1D,cAAkC,oBAAoB,mBAAoB;AAC1E,cAAc,aAAa,YAAa;AAExC,OAAO,cAAM,cAAc;;CACzB,SAAS;CACT,iBAAiB,QAAQ;CAGzB,YAAYA,OAAO,OAAOC,cAAc;AAoEzC;AAED,OAAO,iBAAS,iBACdD,OAAO,OACPE,gCAAgCC,KAAK,oCAC9B","names":["store: Store","optimisticId: OptimisticId","optimisticUpdate: undefined | ((ctx: OptimisticBuilder) => void)","ctx: OptimisticBuilder"],"sources":["../../../../src/observable/internal/OptimisticJob.ts"],"version":3,"file":"OptimisticJob.d.ts"}
+{"mappings":"AAkBA,cAAc,yBAAyB,yBAA0B;AACjE,cAAc,eAAe,qBAAsB;AACnD,cAAkC,oBAAoB,mBAAoB;AAC1E,cAAc,aAAa,YAAa;AAExC,OAAO,cAAM,cAAc;;CACzB,SAAS;CACT,iBAAiB,QAAQ;CAGzB,YAAYA,OAAO,OAAOC,cAAc;AAmEzC;AAED,OAAO,iBAAS,iBACdD,OAAO,OACPE,gCAAgCC,KAAK,oCAC9B","names":["store: Store","optimisticId: OptimisticId","optimisticUpdate: undefined | ((ctx: OptimisticBuilder) => void)","ctx: OptimisticBuilder"],"sources":["../../../../src/observable/internal/OptimisticJob.ts"],"version":3,"file":"OptimisticJob.d.ts"}

package/build/types/observable/internal/Query.d.ts

@@ -1,12 +1,13 @@
-import type { Connectable, Observable, Observer, Subscribable } from "rxjs";
-import type { QueryOptions, Status, Unsubscribable } from "../ObservableClient.js";
+import type { Connectable, Observable, Observer, Subscribable, Subscription } from "rxjs";
+import type { Logger } from "../../Logger.js";
+import type { CommonObserveOptions, Status } from "../ObservableClient.js";
 import type { CacheKey } from "./CacheKey.js";
 import type { Entry } from "./Layer.js";
 import type { BatchContext, Store, SubjectPayload } from "./Store.js";
 export declare abstract class Query<
 	KEY extends CacheKey,
 	PAYLOAD,
-	O extends QueryOptions
+	O extends CommonObserveOptions
 > implements Subscribable<PAYLOAD> {
 	#private;
 	lastFetchStarted?: number;
@@ -16,9 +17,9 @@ export declare abstract class Query<
 	cacheKey: KEY;
 	store: Store;
 	abortController?: AbortController;
-	constructor(store: Store, observable: Observable<SubjectPayload<KEY>>, opts: O, cacheKey: KEY);
+	constructor(store: Store, observable: Observable<SubjectPayload<KEY>>, opts: O, cacheKey: KEY, logger?: Logger);
 	protected abstract _createConnectable(subject: Observable<SubjectPayload<KEY>>): Connectable<PAYLOAD>;
-	subscribe(observer: Partial<Observer<PAYLOAD>>): Unsubscribable;
+	subscribe(observer: Partial<Observer<PAYLOAD>>): Subscription;
 	revalidate(force?: boolean): Promise<unknown>;
 	_preFetch(): void;
 	abstract _fetch(): Promise<unknown>;

package/build/types/observable/internal/Query.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAgBA,cACE,aACA,YACA,UACA,oBAEK,MAAO;AACd,cACE,cACA,QACA,sBACK,wBAAyB;AAChC,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,aAAa,YAAa;AACxC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,OAAO,uBAAe;CACpB,YAAY;CACZ;CACA,UAAU;aACC,aAAa,SAAS;;CACjC;CACA,eAAe;CACf;CACA,SAAS;CACT,UAAU;CACV,OAAO;CACP,kBAAkB;CAKlB,YACEA,OAAO,OACPC,YAAY,WAAW,eAAe,OACtCC,MAAM,GACNC,UAAU;CAQZ,mBAAmB,mBACjBC,SAAS,WAAW,eAAe,QAClC,YAAY;CAEf,AAAO,UACLC,UAAU,QAAQ,SAAS,YAC1B;CAMH,WAAWC,kBAAkB;CAkC7B;CACA,SAAS,UAAU;CAEnB,UACEC,QAAQ,QACRC,OAAO;CAQT;CAQA;CAEA,SAAS,aACPC,MAAM,IAAI,cAAc,UACxBF,QAAQ,QACRC,OAAO,eACN,MAAM;AACV","names":["store: Store","observable: Observable<SubjectPayload<KEY>>","opts: O","cacheKey: KEY","subject: Observable<SubjectPayload<KEY>>","observer: Partial<Observer<PAYLOAD>>","force?: boolean","status: Status","batch: BatchContext","data: KEY[\"__cacheKey\"][\"value\"]"],"sources":["../../../../src/observable/internal/Query.ts"],"version":3,"file":"Query.d.ts"}
+{"mappings":"AAgBA,cACE,aACA,YACA,UACA,cACA,oBACK,MAAO;AAEd,cAAc,cAAc,iBAAkB;AAC9C,cAAc,sBAAsB,cAAc,wBAAyB;AAC3E,cAAc,gBAAgB,eAAgB;AAC9C,cAAc,aAAa,YAAa;AACxC,cAAc,cAAc,OAAO,sBAAsB,YAAa;AAEtE,OAAO,uBAAe;CACpB,YAAY;CACZ;CACA,UAAU;aACC,aAAa,SAAS;;CACjC;CACA,eAAe;CACf;CACA,SAAS;CACT,UAAU;CACV,OAAO;CACP,kBAAkB;CAQlB,YACEA,OAAO,OACPC,YAAY,WAAW,eAAe,OACtCC,MAAM,GACNC,UAAU,KACVC,SAAS;CAoBX,mBAAmB,mBACjBC,SAAS,WAAW,eAAe,QAClC,YAAY;CAEf,AAAO,UACLC,UAAU,QAAQ,SAAS,YAC1B;CAMH,WAAWC,kBAAkB;CAwD7B;CACA,SAAS,UAAU;CAEnB,UACEC,QAAQ,QACRC,OAAO;CAWT;CAQA;CAEA,SAAS,aACPC,MAAM,IAAI,cAAc,UACxBF,QAAQ,QACRC,OAAO,eACN,MAAM;AACV","names":["store: Store","observable: Observable<SubjectPayload<KEY>>","opts: O","cacheKey: KEY","logger?: Logger","subject: Observable<SubjectPayload<KEY>>","observer: Partial<Observer<PAYLOAD>>","force?: boolean","status: Status","batch: BatchContext","data: KEY[\"__cacheKey\"][\"value\"]"],"sources":["../../../../src/observable/internal/Query.ts"],"version":3,"file":"Query.d.ts"}

package/build/types/observable/internal/Store.d.ts

@@ -1,16 +1,17 @@
 import type { ActionDefinition, ObjectTypeDefinition, Osdk, PrimaryKeyType, WhereClause } from "@osdk/api";
 import { BehaviorSubject } from "rxjs";
 import type { ActionSignatureFromDef } from "../../actions/applyAction.js";
-import type { Client } from "../../Client.js";
+import { type Client } from "../../Client.js";
 import type { ListPayload } from "../ListPayload.js";
 import type { ObjectPayload } from "../ObjectPayload.js";
-import type { ObserveObjectOptions, Unsubscribable } from "../ObservableClient.js";
+import type { ObserveListOptions, ObserveObjectOptions, OrderBy, Unsubscribable } from "../ObservableClient.js";
 import type { OptimisticBuilder } from "../OptimisticBuilder.js";
 import type { SubFn } from "../types.js";
 import type { CacheKey } from "./CacheKey.js";
-import { type ChangedObjects } from "./ChangedObjects.js";
-import type { Entry } from "./Layer.js";
-import type { ListCacheKey, ListQueryOptions } from "./ListQuery.js";
+import type { Canonical } from "./Canonical.js";
+import { type Changes } from "./ChangedObjects.js";
+import { Entry } from "./Layer.js";
+import type { ListQueryOptions } from "./ListQuery.js";
 import { ListQuery } from "./ListQuery.js";
 import type { ObjectCacheKey } from "./ObjectQuery.js";
 import { ObjectQuery } from "./ObjectQuery.js";
@@ -20,17 +21,12 @@ export interface SubjectPayload<KEY extends CacheKey> extends Entry<KEY> {
 	isOptimistic: boolean;
 }
 export interface BatchContext {
-	addedObjects: Set<ObjectCacheKey>;
-	modifiedObjects: Set<ObjectCacheKey>;
-	modifiedLists: Set<ListCacheKey>;
+	changes: Changes;
 	createLayerIfNeeded: () => void;
 	optimisticWrite: boolean;
 	write: <K extends CacheKey<string, any, any>>(k: K, v: Entry<K>["value"], status: Entry<K>["status"]) => Entry<K>;
 	read: <K extends CacheKey<string, any, any>>(k: K) => Entry<K> | undefined;
 }
-interface ObserveOptions {
-	mode?: "offline" | "force";
-}
 interface UpdateOptions {
 	optimisticId?: OptimisticId;
 }
@@ -39,9 +35,14 @@ export declare namespace Store {
 		optimisticUpdate?: (ctx: OptimisticBuilder) => void;
 	}
 }
+export declare class OrderByCanonicalizer {
+	#private;
+	canonicalize: <T>(orderBy: Record<string, "asc" | "desc" | undefined>) => Canonical<Record<string, "asc" | "desc" | undefined>>;
+}
 export declare class Store {
 	#private;
 	whereCanonicalizer: WhereClauseCanonicalizer;
+	orderByCanonicalizer: OrderByCanonicalizer;
 	client: Client;
 	constructor(client: Client);
 	applyAction: <Q extends ActionDefinition<any>>(action: Q, args: Parameters<ActionSignatureFromDef<Q>["applyAction"]>[0], opts?: Store.ApplyActionOptions) => Promise<unknown>;
@@ -50,23 +51,50 @@ export declare class Store {
 	peekSubject: <KEY extends CacheKey<string, any, any>>(cacheKey: KEY) => BehaviorSubject<SubjectPayload<KEY>> | undefined;
 	getSubject: <KEY extends CacheKey<string, any, any>>(cacheKey: KEY) => BehaviorSubject<SubjectPayload<KEY>>;
 	observeObject<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>, options: ObserveObjectOptions<T>, subFn: SubFn<ObjectPayload>): Unsubscribable;
-	observeList<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, where: WhereClause<T>, options: ObserveOptions & ListQueryOptions, subFn: SubFn<ListPayload>): Unsubscribable;
-	getListQuery<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, where: WhereClause<T>, opts: ListQueryOptions, peek?: boolean): ListQuery;
+	observeList<T extends ObjectTypeDefinition>(options: ObserveListOptions<T>, subFn: SubFn<ListPayload>): Unsubscribable;
+	getListQuery<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, where: WhereClause<T>, orderBy: Record<string, "asc" | "desc" | undefined>, opts: ListQueryOptions): ListQuery;
 	getObjectQuery<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>): ObjectQuery;
 	getObject<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: string | number): Osdk.Instance<T> | undefined;
-	batch: <X>({ optimisticId }: {
+	batch: <X>({ optimisticId, changes }: {
 		optimisticId?: OptimisticId
+		changes?: Changes
 	}, batchFn: (batchContext: BatchContext) => X) => {
 		batchResult: BatchContext
 		retVal: X
 	};
 	invalidateObject<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, pk: PrimaryKeyType<T>): Promise<unknown>;
-	maybeRevalidateLists(changes: ChangedObjects): void;
-	maybeUpdateLists(changes: ChangedObjects, optimisticId: OptimisticId): void;
-	invalidateObjectType<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T): void;
-	invalidateList<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, where: WhereClause<T>): void;
+	maybeRevalidateLists(changes: Changes): Promise<void>;
+	maybeUpdateLists(changes: Changes, optimisticId: OptimisticId | undefined): Promise<(void | undefined)[]>;
+	/**
+	* @param apiName
+	* @param changes The changes we know about / to update
+	* @returns
+	*/
+	invalidateObjectType<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, changes: Changes | undefined): Promise<unknown[]>;
+	invalidateList<T extends ObjectTypeDefinition>({ objectType, where, orderBy }: {
+		objectType: T["apiName"] | T
+		where?: WhereClause<T>
+		orderBy?: OrderBy<T>
+	}): void;
 	updateObject(apiName: string | ObjectTypeDefinition, value: Osdk.Instance<ObjectTypeDefinition>, { optimisticId }?: UpdateOptions): Osdk.Instance<ObjectTypeDefinition>;
-	updateList<T extends ObjectTypeDefinition>(apiName: T["apiName"] | T, where: WhereClause<T>, values: Osdk.Instance<T>[], { optimisticId }?: UpdateOptions, opts?: ListQueryOptions): void;
+	updateObjects(values: Array<Osdk.Instance<ObjectTypeDefinition>>, batch: BatchContext): ObjectCacheKey[];
+	/**
+	* Updates the internal state of a list and will create a new internal query if needed.
+	*
+	* Helper method only for tests right now. May be removed later.
+	*
+	* @param apiName
+	* @param where
+	* @param orderBy
+	* @param objects
+	* @param param4
+	* @param opts
+	*/
+	updateList<T extends ObjectTypeDefinition>({ objectType: apiName, where, orderBy }: {
+		objectType: T["apiName"] | T
+		where: WhereClause<T>
+		orderBy: OrderBy<T>
+	}, objects: Osdk.Instance<T>[], { optimisticId }?: UpdateOptions, opts?: ListQueryOptions): void;
 	retain(cacheKey: CacheKey<string, any, any>): void;
 	release(cacheKey: CacheKey<string, any, any>): void;
 }

package/build/types/observable/internal/Store.d.ts.map

@@ -1 +1 @@
-{"mappings":"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","names":["k: K","v: Entry<K>[\"value\"]","status: Entry<K>[\"status\"]","ctx: OptimisticBuilder","client: Client","action: Q","args: Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]","opts?: Store.ApplyActionOptions","layerId: OptimisticId","type: K[\"type\"]","cacheKey: KEY","apiName: T[\"apiName\"] | T","pk: PrimaryKeyType<T>","options: ObserveObjectOptions<T>","subFn: SubFn<ObjectPayload>","where: WhereClause<T>","options: ObserveOptions & ListQueryOptions","subFn: SubFn<ListPayload>","opts: ListQueryOptions","pk: string | number","batchFn: (batchContext: BatchContext) => X","batchContext: BatchContext","changes: ChangedObjects","optimisticId: OptimisticId","apiName: string | ObjectTypeDefinition","value: Osdk.Instance<ObjectTypeDefinition>","values: Osdk.Instance<T>[]","cacheKey: CacheKey<string, any, any>"],"sources":["../../../../src/observable/internal/Store.ts"],"version":3,"file":"Store.d.ts"}
+{"mappings":"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","names":["k: K","v: Entry<K>[\"value\"]","status: Entry<K>[\"status\"]","ctx: OptimisticBuilder","orderBy: Record<string, \"asc\" | \"desc\" | undefined>","client: Client","action: Q","args: Parameters<ActionSignatureFromDef<Q>[\"applyAction\"]>[0]","opts?: Store.ApplyActionOptions","layerId: OptimisticId","type: K[\"type\"]","cacheKey: KEY","apiName: T[\"apiName\"] | T","pk: PrimaryKeyType<T>","options: ObserveObjectOptions<T>","subFn: SubFn<ObjectPayload>","options: ObserveListOptions<T>","subFn: SubFn<ListPayload>","where: WhereClause<T>","opts: ListQueryOptions","pk: string | number","batchFn: (batchContext: BatchContext) => X","batchContext: BatchContext","changes: Changes","optimisticId: OptimisticId | undefined","changes: Changes | undefined","apiName: string | ObjectTypeDefinition","value: Osdk.Instance<ObjectTypeDefinition>","values: Array<Osdk.Instance<ObjectTypeDefinition>>","batch: BatchContext","objects: Osdk.Instance<T>[]","cacheKey: CacheKey<string, any, any>"],"sources":["../../../../src/observable/internal/Store.ts"],"version":3,"file":"Store.d.ts"}

package/build/types/observable/internal/testUtils.d.ts

@@ -1,7 +1,8 @@
-import type { ActionEditResponse, ObjectTypeDefinition, Osdk } from "@osdk/api";
+import type { ActionEditResponse, ObjectOrInterfaceDefinition, ObjectTypeDefinition, Osdk, PageResult, WhereClause } from "@osdk/api";
 import type { DeferredPromise } from "p-defer";
 import type { Mock } from "vitest";
 import type { Client } from "../../Client.js";
+import type { Logger } from "../../Logger.js";
 import type { ListPayload } from "../ListPayload.js";
 import type { ObjectPayload } from "../ObjectPayload.js";
 import type { Status, Unsubscribable } from "../ObservableClient.js";
@@ -9,11 +10,20 @@ import type { Entry } from "./Layer.js";
 export interface MockClientHelper {
 	client: Mock<Client> & Client;
 	mockApplyActionOnce: () => DeferredPromise<Partial<ActionEditResponse>>;
-	mockFetchOneOnce: <Q extends ObjectTypeDefinition>() => DeferredPromise<Partial<Osdk.Instance<Q>>>;
+	mockFetchOneOnce: <Q extends ObjectTypeDefinition>(expectedId?: string | number | boolean) => DeferredPromise<Partial<Osdk.Instance<Q>>>;
+	mockObjectFactory2Once: () => DeferredPromise<Osdk.Instance<ObjectOrInterfaceDefinition, never, any, {}>[]>;
+	mockFetchPageOnce: <Q extends ObjectTypeDefinition>(expected?: {
+		where: WhereClause<any>
+		orderBy: Record<string, "asc" | "desc" | undefined>
+	}) => DeferredPromise<PageResult<Partial<Osdk.Instance<Q>>>>;
 }
+export declare function createTestLogger(bindings: Record<string, any>, options?: {
+	level?: string
+	msgPrefix?: string
+}): Logger;
 export declare function createClientMockHelper(): MockClientHelper;
 export declare function createDefer(): (x: Unsubscribable) => Unsubscribable;
-export declare function expectSingleListCallAndClear<T extends ObjectTypeDefinition>(subFn: Mock<(e: ListPayload | undefined) => void>, resolvedList: Osdk.Instance<T>[]): void;
+export declare function expectSingleListCallAndClear<T extends ObjectTypeDefinition>(subFn: Mock<(e: ListPayload | undefined) => void>, resolvedList: Osdk.Instance<T>[], payloadOptions?: Omit<Partial<ListPayload>, "resolvedList">): void;
 export declare function expectSingleObjectCallAndClear<T extends ObjectTypeDefinition>(subFn: Mock<(e: ObjectPayload | undefined) => void>, object: Osdk.Instance<T>, status?: Status): void;
 export declare function waitForCall(subFn: Mock<(e: any) => void>, times?: number): Promise<void>;
 export declare function mockSingleSubCallback(): Mock<(e: ObjectPayload | undefined) => void> & {