New imageicon interface

Sources/Charcoal/SwiftUI/Images/Image.swift

@@ -0,0 +1,26 @@
+import SwiftUI
+
+extension Image {
+    @inlinable init(charocalIcon: CharcoalAsset.Images) {
+        self.init(asset: charocalIcon.imageAsset)
+    }
+}
+
+// MARK: Development View
+
+fileprivate struct ImageView: View {
+    var body: some View {
+        VStack {
+            Image(charocalIcon: .add24)
+            Image(charocalIcon: .delete32)
+            Image(charocalIcon: .addInline)
+            Image(charocalIcon: .codes24)
+        }
+    }
+}
+
+struct ImageView_Previews: PreviewProvider {
+    static var previews: some View {
+        ImageView()
+    }
+}

stencils/assets-template.stencil

@@ -1,6 +1,9 @@
 // swiftlint:disable all
 // Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
+{% import "macros/enum-cases.stencil" %}
 {% import "macros/enum-cases-color.stencil" %}
+{% import "macros/enum-cases-image.stencil" %}
+{% import "macros/enum-cases-flat-images.stencil" %}
 {% if catalogs %}
 {% macro hasValuesBlock assets filter %}
   {%- for asset in assets -%}
@@ -11,6 +14,14 @@
     {%- endif -%}
   {%- endfor -%}
 {% endmacro %}
+
+{% macro hasValuesNoRecursionBlock assets filter %}
+  {%- for asset in assets -%}
+    {%- if asset.type == filter -%}
+      1
+    {%- endif -%}
+  {%- endfor -%}
+{% endmacro %}
 {% set enumName %}{{param.enumName|default:"Asset"}}{% endset %}
 {% set arResourceGroupType %}{{param.arResourceGroupTypeName|default:"ARResourceGroupAsset"}}{% endset %}
 {% set colorType %}{{param.colorTypeName|default:"ColorAsset"}}{% endset %}
@@ -53,14 +64,12 @@
 // MARK: - Asset Catalogs
 
 {% macro enumBlock assets %}
-  {% call casesBlock assets %}
+  {% call casesBlock assets assets.name %}
 
-  {% call enumCasesBlock assets %}
+  {% set assetsHasGroup %}{% call hasValuesNoRecursionBlock assets "group" %}{% endset %}
 
-  {% set catalogHasColor %}{% call hasValuesBlock assets "color" %}{% endset %}
-  {# Generate Charcoral Color Asset Enum #}
-  {% if catalogHasColor %}
-  {% call enumCasesColorBlock assets %}
+  {% if assetsHasGroup %}
+    {% filter indent:2," ",true %}{% call enumCasesFlatImagesBlock assets %}{% endfilter %}
   {% endif %}
 
   {% if param.allValues %}
@@ -104,33 +113,39 @@
   // swiftlint:enable trailing_comma
   {% endif %}
 {% endmacro %}
-{% macro casesBlock assets %}
+{% macro casesBlock assets assetsGroupName %}
   {% for asset in assets %}
   {% if asset.type == "arresourcegroup" %}
   {{accessModifier}} static let {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}} = {{arResourceGroupType}}(name: "{{asset.value}}")
   {% elif asset.type == "color" %}
-  static let {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}}Asset = {{colorType}}(name: "{{asset.value}}")
+  static let {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord}}Asset = {{colorType}}(name: "{{asset.value}}")
   {% elif asset.type == "data" %}
   {{accessModifier}} static let {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}} = {{dataType}}(name: "{{asset.value}}")
   {% elif asset.type == "image" %}
-  {{accessModifier}} static let {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}} = {{imageType}}(name: "{{asset.value}}")
+  {{accessModifier}} static let {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord}}Asset = {{imageType}}(name: "{{asset.value}}")
   {% elif asset.type == "symbol" %}
   {{accessModifier}} static let {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}} = {{symbolType}}(name: "{{asset.value}}")
   {% elif asset.items and ( forceNamespaces == "true" or asset.isNamespaced == "true" ) %}
-  {{accessModifier}} enum {{asset.name|swiftIdentifier:"pretty"|escapeReservedKeywords}} {
-    {% filter indent:2," ",true %}{% call casesBlock asset.items %}{% endfilter %}
+  {{accessModifier}} enum {{asset.name|swiftIdentifier:"pretty"|escapeReservedKeywords}} : CaseIterable {
+    {% filter indent:2," ",true %}{% call casesBlock asset.items asset.name %}{% endfilter %}
   }
   {% elif asset.items %}
   {% call casesBlock asset.items %}
   {% endif %}
   {% endfor %}
-{% endmacro %}
-{% macro enumCasesBlock assets %}
-  {% for asset in assets %}
-  {% if asset.type == "color" %}
-  case {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}}
+
+  {% set catalogHasColor %}{% call hasValuesNoRecursionBlock assets "color" %}{% endset %}
+  {# Generate Charcoral Color Asset Enum #}
+  {% if catalogHasColor %}
+  {% call enumCasesBlock assets %}
+  {% call enumCasesColorBlock assets %}
   {% endif %}
-  {% endfor %}
+
+  {# {% set catalogHasImage %}{% call hasValuesNoRecursionBlock assets "image" %}{% endset %} #}
+  {# Generate Charcoral Image Asset Enum #}
+  {# {% if catalogHasImage and assetsGroupName %} #}
+  {# {% call enumCasesImageBlock assets assetsGroupName %} #}
+  {# {% endif %} #}
 {% endmacro %}
 {% macro allValuesBlock assets filter prefix %}
   {% for asset in assets %}
@@ -148,7 +163,7 @@
 {{accessModifier}} enum {{enumName}} {
   {% if catalogs.count > 1 or param.forceFileNameEnum %}
   {% for catalog in catalogs %}
-  {{accessModifier}} enum {{catalog.name|swiftIdentifier:"pretty"|escapeReservedKeywords}} {
+  {{accessModifier}} enum {{catalog.name|swiftIdentifier:"pretty"|escapeReservedKeywords}} : CaseIterable {
     {% if catalog.assets %}
     {% filter indent:2," ",true %}{% call enumBlock catalog.assets %}{% endfilter %}
     {% endif %}

stencils/macros/enum-cases-flat-images.stencil

@@ -0,0 +1,30 @@
+{% macro enumCasesFlatImagesBlock assets %}
+{% for asset in assets %}
+{% if asset.items %}
+{% for item in asset.items %}
+case {{item.name | swiftIdentifier:"pretty"|lowerFirstWord}}{{asset.name}}
+{% endfor %}
+{% endif %}
+{% endfor %}
+
+{% set groupHasImage %}{% call hasValuesBlock assets "image" %}{% endset %}
+{% if groupHasImage %}
+{{accessModifier}} var imageAsset: ImageAsset {
+  switch (self) {
+    {% for asset in assets %}
+    {% if asset.items %}
+    {% for item in asset.items %}
+    {% if item.type == "image" %}
+    case .{{item.name|swiftIdentifier:"pretty"|lowerFirstWord}}{{asset.name}}:
+      return {{enumName}}.{{catalog.name|swiftIdentifier:"pretty"}}.{{asset.name|swiftIdentifier:"pretty"}}.{{item.name|swiftIdentifier:"pretty"|lowerFirstWord}}Asset
+    {% endif %}
+    {% endfor %}
+    {% endif %}
+    {% endfor %}
+  }
+}
+{{accessModifier}} var image: ImageAsset.Image {
+  return imageAsset.image
+}
+{% endif %}
+{% endmacro %}

stencils/macros/enum-cases-image.stencil

@@ -0,0 +1,15 @@
+{% macro enumCasesImageBlock assets assetsGroupName%}
+  {{accessModifier}} var imageAsset: ImageAsset {
+    switch (self) {
+      {% for asset in assets %}
+      {% if asset.type == "image" %}
+      case .{{asset.name|swiftIdentifier:"pretty"|lowerFirstWord}}:
+        return {{enumName}}.{{catalog.name|swiftIdentifier:"pretty"}}.{{assetsGroupName|swiftIdentifier:"pretty"}}.{{asset.name|swiftIdentifier:"pretty"|lowerFirstWord}}Asset
+      {% endif %}
+      {% endfor %}
+    }
+  }
+  {{accessModifier}} var image: ImageAsset.Image {
+    return imageAsset.image
+  }
+{% endmacro %}

stencils/macros/enum-cases.stencil

@@ -0,0 +1,7 @@
+{% macro enumCasesBlock assets %}
+  {% for asset in assets %}
+  {% if not asset.items %}
+  case {{asset.name|swiftIdentifier:"pretty"|lowerFirstWord|escapeReservedKeywords}}
+  {% endif %}
+  {% endfor %}
+{% endmacro %}