@multiplatform.one/platform 7.87.1 → 7.88.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/platform",
-  "version": "7.87.1",
+  "version": "7.88.0",
   "description": "Platform detection flags and utilities for multiplatform.one",
   "keywords": [
     "detection",
@@ -56,7 +56,7 @@
     "@tamagui/constants": "2.7.6"
   },
   "devDependencies": {
-    "@multiplatform.one/config": "7.87.1",
+    "@multiplatform.one/config": "7.88.0",
     "@tamagui/build": "2.7.6",
     "@types/chrome": "^0.3.5",
     "@types/firefox-webext-browser": "^143.0.1",

package/src/file/saveFile.native.spec.ts

@@ -96,6 +96,50 @@ describe("native byte save (native boundary modeled)", () => {
     expect(file.delete).not.toHaveBeenCalled();
   });
 
+  it("names the iOS file from its URI when expo's File.name comes back empty (FZ-9198)", async () => {
+    native.platform.isIos = true;
+    native.platform.isAndroid = false;
+    directory.uri = "file:///Shared/File%20Provider%20Storage/";
+    file.uri = "file:///Shared/File%20Provider%20Storage/Pokemon_report.csv";
+    file.name = "";
+    const { saveFile } = await api();
+    await expect(saveFile({ ...options(), filename: "Pokemon_report.csv" })).resolves.toEqual({
+      status: "written",
+      uri: file.uri,
+      requestedFilename: "Pokemon_report.csv",
+      filename: "Pokemon_report.csv",
+      byteLength: 4,
+    });
+  });
+
+  it("keeps both on iOS: a taken name gets the next free copy number instead of failing (FZ-9198)", async () => {
+    native.platform.isIos = true;
+    native.platform.isAndroid = false;
+    directory.uri = "file:///picked/";
+    const taken = ["file:///picked/Pokemon_report.csv", "file:///picked/Pokemon_report%202.csv"];
+    Object.assign(directory, { list: vi.fn(() => taken.map((uri) => ({ uri }))) });
+    directory.createFile.mockImplementation((name: string) => {
+      if (taken.includes(`file:///picked/${encodeURIComponent(name)}`)) {
+        throw new Error(`File '${name}' already exists`);
+      }
+      file.uri = `file:///picked/${encodeURIComponent(name)}`;
+      file.name = "";
+      return file;
+    });
+    const { saveFile } = await api();
+    await expect(saveFile({ ...options(), filename: "Pokemon_report.csv" })).resolves.toEqual({
+      status: "written",
+      uri: "file:///picked/Pokemon_report%203.csv",
+      requestedFilename: "Pokemon_report.csv",
+      filename: "Pokemon_report 3.csv",
+      byteLength: 4,
+    });
+    expect(directory.createFile).toHaveBeenCalledExactlyOnceWith(
+      "Pokemon_report 3.csv",
+      "application/octet-stream",
+    );
+  });
+
   it("omits an opaque Android document ID without reading it as a filename", async () => {
     file.uri = "content://example.documents/tree/root/document/42";
     const readName = vi.fn(() => "42");

package/src/file/saveFile.native.ts

@@ -53,10 +53,14 @@ export async function saveFile(options: FileSaveOptions): Promise<FileSaveResult
 
     let file: File | undefined;
     try {
-      file = directory.createFile(input.filename, input.nativeMimeType);
+      const name = platform.isIos
+        ? freeName(input.filename, takenNames(directory))
+        : input.filename;
+      file = directory.createFile(name, input.nativeMimeType);
       const uri = file.uri;
       // Android content URIs can contain opaque IDs instead of provider display names.
-      const filename = platform.isIos && uri.startsWith("file://") ? { filename: file.name } : {};
+      const filename =
+        platform.isIos && uri.startsWith("file://") ? { filename: lastSegment(uri) || name } : {};
       file.write(input.bytes);
       return {
         status: "written",
@@ -81,3 +85,32 @@ export async function saveFile(options: FileSaveOptions): Promise<FileSaveResult
     busy = false;
   }
 }
+
+function lastSegment(uri: string): string {
+  const segment = uri.replace(/\/+$/, "").split("/").pop() ?? "";
+  try {
+    return decodeURIComponent(segment);
+  } catch {
+    return segment;
+  }
+}
+
+function takenNames(directory: Directory): Set<string> {
+  try {
+    return new Set(directory.list().map((entry) => lastSegment(entry.uri)));
+  } catch {
+    return new Set();
+  }
+}
+
+function freeName(requested: string, taken: Set<string>): string {
+  if (!taken.has(requested)) return requested;
+  const dot = requested.lastIndexOf(".");
+  const stem = dot > 0 ? requested.slice(0, dot) : requested;
+  const extension = dot > 0 ? requested.slice(dot) : "";
+  for (let copy = 2; copy < 1000; copy++) {
+    const candidate = `${stem} ${copy}${extension}`;
+    if (!taken.has(candidate)) return candidate;
+  }
+  return requested;
+}

package/types/file/saveFile.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saveFile.native.d.ts","sourceRoot":"","sources":["../../src/file/saveFile.native.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAmB,MAAM,SAAS,CAAC;AAIpG,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA4EhF"}
+{"version":3,"file":"saveFile.native.d.ts","sourceRoot":"","sources":["../../src/file/saveFile.native.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,eAAe,EAAE,KAAK,cAAc,EAAmB,MAAM,SAAS,CAAC;AAIpG,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAgFhF"}