@pnp/sp 3.25.0 → 3.26.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,7 +1,7 @@
1
1
  export function Telemetry() {
2
2
  return (instance) => {
3
3
  instance.on.pre(async function (url, init, result) {
4
- let clientTag = "PnPCoreJS:3.25.0:";
4
+ let clientTag = "PnPCoreJS:3.26.0:";
5
5
  // make our best guess based on url to the method called
6
6
  const { pathname } = new URL(url);
7
7
  // remove anything before the _api as that is potentially PII and we don't care, just want to get the called path to the REST API
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnp/sp",
3
- "version": "3.25.0",
3
+ "version": "3.26.0",
4
4
  "description": "pnp - provides a fluent api for working with SharePoint REST",
5
5
  "main": "./index.js",
6
6
  "typings": "./index",
@@ -9,8 +9,8 @@
9
9
  },
10
10
  "dependencies": {
11
11
  "tslib": "2.4.1",
12
- "@pnp/core": "3.25.0",
13
- "@pnp/queryable": "3.25.0"
12
+ "@pnp/core": "3.26.0",
13
+ "@pnp/queryable": "3.26.0"
14
14
  },
15
15
  "funding": {
16
16
  "type": "individual",
@@ -1 +1 @@
1
- {"version":3,"file":"spqueryable.d.ts","sourceRoot":"","sources":["../../../packages/sp/spqueryable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAGzE,oBAAY,MAAM,GAAG,MAAM,GAAG,YAAY,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAEpE,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IACjE,KAAI,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;CACvC;AAED,oBAAY,mBAAmB,CAAC,CAAC,SAAS,YAAY,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,UAAU,CAAC;AAE1G,eAAO,MAAM,kBAAkB,mCAA+B,GAAG,2BAEhE,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAY,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAC;IAE/D,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IA6CvC;;OAEG;IACI,YAAY,IAAI,MAAM;IAyB7B;;;;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,YAAY,EACtC,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,EACjC,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,GAAE,MAAuB,GAAG,CAAC;CAWxC;AACD,MAAM,WAAW,YAAY,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;CAAI;AAC9E,eAAO,MAAM,WAAW,wCAAiD,CAAC;AAE1E;;;GAGG;AACH,qBAAa,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;IAErE;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKnC;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,UAAO,GAAG,IAAI;IAQvD;;;;OAIG;IACI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK/B;;;;OAIG;IACI,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAIhC;AACD,MAAM,WAAW,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;CAAI;AAClF,eAAO,MAAM,YAAY,2CAAmD,CAAC;AAE7E;;;GAGG;AACH,qBAAa,WAAW,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;CAAI;AACzE,MAAM,WAAW,WAAW,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,WAAW,CAAC,OAAO,CAAC;CAAI;AAC5E,eAAO,MAAM,UAAU,uCAA+C,CAAC;AAEvE;;GAEG;AACH,wBAAgB,UAAU,WAEC,YAAY,KAAG,QAAQ,IAAI,CAAC,CAGtD;AAED,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,wBAAgB,kBAAkB,WAEP,YAAY,oBAAe,QAAQ,IAAI,CAAC,CAGlE;AAED,MAAM,WAAW,mBAAmB;IAChC;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC"}
1
+ {"version":3,"file":"spqueryable.d.ts","sourceRoot":"","sources":["../../../packages/sp/spqueryable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAGzE,oBAAY,MAAM,GAAG,MAAM,GAAG,YAAY,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAEpE,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IACjE,KAAI,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;CACvC;AAED,oBAAY,mBAAmB,CAAC,CAAC,SAAS,YAAY,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,UAAU,CAAC;AAE1G,eAAO,MAAM,kBAAkB,mCAA+B,GAAG,2BAEhE,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAY,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAC;IAE/D,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAE5B;;;;;;OAMG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IA6CvC;;OAEG;IACI,YAAY,IAAI,MAAM;IAmB7B;;;;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,YAAY,EACtC,OAAO,EAAE,mBAAmB,CAAC,GAAG,CAAC,EACjC,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,GAAE,MAAuB,GAAG,CAAC;CAWxC;AACD,MAAM,WAAW,YAAY,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;CAAI;AAC9E,eAAO,MAAM,WAAW,wCAAiD,CAAC;AAE1E;;;GAGG;AACH,qBAAa,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;IAErE;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKnC;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,UAAO,GAAG,IAAI;IAQvD;;;;OAIG;IACI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK/B;;;;OAIG;IACI,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAIhC;AACD,MAAM,WAAW,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;CAAI;AAClF,eAAO,MAAM,YAAY,2CAAmD,CAAC;AAE7E;;;GAGG;AACH,qBAAa,WAAW,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,YAAY,CAAC,OAAO,CAAC;CAAI;AACzE,MAAM,WAAW,WAAW,CAAC,OAAO,GAAG,GAAG,CAAE,SAAQ,WAAW,CAAC,OAAO,CAAC;CAAI;AAC5E,eAAO,MAAM,UAAU,uCAA+C,CAAC;AAEvE;;GAEG;AACH,wBAAgB,UAAU,WAEC,YAAY,KAAG,QAAQ,IAAI,CAAC,CAGtD;AAED,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,wBAAgB,kBAAkB,WAEP,YAAY,oBAAe,QAAQ,IAAI,CAAC,CAGlE;AAED,MAAM,WAAW,mBAAmB;IAChC;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC"}
package/spqueryable.js CHANGED
@@ -58,17 +58,11 @@ export class _SPQueryable extends Queryable {
58
58
  */
59
59
  toRequestUrl() {
60
60
  const aliasedParams = new URLSearchParams(this.query);
61
- // this regex is designed to locate aliased parameters within url paths. These may have the form:
62
- // /something(!@p1::value)
63
- // /something(!@p1::value, param=value)
64
- // /something(param=value,!@p1::value)
65
- // /something(param=value,!@p1::value,param=value)
66
- // /something(param=!@p1::value)
67
- // there could be spaces or not around the boundaries
68
- let url = this.toUrl().replace(/([( *| *, *| *= *])'!(@.*?)::(.*?)'([ *)| *, *])/ig, (match, frontBoundary, labelName, value, endBoundary) => {
61
+ // this regex is designed to locate aliased parameters within url paths
62
+ let url = this.toUrl().replace(/'!(@.+?)::((?:[^']|'')+)'/ig, (match, labelName, value) => {
69
63
  this.log(`Rewriting aliased parameter from match ${match} to label: ${labelName} value: ${value}`, 0);
70
64
  aliasedParams.set(labelName, `'${value}'`);
71
- return `${frontBoundary}${labelName}${endBoundary}`;
65
+ return labelName;
72
66
  });
73
67
  const query = aliasedParams.toString();
74
68
  if (!stringIsNullOrEmpty(query)) {
@@ -1 +1 @@
1
- {"version":3,"file":"spqueryable.js","sourceRoot":"","sources":["../../../packages/sp/spqueryable.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"spqueryable.js","sourceRoot":"","sources":["../../../packages/sp/spqueryable.ts"],"names":[],"mappings":"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"}