fixup! refactor(apple): port make_project! to JS

Author: tido64

ios/app.mjs

@@ -24,8 +24,12 @@ import {
 } from "./xcode.mjs";
 
 /**
- * @import { ApplePlatform, JSONObject, JSONValue } from "../scripts/types.ts";
- * @import { ProjectConfiguration } from "./xcode.mjs";
+ * @import {
+ *   ApplePlatform,
+ *   JSONObject,
+ *   JSONValue,
+ *   ProjectConfiguration,
+ * } from "../scripts/types.ts";
  */
 
 const SUPPORTED_PLATFORMS = ["ios", "macos", "visionos"];

ios/privacyManifest.mjs

@@ -4,14 +4,11 @@ import * as path from "node:path";
 import { isObject, plistFromJSON } from "./utils.mjs";
 
 /**
- * @import { ApplePlatform, JSONObject, JSONValue } from "../scripts/types.js";
- *
- * @typedef {{
- *   NSPrivacyTracking: boolean;
- *   NSPrivacyTrackingDomains: JSONValue[];
- *   NSPrivacyCollectedDataTypes: JSONValue[];
- *   NSPrivacyAccessedAPITypes: JSONValue[];
- * }} PrivacyManifest;
+ * @import {
+ *   ApplePlatform,
+ *   JSONObject,
+ *   PrivacyManifest
+ * } from "../scripts/types.js";
  */
 
 // https://developer.apple.com/documentation/bundleresources/privacy_manifest_files

ios/xcode.mjs

@@ -6,25 +6,12 @@ import { findFile, readTextFile, v } from "../scripts/helpers.js";
 import { isObject, isString } from "./utils.mjs";
 
 /**
- * @import { XmlBuilderOptions } from "fast-xml-parser";
- * @import { ApplePlatform, JSONObject } from "../scripts/types.js";
- *
- * @typedef {{
- *   xcodeprojPath: string;
- *   reactNativePath: string;
- *   reactNativeVersion: number;
- *   singleApp?: string;
- *   useNewArch: boolean;
- *   useBridgeless: boolean;
- *   buildSettings: Record<string, string | string[]>;
- *   testsBuildSettings: Record<string, string>;
- *   uitestsBuildSettings: Record<string, string>;
- * }} ProjectConfiguration
- *
- * @typedef {Pick<
- *   Required<XmlBuilderOptions>,
- *   "attributeNamePrefix" | "ignoreAttributes" | "format" | "indentBy"
- * >} XmlOptions;
+ * @import {
+ *   ApplePlatform,
+ *   JSONObject,
+ *   ProjectConfiguration,
+ *   XmlOptions,
+ * } from "../scripts/types.js";
  */
 
 export const IPHONEOS_DEPLOYMENT_TARGET = "IPHONEOS_DEPLOYMENT_TARGET";

scripts/types.ts

@@ -1,3 +1,5 @@
+import type { XmlBuilderOptions } from "fast-xml-parser";
+
 export type JSONValue =
   | string
   | number
@@ -115,6 +117,38 @@ export type ProjectConfig = {
   windows?: Pick<ProjectParams["windows"], "sourceDir" | "solutionFile">;
 };
 
+/***************************
+ * ios/privacyManifest.mjs *
+ ***************************/
+
+export type PrivacyManifest = {
+  NSPrivacyTracking: boolean;
+  NSPrivacyTrackingDomains: JSONValue[];
+  NSPrivacyCollectedDataTypes: JSONValue[];
+  NSPrivacyAccessedAPITypes: JSONValue[];
+};
+
+/*****************
+ * ios/xcode.mjs *
+ *****************/
+
+export type ProjectConfiguration = {
+  xcodeprojPath: string;
+  reactNativePath: string;
+  reactNativeVersion: number;
+  singleApp?: string;
+  useNewArch: boolean;
+  useBridgeless: boolean;
+  buildSettings: Record<string, string | string[]>;
+  testsBuildSettings: Record<string, string>;
+  uitestsBuildSettings: Record<string, string>;
+};
+
+export type XmlOptions = Pick<
+  Required<XmlBuilderOptions>,
+  "attributeNamePrefix" | "ignoreAttributes" | "format" | "indentBy"
+>;
+
 /*****************
  * parseargs.mjs *
  *****************/

test/ios/newArch.test.ts

@@ -40,7 +40,7 @@ describe("isBridgelessEnabled()", () => {
   });
 
   it("does not return true just because `RCT_NEW_ARCH_ENABLED` is set", () => {
-    // `RCT_NEW_ARCH_ENABLED` does not enable bridgeless
+    // `RCT_NEW_ARCH_ENABLED` does not enable bridgeless on older versions
     process.env["RCT_NEW_ARCH_ENABLED"] = "1";
 
     ok(!isBridgelessEnabled({}, v(0, 72, 999)));

test/ios/xcode.test.ts

@@ -1,7 +1,6 @@
 import { deepEqual, equal, match, notEqual, throws } from "node:assert/strict";
 import * as path from "node:path";
 import { afterEach, beforeEach, describe, it } from "node:test";
-import type { ProjectConfiguration } from "../../ios/xcode.mjs";
 import {
   CODE_SIGN_ENTITLEMENTS,
   CODE_SIGN_IDENTITY,
@@ -19,7 +18,11 @@ import {
   overrideBuildSettings,
 } from "../../ios/xcode.mjs";
 import { readTextFile, v } from "../../scripts/helpers.js";
-import type { ApplePlatform, JSONObject } from "../../scripts/types.ts";
+import type {
+  ApplePlatform,
+  JSONObject,
+  ProjectConfiguration,
+} from "../../scripts/types.ts";
 import { fs, setMockFiles, toJSON } from "../fs.mock.ts";
 
 const macosOnly = { skip: process.platform === "win32" };