@point-hub/papi 0.5.33 → 0.5.36
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.js +47 -13
- package/lib/src/database/mongodb/connection.d.ts.map +1 -1
- package/lib/src/database/mongodb/mongodb-helper.d.ts +2 -0
- package/lib/src/database/mongodb/mongodb-helper.d.ts.map +1 -1
- package/lib/stub/middleware/configurable.middleware.d.ts.map +1 -1
- package/package.json +1 -1
- package/stub/middleware/configurable.middleware.ts +0 -1
package/lib/index.js
CHANGED
|
@@ -69584,27 +69584,53 @@ class MongoDBHelper {
|
|
|
69584
69584
|
});
|
|
69585
69585
|
}
|
|
69586
69586
|
static stringToObjectId(input) {
|
|
69587
|
+
if (!isPlainObject(input)) {
|
|
69588
|
+
return MongoDBHelper.convertToObjectId(input);
|
|
69589
|
+
}
|
|
69590
|
+
const expanded = MongoDBHelper.expandDottedObject(input);
|
|
69591
|
+
return MongoDBHelper.convertToObjectId(expanded);
|
|
69592
|
+
}
|
|
69593
|
+
static expandDottedObject(obj) {
|
|
69594
|
+
let result = {};
|
|
69595
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
69596
|
+
if (key.startsWith("filter.") && key.includes(".")) {
|
|
69597
|
+
const rest = key.substring("filter.".length);
|
|
69598
|
+
const fragment = {
|
|
69599
|
+
filter: {
|
|
69600
|
+
[rest]: value
|
|
69601
|
+
}
|
|
69602
|
+
};
|
|
69603
|
+
result = deepMerge(result, fragment);
|
|
69604
|
+
continue;
|
|
69605
|
+
}
|
|
69606
|
+
if (key.includes(".")) {
|
|
69607
|
+
const fragment = expandDottedKey(key, value);
|
|
69608
|
+
result = deepMerge(result, fragment);
|
|
69609
|
+
continue;
|
|
69610
|
+
}
|
|
69611
|
+
result[key] = value;
|
|
69612
|
+
}
|
|
69613
|
+
return result;
|
|
69614
|
+
}
|
|
69615
|
+
static convertToObjectId(input) {
|
|
69587
69616
|
if (input === null || input === undefined)
|
|
69588
69617
|
return input;
|
|
69618
|
+
if (input instanceof import_mongodb.ObjectId)
|
|
69619
|
+
return input;
|
|
69589
69620
|
if (input instanceof Date)
|
|
69590
69621
|
return input;
|
|
69591
69622
|
if (typeof input !== "object") {
|
|
69592
69623
|
return convertPrimitive(input);
|
|
69593
69624
|
}
|
|
69594
69625
|
if (Array.isArray(input)) {
|
|
69595
|
-
return input.map((item) => MongoDBHelper.
|
|
69626
|
+
return input.map((item) => MongoDBHelper.convertToObjectId(item));
|
|
69596
69627
|
}
|
|
69597
69628
|
if (isPlainObject(input)) {
|
|
69598
|
-
|
|
69629
|
+
const out = {};
|
|
69599
69630
|
for (const [key, value] of Object.entries(input)) {
|
|
69600
|
-
|
|
69601
|
-
expanded = deepMerge(expanded, fragment);
|
|
69602
|
-
}
|
|
69603
|
-
const output = {};
|
|
69604
|
-
for (const [key, value] of Object.entries(expanded)) {
|
|
69605
|
-
output[key] = MongoDBHelper.stringToObjectId(value);
|
|
69631
|
+
out[key] = MongoDBHelper.convertToObjectId(value);
|
|
69606
69632
|
}
|
|
69607
|
-
return
|
|
69633
|
+
return out;
|
|
69608
69634
|
}
|
|
69609
69635
|
return input;
|
|
69610
69636
|
}
|
|
@@ -69905,7 +69931,9 @@ class MongoDBConnection {
|
|
|
69905
69931
|
throw new Error("Collection not found");
|
|
69906
69932
|
}
|
|
69907
69933
|
const retrieveOptions = options;
|
|
69908
|
-
const
|
|
69934
|
+
const transformedQuery = MongoDBHelper.stringToObjectId(query);
|
|
69935
|
+
const filter2 = transformedQuery?.filter ?? {};
|
|
69936
|
+
const cursor = this._collection.find(filter2, retrieveOptions).limit(mongodb_querystring_default.limit(query.page_size)).skip(mongodb_querystring_default.skip(mongodb_querystring_default.page(query.page), mongodb_querystring_default.limit(query.page_size)));
|
|
69909
69937
|
const sort2 = mongodb_querystring_default.sort(query.sort ?? "");
|
|
69910
69938
|
if (!isEmpty(sort2)) {
|
|
69911
69939
|
cursor.sort(sort2);
|
|
@@ -69914,8 +69942,8 @@ class MongoDBConnection {
|
|
|
69914
69942
|
if (!isEmpty(fields2)) {
|
|
69915
69943
|
cursor.project(fields2);
|
|
69916
69944
|
}
|
|
69945
|
+
const totalDocument = await this._collection.countDocuments(filter2);
|
|
69917
69946
|
const result = await cursor.toArray();
|
|
69918
|
-
const totalDocument = await this._collection.countDocuments(query.filter ?? {}, retrieveOptions);
|
|
69919
69947
|
return {
|
|
69920
69948
|
data: MongoDBHelper.objectIdToString(result),
|
|
69921
69949
|
pagination: {
|
|
@@ -69994,6 +70022,12 @@ class MongoDBConnection {
|
|
|
69994
70022
|
if (!this._collection) {
|
|
69995
70023
|
throw new Error("Collection not found");
|
|
69996
70024
|
}
|
|
70025
|
+
const transformedQuery = MongoDBHelper.stringToObjectId(query);
|
|
70026
|
+
if (transformedQuery?.filter) {
|
|
70027
|
+
pipeline.unshift({
|
|
70028
|
+
$match: transformedQuery.filter
|
|
70029
|
+
});
|
|
70030
|
+
}
|
|
69997
70031
|
const aggregateOptions = options;
|
|
69998
70032
|
const convertedPipeline = MongoDBHelper.stringToObjectId(pipeline);
|
|
69999
70033
|
const sort2 = mongodb_querystring_default.sort(query?.sort ?? "");
|
|
@@ -70014,14 +70048,14 @@ class MongoDBConnection {
|
|
|
70014
70048
|
],
|
|
70015
70049
|
total_document: [
|
|
70016
70050
|
{
|
|
70017
|
-
$count: "
|
|
70051
|
+
$count: "count"
|
|
70018
70052
|
}
|
|
70019
70053
|
]
|
|
70020
70054
|
}
|
|
70021
70055
|
}
|
|
70022
70056
|
], aggregateOptions);
|
|
70023
70057
|
const result = await cursor.toArray();
|
|
70024
|
-
const totalDocument = result[0]?.total_document[0]?.
|
|
70058
|
+
const totalDocument = result[0]?.total_document[0]?.count ?? 0;
|
|
70025
70059
|
return {
|
|
70026
70060
|
data: MongoDBHelper.objectIdToString(result[0].paginated_result),
|
|
70027
70061
|
pagination: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/database/mongodb/connection.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAGV,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,oBAAoB,EACpB,EAAE,EACF,SAAS,EAGT,kBAAkB,EAKnB,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,WAAW,EAAY,MAAM,SAAS,CAAA;AAE/C,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,SAAS,EACT,MAAM,EACN,kBAAkB,EAClB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACd,MAAM,aAAa,CAAA;AAIpB,qBAAa,iBAAkB,YAAW,SAAS;IAQxC,YAAY,EAAE,MAAM;IAPtB,MAAM,EAAE,WAAW,CAAA;IACnB,SAAS,EAAE,EAAE,GAAG,SAAS,CAAA;IACzB,WAAW,EAAE,UAAU,GAAG,SAAS,CAAA;IACnC,OAAO,EAAE,aAAa,GAAG,SAAS,CAAA;gBAGvC,gBAAgB,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM;IAWhB,IAAI;IAIJ,KAAK;IAIX,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS;IAK1C,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAS9C,eAAe,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAQ9C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1D,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/D,YAAY;IAKN,UAAU;IAIhB,gBAAgB;IAIV,iBAAiB;IAIjB,gBAAgB;IAIhB,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;IAQlE,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAetE,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAsBjF,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/database/mongodb/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,8 @@ export declare class MongoDBHelper {
|
|
|
37
37
|
isExists(name: string): Promise<boolean>;
|
|
38
38
|
static stringToObjectId(ids: string[]): ObjectId[];
|
|
39
39
|
static stringToObjectId<T>(input: T): T;
|
|
40
|
+
static expandDottedObject(obj: Record<string, unknown>): Record<string, unknown>;
|
|
41
|
+
static convertToObjectId(input: unknown): unknown;
|
|
40
42
|
/**
|
|
41
43
|
* Recursively converts all ObjectId instances within a structure to strings.
|
|
42
44
|
* @param value The input data structure.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodb-helper.d.ts","sourceRoot":"","sources":["../../../../src/database/mongodb/mongodb-helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,GACzC,MAAM,GACN,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GACrB,gBAAgB,CAAC,CAAC,CAAC,EAAE,GACrB,CAAC,SAAS,IAAI,GACd,CAAC,GACD,CAAC,SAAS,MAAM,GAChB;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GAC1C,CAAC,CAAC;AA+DN;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,EAAE,CAAA;gBAEE,EAAE,EAAE,SAAS;IAIzB;;;;;;;;;;;;;;;OAeG;IACU,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAUhE;;OAEG;IACU,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAW5D,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,kBAAkB,EACxB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIH,QAAQ,CAAC,IAAI,EAAE,MAAM;WAOpB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE;WAC3C,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"mongodb-helper.d.ts","sourceRoot":"","sources":["../../../../src/database/mongodb/mongodb-helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,GACzC,MAAM,GACN,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,GACrB,gBAAgB,CAAC,CAAC,CAAC,EAAE,GACrB,CAAC,SAAS,IAAI,GACd,CAAC,GACD,CAAC,SAAS,MAAM,GAChB;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GAC1C,CAAC,CAAC;AA+DN;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,EAAE,CAAA;gBAEE,EAAE,EAAE,SAAS;IAIzB;;;;;;;;;;;;;;;OAeG;IACU,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAUhE;;OAEG;IACU,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAW5D,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,kBAAkB,EACxB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIH,QAAQ,CAAC,IAAI,EAAE,MAAM;WAOpB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE;WAC3C,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC;WAchC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;WA6BzE,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IA0BxD;;;;OAIG;WACW,gBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC;IA4ChE;;;;;;;;OAQG;WACW,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IA+C/E;;;;OAIG;WACW,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAmBjG;;;;OAIG;IACH,OAAc,cAAc,GAAI,UAAU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;KAAE,CAyD5H;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurable.middleware.d.ts","sourceRoot":"","sources":["../../../stub/middleware/configurable.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEzD,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,IACjC,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"configurable.middleware.d.ts","sourceRoot":"","sources":["../../../stub/middleware/configurable.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEzD,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,IACjC,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UAGjE"}
|
package/package.json
CHANGED