@meghjs/core 0.5.0 → 0.5.2
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.
- package/README.md +39 -29
- package/dist/common/helpers.d.ts +0 -1
- package/dist/common/helpers.js +0 -1
- package/dist/common/helpers.js.map +1 -1
- package/dist/config/config.js +1 -2
- package/dist/config/config.js.map +1 -1
- package/dist/core/application.d.ts +0 -6
- package/dist/core/application.js +2 -10
- package/dist/core/application.js.map +1 -1
- package/dist/core/router.js +2 -1
- package/dist/core/router.js.map +1 -1
- package/dist/di/container.d.ts +50 -6
- package/dist/di/container.js +183 -29
- package/dist/di/container.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/openapi/branding.d.ts +29 -0
- package/dist/openapi/branding.js +41 -0
- package/dist/openapi/branding.js.map +1 -0
- package/dist/openapi/openapi.d.ts +8 -0
- package/dist/openapi/openapi.js.map +1 -1
- package/dist/orm/casts.d.ts +6 -1
- package/dist/orm/casts.js +18 -7
- package/dist/orm/casts.js.map +1 -1
- package/dist/orm/config.d.ts +63 -0
- package/dist/orm/config.js +127 -0
- package/dist/orm/config.js.map +1 -0
- package/dist/orm/connect.d.ts +11 -0
- package/dist/orm/connect.js +147 -0
- package/dist/orm/connect.js.map +1 -0
- package/dist/orm/connection.d.ts +9 -5
- package/dist/orm/connection.js +41 -14
- package/dist/orm/connection.js.map +1 -1
- package/dist/orm/core.d.ts +43 -0
- package/dist/orm/core.js +23 -0
- package/dist/orm/core.js.map +1 -0
- package/dist/orm/db.d.ts +171 -0
- package/dist/orm/db.js +534 -0
- package/dist/orm/db.js.map +1 -0
- package/dist/orm/decorators.d.ts +143 -0
- package/dist/orm/decorators.js +243 -0
- package/dist/orm/decorators.js.map +1 -0
- package/dist/orm/engine.d.ts +8 -0
- package/dist/orm/engine.js +8 -0
- package/dist/orm/engine.js.map +1 -0
- package/dist/orm/has-relation.d.ts +31 -0
- package/dist/orm/has-relation.js +77 -0
- package/dist/orm/has-relation.js.map +1 -0
- package/dist/orm/index.d.ts +12 -4
- package/dist/orm/index.js +41 -1
- package/dist/orm/index.js.map +1 -1
- package/dist/orm/migrations.d.ts +27 -0
- package/dist/orm/migrations.js +40 -16
- package/dist/orm/migrations.js.map +1 -1
- package/dist/orm/model.d.ts +55 -6
- package/dist/orm/model.js +82 -16
- package/dist/orm/model.js.map +1 -1
- package/dist/orm/naming.d.ts +19 -0
- package/dist/orm/naming.js +96 -0
- package/dist/orm/naming.js.map +1 -0
- package/dist/orm/paging.d.ts +22 -0
- package/dist/orm/paging.js +32 -0
- package/dist/orm/paging.js.map +1 -0
- package/dist/orm/pivot.js +3 -2
- package/dist/orm/pivot.js.map +1 -1
- package/dist/orm/plugin.d.ts +2 -0
- package/dist/orm/plugin.js +50 -0
- package/dist/orm/plugin.js.map +1 -0
- package/dist/orm/query.d.ts +125 -10
- package/dist/orm/query.js +289 -47
- package/dist/orm/query.js.map +1 -1
- package/dist/orm/relations.d.ts +11 -2
- package/dist/orm/relations.js +14 -2
- package/dist/orm/relations.js.map +1 -1
- package/dist/orm/schema.d.ts +229 -0
- package/dist/orm/schema.js +645 -0
- package/dist/orm/schema.js.map +1 -0
- package/dist/orm/state.d.ts +4 -1
- package/dist/orm/state.js +29 -12
- package/dist/orm/state.js.map +1 -1
- package/dist/orm/types.d.ts +18 -5
- package/dist/plugins/builtin.d.ts +2 -0
- package/dist/plugins/builtin.js +12 -0
- package/dist/plugins/builtin.js.map +1 -0
- package/dist/plugins/registry.d.ts +5 -3
- package/dist/plugins/registry.js +14 -4
- package/dist/plugins/registry.js.map +1 -1
- package/package.json +6 -7
- package/dist/common/utils/di-utils.d.ts +0 -1
- package/dist/common/utils/di-utils.js +0 -20
- package/dist/common/utils/di-utils.js.map +0 -1
package/dist/orm/state.d.ts
CHANGED
|
@@ -14,7 +14,10 @@ export declare function getState(instance: object): InstanceState;
|
|
|
14
14
|
/** Record `values` (model form) as the instance's stored state. */
|
|
15
15
|
export declare function markPersisted(instance: object, values: Record<string, unknown>): void;
|
|
16
16
|
export declare function markDeleted(instance: object): void;
|
|
17
|
-
/**
|
|
17
|
+
/**
|
|
18
|
+
* The instance's column values: its decorated columns, or for models
|
|
19
|
+
* without column decorators, own fields that are not relations.
|
|
20
|
+
*/
|
|
18
21
|
export declare function columnValues(instance: object): Record<string, unknown>;
|
|
19
22
|
/** Columns whose value differs from when the instance was loaded or saved. */
|
|
20
23
|
export declare function changedValues(instance: object): Record<string, unknown>;
|
package/dist/orm/state.js
CHANGED
|
@@ -21,6 +21,8 @@ exports.updateRow = updateRow;
|
|
|
21
21
|
*/
|
|
22
22
|
const casts_1 = require("./casts");
|
|
23
23
|
const connection_1 = require("./connection");
|
|
24
|
+
const decorators_1 = require("./decorators");
|
|
25
|
+
const naming_1 = require("./naming");
|
|
24
26
|
const relations_1 = require("./relations");
|
|
25
27
|
const states = new WeakMap();
|
|
26
28
|
function tableOf(cls) {
|
|
@@ -41,7 +43,7 @@ cast = true) {
|
|
|
41
43
|
delete instance[key];
|
|
42
44
|
}
|
|
43
45
|
}
|
|
44
|
-
const values = cast ? (0, casts_1.castFromDatabase)(cls, row) : row;
|
|
46
|
+
const values = cast ? (0, casts_1.castFromDatabase)(cls, (0, naming_1.toProperties)(cls, row)) : row;
|
|
45
47
|
Object.assign(instance, values);
|
|
46
48
|
markPersisted(instance, values);
|
|
47
49
|
return instance;
|
|
@@ -65,10 +67,23 @@ function markDeleted(instance) {
|
|
|
65
67
|
const state = getState(instance);
|
|
66
68
|
states.set(instance, { ...state, exists: false });
|
|
67
69
|
}
|
|
68
|
-
/**
|
|
70
|
+
/**
|
|
71
|
+
* The instance's column values: its decorated columns, or for models
|
|
72
|
+
* without column decorators, own fields that are not relations.
|
|
73
|
+
*/
|
|
69
74
|
function columnValues(instance) {
|
|
70
|
-
const
|
|
75
|
+
const cls = instance.constructor;
|
|
71
76
|
const out = {};
|
|
77
|
+
const declared = (0, decorators_1.columnNames)(cls);
|
|
78
|
+
if (declared) {
|
|
79
|
+
for (const key of declared) {
|
|
80
|
+
const value = instance[key];
|
|
81
|
+
if (value !== undefined)
|
|
82
|
+
out[key] = value;
|
|
83
|
+
}
|
|
84
|
+
return out;
|
|
85
|
+
}
|
|
86
|
+
const relations = (0, relations_1.getRelations)(cls);
|
|
72
87
|
for (const [key, value] of Object.entries(instance)) {
|
|
73
88
|
if (value !== undefined && !relations.has(key))
|
|
74
89
|
out[key] = value;
|
|
@@ -91,9 +106,10 @@ function withTimestamps(cls, values, on) {
|
|
|
91
106
|
return values;
|
|
92
107
|
const now = new Date();
|
|
93
108
|
const out = { ...values };
|
|
94
|
-
if (on === "insert")
|
|
109
|
+
if (on === "insert" && cls.createdAt)
|
|
95
110
|
out[cls.createdAt] ??= now;
|
|
96
|
-
|
|
111
|
+
if (cls.updatedAt)
|
|
112
|
+
out[cls.updatedAt] ??= now;
|
|
97
113
|
return out;
|
|
98
114
|
}
|
|
99
115
|
/**
|
|
@@ -105,34 +121,35 @@ function withTimestamps(cls, values, on) {
|
|
|
105
121
|
async function insertRow(cls, values) {
|
|
106
122
|
const db = (0, connection_1.getConnection)();
|
|
107
123
|
const table = tableOf(cls);
|
|
108
|
-
const
|
|
124
|
+
const pk = (0, naming_1.columnName)(cls, cls.primaryKey);
|
|
125
|
+
const data = (0, naming_1.toColumns)(cls, (0, casts_1.castToDatabase)(cls, withTimestamps(cls, values, "insert"), db));
|
|
109
126
|
if (db.getExecutor().adapter.supportsReturning) {
|
|
110
127
|
const row = await db
|
|
111
128
|
.insertInto(table)
|
|
112
129
|
.values(data)
|
|
113
130
|
.returningAll()
|
|
114
131
|
.executeTakeFirstOrThrow();
|
|
115
|
-
return (0, casts_1.castFromDatabase)(cls, row);
|
|
132
|
+
return (0, casts_1.castFromDatabase)(cls, (0, naming_1.toProperties)(cls, row));
|
|
116
133
|
}
|
|
117
134
|
const result = await db
|
|
118
135
|
.insertInto(table)
|
|
119
136
|
.values(data)
|
|
120
137
|
.executeTakeFirstOrThrow();
|
|
121
|
-
const id = data[
|
|
138
|
+
const id = data[pk] ?? Number(result.insertId);
|
|
122
139
|
const row = await db
|
|
123
140
|
.selectFrom(table)
|
|
124
141
|
.selectAll()
|
|
125
|
-
.where(
|
|
142
|
+
.where(pk, "=", id)
|
|
126
143
|
.executeTakeFirstOrThrow();
|
|
127
|
-
return (0, casts_1.castFromDatabase)(cls, row);
|
|
144
|
+
return (0, casts_1.castFromDatabase)(cls, (0, naming_1.toProperties)(cls, row));
|
|
128
145
|
}
|
|
129
146
|
/** Update the row with primary key `id`. `values` are in model form. */
|
|
130
147
|
async function updateRow(cls, id, values) {
|
|
131
148
|
const db = (0, connection_1.getConnection)();
|
|
132
149
|
await db
|
|
133
150
|
.updateTable(tableOf(cls))
|
|
134
|
-
.set((0, casts_1.castToDatabase)(cls, values, db))
|
|
135
|
-
.where(cls.primaryKey, "=", id)
|
|
151
|
+
.set((0, naming_1.toColumns)(cls, (0, casts_1.castToDatabase)(cls, values, db)))
|
|
152
|
+
.where((0, naming_1.columnName)(cls, cls.primaryKey), "=", id)
|
|
136
153
|
.execute();
|
|
137
154
|
}
|
|
138
155
|
//# sourceMappingURL=state.js.map
|
package/dist/orm/state.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/orm/state.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/orm/state.ts"],"names":[],"mappings":"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"}
|
package/dist/orm/types.d.ts
CHANGED
|
@@ -37,6 +37,14 @@ type Members<M> = {
|
|
|
37
37
|
export type BelongsToManyKeys<M> = keyof {
|
|
38
38
|
[K in keyof M as M[K] extends BelongsToMany<any, any> ? K : never]: 0;
|
|
39
39
|
} & string;
|
|
40
|
+
/** Keys of `hasMany` and `hasOne` relations. */
|
|
41
|
+
export type HasRelationKeys<M> = keyof {
|
|
42
|
+
[K in keyof M as M[K] extends {
|
|
43
|
+
readonly [RELATION]: {
|
|
44
|
+
type: "hasMany" | "hasOne";
|
|
45
|
+
};
|
|
46
|
+
} ? K : never]: 0;
|
|
47
|
+
} & string;
|
|
40
48
|
export type RelatedModel<R> = R extends {
|
|
41
49
|
readonly [RELATION]: {
|
|
42
50
|
model: infer T;
|
|
@@ -67,9 +75,10 @@ type Loaded<M, P extends string> = {
|
|
|
67
75
|
};
|
|
68
76
|
/**
|
|
69
77
|
* A query result: the selected columns `S`, the relations loaded through
|
|
70
|
-
* paths `P`, and the model's methods and getters.
|
|
78
|
+
* paths `P`, and the model's methods and getters. Columns declared optional
|
|
79
|
+
* (`id?: number`, filled in by the database) are present on loaded rows.
|
|
71
80
|
*/
|
|
72
|
-
export type Row<M, P extends string = never, S extends ColumnKeys<M> = ColumnKeys<M>> = Pick<Columns<M>, S
|
|
81
|
+
export type Row<M, P extends string = never, S extends ColumnKeys<M> = ColumnKeys<M>> = Required<Pick<Columns<M>, S>> & Loaded<M, P> & Members<M>;
|
|
73
82
|
/** The static side of a model class. */
|
|
74
83
|
export interface ModelClass<M = any> {
|
|
75
84
|
new (): M;
|
|
@@ -78,8 +87,8 @@ export interface ModelClass<M = any> {
|
|
|
78
87
|
readonly primaryKey: string;
|
|
79
88
|
readonly generated: readonly string[];
|
|
80
89
|
readonly timestamps: boolean;
|
|
81
|
-
readonly createdAt: string;
|
|
82
|
-
readonly updatedAt: string;
|
|
90
|
+
readonly createdAt: string | null;
|
|
91
|
+
readonly updatedAt: string | null;
|
|
83
92
|
readonly softDeletes: boolean;
|
|
84
93
|
readonly deletedAt: string;
|
|
85
94
|
readonly casts: Readonly<Record<string, Cast>>;
|
|
@@ -90,7 +99,11 @@ type Literal<T, Default> = string extends T ? Default : T;
|
|
|
90
99
|
/** `created_at`/`updated_at` (or their overrides) when `timestamps = true`. */
|
|
91
100
|
export type TimestampKeys<C extends ModelClass> = C["timestamps"] extends true ? Literal<C["createdAt"], "created_at"> | Literal<C["updatedAt"], "updated_at"> : never;
|
|
92
101
|
/** Columns `create()` may leave out. */
|
|
93
|
-
type OptionalKeys<C extends ModelClass> = GeneratedKeys<C> | TimestampKeys<C> | NullableKeys<InstanceType<C>>;
|
|
102
|
+
type OptionalKeys<C extends ModelClass> = GeneratedKeys<C> | TimestampKeys<C> | NullableKeys<InstanceType<C>> | OptionalFieldKeys<InstanceType<C>>;
|
|
103
|
+
/** Columns declared with `?`, such as `@AutoIncrement() id?: number`. */
|
|
104
|
+
type OptionalFieldKeys<M> = {
|
|
105
|
+
[K in ColumnKeys<M>]-?: {} extends Pick<Columns<M>, K> ? K : never;
|
|
106
|
+
}[ColumnKeys<M>];
|
|
94
107
|
type NullableKeys<M> = {
|
|
95
108
|
[K in ColumnKeys<M>]: null extends M[K] ? K : never;
|
|
96
109
|
}[ColumnKeys<M>];
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BUILTIN_PLUGINS = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Plugins that ship inside @meghjs/core until they move to their own
|
|
6
|
+
* packages. An installed package with the same name replaces the built-in
|
|
7
|
+
* one, so publishing `@meghjs/orm` takes over without changes to core; once
|
|
8
|
+
* it's published, its line here is removed.
|
|
9
|
+
*/
|
|
10
|
+
const plugin_1 = require("../orm/plugin");
|
|
11
|
+
exports.BUILTIN_PLUGINS = [plugin_1.ormPlugin];
|
|
12
|
+
//# sourceMappingURL=builtin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"builtin.js","sourceRoot":"","sources":["../../src/plugins/builtin.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,0CAA0C;AAG7B,QAAA,eAAe,GAA0B,CAAC,kBAAS,CAAC,CAAC"}
|
|
@@ -7,7 +7,9 @@ export type PluginOptions = {
|
|
|
7
7
|
autoloadPlugins?: boolean;
|
|
8
8
|
};
|
|
9
9
|
/**
|
|
10
|
-
* Register the app's plugins, dependencies first, and return
|
|
11
|
-
* registration order.
|
|
10
|
+
* Register the app's plugins, dependencies first, and return the names of
|
|
11
|
+
* the installed and explicitly given ones in registration order. Core's
|
|
12
|
+
* built-in plugins are registered too, unless a plugin with the same name
|
|
13
|
+
* replaces them, but aren't listed.
|
|
12
14
|
*/
|
|
13
|
-
export declare function registerPlugins(app: MeghApplication, options?: PluginOptions): string[];
|
|
15
|
+
export declare function registerPlugins(app: MeghApplication, options?: PluginOptions, builtins?: readonly MeghPlugin[]): string[];
|
package/dist/plugins/registry.js
CHANGED
|
@@ -4,13 +4,16 @@ exports.registerPlugins = registerPlugins;
|
|
|
4
4
|
const di_1 = require("../di");
|
|
5
5
|
const logger_1 = require("../observability/logger");
|
|
6
6
|
const system_exception_1 = require("../common/exceptions/system-exception");
|
|
7
|
+
const builtin_1 = require("./builtin");
|
|
7
8
|
const discovery_1 = require("./discovery");
|
|
8
9
|
const plugin_1 = require("./plugin");
|
|
9
10
|
/**
|
|
10
|
-
* Register the app's plugins, dependencies first, and return
|
|
11
|
-
* registration order.
|
|
11
|
+
* Register the app's plugins, dependencies first, and return the names of
|
|
12
|
+
* the installed and explicitly given ones in registration order. Core's
|
|
13
|
+
* built-in plugins are registered too, unless a plugin with the same name
|
|
14
|
+
* replaces them, but aren't listed.
|
|
12
15
|
*/
|
|
13
|
-
function registerPlugins(app, options = {}) {
|
|
16
|
+
function registerPlugins(app, options = {}, builtins = builtin_1.BUILTIN_PLUGINS) {
|
|
14
17
|
const byName = new Map();
|
|
15
18
|
for (const plugin of options.plugins ?? []) {
|
|
16
19
|
(0, plugin_1.assertPlugin)(plugin, "An entry in the plugins option");
|
|
@@ -25,6 +28,13 @@ function registerPlugins(app, options = {}) {
|
|
|
25
28
|
byName.set(plugin.name, plugin);
|
|
26
29
|
}
|
|
27
30
|
}
|
|
31
|
+
const builtin = new Set();
|
|
32
|
+
for (const plugin of builtins) {
|
|
33
|
+
if (byName.has(plugin.name))
|
|
34
|
+
continue;
|
|
35
|
+
byName.set(plugin.name, plugin);
|
|
36
|
+
builtin.add(plugin);
|
|
37
|
+
}
|
|
28
38
|
const ordered = sortByDependencies(byName);
|
|
29
39
|
const methodOwners = new Map();
|
|
30
40
|
for (const plugin of ordered) {
|
|
@@ -39,7 +49,7 @@ function registerPlugins(app, options = {}) {
|
|
|
39
49
|
throw new system_exception_1.SystemUseError(`Plugin "${plugin.name}": register() must be synchronous. Move async work into ctx.onInit().`);
|
|
40
50
|
}
|
|
41
51
|
}
|
|
42
|
-
return ordered.map((p) => p.name);
|
|
52
|
+
return ordered.filter((p) => !builtin.has(p)).map((p) => p.name);
|
|
43
53
|
}
|
|
44
54
|
function createContext(app, plugin, methodOwners) {
|
|
45
55
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/plugins/registry.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/plugins/registry.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@meghjs/core",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.2",
|
|
4
4
|
"description": "TypeScript-first web framework built on Fastify",
|
|
5
5
|
"author": "Tareq Hossain",
|
|
6
6
|
"license": "MIT",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
},
|
|
17
17
|
"sideEffects": true,
|
|
18
18
|
"engines": {
|
|
19
|
-
"node": ">=
|
|
19
|
+
"node": ">=22.0.0"
|
|
20
20
|
},
|
|
21
21
|
"files": [
|
|
22
22
|
"dist",
|
|
@@ -45,11 +45,11 @@
|
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"dotenv": "^17.3.1",
|
|
47
47
|
"fastify": "^5.1.0",
|
|
48
|
+
"kysely": "^0.29.7",
|
|
48
49
|
"mime": "^3.0.0",
|
|
49
50
|
"node-cron": "^4.2.1",
|
|
50
51
|
"pino": "^9.14.0",
|
|
51
|
-
"reflect-metadata": "^0.2.2"
|
|
52
|
-
"typedi": "^0.10.0"
|
|
52
|
+
"reflect-metadata": "^0.2.2"
|
|
53
53
|
},
|
|
54
54
|
"peerDependencies": {
|
|
55
55
|
"@fastify/compress": "^9.0.0",
|
|
@@ -141,7 +141,7 @@
|
|
|
141
141
|
"@scalar/fastify-api-reference": "^1.0.0",
|
|
142
142
|
"@swc/core": "^1.16.20",
|
|
143
143
|
"@types/better-sqlite3": "^9.6.0",
|
|
144
|
-
"@types/node": "^20.
|
|
144
|
+
"@types/node": "^22.20.5",
|
|
145
145
|
"@types/node-cron": "^3.0.11",
|
|
146
146
|
"@typescript-eslint/eslint-plugin": "^8.44.0",
|
|
147
147
|
"@typescript-eslint/parser": "^8.44.0",
|
|
@@ -156,7 +156,6 @@
|
|
|
156
156
|
"fastify-socket.io": "^4.0.0",
|
|
157
157
|
"ioredis": "^5.10.1",
|
|
158
158
|
"kafkajs": "^2.2.4",
|
|
159
|
-
"kysely": "^0.29.7",
|
|
160
159
|
"pino-pretty": "^13.1.3",
|
|
161
160
|
"prettier": "^3.6.2",
|
|
162
161
|
"sharp": "^0.35.5",
|
|
@@ -178,5 +177,5 @@
|
|
|
178
177
|
"publishConfig": {
|
|
179
178
|
"access": "public"
|
|
180
179
|
},
|
|
181
|
-
"gitHead": "
|
|
180
|
+
"gitHead": "dffc7df3cfbcbf991a2af569b0a408ab9971beb3"
|
|
182
181
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function inject<T>(cls: new (...args: any[]) => T): T;
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.inject = inject;
|
|
4
|
-
/**
|
|
5
|
-
* @copyright 2024
|
|
6
|
-
* @author Tareq Hossain
|
|
7
|
-
* @email xtrinsic96@gmail.com
|
|
8
|
-
* @url https://github.com/xtareq
|
|
9
|
-
*/
|
|
10
|
-
const di_1 = require("../../di");
|
|
11
|
-
const system_exception_1 = require("../exceptions/system-exception");
|
|
12
|
-
function inject(cls) {
|
|
13
|
-
try {
|
|
14
|
-
return di_1.Container.get(cls);
|
|
15
|
-
}
|
|
16
|
-
catch (error) {
|
|
17
|
-
throw new system_exception_1.SystemUseError("Not a project class. Maybe you wanna register it first.");
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
//# sourceMappingURL=di-utils.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"di-utils.js","sourceRoot":"","sources":["../../../src/common/utils/di-utils.ts"],"names":[],"mappings":";;AASA,wBAQC;AAjBD;;;;;GAKG;AACH,iCAAqC;AACrC,qEAAgE;AAEhE,SAAgB,MAAM,CAAI,GAA8B;IACtD,IAAI,CAAC;QACH,OAAO,cAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,iCAAc,CACtB,yDAAyD,CAC1D,CAAC;IACJ,CAAC;AACH,CAAC"}
|