make toPlist synchronous

Author: tido64

ios/entitlements.mjs

@@ -41,9 +41,9 @@ function getCodeSignEntitlements(appConfig, targetPlatform) {
  * @param {JSONObject} appConfig
  * @param {ApplePlatform} targetPlatform
  * @param {string} destination
- * @returns {Promise<void>}
+ * @returns {void}
  */
-export async function generateEntitlements(
+export function generateEntitlements(
   appConfig,
   targetPlatform,
   destination,
@@ -56,7 +56,7 @@ export async function generateEntitlements(
   }
 
   const filename = "App.entitlements";
-  const entitlements = await toPlist(
+  const entitlements = toPlist(
     {
       ...(targetPlatform === "macos"
         ? DEFAULT_MACOS_ENTITLEMENTS

ios/privacyManifest.mjs

@@ -54,9 +54,9 @@ function getUserPrivacyManifest(appConfig, targetPlatform) {
  * @param {JSONObject} appConfig
  * @param {ApplePlatform} targetPlatform
  * @param {string} destination
- * @returns {Promise<void>}
+ * @returns {void}
  */
-export async function generatePrivacyManifest(
+export function generatePrivacyManifest(
   appConfig,
   targetPlatform,
   destination,
@@ -107,6 +107,6 @@ export async function generatePrivacyManifest(
   }
 
   const filename = "PrivacyInfo.xcprivacy";
-  const xcprivacy = await toPlist(manifest, filename);
+  const xcprivacy = toPlist(manifest, filename);
   fs.writeFileSync(path.join(destination, filename), xcprivacy);
 }

ios/utils.mjs

@@ -1,5 +1,5 @@
 // @ts-check
-import { spawn } from "node:child_process";
+import { spawnSync } from "node:child_process";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -30,28 +30,18 @@ export function projectPath(p, targetPlatform) {
 /**
  * @param {JSONObject} source
  * @param {string} filename
- * @returns {Promise<string>}
+ * @returns {string}
  */
 export function toPlist(source, filename) {
-  return new Promise((resolve, reject) => {
-    const args = ["-convert", "xml1", "-r", "-o", "-", "--", "-"];
-    const plutil = spawn("/usr/bin/plutil", args, {
-      stdio: ["pipe", "pipe", "inherit"],
-    });
-
-    /** @type {string[]} */
-    const data = [];
-    plutil.stdout.on("data", (chunk) => data.push(chunk.toString()));
+  const args = ["-convert", "xml1", "-r", "-o", "-", "--", "-"];
+  const plutil = spawnSync("/usr/bin/plutil", args, {
+    stdio: ["pipe", "pipe", "inherit"],
+    input: JSON.stringify(source),
+  });
 
-    plutil.on("exit", (exitCode) => {
-      if (exitCode !== 0) {
-        reject(new Error(`Failed to generate '${filename}'`));
-      } else {
-        resolve(data.join(""));
-      }
-    });
+  if (plutil.status !== 0) {
+    throw new Error(`Failed to generate '${filename}'`);
+  }
 
-    plutil.stdin.write(JSON.stringify(source));
-    plutil.stdin.end();
-  });
+  return plutil.stdout.toString();
 }

test/ios/entitlements.test.ts

@@ -12,10 +12,10 @@ describe("generatePrivacyManifest()", macosOnly, () => {
   function generateEntitlements(
     config: JSONObject,
     platform: (typeof targetPlatforms)[number]
-  ): Promise<void> {
+  ): void {
     const destination = ".";
     fs.mkdirSync(destination, { recursive: true, mode: 0o755 });
-    return generateEntitlementsActual(config, platform, destination, fs);
+    generateEntitlementsActual(config, platform, destination, fs);
   }
 
   function readEntitlements() {
@@ -29,32 +29,32 @@ describe("generatePrivacyManifest()", macosOnly, () => {
   });
 
   for (const platform of targetPlatforms) {
-    it(`[${platform}] generates a default manifest`, async () => {
-      await generateEntitlements({}, platform);
+    it(`[${platform}] generates a default manifest`, () => {
+      generateEntitlements({}, platform);
 
       deepEqual(readEntitlements(), DEFAULT_ENTITLEMENTS[platform]);
     });
 
-    it(`[${platform}] handles invalid manifest`, async () => {
-      await generateEntitlements(
+    it(`[${platform}] handles invalid manifest`, () => {
+      generateEntitlements(
         { [platform]: { codeSignEntitlements: false } },
         platform
       );
 
       deepEqual(readEntitlements(), DEFAULT_ENTITLEMENTS[platform]);
     });
 
-    it(`[${platform}] does not generate a manifest when a path is specified`, async () => {
-      await generateEntitlements(
+    it(`[${platform}] does not generate a manifest when a path is specified`, () => {
+      generateEntitlements(
         { [platform]: { codeSignEntitlements: "App.entitlements" } },
         platform
       );
 
       throws(readEntitlements);
     });
 
-    it(`[${platform}] appends to default manifest`, async () => {
-      await generateEntitlements(
+    it(`[${platform}] appends to default manifest`, () => {
+      generateEntitlements(
         {
           [platform]: {
             codeSignEntitlements: {

test/ios/privacyManifest.test.ts

@@ -7,10 +7,10 @@ import { fs, setMockFiles } from "../fs.mock.ts";
 const macosOnly = { skip: process.platform === "win32" };
 
 describe("generatePrivacyManifest()", macosOnly, () => {
-  function generatePrivacyManifest(config: JSONObject): Promise<void> {
+  function generatePrivacyManifest(config: JSONObject): void {
     const destination = ".";
     fs.mkdirSync(destination, { recursive: true, mode: 0o755 });
-    return generatePrivacyManifestActual(config, "ios", destination, fs);
+    generatePrivacyManifestActual(config, "ios", destination, fs);
   }
 
   function readPrivacyManifest() {
@@ -23,20 +23,20 @@ describe("generatePrivacyManifest()", macosOnly, () => {
     setMockFiles();
   });
 
-  it("generates a default manifest", async () => {
-    await generatePrivacyManifest({});
+  it("generates a default manifest", () => {
+    generatePrivacyManifest({});
 
     deepEqual(readPrivacyManifest(), DEFAULT_PRIVACY_MANIFEST);
   });
 
-  it("handles invalid configuration", async () => {
-    await generatePrivacyManifest({ ios: { privacyManifest: "YES" } });
+  it("handles invalid configuration", () => {
+    generatePrivacyManifest({ ios: { privacyManifest: "YES" } });
 
     deepEqual(readPrivacyManifest(), DEFAULT_PRIVACY_MANIFEST);
   });
 
-  it("appends to default manifest", async () => {
-    await generatePrivacyManifest({
+  it("appends to default manifest", () => {
+    generatePrivacyManifest({
       ios: {
         privacyManifest: {
           NSPrivacyTracking: true,