@meghjs/core 0.5.2 → 0.5.3

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.
Files changed (60) hide show
  1. package/README.md +26 -24
  2. package/dist/collection/pagination.d.ts +9 -0
  3. package/dist/collection/pagination.js +11 -1
  4. package/dist/collection/pagination.js.map +1 -1
  5. package/dist/core/application.js +23 -2
  6. package/dist/core/application.js.map +1 -1
  7. package/dist/core/router.js +38 -3
  8. package/dist/core/router.js.map +1 -1
  9. package/dist/openapi/branding.d.ts +1 -1
  10. package/dist/openapi/branding.js.map +1 -1
  11. package/dist/openapi/index.d.ts +1 -0
  12. package/dist/openapi/index.js +4 -0
  13. package/dist/openapi/index.js.map +1 -1
  14. package/dist/openapi/openapi.d.ts +122 -21
  15. package/dist/openapi/openapi.js.map +1 -1
  16. package/dist/openapi/responses.d.ts +89 -0
  17. package/dist/openapi/responses.js +275 -0
  18. package/dist/openapi/responses.js.map +1 -0
  19. package/dist/openapi/swagger-schema.d.ts +5 -0
  20. package/dist/openapi/swagger-schema.js +5 -0
  21. package/dist/openapi/swagger-schema.js.map +1 -1
  22. package/dist/orm/connect.d.ts +12 -1
  23. package/dist/orm/connect.js +72 -1
  24. package/dist/orm/connect.js.map +1 -1
  25. package/dist/orm/connection.d.ts +7 -0
  26. package/dist/orm/connection.js +27 -3
  27. package/dist/orm/connection.js.map +1 -1
  28. package/dist/orm/core.d.ts +2 -0
  29. package/dist/orm/core.js +3 -1
  30. package/dist/orm/core.js.map +1 -1
  31. package/dist/orm/db.js +9 -1
  32. package/dist/orm/db.js.map +1 -1
  33. package/dist/orm/decorators.d.ts +4 -4
  34. package/dist/orm/decorators.js +3 -3
  35. package/dist/orm/decorators.js.map +1 -1
  36. package/dist/orm/factories.d.ts +59 -0
  37. package/dist/orm/factories.js +145 -0
  38. package/dist/orm/factories.js.map +1 -0
  39. package/dist/orm/index.d.ts +3 -0
  40. package/dist/orm/index.js +16 -1
  41. package/dist/orm/index.js.map +1 -1
  42. package/dist/orm/migrations.d.ts +6 -0
  43. package/dist/orm/migrations.js +1 -0
  44. package/dist/orm/migrations.js.map +1 -1
  45. package/dist/orm/model.d.ts +2 -8
  46. package/dist/orm/model.js.map +1 -1
  47. package/dist/orm/openapi.d.ts +8 -0
  48. package/dist/orm/openapi.js +75 -0
  49. package/dist/orm/openapi.js.map +1 -0
  50. package/dist/orm/schema.d.ts +2 -0
  51. package/dist/orm/schema.js +21 -0
  52. package/dist/orm/schema.js.map +1 -1
  53. package/dist/orm/seeders.d.ts +66 -0
  54. package/dist/orm/seeders.js +173 -0
  55. package/dist/orm/seeders.js.map +1 -0
  56. package/dist/orm/state.d.ts +2 -2
  57. package/dist/orm/state.js +13 -3
  58. package/dist/orm/state.js.map +1 -1
  59. package/dist/orm/types.d.ts +39 -15
  60. package/package.json +11 -2
@@ -0,0 +1,173 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.Seeders = exports.SeedError = exports.ENTRY_SEEDER = void 0;
7
+ exports.defineSeeder = defineSeeder;
8
+ exports.seederName = seederName;
9
+ exports.readSeederFolder = readSeederFolder;
10
+ /**
11
+ * Seeders: code that fills the database with rows, for development, tests
12
+ * and demos.
13
+ *
14
+ * A seeder is a module whose default export is `defineSeeder({ run })`. It is
15
+ * named after its file without `.seeder.ts`: `src/database/seeders/
16
+ * users.seeder.ts` is `users`. `megh db:seed` runs the `database` seeder,
17
+ * which calls the others in the order you choose; without one, every seeder
18
+ * runs in file-name order. `megh make:seeder` creates them.
19
+ *
20
+ * A whole run is one transaction: if a seeder throws, nothing is saved.
21
+ */
22
+ const node_fs_1 = __importDefault(require("node:fs"));
23
+ const node_path_1 = __importDefault(require("node:path"));
24
+ const connection_1 = require("./connection");
25
+ const migrations_1 = require("./migrations");
26
+ /**
27
+ * Define a seeder:
28
+ *
29
+ * ```ts
30
+ * export default defineSeeder({
31
+ * async run() {
32
+ * await Role.create({ name: "Admin" });
33
+ * await DB.table("settings").insert([{ key: "theme", value: "dark" }]);
34
+ * },
35
+ * });
36
+ * ```
37
+ */
38
+ function defineSeeder(seeder) {
39
+ return seeder;
40
+ }
41
+ /** The seeder `run()` starts from when it is given no name. */
42
+ exports.ENTRY_SEEDER = "database";
43
+ /** A seeder failed, or a name doesn't match one. */
44
+ class SeedError extends Error {
45
+ seeder;
46
+ cause;
47
+ constructor(message, seeder, cause) {
48
+ super(message);
49
+ this.seeder = seeder;
50
+ this.cause = cause;
51
+ this.name = "SeedError";
52
+ }
53
+ }
54
+ exports.SeedError = SeedError;
55
+ const EXTENSIONS = /\.(c?js|mjs|c?ts|mts)$/;
56
+ const DECLARATION = /\.d\.[cm]?ts$/;
57
+ /** A seeder's name: its file name without the extension and `.seeder`. */
58
+ function seederName(file) {
59
+ return file.replace(EXTENSIONS, "").replace(/\.seeder$/, "");
60
+ }
61
+ /** Seeders in `folder`, keyed by name, in file-name order. */
62
+ async function readSeederFolder(folder) {
63
+ if (!node_fs_1.default.existsSync(folder))
64
+ return {};
65
+ const out = {};
66
+ for (const file of node_fs_1.default.readdirSync(folder).sort()) {
67
+ if (!EXTENSIONS.test(file) || DECLARATION.test(file))
68
+ continue;
69
+ const mod = await (0, migrations_1.loadMigrationFile)(node_path_1.default.join(folder, file));
70
+ const seeder = typeof mod?.run === "function" ? mod : mod?.default;
71
+ if (typeof seeder?.run !== "function") {
72
+ throw new SeedError(`[Megh ORM] Seeder ${file} must export defineSeeder({ run }) as its default export.`, seederName(file));
73
+ }
74
+ out[seederName(file)] = seeder;
75
+ }
76
+ return out;
77
+ }
78
+ const describe = (error) => error instanceof Error ? error.message : String(error);
79
+ /**
80
+ * Runs seeders on a connection:
81
+ *
82
+ * ```ts
83
+ * const seeders = new Seeders(db, { folder: "dist/database/seeders" });
84
+ * await seeders.run(); // the "database" seeder, else all of them
85
+ * await seeders.run("users"); // one seeder
86
+ * ```
87
+ */
88
+ class Seeders {
89
+ db;
90
+ options;
91
+ constructor(db, options = {}) {
92
+ this.db = db;
93
+ this.options = options;
94
+ }
95
+ /** Seeder names, in file-name order. */
96
+ async list() {
97
+ return Object.keys(await this.load());
98
+ }
99
+ /**
100
+ * Run the seeder `name`; without one, the `database` seeder, or else every
101
+ * seeder in file-name order. Returns the seeders that ran, in order.
102
+ */
103
+ async run(name) {
104
+ const seeders = await this.load();
105
+ const names = Object.keys(seeders);
106
+ if (name !== undefined && !seeders[name]) {
107
+ throw new SeedError(`There is no seeder named "${name}". ` +
108
+ (names.length
109
+ ? `Seeders: ${names.join(", ")}.`
110
+ : "There are no seeders."), name);
111
+ }
112
+ const start = name !== undefined
113
+ ? [name]
114
+ : seeders[exports.ENTRY_SEEDER]
115
+ ? [exports.ENTRY_SEEDER]
116
+ : names;
117
+ if (start.length === 0)
118
+ return [];
119
+ // Models in a seeder use the ORM connection: point it at `db` if unset.
120
+ if (!(0, connection_1.hasConnection)())
121
+ (0, connection_1.setConnection)(this.db);
122
+ const ran = [];
123
+ const stack = [];
124
+ const runOne = async (seederToRun, db) => {
125
+ const seeder = seeders[seederToRun];
126
+ if (!seeder) {
127
+ throw new SeedError(`Seeder ${stack[stack.length - 1]} calls "${seederToRun}", which doesn't exist. Seeders: ${names.join(", ")}.`, stack[stack.length - 1]);
128
+ }
129
+ if (stack.includes(seederToRun)) {
130
+ throw new SeedError(`Seeders call each other in a loop: ${[...stack, seederToRun].join(" → ")}.`, seederToRun);
131
+ }
132
+ stack.push(seederToRun);
133
+ ran.push(seederToRun);
134
+ try {
135
+ await seeder.run({
136
+ db,
137
+ call: async (...others) => {
138
+ for (const other of others)
139
+ await runOne(other, db);
140
+ },
141
+ });
142
+ }
143
+ catch (error) {
144
+ // Report the innermost failing seeder once.
145
+ if (error instanceof SeedError)
146
+ throw error;
147
+ throw new SeedError(`Seeder ${seederToRun} failed: ${describe(error)}`, seederToRun, error);
148
+ }
149
+ finally {
150
+ stack.pop();
151
+ }
152
+ };
153
+ const runAll = async (db) => {
154
+ for (const seeder of start)
155
+ await runOne(seeder, db);
156
+ };
157
+ if (this.options.transaction === false)
158
+ await runAll(this.db);
159
+ else
160
+ await (0, connection_1.transactionOn)(this.db, runAll);
161
+ return ran;
162
+ }
163
+ load() {
164
+ if (this.options.seeders)
165
+ return Promise.resolve(this.options.seeders);
166
+ if (!this.options.folder) {
167
+ throw new SeedError("[Megh ORM] Seeders need a folder or a seeders map.", undefined);
168
+ }
169
+ return readSeederFolder(this.options.folder);
170
+ }
171
+ }
172
+ exports.Seeders = Seeders;
173
+ //# sourceMappingURL=seeders.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"seeders.js","sourceRoot":"","sources":["../../src/orm/seeders.ts"],"names":[],"mappings":"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"}
@@ -26,8 +26,8 @@ export declare function withTimestamps(cls: ModelClass, values: Record<string, u
26
26
  /**
27
27
  * Insert `values` (model form) into the model's table and return the stored
28
28
  * row, cast to model form. Fills timestamps. Uses `RETURNING` where the
29
- * dialect has it (Postgres, SQLite, MSSQL) and reads the row back by its id
30
- * otherwise (MySQL).
29
+ * dialect has it (Postgres, SQLite), `OUTPUT inserted.*` on SQL Server, and
30
+ * reads the row back by its id otherwise (MySQL).
31
31
  */
32
32
  export declare function insertRow(cls: ModelClass, values: Record<string, unknown>): Promise<Record<string, unknown>>;
33
33
  /** Update the row with primary key `id`. `values` are in model form. */
package/dist/orm/state.js CHANGED
@@ -115,15 +115,25 @@ function withTimestamps(cls, values, on) {
115
115
  /**
116
116
  * Insert `values` (model form) into the model's table and return the stored
117
117
  * row, cast to model form. Fills timestamps. Uses `RETURNING` where the
118
- * dialect has it (Postgres, SQLite, MSSQL) and reads the row back by its id
119
- * otherwise (MySQL).
118
+ * dialect has it (Postgres, SQLite), `OUTPUT inserted.*` on SQL Server, and
119
+ * reads the row back by its id otherwise (MySQL).
120
120
  */
121
121
  async function insertRow(cls, values) {
122
122
  const db = (0, connection_1.getConnection)();
123
123
  const table = tableOf(cls);
124
124
  const pk = (0, naming_1.columnName)(cls, cls.primaryKey);
125
125
  const data = (0, naming_1.toColumns)(cls, (0, casts_1.castToDatabase)(cls, withTimestamps(cls, values, "insert"), db));
126
- if (db.getExecutor().adapter.supportsReturning) {
126
+ const adapter = db.getExecutor().adapter;
127
+ if (adapter.supportsOutput) {
128
+ // SQL Server has no RETURNING and its driver gives no insertId.
129
+ const row = await db
130
+ .insertInto(table)
131
+ .values(data)
132
+ .outputAll("inserted")
133
+ .executeTakeFirstOrThrow();
134
+ return (0, casts_1.castFromDatabase)(cls, (0, naming_1.toProperties)(cls, row));
135
+ }
136
+ if (adapter.supportsReturning) {
127
137
  const row = await db
128
138
  .insertInto(table)
129
139
  .values(data)
@@ -1 +1 @@
1
- {"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/orm/state.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/orm/state.ts"],"names":[],"mappings":"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"}
@@ -11,6 +11,23 @@ import type { Generated } from "kysely";
11
11
  import type { Cast } from "./casts";
12
12
  import type { AnyRelation, BelongsToMany, RELATION } from "./relations";
13
13
  type Fn = (...args: any[]) => any;
14
+ type IsAny<T> = 0 extends 1 & T ? true : false;
15
+ /**
16
+ * A model instance, recognised by methods every model has. (A full
17
+ * `extends Model` check would compare `this`-typed methods and recurse
18
+ * through the related model's own relations.)
19
+ */
20
+ type ModelLike = {
21
+ isPersisted(): boolean;
22
+ isTrashed(): boolean;
23
+ };
24
+ /**
25
+ * Whether a field holds a relation: typed with a marker (`HasMany<Post>`,
26
+ * `BelongsTo<User>`), as the related model (`role?: Role | null`) or as an
27
+ * array of it (`posts?: Post[]`). `?`, `| null` and `| undefined` don't
28
+ * matter; an `any` field stays a column.
29
+ */
30
+ type IsRelation<T> = IsAny<T> extends true ? false : [NonNullable<T>] extends [never] ? false : NonNullable<T> extends AnyRelation | ModelLike | readonly ModelLike[] ? true : false;
14
31
  type IsReadonly<T, K extends keyof T> = (<X>() => X extends {
15
32
  [Q in K]: T[K];
16
33
  } ? 1 : 2) extends <X>() => X extends {
@@ -22,11 +39,11 @@ type IsReadonly<T, K extends keyof T> = (<X>() => X extends {
22
39
  * visible in error messages.
23
40
  */
24
41
  export type Columns<M> = {
25
- [K in keyof M as K extends string ? M[K] extends Fn ? never : M[K] extends AnyRelation ? never : IsReadonly<M, K> extends true ? never : K : never]: M[K];
42
+ [K in keyof M as K extends string ? M[K] extends Fn ? never : IsRelation<M[K]> extends true ? never : IsReadonly<M, K> extends true ? never : K : never]: M[K];
26
43
  };
27
44
  export type ColumnKeys<M> = keyof Columns<M> & string;
28
45
  type Relations<M> = {
29
- [K in keyof M as K extends string ? M[K] extends AnyRelation ? K : never : never]: M[K];
46
+ [K in keyof M as K extends string ? IsRelation<M[K]> extends true ? K : never : never]: M[K];
30
47
  };
31
48
  export type RelationKeys<M> = keyof Relations<M> & string;
32
49
  /** Methods and getters: kept on query results, which are model instances. */
@@ -35,21 +52,32 @@ type Members<M> = {
35
52
  };
36
53
  /** Keys of `belongsToMany` relations. */
37
54
  export type BelongsToManyKeys<M> = keyof {
38
- [K in keyof M as M[K] extends BelongsToMany<any, any> ? K : never]: 0;
55
+ [K in keyof M as NonNullable<M[K]> extends BelongsToMany<any, any> ? K : never]: 0;
39
56
  } & string;
40
- /** Keys of `hasMany` and `hasOne` relations. */
57
+ /**
58
+ * Keys of `hasMany` and `hasOne` relations. A field typed as a model
59
+ * (`Profile | null`, `Post[]`) counts too: its type can't tell `hasOne`
60
+ * from `belongsTo`, and `related()` checks the real kind when it runs.
61
+ */
41
62
  export type HasRelationKeys<M> = keyof {
42
- [K in keyof M as M[K] extends {
63
+ [K in keyof M as IsAny<M[K]> extends true ? never : NonNullable<M[K]> extends {
43
64
  readonly [RELATION]: {
44
65
  type: "hasMany" | "hasOne";
45
66
  };
46
- } ? K : never]: 0;
67
+ } | ModelLike | readonly ModelLike[] ? K : never]: 0;
47
68
  } & string;
48
- export type RelatedModel<R> = R extends {
69
+ /** The model a relation field points to: `Post` for `HasMany<Post>`, `Post[]` or `Post | null`. */
70
+ export type RelatedModel<R> = NonNullable<R> extends {
49
71
  readonly [RELATION]: {
50
72
  model: infer T;
51
73
  };
52
- } ? T : never;
74
+ } ? T : NonNullable<R> extends readonly (infer T)[] ? T : NonNullable<R>;
75
+ /** Whether a relation field loads a list (`HasMany<Post>`, `Post[]`, `BelongsToMany<Tag>`). */
76
+ export type IsManyRelation<R> = NonNullable<R> extends {
77
+ readonly [RELATION]: {
78
+ kind: "many";
79
+ };
80
+ } | readonly unknown[] ? true : false;
53
81
  /** Relation paths for `with()`, up to 3 levels: "posts" | "posts.comments" | … */
54
82
  export type RelationPaths<M, Depth extends unknown[] = []> = Depth["length"] extends 3 ? never : {
55
83
  [K in RelationKeys<M>]: K | `${K}.${RelationPaths<RelatedModel<M[K]>, [...Depth, unknown]>}`;
@@ -57,18 +85,14 @@ export type RelationPaths<M, Depth extends unknown[] = []> = Depth["length"] ext
57
85
  type Head<P> = P extends `${infer H}.${string}` ? H : P;
58
86
  type Tail<P, H extends string> = P extends `${H}.${infer R}` ? R : never;
59
87
  /** Pivot columns of a `belongsToMany` relation. */
60
- export type PivotOf<R> = R extends {
88
+ export type PivotOf<R> = NonNullable<R> extends {
61
89
  readonly [RELATION]: {
62
90
  pivot: infer Pivot;
63
91
  };
64
92
  } ? Pivot : never;
65
- type Resolve<R, Shape> = R extends BelongsToMany<any, infer Pivot> ? (Shape & {
93
+ type Resolve<R, Shape> = NonNullable<R> extends BelongsToMany<any, infer Pivot> ? (Shape & {
66
94
  readonly pivot: Pivot;
67
- })[] : R extends {
68
- readonly [RELATION]: {
69
- kind: "many";
70
- };
71
- } ? Shape[] : Shape | null;
95
+ })[] : IsManyRelation<R> extends true ? Shape[] : Shape | null;
72
96
  /** Eager-loaded relations for the path union `P`. */
73
97
  type Loaded<M, P extends string> = {
74
98
  [H in Head<P> & RelationKeys<M>]: Resolve<M[H], Row<RelatedModel<M[H]>, Tail<P, H>>>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@meghjs/core",
3
- "version": "0.5.2",
3
+ "version": "0.5.3",
4
4
  "description": "TypeScript-first web framework built on Fastify",
5
5
  "author": "Tareq Hossain",
6
6
  "license": "MIT",
@@ -52,6 +52,7 @@
52
52
  "reflect-metadata": "^0.2.2"
53
53
  },
54
54
  "peerDependencies": {
55
+ "@faker-js/faker": ">=9.0.0",
55
56
  "@fastify/compress": "^9.0.0",
56
57
  "@fastify/cors": "^11.0.0",
57
58
  "@fastify/helmet": "^13.0.0",
@@ -74,6 +75,9 @@
74
75
  "socket.io": ">=4.0.0"
75
76
  },
76
77
  "peerDependenciesMeta": {
78
+ "@faker-js/faker": {
79
+ "optional": true
80
+ },
77
81
  "@fastify/compress": {
78
82
  "optional": true
79
83
  },
@@ -130,6 +134,7 @@
130
134
  }
131
135
  },
132
136
  "devDependencies": {
137
+ "@faker-js/faker": "^10.6.0",
133
138
  "@fastify/compress": "^9.3.0",
134
139
  "@fastify/cors": "^11.0.0",
135
140
  "@fastify/helmet": "^13.2.0",
@@ -156,10 +161,14 @@
156
161
  "fastify-socket.io": "^4.0.0",
157
162
  "ioredis": "^5.10.1",
158
163
  "kafkajs": "^2.2.4",
164
+ "mysql2": "^3.24.6",
165
+ "pg": "^8.23.1",
159
166
  "pino-pretty": "^13.1.3",
160
167
  "prettier": "^3.6.2",
161
168
  "sharp": "^0.35.5",
162
169
  "socket.io": "^4.8.3",
170
+ "tarn": "^3.1.2",
171
+ "tedious": "^20.3.8",
163
172
  "typescript": "^5.7.2",
164
173
  "unplugin-swc": "^2.0.0",
165
174
  "vitest": "^4.1.12"
@@ -177,5 +186,5 @@
177
186
  "publishConfig": {
178
187
  "access": "public"
179
188
  },
180
- "gitHead": "dffc7df3cfbcbf991a2af569b0a408ab9971beb3"
189
+ "gitHead": "65437cf19a7f0ac6d6ed61ab8c69e10ef148dab0"
181
190
  }