sizuku 0.3.2 → 0.4.0

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "sizuku",
   "type": "module",
-  "version": "0.3.2",
-  "description": "Sizuku is a tool that generates validation schemas for Zod and Valibot, as well as ER diagrams, from Drizzle schemas annotated with comments.",
+  "version": "0.4.0",
+  "description": "Sizuku is a tool that generates validation schemas for Zod and Valibot, as well as ER diagrams and DBML, from Drizzle schemas annotated with comments.",
   "license": "MIT",
   "keywords": [
     "drizzle",
     "zod",
     "valibot",
-    "mermaid"
+    "mermaid",
+    "dbml"
   ],
   "homepage": "https://github.com/nakita628/sizuku",
   "publishConfig": {
@@ -21,23 +22,23 @@
   "bugs": {
     "url": "https://github.com/nakita628/sizuku/issues"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/index.mjs",
+  "types": "dist/index.d.mts",
   "files": [
     "dist"
   ],
   "bin": {
-    "sizuku": "dist/index.js"
+    "sizuku": "dist/index.mjs"
   },
   "exports": {
     "./config": {
-      "types": "./dist/config/index.d.ts",
-      "import": "./dist/config/index.js"
+      "types": "./dist/config/index.d.mts",
+      "import": "./dist/config/index.mjs"
     }
   },
   "scripts": {
     "deps": "rm -rf node_modules && pnpm install",
-    "build": "tsc",
+    "build": "tsdown",
     "typecheck": "tsc --noEmit",
     "dev": "pnpm --filter sizuku-test dev",
     "test": "vitest run",
@@ -45,16 +46,29 @@
     "release": "npm pkg fix && pnpm build && npm publish"
   },
   "devDependencies": {
-    "@types/node": "^22.15.34",
-    "@vitest/coverage-v8": "^3.2.4",
-    "drizzle-orm": "^0.40.1",
-    "valibot": "1.0.0-rc.3",
-    "vitest": "^3.2.4",
-    "zod": "^4.0.15"
+    "@types/node": "^24.10.1",
+    "@vitest/coverage-v8": "^4.0.14",
+    "drizzle-orm": "^0.44.7",
+    "tsdown": "^0.20.1",
+    "typescript": "^5.9.3",
+    "valibot": "1.2.0",
+    "vitest": "^4.0.14"
+  },
+  "peerDependencies": {
+    "drizzle-orm": ">=0.36.0"
+  },
+  "peerDependenciesMeta": {
+    "drizzle-orm": {
+      "optional": true
+    }
   },
   "dependencies": {
+    "@resvg/resvg-js": "^2.6.2",
+    "@softwaretechnik/dbml-renderer": "^1.0.31",
     "prettier": "^3.6.2",
-    "ts-morph": "^26.0.0",
-    "tsx": "^4.20.5"
+    "ts-morph": "^27.0.2",
+    "tsx": "^4.20.6",
+    "utils-lab": "^0.0.2",
+    "zod": "^4.1.13"
   }
 }

package/dist/cli/main.d.ts

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-import type { Result } from 'neverthrow';
-import type { Config } from '../src/config/index.js';
-/**
- * Main CLI function that orchestrates the schema generation process.
- *
- * @param config - The configuration object.
- * @returns A Result indicating success or failure.
- */
-export declare function main(config?: Config): Promise<Result<void, Error>>;

package/dist/cli/main.js

@@ -1,61 +0,0 @@
-#!/usr/bin/env node
-import { err, ok, ResultAsync } from 'neverthrow';
-import { getConfig } from '../src/config/index.js';
-import { sizukuMermaidER } from '../src/generator/mermaid-er/index.js';
-import { sizukuValibot } from '../src/generator/valibot/index.js';
-import { sizukuZod } from '../src/generator/zod/index.js';
-import { readFileSync } from '../src/shared/fs/index.js';
-/**
- * Main CLI function that orchestrates the schema generation process.
- *
- * @param config - The configuration object.
- * @returns A Result indicating success or failure.
- */
-export async function main(config = getConfig()) {
-    return ResultAsync.fromPromise(Promise.resolve(), () => new Error('init'))
-        .andThen(() => {
-        if (!config.input) {
-            return err(new Error('input is not found'));
-        }
-        const contentResult = readFileSync(config.input);
-        if (contentResult.isErr()) {
-            return err(contentResult.error);
-        }
-        const content = contentResult.value;
-        const lines = content.split('\n');
-        const codeStart = lines.findIndex((line) => !line.trim().startsWith('import') && line.trim() !== '');
-        return ok(lines.slice(codeStart));
-    })
-        .andThen((code) => {
-        if (config.zod?.output) {
-            return ResultAsync.fromPromise(sizukuZod(code, config.zod.output, config.zod.comment, config.zod.type, config.zod.zod), (e) => (e instanceof Error ? e : new Error(String(e)))).map(() => {
-                console.log(`Generated Zod schema at: ${config.zod?.output}`);
-                return code;
-            });
-        }
-        return ok(code);
-    })
-        .andThen((code) => {
-        if (config.valibot?.output) {
-            return ResultAsync.fromPromise(sizukuValibot(code, config.valibot.output, config.valibot.comment, config.valibot.type), (e) => (e instanceof Error ? e : new Error(String(e)))).map(() => {
-                console.log(`Generated Valibot schema at: ${config.valibot?.output}`);
-                return code;
-            });
-        }
-        return ok(code);
-    })
-        .andThen((code) => {
-        if (config.mermaid?.output) {
-            return ResultAsync.fromPromise(sizukuMermaidER(code, config.mermaid.output), (e) => e instanceof Error ? e : new Error(String(e))).map(() => {
-                console.log(`Generated Mermaid ER at: ${config.mermaid?.output}`);
-            });
-        }
-        return ok(undefined);
-    });
-}
-main().then((result) => {
-    if (!result.isOk()) {
-        console.error(result.error);
-        process.exit(1);
-    }
-});

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/cli.js

@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-import { resolve } from 'path';
-import { Result, err, ok } from 'neverthrow';
-import { loadConfig, validateConfig } from './config/loader.js';
-import { generateSchemas } from './generator/engine.js';
-const main = async () => {
-    try {
-        // コマンドライン引数を解析
-        const args = process.argv.slice(2);
-        if (args.length === 0) {
-            return err(new Error('Usage: sizuku <config-file>'));
-        }
-        const configPath = resolve(args[0]);
-        // 設定ファイルを読み込み
-        const configResult = await loadConfig(configPath);
-        if (configResult.isErr()) {
-            return err(configResult.error);
-        }
-        // 設定をバリデーション
-        const validationResult = validateConfig(configResult.value);
-        if (validationResult.isErr()) {
-            return err(validationResult.error);
-        }
-        const config = validationResult.value;
-        // スキーマ生成を実行
-        const generationResult = await generateSchemas(config);
-        if (generationResult.isErr()) {
-            return err(generationResult.error);
-        }
-        console.log('✅ Schema generation completed successfully!');
-        return ok(undefined);
-    }
-    catch (error) {
-        return err(new Error(`CLI execution failed: ${error instanceof Error ? error.message : String(error)}`));
-    }
-};
-// CLI実行
-if (import.meta.url === `file://${process.argv[1]}`) {
-    main()
-        .then(result => {
-        if (result.isErr()) {
-            console.error('❌ Error:', result.error.message);
-            process.exit(1);
-        }
-        process.exit(0);
-    })
-        .catch(error => {
-        console.error('❌ Unexpected error:', error instanceof Error ? error.message : String(error));
-        process.exit(1);
-    });
-}

package/dist/config/index.d.ts

@@ -1,27 +0,0 @@
-export type Config = {
-    readonly input: `${string}.ts`;
-    readonly zod?: {
-        readonly output: `${string}.ts`;
-        readonly comment?: boolean;
-        readonly type?: boolean;
-        readonly zod?: 'v4' | 'mini' | '@hono/zod-openapi';
-        readonly relation?: boolean;
-    };
-    readonly valibot?: {
-        readonly output: `${string}.ts`;
-        readonly comment?: boolean;
-        readonly type?: boolean;
-        readonly relation?: boolean;
-    };
-    readonly mermaid?: {
-        readonly output: string;
-    };
-};
-export declare function config(): Promise<{
-    readonly ok: true;
-    readonly value: Config;
-} | {
-    readonly ok: false;
-    readonly error: string;
-}>;
-export declare function defineConfig(config: Config): Config;

package/dist/config/index.js

@@ -1,85 +0,0 @@
-import { existsSync } from 'node:fs';
-import { resolve } from 'node:path';
-import { pathToFileURL } from 'node:url';
-import { register } from 'tsx/esm/api';
-export async function config() {
-    const isTs = (o) => o.endsWith('.ts');
-    const abs = resolve(process.cwd(), 'sizuku.config.ts');
-    if (!existsSync(abs)) {
-        return { ok: false, error: `Config not found: ${abs}` };
-    }
-    try {
-        register();
-        const mod = await import(pathToFileURL(abs).href);
-        if (!('default' in mod)) {
-            return { ok: false, error: 'Config must export default object' };
-        }
-        if (mod.default !== undefined) {
-            if (!isTs(mod.default.input)) {
-                return { ok: false, error: 'Input must be a .ts file' };
-            }
-            // zod
-            if (mod.default.zod !== undefined) {
-                if (!isTs(mod.default.zod.output)) {
-                    return { ok: false, error: 'Zod output must be a .ts file' };
-                }
-                if (mod.default.zod.comment !== undefined) {
-                    if (typeof mod.default.zod.comment !== 'boolean') {
-                        return { ok: false, error: 'Zod comment must be a boolean' };
-                    }
-                }
-                if (mod.default.zod.type !== undefined) {
-                    if (typeof mod.default.zod.type !== 'boolean') {
-                        return { ok: false, error: 'Zod type must be a boolean' };
-                    }
-                }
-                if (mod.default.zod.zod !== undefined) {
-                    if (mod.default.zod.zod !== 'v4' &&
-                        mod.default.zod.zod !== 'mini' &&
-                        mod.default.zod.zod !== '@hono/zod-openapi') {
-                        return { ok: false, error: 'zod must be v4, mini, or @hono/zod-openapi' };
-                    }
-                }
-                if (mod.default.zod.relation !== undefined) {
-                    if (typeof mod.default.zod.relation !== 'boolean') {
-                        return { ok: false, error: 'Zod relation must be a boolean' };
-                    }
-                }
-            }
-        }
-        // valibot
-        if (mod.default.valibot !== undefined) {
-            if (!isTs(mod.default.valibot.output)) {
-                return { ok: false, error: 'Valibot output must be a .ts file' };
-            }
-            if (mod.default.valibot.comment !== undefined) {
-                if (typeof mod.default.valibot.comment !== 'boolean') {
-                    return { ok: false, error: 'Valibot comment must be a boolean' };
-                }
-            }
-            if (mod.default.valibot.type !== undefined) {
-                if (typeof mod.default.valibot.type !== 'boolean') {
-                    return { ok: false, error: 'Valibot type must be a boolean' };
-                }
-            }
-            if (mod.default.valibot.relation !== undefined) {
-                if (typeof mod.default.valibot.relation !== 'boolean') {
-                    return { ok: false, error: 'Valibot relation must be a boolean' };
-                }
-            }
-        }
-        // mermaid
-        if (mod.default.mermaid !== undefined) {
-            if (typeof mod.default.mermaid.output !== 'string') {
-                return { ok: false, error: 'Mermaid output must be a string' };
-            }
-        }
-        return { ok: true, value: mod.default };
-    }
-    catch (e) {
-        return { ok: false, error: e instanceof Error ? e.message : String(e) };
-    }
-}
-export function defineConfig(config) {
-    return config;
-}

package/dist/config/loader.d.ts

@@ -1,19 +0,0 @@
-import { Result } from 'neverthrow';
-export type SizukuConfig = {
-    input: string;
-    zod?: {
-        output: string;
-        comment?: boolean;
-        type?: boolean;
-    };
-    valibot?: {
-        output: string;
-        comment?: boolean;
-        type?: boolean;
-    };
-    mermaid?: {
-        output: string;
-    };
-};
-export declare const loadConfig: (configPath: string) => Promise<Result<SizukuConfig, Error>>;
-export declare const validateConfig: (config: SizukuConfig) => Result<SizukuConfig, Error>;

package/dist/config/loader.js

@@ -1,30 +0,0 @@
-import { readFile } from 'fs/promises';
-import { Result, err, ok } from 'neverthrow';
-export const loadConfig = async (configPath) => {
-    try {
-        const configContent = await readFile(configPath, 'utf-8');
-        const config = JSON.parse(configContent);
-        // 基本的なバリデーション
-        if (!config.input) {
-            return err(new Error('Config must specify input file path'));
-        }
-        return ok(config);
-    }
-    catch (error) {
-        return err(new Error(`Failed to load config from ${configPath}: ${error instanceof Error ? error.message : String(error)}`));
-    }
-};
-export const validateConfig = (config) => {
-    try {
-        if (!config.input) {
-            return err(new Error('Input file path is required'));
-        }
-        if (!config.zod && !config.valibot && !config.mermaid) {
-            return err(new Error('At least one output format must be specified (zod, valibot, or mermaid)'));
-        }
-        return ok(config);
-    }
-    catch (error) {
-        return err(new Error(`Config validation failed: ${error instanceof Error ? error.message : String(error)}`));
-    }
-};

package/dist/generator/engine.d.ts

@@ -1,3 +0,0 @@
-import { Result } from 'neverthrow';
-import type { SizukuConfig } from '../config/loader.js';
-export declare const generateSchemas: (config: SizukuConfig) => Promise<Result<void, Error>>;

package/dist/generator/engine.js

@@ -1,63 +0,0 @@
-import { Result, err, ok } from 'neverthrow';
-import { parseSchemaFile } from '../shared/helper/ast-parser.js';
-import { generateZodSchemas } from './zod/generator.js';
-import { generateValibotSchemas } from './valibot/generator.js';
-import { generateMermaidERDiagram } from './mermaid-er/generator.js';
-import { writeFileSafely } from '../shared/helper/file-writer.js';
-export const generateSchemas = async (config) => {
-    try {
-        // スキーマファイルを解析
-        const parseResult = await parseSchemaFile(config.input);
-        if (parseResult.isErr()) {
-            return err(parseResult.error);
-        }
-        const schema = parseResult.value;
-        // 各フォーマットを生成
-        const results = [];
-        if (config.zod) {
-            results.push(generateZodOutput(schema, config.zod.output));
-        }
-        if (config.valibot) {
-            results.push(generateValibotOutput(schema, config.valibot.output));
-        }
-        if (config.mermaid) {
-            results.push(generateMermaidOutput(schema, config.mermaid.output));
-        }
-        // すべての生成を待機
-        const generationResults = await Promise.all(results);
-        // エラーがあれば最初のエラーを返す
-        for (const result of generationResults) {
-            if (result.isErr()) {
-                return err(result.error);
-            }
-        }
-        return ok(undefined);
-    }
-    catch (error) {
-        return err(new Error(`Schema generation failed: ${error instanceof Error ? error.message : String(error)}`));
-    }
-};
-const generateZodOutput = async (schema, outputPath) => {
-    const zodResult = generateZodSchemas(schema);
-    if (zodResult.isErr()) {
-        return err(zodResult.error);
-    }
-    const writeResult = await writeFileSafely(outputPath, zodResult.value);
-    return writeResult;
-};
-const generateValibotOutput = async (schema, outputPath) => {
-    const valibotResult = generateValibotSchemas(schema);
-    if (valibotResult.isErr()) {
-        return err(valibotResult.error);
-    }
-    const writeResult = await writeFileSafely(outputPath, valibotResult.value);
-    return writeResult;
-};
-const generateMermaidOutput = async (schema, outputPath) => {
-    const mermaidResult = generateMermaidERDiagram(schema);
-    if (mermaidResult.isErr()) {
-        return err(mermaidResult.error);
-    }
-    const writeResult = await writeFileSafely(outputPath, mermaidResult.value);
-    return writeResult;
-};

package/dist/generator/mermaid-er/config/index.d.ts

@@ -1,10 +0,0 @@
-export type Config = {
-  input?: string
-  output?: string
-}
-/**
- * Loads the configuration from the `sizuku.json` file or returns the default configuration.
- *
- * @returns The configuration object.
- */
-export declare function getConfig(): Config

package/dist/generator/mermaid-er/config/index.js

@@ -1,12 +0,0 @@
-import fs from 'node:fs';
-/**
- * Loads the configuration from the `sizuku.json` file or returns the default configuration.
- *
- * @returns The configuration object.
- */
-export function getConfig() {
-    const config = fs.existsSync('sizuku-mermaid-er.json')
-        ? { ...JSON.parse(fs.readFileSync('sizuku-mermaid-er.json', 'utf-8')) }
-        : {};
-    return config;
-}

package/dist/generator/mermaid-er/core/extract-relations.d.ts

@@ -1,8 +0,0 @@
-import type { Relation } from '../types.js';
-/**
- * Extracts relations from the given code.
- *
- * @param code - The code to extract relations from.
- * @returns The extracted relations.
- */
-export declare function extractRelations(code: string[]): Relation[];

package/dist/generator/mermaid-er/core/extract-relations.js

@@ -1,17 +0,0 @@
-import { parseRelationLine } from '../validator/parse-relation-line.js';
-/**
- * Extracts relations from the given code.
- *
- * @param code - The code to extract relations from.
- * @returns The extracted relations.
- */
-export function extractRelations(code) {
-    const relations = [];
-    for (const line of code) {
-        const relation = parseRelationLine(line);
-        if (relation) {
-            relations.push(relation);
-        }
-    }
-    return relations;
-}

package/dist/generator/mermaid-er/core.d.ts

@@ -1,6 +0,0 @@
-import type { TableInfo, ColumnInfo, RelationInfo } from '../../shared/utils/types.js';
-export declare const generateMermaidER: (tables: TableInfo[]) => string;
-export declare const generateRelations: (tables: TableInfo[]) => string;
-export declare const generateRelationLine: (relation: RelationInfo) => string;
-export declare const generateEntity: (table: TableInfo) => string;
-export declare const generateColumnDefinition: (column: ColumnInfo) => string;

package/dist/generator/mermaid-er/core.js

@@ -1,54 +0,0 @@
-// 完全純粋なMermaid ER図生成ユーティリティ - 外部import禁止
-export const generateMermaidER = (tables) => {
-    const header = 'erDiagram';
-    const relations = generateRelations(tables);
-    const entities = tables.map(table => generateEntity(table)).join('\n    ');
-    return `${header}
-    ${relations}
-    ${entities}`;
-};
-export const generateRelations = (tables) => {
-    const relations = [];
-    for (const table of tables) {
-        for (const relation of table.relations) {
-            const relationLine = generateRelationLine(relation);
-            if (relationLine) {
-                relations.push(relationLine);
-            }
-        }
-    }
-    return relations.join('\n    ');
-};
-export const generateRelationLine = (relation) => {
-    const sourceTable = relation.sourceTable;
-    const targetTable = relation.targetTable;
-    const sourceColumn = relation.sourceColumn;
-    const targetColumn = relation.targetColumn;
-    if (relation.type === 'one-to-many') {
-        return `${sourceTable} ||--}| ${targetTable} : "(${sourceColumn}) - (${targetColumn})"`;
-    }
-    else if (relation.type === 'many-to-one') {
-        return `${targetTable} ||--}| ${sourceTable} : "(${targetColumn}) - (${sourceColumn})"`;
-    }
-    else if (relation.type === 'one-to-one') {
-        return `${sourceTable} ||--|| ${targetTable} : "(${sourceColumn}) - (${targetColumn})"`;
-    }
-    else if (relation.type === 'many-to-many') {
-        return `${sourceTable} }|--|{ ${targetTable} : "(${sourceColumn}) - (${targetColumn})"`;
-    }
-    return '';
-};
-export const generateEntity = (table) => {
-    const columns = table.columns.map(column => generateColumnDefinition(column)).join('\n        ');
-    return `${table.name} {
-        ${columns}
-    }`;
-};
-export const generateColumnDefinition = (column) => {
-    const type = column.type;
-    const name = column.name;
-    const comment = column.comment || '';
-    const primaryKey = column.isPrimary ? ' (PK)' : '';
-    const nullable = column.isNullable ? '' : ' NOT NULL';
-    return `${type} ${name}${primaryKey}${nullable} "${comment}"`;
-};

package/dist/generator/mermaid-er/generator/er-content.d.ts

@@ -1,20 +0,0 @@
-/**
- * Generate ER content
- * @param relations - The relations to generate the ER content from
- * @param tables - The tables to generate the ER content from
- * @returns The generated ER content
- */
-export declare function erContent(relations: {
-    fromModel: string;
-    toModel: string;
-    fromField: string;
-    toField: string;
-    type: string;
-}[], tables: {
-    name: string;
-    fields: {
-        type: string;
-        name: string;
-        description: string | null;
-    }[];
-}[]): string;

package/dist/generator/mermaid-er/generator/er-content.js

@@ -1,23 +0,0 @@
-import { relationLine } from './index.js';
-const ER_HEADER = ['```mermaid', 'erDiagram'];
-const ER_FOOTER = ['```'];
-/**
- * Generate ER content
- * @param relations - The relations to generate the ER content from
- * @param tables - The tables to generate the ER content from
- * @returns The generated ER content
- */
-export function erContent(relations, tables) {
-    const erContent = [
-        ...ER_HEADER,
-        ...relations.map(relationLine),
-        // Generate per-table definitions
-        ...tables.flatMap((table) => [
-            `    ${table.name} {`,
-            ...table.fields.map((field) => `        ${field.type} ${field.name}${field.description ? ` "${field.description}"` : ''}`),
-            '    }',
-        ]),
-        ...ER_FOOTER,
-    ];
-    return erContent.join('\n');
-}

package/dist/generator/mermaid-er/generator/index.d.ts

@@ -1,2 +0,0 @@
-export { erContent } from './er-content.js';
-export { relationLine } from './relation-line.js';

package/dist/generator/mermaid-er/generator/index.js

@@ -1,2 +0,0 @@
-export { erContent } from './er-content.js';
-export { relationLine } from './relation-line.js';

package/dist/generator/mermaid-er/generator/relation-line.d.ts

@@ -1,12 +0,0 @@
-/**
- * Generate a relation line for a relation
- * @param relation - The relation to generate a line for
- * @returns The generated relation line
- */
-export declare function relationLine(relation: {
-    fromModel: string;
-    toModel: string;
-    fromField: string;
-    toField: string;
-    type: string;
-}): string;

package/dist/generator/mermaid-er/generator/relation-line.js

@@ -1,13 +0,0 @@
-import { buildRelationLine } from '../../../shared/helper/extract-schemas.js';
-/**
- * Generate a relation line for a relation
- * @param relation - The relation to generate a line for
- * @returns The generated relation line
- */
-export function relationLine(relation) {
-    const cardinality = buildRelationLine(relation.type);
-    if (!cardinality) {
-        throw new Error(`Unknown relation type: ${relation.type}`);
-    }
-    return `    ${relation.fromModel} ${cardinality} ${relation.toModel} : "(${relation.fromField}) - (${relation.toField})"`;
-}

package/dist/generator/mermaid-er/generator.d.ts

@@ -1,3 +0,0 @@
-import { Result } from 'neverthrow';
-import type { ParsedSchema } from '../../shared/utils/types.js';
-export declare const generateMermaidERDiagram: (schema: ParsedSchema) => Result<string, Error>;