Support vision models and function calling

.gitignore

@@ -94,4 +94,8 @@ iOSInjectionProject/
 /Packages
 .netrc
 .idea
-.swiftpm
+.swiftpm
+
+# Specific to this package
+
+*.code-workspace

.pre-commit-config.yaml

@@ -1,6 +1,10 @@
 repos:
 - repo: https://github.com/slessans/pre-commit-swift-format
-  rev: ""
+  rev: "fd627de92bdf84a75c924ed95691336d14e94cf1"
   hooks:
     - id: swift-format
       args: ["--configuration", ".swift-format"]
+- repo: https://github.com/kynan/nbstripout
+  rev: 0.8.1
+  hooks:
+    - id: nbstripout

.swift-format

@@ -8,5 +8,8 @@
   "respectsExistingLineBreaks": true,
   "lineBreakBeforeEachArgument": true,
   "multiElementCollectionTrailingCommas": true,
-  "spacesAroundRangeFormationOperators": true
+  "spacesAroundRangeFormationOperators": true,
+  "rules": {
+    "AlwaysUseLowerCamelCase": false
+  }
 }

Package.resolved

@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections.git",
+      "state" : {
+        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
+        "version" : "1.1.4"
+      }
+    }
+  ],
+  "version" : 2
+}

Package.swift

@@ -13,17 +13,25 @@ let package = Package(
             targets: ["Jinja"]
         )
     ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.4")
+    ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
             name: "Jinja",
+            dependencies: [
+                .product(name: "OrderedCollections", package: "swift-collections")
+            ],
             path: "Sources",
             swiftSettings: [.enableUpcomingFeature("BareSlashRegexLiterals")]
         ),
         .testTarget(
             name: "JinjaTests",
-            dependencies: ["Jinja"],
+            dependencies: [
+                "Jinja"
+            ],
             path: "Tests",
             swiftSettings: [.enableUpcomingFeature("BareSlashRegexLiterals")]
         ),

Sources/Ast.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import OrderedCollections
 
 protocol Statement {}
 
@@ -41,15 +42,15 @@ struct TupleLiteral: Literal {
 }
 
 struct ObjectLiteral: Literal {
-    var value: [(Expression, Expression)]
+    var value: OrderedDictionary<String, Expression>
 }
 
 struct Set: Statement {
     var assignee: Expression
     var value: Expression
 }
 
-struct If: Statement {
+struct If: Statement, Expression {
     var test: Expression
     var body: [Statement]
     var alternate: [Statement]
@@ -59,14 +60,14 @@ struct Identifier: Expression {
     var value: String
 }
 
-protocol Loopvar {}
-extension Identifier: Loopvar {}
-extension TupleLiteral: Loopvar {}
+typealias Loopvar = Expression
 
 struct For: Statement {
     var loopvar: Loopvar
     var iterable: Expression
     var body: [Statement]
+    var defaultBlock: [Statement]
+    var test: Expression?
 }
 
 struct MemberExpression: Expression {
@@ -92,7 +93,11 @@ extension CallExpression: Filter {}
 
 struct FilterExpression: Expression {
     var operand: Expression
-    var filter: Filter
+    var filter: Identifier
+    var args: [Expression]
+    var kwargs: [KeywordArgumentExpression]
+    var dyn_args: Expression?
+    var dyn_kwargs: Expression?
 }
 
 struct TestExpression: Expression {
@@ -124,3 +129,23 @@ struct KeywordArgumentExpression: Expression {
 struct NullLiteral: Literal {
     var value: Any? = nil
 }
+
+struct SelectExpression: Expression {
+    var iterable: Expression
+    var test: Expression
+}
+
+struct Macro: Statement {
+    var name: Identifier
+    var args: [Expression]
+    var body: [Statement]
+}
+
+struct KeywordArgumentsValue: RuntimeValue {
+    var value: [String: any RuntimeValue]
+    var builtins: [String: any RuntimeValue] = [:]
+
+    func bool() -> Bool {
+        !value.isEmpty
+    }
+}