@leonxin/meetgames 0.1.13 → 0.1.15

package/src/ios/integrate.ts

@@ -20,7 +20,6 @@ import {
   addUrlScheme,
   buildPlistXml,
   parsePlistXml,
-  setAppTransportSecurity,
   type PlistDocument,
 } from "./infoPlist.js";
 import {
@@ -31,6 +30,7 @@ import {
   addSystemLib,
   addThirdPartyFramework,
   findInfoPlistPathsFromPbx,
+  getTargetBuildSettings,
   loadPbxFromStore,
   savePbxToStore,
   setBuildSetting,
@@ -49,6 +49,34 @@ export interface IosIntegrateOptions {
 }
 
 const IOS_FIREBASE_CONFIG_FILE = "GoogleService-Info.plist";
+const DEFAULT_IOS_BUILD_SETTINGS: Record<string, unknown> = {
+  FRAMEWORK_SEARCH_PATHS: ['"$(SRCROOT)/topSDK"', '"$(inherited)"', '"$(PROJECT_DIR)/topSDK"'],
+  LIBRARY_SEARCH_PATHS: '"$(SRCROOT)/topSDK"',
+  SWIFT_VERSION: "5.0",
+};
+
+function logValue(value: unknown): string {
+  if (value === undefined) return "<missing>";
+  if (typeof value === "string") return value;
+  return JSON.stringify(value);
+}
+
+function pushValueChangeLog(logs: string[], label: string, before: unknown, after: unknown): void {
+  if (valuesEqual(before, after)) {
+    logs.push(`SUCCESS: ${label} 未变化 value:${logValue(after)}`);
+    return;
+  }
+  logs.push(`SUCCESS: ${label} ${logValue(before)} -> ${logValue(after)}`);
+}
+
+function valuesEqual(before: unknown, after: unknown): boolean {
+  return JSON.stringify(before) === JSON.stringify(after);
+}
+
+function cloneValue(value: unknown): unknown {
+  if (value === undefined) return undefined;
+  return JSON.parse(JSON.stringify(value)) as unknown;
+}
 
 function ok(changed: string[], warnings: string[] = [], logs: string[] = []): StepResult {
   return { ok: true, changedFiles: changed, logs, warnings, errors: [] };
@@ -70,7 +98,6 @@ function applyPlugin(
   remoteSources: Map<string, string> = new Map()
 ): void {
   const { config, sourceDir } = loaded;
-  const srcRoot = pbx.srcRoot;
 
   logs.push(`- 插件：${config.name}, 类型：${config.type},版本：${config.pluginVersion}`);
 
@@ -163,7 +190,13 @@ function applyPlugin(
 
   if (perform.includes("buildSettings") && config.buildSettings) {
     for (const [k, v] of Object.entries(config.buildSettings)) {
-      setBuildSetting(pbx, k, v);
+      const beforeValues = [...new Set(getTargetBuildSettings(pbx).map((settings) => settings[k]))];
+      if (beforeValues.length === 0 || beforeValues.some((before) => !valuesEqual(before, v))) {
+        setBuildSetting(pbx, k, v);
+      }
+      for (const before of beforeValues.length ? beforeValues : [undefined]) {
+        pushValueChangeLog(logs, `BuildSetting设置${k}`, before, v);
+      }
       logs.push(`SUCCESS: BuildSetting设置${k}为${v} 完成`);
     }
   }
@@ -174,8 +207,6 @@ function applyPlugin(
       logs.push(`SUCCESS: 添加other link flag:${flag} 完成`);
     }
   }
-
-  logs.push(`SUCCESS: 插件${config.name}接入完成`);
 }
 
 function validateLoadedPluginResourcesForIos(loaded: LoadedPluginConfig): string[] {
@@ -266,14 +297,27 @@ function ensureTopSdkInstallSwift(
   pbx: PbxContext
 ): string | null {
   if (hasSwiftSource(pbx.srcRoot)) return null;
-  const relFromSrc = path.join(pbx.targetName, "TopSDKInstall.swift").split(path.sep).join("/");
+  const relFromSrc = path.join("topSDK", "TopSDKInstall.swift").split(path.sep).join("/");
   const abs = path.join(pbx.srcRoot, relFromSrc);
   const relFromProject = path.relative(ctx.projectRoot, abs).split(path.sep).join("/");
-  store.write(relFromProject, "import Foundation\n\n");
+  store.write(relFromProject, "");
   addSourceOrResourceFile(pbx, relFromSrc);
   return relFromProject;
 }
 
+function applyDefaultIosBuildSettings(pbx: PbxContext, logs: string[]): void {
+  for (const [key, value] of Object.entries(DEFAULT_IOS_BUILD_SETTINGS)) {
+    const beforeValues = [...new Set(getTargetBuildSettings(pbx).map((settings) => settings[key]))];
+    if (beforeValues.length === 0 || beforeValues.some((before) => !valuesEqual(before, value))) {
+      setBuildSetting(pbx, key, value);
+    }
+    for (const before of beforeValues.length ? beforeValues : [undefined]) {
+      pushValueChangeLog(logs, `BuildSetting设置${key}`, before, value);
+    }
+    logs.push(`SUCCESS: BuildSetting设置${key}为${logValue(value)} 完成`);
+  }
+}
+
 function appDelegateCodeShouldMoveToSceneDelegate(code: CodeConfig): boolean {
   if (code.type === "header") return false;
   const method = code.method ?? "";
@@ -325,7 +369,8 @@ function mergePlistParams(
   loaded: LoadedPluginConfig,
   channelConfig: Record<string, unknown>,
   perform: readonly PerformSetting[],
-  logs: string[]
+  logs: string[],
+  dirtyDocs: Set<PlistDocument>
 ): void {
   if (!perform.includes("infoParams") && !perform.includes("urlScheme") && !perform.includes("queriesSchemes")) {
     return;
@@ -334,20 +379,31 @@ function mergePlistParams(
     if (perform.includes("infoParams") && loaded.config.infoParams) {
       for (const [key, raw] of Object.entries(loaded.config.infoParams)) {
         const value = applyChannelTemplateValue(raw, channelConfig);
-        addPlistParam(doc.data, key, value);
+        const before = doc.data[key];
+        if (!valuesEqual(before, value)) {
+          addPlistParam(doc.data, key, value);
+          dirtyDocs.add(doc);
+        }
+        pushValueChangeLog(logs, `info.plist配置key：${key}`, before, value);
         logs.push(`SUCCESS: info.plist添加配置key：${key} value:${String(value)} 完成`);
       }
     }
     if (perform.includes("queriesSchemes") && loaded.config.queriesSchemes?.length) {
       for (const scheme of loaded.config.queriesSchemes) {
+        const before = cloneValue(doc.data.LSApplicationQueriesSchemes ?? []);
         addQueriesScheme(doc.data, scheme);
+        if (!valuesEqual(before, doc.data.LSApplicationQueriesSchemes)) dirtyDocs.add(doc);
+        pushValueChangeLog(logs, `info.plist queriesSchemes ${scheme}`, before, doc.data.LSApplicationQueriesSchemes);
         logs.push(`SUCCESS: 添加queriesSchemes:${scheme} 完成`);
       }
     }
     if (perform.includes("urlScheme") && loaded.config.urlScheme) {
       let scheme = applyChannelTemplate(loaded.config.urlScheme, channelConfig);
       if (scheme.endsWith("://")) scheme = scheme.replace("://", "");
+      const before = cloneValue(doc.data.CFBundleURLTypes ?? []);
       addUrlScheme(doc.data, scheme);
+      if (!valuesEqual(before, doc.data.CFBundleURLTypes)) dirtyDocs.add(doc);
+      pushValueChangeLog(logs, `info.plist URL Scheme ${scheme}`, before, doc.data.CFBundleURLTypes);
       logs.push(`SUCCESS: 设置urlScheme：${scheme}完成`);
     }
   }
@@ -367,7 +423,9 @@ function buildTopSdkPluginInfo(
       for (const [paramKey, rawValue] of Object.entries(loaded.config.pluginParams ?? {})) {
         params[paramKey] = applyChannelTemplate(String(rawValue), channelConfig);
       }
-      info.params = params;
+      if (Object.keys(params).length > 0) {
+        info.params = params;
+      }
     }
     if (loaded.config.type === 4) {
       dataPluginsInfo.push(info);
@@ -378,6 +436,89 @@ function buildTopSdkPluginInfo(
   return { pluginsInfo, dataPluginsInfo };
 }
 
+function injectDelegateCodes(
+  loadedConfigs: LoadedPluginConfig[],
+  ctx: WorkspaceContext,
+  store: TextFileStore,
+  pbx: PbxContext,
+  warnings: string[],
+  changed: Set<string>,
+  logs: string[]
+): void {
+  const hasAppDelegateCodes = loadedConfigs.some((loaded) => (loaded.config.appDelegateCodes ?? []).length > 0);
+  const hasSceneDelegateCodes = loadedConfigs.some((loaded) => (loaded.config.sceneDelegateCodes ?? []).length > 0);
+  if (!hasAppDelegateCodes && !hasSceneDelegateCodes) return;
+
+  const sceneDelegateRelPaths: string[] = [];
+  for (const abs of findSceneDelegateFiles(pbx.srcRoot)) {
+    sceneDelegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
+  }
+  const hasUniqueSceneDelegate = sceneDelegateRelPaths.length === 1;
+
+  const delegateRelPaths: string[] = [];
+  for (const abs of findDelegateFiles(pbx.srcRoot)) {
+    delegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
+  }
+  if (hasAppDelegateCodes && !delegateRelPaths.length) {
+    warnings.push("no UIApplicationDelegate .m/.mm found; skipped AppDelegate injection (SwiftUI @main is not supported yet)");
+  }
+  if (hasAppDelegateCodes && delegateRelPaths.length > 1) {
+    warnings.push(`multiple UIApplicationDelegate files found; skipped AppDelegate injection: ${delegateRelPaths.join(", ")}`);
+  }
+  for (const rel of hasAppDelegateCodes && delegateRelPaths.length === 1 ? delegateRelPaths : []) {
+    const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
+    logs.push("检测到工程UIApplicationDelegate实现类，将自动接入对应接口");
+    let okInject = true;
+    for (const loaded of loadedConfigs) {
+      for (const code of appDelegateCodesForLifecycle(loaded, hasUniqueSceneDelegate)) {
+        const existed = cu.hasCode(code.content);
+        if (code.type === "header") {
+          if (!cu.addHeader(code.content)) okInject = false;
+        } else if ((code.type === "method" || code.type === "code") && code.method) {
+          if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
+        }
+        if (okInject) {
+          logs.push(
+            `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
+          );
+        }
+      }
+    }
+    if (!okInject) warnings.push(`AppDelegate injection incomplete for ${rel}`);
+    const before = store.read(rel);
+    cu.applyToStore((c) => store.write(rel, c));
+    if (store.read(rel) !== before) changed.add(rel);
+  }
+
+  if (hasSceneDelegateCodes && sceneDelegateRelPaths.length > 1) {
+    warnings.push(`multiple UIWindowSceneDelegate files found; skipped SceneDelegate injection: ${sceneDelegateRelPaths.join(", ")}`);
+  }
+  for (const rel of hasSceneDelegateCodes && sceneDelegateRelPaths.length === 1 ? sceneDelegateRelPaths : []) {
+    const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
+    logs.push("检测到工程存在UIWindowSceneDelegate实现类，将自动接入对应接口");
+    let okInject = true;
+    for (const loaded of loadedConfigs) {
+      for (const code of loaded.config.sceneDelegateCodes ?? []) {
+        const existed = cu.hasCode(code.content);
+        if (code.type === "header") {
+          if (!cu.addHeader(code.content)) okInject = false;
+        } else if ((code.type === "method" || code.type === "code") && code.method) {
+          if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
+        }
+        if (okInject) {
+          logs.push(
+            `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
+          );
+        }
+      }
+    }
+    if (!okInject) warnings.push(`SceneDelegate injection incomplete for ${rel}`);
+    const before = store.read(rel);
+    cu.applyToStore((c) => store.write(rel, c));
+    if (store.read(rel) !== before) changed.add(rel);
+  }
+}
+
 export async function runIosIntegrateTopSdk(
   ctx: WorkspaceContext,
   store: TextFileStore,
@@ -436,6 +577,9 @@ export async function runIosIntegrateTopSdk(
 
   const xcodeprojPath = ctx.ios.xcodeprojPath!;
   const pbx = await loadPbxFromStore(store, ctx.projectRoot, xcodeprojPath, targetName);
+  if (perform.includes("buildSettings")) {
+    applyDefaultIosBuildSettings(pbx, logs);
+  }
   const fm = new TopSdkFileManager(pbx.srcRoot);
 
   let plistDocs: PlistDocument[];
@@ -444,6 +588,7 @@ export async function runIosIntegrateTopSdk(
   } catch (e) {
     return fail([e instanceof Error ? e.message : String(e)], warnings, logs);
   }
+  const dirtyPlistDocs = new Set<PlistDocument>();
 
   const firebaseDownload = await downloadIosFirebaseConfig(remote, pbx, dryRun, iosFirebaseConfigRelPath(plistDocs));
   warnings.push(...firebaseDownload.warnings);
@@ -466,112 +611,48 @@ export async function runIosIntegrateTopSdk(
         logs.push("SUCCESS: 未检测到Swift代码文件，自动添加TopSDKInstall.swift完成");
       }
     }
+    mergePlistParams(plistDocs, loaded, channelConfig, perform, logs, dirtyPlistDocs);
+    if (perform.includes("infoParams") && loaded.config.name === "AppleSignin") {
+      for (const rel of ensureAppleSignInEntitlement(store, ctx.projectRoot, pbx)) {
+        changed.add(rel);
+      }
+      logs.push("SUCCESS: 启用SigninWithApple完成");
+    }
+    logs.push(`SUCCESS: 插件${loaded.config.name}接入完成`);
   }
   for (const loaded of coreConfigs) {
     applyPlugin(loaded, pbx, fm, channelConfig, perform, binaryCopies, dryRun, logs, firebaseDownload.remoteSources);
-  }
-
-  for (const loaded of [...coreConfigs, ...pluginConfigs]) {
-    mergePlistParams(plistDocs, loaded, channelConfig, perform, logs);
-    if (perform.includes("infoParams")) {
-      setAppTransportSecurity(plistDocs[0]?.data ?? {}, true);
+    mergePlistParams(plistDocs, loaded, channelConfig, perform, logs, dirtyPlistDocs);
+    if (executeAppDelegate) {
+      injectDelegateCodes([loaded], ctx, store, pbx, warnings, changed, logs);
     }
+    logs.push(`SUCCESS: 插件${loaded.config.name}接入完成`);
   }
   for (const doc of plistDocs) {
     if (perform.includes("infoParams")) {
       const { pluginsInfo, dataPluginsInfo } = buildTopSdkPluginInfo(pluginConfigs, channelConfig);
-      addPlistParam(doc.data, "TOPSDK", {
+      const before = doc.data.TOPSDK;
+      const nextTopSdk = {
         APP_ID: remote.topsdk.appId,
         Plugins: pluginsInfo,
         dataPlugins: dataPluginsInfo,
-      });
+      };
+      if (!valuesEqual(before, nextTopSdk)) {
+        addPlistParam(doc.data, "TOPSDK", nextTopSdk);
+        dirtyPlistDocs.add(doc);
+      }
+      pushValueChangeLog(logs, "info.plist配置key：TOPSDK", before, nextTopSdk);
     }
     const rel = path.relative(ctx.projectRoot, path.join(pbx.srcRoot, doc.relPath)).split(path.sep).join("/");
-    store.write(rel, buildPlistXml(doc.data));
-    changed.add(rel);
-  }
-
-  if (perform.includes("infoParams") && pluginConfigs.some((p) => p.config.name === "AppleSignin")) {
-    for (const rel of ensureAppleSignInEntitlement(store, ctx.projectRoot, pbx)) {
+    if (dirtyPlistDocs.has(doc)) {
+      store.write(rel, buildPlistXml(doc.data));
       changed.add(rel);
     }
-    logs.push("SUCCESS: 启用SigninWithApple完成");
   }
 
   savePbxToStore(store, pbx);
   changed.add(pbx.rel);
 
-  if (executeAppDelegate) {
-    const sceneDelegateRelPaths: string[] = [];
-    for (const abs of findSceneDelegateFiles(pbx.srcRoot)) {
-      sceneDelegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
-    }
-    const hasUniqueSceneDelegate = sceneDelegateRelPaths.length === 1;
-
-    const delegateRelPaths: string[] = [];
-    for (const abs of findDelegateFiles(pbx.srcRoot)) {
-      delegateRelPaths.push(path.relative(ctx.projectRoot, abs).split(path.sep).join("/"));
-    }
-    if (!delegateRelPaths.length) {
-      warnings.push("no UIApplicationDelegate .m/.mm found; skipped AppDelegate injection (SwiftUI @main is not supported yet)");
-    }
-    if (delegateRelPaths.length > 1) {
-      warnings.push(`multiple UIApplicationDelegate files found; skipped AppDelegate injection: ${delegateRelPaths.join(", ")}`);
-    }
-    for (const rel of delegateRelPaths.length === 1 ? delegateRelPaths : []) {
-      const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
-      logs.push("检测到工程UIApplicationDelegate实现类，将自动接入对应接口");
-      let okInject = true;
-      for (const loaded of [...coreConfigs, ...pluginConfigs]) {
-        for (const code of appDelegateCodesForLifecycle(loaded, hasUniqueSceneDelegate)) {
-          const existed = cu.hasCode(code.content);
-          if (code.type === "header") {
-            if (!cu.addHeader(code.content)) okInject = false;
-          } else if ((code.type === "method" || code.type === "code") && code.method) {
-            if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
-          }
-          if (okInject) {
-            logs.push(
-              `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
-            );
-          }
-        }
-      }
-      if (!okInject) warnings.push(`AppDelegate injection incomplete for ${rel}`);
-      const before = store.read(rel);
-      cu.applyToStore((c) => store.write(rel, c));
-      if (store.read(rel) !== before) changed.add(rel);
-    }
-
-    if (sceneDelegateRelPaths.length > 1) {
-      warnings.push(`multiple UIWindowSceneDelegate files found; skipped SceneDelegate injection: ${sceneDelegateRelPaths.join(", ")}`);
-    }
-    for (const rel of sceneDelegateRelPaths.length === 1 ? sceneDelegateRelPaths : []) {
-      const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
-      logs.push("检测到工程存在UIWindowSceneDelegate实现类，将自动接入对应接口");
-      let okInject = true;
-      for (const loaded of [...coreConfigs, ...pluginConfigs]) {
-        for (const code of loaded.config.sceneDelegateCodes ?? []) {
-          const existed = cu.hasCode(code.content);
-          if (code.type === "header") {
-            if (!cu.addHeader(code.content)) okInject = false;
-          } else if ((code.type === "method" || code.type === "code") && code.method) {
-            if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
-          }
-          if (okInject) {
-            logs.push(
-              `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
-            );
-          }
-        }
-      }
-      if (!okInject) warnings.push(`SceneDelegate injection incomplete for ${rel}`);
-      const before = store.read(rel);
-      cu.applyToStore((c) => store.write(rel, c));
-      if (store.read(rel) !== before) changed.add(rel);
-    }
-  }
-
   logs.push("SUCCESS: info.plist配置写入完成");
   logs.push("！！ 接入流程已全部结束 ！！");
   return ok([...changed], warnings, logs);

package/src/ios/pbxprojEditor.ts

@@ -103,7 +103,14 @@ function sanitizePbxBuildSettings(proj: XcodeProject): void {
         continue;
       }
       if (Array.isArray(raw)) {
-        settings[key] = raw.map((value) => (typeof value === "string" ? quotePbxStringIfNeeded(value) : value));
+        const normalized = raw.map((value) => (typeof value === "string" ? quotePbxStringIfNeeded(value) : value));
+        const seen = new Set<string>();
+        settings[key] = normalized.filter((value) => {
+          const marker = typeof value === "string" ? unquotePbxString(value) : JSON.stringify(value);
+          if (seen.has(marker)) return false;
+          seen.add(marker);
+          return true;
+        });
       }
     }
   }
@@ -162,12 +169,15 @@ function ensureResourcesBuildPhase(proj: XcodeProject, targetName: string): void
 export function addThirdPartyFramework(ctx: PbxContext, relPathFromSrcRoot: string, embed: boolean): void {
   const file = relPathFromSrcRoot.split(path.sep).join("/");
   const target = targetKey(ctx.proj, ctx.targetName);
-  ctx.proj.addFramework(file, {
-    customFramework: true,
-    embed,
-    sign: true,
-    target,
-  });
+  const basename = path.basename(file);
+  const fileRefUuid = ensureFileRef(ctx, file, frameworkFileType(file));
+  addBuildFileToPhase(ctx, ensureFrameworksBuildPhase(ctx, target), fileRefUuid, basename, "Frameworks", ["Weak"]);
+  if (embed) {
+    addBuildFileToPhase(ctx, ensureCopyFilesBuildPhase(ctx, target), fileRefUuid, basename, "Embed Frameworks", [
+      "CodeSignOnCopy",
+      "RemoveHeadersOnCopy",
+    ]);
+  }
 }
 
 export function addCopyFile(ctx: PbxContext, relPathFromSrcRoot: string): void {
@@ -202,13 +212,81 @@ function findFileRefUuid(ctx: PbxContext, file: string): string | null {
   return null;
 }
 
+function frameworkFileType(file: string): string {
+  return file.endsWith(".xcframework") ? "wrapper.xcframework" : "wrapper.framework";
+}
+
+function ensureFileRef(ctx: PbxContext, file: string, lastKnownFileType: string): string {
+  const basename = path.basename(file);
+  const existing = findFileRefUuid(ctx, file);
+  const fileRefSection = objectSection(ctx.proj, "PBXFileReference");
+  if (existing) {
+    const ref = fileRefSection[existing];
+    if (ref && typeof ref === "object") {
+      (ref as Record<string, unknown>).lastKnownFileType = lastKnownFileType;
+    }
+    return existing;
+  }
+
+  const uuid = ctx.proj.generateUuid();
+  fileRefSection[uuid] = {
+    isa: "PBXFileReference",
+    name: `"${basename}"`,
+    path: `"${file}"`,
+    sourceTree: '"<group>"',
+    lastKnownFileType,
+    includeInIndex: 0,
+  };
+  fileRefSection[`${uuid}_comment`] = basename;
+  return uuid;
+}
+
+function ensureFrameworksBuildPhase(ctx: PbxContext, target: string): Record<string, unknown> {
+  try {
+    const phase = ctx.proj.pbxFrameworksBuildPhaseObj(target) as Record<string, unknown>;
+    phase.files = (phase.files as unknown[]) ?? [];
+    return phase;
+  } catch {
+    ctx.proj.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", target);
+    const phase = ctx.proj.pbxFrameworksBuildPhaseObj(target) as Record<string, unknown>;
+    phase.files = (phase.files as unknown[]) ?? [];
+    return phase;
+  }
+}
+
+function addBuildFileToPhase(
+  ctx: PbxContext,
+  phase: Record<string, unknown>,
+  fileRefUuid: string,
+  basename: string,
+  phaseName: string,
+  attributes?: string[]
+): void {
+  const files = (phase.files ??= []) as Array<{ value?: string; comment?: string }>;
+  if (files.some((file) => file.comment === `${basename} in ${phaseName}`)) return;
+
+  const buildUuid = ctx.proj.generateUuid();
+  const buildFileSection = objectSection(ctx.proj, "PBXBuildFile");
+  const buildFile: Record<string, unknown> = {
+    isa: "PBXBuildFile",
+    fileRef: fileRefUuid,
+    fileRef_comment: basename,
+  };
+  if (attributes?.length) {
+    buildFile.settings = { ATTRIBUTES: attributes };
+  }
+  buildFileSection[buildUuid] = buildFile;
+  buildFileSection[`${buildUuid}_comment`] = `${basename} in ${phaseName}`;
+  files.push({ value: buildUuid, comment: `${basename} in ${phaseName}` });
+}
+
 function ensureCopyFilesBuildPhase(ctx: PbxContext, target: string): Record<string, unknown> {
   const section = objectSection(ctx.proj, "PBXCopyFilesBuildPhase");
   for (const [uuid, raw] of Object.entries(section)) {
     if (uuid.endsWith("_comment") || !raw || typeof raw !== "object") continue;
     const phase = raw as Record<string, unknown>;
     const name = String(phase.name ?? "").replace(/^"|"$/g, "");
-    if (name === "Copy Files" || section[`${uuid}_comment`] === "Copy Files") {
+    if (name === "Embed Frameworks" || section[`${uuid}_comment`] === "Embed Frameworks") {
       phase.files = (phase.files as unknown[]) ?? [];
       return phase;
     }
@@ -221,15 +299,15 @@ function ensureCopyFilesBuildPhase(ctx: PbxContext, target: string): Record<stri
     dstPath: '""',
     dstSubfolderSpec: 10,
     files: [],
-    name: '"Copy Files"',
+    name: '"Embed Frameworks"',
     runOnlyForDeploymentPostprocessing: 0,
   };
   section[uuid] = phase;
-  section[`${uuid}_comment`] = "Copy Files";
+  section[`${uuid}_comment`] = "Embed Frameworks";
   const native = ctx.proj.pbxNativeTargetSection?.()[target] as { buildPhases?: Array<{ value: string; comment: string }> };
   native.buildPhases ??= [];
   if (!native.buildPhases.some((p) => p.value === uuid)) {
-    native.buildPhases.push({ value: uuid, comment: "Copy Files" });
+    native.buildPhases.push({ value: uuid, comment: "Embed Frameworks" });
   }
   return phase;
 }
@@ -289,9 +367,13 @@ export function addSourceOrResourceFile(ctx: PbxContext, relPathFromSrcRoot: str
   const target = targetKey(ctx.proj, ctx.targetName);
   if (file.endsWith(".h")) {
     ctx.proj.addHeaderFile(file, { target });
-  } else if (file.endsWith(".m") || file.endsWith(".mm") || file.endsWith(".swift")) {
+  } else if (file.endsWith(".m") || file.endsWith(".mm") || file.endsWith(".swift") || file.endsWith(".xcdatamodeld")) {
     try {
-      ctx.proj.addSourceFile(file, { target });
+      if (file.endsWith(".xcdatamodeld")) {
+        addSourceFileManually(ctx, file, "wrapper.xcdatamodel");
+      } else {
+        ctx.proj.addSourceFile(file, { target });
+      }
     } catch (e) {
       if (!String(e instanceof Error ? e.message : e).includes("path")) throw e;
       addSourceFileManually(ctx, file);
@@ -327,7 +409,7 @@ function sourceFileType(file: string): string {
   return "sourcecode.c.objc";
 }
 
-function addSourceFileManually(ctx: PbxContext, file: string): void {
+function addSourceFileManually(ctx: PbxContext, file: string, lastKnownFileType?: string): void {
   const basename = path.basename(file);
   ensureSourcesBuildPhase(ctx.proj, ctx.targetName);
   const sources = ctx.proj.pbxSourcesBuildPhaseObj(targetKey(ctx.proj, ctx.targetName));
@@ -344,7 +426,7 @@ function addSourceFileManually(ctx: PbxContext, file: string): void {
     name: `"${basename}"`,
     path: `"${file}"`,
     sourceTree: '"<group>"',
-    lastKnownFileType: sourceFileType(file),
+    lastKnownFileType: lastKnownFileType ?? sourceFileType(file),
   };
   fileRefSection[`${fileRefUuid}_comment`] = basename;
   buildFileSection[buildUuid] = {
@@ -394,7 +476,7 @@ function addResourceFileManually(ctx: PbxContext, file: string, lastKnownFileTyp
   files.push({ value: buildUuid, comment: `${basename} in Resources` });
 }
 
-export function setBuildSetting(ctx: PbxContext, key: string, value: string): void {
+export function setBuildSetting(ctx: PbxContext, key: string, value: unknown): void {
   const uuid = targetUuid(ctx.proj, ctx.targetName);
   if (!uuid) return;
   const native = ctx.proj.pbxNativeTargetSection?.()[uuid] as { buildConfigurationList?: string };

package/src/ops/fileStore.ts

@@ -4,7 +4,7 @@ import path from "node:path";
 /** Tracks text file originals and pending content for dry-run / apply */
 export class TextFileStore {
   private readonly projectRoot: string;
-  private readonly map = new Map<string, { original: string; current: string }>();
+  private readonly map = new Map<string, { original: string; current: string; existed: boolean }>();
 
   constructor(projectRoot: string) {
     this.projectRoot = projectRoot;
@@ -20,7 +20,7 @@ export class TextFileStore {
     const abs = path.join(this.projectRoot, rel);
     if (!fs.existsSync(abs)) return "";
     const content = fs.readFileSync(abs, "utf8");
-    this.map.set(rel, { original: content, current: content });
+    this.map.set(rel, { original: content, current: content, existed: true });
     return content;
   }
 
@@ -32,22 +32,23 @@ export class TextFileStore {
       return;
     }
     let original = "";
-    if (fs.existsSync(abs)) original = fs.readFileSync(abs, "utf8");
-    this.map.set(rel, { original, current: content });
+    const existed = fs.existsSync(abs);
+    if (existed) original = fs.readFileSync(abs, "utf8");
+    this.map.set(rel, { original, current: content, existed });
   }
 
   /** Files where current !== original */
   changedEntries(): Array<{ rel: string; original: string; current: string }> {
     const out: Array<{ rel: string; original: string; current: string }> = [];
     for (const [rel, v] of this.map) {
-      if (v.current !== v.original) out.push({ rel, original: v.original, current: v.current });
+      if (!v.existed || v.current !== v.original) out.push({ rel, original: v.original, current: v.current });
     }
     return out;
   }
 
   flushToDisk(): void {
     for (const [rel, v] of this.map) {
-      if (v.current === v.original) continue;
+      if (v.existed && v.current === v.original) continue;
       const abs = path.join(this.projectRoot, rel);
       fs.mkdirSync(path.dirname(abs), { recursive: true });
       fs.writeFileSync(abs, v.current, "utf8");