@spinajs/intl-orm 2.0.38 → 2.0.45
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/lib/index.d.ts +5 -3
- package/lib/index.js +7 -4
- package/lib/index.js.map +1 -1
- package/package.json +10 -10
package/lib/index.d.ts
CHANGED
|
@@ -2,10 +2,12 @@ import { IModelDescriptor, ModelBase, Orm, OrmRelation, SelectQueryBuilder, Quer
|
|
|
2
2
|
import { TranslationSource } from '@spinajs/intl';
|
|
3
3
|
export * from './decorators';
|
|
4
4
|
export * from './model';
|
|
5
|
-
export * from './
|
|
5
|
+
export * from './migrations/IntlOrm_2022_06_28_01_13_00';
|
|
6
|
+
export * from './models/IntlResource';
|
|
7
|
+
export * from './models/IntlTranslation';
|
|
6
8
|
declare module '@spinajs/orm' {
|
|
7
|
-
interface
|
|
8
|
-
translate(lang: string):
|
|
9
|
+
interface SelectQueryBuilder<T> {
|
|
10
|
+
translate(lang: string): SelectQueryBuilder<T>;
|
|
9
11
|
translated: boolean;
|
|
10
12
|
}
|
|
11
13
|
interface IColumnDescriptor {
|
package/lib/index.js
CHANGED
|
@@ -35,7 +35,10 @@ const IntlTranslation_1 = require("./models/IntlTranslation");
|
|
|
35
35
|
const IntlResource_1 = require("./models/IntlResource");
|
|
36
36
|
__exportStar(require("./decorators"), exports);
|
|
37
37
|
__exportStar(require("./model"), exports);
|
|
38
|
-
__exportStar(require("./
|
|
38
|
+
__exportStar(require("./migrations/IntlOrm_2022_06_28_01_13_00"), exports);
|
|
39
|
+
__exportStar(require("./models/IntlResource"), exports);
|
|
40
|
+
__exportStar(require("./models/IntlTranslation"), exports);
|
|
41
|
+
const { SelectQueryBuilder: SQB } = require('@spinajs/orm');
|
|
39
42
|
let IntlModelRelation = class IntlModelRelation extends orm_1.OrmRelation {
|
|
40
43
|
constructor(_lang, _orm, _query, _mDescriptor, _parentRelation) {
|
|
41
44
|
super(_orm, _query, {
|
|
@@ -61,7 +64,7 @@ let IntlModelRelation = class IntlModelRelation extends orm_1.OrmRelation {
|
|
|
61
64
|
};
|
|
62
65
|
IntlModelRelation = __decorate([
|
|
63
66
|
(0, di_1.NewInstance)(),
|
|
64
|
-
__metadata("design:paramtypes", [String, orm_1.Orm,
|
|
67
|
+
__metadata("design:paramtypes", [String, orm_1.Orm, Object, Object, orm_1.OrmRelation])
|
|
65
68
|
], IntlModelRelation);
|
|
66
69
|
exports.IntlModelRelation = IntlModelRelation;
|
|
67
70
|
class IntlModelMiddleware {
|
|
@@ -131,7 +134,7 @@ class IntlModelMiddleware {
|
|
|
131
134
|
}
|
|
132
135
|
}
|
|
133
136
|
exports.IntlModelMiddleware = IntlModelMiddleware;
|
|
134
|
-
|
|
137
|
+
SQB.prototype['translate'] = function (lang) {
|
|
135
138
|
/**
|
|
136
139
|
* Cannot translate query that cames from translation middleware !
|
|
137
140
|
*/
|
|
@@ -153,7 +156,7 @@ orm_1.SelectQueryBuilder.prototype['translate'] = function (lang) {
|
|
|
153
156
|
};
|
|
154
157
|
let IntlQueryMiddleware = class IntlQueryMiddleware extends orm_1.QueryMiddleware {
|
|
155
158
|
afterQueryCreation(builder) {
|
|
156
|
-
if (builder instanceof
|
|
159
|
+
if (builder instanceof SQB && !builder.translated) {
|
|
157
160
|
const lang = (0, intl_1.guessLanguage)();
|
|
158
161
|
const dLang = (0, intl_1.defaultLanguage)();
|
|
159
162
|
if (lang && dLang !== lang) {
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAsD;AACtD,sCAA2N;AAC3N,wCAAkF;AAClF,oDAAuB;AACvB,8DAA2D;AAC3D,wDAAqD;AAErD,+CAA6B;AAC7B,0CAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/intl-orm",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.45",
|
|
4
4
|
"description": "Internationalization support for ORM module",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -38,18 +38,18 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/spinajs/main#readme",
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@spinajs/configuration": "^2.0.
|
|
42
|
-
"@spinajs/di": "^2.0.
|
|
43
|
-
"@spinajs/exceptions": "^2.0.
|
|
44
|
-
"@spinajs/intl": "^2.0.
|
|
45
|
-
"@spinajs/log": "^2.0.
|
|
46
|
-
"@spinajs/orm": "^2.0.
|
|
47
|
-
"@spinajs/reflection": "^2.0.
|
|
41
|
+
"@spinajs/configuration": "^2.0.45",
|
|
42
|
+
"@spinajs/di": "^2.0.45",
|
|
43
|
+
"@spinajs/exceptions": "^2.0.39",
|
|
44
|
+
"@spinajs/intl": "^2.0.45",
|
|
45
|
+
"@spinajs/log": "^2.0.45",
|
|
46
|
+
"@spinajs/orm": "^2.0.45",
|
|
47
|
+
"@spinajs/reflection": "^2.0.45",
|
|
48
48
|
"luxon": "^2.4.0",
|
|
49
49
|
"typescript-mix": "^3.1.3"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@spinajs/orm-sqlite": "^2.0.
|
|
52
|
+
"@spinajs/orm-sqlite": "^2.0.45"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "3aa423c570eae952dc79fe6a4704c3d2ccc178be"
|
|
55
55
|
}
|