@leonxin/meetgames 0.1.14 → 0.1.15

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");

package/tests/meetSdkRemoteConfig.test.ts

@@ -53,7 +53,7 @@ describe("meetSdkRemoteConfig", () => {
           naver: { clientId: "naver-client", secret: "naver-secret", name: "Naver", scheme: "naver-scheme" },
           apple: {},
         },
-        payment: {},
+        payment: { appleIap: {} },
         analytics: {
           appsflyer: { devKey: "af-key", appleAppId: "1234567890" },
           firebase: { firebaseUrl: "https://cdn.example/GoogleService-Info.plist", firebaseName: "GoogleService-Info.plist" },
@@ -82,6 +82,7 @@ describe("meetSdkRemoteConfig", () => {
       devKey: "af-key",
       appleAppId: "1234567890",
     });
+    expect(parsed!.sdkModules.payment.appleIap).toMatchObject({});
   });
 
   it("does not treat legacy remote field names as valid config", () => {

package/tests/pipeline.ios.test.ts

@@ -50,7 +50,7 @@ function writeNativeSampleRemoteConfig(projectRoot: string): void {
         apple: {},
       },
       payment: {
-        googleIap: {},
+        appleIap: {},
       },
       analytics: {
         appsflyer: {
@@ -156,11 +156,19 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPCore.framework"))).toBe(true);
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPSDK.framework"))).toBe(true);
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPGuestSigninPlugin.framework"))).toBe(true);
+      expect(fs.existsSync(path.join(tmp, "topSDK", "TOPIAPPayPlugin.framework"))).toBe(true);
+      expect(fs.readFileSync(path.join(tmp, "topSDK", "TopSDKInstall.swift"), "utf8")).toBe("");
       expect(fs.existsSync(path.join(tmp, "topSDK", "TopSDKSource.bundle"))).toBe(true);
 
       const pbx = fs.readFileSync(path.join(tmp, "native-sample.xcodeproj", "project.pbxproj"), "utf8");
       expect(pbx).toContain("TOPCore.framework");
       expect(pbx).toContain("TOPGuestSigninPlugin.framework");
+      expect(pbx).toContain("TOPIAPPayPlugin.framework in Frameworks");
+      expect(pbx).toContain("TOPCoreModel.xcdatamodeld in Sources");
+      expect(pbx).not.toContain("TOPCoreModel.xcdatamodeld in Resources");
+      expect(pbx).not.toContain("FBSDKLoginKit.xcframework in Resources");
+      expect(pbx).toContain("LIBRARY_SEARCH_PATHS = \"$(SRCROOT)/topSDK\"");
+      expect(pbx).toContain("SWIFT_VERSION = 5.0");
       expect(pbx).toContain('"-ObjC"');
       expect(pbx).toContain("libc++.tbd");
       expect(pbx).not.toMatch(/\n\s+-ObjC,/);
@@ -177,6 +185,8 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
       expect(plist).toContain("<key>APP_ID</key>");
       expect(plist).toContain("mock-ios-native-sample-app-id");
       expect(plist).toContain("GuestSignin");
+      expect(plist).toContain("IAPPay");
+      expect(plist).not.toContain("NSAppTransportSecurity");
     } finally {
       fs.rmSync(tmp, { recursive: true, force: true });
     }
@@ -548,7 +558,7 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios native-sample parity", () =
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPGoogleSigninPlugin.framework"))).toBe(true);
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPAppleSigninPlugin.framework"))).toBe(true);
       expect(fs.existsSync(path.join(tmp, "topSDK", "TopSDKSource.bundle"))).toBe(true);
-      expect(fs.existsSync(path.join(tmp, "native-sample", "TopSDKInstall.swift"))).toBe(true);
+      expect(fs.readFileSync(path.join(tmp, "topSDK", "TopSDKInstall.swift"), "utf8")).toBe("");
 
       const pbx = fs.readFileSync(path.join(tmp, "native-sample.xcodeproj", "project.pbxproj"), "utf8");
       expect(pbx).toContain("TOPUIPlugin.framework");