chore: add jsr.io config

Author: sebastianwessel

.npmrc

@@ -0,0 +1 @@
+@jsr:registry=https://npm.jsr.io

README.md

@@ -58,12 +58,6 @@ Configuring options for this tool is flexible and convenient. You have two main
 And the best part? You can use both methods simultaneously if it suits your needs. In such cases, the tool intelligently merges the parameters, giving priority to the ones provided through the CLI.
 This means you have complete control over your configuration, adapting it to your preferences effortlessly.
 
-Decide for which lib do you want to generate your client.
-Currently available:
-
-- surrealdb.js
-- surrealdb.node
-
 ```bash
 Usage: surql-gen [options]
 
@@ -81,7 +75,6 @@ Options:
   -o, --outputFolder    output folder (default: client_generated)
   -g, --generateClient  generate client (default: true)
   --no-generateClient   no client generation
-  -l, --lib             library to be used in client (default: surrealdb.js)
   -h, --help            display help for command
 ```
 

jsr.json

@@ -0,0 +1,11 @@
+{
+	"$schema": "https://jsr.io/schema/config-file.v1.json",
+	"name": "@sebastianwessel/surql-gen",
+	"description": "A small tool which generates a typescript client for SurrealDB based on the schema of a given database",
+	"version": "2.3.0",
+	"exports": "./dist/esm/index.js",
+	"publish": {
+		"include": ["dist/**/*.js", "dist/**/*.d.ts", "README.md", "package.json"],
+		"exclude": ["src", ".github", ".vscode", "!dist", "!dist/**/*.js", "!dist/**/*.d.ts", ".tshy", "out"]
+	}
+}

package-lock.json

@@ -31,12 +31,14 @@
 		"build": "tshy",
 		"lint": "npx @biomejs/biome check --write .",
 		"test": "vitest",
-		"prepare": "tshy"
+		"prepublishOnly": "npm run lint && vitest --no-watch && tshy",
+		"postpublish": "npx jsr publish"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.8.3",
 		"@types/node": "^20.14.10",
 		"tshy": "^3.0.2",
+		"jsr": "^0.12.4",
 		"tsx": "^4.15.7",
 		"typescript": "^5.5.2",
 		"vitest": "^2.0.1"

package.json

@@ -13,9 +13,9 @@ describe('generateTableSchema', () => {
 			'DEFINE TABLE test TYPE ANY SCHEMAFULL PERMISSIONS NONE',
 		)
 
-		expect(inputFields).toBe('const testInputSchemaGen = z.object({\nname: z.string(),\n})')
+		expect(inputFields).toBe('const testInputSchemaGen = z.object({\n  name: z.string()\n})')
 
-		expect(outputFields).toBe('const testOutputSchemaGen = z.object({\nname: z.string(),\n})')
+		expect(outputFields).toBe('const testOutputSchemaGen = z.object({\n  name: z.string()\n})')
 	})
 
 	it('generates a schema for a SCHEMALESS table', async () => {
@@ -24,9 +24,9 @@ describe('generateTableSchema', () => {
 			'DEFINE TABLE test TYPE ANY SCHEMALESS PERMISSIONS NONE',
 		)
 
-		expect(inputFields).toBe('const testInputSchemaGen = z.object({\nname: z.string(),\n}).passthrough()')
+		expect(inputFields).toBe('const testInputSchemaGen = z.object({\n  name: z.string()\n}).passthrough()')
 
-		expect(outputFields).toBe('const testOutputSchemaGen = z.object({\nname: z.string(),\n}).passthrough()')
+		expect(outputFields).toBe('const testOutputSchemaGen = z.object({\n  name: z.string()\n}).passthrough()')
 	})
 
 	it('generates a schema for a table without explicit SCHEMAFULL/SCHEMALESS setting', async () => {
@@ -35,8 +35,8 @@ describe('generateTableSchema', () => {
 			'DEFINE TABLE test TYPE ANY PERMISSIONS NONE',
 		)
 
-		expect(inputFields).toBe('const testInputSchemaGen = z.object({\nname: z.string(),\n}).passthrough()')
+		expect(inputFields).toBe('const testInputSchemaGen = z.object({\n  name: z.string()\n}).passthrough()')
 
-		expect(outputFields).toBe('const testOutputSchemaGen = z.object({\nname: z.string(),\n}).passthrough()')
+		expect(outputFields).toBe('const testOutputSchemaGen = z.object({\n  name: z.string()\n}).passthrough()')
 	})
 })

src/genSchema/generateTableSchema.test.ts

@@ -7,15 +7,17 @@ export const generateZodSchemaCode = (fields: FieldDetail[], schemaName: string)
 			const parts = field.name.split('.').map(part => part.replace('[*]', ''))
 			let current = fieldMap
 
+			const fieldDefault = undefined // field.default
+
 			let i = 0
 			for (const part of parts) {
 				if (i === parts.length - 1) {
 					// Leaf node
 					if (field.type?.startsWith('array')) {
-						current[part] = `z.array(${field.zodString.replace('{}', '')}).default(${field.default ?? '[]'})`
+						current[part] = `z.array(${field.zodString.replace('{}', '')}).default(${fieldDefault ?? '[]'})`
 					} else {
-						const fieldDefault = field.default ? `.default(${field.default})` : ''
-						current[part] = `${field.zodString}${fieldDefault}`
+						const fd = fieldDefault ? `.default(${fieldDefault})` : ''
+						current[part] = `${field.zodString}${fd}`
 					}
 				} else {
 					// Intermediate node

src/genSchema/generateZodSchemaCode.ts

@@ -48,9 +48,6 @@ export const tokenize = (definition: string): TokenizedDefinition => {
 
 	const defaultMatch = definition.match(/DEFAULT (\S+)/im)
 	if (defaultMatch) {
-		// Default makes no sense in base schemas.
-		// Get should only return existing values
-		// Create with default means optional in schema
 		result.default = defaultMatch[1]
 	}
 

src/genSchema/tokenize.ts

@@ -5,6 +5,6 @@ export default defineConfig({
 		include: ['**/*.test.ts'],
 		globals: true,
 		disableConsoleIntercept: true,
-		setupFiles: ['./customMatchers.ts'],
+		setupFiles: ['./vitest.customMatchers.ts'],
 	},
 })