Refactor

Package.swift

@@ -5,17 +5,13 @@ import PackageDescription
 import CompilerPluginSupport
 
 let package = Package(
-    name: "Sim",
+    name: "swift-sim",
     platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .macCatalyst(.v13)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
-            name: "Sim",
-            targets: ["Sim"]),
-        .library(
-            name: "SimMacro",
-            targets: ["SimMacro"]
-        ),
+            name: "Simulator",
+            targets: ["Simulator"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -28,31 +24,30 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .macro(
-          name: "SimMacroLibrary",
+          name: "SimulatorMacroLibrary",
           dependencies: [
               .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
               .product(name: "SwiftCompilerPlugin", package: "swift-syntax")
           ]
         ),
 
-        .target(name: "SimMacro", dependencies: ["SimMacroLibrary"]),
         .target(
-            name: "Sim",
+            name: "Simulator",
             dependencies: [
               .product(name: "Collections",
                        package: "swift-collections"),
               .product(name: "OrderedCollections",
                        package: "swift-collections"),
-              "SimMacro"
+              "SimulatorMacroLibrary"
             ]),
         .testTarget(
-            name: "SimTests",
-            dependencies: ["Sim"]),
+            name: "SimulatorTests",
+            dependencies: ["Simulator"]),
 
         .testTarget(
-            name: "SimMacroTests",
+            name: "SimulatorMacroTests",
             dependencies: [
-                "SimMacroLibrary",
+                "SimulatorMacroLibrary",
                 .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
             ]
         ),

Sources/Sim/Component.swift → Sources/Simulator/Component.swift

@@ -18,14 +18,11 @@
 
 @dynamicMemberLookup
 open class Component : Model {
-  var models: [String: Model]
-
   public override init(name: String) {
-    self.models = [:]
     super.init(name: name)
   }
 
   public subscript(dynamicMember member: String) -> Model? {
-    return models[member]
+    return children[member]
   }
 }

Sources/Sim/Model.swift → Sources/Simulator/Model.swift

@@ -18,19 +18,57 @@
 
 import Foundation
 
+public protocol Publisher : Service {
+  func publishField(name: String, reader: ()->(), writer: ()->())
+}
+
 open class Model {
   weak var _sim: Simulator!
   public weak var sim: Simulator! { get { _sim } }
   weak var parent: Model?
   var children: [String : Model]
   var entrypoints: [String : ()->()] = [:]
+
+  var stateWriters: [String : (Any)->()] = [:]
+  var stateReaders: [String : ()->Any] = [:]
+
   public let name: String
 
   public init(name: String) {
     self.name = name
     self.children = [:]
   }
 
+  public func publishFieldReader(name: String, reader: @escaping ()->(Any)) throws {
+    guard !stateReaders.keys.contains(name) else {
+      throw SimError.DuplicateName
+    }
+
+    stateReaders[name] = reader
+  }
+  public func publishFieldWriter(name: String, writer: @escaping (Any)->()) throws {
+    guard !stateWriters.keys.contains(name) else {
+      throw SimError.DuplicateName
+    }
+
+    stateWriters[name] = writer
+  }
+  public func getField(name: String) throws -> Any {
+    guard let reader = stateReaders[name] else {
+      throw SimError.InvalidFieldName
+    }
+
+    return reader()
+  }
+  public func setField(name: String, value: Any) throws
+  {
+    guard let writer = stateWriters[name] else {
+      throw SimError.InvalidFieldName
+    }
+
+    writer(value)
+  }
+
   public func add(child: Model) throws {
     try add(child: child, withName: child.name)
   }

Sources/SimMacro/SimMacro.swift → Sources/Simulator/SimMacro.swift

@@ -18,16 +18,16 @@
 
 @attached(member)
 public macro model<T>(_ value: T)
-  = #externalMacro(module: "SimMacroLibrary", type: "ModelMacro")
+  = #externalMacro(module: "SimulatorMacroLibrary", type: "ModelMacro")
 
 @attached(member)
 public macro input<T>(_ value: T) 
-  = #externalMacro(module: "SimMacroLibrary", type: "InputMacro")
+  = #externalMacro(module: "SimulatorMacroLibrary", type: "InputMacro")
 
 @attached(member)
 public macro output<T>(_ value: T) 
-  = #externalMacro(module: "SimMacroLibrary", type: "OutputMacro")
+  = #externalMacro(module: "SimulatorMacroLibrary", type: "OutputMacro")
 
 @attached(member)
 public macro field<T>(_ value: T)
-  = #externalMacro(module: "SimMacroLibrary", type: "FieldMacro")
+  = #externalMacro(module: "SimulatorMacroLibrary", type: "FieldMacro")

Tests/SimMacroTests/SimMacroTest.swift → Tests/SimulatorMacroTests/SimMacroTest.swift

@@ -9,8 +9,8 @@ import SwiftSyntaxMacros
 import SwiftSyntaxMacrosTestSupport
 import XCTest
 
-#if canImport(SimMacroLibrary)
-import SimMacroLibrary
+#if canImport(SimulatorMacroLibrary)
+import SimulatorMacroLibrary
 
 let testMacros: [String: Macro.Type] = [
   "model": ModelMacro.self,
@@ -22,7 +22,7 @@ let testMacros: [String: Macro.Type] = [
 
 final class SimMacroTest: XCTestCase {
   func testModelMacro() throws {
-    #if canImport(SimMacroLibrary)
+    #if canImport(SimulatorMacroLibrary)
       assertMacroExpansion(
         """
         @model
@@ -45,7 +45,7 @@ final class SimMacroTest: XCTestCase {
   }
 
   func testInputMacro() throws {
-    #if canImport(SimMacroLibrary)
+    #if canImport(SimulatorMacroLibrary)
       assertMacroExpansion(
         """
         @input
@@ -64,7 +64,7 @@ final class SimMacroTest: XCTestCase {
   }
 
   func testOutputMacro() throws {
-    #if canImport(SimMacroLibrary)
+    #if canImport(SimulatorMacroLibrary)
       assertMacroExpansion(
         """
         @output
@@ -83,7 +83,7 @@ final class SimMacroTest: XCTestCase {
   }
 
   func testFieldMacro() throws {
-    #if canImport(SimMacroLibrary)
+    #if canImport(SimulatorMacroLibrary)
       assertMacroExpansion(
         """
         @field

Tests/SimTests/ClockedModelTest.swift → Tests/SimulatorTests/ClockedModelTest.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import Sim
+@testable import Simulator
 
 class ClockedFoo : Model, ClockedModel {
   var period: Double = 0.1

Tests/SimTests/ConnectorTest.swift → Tests/SimulatorTests/ConnectorTest.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import Sim
+@testable import Simulator
 
 class MyModel : Model {
   @Input public var xInput: Int

Tests/SimTests/EventManagerTest.swift → Tests/SimulatorTests/EventManagerTest.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import Sim
+@testable import Simulator
 
 final class EventManagerTest: XCTestCase {
   func testPublication() throws {

Tests/SimTests/LoggerTest.swift → Tests/SimulatorTests/LoggerTest.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import Sim
+@testable import Simulator
 
 fileprivate class NamedModel : Model {
   override init(name: String) {

Tests/SimTests/ResolverTest.swift → Tests/SimulatorTests/ResolverTest.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import Sim
+@testable import Simulator
 
 
 

Tests/SimTests/SimulatorTest.swift → Tests/SimulatorTests/SimulatorTest.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import Sim
+@testable import Simulator
 
 class Foo : Model {
   override init(name: String) {

Tests/SimTests/TimeKeeperTest.swift → Tests/SimulatorTests/TimeKeeperTest.swift

@@ -17,7 +17,7 @@
 //
 
 import XCTest
-@testable import Sim
+@testable import Simulator
 
 final class TimeKeeperTest: XCTestCase {
   func testEpochToMissionTime() throws {