add prettier

Author: IbrahimShamma99

.prettierignore

@@ -0,0 +1,2 @@
+/dist
+/node_modules

.prettierrc

@@ -0,0 +1,6 @@
+{
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": false,
+    "singleQuote": true
+}

__tests__/generator/simple.test.ts

@@ -3,14 +3,11 @@ import { Generator } from "../../src";
 describe("Generators Tests", () => {
   it("should generate from simple query", () => {
     const source = "SELECT user_name , id FROM users";
-
     const generator = new Generator([
       { id: "id1", user_name: "user1" },
       { id: "id2", user_name: "user2" },
     ]);
-
     const results = generator.execute(source);
-
     expect(results).toEqual([
       { user_name: "user1", id: "id1" },
       { user_name: "user2", id: "id2" },
@@ -19,62 +16,46 @@ describe("Generators Tests", () => {
 
   it("should generate from simple query with where", () => {
     const source = "SELECT user_name , id FROM users where id = 'id1' ;";
-
     const generator = new Generator([
       { id: "id1", user_name: "user1" },
       { id: "id2", user_name: "user2" },
     ]);
-
     const results = generator.execute(source);
-
     expect(results).toEqual([{ user_name: "user1", id: "id1" }]);
   });
 
   it("should generate from simple query with where", () => {
     const source =
       "SELECT user_name as username , id FROM users where id = 'id1' ;";
-
     const generator = new Generator([
       { id: "id1", user_name: "user1" },
       { id: "id2", user_name: "user2" },
     ]);
-
     const results = generator.execute(source);
-
     generator.source;
-
     expect(results).toEqual([{ username: "user1", id: "id1" }]);
   });
 
   it("should generate from simple query with where numeric", () => {
     const source =
       "SELECT user_name as username , id FROM users where id = 1 ;";
-
     const generator = new Generator([
       { id: 1, user_name: "user1" },
       { id: 2, user_name: "user2" },
     ]);
-
     const results = generator.execute(source);
-
-    generator.source;
-
     expect(results).toEqual([{ username: "user1", id: 1 }]);
   });
 
   it("should generate from simple query with where numeric and group by", () => {
     const source =
       "SELECT user_name as username , id FROM users Group by user_name , id ;";
-
     const generator = new Generator([
       { id: 1, user_name: "user1" },
       { id: 2, user_name: "user2" },
     ]);
-
     const results = generator.execute(source);
-
     generator.source;
-
     expect(results).toEqual({
       "1": [{ id: 1, username: "user1" }],
       "2": [{ id: 2, username: "user2" }],
@@ -84,16 +65,11 @@ describe("Generators Tests", () => {
   it("should generate from simple query with order by", () => {
     const source =
       "SELECT user_name as username , id FROM users order by user_name , id ;";
-
     const generator = new Generator([
       { id: 2, user_name: "user2" },
       { id: 1, user_name: "user1" },
     ]);
-
     const results = generator.execute(source);
-
-    generator.source;
-
     expect(results).toEqual([
       { id: 1, username: "user1" },
       { id: 2, username: "user2" },

__tests__/scanner/select.test.ts

@@ -14,4 +14,19 @@ describe("Scanner Tests", () => {
 
     expect(scanner.tokens).toHaveLength(9);
   });
+
+  it("should scan a simple select statement with limit", () => {
+    const source = `
+            SELECT
+                id,
+                user_name as username
+                from users
+                limit 15
+                `;
+
+    const scanner = new Scanner(source);
+    scanner.scan();
+
+    expect(scanner.tokens).toHaveLength(11);
+  });
 });

src/compiler/parser.ts

@@ -118,6 +118,9 @@ export class Parser {
       throw new Error("Expect at least one column / Expr after 'ORDER BY'");
     }
 
+    if (this.match(TokenType.LIMIT) && this.match(TokenType.NUMBER)) {
+    }
+
     return statement;
   }
 

src/expressions/limit.expression.ts

@@ -8,10 +8,11 @@ export class LimitExpression extends Expression {
   constructor(public expression: Expression) {
     super();
   }
+
   public override accept<R>(visitor: Visitor<R>, context: any): R {
-    //return visitor.visitLimitExpr(this, context);
-    throw new Error("Method not implemented.");
+    return visitor.visitLimitExpr(this, context);
   }
+
   public override toLiteral<R>(): string {
     throw new Error("Method not implemented.");
   }

src/factory/factory.ts

@@ -41,6 +41,10 @@ export class Factory {
     return order;
   }
 
+  public createLimitExpression(limit: Expression): LimitExpression {
+    return new LimitExpression(limit);
+  }
+
   public createIdentifier(name: string, alias?: string): Identifier {
     return new Identifier(name, alias);
   }

src/visitors/js.visitor.ts

@@ -89,11 +89,14 @@ export class JsVisitor extends Visitor<string> {
   }
 
   public visitGroupByExpr(expr: GroupByExpression, context?: any): string {
-    //FIXME
     return expr.columns.map((node) => `'${node.accept(this)}'`).join(",");
   }
 
   public visitNumericLiteralExpr(expr: NumericLiteral): string {
     return expr.value;
   }
+
+  public visitLimitExpr(expr: LimitExpression, context?: any): string {
+    return expr.expression.accept(this);
+  }
 }

src/visitors/visitor.ts

@@ -28,7 +28,7 @@ export abstract class Visitor<R> {
   public abstract visitIdentifier(expr: Identifier): R;
   public abstract visitSelectStmt(stmt: SelectStatement, context?: any): R;
   public abstract visitGroupByExpr(expr: GroupByExpression, context?: any): R;
-  // public abstract visitLimitExpr(expr: LimitExpression, context?: any): R;
+  public abstract visitLimitExpr(expr: LimitExpression, context?: any): R;
   public abstract visitOrderByExpr(expr: OrderExpression, context?: any): R;
   public abstract visitOrderByColumn(expr: OrderByColumn): R;
 }