Merge pull request #70 from cerebruminc/lucianbuzzo/sql-parser

fix: use upstream node-sql-parser package

package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "generate": "prisma generate",
     "build": "tsc",
-    "test": "rome ci src",
+    "test": "rome ci src test",
+    "lint:fix": "rome check --apply src test",
     "test:integration": "jest test/integration",
     "test:compose:integration": "docker compose -f docker-compose.yml --profile with-sut up db sut --exit-code-from sut",
     "setup": "prisma generate && prisma migrate dev",
@@ -29,7 +30,7 @@
     "uuid": "^9.0.0"
   },
   "dependencies": {
-    "@lucianbuzzo/node-sql-parser": "^4.6.6",
+    "node-sql-parser": "^4.12.0",
     "lodash": "^4.17.21"
   },
   "peerDependencies": {

src/expressions.ts

@@ -1,10 +1,13 @@
-import { Prisma, PrismaClient } from "@prisma/client";
-import { Dictionary, get } from "lodash";
+import { PrismaClient } from "@prisma/client";
 import random from "lodash/random";
 import matches from "lodash/matches";
-import { Parser } from "@lucianbuzzo/node-sql-parser";
-import { escapeIdentifier, escapeLiteral } from "./escape";
-import { RuntimeDataModel } from "@prisma/client/runtime/library";
+import { Parser } from "node-sql-parser";
+import { escapeLiteral } from "./escape";
+import { defineDmmfProperty } from "@prisma/client/runtime/library";
+
+// This is black magic to get the runtime data model from the Prisma client
+// It's not exported, so we need to use some type infiltration to get it
+export type RuntimeDataModel = Parameters<typeof defineDmmfProperty>[1];
 
 const PRISMA_NUMERIC_TYPES = ["Int", "BigInt", "Float", "Decimal"];
 
@@ -25,7 +28,7 @@ const deepFind = (obj: any, subObj: any): any => {
 type Token = {
 	astFragment: any;
 };
-type Tokens = Dictionary<Token>;
+type Tokens = Record<string, Token>;
 
 export type Expression<ContextKeys extends string = string> =
 	| string
@@ -62,7 +65,7 @@ const tokenizeWhereExpression = (
 	/** The Prisma client to use for metadata */
 	client: PrismaClient,
 	/** The Prisma where expression to be tokenized */
-	where: Dictionary<any>,
+	where: Record<string, any>,
 	/** The base table we are generating an expression for */
 	table: string,
 	/** The model name being queried. e.g. 'User' */
@@ -71,7 +74,7 @@ const tokenizeWhereExpression = (
 	tokens: Tokens = {},
 ): {
 	tokens: Tokens;
-	where: Dictionary<any>;
+	where: Record<string, any>;
 } => {
 	for (const field in where) {
 		// Get field data from the prisma client for the model and field being queried
@@ -254,8 +257,9 @@ export const expressionToSQL = async (getExpression: Expression, table: string):
 
 						const parameterizedStatement = deepFind(ast, {
 							right: {
-								type: "origin",
-								value: `$${i + 1}`,
+								type: "var",
+								name: i + 1,
+								prefix: "$",
 							},
 						});
 

src/index.ts

@@ -1,11 +1,10 @@
 import { Prisma, PrismaClient } from "@prisma/client";
-import { RuntimeDataModel } from "@prisma/client/runtime/library";
 import difference from "lodash/difference";
 import flatMap from "lodash/flatMap";
 import map from "lodash/map";
 import toPairs from "lodash/toPairs";
 import * as crypto from "crypto";
-import { Expression, expressionToSQL } from "./expressions";
+import { Expression, expressionToSQL, RuntimeDataModel } from "./expressions";
 
 const VALID_OPERATIONS = ["SELECT", "UPDATE", "INSERT", "DELETE"] as const;
 

test/integration/rbac.spec.ts

@@ -1,7 +1,6 @@
 import { PrismaClient, User } from "@prisma/client";
 import { setup } from "../../src";
 import { v4 as uuid } from "uuid";
-import { update } from "lodash";
 
 let adminClient: PrismaClient;