hekireki 0.0.4 → 0.0.6

package/dist/generator/zod/generator/generate-zod-infer.js

@@ -10,14 +10,7 @@ const get_variable_schema_name_helper_1 = require("../../../common/helper/get-va
  * @returns The generated Zod infer
  */
 function generateZodInfer(modelName, config) {
-	const typeName = (0, get_variable_name_helper_1.getVariableNameHelper)(
-		modelName,
-		config,
-	);
-	const schemaName = (0,
-	get_variable_schema_name_helper_1.getVariableSchemaNameHelper)(
-		modelName,
-		config,
-	);
-	return `export type ${typeName} = z.infer<typeof ${schemaName}>`;
+    const typeName = (0, get_variable_name_helper_1.getVariableNameHelper)(modelName, config);
+    const schemaName = (0, get_variable_schema_name_helper_1.getVariableSchemaNameHelper)(modelName, config);
+    return `export type ${typeName} = z.infer<typeof ${schemaName}>`;
 }

package/dist/generator/zod/generator/generate-zod-properties.d.ts

@@ -5,13 +5,10 @@ import type { Config } from "..";
  * @param config - The configuration for the generator
  * @returns The generated Zod properties
  */
-export declare function generateZodProperties(
-	modelFields: {
-		documentation: string;
-		modelName: string;
-		fieldName: string;
-		validation: string | null;
-		comment: string[];
-	}[],
-	config?: Config,
-): string;
+export declare function generateZodProperties(modelFields: {
+    documentation: string;
+    modelName: string;
+    fieldName: string;
+    validation: string | null;
+    comment: string[];
+}[], config?: Config): string;

package/dist/generator/zod/generator/generate-zod-properties.js

@@ -8,25 +8,19 @@ exports.generateZodProperties = generateZodProperties;
  * @returns The generated Zod properties
  */
 function generateZodProperties(modelFields, config) {
-	const fields = modelFields
-		.filter((field) => field.validation)
-		.map((field) => {
-			// @relation, @v, @z exclude
-			const cleanDoc = field.comment
-				.filter(
-					(line) =>
-						!(
-							line.includes("@relation") ||
-							line.includes("@v") ||
-							line.includes("@z")
-						),
-				)
-				.join("\n")
-				.trim();
-			const docComment =
-				config?.comment && cleanDoc ? `  /**\n   * ${cleanDoc}\n   */\n` : "";
-			return `${docComment}  ${field.fieldName}: z.${field.validation}`;
-		})
-		.join(",\n");
-	return fields;
+    const fields = modelFields
+        .filter((field) => field.validation)
+        .map((field) => {
+        // @relation, @v, @z exclude
+        const cleanDoc = field.comment
+            .filter((line) => !(line.includes("@relation") ||
+            line.includes("@v") ||
+            line.includes("@z")))
+            .join("\n")
+            .trim();
+        const docComment = config?.comment && cleanDoc ? `  /**\n   * ${cleanDoc}\n   */\n` : "";
+        return `${docComment}  ${field.fieldName}: z.${field.validation}`;
+    })
+        .join(",\n");
+    return fields;
 }

package/dist/generator/zod/generator/generate-zod-schema.d.ts

@@ -6,8 +6,4 @@ import type { Config } from "..";
  * @param config - The configuration for the generator
  * @returns The generated Zod schema
  */
-export declare function generateZodSchema(
-	modelName: string,
-	fields: string,
-	config: Config,
-): string;
+export declare function generateZodSchema(modelName: string, fields: string, config: Config): string;

package/dist/generator/zod/generator/generate-zod-schema.js

@@ -10,10 +10,6 @@ const get_variable_schema_name_helper_1 = require("../../../common/helper/get-va
  * @returns The generated Zod schema
  */
 function generateZodSchema(modelName, fields, config) {
-	const schemaName = (0,
-	get_variable_schema_name_helper_1.getVariableSchemaNameHelper)(
-		modelName,
-		config,
-	);
-	return `export const ${schemaName} = z.object({\n${fields}\n})`;
+    const schemaName = (0, get_variable_schema_name_helper_1.getVariableSchemaNameHelper)(modelName, config);
+    return `export const ${schemaName} = z.object({\n${fields}\n})`;
 }

package/dist/generator/zod/generator/generate-zod-schemas.d.ts

@@ -5,13 +5,10 @@ import type { Config } from "..";
  * @param config - The configuration for the generator
  * @returns The generated Zod schemas
  */
-export declare function generateZodSchemas(
-	modelFields: {
-		documentation: string;
-		modelName: string;
-		fieldName: string;
-		validation: string | null;
-		comment: string[];
-	}[],
-	config: Config,
-): string;
+export declare function generateZodSchemas(modelFields: {
+    documentation: string;
+    modelName: string;
+    fieldName: string;
+    validation: string | null;
+    comment: string[];
+}[], config: Config): string;

package/dist/generator/zod/generator/generate-zod-schemas.js

@@ -10,18 +10,11 @@ const generate_zod_schema_1 = require("./generate-zod-schema");
  * @returns The generated Zod schemas
  */
 function generateZodSchemas(modelFields, config) {
-	const modelName = modelFields[0].modelName;
-	const modelDoc = modelFields[0].documentation || "";
-	const fields = (0, generate_zod_properties_1.generateZodProperties)(
-		modelFields,
-		config,
-	);
-	if (!(modelDoc || !config?.comment)) {
-		return (0, generate_zod_schema_1.generateZodSchema)(
-			modelName,
-			fields,
-			config,
-		);
-	}
-	return `${(0, generate_zod_schema_1.generateZodSchema)(modelName, fields, config)}`;
+    const modelName = modelFields[0].modelName;
+    const modelDoc = modelFields[0].documentation || "";
+    const fields = (0, generate_zod_properties_1.generateZodProperties)(modelFields, config);
+    if (!(modelDoc || !config?.comment)) {
+        return (0, generate_zod_schema_1.generateZodSchema)(modelName, fields, config);
+    }
+    return `${(0, generate_zod_schema_1.generateZodSchema)(modelName, fields, config)}`;
 }

package/dist/generator/zod/generator/generate-zod.d.ts

@@ -6,7 +6,4 @@ import type { Model } from "../../../common/type";
  * @param config - The configuration for the generator
  * @returns The generated Zod schemas and types
  */
-export declare function generateZod(
-	models: readonly Model[],
-	config: Config,
-): string;
+export declare function generateZod(models: readonly Model[], config: Config): string;

package/dist/generator/zod/generator/generate-zod.js

@@ -15,55 +15,40 @@ const ZOD_IMPORT = `import { z } from 'zod'\n`;
  * @returns The generated Zod schemas and types
  */
 function generateZod(models, config) {
-	const modelInfos = models.map((model) => {
-		return {
-			documentation: model.documentation ?? "",
-			name: model.name,
-			fields: model.fields,
-		};
-	});
-	const modelFields = modelInfos.map((model) => {
-		const fields = model.fields.map((field) => ({
-			documentation: model.documentation,
-			modelName: model.name,
-			fieldName: field.name,
-			comment: (0, is_zod_documentation_1.isZodDocumentValidation)(
-				field.documentation,
-			),
-			validation: (0, is_zod_validation_1.isZodValidation)(field.documentation),
-		}));
-		return fields;
-	});
-	// null exclude
-	const validFields = (0, is_fields_validation_1.isFieldsValidation)(
-		modelFields,
-	);
-	// group by model
-	const groupedByModel = (0, group_by_model_helper_1.groupByModelHelper)(
-		validFields,
-	);
-	const zods = Object.values(groupedByModel).map((fields) => {
-		return {
-			generateZodSchema: (0, generate_zod_schemas_1.generateZodSchemas)(
-				fields,
-				config,
-			),
-			generateZodInfer:
-				config.type === "true"
-					? (0, generate_zod_infer_1.generateZodInfer)(
-							fields[0].modelName,
-							config,
-						)
-					: "",
-		};
-	});
-	return [
-		ZOD_IMPORT,
-		"",
-		zods
-			.flatMap(({ generateZodSchema, generateZodInfer }) =>
-				[generateZodSchema, generateZodInfer].filter(Boolean),
-			)
-			.join("\n\n"),
-	].join("\n");
+    const modelInfos = models.map((model) => {
+        return {
+            documentation: model.documentation ?? "",
+            name: model.name,
+            fields: model.fields,
+        };
+    });
+    const modelFields = modelInfos.map((model) => {
+        const fields = model.fields.map((field) => ({
+            documentation: model.documentation,
+            modelName: model.name,
+            fieldName: field.name,
+            comment: (0, is_zod_documentation_1.isZodDocumentValidation)(field.documentation),
+            validation: (0, is_zod_validation_1.isZodValidation)(field.documentation),
+        }));
+        return fields;
+    });
+    // null exclude
+    const validFields = (0, is_fields_validation_1.isFieldsValidation)(modelFields);
+    // group by model
+    const groupedByModel = (0, group_by_model_helper_1.groupByModelHelper)(validFields);
+    const zods = Object.values(groupedByModel).map((fields) => {
+        return {
+            generateZodSchema: (0, generate_zod_schemas_1.generateZodSchemas)(fields, config),
+            generateZodInfer: config.type === "true"
+                ? (0, generate_zod_infer_1.generateZodInfer)(fields[0].modelName, config)
+                : "",
+        };
+    });
+    return [
+        ZOD_IMPORT,
+        "",
+        zods
+            .flatMap(({ generateZodSchema, generateZodInfer }) => [generateZodSchema, generateZodInfer].filter(Boolean))
+            .join("\n\n"),
+    ].join("\n");
 }

package/dist/generator/zod/index.d.ts

@@ -1,10 +1,11 @@
+#!/usr/bin/env node
 import type { GeneratorOptions } from "@prisma/generator-helper";
 export type Config = {
-	output?: string;
-	file?: string | string[];
-	schemaName?: "PascalCase" | "camelCase" | string | string[];
-	typeName?: "PascalCase" | "camelCase" | string | string[];
-	type?: boolean | string | string[];
-	comment?: boolean | string | string[];
+    output?: string;
+    file?: string | string[];
+    schemaName?: "PascalCase" | "camelCase" | string | string[];
+    typeName?: "PascalCase" | "camelCase" | string | string[];
+    type?: boolean | string | string[];
+    comment?: boolean | string | string[];
 };
 export declare function main(options: GeneratorOptions): Promise<void>;

package/dist/generator/zod/index.js

@@ -1,9 +1,8 @@
+#!/usr/bin/env node
 "use strict";
-var __importDefault =
-	(this && this.__importDefault) ||
-	function (mod) {
-		return mod && mod.__esModule ? mod : { default: mod };
-	};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = main;
 const generator_helper_1 = require("@prisma/generator-helper");
@@ -11,49 +10,45 @@ const generate_zod_1 = require("./generator/generate-zod");
 const prettier_1 = require("prettier");
 const node_fs_1 = __importDefault(require("node:fs"));
 const DEFAULT_CONFIG = {
-	output: "./zod",
-	file: "index.ts",
-	schemaName: "PascalCase",
-	typeName: "PascalCase",
-	type: false,
-	comment: false,
+    output: "./zod",
+    file: "index.ts",
+    schemaName: "PascalCase",
+    typeName: "PascalCase",
+    type: false,
+    comment: false,
 };
 async function main(options) {
-	const config = {
-		output: options.generator.output?.value ?? DEFAULT_CONFIG.output,
-		file: options.generator.config?.file ?? DEFAULT_CONFIG.file,
-		schemaName:
-			options.generator.config?.schemaName ?? DEFAULT_CONFIG.schemaName,
-		typeName: options.generator.config?.typeName ?? DEFAULT_CONFIG.typeName,
-		type: options.generator.config?.type ?? DEFAULT_CONFIG.type,
-		comment: options.generator.config?.comment === "true",
-	};
-	const content = (0, generate_zod_1.generateZod)(
-		options.dmmf.datamodel.models,
-		config,
-	);
-	const code = await (0, prettier_1.format)(content, {
-		parser: "typescript",
-		printWidth: 100,
-		singleQuote: true,
-		semi: false,
-	});
-	if (!config.output) {
-		throw new Error("output is required");
-	}
-	if (!node_fs_1.default.existsSync(config.output)) {
-		node_fs_1.default.mkdirSync(config.output, { recursive: true });
-	}
-	const file = config.file ?? "index.ts";
-	const filePath = `${config.output}/${file}`;
-	node_fs_1.default.writeFileSync(filePath, code);
+    const config = {
+        output: options.generator.output?.value ?? DEFAULT_CONFIG.output,
+        file: options.generator.config?.file ?? DEFAULT_CONFIG.file,
+        schemaName: options.generator.config?.schemaName ?? DEFAULT_CONFIG.schemaName,
+        typeName: options.generator.config?.typeName ?? DEFAULT_CONFIG.typeName,
+        type: options.generator.config?.type ?? DEFAULT_CONFIG.type,
+        comment: options.generator.config?.comment === "true",
+    };
+    const content = (0, generate_zod_1.generateZod)(options.dmmf.datamodel.models, config);
+    const code = await (0, prettier_1.format)(content, {
+        parser: "typescript",
+        printWidth: 100,
+        singleQuote: true,
+        semi: false,
+    });
+    if (!config.output) {
+        throw new Error("output is required");
+    }
+    if (!node_fs_1.default.existsSync(config.output)) {
+        node_fs_1.default.mkdirSync(config.output, { recursive: true });
+    }
+    const file = config.file ?? "index.ts";
+    const filePath = `${config.output}/${file}`;
+    node_fs_1.default.writeFileSync(filePath, code);
 }
 (0, generator_helper_1.generatorHandler)({
-	onManifest() {
-		return {
-			defaultOutput: "./zod/",
-			prettyName: "Hekireki-Zod",
-		};
-	},
-	onGenerate: main,
+    onManifest() {
+        return {
+            defaultOutput: "./zod/",
+            prettyName: "Hekireki-Zod",
+        };
+    },
+    onGenerate: main,
 });

package/dist/generator/zod/validator/is-zod-documentation.d.ts

@@ -3,6 +3,4 @@
  * @param documentation - The documentation of the field
  * @returns The Zod documentation
  */
-export declare function isZodDocumentValidation(
-	documentation?: string,
-): string[];
+export declare function isZodDocumentValidation(documentation?: string): string[];

package/dist/generator/zod/validator/is-zod-documentation.js

@@ -8,12 +8,11 @@ const VALIDATION_PATTERNS = ["@z."];
  * @returns The Zod documentation
  */
 function isZodDocumentValidation(documentation) {
-	if (!documentation) return [];
-	return documentation
-		.split("\n")
-		.filter(
-			(line) => !VALIDATION_PATTERNS.some((pattern) => line.includes(pattern)),
-		)
-		.map((line) => line.trim())
-		.filter(Boolean);
+    if (!documentation)
+        return [];
+    return documentation
+        .split("\n")
+        .filter((line) => !VALIDATION_PATTERNS.some((pattern) => line.includes(pattern)))
+        .map((line) => line.trim())
+        .filter(Boolean);
 }

package/dist/generator/zod/validator/is-zod-validation.js

@@ -7,7 +7,8 @@ exports.isZodValidation = isZodValidation;
  * @returns The Zod validation
  */
 function isZodValidation(documentation) {
-	if (!documentation) return null;
-	const match = documentation.match(/@z\.(.+?)(?:\n|$)/);
-	return match ? match[1].trim() : null;
+    if (!documentation)
+        return null;
+    const match = documentation.match(/@z\.(.+?)(?:\n|$)/);
+    return match ? match[1].trim() : null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hekireki",
-	"version": "0.0.4",
+	"version": "0.0.6",
 	"license": "MIT",
 	"description": "Hekireki is a tool that generates validation schemas for Zod and Valibot, as well as ER diagrams, from Prisma schemas annotated with comments.",
 	"keywords": [
@@ -37,7 +37,7 @@
 		"typecheck": "tsc --noEmit",
 		"test": "vitest run",
 		"coverage": "vitest run --coverage",
-		"release": "npm pkg fix && npm publish"
+		"release": "npm pkg fix && pnpm build && npm publish"
 	},
 	"devDependencies": {
 		"@types/node": "^22.13.10",