Merge pull request #61 from Blitzapps/migrate-vitest

fix: vitest

Author: lveillard

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-pnpm precommit
+pnpm test

changelog.md

@@ -2,6 +2,12 @@
 
 📝 following beta format X.Y.Z where Y = breaking change and Z = feature and fix. Later => FAIL.FEATURE.FIX
 
+
+## 0.10.2(2024-04-18)
+
+- Test: Migrated to vitest
+- Test: TypeDB url moved as env var
+
 ## 0.10.1(2024-04-17)
 
 - Feat: Transformations for mutations with $fields included.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@blitznocode/blitz-orm",
-	"version": "0.10.1",
+	"version": "0.10.2",
 	"main": "dist/index.cjs",
 	"module": "./dist/index.mjs",
 	"types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
 		"build": "tsup src/index.ts --format cjs,esm --clean --dts --treeshake --minify",
 		"dev": "tsup --dts --watch --sourcemap",
 		"knip": "knip",
-		"husky:prepare": "husky install",
+		"husky:prepare": "husky init",
 		"lint:check": "eslint src --quiet --ext .ts,.tsx",
 		"lint:fix": "eslint src --ext .ts,.tsx --fix",
 		"lint-staged": "lint-staged",
@@ -27,13 +27,14 @@
 		"test:query": "./tests/test.sh query.test.ts",
 		"test:typedb-query": "./tests/test.sh typedb/unit/queries",
 		"test:typedb-mutation": "./tests/test.sh typedb/unit/mutations",
-		"test:typedb-ignoreTodo": "./tests/test.sh -t \"^(?!.*TODO:).*\" --detectOpenHandles typedb",
+		"test:typedb-ignoreTodo": "vitest typedb -t \"^(?!.*TODO:).*\" ",
 		"test:surrealdb-query": "./tests/test.sh surrealdb/unit/queries/query.test.ts",
 		"test:multidb": "./tests/test.sh --detectOpenHandles multidb",
 		"test:ignoreTodo": "./tests/test.sh -t \"^(?!.*TODO:).*\" --detectOpenHandles",
 		"test:buildSchema": "npx esbuild tests/mocks/buildSchema.ts --bundle --loader:.ts=ts --platform=node --format=cjs --outfile=tests/mocks/buildSchema.js && node tests/mocks/buildSchema.js",
 		"test:watch": "./tests/test.sh --watch",
-		"types": "tsc --noEmit"
+		"types": "tsc --noEmit",
+		"prepare": "husky"
 	},
 	"private": false,
 	"license": "AGPL-3.0-only",
@@ -54,14 +55,16 @@
 	"dependencies": {
 		"acorn": "^8.11.3",
 		"case-anything": "^2.1.13",
+		"dotenv": "^16.4.5",
 		"immer": "10.0.4",
-		"nanoid": "3",
+		"nanoid": "^5.0.7",
 		"object-traversal": "^1.0.1",
 		"radash": "^11.0.0",
 		"robot3": "^0.4.1",
 		"surrealdb.node": "^0.3.0",
 		"typedb-driver": "2.26.6-rc1",
-		"uuid": "^9.0.1"
+		"uuid": "^9.0.1",
+		"vitest": "^1.5.0"
 	},
 	"devDependencies": {
 		"@blitznocode/eslint-config": "^1.1.0",

src/stateMachine/query/tql/parse.ts

@@ -61,8 +61,8 @@ const parseObj = (res: any, rawBqlRequest: RawBQLQuery, schema: EnrichedBormSche
 	const parsedDataFields = parseDataFields(dataFields, currentSchema, config);
 	const parsedLinkFields = parseLinkFields(linkFields, schema, config);
 	const parsedRoleFields = parseRoleFields(roleFields, schema, config);
-	console.log('parseObj/parsedLinkFields', JSON.stringify(parsedLinkFields));
-	console.log('parseObj/parsedRoleFields', JSON.stringify(parsedRoleFields));
+	//console.log('parseObj/parsedLinkFields', JSON.stringify(parsedLinkFields));
+	//console.log('parseObj/parsedRoleFields', JSON.stringify(parsedRoleFields));
 	const idNotIncluded = rawBqlRequest?.$fields?.every(
 		(field) => !currentSchema?.idFields?.includes(typeof field === 'string' ? field : field.$path),
 	);

tests/helpers/createTest.ts

@@ -2,6 +2,7 @@ import 'jest';
 
 import BormClient from "../../src";
 import { assertDefined } from '../../src/helpers';
+import { afterAll, beforeAll, describe } from 'vitest';
 
 type TestContext = {
 	query: BormClient['query'];

tests/helpers/matchers.ts

@@ -3,6 +3,7 @@
 import { produce } from 'immer';
 import type { TraversalCallbackContext } from 'object-traversal';
 import { traverse } from 'object-traversal';
+import { expect } from 'vitest';
 
 const getCommonKey = (obj1: Record<string, any>, obj2: Record<string, any>): string | undefined => {
 	const keys1 = Object.keys(obj1);

tests/multidb/mocks/config.ts

@@ -1,4 +1,12 @@
 import type { BormConfig } from '../../../src/index';
+import dotenv from 'dotenv';
+dotenv.config();
+
+// eslint-disable-next-line turbo/no-undeclared-env-vars
+const typeDbUrl = process.env.TYPE_DB_URL as string;
+if (!typeDbUrl) {
+	throw new Error('TYPE_DB_URL is not defined');
+}
 
 export const config: BormConfig = {
 	server: {
@@ -9,16 +17,16 @@ export const config: BormConfig = {
 			id: 'typeDB',
 			provider: 'typeDB',
 			dbName: 'multi_db_test',
-			url: 'localhost:1729',
+			url: typeDbUrl,
 		},
 		{
 			id: 'surrealDB',
 			provider: 'surrealDB',
-      namespace: 'multi_db_test',
+			namespace: 'multi_db_test',
 			dbName: 'test',
 			url: 'ws://127.0.0.1:8000',
-      username: 'tester',
-      password: 'tester'
+			username: 'tester',
+			password: 'tester',
 		},
 	],
 };

tests/multidb/unit/queries/query.test.ts

@@ -3,6 +3,7 @@ import 'jest';
 import { init } from '../../helpers/lifecycle';
 import type BormClient from '../../../../src/index';
 import { deepSort } from '../../../helpers/matchers';
+import { afterAll, beforeAll, describe } from 'vitest';
 
 describe('Query', () => {
 	let cleanup: () => Promise<void>;

tests/typedb/mocks/config.ts

@@ -1,4 +1,12 @@
 import type { BormConfig } from '../../../src/index';
+import dotenv from 'dotenv';
+dotenv.config();
+
+// eslint-disable-next-line turbo/no-undeclared-env-vars
+const typeDbUrl = process.env.TYPE_DB_URL as string;
+if (!typeDbUrl) {
+	throw new Error('TYPE_DB_URL is not defined');
+}
 
 export const config: BormConfig = {
 	server: {
@@ -9,7 +17,7 @@ export const config: BormConfig = {
 			id: 'default',
 			provider: 'typeDB',
 			dbName: 'test',
-			url: 'localhost:1729',
+			url: typeDbUrl,
 		},
 	],
 };

tests/unit/mutations/basic.ts

@@ -3,6 +3,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { deepSort, expectArraysInObjectToContainSameElements } from '../../helpers/matchers';
 import { createTest } from '../../helpers/createTest';
+import { expect, it } from 'vitest';
 
 export const testBasicMutation = createTest('Mutation: Basic', (ctx) => {
 	// some random issues forced a let here