-
Notifications
You must be signed in to change notification settings - Fork 20
Support implementing Symbol-based EcmaScript protocols like Iterable #28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
justjake
wants to merge
8
commits into
kabiroberai:main
Choose a base branch
from
justjake:jake--NodeName-macro
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
163ebf8
Add @NodeName macro to rename properties/methods
justjake 3e3e90b
Improve usability of NodeSymbol for method names
justjake e6f35d7
Implement Javascript iterable protocol w/ NodeIterator
justjake 147db9f
Improve error when calling non-function values
justjake 082d531
Don't clean runs of single integration tests
justjake 869e58a
Fix test failure
justjake 93a4d31
revert change to integration test runner
justjake 751b3ff
document using _suite <name> to skip clean
justjake File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
extension Sequence where Element: NodeValueConvertible { | ||
@NodeActor public func nodeIterator() -> NodeIterator { | ||
NodeIterator(self.lazy.map { $0 as NodeValueConvertible }.makeIterator()) | ||
} | ||
} | ||
|
||
public final class NodeIterator: NodeClass { | ||
public struct Result: NodeValueConvertible, NodeValueCreatable { | ||
public typealias ValueType = NodeObject | ||
|
||
let value: NodeValueConvertible? | ||
let done: Bool? | ||
|
||
public func nodeValue() throws -> any NodeValue { | ||
let obj = try NodeObject() | ||
if let value = value { | ||
try obj["value"].set(to: value) | ||
} | ||
if let done = done { | ||
try obj["done"].set(to: done) | ||
} | ||
return obj | ||
} | ||
|
||
public static func from(_ value: ValueType) throws -> Self { | ||
Self( | ||
value: try value.get("value"), | ||
done: try value.get("done").as(Bool.self) | ||
) | ||
} | ||
} | ||
|
||
public static let properties: NodeClassPropertyList = [ | ||
"next": NodeMethod(next), | ||
] | ||
|
||
private var iterator: any IteratorProtocol<NodeValueConvertible> | ||
public init(_ iterator: any IteratorProtocol<NodeValueConvertible>) { | ||
self.iterator = iterator | ||
} | ||
|
||
public func next() -> Result { | ||
if let value = iterator.next() { | ||
return Result(value: value, done: false) | ||
} else { | ||
return Result(value: nil, done: true) | ||
} | ||
} | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import SwiftSyntax | ||
import SwiftSyntaxMacros | ||
|
||
struct NodeNameMacro: PeerMacro { | ||
static func expansion( | ||
of node: AttributeSyntax, | ||
providingPeersOf declaration: some DeclSyntaxProtocol, | ||
in context: some MacroExpansionContext | ||
) throws -> [DeclSyntax] { | ||
guard let _ = node.nodeAttributes else { | ||
context.diagnose(.init(node: Syntax(node), message: .expectedName)) | ||
return [] | ||
} | ||
|
||
// Processed by NodeClassMacro. | ||
return [] | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,4 +58,22 @@ final class File: NodeClass { | |
} | ||
} | ||
|
||
#NodeModule(exports: ["File": File.deferredConstructor]) | ||
final class SomeIterable: NodeClass { | ||
typealias Element = String | ||
|
||
static let properties: NodeClassPropertyList = [ | ||
NodeSymbol.iterator: NodeMethod(nodeIterator), | ||
] | ||
|
||
static let construct = NodeConstructor(SomeIterable.init(_:)) | ||
init(_ args: NodeArguments) throws { } | ||
|
||
private let values: [String] = ["one", "two", "three"] | ||
|
||
func nodeIterator() throws -> NodeIterator { | ||
values.nodeIterator() | ||
} | ||
|
||
} | ||
Comment on lines
+61
to
+77
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this code prefer the macro? |
||
|
||
#NodeModule(exports: ["File": File.deferredConstructor, "SomeIterable": SomeIterable.deferredConstructor]) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps it would be better for DynamicProperty to implement CustomStringRepresentable in like "(obj).(key)", so that stringifying a DynamicProperty anywhere prints the full path 🤔