sonamu 0.2.19 → 0.2.20
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.
|
@@ -11,7 +11,7 @@ export declare class BaseModelClass {
|
|
|
11
11
|
getInsertedIds(wdb: Knex, rows: any[], tableName: string, unqKeyFields: string[], chunkSize?: number): Promise<number[]>;
|
|
12
12
|
useLoaders(db: Knex, rows: any[], loaders: SubsetQuery["loaders"]): Promise<any[]>;
|
|
13
13
|
hydrate<T>(rows: T[]): T[];
|
|
14
|
-
runSubsetQuery<T extends BaseListParams, U extends string>({ params, baseTable, subset, subsetQuery, build, debug, }: {
|
|
14
|
+
runSubsetQuery<T extends BaseListParams, U extends string>({ params, baseTable, subset, subsetQuery, build, debug, db: _db, }: {
|
|
15
15
|
subset: U;
|
|
16
16
|
params: T;
|
|
17
17
|
subsetQuery: SubsetQuery;
|
|
@@ -24,6 +24,7 @@ export declare class BaseModelClass {
|
|
|
24
24
|
}) => Knex.QueryBuilder;
|
|
25
25
|
baseTable?: string;
|
|
26
26
|
debug?: boolean | "list" | "count";
|
|
27
|
+
db?: Knex;
|
|
27
28
|
}): Promise<{
|
|
28
29
|
rows: any[];
|
|
29
30
|
total?: number | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-model.d.ts","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,QAAQ,EAAM,MAAM,MAAM,CAAC;AACpC,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,cAAc;IAClB,SAAS,EAAE,MAAM,CAAa;IAGrC,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAGtB,OAAO;IAIb,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAQ3B,cAAc,CAClB,GAAG,EAAE,IAAI,EACT,IAAI,EAAE,GAAG,EAAE,EACX,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,GAAE,MAAY;IAkCnB,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC;IAiFvE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;IAuCpB,cAAc,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,MAAM,EAAE,EAC/D,MAAM,EACN,SAAS,EACT,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,
|
|
1
|
+
{"version":3,"file":"base-model.d.ts","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,QAAQ,EAAM,MAAM,MAAM,CAAC;AACpC,OAAO,EAAsB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBAAa,cAAc;IAClB,SAAS,EAAE,MAAM,CAAa;IAGrC,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAGtB,OAAO;IAIb,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAQ3B,cAAc,CAClB,GAAG,EAAE,IAAI,EACT,IAAI,EAAE,GAAG,EAAE,EACX,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,GAAE,MAAY;IAkCnB,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC;IAiFvE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;IAuCpB,cAAc,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,MAAM,EAAE,EAC/D,MAAM,EACN,SAAS,EACT,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,EACL,EAAE,EAAE,GAAG,GACR,EAAE;QACD,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,CAAC,WAAW,EAAE;YACnB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC;YACtB,EAAE,EAAE,IAAI,CAAC;YACT,MAAM,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;SACnB,KAAK,IAAI,CAAC,YAAY,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;QACnC,EAAE,CAAC,EAAE,IAAI,CAAC;KACX,GAAG,OAAO,CAAC;QACV,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,WAAW,EAAE,WAAW,CAAC;QACzB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC;KACvB,CAAC;IA6FF,aAAa,CACX,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,EACtB,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAQhB,gBAAgB,IAAI,aAAa;CAGlC;AACD,eAAO,MAAM,SAAS,gBAAuB,CAAC"}
|
|
@@ -161,10 +161,10 @@ class BaseModelClass {
|
|
|
161
161
|
return hydrated;
|
|
162
162
|
});
|
|
163
163
|
}
|
|
164
|
-
runSubsetQuery({ params, baseTable, subset, subsetQuery, build, debug, }) {
|
|
164
|
+
runSubsetQuery({ params, baseTable, subset, subsetQuery, build, debug, db: _db, }) {
|
|
165
165
|
var _a;
|
|
166
166
|
return __awaiter(this, void 0, void 0, function* () {
|
|
167
|
-
const db = this.getDB(subset.startsWith("A") ? "w" : "r");
|
|
167
|
+
const db = _db !== null && _db !== void 0 ? _db : this.getDB(subset.startsWith("A") ? "w" : "r");
|
|
168
168
|
baseTable = baseTable !== null && baseTable !== void 0 ? baseTable : (0, inflection_1.pluralize)((0, inflection_1.underscore)(this.modelName));
|
|
169
169
|
const queryMode = (_a = params.queryMode) !== null && _a !== void 0 ? _a : (params.id !== undefined ? "list" : "both");
|
|
170
170
|
const { select, virtual, joins, loaders } = subsetQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iCAAiC;AAEjC,mCAAmE;AACnE,sFAAkF;AAClF,IAAA,kDAAuB,GAAE,CAAC;AAC1B,6BAAoC;AACpC,0CAAiE;AAEjE,2CAAmD;AACnD,kDAA0B;AAC1B,qDAAiD;AAEjD,MAAa,cAAc;IAA3B;QACS,cAAS,GAAW,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"base-model.js","sourceRoot":"","sources":["../../src/database/base-model.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -195,6 +195,7 @@ export class BaseModelClass {
|
|
|
195
195
|
subsetQuery,
|
|
196
196
|
build,
|
|
197
197
|
debug,
|
|
198
|
+
db: _db,
|
|
198
199
|
}: {
|
|
199
200
|
subset: U;
|
|
200
201
|
params: T;
|
|
@@ -208,13 +209,14 @@ export class BaseModelClass {
|
|
|
208
209
|
}) => Knex.QueryBuilder;
|
|
209
210
|
baseTable?: string;
|
|
210
211
|
debug?: boolean | "list" | "count";
|
|
212
|
+
db?: Knex;
|
|
211
213
|
}): Promise<{
|
|
212
214
|
rows: any[];
|
|
213
215
|
total?: number | undefined;
|
|
214
216
|
subsetQuery: SubsetQuery;
|
|
215
217
|
qb: Knex.QueryBuilder;
|
|
216
218
|
}> {
|
|
217
|
-
const db = this.getDB(subset.startsWith("A") ? "w" : "r");
|
|
219
|
+
const db = _db ?? this.getDB(subset.startsWith("A") ? "w" : "r");
|
|
218
220
|
baseTable = baseTable ?? pluralize(underscore(this.modelName));
|
|
219
221
|
const queryMode =
|
|
220
222
|
params.queryMode ?? (params.id !== undefined ? "list" : "both");
|