Load Info.plist string value using generated function

Author: tomlokhorst

ResourceApp/ResourceAppTests/InfoPlistTests.swift

@@ -17,27 +17,6 @@ class InfoPlistTests: XCTestCase {
   }
 
   func testVariable() {
-//    let x = (Bundle.main.object(forInfoDictionaryKey: "NSExtension") as? [String: Any])?["NSExtensionPrincipalClass"] as? String
     XCTAssertEqual(R.info.nsExtension.nsExtensionPrincipalClass, "ResourceApp.IntentHandler")
   }
 }
-
-//<key>NSExtension</key>
-//<dict>
-//  <key>NSExtensionAttributes</key>
-//  <dict>
-//    <key>IntentsRestrictedWhileLocked</key>
-//    <array/>
-//    <key>IntentsRestrictedWhileProtectedDataUnavailable</key>
-//    <array/>
-//    <key>IntentsSupported</key>
-//    <array>
-//      <string>PlanTripIntent</string>
-//      <string>ShowDeparturesIntent</string>
-//    </array>
-//  </dict>
-//  <key>NSExtensionPointIdentifier</key>
-//  <string>com.apple.intents-service</string>
-//  <key>NSExtensionPrincipalClass</key>
-//  <string>$(PRODUCT_MODULE_NAME).IntentHandler</string>
-//</dict>

Sources/RswiftCore/Generators/PropertyListGenerator.swift

@@ -77,13 +77,15 @@ struct PropertyListGenerator: ExternalOnlyStructGenerator {
 
   private func propertyFromInfoString(key: String, value: String, path: [String], at externalAccessLevel: AccessLevel) -> Let {
 
+    let steps = path.map { "\"\($0.escapedStringLiteral)\"" }.joined(separator: ", ")
+
     let isKey = key == "_key"
     let letValue: String = isKey
       ? "\"\(value.escapedStringLiteral)\""
-      : "_infoDictionary?[\"\(key)\"] as? String ?? \"\(value.escapedStringLiteral)\""
+      : "infoPlistString(path: [\(steps)], key: \"\(key.escapedStringLiteral)\") ?? \"\(value.escapedStringLiteral)\""
 
     return Let(
-      comments: isKey ? [] : [value],
+      comments: [],
       accessModifier: externalAccessLevel,
       isStatic: true,
       name: SwiftIdentifier(name: key),
@@ -99,35 +101,18 @@ struct PropertyListGenerator: ExternalOnlyStructGenerator {
         var ps = path
         ps.append(key)
 
-        let info = path.reduce("hostingBundle.infoDictionary", { (source, step) in
-          "(\(source)?[\"\(step)\"] as? [String: Any])"
-        })
-        let object = Let(
-          comments: [],
-          accessModifier: .privateLevel,
-          isStatic: true,
-          name: "_infoDictionary",
-          typeDefinition: .inferred(nil),
-          value: info
-        )
-
         switch value {
         case let array as [String]:
-          var props = array.map { item in
-            propertyFromInfoString(key: item, value: item, path: ps, at: externalAccessLevel)
-          }
-          if !props.isEmpty {
-            props.append(object)
-          }
-
           return Struct(
             availables: [],
             comments: [],
             accessModifier: externalAccessLevel,
             type: Type(module: .host, name: SwiftIdentifier(name: key)),
             implements: [],
             typealiasses: [],
-            properties: props,
+            properties: array.map { item in
+              propertyFromInfoString(key: item, value: item, path: ps, at: externalAccessLevel)
+            },
             functions: [],
             structs: [],
             classes: [],
@@ -136,10 +121,6 @@ struct PropertyListGenerator: ExternalOnlyStructGenerator {
 
         case var dict as [String: Any]:
           dict["_key"] = key
-          var props = propertiesFromInfoPlist(contents: dict, path: ps, at: externalAccessLevel)
-          if !props.isEmpty {
-            props.append(object)
-          }
 
           return Struct(
             availables: [],
@@ -148,7 +129,7 @@ struct PropertyListGenerator: ExternalOnlyStructGenerator {
             type: Type(module: .host, name: SwiftIdentifier(name: key)),
             implements: [],
             typealiasses: [],
-            properties: props,
+            properties: propertiesFromInfoPlist(contents: dict, path: ps, at: externalAccessLevel),
             functions: [],
             structs: structsFromInfoPlist(contents: dict, path: ps, at: externalAccessLevel),
             classes: [],

Sources/RswiftCore/Util/Struct+InternalProperties.swift

@@ -33,6 +33,29 @@ extension Struct {
     ]
 
     let internalFunctions = [
+      Function(
+        availables: [],
+        comments: ["Load string from Info.plist file"],
+        accessModifier: .filePrivate,
+        isStatic: true,
+        name: "infoPlistString",
+        generics: nil,
+        parameters: [
+          .init(name: "path", type: Type._Array.withGenericArgs([Type._String])),
+          .init(name: "key", type: Type._String)
+        ],
+        doesThrow: false,
+        returnType: Type._String.asOptional(),
+        body: """
+          var dict = hostingBundle.infoDictionary
+          for step in path {
+            guard let obj = dict?[step] as? [String: Any] else { return nil }
+            dict = obj
+          }
+          return dict?[key] as? String
+          """,
+        os: []
+      ),
       Function(
         availables: [],
         comments: ["Find first language and bundle for which the table exists"],
@@ -106,7 +129,8 @@ extension Struct {
           // If table is not found for requested languages, key will be shown
           return nil
           """,
-        os: [])
+        os: []
+      )
     ]
 
     var externalStruct = self