@spinajs/intl-orm 2.0.480 → 2.0.482
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/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +8 -2
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/model.d.ts +1 -4
- package/lib/cjs/model.d.ts.map +1 -1
- package/lib/cjs/model.js +3 -1
- package/lib/cjs/model.js.map +1 -1
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +8 -2
- package/lib/mjs/index.js.map +1 -1
- package/lib/mjs/model.d.ts +1 -4
- package/lib/mjs/model.d.ts.map +1 -1
- package/lib/mjs/model.js +4 -2
- package/lib/mjs/model.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +16 -18
package/lib/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAuC,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAqD,gBAAgB,EAAE,SAAS,EAAqB,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,YAAY,EAAqB,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjR,OAAO,EAAE,iBAAiB,EAAqD,MAAM,eAAe,CAAC;AAOrG,cAAc,iBAAiB,CAAC;AAChC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC;AAE3B,OAAO,QAAQ,cAAc,CAAC;IAC5B,UAAU,mBAAmB,CAAC,CAAC;QAC7B;;;;;;;;WAQG;QACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAC/C,UAAU,EAAE,OAAO,CAAC;QACpB,cAAc,EAAE,OAAO,CAAC;KACzB;IACD,UAAU,iBAAiB;QACzB,SAAS,EAAE,OAAO,CAAC;KACpB;CACF;AAED,qBAEa,iBAAkB,SAAQ,iBAAiB;IACnB,SAAS,CAAC,KAAK,EAAE,MAAM;IAA+B,SAAS,CAAC,YAAY,EAAE,gBAAgB;gBAArH,UAAU,EAAE,SAAS,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAY,YAAY,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,iBAAiB;IAoB/J,OAAO,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAuC,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAqD,gBAAgB,EAAE,SAAS,EAAqB,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,YAAY,EAAqB,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjR,OAAO,EAAE,iBAAiB,EAAqD,MAAM,eAAe,CAAC;AAOrG,cAAc,iBAAiB,CAAC;AAChC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC;AAE3B,OAAO,QAAQ,cAAc,CAAC;IAC5B,UAAU,mBAAmB,CAAC,CAAC;QAC7B;;;;;;;;WAQG;QACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAC/C,UAAU,EAAE,OAAO,CAAC;QACpB,cAAc,EAAE,OAAO,CAAC;KACzB;IACD,UAAU,iBAAiB;QACzB,SAAS,EAAE,OAAO,CAAC;KACpB;CACF;AAED,qBAEa,iBAAkB,SAAQ,iBAAiB;IACnB,SAAS,CAAC,KAAK,EAAE,MAAM;IAA+B,SAAS,CAAC,YAAY,EAAE,gBAAgB;gBAArH,UAAU,EAAE,SAAS,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAY,YAAY,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,iBAAiB;IAoB/J,OAAO,IAAI,IAAI;IAYf,SAAS,CAAC,KAAK,EAAE,MAAM;CAG/B;AAED,qBAAa,mBAAoB,YAAW,kBAAkB;IAChD,SAAS,CAAC,KAAK,EAAE,MAAM;IAAE,SAAS,CAAC,cAAc,EAAE,mBAAmB;IAAE,SAAS,CAAC,YAAY,EAAE,gBAAgB;IAAE,SAAS,CAAC,MAAM,EAAE,YAAY;gBAAtI,KAAK,EAAE,MAAM,EAAY,cAAc,EAAE,mBAAmB,EAAY,YAAY,EAAE,gBAAgB,EAAY,MAAM,EAAE,YAAY;IAErJ,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI;IAEnD,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE;IAG9B,aAAa,CAAC,CAAC,EAAE,GAAG,GAAG,SAAS;IAG1B,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA4C/D;AA8BD;;;;;;GAMG;AACH,qBACa,mBAAoB,SAAQ,eAAe;IACtD,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI;IAyCtD,kBAAkB,CAAC,QAAQ,EAAE,YAAY;CAC1C;AAED,qBACa,mBAAoB,SAAQ,iBAAiB;IAC3C,IAAI;;;CAWlB"}
|
package/lib/cjs/index.js
CHANGED
|
@@ -57,7 +57,13 @@ let IntlModelRelation = class IntlModelRelation extends orm_1.NativeOrmRelation
|
|
|
57
57
|
this._relationQuery.from('intl_resources', this.Alias);
|
|
58
58
|
}
|
|
59
59
|
compile() {
|
|
60
|
+
// guarded like every other relation: `toDB()` calls compile(), so without this a query
|
|
61
|
+
// compiled twice would register the translation middleware twice ( B19 )
|
|
62
|
+
if (this._compiled) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
60
65
|
this._query.middleware(new IntlModelMiddleware(this._lang, this._relationQuery, this._mDescriptor, this.parentRelation));
|
|
66
|
+
this._compiled = true;
|
|
61
67
|
}
|
|
62
68
|
translate(_lang) {
|
|
63
69
|
// empty, cannot translate translation relation!
|
|
@@ -87,7 +93,7 @@ class IntlModelMiddleware {
|
|
|
87
93
|
const self = this;
|
|
88
94
|
const pks = data.map((d) => {
|
|
89
95
|
// do this as one pass
|
|
90
|
-
return d[this._description.PrimaryKey];
|
|
96
|
+
return d[this._description.PrimaryKey[0]];
|
|
91
97
|
});
|
|
92
98
|
const hydrateMiddleware = {
|
|
93
99
|
afterQuery(data) {
|
|
@@ -100,7 +106,7 @@ class IntlModelMiddleware {
|
|
|
100
106
|
data.forEach((d) => {
|
|
101
107
|
let val = d;
|
|
102
108
|
const relData = relationData.filter((rd) => {
|
|
103
|
-
return rd['ResourceId'] === val[self._description.PrimaryKey];
|
|
109
|
+
return rd['ResourceId'] === val[self._description.PrimaryKey[0]];
|
|
104
110
|
});
|
|
105
111
|
relData.forEach((rd) => {
|
|
106
112
|
if (self._owner && self._owner instanceof orm_1.BelongsToRelation) {
|
package/lib/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA6E;AAC7E,sCAAiR;AAGjR,wCAAqG;AACrG,oDAAuB;AACvB,oEAA8D;AAC9D,8DAAwD;AACxD,wEAA8D;AAC9D,6CAAgD;AAEhD,kDAAgC;AAChC,8EAA4D;AAC5D,2DAAyC;AACzC,8DAA4C;AAC5C,6CAA2B;AAwBpB,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,uBAAiB;IACtD,YAAY,UAAqB,EAAY,KAAa,EAAE,MAA2B,EAAY,YAA8B,EAAE,eAAmC;QACpK,KAAK,CACH,UAAU,EACV,MAAM,EACN;YACE,WAAW,EAAE,8BAAgE;YAC7E,eAAe,EAAE,8BAAY;YAC7B,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,kBAAY,CAAC,IAAI;YACvB,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,KAAK;SACjB,EACD,eAAe,CAChB,CAAC;QAfyC,UAAK,GAAL,KAAK,CAAQ;QAAyC,iBAAY,GAAZ,YAAY,CAAkB;QAiB/H,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,cAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/model.d.ts
CHANGED
|
@@ -8,9 +8,6 @@ export declare class Translatable extends ModelBase {
|
|
|
8
8
|
*/
|
|
9
9
|
translate(lang?: string): Promise<void>;
|
|
10
10
|
setLanguage(lang: string): void;
|
|
11
|
-
update(data?: Partial<this>): Promise<
|
|
12
|
-
RowsAffected: number;
|
|
13
|
-
LastInsertId: number;
|
|
14
|
-
}>;
|
|
11
|
+
update(data?: Partial<this>): Promise<import("@spinajs/orm").IUpdateResult>;
|
|
15
12
|
}
|
|
16
13
|
//# sourceMappingURL=model.d.ts.map
|
package/lib/cjs/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,SAAS,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,SAAS,EAAW,MAAM,cAAc,CAAC;AAKnE,qBAAa,YAAa,SAAQ,SAAS;IACzC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;IACU,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IAgB7B,WAAW,CAAC,IAAI,EAAE,MAAM;IAIlB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;CAuDzC"}
|
package/lib/cjs/model.js
CHANGED
|
@@ -53,7 +53,9 @@ class Translatable extends orm_1.ModelBase {
|
|
|
53
53
|
const cToDehydrate = [...tColumns.map((c) => c.Name)];
|
|
54
54
|
const dToUpdate = lodash_1.default.omit(this.toSql(), cToDehydrate);
|
|
55
55
|
if (Object.keys(dToUpdate).length !== 0) {
|
|
56
|
-
|
|
56
|
+
const q = query.update(dToUpdate);
|
|
57
|
+
(0, orm_1.wherePk)(q, this.ModelDescriptor, this.PrimaryKeyValue);
|
|
58
|
+
await q;
|
|
57
59
|
}
|
|
58
60
|
const translations = tColumns.map((c) => {
|
|
59
61
|
return new IntlResource_js_1.IntlResource({
|
package/lib/cjs/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":";;;;;;AAAA,oCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"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"}
|
package/lib/mjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAuC,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAqD,gBAAgB,EAAE,SAAS,EAAqB,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,YAAY,EAAqB,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjR,OAAO,EAAE,iBAAiB,EAAqD,MAAM,eAAe,CAAC;AAOrG,cAAc,iBAAiB,CAAC;AAChC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC;AAE3B,OAAO,QAAQ,cAAc,CAAC;IAC5B,UAAU,mBAAmB,CAAC,CAAC;QAC7B;;;;;;;;WAQG;QACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAC/C,UAAU,EAAE,OAAO,CAAC;QACpB,cAAc,EAAE,OAAO,CAAC;KACzB;IACD,UAAU,iBAAiB;QACzB,SAAS,EAAE,OAAO,CAAC;KACpB;CACF;AAED,qBAEa,iBAAkB,SAAQ,iBAAiB;IACnB,SAAS,CAAC,KAAK,EAAE,MAAM;IAA+B,SAAS,CAAC,YAAY,EAAE,gBAAgB;gBAArH,UAAU,EAAE,SAAS,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAY,YAAY,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,iBAAiB;IAoB/J,OAAO,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAuC,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAqD,gBAAgB,EAAE,SAAS,EAAqB,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,YAAY,EAAqB,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjR,OAAO,EAAE,iBAAiB,EAAqD,MAAM,eAAe,CAAC;AAOrG,cAAc,iBAAiB,CAAC;AAChC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC;AAE3B,OAAO,QAAQ,cAAc,CAAC;IAC5B,UAAU,mBAAmB,CAAC,CAAC;QAC7B;;;;;;;;WAQG;QACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAC/C,UAAU,EAAE,OAAO,CAAC;QACpB,cAAc,EAAE,OAAO,CAAC;KACzB;IACD,UAAU,iBAAiB;QACzB,SAAS,EAAE,OAAO,CAAC;KACpB;CACF;AAED,qBAEa,iBAAkB,SAAQ,iBAAiB;IACnB,SAAS,CAAC,KAAK,EAAE,MAAM;IAA+B,SAAS,CAAC,YAAY,EAAE,gBAAgB;gBAArH,UAAU,EAAE,SAAS,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAY,YAAY,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,iBAAiB;IAoB/J,OAAO,IAAI,IAAI;IAYf,SAAS,CAAC,KAAK,EAAE,MAAM;CAG/B;AAED,qBAAa,mBAAoB,YAAW,kBAAkB;IAChD,SAAS,CAAC,KAAK,EAAE,MAAM;IAAE,SAAS,CAAC,cAAc,EAAE,mBAAmB;IAAE,SAAS,CAAC,YAAY,EAAE,gBAAgB;IAAE,SAAS,CAAC,MAAM,EAAE,YAAY;gBAAtI,KAAK,EAAE,MAAM,EAAY,cAAc,EAAE,mBAAmB,EAAY,YAAY,EAAE,gBAAgB,EAAY,MAAM,EAAE,YAAY;IAErJ,kBAAkB,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI;IAEnD,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE;IAG9B,aAAa,CAAC,CAAC,EAAE,GAAG,GAAG,SAAS;IAG1B,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA4C/D;AA8BD;;;;;;GAMG;AACH,qBACa,mBAAoB,SAAQ,eAAe;IACtD,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI;IAyCtD,kBAAkB,CAAC,QAAQ,EAAE,YAAY;CAC1C;AAED,qBACa,mBAAoB,SAAQ,iBAAiB;IAC3C,IAAI;;;CAWlB"}
|
package/lib/mjs/index.js
CHANGED
|
@@ -37,7 +37,13 @@ let IntlModelRelation = class IntlModelRelation extends NativeOrmRelation {
|
|
|
37
37
|
this._relationQuery.from('intl_resources', this.Alias);
|
|
38
38
|
}
|
|
39
39
|
compile() {
|
|
40
|
+
// guarded like every other relation: `toDB()` calls compile(), so without this a query
|
|
41
|
+
// compiled twice would register the translation middleware twice ( B19 )
|
|
42
|
+
if (this._compiled) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
40
45
|
this._query.middleware(new IntlModelMiddleware(this._lang, this._relationQuery, this._mDescriptor, this.parentRelation));
|
|
46
|
+
this._compiled = true;
|
|
41
47
|
}
|
|
42
48
|
translate(_lang) {
|
|
43
49
|
// empty, cannot translate translation relation!
|
|
@@ -67,7 +73,7 @@ export class IntlModelMiddleware {
|
|
|
67
73
|
const self = this;
|
|
68
74
|
const pks = data.map((d) => {
|
|
69
75
|
// do this as one pass
|
|
70
|
-
return d[this._description.PrimaryKey];
|
|
76
|
+
return d[this._description.PrimaryKey[0]];
|
|
71
77
|
});
|
|
72
78
|
const hydrateMiddleware = {
|
|
73
79
|
afterQuery(data) {
|
|
@@ -80,7 +86,7 @@ export class IntlModelMiddleware {
|
|
|
80
86
|
data.forEach((d) => {
|
|
81
87
|
let val = d;
|
|
82
88
|
const relData = relationData.filter((rd) => {
|
|
83
|
-
return rd['ResourceId'] === val[self._description.PrimaryKey];
|
|
89
|
+
return rd['ResourceId'] === val[self._description.PrimaryKey[0]];
|
|
84
90
|
});
|
|
85
91
|
relData.forEach((rd) => {
|
|
86
92
|
if (self._owner && self._owner instanceof BelongsToRelation) {
|
package/lib/mjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC7E,OAAO,EAAE,kBAAkB,IAAI,GAAG,EAAE,sBAAsB,EAA+B,GAAG,EAAE,YAAY,EAAoC,eAAe,EAAoC,iBAAiB,EAAuB,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjR,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAqB,MAAM,eAAe,CAAC;AACrG,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,cAAc,iBAAiB,CAAC;AAChC,cAAc,6CAA6C,CAAC;AAC5D,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC;AAwBpB,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,iBAAiB;IACtD,YAAY,UAAqB,EAAY,KAAa,EAAE,MAA2B,EAAY,YAA8B,EAAE,eAAmC;QACpK,KAAK,CACH,UAAU,EACV,MAAM,EACN;YACE,WAAW,EAAE,YAAgE;YAC7E,eAAe,EAAE,YAAY;YAC7B,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,KAAK;SACjB,EACD,eAAe,CAChB,CAAC;QAfyC,UAAK,GAAL,KAAK,CAAQ;QAAyC,iBAAY,GAAZ,YAAY,CAAkB;QAiB/H,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,cAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/mjs/model.d.ts
CHANGED
|
@@ -8,9 +8,6 @@ export declare class Translatable extends ModelBase {
|
|
|
8
8
|
*/
|
|
9
9
|
translate(lang?: string): Promise<void>;
|
|
10
10
|
setLanguage(lang: string): void;
|
|
11
|
-
update(data?: Partial<this>): Promise<
|
|
12
|
-
RowsAffected: number;
|
|
13
|
-
LastInsertId: number;
|
|
14
|
-
}>;
|
|
11
|
+
update(data?: Partial<this>): Promise<import("@spinajs/orm").IUpdateResult>;
|
|
15
12
|
}
|
|
16
13
|
//# sourceMappingURL=model.d.ts.map
|
package/lib/mjs/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,SAAS,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,SAAS,EAAW,MAAM,cAAc,CAAC;AAKnE,qBAAa,YAAa,SAAQ,SAAS;IACzC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B;;;;OAIG;IACU,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM;IAgB7B,WAAW,CAAC,IAAI,EAAE,MAAM;IAIlB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;CAuDzC"}
|
package/lib/mjs/model.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DI } from '@spinajs/di';
|
|
2
|
-
import { InsertBehaviour, ModelBase } from '@spinajs/orm';
|
|
2
|
+
import { InsertBehaviour, ModelBase, wherePk } from '@spinajs/orm';
|
|
3
3
|
import _ from 'lodash';
|
|
4
4
|
import { IntlResource } from './models/IntlResource.js';
|
|
5
5
|
import { Configuration } from '@spinajs/configuration-common';
|
|
@@ -47,7 +47,9 @@ export class Translatable extends ModelBase {
|
|
|
47
47
|
const cToDehydrate = [...tColumns.map((c) => c.Name)];
|
|
48
48
|
const dToUpdate = _.omit(this.toSql(), cToDehydrate);
|
|
49
49
|
if (Object.keys(dToUpdate).length !== 0) {
|
|
50
|
-
|
|
50
|
+
const q = query.update(dToUpdate);
|
|
51
|
+
wherePk(q, this.ModelDescriptor, this.PrimaryKeyValue);
|
|
52
|
+
await q;
|
|
51
53
|
}
|
|
52
54
|
const translations = tColumns.map((c) => {
|
|
53
55
|
return new IntlResource({
|
package/lib/mjs/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"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"}
|