diff --git a/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableComponent.swift b/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableComponent.swift index b6bac1ef..523e6b14 100644 --- a/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableComponent.swift +++ b/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableComponent.swift @@ -21,7 +21,7 @@ import Foundation /// representation does not have the reference between the pluginized component /// and its non-core one. Since it is the pure AST representation, it only /// has the type name of the non-core component. -class PluginizableASTComponent { +class PluginizedASTComponent { /// The actual data of this component. let data: ASTComponent /// The type name of the plugin extension. @@ -34,8 +34,8 @@ class PluginizableASTComponent { var pluginExtension: PluginExtension? /// Convert the mutable reference type into a thread-safe value type. - var valueType: PluginizableComponent { - return PluginizableComponent(data: data.valueType, nonCoreComponent: nonCoreComponent!.valueType, pluginExtension: pluginExtension!) + var valueType: PluginizedComponent { + return PluginizedComponent(data: data.valueType, nonCoreComponent: nonCoreComponent!.valueType, pluginExtension: pluginExtension!) } /// Initializer. @@ -53,7 +53,7 @@ class PluginizableASTComponent { /// A data model representing an extended component that may be a pluginized /// component with a referenced non-core component. -struct PluginizableComponent { +struct PluginizedComponent { /// The actual data of this component. let data: Component /// The non-core component. diff --git a/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableDependencyGraphNode.swift b/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableDependencyGraphNode.swift index a2ebe97a..ffa88cb3 100644 --- a/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableDependencyGraphNode.swift +++ b/Generator/Sources/NeedleFramework/Models/Pluginized/PluginizableDependencyGraphNode.swift @@ -18,9 +18,9 @@ import Foundation /// An extended data model representing a node in the dependency graph. /// The components may be pluginized components or regular ones. -struct PluginizableDependencyGraphNode { - /// The list of pluginizable components in this node. - let pluginizableComponents: [PluginizableASTComponent] +struct PluginizedDependencyGraphNode { + /// The list of pluginized components in this node. + let pluginizedComponents: [PluginizedASTComponent] /// The list of non-core components in this node. let nonCoreComponents: [ASTComponent] /// The list of plugin extensions in this node. diff --git a/Generator/Sources/NeedleFramework/Parsing/Pluginized/PluginizableDependencyGraphParser.swift b/Generator/Sources/NeedleFramework/Parsing/Pluginized/PluginizableDependencyGraphParser.swift index 74c704ed..7c8bba23 100644 --- a/Generator/Sources/NeedleFramework/Parsing/Pluginized/PluginizableDependencyGraphParser.swift +++ b/Generator/Sources/NeedleFramework/Parsing/Pluginized/PluginizableDependencyGraphParser.swift @@ -19,7 +19,7 @@ import Foundation /// The entry utility for the parsing phase. The parser deeply scans a /// directory and parses the relevant Swift source files, and finally /// outputs the dependency graph. -class PluginizableDependencyGraphParser { +class PluginizedDependencyGraphParser { /// Parse all the Swift sources within the directory of given URL, /// excluding any file that contains a suffix specified in the given @@ -34,21 +34,21 @@ class PluginizableDependencyGraphParser { /// data models and sorted import statements. /// - throws: `DependencyGraphParserError.timeout` if parsing a Swift /// source timed out. - func parse(from rootUrl: URL, excludingFilesWithSuffixes exclusionSuffixes: [String] = [], using executor: SequenceExecutor) throws -> ([Component], [PluginizableComponent], [String]) { + func parse(from rootUrl: URL, excludingFilesWithSuffixes exclusionSuffixes: [String] = [], using executor: SequenceExecutor) throws -> ([Component], [PluginizedComponent], [String]) { let urlHandles: [UrlSequenceHandle] = enqueueParsingTasks(with: rootUrl, excludingFilesWithSuffixes: exclusionSuffixes, using: executor) - let (pluginizableComponents, nonCoreComponents, pluginExtensions, components, dependencies, imports) = try collectDataModels(with: urlHandles) - return process(pluginizableComponents, nonCoreComponents, pluginExtensions, components, dependencies, imports) + let (pluginizedComponents, nonCoreComponents, pluginExtensions, components, dependencies, imports) = try collectDataModels(with: urlHandles) + return process(pluginizedComponents, nonCoreComponents, pluginExtensions, components, dependencies, imports) } // MARK: - Private - private func enqueueParsingTasks(with rootUrl: URL, excludingFilesWithSuffixes exclusionSuffixes: [String], using executor: SequenceExecutor) -> [(SequenceExecutionHandle, URL)] { - var taskHandleTuples = [(handle: SequenceExecutionHandle, fileUrl: URL)]() + private func enqueueParsingTasks(with rootUrl: URL, excludingFilesWithSuffixes exclusionSuffixes: [String], using executor: SequenceExecutor) -> [(SequenceExecutionHandle, URL)] { + var taskHandleTuples = [(handle: SequenceExecutionHandle, fileUrl: URL)]() // Enumerate all files and execute parsing sequences concurrently. let enumerator = FileEnumerator() enumerator.enumerate(from: rootUrl) { (fileUrl: URL) in - let task = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: exclusionSuffixes) + let task = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: exclusionSuffixes) let taskHandle = executor.executeSequence(from: task, with: nextExecution(after:with:)) taskHandleTuples.append((taskHandle, fileUrl)) } @@ -56,25 +56,25 @@ class PluginizableDependencyGraphParser { return taskHandleTuples } - private func nextExecution(after currentTask: Task, with currentResult: Any) -> SequenceExecution { - if currentTask is PluginizableFileFilterTask, let filterResult = currentResult as? FilterResult { + private func nextExecution(after currentTask: Task, with currentResult: Any) -> SequenceExecution { + if currentTask is PluginizedFileFilterTask, let filterResult = currentResult as? FilterResult { switch filterResult { case .shouldParse(let url, let content): return .continueSequence(ASTProducerTask(sourceUrl: url, sourceContent: content)) case .skip: - return .endOfSequence(PluginizableDependencyGraphNode(pluginizableComponents: [], nonCoreComponents: [], pluginExtensions: [], components: [], dependencies: [], imports: [])) + return .endOfSequence(PluginizedDependencyGraphNode(pluginizedComponents: [], nonCoreComponents: [], pluginExtensions: [], components: [], dependencies: [], imports: [])) } } else if currentTask is ASTProducerTask, let ast = currentResult as? AST { - return .continueSequence(PluginizableASTParserTask(ast: ast)) - } else if currentTask is PluginizableASTParserTask, let node = currentResult as? PluginizableDependencyGraphNode { + return .continueSequence(PluginizedASTParserTask(ast: ast)) + } else if currentTask is PluginizedASTParserTask, let node = currentResult as? PluginizedDependencyGraphNode { return .endOfSequence(node) } else { fatalError("Unhandled task \(currentTask) with result \(currentResult)") } } - private func collectDataModels(with urlHandles: [UrlSequenceHandle]) throws -> ([PluginizableASTComponent], [ASTComponent], [PluginExtension], [ASTComponent], [Dependency], Set) { - var pluginizableComponents = [PluginizableASTComponent]() + private func collectDataModels(with urlHandles: [UrlSequenceHandle]) throws -> ([PluginizedASTComponent], [ASTComponent], [PluginExtension], [ASTComponent], [Dependency], Set) { + var pluginizedComponents = [PluginizedASTComponent]() var nonCoreComponents = [ASTComponent]() var pluginExtensions = [PluginExtension]() var components = [ASTComponent]() @@ -83,7 +83,7 @@ class PluginizableDependencyGraphParser { for urlHandle in urlHandles { do { let node = try urlHandle.handle.await(withTimeout: 30) - pluginizableComponents.append(contentsOf: node.pluginizableComponents) + pluginizedComponents.append(contentsOf: node.pluginizedComponents) nonCoreComponents.append(contentsOf: node.nonCoreComponents) pluginExtensions.append(contentsOf: node.pluginExtensions) components.append(contentsOf: node.components) @@ -97,21 +97,21 @@ class PluginizableDependencyGraphParser { fatalError("Unhandled task execution error \(error)") } } - return (pluginizableComponents, nonCoreComponents, pluginExtensions, components, dependencies, imports) + return (pluginizedComponents, nonCoreComponents, pluginExtensions, components, dependencies, imports) } - private func process(_ pluginizableComponents: [PluginizableASTComponent], _ nonCoreComponents: [ASTComponent], _ pluginExtensions: [PluginExtension], _ components: [ASTComponent], _ dependencies: [Dependency], _ imports: Set) -> ([Component], [PluginizableComponent], [String]) { + private func process(_ pluginizedComponents: [PluginizedASTComponent], _ nonCoreComponents: [ASTComponent], _ pluginExtensions: [PluginExtension], _ components: [ASTComponent], _ dependencies: [Dependency], _ imports: Set) -> ([Component], [PluginizedComponent], [String]) { var allComponents = nonCoreComponents + components - let pluginizableComponentData = pluginizableComponents.map { (component: PluginizableASTComponent) -> ASTComponent in + let pluginizedComponentData = pluginizedComponents.map { (component: PluginizedASTComponent) -> ASTComponent in component.data } - allComponents.append(contentsOf: pluginizableComponentData) + allComponents.append(contentsOf: pluginizedComponentData) let processors: [Processor] = [ DuplicateValidator(components: allComponents, dependencies: dependencies), ParentLinker(components: allComponents), DependencyLinker(components: allComponents, dependencies: dependencies), - NonCoreComponentLinker(pluginizableComponents: pluginizableComponents, nonCoreComponents: nonCoreComponents), - PluginExtensionLinker(pluginizableComponents: pluginizableComponents, pluginExtensions: pluginExtensions) + NonCoreComponentLinker(pluginizedComponents: pluginizedComponents, nonCoreComponents: nonCoreComponents), + PluginExtensionLinker(pluginizedComponents: pluginizedComponents, pluginExtensions: pluginExtensions) ] for processor in processors { do { @@ -124,7 +124,7 @@ class PluginizableDependencyGraphParser { let valueTypeComponents = components.map { (astComponent: ASTComponent) -> Component in astComponent.valueType } - let valueTypePluginizedComponents = pluginizableComponents.map { (astComponent: PluginizableASTComponent) -> PluginizableComponent in + let valueTypePluginizedComponents = pluginizedComponents.map { (astComponent: PluginizedASTComponent) -> PluginizedComponent in return astComponent.valueType } let sortedImports = imports.sorted() @@ -132,4 +132,4 @@ class PluginizableDependencyGraphParser { } } -private typealias UrlSequenceHandle = (handle: SequenceExecutionHandle, fileUrl: URL) +private typealias UrlSequenceHandle = (handle: SequenceExecutionHandle, fileUrl: URL) diff --git a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/NonCoreComponentLinker.swift b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/NonCoreComponentLinker.swift index fb7a8d53..cda37ce2 100644 --- a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/NonCoreComponentLinker.swift +++ b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/NonCoreComponentLinker.swift @@ -16,17 +16,17 @@ import Foundation -/// A processor that links non-core components to pluginizable components +/// A processor that links non-core components to pluginized components /// based on type name. class NonCoreComponentLinker: Processor { /// Initializer. /// - /// - parameter pluginizableComponents: The pluginizable components to + /// - parameter pluginizedComponents: The pluginized components to /// link with non-core components. /// - parameter nonCoreComponents: The non-core components to link. - init(pluginizableComponents: [PluginizableASTComponent], nonCoreComponents: [ASTComponent]) { - self.pluginizableComponents = pluginizableComponents + init(pluginizedComponents: [PluginizedASTComponent], nonCoreComponents: [ASTComponent]) { + self.pluginizedComponents = pluginizedComponents self.nonCoreComponents = nonCoreComponents } @@ -40,16 +40,16 @@ class NonCoreComponentLinker: Processor { nonCoreMap[nonCoreComponent.name] = nonCoreComponent } - for pluginizableComponent in pluginizableComponents { - pluginizableComponent.nonCoreComponent = nonCoreMap[pluginizableComponent.nonCoreComponentType] - if pluginizableComponent.nonCoreComponent == nil { - throw ProcessingError.fail("Cannot find \(pluginizableComponent.data.name)'s non-core component with type name \(pluginizableComponent.nonCoreComponentType)") + for pluginizedComponent in pluginizedComponents { + pluginizedComponent.nonCoreComponent = nonCoreMap[pluginizedComponent.nonCoreComponentType] + if pluginizedComponent.nonCoreComponent == nil { + throw ProcessingError.fail("Cannot find \(pluginizedComponent.data.name)'s non-core component with type name \(pluginizedComponent.nonCoreComponentType)") } } } // MARK: - Private - private let pluginizableComponents: [PluginizableASTComponent] + private let pluginizedComponents: [PluginizedASTComponent] private let nonCoreComponents: [ASTComponent] } diff --git a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/PluginExtensionLinker.swift b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/PluginExtensionLinker.swift index affccd5f..60efeb95 100644 --- a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/PluginExtensionLinker.swift +++ b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Processors/PluginExtensionLinker.swift @@ -16,17 +16,17 @@ import Foundation -/// A processor that links pluginizable components with their plugin +/// A processor that links pluginized components with their plugin /// extensions based on type name. class PluginExtensionLinker: Processor { /// Initializer. /// - /// - parameter pluginizableComponents: The pluginizable components to + /// - parameter pluginizedComponents: The pluginized components to /// link with plugin extensions. /// - parameter pluginExtensions: The non-core components to link. - init(pluginizableComponents: [PluginizableASTComponent], pluginExtensions: [PluginExtension]) { - self.pluginizableComponents = pluginizableComponents + init(pluginizedComponents: [PluginizedASTComponent], pluginExtensions: [PluginExtension]) { + self.pluginizedComponents = pluginizedComponents self.pluginExtensions = pluginExtensions } @@ -40,16 +40,16 @@ class PluginExtensionLinker: Processor { extensionMap[pluginExtension.name] = pluginExtension } - for pluginizableComponent in pluginizableComponents { - pluginizableComponent.pluginExtension = extensionMap[pluginizableComponent.pluginExtensionType] - if pluginizableComponent.pluginExtension == nil { - throw ProcessingError.fail("Cannot find \(pluginizableComponent.data.name)'s plugin extension with type name \(pluginizableComponent.pluginExtensionType)") + for pluginizedComponent in pluginizedComponents { + pluginizedComponent.pluginExtension = extensionMap[pluginizedComponent.pluginExtensionType] + if pluginizedComponent.pluginExtension == nil { + throw ProcessingError.fail("Cannot find \(pluginizedComponent.data.name)'s plugin extension with type name \(pluginizedComponent.pluginExtensionType)") } } } // MARK: - Private - private let pluginizableComponents: [PluginizableASTComponent] + private let pluginizedComponents: [PluginizedASTComponent] private let pluginExtensions: [PluginExtension] } diff --git a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableASTParserTask.swift b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableASTParserTask.swift index 19449e2e..cd5ce6fb 100644 --- a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableASTParserTask.swift +++ b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableASTParserTask.swift @@ -19,7 +19,7 @@ import SourceKittenFramework /// The extended AST parser task that parses all components, dependency /// protocols and import statements, including pluginized components. -class PluginizableASTParserTask: AbstractTask { +class PluginizedASTParserTask: AbstractTask { /// Initializer. /// @@ -31,19 +31,19 @@ class PluginizableASTParserTask: AbstractTask { /// Execute the task and returns the dependency graph data model. /// /// - returns: Parsed `PluginizedDependencyGraphNode`. - override func execute() -> PluginizableDependencyGraphNode { + override func execute() -> PluginizedDependencyGraphNode { let baseTask = ASTParserTask(ast: ast) let baseNode = baseTask.execute() let (pluginizedComponents, nonCoreComponents, pluginExtensions) = parsePluginizedStructures() - return PluginizableDependencyGraphNode(pluginizableComponents: pluginizedComponents, nonCoreComponents: nonCoreComponents, pluginExtensions: pluginExtensions, components: baseNode.components, dependencies: baseNode.dependencies, imports: baseNode.imports) + return PluginizedDependencyGraphNode(pluginizedComponents: pluginizedComponents, nonCoreComponents: nonCoreComponents, pluginExtensions: pluginExtensions, components: baseNode.components, dependencies: baseNode.dependencies, imports: baseNode.imports) } // MARK: - Private private let ast: AST - private func parsePluginizedStructures() -> ([PluginizableASTComponent], [ASTComponent], [PluginExtension]) { - var pluginizedComponents = [PluginizableASTComponent]() + private func parsePluginizedStructures() -> ([PluginizedASTComponent], [ASTComponent], [PluginExtension]) { + var pluginizedComponents = [PluginizedASTComponent]() var nonCoreComponents = [ASTComponent]() var pluginExtensions = [PluginExtension]() @@ -53,7 +53,7 @@ class PluginizableASTParserTask: AbstractTask { if substructure.isPluginizedComponent { let (dependencyProtocolName, pluginExtensionName, nonCoreComponentName) = substructure.pluginizedGenerics let component = ASTComponent(name: substructure.name, dependencyProtocolName: dependencyProtocolName, properties: substructure.properties, expressionCallTypeNames: substructure.expressionCallNames) - pluginizedComponents.append(PluginizableASTComponent(data: component, pluginExtensionType: pluginExtensionName, nonCoreComponentType: nonCoreComponentName)) + pluginizedComponents.append(PluginizedASTComponent(data: component, pluginExtensionType: pluginExtensionName, nonCoreComponentType: nonCoreComponentName)) } else if substructure.isNonCoreComponent { let dependencyProtocolName = substructure.dependencyProtocolName(for: "NonCoreComponent") let component = ASTComponent(name: substructure.name, dependencyProtocolName: dependencyProtocolName, properties: substructure.properties, expressionCallTypeNames: substructure.expressionCallNames) diff --git a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableFileFilterTask.swift b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableFileFilterTask.swift index 8ffa5620..37ff4f77 100644 --- a/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableFileFilterTask.swift +++ b/Generator/Sources/NeedleFramework/Parsing/Pluginized/Tasks/PluginizableFileFilterTask.swift @@ -20,7 +20,7 @@ import Foundation /// to determine if the file needs to be parsed for AST. If the file should /// This task extends the Needle `FileFilterTask` to support pluginized and /// non-core component types. -class PluginizableFileFilterTask: AbstractTask { +class PluginizedFileFilterTask: AbstractTask { /// Initializer. /// diff --git a/Generator/Tests/LinuxMain.swift b/Generator/Tests/LinuxMain.swift index b22004b7..181a404e 100644 --- a/Generator/Tests/LinuxMain.swift +++ b/Generator/Tests/LinuxMain.swift @@ -28,4 +28,11 @@ XCTMain([ testCase(DuplicateValidatorTests.allTests), testCase(FileFilterTaskTests.allTests), testCase(SequenceExecutorTests.allTests), + testCase(PluginizableASTParserTaskTests.allTests), + testCase(PluginizableFileFilterTaskTests.allTests), + testCase(NonCoreComponentLinkerTests.allTests), + testCase(PluginExtensionLinkerTests.allTests), + testCase(DependencyLinkerTests.allTests), + testCase(ParentLinkerTests.allTests), + testCase(PluginizableDependencyGraphParserTests.allTests), ]) diff --git a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/NonCoreComponentLinkerTests.swift b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/NonCoreComponentLinkerTests.swift index 3f1bddd9..111f5b99 100644 --- a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/NonCoreComponentLinkerTests.swift +++ b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/NonCoreComponentLinkerTests.swift @@ -26,10 +26,10 @@ class NonCoreComponentLinkerTests: AbstractParserTests { func test_process_withComponents_verifyLinkages() { let data = ASTComponent(name: "SomePluginizedComp", dependencyProtocolName: "Doesn't matter", properties: [], expressionCallTypeNames: []) - let pluginizedComp = PluginizableASTComponent(data: data, pluginExtensionType: "Doesn't matter", nonCoreComponentType: "SomeComp") + let pluginizedComp = PluginizedASTComponent(data: data, pluginExtensionType: "Doesn't matter", nonCoreComponentType: "SomeComp") let nonCoreComponent = ASTComponent(name: "SomeComp", dependencyProtocolName: "ItsDependency", properties: [], expressionCallTypeNames: []) - let linker = NonCoreComponentLinker(pluginizableComponents: [pluginizedComp], nonCoreComponents: [nonCoreComponent]) + let linker = NonCoreComponentLinker(pluginizedComponents: [pluginizedComp], nonCoreComponents: [nonCoreComponent]) try! linker.process() @@ -38,10 +38,10 @@ class NonCoreComponentLinkerTests: AbstractParserTests { func test_process_withComponentsNoNonCoreComp_verifyError() { let data = ASTComponent(name: "SomePluginizedComp", dependencyProtocolName: "Doesn't matter", properties: [], expressionCallTypeNames: []) - let pluginizedComp = PluginizableASTComponent(data: data, pluginExtensionType: "Doesn't matter", nonCoreComponentType: "SomeComp") + let pluginizedComp = PluginizedASTComponent(data: data, pluginExtensionType: "Doesn't matter", nonCoreComponentType: "SomeComp") let nonCoreComponent = ASTComponent(name: "WrongNonCoreComp", dependencyProtocolName: "ItsDependency", properties: [], expressionCallTypeNames: []) - let linker = NonCoreComponentLinker(pluginizableComponents: [pluginizedComp], nonCoreComponents: [nonCoreComponent]) + let linker = NonCoreComponentLinker(pluginizedComponents: [pluginizedComp], nonCoreComponents: [nonCoreComponent]) do { try linker.process() diff --git a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginExtensionLinkerTests.swift b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginExtensionLinkerTests.swift index fce0f2c2..5743ac6f 100644 --- a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginExtensionLinkerTests.swift +++ b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginExtensionLinkerTests.swift @@ -26,10 +26,10 @@ class PluginExtensionLinkerTests: AbstractParserTests { func test_process_withComponents_verifyLinkages() { let data = ASTComponent(name: "SomePluginizedComp", dependencyProtocolName: "Doesn't matter", properties: [], expressionCallTypeNames: []) - let pluginizedComp = PluginizableASTComponent(data: data, pluginExtensionType: "MyExtension", nonCoreComponentType: "Doesn't matter") + let pluginizedComp = PluginizedASTComponent(data: data, pluginExtensionType: "MyExtension", nonCoreComponentType: "Doesn't matter") let pluginExtension = PluginExtension(name: "MyExtension", properties: []) - let linker = PluginExtensionLinker(pluginizableComponents: [pluginizedComp], pluginExtensions: [pluginExtension]) + let linker = PluginExtensionLinker(pluginizedComponents: [pluginizedComp], pluginExtensions: [pluginExtension]) try! linker.process() @@ -38,9 +38,9 @@ class PluginExtensionLinkerTests: AbstractParserTests { func test_process_withComponentsNoPluginExtension_verifyError() { let data = ASTComponent(name: "SomePluginizedComp", dependencyProtocolName: "Doesn't matter", properties: [], expressionCallTypeNames: []) - let pluginizedComp = PluginizableASTComponent(data: data, pluginExtensionType: "StuffExtension", nonCoreComponentType: "SomeComp") + let pluginizedComp = PluginizedASTComponent(data: data, pluginExtensionType: "StuffExtension", nonCoreComponentType: "SomeComp") - let linker = PluginExtensionLinker(pluginizableComponents: [pluginizedComp], pluginExtensions: []) + let linker = PluginExtensionLinker(pluginizedComponents: [pluginizedComp], pluginExtensions: []) do { try linker.process() diff --git a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableASTParserTaskTests.swift b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableASTParserTaskTests.swift index 117cd198..4e886466 100644 --- a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableASTParserTaskTests.swift +++ b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableASTParserTaskTests.swift @@ -18,19 +18,19 @@ import SourceKittenFramework import XCTest @testable import NeedleFramework -class PluginizableASTParserTaskTests: AbstractParserTests { +class PluginizedASTParserTaskTests: AbstractParserTests { static var allTests = [ - ("test_execute_withValidAndInvalidComponentsDependencies_verifyPluginizableDependencyGraphNode", test_execute_withValidAndInvalidComponentsDependencies_verifyPluginizableDependencyGraphNode), + ("test_execute_withValidAndInvalidComponentsDependencies_verifyPluginizedDependencyGraphNode", test_execute_withValidAndInvalidComponentsDependencies_verifyPluginizedDependencyGraphNode), ] - func test_execute_withValidAndInvalidComponentsDependencies_verifyPluginizableDependencyGraphNode() { + func test_execute_withValidAndInvalidComponentsDependencies_verifyPluginizedDependencyGraphNode() { let sourceUrl = fixtureUrl(for: "ComponentSample.swift") let sourceContent = try! String(contentsOf: sourceUrl) let structure = try! Structure(file: File(contents: sourceContent)) let imports = ["import UIKit", "import RIBs", "import Foundation"] - let task = PluginizableASTParserTask(ast: AST(structure: structure, imports: imports)) + let task = PluginizedASTParserTask(ast: AST(structure: structure, imports: imports)) let node = task.execute() @@ -95,12 +95,12 @@ class PluginizableASTParserTaskTests: AbstractParserTests { XCTAssertTrue(containsSharedNonCoreObject) // Pluginized components. - XCTAssertEqual(node.pluginizableComponents.count, 1) - let somePluginizedCompo = node.pluginizableComponents.first { (component: PluginizableASTComponent) -> Bool in - component.data.name == "SomePluginizedCompo" + XCTAssertEqual(node.pluginizedComponents.count, 1) + let somePluginizedCompo = node.pluginizedComponents.first { (component: PluginizedASTComponent) -> Bool in + component.data.name == "SomePluginizedComp" }! XCTAssertEqual(somePluginizedCompo.data.expressionCallTypeNames, ["LGOLEDTv"]) - XCTAssertEqual(somePluginizedCompo.data.name, "SomePluginizedCompo") + XCTAssertEqual(somePluginizedCompo.data.name, "SomePluginizedComp") XCTAssertEqual(somePluginizedCompo.data.dependencyProtocolName, "ADependency") XCTAssertEqual(somePluginizedCompo.data.properties.count, 1) XCTAssertEqual(somePluginizedCompo.pluginExtensionType, "BExtension") diff --git a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableDependencyGraphParserTests.swift b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableDependencyGraphParserTests.swift index 1f5a78ee..133ac5d3 100644 --- a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableDependencyGraphParserTests.swift +++ b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableDependencyGraphParserTests.swift @@ -17,7 +17,7 @@ import XCTest @testable import NeedleFramework -class PluginizableDependencyGraphParserTests: AbstractPluginizedParserTests { +class PluginizedDependencyGraphParserTests: AbstractPluginizedParserTests { static var allTests = [ ("test_parse_withTaskCompleteion_verifyTaskSequence", test_parse_withTaskCompleteion_verifyTaskSequence), @@ -25,7 +25,7 @@ class PluginizableDependencyGraphParserTests: AbstractPluginizedParserTests { ] func test_parse_withTaskCompleteion_verifyTaskSequence() { - let parser = PluginizableDependencyGraphParser() + let parser = PluginizedDependencyGraphParser() let fixturesURL = fixtureUrl(for: "") let enumerator = FileManager.default.enumerator(at: fixturesURL, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles], errorHandler: nil) let files = enumerator!.allObjects as! [URL] @@ -35,11 +35,11 @@ class PluginizableDependencyGraphParserTests: AbstractPluginizedParserTests { var producerCount = 0 var parserCount = 0 executor.executionHandler = { (task: Task, result: Any) in - if task is PluginizableFileFilterTask { + if task is PluginizedFileFilterTask { filterCount += 1 } else if task is ASTProducerTask { producerCount += 1 - } else if task is PluginizableASTParserTask { + } else if task is PluginizedASTParserTask { parserCount += 1 } else { XCTFail() @@ -62,7 +62,7 @@ class PluginizableDependencyGraphParserTests: AbstractPluginizedParserTests { } func test_parse_withTaskCompleteion_verifyResults() { - let parser = PluginizableDependencyGraphParser() + let parser = PluginizedDependencyGraphParser() let fixturesURL = fixtureUrl(for: "") let enumerator = FileManager.default.enumerator(at: fixturesURL, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles], errorHandler: nil) let files = enumerator!.allObjects as! [URL] diff --git a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableFileFilterTaskTests.swift b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableFileFilterTaskTests.swift index c7e7a141..db02e2fe 100644 --- a/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableFileFilterTaskTests.swift +++ b/Generator/Tests/NeedleFrameworkTests/Parsing/Pluginized/PluginizableFileFilterTaskTests.swift @@ -17,7 +17,7 @@ import XCTest @testable import NeedleFramework -class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { +class PluginizedFileFilterTaskTests: AbstractPluginizedParserTests { static var allTests = [ ("test_execute_nonSwiftSource_verifyFilter", test_execute_nonSwiftSource_verifyFilter), @@ -29,7 +29,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_nonSwiftSource_verifyFilter() { let fileUrl = fixtureUrl(for: "NonSwift.json") - let task = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: []) + let task = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: []) let result = task.execute() switch result { @@ -43,7 +43,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_excludedSuffix_verifyFilter() { let fileUrl = fixtureUrl(for: "ComponentSample.swift") let content = try! String(contentsOf: fileUrl) - let excludeSuffixTask = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: ["Sample"]) + let excludeSuffixTask = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: ["Sample"]) var result = excludeSuffixTask.execute() @@ -54,7 +54,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { break } - let includeSuffixTask = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: []) + let includeSuffixTask = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: []) result = includeSuffixTask.execute() @@ -69,7 +69,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_nonNeedleComponent_verifyFilter() { let fixturesURL = fixtureUrl(for: "NonNeedleComponent.swift") - let task = PluginizableFileFilterTask(url: fixturesURL, exclusionSuffixes: []) + let task = PluginizedFileFilterTask(url: fixturesURL, exclusionSuffixes: []) let result = task.execute() @@ -83,7 +83,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_nonInheritanceComponent_verifyFilter() { let fixturesURL = fixtureUrl(for: "NonInheritanceComponent.swift") - let task = PluginizableFileFilterTask(url: fixturesURL, exclusionSuffixes: []) + let task = PluginizedFileFilterTask(url: fixturesURL, exclusionSuffixes: []) let result = task.execute() @@ -98,7 +98,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_onlyComponent_verifyResult() { let fileUrl = fixtureUrl(for: "ComponentSample.swift") let content = try! String(contentsOf: fileUrl) - let task = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: []) + let task = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: []) let result = task.execute() @@ -114,7 +114,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_onlyPluginizedComponent_verifyResult() { let fileUrl = pluginizedFixtureUrl(for: "OnlyPluginizedComponent.swift") let content = try! String(contentsOf: fileUrl) - let task = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: []) + let task = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: []) let result = task.execute() @@ -130,7 +130,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_onlyNonCoreComponent_verifyResult() { let fileUrl = pluginizedFixtureUrl(for: "OnlyNonCoreComponent.swift") let content = try! String(contentsOf: fileUrl) - let task = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: []) + let task = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: []) let result = task.execute() @@ -162,7 +162,7 @@ class PluginizableFileFilterTaskTests: AbstractPluginizedParserTests { func test_execute_onlyPluginExtension_verifyResult() { let fileUrl = pluginizedFixtureUrl(for: "OnlyPluginExtension.swift") let content = try! String(contentsOf: fileUrl) - let task = PluginizableFileFilterTask(url: fileUrl, exclusionSuffixes: []) + let task = PluginizedFileFilterTask(url: fileUrl, exclusionSuffixes: []) let result = task.execute()