sizuku 0.6.2 → 0.6.5

package/dist/index.mjs

@@ -432,6 +432,66 @@ function extractRelationsFromSchema(code) {
 	});
 }
 //#endregion
+//#region src/helper/parse-relation.ts
+const RELATIONSHIPS = {
+	"zero-one": "|o",
+	one: "||",
+	"zero-many": "}o",
+	many: "}|"
+};
+function isRelationshipType(type) {
+	return type === "zero-one" || type === "one" || type === "zero-many" || type === "many";
+}
+const CARDINALITY = "(?:zero-one|one|zero-many|many)";
+const RELATION_TYPE = `${CARDINALITY}-to-${CARDINALITY}(?:-optional)?`;
+const RELATION_RE = new RegExp(String.raw`^@relation\s+(\w+)\.(\w+)\s+(\w+)\.(\w+)\s+(${RELATION_TYPE})$`);
+function parseRelation(line) {
+	const match = line.trim().replace(/^\/\/\/\s*/, "").match(RELATION_RE);
+	if (!match) return null;
+	const [, fromModel, fromField, toModel, toField, type] = match;
+	return {
+		fromModel,
+		fromField,
+		toModel,
+		toField,
+		type
+	};
+}
+function makeRelationLine(input) {
+	const parts = input.split("-to-");
+	if (parts.length !== 2) return {
+		ok: false,
+		error: `Invalid input format: ${input}`
+	};
+	const [to, optionalFlag] = parts[1].includes("-optional") ? [parts[1].replace("-optional", ""), "optional"] : [parts[1], ""];
+	const from = parts[0];
+	if (!isRelationshipType(from)) return {
+		ok: false,
+		error: `Invalid relationship: ${from}`
+	};
+	if (!isRelationshipType(to)) return {
+		ok: false,
+		error: `Invalid relationship: ${to}`
+	};
+	return {
+		ok: true,
+		value: `${RELATIONSHIPS[from]}${optionalFlag === "optional" ? ".." : "--"}${RELATIONSHIPS[to]}`
+	};
+}
+function extractRelationsFromAnnotations(code) {
+	return code.map(parseRelation).filter((r) => r !== null).flatMap((r) => {
+		const result = makeRelationLine(r.type);
+		if (!result.ok) return [];
+		return [{
+			fromModel: r.fromModel,
+			fromField: r.fromField,
+			toModel: r.toModel,
+			toField: r.toField,
+			symbol: result.value
+		}];
+	});
+}
+//#endregion
 //#region src/generator/arktype.ts
 function undeclared(objectType) {
 	if (objectType === "strict") return "\"+\":\"reject\",";
@@ -642,8 +702,19 @@ async function emit(code, dir, output) {
 //#region src/generator/mermaid-er.ts
 function mermaidER(code) {
 	const tables = parseTableInfo(code);
-	const relations = extractRelationsFromSchema(code);
-	const relationLines = [...new Set(relations.map((r) => `    ${r.fromModel} ||--${r.isRequired ? "}|" : "}o"} ${r.toModel} : "(${r.fromField}) - (${r.toField})"`))];
+	const inferred = extractRelationsFromSchema(code);
+	const annotated = extractRelationsFromAnnotations(code);
+	const key = (r) => `${r.fromModel}.${r.fromField}->${r.toModel}.${r.toField}`;
+	const merged = /* @__PURE__ */ new Map();
+	for (const r of inferred) merged.set(key(r), {
+		fromModel: r.fromModel,
+		fromField: r.fromField,
+		toModel: r.toModel,
+		toField: r.toField,
+		symbol: r.isRequired ? "||--}|" : "||--}o"
+	});
+	for (const r of annotated) merged.set(key(r), r);
+	const relationLines = [...merged.values()].map((r) => `    ${r.fromModel} ${r.symbol} ${r.toModel} : "(${r.fromField}) - (${r.toField})"`);
 	const tableDefinitions = tables.flatMap((table) => [
 		`    ${table.name} {`,
 		...table.fields.map((field) => {
@@ -799,42 +870,42 @@ Options:
   --no-with-comment                 Do not add JSDoc comments
   --no-with-relation                Do not generate relation schemas
   -h, --help                        Display this help message`;
-function parseFlags(argv) {
+function parseFlags(args) {
 	const ZOD_VERSIONS = [
 		"v4",
 		"mini",
 		"@hono/zod-openapi"
 	];
-	const zodVersionIndex = argv.findIndex((a) => a === "--zod-version" || a.startsWith("--zod-version="));
-	const zodVersionValue = zodVersionIndex === -1 ? void 0 : argv[zodVersionIndex].includes("=") ? argv[zodVersionIndex].split("=")[1] : argv[zodVersionIndex + 1];
+	const zodVersionIndex = args.findIndex((a) => a === "--zod-version" || a.startsWith("--zod-version="));
+	const zodVersionValue = zodVersionIndex === -1 ? void 0 : args[zodVersionIndex].includes("=") ? args[zodVersionIndex].split("=")[1] : args[zodVersionIndex + 1];
 	return {
-		zod: argv.includes("--zod"),
-		valibot: argv.includes("--valibot"),
-		arktype: argv.includes("--arktype"),
-		effect: argv.includes("--effect"),
+		zod: args.includes("--zod"),
+		valibot: args.includes("--valibot"),
+		arktype: args.includes("--arktype"),
+		effect: args.includes("--effect"),
 		zodVersion: ZOD_VERSIONS.find((v) => v === zodVersionValue),
-		exportTypes: !argv.includes("--no-export-types"),
-		withComment: !argv.includes("--no-with-comment"),
-		withRelation: !argv.includes("--no-with-relation")
+		exportTypes: !args.includes("--no-export-types"),
+		withComment: !args.includes("--no-with-comment"),
+		withRelation: !args.includes("--no-with-relation")
 	};
 }
 async function sizuku() {
-	const argv = process.argv.slice(2);
-	if (argv.length === 0 || argv.includes("--help") || argv.includes("-h")) return {
+	const args = process.argv.slice(2);
+	if (args.length === 0 || args.includes("--help") || args.includes("-h")) return {
 		ok: true,
 		value: HELP_TEXT
 	};
-	const input = argv[0];
+	const input = args[0];
 	if (!input || input.startsWith("-")) return {
 		ok: false,
 		error: HELP_TEXT
 	};
-	const oIndex = argv.indexOf("-o");
+	const oIndex = args.indexOf("-o");
 	if (oIndex === -1) return {
 		ok: false,
 		error: "Missing -o flag. Usage: sizuku <input> -o <output>"
 	};
-	const output = argv[oIndex + 1];
+	const output = args[oIndex + 1];
 	if (!output) return {
 		ok: false,
 		error: "Missing output file path after -o"
@@ -844,7 +915,7 @@ async function sizuku() {
 		ok: false,
 		error: `Unsupported output format: ${output}. Supported: .dbml, .png, .md, .ts`
 	};
-	const flags = outputType === "typescript" ? parseFlags(argv) : null;
+	const flags = outputType === "typescript" ? parseFlags(args) : null;
 	const lib = flags === null ? null : flags.zod ? {
 		name: "zod",
 		label: "Zod"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sizuku",
-  "version": "0.6.2",
+  "version": "0.6.5",
   "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.",
   "keywords": [
     "dbml",
@@ -27,7 +27,6 @@
   "type": "module",
   "main": "dist/index.mjs",
   "types": "dist/index.d.mts",
-  "exports": {},
   "publishConfig": {
     "access": "public"
   },