@pnp/sp 3.5.1 → 3.6.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.
Files changed (70) hide show
  1. package/appcatalog/types.d.ts.map +1 -1
  2. package/appcatalog/types.js +1 -2
  3. package/appcatalog/types.js.map +1 -1
  4. package/batching.d.ts.map +1 -1
  5. package/batching.js +15 -6
  6. package/batching.js.map +1 -1
  7. package/behaviors/telemetry.js +1 -1
  8. package/clientside-pages/types.js +4 -4
  9. package/clientside-pages/types.js.map +1 -1
  10. package/column-defaults/list.js +3 -3
  11. package/column-defaults/list.js.map +1 -1
  12. package/content-types/types.d.ts +14 -1
  13. package/content-types/types.d.ts.map +1 -1
  14. package/content-types/types.js +11 -2
  15. package/content-types/types.js.map +1 -1
  16. package/files/types.d.ts.map +1 -1
  17. package/files/types.js +17 -17
  18. package/files/types.js.map +1 -1
  19. package/files/web.d.ts.map +1 -1
  20. package/files/web.js +2 -2
  21. package/files/web.js.map +1 -1
  22. package/folders/types.d.ts.map +1 -1
  23. package/folders/types.js +4 -4
  24. package/folders/types.js.map +1 -1
  25. package/index.d.ts +1 -0
  26. package/index.d.ts.map +1 -1
  27. package/index.js +1 -0
  28. package/index.js.map +1 -1
  29. package/items/types.js +6 -6
  30. package/items/types.js.map +1 -1
  31. package/lists/types.d.ts.map +1 -1
  32. package/lists/types.js +2 -2
  33. package/lists/types.js.map +1 -1
  34. package/lists/web.js +2 -2
  35. package/lists/web.js.map +1 -1
  36. package/package.json +3 -3
  37. package/profiles/types.js +9 -9
  38. package/profiles/types.js.map +1 -1
  39. package/security/funcs.js +1 -1
  40. package/security/funcs.js.map +1 -1
  41. package/sharing/funcs.js +5 -5
  42. package/sharing/funcs.js.map +1 -1
  43. package/site-groups/web.d.ts.map +1 -1
  44. package/site-groups/web.js +3 -4
  45. package/site-groups/web.js.map +1 -1
  46. package/site-scripts/types.js +2 -2
  47. package/site-scripts/types.js.map +1 -1
  48. package/site-users/types.js +2 -2
  49. package/site-users/types.js.map +1 -1
  50. package/sites/types.d.ts.map +1 -1
  51. package/sites/types.js +2 -3
  52. package/sites/types.js.map +1 -1
  53. package/social/types.js +3 -3
  54. package/social/types.js.map +1 -1
  55. package/spqueryable.d.ts.map +1 -1
  56. package/spqueryable.js +19 -13
  57. package/spqueryable.js.map +1 -1
  58. package/taxonomy/types.js +2 -2
  59. package/taxonomy/types.js.map +1 -1
  60. package/utils/encode-path-str.d.ts +8 -0
  61. package/utils/encode-path-str.d.ts.map +1 -0
  62. package/utils/encode-path-str.js +25 -0
  63. package/utils/encode-path-str.js.map +1 -0
  64. package/utils/escape-query-str.d.ts.map +1 -1
  65. package/utils/escape-query-str.js +3 -4
  66. package/utils/escape-query-str.js.map +1 -1
  67. package/views/types.d.ts +6 -0
  68. package/views/types.d.ts.map +1 -1
  69. package/webs/types.js +5 -5
  70. package/webs/types.js.map +1 -1
@@ -0,0 +1,25 @@
1
+ import { stringIsNullOrEmpty } from "@pnp/core";
2
+ /**
3
+ * Encodes path portions of SharePoint urls such as decodedUrl=`encodePath(pathStr)`
4
+ *
5
+ * @param value The string path to encode
6
+ * @returns A path encoded for use in SP urls
7
+ */
8
+ export function encodePath(value) {
9
+ if (stringIsNullOrEmpty(value)) {
10
+ return "";
11
+ }
12
+ // replace all instance of ' with ''
13
+ if (/!(@.*?)::(.*?)/ig.test(value)) {
14
+ return value.replace(/!(@.*?)::(.*)$/ig, (match, labelName, v) => {
15
+ // we do not need to encodeURIComponent v as it will be encoded automatically when it is added as a query string param
16
+ // we do need to double any ' chars
17
+ return `!${labelName}::${v.replace(/'/ig, "''")}`;
18
+ });
19
+ }
20
+ else {
21
+ // because this is a literal path value we encodeURIComponent after doubling any ' chars
22
+ return encodeURIComponent(value.replace(/'/ig, "''"));
23
+ }
24
+ }
25
+ //# sourceMappingURL=encode-path-str.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"encode-path-str.js","sourceRoot":"","sources":["../../../../packages/sp/utils/encode-path-str.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,KAAa;IAEpC,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE;QAC5B,OAAO,EAAE,CAAC;KACb;IAED,oCAAoC;IACpC,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAEhC,OAAO,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;YAC7D,sHAAsH;YACtH,mCAAmC;YACnC,OAAO,IAAI,SAAS,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;QACtD,CAAC,CAAC,CAAC;KAEN;SAAM;QAEH,wFAAwF;QACxF,OAAO,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;KACzD;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"escape-query-str.d.ts","sourceRoot":"","sources":["../../../../packages/sp/utils/escape-query-str.ts"],"names":[],"mappings":"AAEA,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBzD"}
1
+ {"version":3,"file":"escape-query-str.d.ts","sourceRoot":"","sources":["../../../../packages/sp/utils/escape-query-str.ts"],"names":[],"mappings":"AAGA,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAgBzD"}
@@ -1,18 +1,17 @@
1
1
  import { stringIsNullOrEmpty } from "@pnp/core";
2
+ // deprecated, will be removed in future versions, no longer used internally
2
3
  export function escapeQueryStrValue(value) {
3
4
  if (stringIsNullOrEmpty(value)) {
4
5
  return "";
5
6
  }
6
7
  // replace all instance of ' with ''
7
8
  if (/!(@.*?)::(.*?)/ig.test(value)) {
8
- // to ensure our param aliasing still works we need to treat these special or we'll hear about it
9
- // so we encode JUST the part that will end up in the url
10
9
  return value.replace(/!(@.*?)::(.*)$/ig, (match, labelName, v) => {
11
- return `!${labelName}::${encodeURIComponent(v.replace(/'/ig, "''"))}`;
10
+ return `!${labelName}::${v.replace(/'/ig, "''")}`;
12
11
  });
13
12
  }
14
13
  else {
15
- return encodeURIComponent(value.replace(/'/ig, "''"));
14
+ return value.replace(/'/ig, "''");
16
15
  }
17
16
  }
18
17
  //# sourceMappingURL=escape-query-str.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"escape-query-str.js","sourceRoot":"","sources":["../../../../packages/sp/utils/escape-query-str.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAE7C,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE;QAC5B,OAAO,EAAE,CAAC;KACb;IAED,oCAAoC;IAEpC,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAChC,iGAAiG;QACjG,yDAAyD;QACzD,OAAO,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;YAC7D,OAAO,IAAI,SAAS,KAAK,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QAC1E,CAAC,CAAC,CAAC;KACN;SAAM;QACH,OAAO,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;KACzD;AACL,CAAC"}
1
+ {"version":3,"file":"escape-query-str.js","sourceRoot":"","sources":["../../../../packages/sp/utils/escape-query-str.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,4EAA4E;AAC5E,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAE7C,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE;QAC5B,OAAO,EAAE,CAAC;KACb;IAED,oCAAoC;IACpC,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAEhC,OAAO,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;YAC7D,OAAO,IAAI,SAAS,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;QACtD,CAAC,CAAC,CAAC;KAEN;SAAM;QACH,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACrC;AACL,CAAC"}
package/views/types.d.ts CHANGED
@@ -98,6 +98,11 @@ export declare enum ViewScope {
98
98
  FilesOnly = 3
99
99
  }
100
100
  export interface IViewInfo {
101
+ AssociatedContentTypeId: string | null;
102
+ CalendarViewStyles: string | null;
103
+ CustomFormatter: string | null;
104
+ DefaultView: boolean;
105
+ DefaultViewForContentType: boolean;
101
106
  EditorModified: boolean;
102
107
  Formats: string | null;
103
108
  Hidden: boolean;
@@ -136,6 +141,7 @@ export interface IViewInfo {
136
141
  } | null;
137
142
  ViewQuery: string;
138
143
  ViewType: string;
144
+ ViewType2: "KANBAN" | "TILES" | "COMPACTLIST" | "MODERNCALENDAR" | null;
139
145
  VisualizationInfo: any | null;
140
146
  }
141
147
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/sp/views/types.ts"],"names":[],"mappings":"AACA,OAAO,EACH,aAAa,EAEb,WAAW,EAEX,WAAW,EACd,MAAM,mBAAmB,CAAC;AAI3B,qBACa,MAAO,SAAQ,aAAa,CAAC,SAAS,EAAE,CAAC;IAElD;;;;;;OAMG;IACU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,UAAQ,EAAE,kBAAkB,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAc5H;;;;OAIG;IACI,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK;IAIjC;;;;OAIG;IACI,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK;CAG1C;AACD,MAAM,WAAW,MAAO,SAAQ,MAAM;CAAI;AAC1C,eAAO,MAAM,KAAK,yDAAqC,CAAC;AAExD,qBAAa,KAAM,SAAQ,WAAW,CAAC,SAAS,CAAC;IAEtC,MAAM,yEAAgB;IAE7B,IAAW,MAAM,IAAI,WAAW,CAE/B;IAED;;;;OAIG;IACU,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAY1E;;;OAGG;IACI,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;;OAIG;IACI,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGpD;AACD,MAAM,WAAW,KAAM,SAAQ,KAAK,EAAE,WAAW;CAAI;AACrD,eAAO,MAAM,IAAI,wDAAmC,CAAC;AAErD,qBACa,WAAY,SAAQ,aAAa,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;IAElF;;OAEG;IACI,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;;OAIG;IACI,GAAG,CAAC,wBAAwB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D;;;;;OAKG;IACI,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD;;OAEG;IACI,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC;;;;OAIG;IACI,MAAM,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG1D;AACD,MAAM,WAAW,WAAY,SAAQ,WAAW;CAAI;AACpD,eAAO,MAAM,UAAU,8DAA+C,CAAC;AAEvE,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,SAAS,CAAC;CACnB;AAED,oBAAY,SAAS;IACjB,YAAY,IAAA;IACZ,SAAS,IAAA;IACT,YAAY,IAAA;IACZ,SAAS,IAAA;CACZ;AAED,MAAM,WAAW,SAAS;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,yBAAyB,EAAE,OAAO,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,CAAC;IACjB,kBAAkB,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,mBAAmB,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,GAAG,GAAG,IAAI,CAAC;CACjC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/sp/views/types.ts"],"names":[],"mappings":"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"}
package/webs/types.js CHANGED
@@ -4,9 +4,9 @@ import { _SPCollection, spInvokableFactory, _SPInstance, SPCollection, SPInstanc
4
4
  import { defaultPath } from "../decorators.js";
5
5
  import { odataUrlFrom } from "../utils/odata-url-from.js";
6
6
  import { spPost, spPostMerge } from "../operations.js";
7
- import { escapeQueryStrValue } from "../utils/escape-query-str.js";
8
7
  import { extractWebUrl } from "../index.js";
9
8
  import { combine, isArray } from "@pnp/core";
9
+ import { encodePath } from "../utils/encode-path-str.js";
10
10
  let _Webs = class _Webs extends _SPCollection {
11
11
  /**
12
12
  * Adds a new web to the collection
@@ -146,7 +146,7 @@ let _Web = class _Web extends _SPInstance {
146
146
  * @param template Name of the site definition or the name of the site template
147
147
  */
148
148
  applyWebTemplate(template) {
149
- return spPost(Web(this, `applywebtemplate(webTemplate='${escapeQueryStrValue(template)}')`));
149
+ return spPost(Web(this, `applywebtemplate(webTemplate='${encodePath(template)}')`));
150
150
  }
151
151
  /**
152
152
  * Returns the collection of changes from the change log that have occurred within the list, based on the specified query
@@ -164,7 +164,7 @@ let _Web = class _Web extends _SPInstance {
164
164
  * @param progId The ProgID of the application that was used to create the file, in the form OLEServerName.ObjectName
165
165
  */
166
166
  mapToIcon(filename, size = 0, progId = "") {
167
- return Web(this, `maptoicon(filename='${escapeQueryStrValue(filename)}',progid='${escapeQueryStrValue(progId)}',size=${size})`)();
167
+ return Web(this, `maptoicon(filename='${encodePath(filename)}',progid='${encodePath(progId)}',size=${size})`)();
168
168
  }
169
169
  /**
170
170
  * Returns the tenant property corresponding to the specified key in the app catalog site
@@ -172,7 +172,7 @@ let _Web = class _Web extends _SPInstance {
172
172
  * @param key Id of storage entity to be set
173
173
  */
174
174
  getStorageEntity(key) {
175
- return Web(this, `getStorageEntity('${escapeQueryStrValue(key)}')`)();
175
+ return Web(this, `getStorageEntity('${encodePath(key)}')`)();
176
176
  }
177
177
  /**
178
178
  * This will set the storage entity identified by the given key (MUST be called in the context of the app catalog)
@@ -196,7 +196,7 @@ let _Web = class _Web extends _SPInstance {
196
196
  * @param key Id of storage entity to be removed
197
197
  */
198
198
  removeStorageEntity(key) {
199
- return spPost(Web(this, `removeStorageEntity('${escapeQueryStrValue(key)}')`));
199
+ return spPost(Web(this, `removeStorageEntity('${encodePath(key)}')`));
200
200
  }
201
201
  /**
202
202
  * Returns a collection of objects that contain metadata about subsites of the current site in which the current user is a member.
package/webs/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../packages/sp/webs/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../packages/sp/webs/types.ts"],"names":[],"mappings":"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"}