@pnp/graph 3.6.0 → 3.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  import { TimelinePipe } from "@pnp/core";
2
2
  import { IGraphQueryableCollection } from "../graphqueryable.js";
3
3
  export interface IPagedResult {
4
+ count: number;
4
5
  value: any[] | null;
5
6
  hasNext: boolean;
6
7
  next(): Promise<IPagedResult>;
@@ -1 +1 @@
1
- {"version":3,"file":"paged.d.ts","sourceRoot":"","sources":["../../../../packages/graph/behaviors/paged.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,YAAY,EAAE,MAAM,WAAW,CAAC;AAEpF,OAAO,EAA6C,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAE5G,MAAM,WAAW,YAAY;IACzB,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;CACjC;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,yBAAyB,GAAG,yBAAyB,CAcjF;AAED;;;;GAIG;AACH,wBAAgB,KAAK,IAAI,YAAY,CAwBpC"}
1
+ {"version":3,"file":"paged.d.ts","sourceRoot":"","sources":["../../../../packages/graph/behaviors/paged.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6C,YAAY,EAAE,MAAM,WAAW,CAAC;AAEpF,OAAO,EAA6C,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAG5G,MAAM,WAAW,YAAY;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;CACjC;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,yBAAyB,GAAG,yBAAyB,CAmBjF;AAED;;;;GAIG;AACH,wBAAgB,KAAK,IAAI,YAAY,CA0BpC"}
@@ -1,6 +1,7 @@
1
1
  import { objectDefinedNotNull, stringIsNullOrEmpty } from "@pnp/core";
2
2
  import { errorCheck, parseODataJSON } from "@pnp/queryable";
3
3
  import { GraphQueryableCollection } from "../graphqueryable.js";
4
+ import { ConsistencyLevel } from "./consistency-level.js";
4
5
  /**
5
6
  * Configures a collection query to returned paged results
6
7
  *
@@ -8,8 +9,13 @@ import { GraphQueryableCollection } from "../graphqueryable.js";
8
9
  * @returns A duplicate collection which will return paged results
9
10
  */
10
11
  export function AsPaged(col) {
11
- const q = GraphQueryableCollection(col).using(Paged());
12
- const queryParams = ["$top", "$select", "$expand", "$filter", "$orderby"];
12
+ const q = GraphQueryableCollection(col).using(Paged(), ConsistencyLevel());
13
+ // we might be constructing our query with a next url that will already contain $count so we need
14
+ // to ensure we don't add it again, likewise if it is already in our query collection we don't add it again
15
+ if (!q.query.has("$count") && !/\$count=true/i.test(q.toUrl())) {
16
+ q.query.set("$count", "true");
17
+ }
18
+ const queryParams = ["$search", "$count", "$top", "$select", "$expand", "$filter", "$orderby"];
13
19
  for (let i = 0; i < queryParams.length; i++) {
14
20
  const param = col.query.get(queryParams[i]);
15
21
  if (objectDefinedNotNull(param)) {
@@ -30,8 +36,10 @@ export function Paged() {
30
36
  const txt = await response.text();
31
37
  const json = txt.replace(/\s/ig, "").length > 0 ? JSON.parse(txt) : {};
32
38
  const nextLink = json["@odata.nextLink"];
39
+ const count = parseInt(json["@odata.count"], 10);
33
40
  const hasNext = !stringIsNullOrEmpty(nextLink);
34
41
  result = {
42
+ count,
35
43
  hasNext,
36
44
  next: () => (hasNext ? AsPaged(GraphQueryableCollection([instance, nextLink]))() : null),
37
45
  value: parseODataJSON(json),
@@ -1 +1 @@
1
- {"version":3,"file":"paged.js","sourceRoot":"","sources":["../../../../packages/graph/behaviors/paged.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAgB,MAAM,WAAW,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAA8C,MAAM,sBAAsB,CAAC;AAQ5G;;;;;GAKG;AACH,MAAM,UAAU,OAAO,CAAC,GAA8B;IAElD,MAAM,CAAC,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAE1E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SACtC;KACJ;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,KAAK;IAEjB,OAAO,CAAC,QAAyB,EAAE,EAAE;QAEjC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAQ,EAAE,QAAkB,EAAE,MAAW,EAAiC,EAAE;YAEjG,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAEzC,MAAM,OAAO,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAE/C,MAAM,GAAG;gBACL,OAAO;gBACP,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBACxF,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC;aAC9B,CAAC;YAEF,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"paged.js","sourceRoot":"","sources":["../../../../packages/graph/behaviors/paged.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAgB,MAAM,WAAW,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAA8C,MAAM,sBAAsB,CAAC;AAC5G,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAS1D;;;;;GAKG;AACH,MAAM,UAAU,OAAO,CAAC,GAA8B;IAElD,MAAM,CAAC,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC3E,iGAAiG;IACjG,2GAA2G;IAC3G,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE;QAC5D,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;KACjC;IAED,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAE/F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SACtC;KACJ;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,KAAK;IAEjB,OAAO,CAAC,QAAyB,EAAE,EAAE;QAEjC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAQ,EAAE,QAAkB,EAAE,MAAW,EAAiC,EAAE;YAEjG,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YAEjD,MAAM,OAAO,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAE/C,MAAM,GAAG;gBACL,KAAK;gBACL,OAAO;gBACP,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBACxF,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC;aAC9B,CAAC;YAEF,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;AACN,CAAC"}
@@ -1,7 +1,7 @@
1
1
  export function Telemetry() {
2
2
  return (instance) => {
3
3
  instance.on.pre(async function (url, init, result) {
4
- init.headers = { ...init.headers, SdkVersion: "PnPCoreJS/3.6.0" };
4
+ init.headers = { ...init.headers, SdkVersion: "PnPCoreJS/3.7.0" };
5
5
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/dot-notation
6
6
  this.log(`Request Tag: ${init.headers["SdkVersion"]}`, 0);
7
7
  return [url, init, result];
@@ -1 +1 @@
1
- {"version":3,"file":"graphqueryable.d.ts","sourceRoot":"","sources":["../../../packages/graph/graphqueryable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAa,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAEpF,OAAO,EAAW,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7D,oBAAY,SAAS,GAAG,MAAM,GAAG,eAAe,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAE7E,MAAM,WAAW,0BAA0B,CAAC,CAAC;IACzC,KAAI,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;CAC1C;AAED,oBAAY,sBAAsB,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,UAAU,CAAC;AAEnH,eAAO,MAAM,qBAAqB,sCAAkC,GAAG,8BAEtE,CAAC;AAEF;;;GAGG;AACH,qBAAa,eAAe,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAC;IAElE,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;gBACS,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM;IAkB1C;;;;OAIG;IACI,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAOzC;;;;OAIG;IACI,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAOzC;;;;OAIG;IACH,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,eAAe,EACzC,OAAO,EAAE,0BAA0B,CAAC,CAAC,CAAC,EACtC,IAAI,GAAE,SAA0B,EAChC,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC;CAIxB;AAED,MAAM,WAAW,eAAe,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAI;AACpF,eAAO,MAAM,cAAc,8CAA0D,CAAC;AAEtF;;;GAGG;AACH,qBAAa,yBAAyB,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAEpF;;;OAGG;IACI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKnC;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,UAAO,GAAG,IAAI;IAQvD;;;;OAIG;IACI,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK7B;;;;OAIG;IACI,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK9B;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAMlC;;OAEG;IACI,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKrC;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAOrC;;;;OAIG;IACI,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAGxC;AACD,MAAM,WAAW,yBAAyB,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,yBAAyB,CAAC,OAAO,CAAC;CAAI;AAC1G,eAAO,MAAM,wBAAwB,0DAA8E,CAAC;AAEpH;;;GAGG;AACH,qBAAa,uBAAuB,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAI;AAExF,MAAM,WAAW,uBAAuB,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC;CAAI;AACxG,eAAO,MAAM,sBAAsB,sDAA0E,CAAC"}
1
+ {"version":3,"file":"graphqueryable.d.ts","sourceRoot":"","sources":["../../../packages/graph/graphqueryable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAEzE,OAAO,EAAW,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7D,oBAAY,SAAS,GAAG,MAAM,GAAG,eAAe,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAE7E,MAAM,WAAW,0BAA0B,CAAC,CAAC;IACzC,KAAI,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;CAC1C;AAED,oBAAY,sBAAsB,CAAC,CAAC,SAAS,eAAe,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,UAAU,CAAC;AAEnH,eAAO,MAAM,qBAAqB,sCAAkC,GAAG,8BAEtE,CAAC;AAEF;;;GAGG;AACH,qBAAa,eAAe,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAC;IAElE,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;gBACS,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM;IAkB1C;;;;OAIG;IACI,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAOzC;;;;OAIG;IACI,MAAM,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAOzC;;;;OAIG;IACH,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,eAAe,EACzC,OAAO,EAAE,0BAA0B,CAAC,CAAC,CAAC,EACtC,IAAI,GAAE,SAA0B,EAChC,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC;CAIxB;AAED,MAAM,WAAW,eAAe,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAI;AACpF,eAAO,MAAM,cAAc,8CAA0D,CAAC;AAEtF;;;GAGG;AACH,qBAAa,yBAAyB,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;IAEpF;;;OAGG;IACI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKnC;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,UAAO,GAAG,IAAI;IAQvD;;;;OAIG;IACI,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK7B;;;;OAIG;IACI,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK9B;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAMlC;;OAEG;IACI,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKrC;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC;;;;OAIG;IACI,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;CAGxC;AACD,MAAM,WAAW,yBAAyB,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,yBAAyB,CAAC,OAAO,CAAC;CAAI;AAC1G,eAAO,MAAM,wBAAwB,0DAA8E,CAAC;AAEpH;;;GAGG;AACH,qBAAa,uBAAuB,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAI;AAExF,MAAM,WAAW,uBAAuB,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC;CAAI;AACxG,eAAO,MAAM,sBAAsB,sDAA0E,CAAC"}
package/graphqueryable.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { isArray } from "@pnp/core";
2
- import { JSONParse, Queryable, queryableFactory } from "@pnp/queryable";
2
+ import { Queryable, queryableFactory } from "@pnp/queryable";
3
3
  import { ConsistencyLevel } from "./behaviors/consistency-level.js";
4
4
  import { AsPaged } from "./behaviors/paged.js";
5
5
  export const graphInvokableFactory = (f) => {
@@ -127,10 +127,9 @@ export class _GraphQueryableCollection extends _GraphQueryable {
127
127
  * Retrieves the total count of matching resources
128
128
  */
129
129
  async count() {
130
- const q = GraphQueryableCollection(this).using(ConsistencyLevel(), JSONParse());
131
- q.query.set("$count", "true");
130
+ const q = AsPaged(this);
132
131
  const r = await q.top(1)();
133
- return parseFloat(r["@odata.count"]);
132
+ return r.count;
134
133
  }
135
134
  /**
136
135
  * Allows reading through a collection as pages of information whose size is determined by top or the api method's default
@@ -1 +1 @@
1
- {"version":3,"file":"graphqueryable.js","sourceRoot":"","sources":["../../../packages/graph/graphqueryable.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"graphqueryable.js","sourceRoot":"","sources":["../../../packages/graph/graphqueryable.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnp/graph",
3
- "version": "3.6.0",
3
+ "version": "3.7.0",
4
4
  "description": "pnp - provides a fluent interface to query the Microsoft Graph",
5
5
  "main": "./index.js",
6
6
  "typings": "./index",
@@ -10,8 +10,8 @@
10
10
  "dependencies": {
11
11
  "@microsoft/microsoft-graph-types": "2.23.0",
12
12
  "tslib": "2.4.0",
13
- "@pnp/core": "3.6.0",
14
- "@pnp/queryable": "3.6.0"
13
+ "@pnp/core": "3.7.0",
14
+ "@pnp/queryable": "3.7.0"
15
15
  },
16
16
  "funding": {
17
17
  "type": "individual",