moar stuff

Author: Brandon Sneed

.swiftpm/xcode/xcshareddata/xcschemes/segmentcli.xcscheme

@@ -99,6 +99,10 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "repl"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "repl -r /Users/brandonsneed/test.js"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument

Package.resolved

@@ -15,7 +15,8 @@ let package = Package(
         .package(url: "https://github.com/segmentio/analytics-swift.git", branch: "bsneed/cli_additions"),
         .package(url: "https://github.com/swiftcsv/SwiftCSV.git", from: "0.6.1"),
         .package(url: "https://github.com/AlwaysRightInstitute/Mustache", from: "1.0.0"),
-        .package(url: "https://github.com/antitypical/Result.git", from: "5.0.0")
+        .package(url: "https://github.com/antitypical/Result.git", from: "5.0.0"),
+        .package(url: "https://github.com/bsneed/SwiftJS.git", branch: "main")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -27,6 +28,7 @@ let package = Package(
                            "ColorizeSwift",
                            "SwiftCSV",
                            "Result",
+                           "SwiftJS",
                            .product(name: "mustache", package: "Mustache"),
                            .product(name: "Segment", package: "analytics-swift")]),
         .testTarget(

Package.swift

@@ -7,22 +7,22 @@
 
 import Foundation
 import SwiftCLI
+import JavaScriptCore
+import mustache
 
 class ImportCommand: Command {
     let name = "import"
     let shortDescription = "Import CSV data into Segment from"
 
-    @Param var csvFile: String
-    @Param var configFile: String
     @Param var writeKey: String
+    @Param var csvFile: String
 
-    /*
-    @Key("-csv", "--csv", description: "CSV file to read from")
-    var csvFile: String?
+    let jsContext = JSContext()!
 
-    @Key("-csvConfig", "--csvConfig", description: "A config file describing how to interpret CSV columns to event data")
-    var configFile: String?
-     */
     func execute() throws {
+        let generate = Mustache(importer_js)
+        let result = generate(name: "", writeKey: writeKey, csvFile: csvFile)
+        
+        runJS(script: result, context: jsContext)
     }
 }

Sources/segmentcli/Commands/Import.swift

@@ -8,7 +8,29 @@
 import Foundation
 import SwiftCLI
 import Segment
+//import SwiftJS
+import JavaScriptCore
 
+class REPLCommand: Command {
+    let name: String = "repl"
+    let shortDescription = "Segment virtual development environment"
+    
+    @Key("-r", "--runscript", "Runs the supplied script in the REPL")
+    var scriptFile: String?
+    
+    let jsContext = JSContext()!
+    
+    func execute() throws {
+        if let scriptFile = scriptFile {
+            runJSFile(path: scriptFile, context: jsContext)
+        } else {
+            runJSInteractive(context: jsContext)
+        }
+    }
+    
+}
+
+/*
 class REPLCommand: Command {
     let name: String = "repl"
     let shortDescription = "Segment virtual development environment"
@@ -38,6 +60,7 @@ class REPLCommand: Command {
     }
 
 }
+ */
 
 /*
 guard let writeKey = args[0] as? String else { return NilAny }

Sources/segmentcli/Commands/REPL.swift

@@ -63,6 +63,8 @@ class ScaffoldCommand: Command {
 
         if plugin && useSwift {
             generateSwiftPlugin()
+        } else if importer {
+            generateCSVImporterScript()
         }
     }
 
@@ -95,4 +97,35 @@ class ScaffoldCommand: Command {
 
         print("\n")
     }
+    
+    func generateCSVImporterScript() {
+        guard let scaffoldName = scaffoldName else {
+            exitWithError("Could not determine a plugin name to use.")
+            return
+        }
+        
+        let filename = scaffoldName + ".js"
+        
+        print("Generating a Swift Plugin from template...")
+ 
+        for file in importer_templates_js {
+            if fileManager.fileExists(atPath: filename) {
+                let overwrite = Input.readBool(prompt: "\(filename) exists.  Overwrite? [y/N]: ", defaultValue: false)
+                if overwrite == false {
+                    exitWithError(code: .commandFailed)
+                }
+            }
+            let generate = Mustache(file)
+            let result = generate(name: scaffoldName, filename: filename)
+            do {
+                try result.write(toFile: filename, atomically: true, encoding: .utf8)
+                print("Created \(filename).")
+            } catch {
+                exitWithError("Unable to write \(filename)")
+            }
+        }
+        
+        print("\n")
+
+    }
 }

Sources/segmentcli/Commands/Scaffold.swift

@@ -43,15 +43,22 @@ public final class Lox {
     }
 
     public static func runFile(path: String) throws {
-        let url = URL(fileURLWithPath: path)
-        let code = try String(contentsOf: url)
-        run(code)
+        //let runQueue = DispatchQueue(label: "segmentcli.run")
 
-        if hadError {
-            exit(65)
-        }
-        if hadRuntimeError {
-            exit(70)
+        //runQueue.async {
+            let url = URL(fileURLWithPath: path)
+            let code = try String(contentsOf: url)
+            run(code)
+
+            if hadError {
+                exit(65)
+            }
+            if hadRuntimeError {
+                exit(70)
+            }
+        //}
+        while true {
+            RunLoop.main.run(until: Date.distantPast)
         }
     }
 

Sources/segmentcli/LoxCore/Lox.swift

@@ -308,7 +308,17 @@ final class Parser {
         let (parameters, body) = try functionBody(kind: kind)
         return Stmt.Function(name: name, parameters: parameters, body: body)
     }
-
+    /*
+    private func array() throws -> Expr {
+        var items: Array<Token> = []
+        if !check(.rightBracket) {
+            repeat {
+                items.append(try consume(., message: "Expect parameter name."))
+            } while match(.comma)
+        }
+        try consume(.rightParen, message: "Expect ')' after parameters.")
+    }
+*/
     private func block() throws -> Array<Stmt> {
         var statements = Array<Stmt>()
 
@@ -344,6 +354,10 @@ final class Parser {
             let right = try unary()
             return Expr.Unary(op: op, right: right)
         }
+        
+        /*if match(.number, .string) {
+            return try function(kind: "array")
+        }*/
 
         return try call()
     }
@@ -417,6 +431,12 @@ final class Parser {
             try consume(.rightParen, message: "Expect ')' after expression.")
             return Expr.Grouping(expression: expr)
         }
+        
+        if match(.leftBracket) {
+            let expr = try expression()
+            try consume(.rightBracket, message: "Expect ']' after expression.")
+            return Expr.Grouping(expression: expr)
+        }
 
         throw error(token: peek(), message: "Expect expression.")
     }

Sources/segmentcli/LoxCore/Parser.swift

@@ -34,7 +34,7 @@ final class Interpreter: ExprVisitor, StmtVisitor {
 
     internal let globals = Environment()
     private var locals: Dictionary<Expr, Int> = [:]
-    private var environment: Environment
+    internal var environment: Environment
 
     init() {
         environment = globals
@@ -191,10 +191,12 @@ final class Interpreter: ExprVisitor, StmtVisitor {
 
         case .leftParen, .rightParen: fallthrough
         case .leftBrace, .rightBrace: fallthrough
+        case .leftBracket, .rightBracket: fallthrough
         case .comma: fallthrough
         case .dot: fallthrough
         case .plus: fallthrough
         case .semicolon: fallthrough
+        case .colon: fallthrough
         case .slash: fallthrough
         case .star: fallthrough
         case .bangEqual: fallthrough
@@ -205,6 +207,8 @@ final class Interpreter: ExprVisitor, StmtVisitor {
         case .identifier: fallthrough
         case .string: fallthrough
         case .number: fallthrough
+        case .array: fallthrough
+        case .dictionary: fallthrough
         case .and: fallthrough
         case .Class: fallthrough
         case .Else: fallthrough
@@ -307,14 +311,18 @@ final class Interpreter: ExprVisitor, StmtVisitor {
 
         case .leftParen, .rightParen: fallthrough
         case .leftBrace, .rightBrace: fallthrough
+        case .leftBracket, .rightBracket: fallthrough
         case .comma: fallthrough
         case .dot: fallthrough
         case .semicolon: fallthrough
+        case .colon: fallthrough
         case .bang: fallthrough
         case .equal: fallthrough
         case .identifier: fallthrough
         case .string: fallthrough
         case .number: fallthrough
+        case .array: fallthrough
+        case .dictionary: fallthrough
         case .and: fallthrough
         case .Class: fallthrough
         case .Else: fallthrough

Sources/segmentcli/LoxCore/Runtime/Interpreter.swift

@@ -51,6 +51,10 @@ final class Scanner {
             addToken(type: .leftBrace)
         case "}":
             addToken(type: .rightBrace)
+        case "[":
+            addToken(type: .leftBracket)
+        case "]":
+            addToken(type: .rightBracket)
         case ",":
             addToken(type: .comma)
         case ".":
@@ -61,6 +65,8 @@ final class Scanner {
             addToken(type: .plus)
         case ";":
             addToken(type: .semicolon)
+        case ":":
+            addToken(type: .colon)
         case "*":
             addToken(type: .star)