Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PREFIX?=/usr/local

PRODUCT_NAME=analyticsgen
PRODUCT_VERSION=0.6.9
PRODUCT_VERSION=0.6.10
TEMPLATES_NAME=Templates
README_NAME=README.md
LICENSE_NAME=LICENSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,18 @@ final class DefaultEventGenerator: EventGenerator {
hasParametersToInit: !internalEvent
.parameters
.filter { !$0.type.oneOf.isNil || !$0.type.swiftType.isNil }
.isEmpty
.isEmpty,
isForDesignSystem: event.isForDesignSystem ?? false,
isDesignSystem: event.isDesignSystem ?? false,
hhtmSource: internalEvent.hhtmSource.map { hhtmSource in
InternalEventContext.Parameter(
name: hhtmSource.name,
description: hhtmSource.description,
oneOf: hhtmSource.type.oneOf,
const: hhtmSource.type.const,
type: hhtmSource.type.swiftType
)
}
)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@ struct InternalEventContext: Encodable {
let schemePath: String
let parameters: [Parameter]?
let hasParametersToInit: Bool
let isForDesignSystem: Bool
let isDesignSystem: Bool
let hhtmSource: Parameter?
}
2 changes: 2 additions & 0 deletions Sources/AnalyticsGen/Models/Event/Event.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ struct Event: Decodable {
let external: ExternalEvent?
let `internal`: InternalEvent?
let name: String
let isForDesignSystem: Bool?
let isDesignSystem: Bool?
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ struct InternalEvent: Decodable {
let platform: EventPlatform?
let sql: String?
let parameters: [InternalEventParameter]
let hhtmSource: InternalEventParameter?

// MARK: -

Expand All @@ -66,6 +67,7 @@ struct InternalEvent: Decodable {
self.event = try container.decode(forKey: .event)
self.platform = try container.decodeIfPresent(forKey: .platform)
self.sql = try container.decodeIfPresent(forKey: .sql)
self.hhtmSource = try container.decodeIfPresent(forKey: .hhtmSource)

self.parameters = try container
.allKeys
Expand Down
2 changes: 1 addition & 1 deletion Sources/AnalyticsGen/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ private extension String {

// MARK: - Type Properties

static let version = "0.6.9"
static let version = "0.6.10"
static let description = "Generate analytics code for you Swift iOS project"
}