hekireki 0.8.4 → 0.8.6

package/README.md

@@ -530,6 +530,26 @@ export const postRelations = relations(post, ({ one }) => ({
 }))
 ```
 
+#### ID default functions
+
+For Drizzle, Prisma `@default(...)` ID generators are emitted as client-side `$defaultFn` calls. Some require an extra package — install it in your project:
+
+| Prisma default                           | Generated call        | Package to install                             |
+| ---------------------------------------- | --------------------- | ---------------------------------------------- |
+| `@default(uuid())` / `@default(uuid(4))` | `crypto.randomUUID()` | — (Node/Web built-in)                          |
+| `@default(cuid())` / `@default(cuid(1))` | `cuid()`              | `npm i cuid`                                   |
+| `@default(cuid(2))`                      | `createId()`          | `npm i @paralleldrive/cuid2`                   |
+| `@default(nanoid())`                     | `nanoid()`            | `npm i nanoid` (>= 5.0.9, or >= 3.3.8 for CJS) |
+| `@default(ulid())`                       | `ulid()`              | `npm i ulidx`                                  |
+
+Notes:
+
+- **`cuid()` uses cuid v1**, which its author has deprecated in favor of cuid v2 ([npm `cuid`](https://www.npmjs.com/package/cuid)). It is emitted only when you explicitly write `@default(cuid())`; for new schemas prefer `@default(cuid(2))`.
+- **`ulid()` maps to [`ulidx`](https://www.npmjs.com/package/ulidx)** (an actively maintained, crypto-backed drop-in for `ulid`).
+- `@default(uuid(7))` is currently emitted as `crypto.randomUUID()` (UUID v4); native v7 support is planned.
+- `@default(nanoid(n))` length argument is not yet applied — the default length is used.
+- Inserts that bypass the ORM (raw SQL, bulk load) won't run `$defaultFn`; add a database-level `DEFAULT` for those paths.
+
 ### Mermaid
 
 ```mermaid

package/dist/bin/ajv.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/ajv.ts
 registerGenerator("ajv");
 //#endregion

package/dist/bin/arktype.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/arktype.ts
 registerGenerator("arktype");
 //#endregion

package/dist/bin/dbml.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/dbml.ts
 registerGenerator("dbml");
 //#endregion

package/dist/bin/docs.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/docs.ts
 registerGenerator("docs");
 //#endregion

package/dist/bin/drizzle.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/drizzle.ts
 registerGenerator("drizzle");
 //#endregion

package/dist/bin/ecto.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/ecto.ts
 registerGenerator("ecto");
 //#endregion

package/dist/bin/effect.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/effect.ts
 registerGenerator("effect");
 //#endregion

package/dist/bin/gorm.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/gorm.ts
 registerGenerator("gorm");
 //#endregion

package/dist/bin/mermaid-er.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/mermaid-er.ts
 registerGenerator("mermaid-er");
 //#endregion

package/dist/bin/sea-orm.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/sea-orm.ts
 registerGenerator("sea-orm");
 //#endregion

package/dist/bin/sqlalchemy.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/sqlalchemy.ts
 registerGenerator("sqlalchemy");
 //#endregion

package/dist/bin/typebox.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/typebox.ts
 registerGenerator("typebox");
 //#endregion

package/dist/bin/valibot.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/valibot.ts
 registerGenerator("valibot");
 //#endregion

package/dist/bin/zod.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-5xZho8bJ.js";
+import { t as registerGenerator } from "../bin-DLQOqGdU.js";
 //#region src/bin/zod.ts
 registerGenerator("zod");
 //#endregion

package/dist/{bin-5xZho8bJ.js → bin-DLQOqGdU.js}

@@ -163,7 +163,7 @@ function parseDocumentWithoutAnnotations(documentation) {
 		"@t.",
 		"@j."
 	];
-	const annotationExact = new Set([
+	const annotationExact = /* @__PURE__ */ new Set([
 		"@z",
 		"@v",
 		"@a",
@@ -183,7 +183,7 @@ function stripAnnotations(doc) {
 		"@t.",
 		"@j."
 	];
-	const annotationExact = new Set([
+	const annotationExact = /* @__PURE__ */ new Set([
 		"@z",
 		"@v",
 		"@a",
@@ -1067,7 +1067,7 @@ const ModelAction = {
 function isFieldDefault$1(v) {
 	return typeof v === "object" && v !== null && "name" in v && "args" in v;
 }
-const fieldDirectiveMap = new Map([
+const fieldDirectiveMap = /* @__PURE__ */ new Map([
 	["isUnique", "@unique"],
 	["isId", "@id"],
 	["hasDefaultValue", "@default"],
@@ -1761,21 +1761,43 @@ function createImports() {
 		ext: /* @__PURE__ */ new Map()
 	};
 }
-function addExternal(imports, pkg, fn) {
-	const fns = imports.ext.get(pkg) ?? /* @__PURE__ */ new Set();
-	fns.add(fn);
-	imports.ext.set(pkg, fns);
+function applyImport(imports, req) {
+	if (req.pkg === "drizzle-orm") {
+		imports.orm.add(req.name);
+		return;
+	}
+	const entry = imports.ext.get(req.pkg) ?? { named: /* @__PURE__ */ new Set() };
+	const next = req.kind === "default" ? {
+		named: entry.named,
+		default: req.name
+	} : {
+		named: entry.named.add(req.name),
+		default: entry.default
+	};
+	imports.ext.set(req.pkg, next);
 }
 function generateImports(imports, provider) {
 	const mod = provider === "postgresql" ? "drizzle-orm/pg-core" : provider === "mysql" ? "drizzle-orm/mysql-core" : "drizzle-orm/sqlite-core";
 	return [
 		imports.core.size > 0 ? `import { ${[...imports.core].sort().join(", ")} } from '${mod}'` : "",
 		imports.orm.size > 0 ? `import { ${[...imports.orm].sort().join(", ")} } from 'drizzle-orm'` : "",
-		...[...imports.ext.entries()].map(([pkg, fns]) => `import { ${[...fns].sort().join(", ")} } from '${pkg}'`)
+		...[...imports.ext.entries()].map(([pkg, entry]) => {
+			return `import ${[entry.default, entry.named.size > 0 ? `{ ${[...entry.named].sort().join(", ")} }` : void 0].filter((c) => c !== void 0).join(", ")} from '${pkg}'`;
+		})
 	].filter(Boolean).join("\n");
 }
-function toCamelCase(name) {
-	return name.charAt(0).toLowerCase() + name.slice(1);
+function snakeToCamel(name) {
+	return name.replace(/_+([a-zA-Z0-9])/g, (_, c) => c.toUpperCase());
+}
+function resolveTableName(model) {
+	return model.dbName ?? makeSnakeCase(model.name);
+}
+function resolveVarName(model) {
+	return snakeToCamel(resolveTableName(model));
+}
+function resolveVarNameByType(type, models) {
+	const target = models.find((m) => m.name === type);
+	return snakeToCamel(target ? resolveTableName(target) : makeSnakeCase(type));
 }
 function isFieldDefault(v) {
 	return typeof v === "object" && v !== null && "name" in v;
@@ -1818,80 +1840,98 @@ function makeColumnExpr(field, provider, imports, enums) {
 	const rest = baseExpr.slice(parenIdx + 1);
 	return rest === ")" ? `${baseFnName}('${colName}')` : `${baseFnName}('${colName}', ${rest}`;
 }
+const SQL_IMPORT = {
+	pkg: "drizzle-orm",
+	kind: "named",
+	name: "sql"
+};
 function resolveDefaultValue(dflt, fieldType, provider) {
 	if (dflt === void 0 || dflt === null) return {
 		chain: "",
-		needsSql: false,
-		needsCuid: false
+		imports: []
 	};
 	if (isFieldDefault(dflt)) switch (dflt.name) {
 		case "autoincrement": return {
 			chain: "",
-			needsSql: false,
-			needsCuid: false
+			imports: []
 		};
 		case "now":
 			if (provider === "sqlite") return {
 				chain: ".default(sql`(unixepoch() * 1000)`)",
-				needsSql: true,
-				needsCuid: false
+				imports: [SQL_IMPORT]
 			};
 			if (provider === "mysql") return {
 				chain: ".default(sql`CURRENT_TIMESTAMP(3)`)",
-				needsSql: true,
-				needsCuid: false
+				imports: [SQL_IMPORT]
 			};
 			return {
 				chain: ".defaultNow()",
-				needsSql: false,
-				needsCuid: false
+				imports: []
 			};
 		case "uuid": return {
 			chain: ".$defaultFn(() => crypto.randomUUID())",
-			needsSql: false,
-			needsCuid: false
+			imports: []
 		};
-		case "cuid": return {
+		case "cuid": return dflt.args[0] === 2 ? {
 			chain: ".$defaultFn(() => createId())",
-			needsSql: false,
-			needsCuid: true
+			imports: [{
+				pkg: "@paralleldrive/cuid2",
+				kind: "named",
+				name: "createId"
+			}]
+		} : {
+			chain: ".$defaultFn(() => cuid())",
+			imports: [{
+				pkg: "cuid",
+				kind: "default",
+				name: "cuid"
+			}]
+		};
+		case "nanoid": return {
+			chain: ".$defaultFn(() => nanoid())",
+			imports: [{
+				pkg: "nanoid",
+				kind: "named",
+				name: "nanoid"
+			}]
+		};
+		case "ulid": return {
+			chain: ".$defaultFn(() => ulid())",
+			imports: [{
+				pkg: "ulidx",
+				kind: "named",
+				name: "ulid"
+			}]
 		};
 		case "dbgenerated":
 			if (typeof dflt.args[0] === "string") return {
 				chain: `.default(sql\`${dflt.args[0]}\`)`,
-				needsSql: true,
-				needsCuid: false
+				imports: [SQL_IMPORT]
 			};
 			return {
 				chain: "",
-				needsSql: false,
-				needsCuid: false
+				imports: []
 			};
 		default: return {
 			chain: "",
-			needsSql: false,
-			needsCuid: false
+			imports: []
 		};
 	}
 	if (typeof dflt === "string") return {
 		chain: `.default('${dflt}')`,
-		needsSql: false,
-		needsCuid: false
+		imports: []
 	};
 	if (typeof dflt === "number") return {
 		chain: fieldType === "Decimal" ? `.default('${dflt}')` : `.default(${dflt})`,
-		needsSql: false,
-		needsCuid: false
+		imports: []
 	};
 	if (typeof dflt === "boolean") return {
 		chain: `.default(${dflt})`,
-		needsSql: false,
-		needsCuid: false
+		imports: []
 	};
 	return {
 		chain: "",
-		needsSql: false,
-		needsCuid: false
+		imports: []
 	};
 }
 function resolveUpdatedAtDefault(provider) {
@@ -1910,8 +1950,7 @@ function resolveUpdatedAtDefault(provider) {
 }
 function makeDefaultChain(dflt, fieldType, provider, imports) {
 	const result = resolveDefaultValue(dflt, fieldType, provider);
-	if (result.needsSql) imports.orm.add("sql");
-	if (result.needsCuid) addExternal(imports, "@paralleldrive/cuid2", "createId");
+	for (const req of result.imports) applyImport(imports, req);
 	return result.chain;
 }
 const PRISMA_ACTION_MAP = {
@@ -1921,17 +1960,17 @@ const PRISMA_ACTION_MAP = {
 	NoAction: "no action",
 	SetDefault: "set default"
 };
-function makeFkReference(field, model) {
+function makeFkReference(field, model, models) {
 	const relField = model.fields.find((f) => f.kind === "object" && f.relationFromFields && f.relationFromFields.includes(field.name));
 	if (!(relField?.relationFromFields && relField.relationToFields)) return "";
 	if (relField.type === model.name) return "";
-	const targetVar = toCamelCase(relField.type);
+	const targetVar = resolveVarNameByType(relField.type, models);
 	const toCol = relField.relationToFields[0] ?? "id";
 	const onDelete = relField.relationOnDelete;
 	const drizzleAction = onDelete ? PRISMA_ACTION_MAP[onDelete] : void 0;
 	return `.references(() => ${targetVar}.${toCol}${drizzleAction ? `, { onDelete: '${drizzleAction}' }` : ""})`;
 }
-function makeColumn(field, model, provider, imports, enums) {
+function makeColumn(field, model, models, provider, imports, enums) {
 	if (field.kind === "object") return null;
 	if (field.kind === "unsupported") return `// unsupported type: ${field.name}`;
 	const isAutoincrement = isFieldDefault(field.default) && field.default.name === "autoincrement";
@@ -1941,7 +1980,7 @@ function makeColumn(field, model, provider, imports, enums) {
 		field.isId && !hasCompositePK ? isAutoincrement && provider === "sqlite" ? ".primaryKey({ autoIncrement: true })" : ".primaryKey()" : "",
 		field.isRequired && !field.isId && !(isAutoincrement && provider === "postgresql") ? ".notNull()" : "",
 		field.isUnique ? ".unique()" : "",
-		makeFkReference(field, model),
+		makeFkReference(field, model, models),
 		isAutoincrement ? provider === "mysql" ? ".autoincrement()" : "" : field.isUpdatedAt && (field.default === void 0 || field.default === null) ? (() => {
 			const r = resolveUpdatedAtDefault(provider);
 			if (r.needsSql) imports.orm.add("sql");
@@ -1972,18 +2011,18 @@ function makeCompositeConstraints(model, imports, indexes, tableName) {
 	].filter((l) => l !== null);
 	return all.length > 0 ? all.join(", ") : null;
 }
-function makeTable(model, provider, imports, enums, indexes) {
+function makeTable(model, models, provider, imports, enums, indexes) {
 	const tableFunc = provider === "postgresql" ? "pgTable" : provider === "mysql" ? "mysqlTable" : "sqliteTable";
 	imports.core.add(tableFunc);
-	const varName = toCamelCase(model.name);
-	const tableName = model.dbName ?? makeSnakeCase(model.name);
-	const columns = model.fields.map((field) => makeColumn(field, model, provider, imports, enums)).filter((c) => c !== null).join(", ");
+	const varName = resolveVarName(model);
+	const tableName = resolveTableName(model);
+	const columns = model.fields.map((field) => makeColumn(field, model, models, provider, imports, enums)).filter((c) => c !== null).join(", ");
 	const constraints = makeCompositeConstraints(model, imports, indexes, tableName);
 	return constraints ? `export const ${varName} = ${tableFunc}('${tableName}', { ${columns} }, (table) => [${constraints}])` : `export const ${varName} = ${tableFunc}('${tableName}', { ${columns} })`;
 }
-function makeRelationField(field, model, _models, relFields) {
-	const targetVar = toCamelCase(field.type);
-	const modelVar = toCamelCase(model.name);
+function makeRelationField(field, model, models, relFields) {
+	const targetVar = resolveVarNameByType(field.type, models);
+	const modelVar = resolveVarName(model);
 	const needsAlias = relFields.filter((f) => f.type === field.type).length > 1 && field.relationName;
 	if (field.relationFromFields && field.relationFromFields.length > 0) {
 		const fromCol = field.relationFromFields[0];
@@ -2005,7 +2044,7 @@ function makeRelations(models, imports) {
 	return modelsWithRels.map((model) => {
 		const relFields = model.fields.filter((f) => f.kind === "object");
 		const fieldLines = relFields.map((field) => makeRelationField(field, model, models, relFields)).join(", ");
-		const modelVar = toCamelCase(model.name);
+		const modelVar = resolveVarName(model);
 		const needsOne = relFields.some((f) => f.relationFromFields && f.relationFromFields.length > 0 || !f.isList);
 		const needsMany = relFields.some((f) => f.isList && !(f.relationFromFields && f.relationFromFields.length > 0));
 		return `export const ${modelVar}Relations = relations(${modelVar}, ({ ${[needsOne ? "one" : "", needsMany ? "many" : ""].filter(Boolean).join(", ")} }) => ({ ${fieldLines} }))`;
@@ -2016,7 +2055,7 @@ function makeRelations(models, imports) {
 function drizzleSchema(datamodel, provider, indexes) {
 	const db = resolveDbProvider(provider);
 	const imports = createImports();
-	const tableLines = datamodel.models.map((model) => makeTable(model, db, imports, datamodel.enums, indexes));
+	const tableLines = datamodel.models.map((model) => makeTable(model, datamodel.models, db, imports, datamodel.enums, indexes));
 	const relationsLines = makeRelations(datamodel.models, imports);
 	const tableLinesWithGap = tableLines.flatMap((line, i) => i < tableLines.length - 1 ? [line, ""] : [line]);
 	const relationsLinesWithGap = relationsLines.flatMap((line, i) => i < relationsLines.length - 1 ? [line, ""] : [line]);
@@ -2564,7 +2603,7 @@ function collectCompositeIndexTags(model, indexes) {
 		return map;
 	}, /* @__PURE__ */ new Map());
 }
-const GO_INITIALISMS = new Set([
+const GO_INITIALISMS = /* @__PURE__ */ new Set([
 	"acl",
 	"api",
 	"ascii",
@@ -2735,8 +2774,8 @@ const RELATIONSHIPS = {
 	"zero-many": "}o",
 	many: "}|"
 };
-function erRelationLine(relation) {
-	return `    ${relation.from.model} ${RELATIONSHIPS[relation.from.cardinality]}--${RELATIONSHIPS[relation.to.cardinality]} ${relation.to.model} : "(${relation.from.field}) - (${relation.to.field})"`;
+function erRelationLine(relation, resolveName = (model) => model) {
+	return `    ${resolveName(relation.from.model)} ${RELATIONSHIPS[relation.from.cardinality]}--${RELATIONSHIPS[relation.to.cardinality]} ${resolveName(relation.to.model)} : "(${relation.from.field}) - (${relation.to.field})"`;
 }
 function modelFields(model) {
 	const fkFields = new Set(model.fields.filter((f) => f.relationFromFields && f.relationFromFields.length > 0).flatMap((f) => f.relationFromFields ?? []));
@@ -2750,7 +2789,7 @@ function modelFields(model) {
 }
 function modelInfo(model) {
 	return [
-		`    ${model.name} {`,
+		`    ${model.dbName ?? model.name} {`,
 		...modelFields(model),
 		"    }"
 	];
@@ -2760,7 +2799,8 @@ function modelInfo(model) {
 const ER_HEADER = ["```mermaid", "erDiagram"];
 const ER_FOOTER = ["```"];
 function erContent(models) {
-	const relations = mergeERRelations(models).map(erRelationLine);
+	const resolveName = (model) => models.find((m) => m.name === model)?.dbName ?? model;
+	const relations = mergeERRelations(models).map((relation) => erRelationLine(relation, resolveName));
 	const modelInfos = models.flatMap(modelInfo);
 	return [
 		...ER_HEADER,
@@ -2932,7 +2972,7 @@ function toPascalCase(name) {
 function toModuleName(modelName) {
 	return toSnakeCase(modelName);
 }
-const NON_EQ_PRISMA_TYPES = new Set(["Float"]);
+const NON_EQ_PRISMA_TYPES = /* @__PURE__ */ new Set(["Float"]);
 function canDeriveEq(fields) {
 	return fields.filter((f) => f.kind !== "object").every((f) => !NON_EQ_PRISMA_TYPES.has(f.type));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hekireki",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "Hekireki is a tool that generates validation schemas for Zod, Valibot, ArkType, and Effect Schema, as well as ER diagrams and DBML, from Prisma schemas annotated with comments.",
   "keywords": [
     "ajv",
@@ -55,28 +55,28 @@
     "access": "public"
   },
   "dependencies": {
-    "@hono/node-server": "^2.0.4",
+    "@hono/node-server": "^2.0.6",
     "@prisma/generator-helper": "^7.8.0",
     "@resvg/resvg-js": "^2.6.2",
     "@softwaretechnik/dbml-renderer": "^1.0.31",
-    "hono": "^4.12.25",
-    "oxfmt": "^0.54.0"
+    "hono": "^4.12.27",
+    "oxfmt": "^0.56.0"
   },
   "devDependencies": {
     "@paralleldrive/cuid2": "^3.3.0",
     "@prisma/client": "^7.8.0",
     "@sinclair/typebox": "^0.34.49",
-    "@types/node": "^25.9.3",
-    "@typescript/native-preview": "7.0.0-dev.20260611.2",
+    "@types/node": "^26.0.1",
+    "@typescript/native-preview": "7.0.0-dev.20260624.1",
     "ajv": "^8.20.0",
-    "arktype": "^2.2.0",
-    "better-auth": "^1.6.17",
+    "arktype": "^2.2.1",
+    "better-auth": "^1.6.20",
     "drizzle-kit": "^0.31.10",
     "drizzle-orm": "^0.45.2",
-    "effect": "^3.21.3",
+    "effect": "^3.21.4",
     "json-schema-to-ts": "^3.1.1",
     "prisma": "^7.8.0",
-    "tsdown": "^0.22.2",
+    "tsdown": "^0.22.3",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3",
     "valibot": "1.4.1",