fix: Incomplete generation #8

Author: sebastianwessel

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+	"editor.formatOnSave": true,
+	"editor.defaultFormatter": "biomejs.biome",
+	"editor.codeActionsOnSave": {
+		"quickfix.biome": "explicit",
+		"source.organizeImports.biome": "explicit"
+	},
+	"[javascript]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"[typescript]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"[json]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	}
+}

README.md

@@ -126,6 +126,33 @@ They serve as safe spaces for your customizations, changes, and enhancements:
 **Customization Freedom**: You can confidently make modifications and enhancements in these subfolders without worrying about them being altered by future executions of the tool.
 This design allows you to tailor the generated code to your project's specific requirements, ensuring a seamless development experience.
 
+## Mapping
+
+### Basic Type
+
+| SurrealQL | Zod (input)  | Zod (output) |
+|-----------|---|---|
+| TYPE number  | z.number()  | z.number() |
+| TYPE option\<number\>  | z.number().optional()  | z.number().optional() |
+| TYPE string  | z.string()  | z.string() |
+| TYPE option\<string\>  | z.string().optional()  | z.string().optional() |
+| TYPE datetime  | z.string().datetime()  | z.string().datetime() |
+| TYPE option\<datetime\>  | z.string().datetime().optional()  | z.string().datetime().optional() |
+| TYPE bool  | z.boolean()  | z.boolean() |
+| TYPE option\<bool\>  | z.boolean().optional()  | z.boolean().optional() |
+| TYPE object  | z.object({})  | z.object({}) |
+| TYPE option\<object\>  | z.object({}).optional()  | z.object({}).optional() |
+| TYPE array  | z.array()  | z.array(z.any()) |
+| TYPE option\<array\>  | z.array(z.any()).optional()  | z.array(z.any()).optional() |
+| TYPE array\<string\>  | z.array()  | z.array(z.string()) |
+| TYPE option\<array\<string\>\>  | z.array(z.string()).optional()  | z.array(z.string()).optional() |
+| TYPE array\<number\>  | z.array()  | z.array(z.number()) |
+| TYPE option\<array\<number\>\>  | z.array(z.number()).optional()  | z.array(z.number()).optional() |
+| TYPE array\<bool\>  | z.array()  | z.array(z.boolean()) |
+| TYPE option\<array\<bool\>\>  | z.array(z.boolean()).optional()  | z.array(z.boolean()).optional() |
+| TYPE record  | z.any()  | z.any() |
+| TYPE option\<record\>  | z.any()  | z.any() |
+
 ---
 
 If you like this tool, I please you, to give a star ⭐️ on github:

biome.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "https://biomejs.dev/schemas/1.7.2/schema.json",
+	"$schema": "https://biomejs.dev/schemas/1.8.0/schema.json",
 	"organizeImports": {
 		"enabled": true
 	},
@@ -8,7 +8,7 @@
 		"rules": {
 			"recommended": true
 		},
-		"ignore": ["dist/**", "node_modules/**", ".tshy/**", "./out/**"]
+		"ignore": ["dist/**", "node_modules/**", ".tshy/**", "./out/**", "./client_generated/**"]
 	},
 	"formatter": {
 		"ignore": ["dist/**", "node_modules/**", ".tshy/**", "./out/**"],
@@ -24,7 +24,7 @@
 			"enabled": true,
 			"semicolons": "asNeeded",
 			"quoteStyle": "single",
-			"trailingComma": "all",
+			"trailingCommas": "all",
 			"arrowParentheses": "asNeeded"
 		}
 	}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sebastianwessel/surql-gen",
 	"private": false,
-	"version": "2.0.0",
+	"version": "2.1.0",
 	"engines": {
 		"node": ">=18"
 	},
@@ -40,7 +40,8 @@
 	"scripts": {
 		"start": "node dist/esm/index.js",
 		"dev": "tsx src/index.ts",
-		"lint": "npx @biomejs/biome check --apply .",
+		"build": "tshy",
+		"lint": "npx @biomejs/biome check --write .",
 		"test": "vitest",
 		"prepare": "tshy"
 	},

src/config/configFileSchema.ts

@@ -9,5 +9,4 @@ export const configFileSchema = z.object({
 	password: z.string().default('root'),
 	outputFolder: z.string().default('client_generated'),
 	generateClient: z.boolean().default(true),
-	lib: z.enum(['surrealdb.js', 'surrealdb.node']).default('surrealdb.js'),
 })

src/database/db.ts

@@ -15,10 +15,10 @@ export const connectDb = async (config: Config) => {
 	console.log('connect to database')
 	db = new Surreal()
 	await db.connect(config.surreal)
-  await db.use({
-    namespace: config.ns,
+	await db.use({
+		namespace: config.ns,
 		database: config.db,
-  })
+	})
 	await db.signin({
 		username: config.username,
 		password: config.password,
@@ -28,7 +28,7 @@ export const connectDb = async (config: Config) => {
 export const insertDefinitions = async (content: string) => {
 	const db = getDb()
 	const result = await db.query(content, {})
-	console.debug('insertDefinitions:', JSON.stringify(result, null, 2))
+	console.log('definitions written to database')
 }
 
 export const closeDb = async () => {

src/database/getAllTableNames.ts

@@ -3,16 +3,16 @@ import { getDb } from './db.js'
 export const getAllTableNames = async () => {
 	const db = getDb()
 
-  type InfoDB = {
-    analyzers: Record<string,unknown>
-    functions: Record<string,unknown>
-    models:  Record<string,unknown>
-    params: Record<string,unknown>
-    scopes: Record<string,unknown>
-    tables: Record<string,string>
-    tokens: Record<string,unknown>
-    users: Record<string,unknown>
-  }[]
+	type InfoDB = {
+		analyzers: Record<string, unknown>
+		functions: Record<string, unknown>
+		models: Record<string, unknown>
+		params: Record<string, unknown>
+		scopes: Record<string, unknown>
+		tables: Record<string, string>
+		tokens: Record<string, unknown>
+		users: Record<string, unknown>
+	}[]
 
 	const result = await db.query<InfoDB>('INFO FOR DB;', {})
 	if (!result[0]?.tables) {

src/database/getTableFields.ts

@@ -1,11 +1,11 @@
 import { getDb } from './db.js'
 
 type InfoTable = {
-  events: Record<string,unknown>
-  fields: Record<string,string>
-  indexes: Record<string,unknown>
-  lives: Record<string,unknown>
-  tables: Record<string,unknown>
+	events: Record<string, unknown>
+	fields: Record<string, string>
+	indexes: Record<string, unknown>
+	lives: Record<string, unknown>
+	tables: Record<string, unknown>
 }[]
 
 export const getTableFields = async (tableName: string) => {

src/genClient/generateClientJs.ts

@@ -27,58 +27,112 @@ export const generateClientJs = async (outputFolder: string, tableNames: string[
 		const repoFileName = resolve(clientTableFolder, `get${tableNameFirstUpper}Repository.ts`)
 		if (!existsSync(repoFileName)) {
 			const file = createWriteStream(repoFileName)
-			file.write(getRepositoryContent(lib, tableNameFirstUpper))
+			await new Promise((resolve, reject) =>
+				file.write(getRepositoryContent(lib, tableNameFirstUpper), err => {
+					if (err) {
+						console.error(err)
+						reject(err)
+					} else {
+						resolve(true)
+					}
+				}),
+			)
 			file.close()
 		}
 
 		const createFileName = resolve(clientTableFolder, `create${tableNameFirstUpper}.ts`)
-		if (!existsSync(repoFileName)) {
+		if (!existsSync(createFileName)) {
 			const file = createWriteStream(createFileName)
-			file.write(getCreateEntityFileContent(lib, tableName, name))
+			await new Promise((resolve, reject) =>
+				file.write(getCreateEntityFileContent(lib, tableName, name), err => {
+					if (err) {
+						console.error(err)
+						reject(err)
+					} else {
+						resolve(true)
+					}
+				}),
+			)
 			file.close()
 			console.log(` ✅ [${tableName}]: create${tableNameFirstUpper}.ts`)
 		} else {
-			console.log(` ❎ [${tableName}]: create${tableNameFirstUpper}.ts already exists`)
+			console.log(` ❌ [${tableName}]: create${tableNameFirstUpper}.ts already exists`)
 		}
 
 		const updateFileName = resolve(clientTableFolder, `update${tableNameFirstUpper}.ts`)
-		if (!existsSync(repoFileName)) {
+		if (!existsSync(updateFileName)) {
 			const file = createWriteStream(updateFileName)
-			file.write(getUpdateEntityFileContent(lib, tableName))
+			await new Promise((resolve, reject) =>
+				file.write(getUpdateEntityFileContent(lib, tableName), err => {
+					if (err) {
+						console.error(err)
+						reject(err)
+					} else {
+						resolve(true)
+					}
+				}),
+			)
 			file.close()
 			console.log(` ✅ [${tableName}]: update${tableNameFirstUpper}.ts`)
 		} else {
-			console.log(` ❎ [${tableName}]: update${tableNameFirstUpper}.ts already exists`)
+			console.log(` ❌ [${tableName}]: update${tableNameFirstUpper}.ts already exists ${updateFileName}`)
 		}
 
 		const deleteFileName = resolve(clientTableFolder, `delete${tableNameFirstUpper}.ts`)
-		if (!existsSync(repoFileName)) {
+		if (!existsSync(deleteFileName)) {
 			const file = createWriteStream(deleteFileName)
-			file.write(getDeleteEntityFileContent(lib, tableName))
+			await new Promise((resolve, reject) =>
+				file.write(getDeleteEntityFileContent(lib, tableName), err => {
+					if (err) {
+						console.error(err)
+						reject(err)
+					} else {
+						resolve(true)
+					}
+				}),
+			)
 			file.close()
 			console.log(` ✅ [${tableName}]: delete${tableNameFirstUpper}.ts`)
 		} else {
-			console.log(` ❎ [${tableName}]: delete${tableNameFirstUpper}.ts already exists`)
+			console.log(` ❌ [${tableName}]: delete${tableNameFirstUpper}.ts already exists`)
 		}
 
 		const getAllFileName = resolve(clientTableFolder, `getAll${tableNameFirstUpper}s.ts`)
-		if (!existsSync(repoFileName)) {
+		if (!existsSync(getAllFileName)) {
 			const file = createWriteStream(getAllFileName)
-			file.write(getAllEntityFileContent(lib, tableName, name))
+			await new Promise((resolve, reject) =>
+				file.write(getAllEntityFileContent(lib, tableName, name), err => {
+					if (err) {
+						console.error(err)
+						reject(err)
+					} else {
+						resolve(true)
+					}
+				}),
+			)
 			file.close()
 			console.log(` ✅ [${tableName}]: getAll${tableNameFirstUpper}s.ts`)
 		} else {
-			console.log(` ❎ [${tableName}]: getAll${tableNameFirstUpper}s.ts already exists`)
+			console.log(` ❌ [${tableName}]: getAll${tableNameFirstUpper}s.ts already exists`)
 		}
 
 		const getByIdFileName = resolve(clientTableFolder, `get${tableNameFirstUpper}ById.ts`)
-		if (!existsSync(repoFileName)) {
+		if (!existsSync(getByIdFileName)) {
 			const file = createWriteStream(getByIdFileName)
-			file.write(getByIdEntityFileContent(lib, tableName))
+			await new Promise((resolve, reject) =>
+				file.write(getByIdEntityFileContent(lib, tableName), err => {
+					if (err) {
+						console.error(err)
+						reject(err)
+					} else {
+						resolve(true)
+					}
+				}),
+			)
 			file.close()
 			console.log(` ✅ [${tableName}]: get${tableNameFirstUpper}ById.ts`)
 		} else {
-			console.log(` ❎ [${tableName}]: get${tableNameFirstUpper}ById.ts already exists`)
+			console.log(` ❌ [${tableName}]: get${tableNameFirstUpper}ById.ts already exists`)
 		}
 	}
 }

src/genClient/getAllEntityFileContent.ts

@@ -10,14 +10,7 @@ import type { Surreal } from "${lib}";
 import type { ${entityTypeName} } from "../../schema/${entityName}/${entityName}Types.js";
 
 export const getAll${entityNameFirstUpper}s = async function (db: Surreal) {
-
-  const result = await db.query<[${entityTypeName}[]]>("SELECT * FROM ${tableName}", {});
-
-  if(result[0].status==="ERR") {
-    throw new Error('[DB_ERR] '+result[0].result)
-  }
-
-  return result[0].result;
+  return db.select<${entityTypeName}>("${tableName}")
 };
 `
 }