hekireki 0.44.0 → 0.46.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/activerecord.ts
4
4
  registerGenerator("activerecord");
5
5
  export {};
package/dist/bin/ajv.js CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/ajv.ts
4
4
  registerGenerator("ajv");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/arktype.ts
4
4
  registerGenerator("arktype");
5
5
  export {};
package/dist/bin/atlas.js CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/atlas.ts
4
4
  registerGenerator("atlas");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/django.ts
4
4
  registerGenerator("django");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/drizzle.ts
4
4
  registerGenerator("drizzle");
5
5
  export {};
package/dist/bin/ecto.js CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/ecto.ts
4
4
  registerGenerator("ecto");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/efcore.ts
4
4
  registerGenerator("efcore");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/effect.ts
4
4
  registerGenerator("effect");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/eloquent.ts
4
4
  registerGenerator("eloquent");
5
5
  export {};
package/dist/bin/er.js CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/er.ts
4
4
  registerGenerator("er");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/exposed.ts
4
4
  registerGenerator("exposed");
5
5
  export {};
package/dist/bin/gorm.js CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/gorm.ts
4
4
  registerGenerator("gorm");
5
5
  export {};
@@ -6,7 +6,7 @@ import { Console, Data, Effect, Schema } from "effect";
6
6
  import path from "node:path";
7
7
  import { CliError, Command, Flag } from "effect/cli";
8
8
  // package.json
9
- var version = "0.44.0";
9
+ var version = "0.46.0";
10
10
  // src/schema/path.ts
11
11
  /** Where Prisma looks for a schema when neither the command nor prisma.config.ts names one. */
12
12
  const DEFAULT_SCHEMA_PATHS = ["prisma/schema.prisma", "schema.prisma"];
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/kysely.ts
4
4
  registerGenerator("kysely");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/openapi.ts
4
4
  registerGenerator("openapi");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/pydantic.ts
4
4
  registerGenerator("pydantic");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/sea-orm.ts
4
4
  registerGenerator("sea-orm");
5
5
  export {};
package/dist/bin/seed.js CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/seed.ts
4
4
  registerGenerator("seed");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/sqlalchemy.ts
4
4
  registerGenerator("sqlalchemy");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/typebox.ts
4
4
  registerGenerator("typebox");
5
5
  export {};
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/valibot.ts
4
4
  registerGenerator("valibot");
5
5
  export {};
package/dist/bin/zod.js CHANGED
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
- import { t as registerGenerator } from "../bin-CVmSO6Yb.js";
2
+ import { t as registerGenerator } from "../bin-Cqjn5U_r.js";
3
3
  // src/bin/zod.ts
4
4
  registerGenerator("zod");
5
5
  export {};
@@ -1740,27 +1740,49 @@ function activeRecordModels(models, allModels, enums, provider) {
1740
1740
  return attribute(f.type === "Json" ? `-> { ${literal} }` : literal);
1741
1741
  });
1742
1742
  const enumLines = model.fields.filter((f) => f.kind === "enum" && !f.isList).reduce((acc, f) => {
1743
+ const column = f.dbName ?? f.name;
1743
1744
  const values = (enumMap.get(f.type) ?? []).map((v) => ({
1744
1745
  key: makeSnakeCase(v.name),
1745
1746
  name: v.name,
1746
1747
  stored: v.dbName ?? v.name
1747
1748
  }));
1748
- const pairs = values.map((v) => `${symbolKey(v.key)}: "${v.stored}"`).join(", ");
1749
- const conflicts = values.some((v) => acc.seenKeys.has(v.key) || RAILS_RESERVED_NAMES.has(v.key));
1750
1749
  const defaultValue = values.find((v) => v.name === f.default);
1750
+ if (RAILS_RESERVED_NAMES.has(pluralize$1(column))) return {
1751
+ lines: [
1752
+ ...acc.lines,
1753
+ ...typeof f.default === "string" && defaultValue !== void 0 ? [rubyCall("attribute", [`:${column}`], [`default: "${defaultValue.stored}"`])] : [],
1754
+ rubyCall("validates", [`:${column}`], [`inclusion: { in: ${rubyArray(values.map((v) => `"${v.stored}"`))}${f.isRequired ? "" : ", allow_nil: true"} }`])
1755
+ ],
1756
+ taken: acc.taken
1757
+ };
1758
+ const pairs = values.map((v) => `${symbolKey(v.key)}: "${v.stored}"`).join(", ");
1759
+ const affix = [
1760
+ {
1761
+ option: [],
1762
+ name: (key) => key
1763
+ },
1764
+ {
1765
+ option: ["prefix: true"],
1766
+ name: (key) => `${column}_${key}`
1767
+ },
1768
+ {
1769
+ option: ["suffix: true"],
1770
+ name: (key) => `${key}_${column}`
1771
+ }
1772
+ ].find(({ name }) => values.every((v) => !acc.taken.has(name(v.key)) && !RAILS_RESERVED_NAMES.has(name(v.key))));
1751
1773
  const opts = [
1752
1774
  ...typeof f.default === "string" && defaultValue !== void 0 ? [`default: :${symbolKey(defaultValue.key)}`] : [],
1753
- ...conflicts ? ["prefix: true"] : [],
1775
+ ...affix === void 0 ? ["scopes: false", "instance_methods: false"] : affix.option,
1754
1776
  f.isRequired ? "validate: true" : "validate: { allow_nil: true }"
1755
1777
  ];
1756
- for (const v of values) acc.seenKeys.add(v.key);
1778
+ if (affix !== void 0) for (const v of values) acc.taken.add(affix.name(v.key));
1757
1779
  return {
1758
- lines: [...acc.lines, rubyCall("enum", [`:${f.dbName ?? f.name}`, `{ ${pairs} }`], opts)],
1759
- seenKeys: acc.seenKeys
1780
+ lines: [...acc.lines, rubyCall("enum", [`:${column}`, `{ ${pairs} }`], opts)],
1781
+ taken: acc.taken
1760
1782
  };
1761
1783
  }, {
1762
1784
  lines: [],
1763
- seenKeys: /* @__PURE__ */ new Set()
1785
+ taken: /* @__PURE__ */ new Set()
1764
1786
  }).lines;
1765
1787
  const foreignKeyFields = new Set(model.fields.flatMap((f) => f.kind === "object" ? f.relationFromFields ?? [] : []));
1766
1788
  const compositeKeyFields = new Set(model.primaryKey?.fields);
@@ -9282,8 +9304,56 @@ function toDBMLColumn(field, enums) {
9282
9304
  note: stripAnnotations(field.documentation)
9283
9305
  };
9284
9306
  }
9307
+ /**
9308
+ * Prisma's join table for each implicit many-to-many relation: `_<relation>`, column `A` holding
9309
+ * the id of the model whose name sorts first and `B` the other's (both the same model's in a
9310
+ * self-relation). The schema has no model for it, so the relation would otherwise have no table
9311
+ * and no `Ref` in the DBML.
9312
+ */
9313
+ function joinTables(models) {
9314
+ return implicitJoinTables(models).flatMap((pair) => {
9315
+ const left = models.find((m) => m.name === pair.left);
9316
+ const right = models.find((m) => m.name === pair.right);
9317
+ const leftId = left?.fields.find((f) => f.isId);
9318
+ const rightId = right?.fields.find((f) => f.isId);
9319
+ if (!(left && right && leftId && rightId)) return [];
9320
+ return [{
9321
+ name: `_${pair.relationName}`,
9322
+ a: {
9323
+ table: dbNameOf(left),
9324
+ id: leftId
9325
+ },
9326
+ b: {
9327
+ table: dbNameOf(right),
9328
+ id: rightId
9329
+ }
9330
+ }];
9331
+ });
9332
+ }
9285
9333
  function makeTables(models, enums = []) {
9286
- return models.map((model) => {
9334
+ const joins = joinTables(models).map((join) => [
9335
+ `Table ${join.name} {`,
9336
+ makePrismaColumn({
9337
+ name: "A",
9338
+ type: join.a.id.type,
9339
+ isNotNull: true
9340
+ }),
9341
+ makePrismaColumn({
9342
+ name: "B",
9343
+ type: join.b.id.type,
9344
+ isNotNull: true
9345
+ }),
9346
+ "",
9347
+ " indexes {",
9348
+ makeIndex({
9349
+ columns: ["A", "B"],
9350
+ isUnique: true
9351
+ }),
9352
+ makeIndex({ columns: ["B"] }),
9353
+ " }",
9354
+ "}"
9355
+ ].join("\n"));
9356
+ return [...models.map((model) => {
9287
9357
  const modelName = dbNameOf(model);
9288
9358
  const columnLines = model.fields.filter((field) => !field.relationName).map((field) => toDBMLColumn(field, enums)).map(makePrismaColumn).join("\n");
9289
9359
  const columnsOf = (fields) => fields.map((f) => fieldColumn(model, f));
@@ -9297,7 +9367,7 @@ function makeTables(models, enums = []) {
9297
9367
  const indexBlock = indexes.length > 0 ? `\n\n indexes {\n${indexes.map(makeIndex).join("\n")}\n }` : "";
9298
9368
  const strippedNote = stripAnnotations(model.documentation);
9299
9369
  return `Table ${modelName} {\n${columnLines}${indexBlock}${strippedNote ? `\n\n Note: ${noteLiteral(strippedNote)}` : ""}\n}`;
9300
- });
9370
+ }), ...joins];
9301
9371
  }
9302
9372
  function makeEnums(enums) {
9303
9373
  return enums.map((e) => makeEnum({
@@ -9306,7 +9376,19 @@ function makeEnums(enums) {
9306
9376
  }));
9307
9377
  }
9308
9378
  function makeRelations(models) {
9309
- return models.flatMap((model) => model.fields.filter((field) => field.relationName && field.relationToFields?.length && field.relationFromFields?.length).map((field) => {
9379
+ const joinRefs = joinTables(models).flatMap((join) => ["A", "B"].map((column) => {
9380
+ const side = column === "A" ? join.a : join.b;
9381
+ return makeRef({
9382
+ name: `${join.name}_${column}_fk`,
9383
+ fromTable: join.name,
9384
+ fromColumn: column,
9385
+ toTable: side.table,
9386
+ toColumn: dbNameOf(side.id),
9387
+ onDelete: "Cascade",
9388
+ onUpdate: "Cascade"
9389
+ });
9390
+ }));
9391
+ return [...models.flatMap((model) => model.fields.filter((field) => field.relationName && field.relationToFields?.length && field.relationFromFields?.length).map((field) => {
9310
9392
  const relationTo = field.type;
9311
9393
  const toModel = models.find((m) => m.name === relationTo);
9312
9394
  const operator = backRelation(field, model, models)?.isList ? ">" : "-";
@@ -9324,7 +9406,7 @@ function makeRelations(models) {
9324
9406
  onDelete: field.relationOnDelete,
9325
9407
  onUpdate: field.relationOnUpdate
9326
9408
  });
9327
- }));
9409
+ })), ...joinRefs];
9328
9410
  }
9329
9411
  function isMany(cardinality) {
9330
9412
  return cardinality === "many" || cardinality === "zero-many";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hekireki",
3
- "version": "0.44.0",
3
+ "version": "0.46.0",
4
4
  "description": "Hekireki is a code generator from Prisma schema to validation schemas, ORM models, OpenAPI and ER diagrams, with a Studio for your schema and its data",
5
5
  "keywords": [
6
6
  "activerecord",