peachsim 0.1.2221 → 0.1.2223

package/src/xcode-target-members.ts

@@ -4,6 +4,8 @@ import { isDict, list, str, type PlistDict } from './openstep-plist'
 
 const NEVER_MEMBER =
   /(?:^|\/)(?:Info\.plist|[^/]+\.entitlements|[^/]+\.xcconfig|\.DS_Store)$/
+// a folder reference and a scenekit asset catalog copy as one directory of that name.
+const FOLDER_REFERENCE = /^(?:folder|wrapper\.scnassets)$/
 const BUNDLE_DIR =
   /\.(xcassets|bundle|lproj|xcdatamodeld|scnassets|spriteatlas|rcproject|storyboardc|icon)$/
 
@@ -71,7 +73,11 @@ export function xcodeTargetMemberVisitor(objects: PlistDict) {
     resolvePath: (id: string) => string | null,
     filesUnder: (path: string) => string[],
     join: (base: string, own: string) => string,
-    visit: (file: string, kind: 'source' | 'header' | 'resource') => void,
+    visit: (
+      file: string,
+      kind: 'source' | 'header' | 'resource',
+      bundleName?: string,
+    ) => void,
   ): void => {
     const target = objects[targetId]
     if (!isDict(target)) return
@@ -93,8 +99,24 @@ export function xcodeTargetMemberVisitor(objects: PlistDict) {
         for (const id of refs) {
           const file = resolvePath(id)
           if (file === null) continue
-          if (phase.isa === 'PBXSourcesBuildPhase') visit(file, 'source')
-          else for (const inner of filesUnder(file)) visit(inner, 'resource')
+          if (phase.isa === 'PBXSourcesBuildPhase') {
+            visit(file, 'source')
+            continue
+          }
+          const ref = objects[id]
+          const type = isDict(ref)
+            ? (str(ref.lastKnownFileType) ?? str(ref.explicitFileType) ?? '')
+            : ''
+          const root = file.replace(/[\\/]+$/, '')
+          const folder = FOLDER_REFERENCE.test(type)
+            ? root.split(/[\\/]/).pop()
+            : undefined
+          for (const inner of filesUnder(file))
+            visit(
+              inner,
+              'resource',
+              folder && `${folder}/${inner.slice(root.length + 1).replaceAll('\\', '/')}`,
+            )
         }
       }
     }