Version 4

debug/launch/main.ts

@@ -8,7 +8,7 @@ import { ITestingSettings } from "../../test/load-settings.js";
 // add your debugging imports here and prior to submitting a PR git checkout debug/debug.ts
 // will allow you to keep all your debugging files locally
 // comment out the example
-import { Example } from "./sp.js";
+import { Example } from "./issue-3220.js";
 // import { Example } from "./graph.js";
 
 // setup the connection to SharePoint using the settings file, you can

docs/sp/files.md

@@ -191,25 +191,6 @@ const sp = spfi(...);
 const fileInfo = await sp.web.lists.getByTitle("Documents").rootFolder.files.addChunked("new.txt", stream, { progress: data => { console.log(`progress`); }, Overwrite: true });
 ```
 
-### Setting Associated Item Values
-
-You can also update the file properties of a newly uploaded file using code similar to the below snippet:
-
-```TypeScript
-import { spfi } from "@pnp/sp";
-import "@pnp/sp/webs";
-import "@pnp/sp/files";
-import "@pnp/sp/folders";
-
-const sp = spfi(...);
-const fileInfo = await sp.web.getFolderByServerRelativePath("/sites/dev/Shared%20Documents/test/").files.addUsingPath("file.name", "content", {Overwrite: true});
-const item = await file.file.getItem();
-await item.update({
-  Title: "A Title",
-  OtherField: "My Other Value"
-});
-```
-
 ## Update File Content
 
 You can of course use similar methods to update existing files as shown below. This overwrites the existing content in the file.

packages/sp/folders/types.ts

@@ -17,7 +17,7 @@ import { IItem, Item } from "../items/types.js";
 import { defaultPath } from "../decorators.js";
 import { extractWebUrl } from "../utils/extract-web-url.js";
 import { toResourcePath, IResourcePath } from "../utils/to-resource-path.js";
-import { encodePath } from "../utils/encode-path-str.js";
+import { encodePath, encodePathNoURIEncode } from "../utils/encode-path-str.js";
 import "../context-info/index.js";
 import { IMoveCopyOptions } from "../types.js";
 import { BatchNever } from "../batching.js";
@@ -301,7 +301,7 @@ export const Folder = spInvokableFactory<IFolder>(_Folder);
  */
 export function folderFromServerRelativePath(base: ISPQueryable, serverRelativePath: string): IFolder {
 
-    return Folder([base, extractWebUrl(base.toUrl())], `_api/web/getFolderByServerRelativePath(decodedUrl='${encodePath(serverRelativePath)}')`);
+    return Folder([base, extractWebUrl(base.toUrl())], `_api/web/getFolderByServerRelativePath(decodedUrl='${encodePathNoURIEncode(serverRelativePath)}')`);
 }
 
 /**

packages/sp/utils/encode-path-str.ts

@@ -27,3 +27,25 @@ export function encodePath(value: string): string {
         return encodeURIComponent(value.replace(/'/ig, "''"));
     }
 }
+
+export function encodePathNoURIEncode(value: string): string {
+
+    if (stringIsNullOrEmpty(value)) {
+        return "";
+    }
+
+    // replace all instance of ' with ''
+    if (/!(@.*?)::(.*?)/ig.test(value)) {
+
+        return value.replace(/!(@.*?)::(.*)$/ig, (match, labelName, v) => {
+            // we do not need to encodeURIComponent v as it will be encoded automatically when it is added as a query string param
+            // we do need to double any ' chars
+            return `!${labelName}::${v.replace(/'/ig, "''")}`;
+        });
+
+    } else {
+
+        // because this is a literal path value we encodeURIComponent after doubling any ' chars
+        return value.replace(/'/ig, "''");
+    }
+}