proto.io 0.0.205 → 0.0.207
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/dist/adapters/file/aliyun-oss.d.ts +3 -3
- package/dist/adapters/file/database.d.ts +2 -2
- package/dist/adapters/file/database.js +2 -2
- package/dist/adapters/file/database.js.map +1 -1
- package/dist/adapters/file/database.mjs +2 -2
- package/dist/adapters/file/database.mjs.map +1 -1
- package/dist/adapters/file/filesystem.d.ts +3 -3
- package/dist/adapters/file/google-cloud-storage.d.ts +3 -3
- package/dist/adapters/storage/progres.d.ts +9 -20
- package/dist/adapters/storage/progres.js +28 -109
- package/dist/adapters/storage/progres.js.map +1 -1
- package/dist/adapters/storage/progres.mjs +28 -109
- package/dist/adapters/storage/progres.mjs.map +1 -1
- package/dist/client.d.ts +3 -3
- package/dist/client.js +2 -1
- package/dist/client.js.map +1 -1
- package/dist/client.mjs +3 -2
- package/dist/client.mjs.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.js +45 -109
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +46 -110
- package/dist/index.mjs.map +1 -1
- package/dist/internals/{base-Cf7WkDhO.d.ts → base-DHkvlTFy.d.ts} +2 -2
- package/dist/internals/base-DHkvlTFy.d.ts.map +1 -0
- package/dist/internals/{chunk-ONaLyXL0.d.ts → chunk-C7kDLOLD.d.ts} +3 -3
- package/dist/internals/chunk-C7kDLOLD.d.ts.map +1 -0
- package/dist/internals/{index-DByHjIHI.js → index-BRzKDwPs.js} +64 -22
- package/dist/internals/index-BRzKDwPs.js.map +1 -0
- package/dist/internals/{index-DI-jPA6f.d.ts → index-CKcESGqE.d.ts} +3 -3
- package/dist/internals/index-CKcESGqE.d.ts.map +1 -0
- package/dist/internals/{index-C4vwSN74.js → index-CkAvNaAe.js} +240 -1
- package/dist/internals/index-CkAvNaAe.js.map +1 -0
- package/dist/internals/{index-DtCgllhg.mjs → index-DAkcqabS.mjs} +64 -22
- package/dist/internals/index-DAkcqabS.mjs.map +1 -0
- package/dist/internals/{index-Blw7vAq5.mjs → index-DlY33lfO.mjs} +240 -1
- package/dist/internals/index-DlY33lfO.mjs.map +1 -0
- package/dist/internals/{index-JdEs5VLY.d.ts → index-PLz89AWF.d.ts} +23 -31
- package/dist/internals/index-PLz89AWF.d.ts.map +1 -0
- package/dist/internals/{random-Dk3OhDNU.js → random-B0V0EnjP.js} +2 -2
- package/dist/internals/random-B0V0EnjP.js.map +1 -0
- package/dist/internals/{random-6nHcBOxn.mjs → random-ZgzzM5v_.mjs} +2 -2
- package/dist/internals/random-ZgzzM5v_.mjs.map +1 -0
- package/package.json +1 -1
- package/dist/internals/base-Cf7WkDhO.d.ts.map +0 -1
- package/dist/internals/chunk-ONaLyXL0.d.ts.map +0 -1
- package/dist/internals/index-Blw7vAq5.mjs.map +0 -1
- package/dist/internals/index-C4vwSN74.js.map +0 -1
- package/dist/internals/index-DByHjIHI.js.map +0 -1
- package/dist/internals/index-DI-jPA6f.d.ts.map +0 -1
- package/dist/internals/index-DtCgllhg.mjs.map +0 -1
- package/dist/internals/index-JdEs5VLY.d.ts.map +0 -1
- package/dist/internals/random-6nHcBOxn.mjs.map +0 -1
- package/dist/internals/random-Dk3OhDNU.js.map +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { P as ProtoService } from '../../internals/index-
|
|
1
|
+
import { P as ProtoService } from '../../internals/index-PLz89AWF.js';
|
|
2
2
|
import OSS from 'ali-oss';
|
|
3
|
-
import { a as FileStorageOptions } from '../../internals/base-
|
|
4
|
-
import { F as FileChunkStorageBase } from '../../internals/chunk-
|
|
3
|
+
import { a as FileStorageOptions } from '../../internals/base-DHkvlTFy.js';
|
|
4
|
+
import { F as FileChunkStorageBase } from '../../internals/chunk-C7kDLOLD.js';
|
|
5
5
|
import '@o2ter/utils-js';
|
|
6
6
|
import 'jsonwebtoken';
|
|
7
7
|
import '@o2ter/server-js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { T as TSchema, P as ProtoService } from '../../internals/index-
|
|
2
|
-
import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-
|
|
1
|
+
import { T as TSchema, P as ProtoService } from '../../internals/index-PLz89AWF.js';
|
|
2
|
+
import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-DHkvlTFy.js';
|
|
3
3
|
import '@o2ter/utils-js';
|
|
4
4
|
import 'jsonwebtoken';
|
|
5
5
|
import '@o2ter/server-js';
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var _ = require('lodash');
|
|
6
6
|
var base = require('../../internals/base-BFKQpiws.js');
|
|
7
|
-
var index = require('../../internals/index-
|
|
7
|
+
var index = require('../../internals/index-CkAvNaAe.js');
|
|
8
8
|
var utilsJs = require('@o2ter/utils-js');
|
|
9
9
|
require('util');
|
|
10
10
|
require('zlib');
|
|
@@ -99,7 +99,7 @@ class DatabaseFileStorage extends base.FileStorageBase {
|
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
async destroy(proto, token) {
|
|
102
|
-
proto.storage.
|
|
102
|
+
proto.storage.delete({
|
|
103
103
|
className: '_FileChunk',
|
|
104
104
|
filter: index.QuerySelector.decode({ token: { $eq: token } }),
|
|
105
105
|
includes: ['_id'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n// index.ts\n//\n// The MIT License\n// Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n constructor(options: FileStorageOptions = {}) {\n super(options);\n }\n\n get schema(): Record<string, TSchema> {\n return {\n '_FileChunk': {\n fields: {\n token: 'string',\n start: 'number',\n end: 'number',\n size: 'number',\n base64: 'string',\n },\n classLevelPermissions: {\n get: [],\n find: [],\n count: [],\n create: [],\n update: [],\n delete: [],\n },\n fieldLevelPermissions: {\n _expired_at: { create: [], update: [] },\n },\n indexes: [\n { keys: { token: 1, start: 1, end: 1 } },\n { keys: { token: 1, end: 1 } },\n ]\n },\n }\n }\n\n async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n const created = await proto.Query('_FileChunk').insert({\n token,\n start: start,\n end: end,\n size: end - start,\n base64: bufferToBase64(compressed),\n }, { master: true });\n\n if (!created) throw Error('Unable to save file');\n\n }\n\n async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n const query = proto.Query('_FileChunk')\n .sort({ start: 1 })\n .filter({\n token: { $eq: token },\n ...start ? { end: { $gt: start } } : {},\n ...end ? { start: { $lt: end } } : {},\n });\n for await (const chunk of query.find({ master: true })) {\n const startBytes = chunk.get('start');\n const base64 = chunk.get('base64');\n if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n yield {\n start: startBytes,\n data: base64ToBuffer(base64),\n };\n }\n }\n\n async destroy<E>(proto: ProtoService<E>, token: string) {\n proto.storage.
|
|
1
|
+
{"version":3,"file":"database.js","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n// index.ts\n//\n// The MIT License\n// Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n constructor(options: FileStorageOptions = {}) {\n super(options);\n }\n\n get schema(): Record<string, TSchema> {\n return {\n '_FileChunk': {\n fields: {\n token: 'string',\n start: 'number',\n end: 'number',\n size: 'number',\n base64: 'string',\n },\n classLevelPermissions: {\n get: [],\n find: [],\n count: [],\n create: [],\n update: [],\n delete: [],\n },\n fieldLevelPermissions: {\n _expired_at: { create: [], update: [] },\n },\n indexes: [\n { keys: { token: 1, start: 1, end: 1 } },\n { keys: { token: 1, end: 1 } },\n ]\n },\n }\n }\n\n async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n const created = await proto.Query('_FileChunk').insert({\n token,\n start: start,\n end: end,\n size: end - start,\n base64: bufferToBase64(compressed),\n }, { master: true });\n\n if (!created) throw Error('Unable to save file');\n\n }\n\n async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n const query = proto.Query('_FileChunk')\n .sort({ start: 1 })\n .filter({\n token: { $eq: token },\n ...start ? { end: { $gt: start } } : {},\n ...end ? { start: { $lt: end } } : {},\n });\n for await (const chunk of query.find({ master: true })) {\n const startBytes = chunk.get('start');\n const base64 = chunk.get('base64');\n if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n yield {\n start: startBytes,\n data: base64ToBuffer(base64),\n };\n }\n }\n\n async destroy<E>(proto: ProtoService<E>, token: string) {\n proto.storage.delete({\n className: '_FileChunk',\n filter: QuerySelector.decode({ token: { $eq: token } }),\n includes: ['_id'],\n matches: {},\n countMatches: [],\n objectIdSize: 0\n });\n }\n};\n\nexport default DatabaseFileStorage;"],"names":["FileStorageBase","bufferToBase64","base64ToBuffer","QuerySelector"],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
2
|
import { F as FileStorageBase } from '../../internals/base-CfQi0T0I.mjs';
|
|
3
|
-
import { Q as QuerySelector } from '../../internals/index-
|
|
3
|
+
import { Q as QuerySelector } from '../../internals/index-DlY33lfO.mjs';
|
|
4
4
|
import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
|
|
5
5
|
import 'util';
|
|
6
6
|
import 'zlib';
|
|
@@ -95,7 +95,7 @@ class DatabaseFileStorage extends FileStorageBase {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
async destroy(proto, token) {
|
|
98
|
-
proto.storage.
|
|
98
|
+
proto.storage.delete({
|
|
99
99
|
className: '_FileChunk',
|
|
100
100
|
filter: QuerySelector.decode({ token: { $eq: token } }),
|
|
101
101
|
includes: ['_id'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.mjs","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n// index.ts\n//\n// The MIT License\n// Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n constructor(options: FileStorageOptions = {}) {\n super(options);\n }\n\n get schema(): Record<string, TSchema> {\n return {\n '_FileChunk': {\n fields: {\n token: 'string',\n start: 'number',\n end: 'number',\n size: 'number',\n base64: 'string',\n },\n classLevelPermissions: {\n get: [],\n find: [],\n count: [],\n create: [],\n update: [],\n delete: [],\n },\n fieldLevelPermissions: {\n _expired_at: { create: [], update: [] },\n },\n indexes: [\n { keys: { token: 1, start: 1, end: 1 } },\n { keys: { token: 1, end: 1 } },\n ]\n },\n }\n }\n\n async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n const created = await proto.Query('_FileChunk').insert({\n token,\n start: start,\n end: end,\n size: end - start,\n base64: bufferToBase64(compressed),\n }, { master: true });\n\n if (!created) throw Error('Unable to save file');\n\n }\n\n async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n const query = proto.Query('_FileChunk')\n .sort({ start: 1 })\n .filter({\n token: { $eq: token },\n ...start ? { end: { $gt: start } } : {},\n ...end ? { start: { $lt: end } } : {},\n });\n for await (const chunk of query.find({ master: true })) {\n const startBytes = chunk.get('start');\n const base64 = chunk.get('base64');\n if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n yield {\n start: startBytes,\n data: base64ToBuffer(base64),\n };\n }\n }\n\n async destroy<E>(proto: ProtoService<E>, token: string) {\n proto.storage.
|
|
1
|
+
{"version":3,"file":"database.mjs","sources":["../../../../src/adapters/file/database/index.ts"],"sourcesContent":["//\n// index.ts\n//\n// The MIT License\n// Copyright (c) 2021 - 2025 O2ter Limited. All rights reserved.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n//\n\nimport _ from 'lodash';\nimport { ProtoService } from '../../../server/proto';\nimport { TSchema } from '../../../internals/schema';\nimport FileStorageBase, { FileStorageOptions } from '../base';\nimport { QuerySelector } from '../../../server/query/dispatcher/parser';\nimport { base64ToBuffer, bufferToBase64 } from '@o2ter/utils-js';\n\nexport class DatabaseFileStorage extends FileStorageBase {\n\n constructor(options: FileStorageOptions = {}) {\n super(options);\n }\n\n get schema(): Record<string, TSchema> {\n return {\n '_FileChunk': {\n fields: {\n token: 'string',\n start: 'number',\n end: 'number',\n size: 'number',\n base64: 'string',\n },\n classLevelPermissions: {\n get: [],\n find: [],\n count: [],\n create: [],\n update: [],\n delete: [],\n },\n fieldLevelPermissions: {\n _expired_at: { create: [], update: [] },\n },\n indexes: [\n { keys: { token: 1, start: 1, end: 1 } },\n { keys: { token: 1, end: 1 } },\n ]\n },\n }\n }\n\n async createChunk<E>(proto: ProtoService<E>, token: string, start: number, end: number, compressed: Buffer) {\n\n const created = await proto.Query('_FileChunk').insert({\n token,\n start: start,\n end: end,\n size: end - start,\n base64: bufferToBase64(compressed),\n }, { master: true });\n\n if (!created) throw Error('Unable to save file');\n\n }\n\n async* readChunks<E>(proto: ProtoService<E>, token: string, start?: number | undefined, end?: number | undefined) {\n const query = proto.Query('_FileChunk')\n .sort({ start: 1 })\n .filter({\n token: { $eq: token },\n ...start ? { end: { $gt: start } } : {},\n ...end ? { start: { $lt: end } } : {},\n });\n for await (const chunk of query.find({ master: true })) {\n const startBytes = chunk.get('start');\n const base64 = chunk.get('base64');\n if (!_.isNumber(startBytes) || !_.isString(base64)) throw Error('Corrupted data');\n yield {\n start: startBytes,\n data: base64ToBuffer(base64),\n };\n }\n }\n\n async destroy<E>(proto: ProtoService<E>, token: string) {\n proto.storage.delete({\n className: '_FileChunk',\n filter: QuerySelector.decode({ token: { $eq: token } }),\n includes: ['_id'],\n matches: {},\n countMatches: [],\n objectIdSize: 0\n });\n }\n};\n\nexport default DatabaseFileStorage;"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { P as ProtoService } from '../../internals/index-
|
|
2
|
-
import { a as FileStorageOptions } from '../../internals/base-
|
|
3
|
-
import { F as FileChunkStorageBase } from '../../internals/chunk-
|
|
1
|
+
import { P as ProtoService } from '../../internals/index-PLz89AWF.js';
|
|
2
|
+
import { a as FileStorageOptions } from '../../internals/base-DHkvlTFy.js';
|
|
3
|
+
import { F as FileChunkStorageBase } from '../../internals/chunk-C7kDLOLD.js';
|
|
4
4
|
import '@o2ter/utils-js';
|
|
5
5
|
import 'jsonwebtoken';
|
|
6
6
|
import '@o2ter/server-js';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as _google_cloud_storage from '@google-cloud/storage';
|
|
2
2
|
import { File, Storage } from '@google-cloud/storage';
|
|
3
|
-
import { P as ProtoService } from '../../internals/index-
|
|
4
|
-
import { a as FileStorageOptions } from '../../internals/base-
|
|
5
|
-
import { F as FileChunkStorageBase } from '../../internals/chunk-
|
|
3
|
+
import { P as ProtoService } from '../../internals/index-PLz89AWF.js';
|
|
4
|
+
import { a as FileStorageOptions } from '../../internals/base-DHkvlTFy.js';
|
|
5
|
+
import { F as FileChunkStorageBase } from '../../internals/chunk-C7kDLOLD.js';
|
|
6
6
|
import '@o2ter/utils-js';
|
|
7
7
|
import 'jsonwebtoken';
|
|
8
8
|
import '@o2ter/server-js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Pool, PoolClient, PoolConfig } from 'pg';
|
|
2
|
-
import { a as TValueWithoutObject, T as TSchema,
|
|
2
|
+
import { a as TValueWithoutObject, T as TSchema, u as TValueWithUndefined, v as TValue, w as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, x as QuerySelector, y as DecodedSortOption, z as DecodedQuery, A as FindOptions, I as InsertOptions, B as TStorage, C as TransactionOptions, j as TObject, G as TQueryRandomOptions, H as TPubSub } from '../../internals/index-PLz89AWF.js';
|
|
3
3
|
import * as _o2ter_utils_js from '@o2ter/utils-js';
|
|
4
4
|
import { asyncStream } from '@o2ter/utils-js';
|
|
5
5
|
import 'jsonwebtoken';
|
|
@@ -149,14 +149,10 @@ declare class QueryCompiler {
|
|
|
149
149
|
private _selectIncludes;
|
|
150
150
|
_encodeSort(sort: Record<string, 1 | -1> | DecodedSortOption[], parent: QueryContext): SQL;
|
|
151
151
|
private _selectPopulateMap;
|
|
152
|
-
insert(options: InsertOptions,
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
upsertOne(query: DecodedQuery<FindOneOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): SQL;
|
|
157
|
-
upsertMany(query: DecodedQuery<FindOneOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): SQL;
|
|
158
|
-
deleteOne(query: DecodedQuery<FindOneOptions>): SQL;
|
|
159
|
-
deleteMany(query: DecodedQuery<FindOptions>): SQL;
|
|
152
|
+
insert(options: InsertOptions, values: Record<string, TValueWithUndefined>[]): SQL;
|
|
153
|
+
update(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>): SQL;
|
|
154
|
+
upsert(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): SQL;
|
|
155
|
+
delete(query: DecodedQuery<FindOptions>): SQL;
|
|
160
156
|
}
|
|
161
157
|
|
|
162
158
|
declare abstract class SqlStorage implements TStorage {
|
|
@@ -190,17 +186,10 @@ declare abstract class SqlStorage implements TStorage {
|
|
|
190
186
|
random(query: DecodedQuery<FindOptions & RelationOptions>, opts?: TQueryRandomOptions): AsyncGenerator<TObject, void, unknown>;
|
|
191
187
|
refs(object: TObject, classNames: string[], roles?: string[]): AsyncGenerator<TObject, void, unknown>;
|
|
192
188
|
nonrefs(query: DecodedQuery<FindOptions>): AsyncGenerator<TObject, void, unknown>;
|
|
193
|
-
insert(options: InsertOptions,
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
upsertOne(query: DecodedQuery<FindOneOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): Promise<TObject | undefined>;
|
|
198
|
-
upsertMany(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): Promise<{
|
|
199
|
-
updated: number;
|
|
200
|
-
inserted: number;
|
|
201
|
-
}>;
|
|
202
|
-
deleteOne(query: DecodedQuery<FindOneOptions>): Promise<TObject | undefined>;
|
|
203
|
-
deleteMany(query: DecodedQuery<FindOptions>): Promise<number>;
|
|
189
|
+
insert(options: InsertOptions, values: Record<string, TValueWithUndefined>[]): Promise<TObject[]>;
|
|
190
|
+
update(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>): Promise<TObject[]>;
|
|
191
|
+
upsert(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): Promise<TObject[]>;
|
|
192
|
+
delete(query: DecodedQuery<FindOptions>): Promise<TObject[]>;
|
|
204
193
|
}
|
|
205
194
|
|
|
206
195
|
declare class PostgresStorageClient<Driver extends PostgresClientDriver> extends SqlStorage implements TPubSub {
|
|
@@ -9,9 +9,9 @@ var QueryStream = require('pg-query-stream');
|
|
|
9
9
|
var utilsJs = require('@o2ter/utils-js');
|
|
10
10
|
var Decimal = require('decimal.js');
|
|
11
11
|
var utils = require('pg/lib/utils');
|
|
12
|
-
var index$1 = require('../../internals/index-
|
|
12
|
+
var index$1 = require('../../internals/index-CkAvNaAe.js');
|
|
13
13
|
require('@o2ter/crypto-js');
|
|
14
|
-
var random$1 = require('../../internals/random-
|
|
14
|
+
var random$1 = require('../../internals/random-B0V0EnjP.js');
|
|
15
15
|
var _private = require('../../internals/private-Ciddhure.js');
|
|
16
16
|
|
|
17
17
|
//
|
|
@@ -100,7 +100,7 @@ class SQL {
|
|
|
100
100
|
query += `${dialect.placeholder(nextIdx())}::DOUBLE PRECISION`;
|
|
101
101
|
values.push(value.value);
|
|
102
102
|
}
|
|
103
|
-
else if (
|
|
103
|
+
else if (value.value instanceof Decimal) {
|
|
104
104
|
query += `${dialect.placeholder(nextIdx())}::DECIMAL`;
|
|
105
105
|
values.push(value.value.toString());
|
|
106
106
|
}
|
|
@@ -431,11 +431,12 @@ class QueryCompiler {
|
|
|
431
431
|
_selectPopulateMap(context) {
|
|
432
432
|
return _.map(context.populates, (populate, field) => this.dialect.selectPopulate(this, context, populate, field, _.includes(context.countMatches, field)));
|
|
433
433
|
}
|
|
434
|
-
insert(options,
|
|
435
|
-
const
|
|
434
|
+
insert(options, values) {
|
|
435
|
+
const _values = _.map(values, attr => ({
|
|
436
436
|
..._defaultInsertOpts(options),
|
|
437
|
-
...this._encodeObjectAttrs(options.className,
|
|
438
|
-
});
|
|
437
|
+
...this._encodeObjectAttrs(options.className, attr),
|
|
438
|
+
}));
|
|
439
|
+
const keys = _.uniq(_.flatMap(_values, x => _.keys(x)));
|
|
439
440
|
const name = `_insert_$${options.className.toLowerCase()}`;
|
|
440
441
|
const context = { ...this._encodeIncludes(options), name };
|
|
441
442
|
const populates = _.mapValues(context.populates, (populate) => this.dialect.encodePopulate(this, populate));
|
|
@@ -445,8 +446,8 @@ class QueryCompiler {
|
|
|
445
446
|
return sql `
|
|
446
447
|
WITH ${{ identifier: name }} AS (
|
|
447
448
|
INSERT INTO ${{ identifier: options.className }}
|
|
448
|
-
(${_.map(
|
|
449
|
-
VALUES (${_.map(
|
|
449
|
+
(${_.map(keys, x => sql `${{ identifier: x }}`)})
|
|
450
|
+
VALUES ${_.map(_values, v => sql `(${_.map(keys, k => sql `${v[k]}`)})`)}
|
|
450
451
|
RETURNING *
|
|
451
452
|
)${!_.isEmpty(stages) ? sql `, ${_.map(stages, (q, n) => sql `${{ identifier: n }} AS (${q})`)}` : sql ``}
|
|
452
453
|
SELECT ${{
|
|
@@ -459,21 +460,8 @@ class QueryCompiler {
|
|
|
459
460
|
${!_.isEmpty(joins) ? { literal: joins, separator: '\n' } : sql ``}
|
|
460
461
|
`;
|
|
461
462
|
}
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
..._defaultInsertOpts(options),
|
|
465
|
-
...this._encodeObjectAttrs(options.className, attr),
|
|
466
|
-
}));
|
|
467
|
-
const keys = _.uniq(_.flatMap(_values, x => _.keys(x)));
|
|
468
|
-
return sql `
|
|
469
|
-
INSERT INTO ${{ identifier: options.className }}
|
|
470
|
-
(${_.map(keys, x => sql `${{ identifier: x }}`)})
|
|
471
|
-
VALUES ${_.map(_values, v => sql `(${_.map(keys, k => sql `${v[k]}`)})`)}
|
|
472
|
-
RETURNING _id
|
|
473
|
-
`;
|
|
474
|
-
}
|
|
475
|
-
updateOne(query, update) {
|
|
476
|
-
return this._modifyQuery({ ...query, limit: 1 }, (fetchName) => {
|
|
463
|
+
update(query, update) {
|
|
464
|
+
return this._modifyQuery(query, (fetchName) => {
|
|
477
465
|
const name = `_update_$${query.className.toLowerCase()}`;
|
|
478
466
|
return sql `
|
|
479
467
|
, ${{ identifier: name }} AS (
|
|
@@ -486,22 +474,12 @@ class QueryCompiler {
|
|
|
486
474
|
`;
|
|
487
475
|
});
|
|
488
476
|
}
|
|
489
|
-
|
|
490
|
-
return this._modifyQuery(query, (fetchName) => {
|
|
491
|
-
return sql `
|
|
492
|
-
UPDATE ${{ identifier: query.className }}
|
|
493
|
-
SET ${this._encodeUpdateAttrs(query.className, update)}
|
|
494
|
-
WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
|
|
495
|
-
RETURNING _id
|
|
496
|
-
`;
|
|
497
|
-
});
|
|
498
|
-
}
|
|
499
|
-
upsertOne(query, update, setOnInsert) {
|
|
477
|
+
upsert(query, update, setOnInsert) {
|
|
500
478
|
const _insert = _.toPairs({
|
|
501
479
|
..._defaultInsertOpts(query),
|
|
502
480
|
...this._encodeObjectAttrs(query.className, setOnInsert),
|
|
503
481
|
});
|
|
504
|
-
return this._modifyQuery(
|
|
482
|
+
return this._modifyQuery(query, (fetchName) => {
|
|
505
483
|
const updateName = `_update_$${query.className.toLowerCase()}`;
|
|
506
484
|
const insertName = `_insert_$${query.className.toLowerCase()}`;
|
|
507
485
|
const upsertName = `_upsert_$${query.className.toLowerCase()}`;
|
|
@@ -528,36 +506,8 @@ class QueryCompiler {
|
|
|
528
506
|
`;
|
|
529
507
|
});
|
|
530
508
|
}
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
..._defaultInsertOpts(query),
|
|
534
|
-
...this._encodeObjectAttrs(query.className, setOnInsert),
|
|
535
|
-
});
|
|
536
|
-
return this._modifyQuery(query, (fetchName) => {
|
|
537
|
-
const updateName = `_update_$${query.className.toLowerCase()}`;
|
|
538
|
-
const insertName = `_insert_$${query.className.toLowerCase()}`;
|
|
539
|
-
return sql `
|
|
540
|
-
, ${{ identifier: updateName }} AS (
|
|
541
|
-
UPDATE ${{ identifier: query.className }}
|
|
542
|
-
SET ${this._encodeUpdateAttrs(query.className, update)}
|
|
543
|
-
WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
|
|
544
|
-
RETURNING _id, __v
|
|
545
|
-
)
|
|
546
|
-
, ${{ identifier: insertName }} AS (
|
|
547
|
-
INSERT INTO ${{ identifier: query.className }}
|
|
548
|
-
(${_.map(_insert, x => sql `${{ identifier: x[0] }}`)})
|
|
549
|
-
SELECT ${_.map(_insert, x => sql `${x[1]} AS ${{ identifier: x[0] }}`)}
|
|
550
|
-
WHERE NOT EXISTS(SELECT * FROM ${{ identifier: updateName }})
|
|
551
|
-
RETURNING _id, __v
|
|
552
|
-
)
|
|
553
|
-
SELECT * FROM ${{ identifier: updateName }}
|
|
554
|
-
UNION
|
|
555
|
-
SELECT * FROM ${{ identifier: insertName }}
|
|
556
|
-
`;
|
|
557
|
-
});
|
|
558
|
-
}
|
|
559
|
-
deleteOne(query) {
|
|
560
|
-
return this._modifyQuery({ ...query, limit: 1 }, (fetchName, context) => {
|
|
509
|
+
delete(query) {
|
|
510
|
+
return this._modifyQuery(query, (fetchName, context) => {
|
|
561
511
|
const name = `_delete_$${query.className.toLowerCase()}`;
|
|
562
512
|
const populates = this._selectPopulateMap({ ...context, name });
|
|
563
513
|
const joins = _.compact(_.map(populates, ({ join }) => join));
|
|
@@ -578,13 +528,6 @@ class QueryCompiler {
|
|
|
578
528
|
`;
|
|
579
529
|
});
|
|
580
530
|
}
|
|
581
|
-
deleteMany(query) {
|
|
582
|
-
return this._modifyQuery(query, (fetchName) => sql `
|
|
583
|
-
DELETE FROM ${{ identifier: query.className }}
|
|
584
|
-
WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
|
|
585
|
-
RETURNING _id
|
|
586
|
-
`);
|
|
587
|
-
}
|
|
588
531
|
}
|
|
589
532
|
|
|
590
533
|
//
|
|
@@ -765,49 +708,25 @@ class SqlStorage {
|
|
|
765
708
|
}
|
|
766
709
|
})();
|
|
767
710
|
}
|
|
768
|
-
async insert(options,
|
|
711
|
+
async insert(options, values) {
|
|
769
712
|
const compiler = this._makeCompiler(true);
|
|
770
|
-
const result =
|
|
771
|
-
return _.
|
|
772
|
-
}
|
|
773
|
-
async insertMany(options, values) {
|
|
774
|
-
const compiler = this._makeCompiler(true);
|
|
775
|
-
const result = await this.query(compiler.insertMany(options, values));
|
|
776
|
-
return result.length;
|
|
777
|
-
}
|
|
778
|
-
async updateOne(query, update) {
|
|
779
|
-
const compiler = this._makeCompiler(true, query.extraFilter);
|
|
780
|
-
const updated = _.first(await this.query(compiler.updateOne(query, update)));
|
|
781
|
-
return _.isNil(updated) ? undefined : this._decodeObject(query.className, updated);
|
|
713
|
+
const result = await this.query(compiler.insert(options, values));
|
|
714
|
+
return _.map(result, x => this._decodeObject(options.className, x));
|
|
782
715
|
}
|
|
783
|
-
async
|
|
716
|
+
async update(query, update) {
|
|
784
717
|
const compiler = this._makeCompiler(true, query.extraFilter);
|
|
785
|
-
const updated = await this.query(compiler.
|
|
786
|
-
return updated.
|
|
787
|
-
}
|
|
788
|
-
async upsertOne(query, update, setOnInsert) {
|
|
789
|
-
const compiler = this._makeCompiler(true, query.extraFilter);
|
|
790
|
-
const upserted = _.first(await this.query(compiler.upsertOne(query, update, setOnInsert)));
|
|
791
|
-
return _.isNil(upserted) ? undefined : this._decodeObject(query.className, upserted);
|
|
792
|
-
}
|
|
793
|
-
async upsertMany(query, update, setOnInsert) {
|
|
794
|
-
const compiler = this._makeCompiler(true, query.extraFilter);
|
|
795
|
-
const upserted = await this.query(compiler.upsertMany(query, update, setOnInsert));
|
|
796
|
-
const inserted = _.filter(upserted, x => x.__v === 0).length;
|
|
797
|
-
return {
|
|
798
|
-
updated: upserted.length - inserted,
|
|
799
|
-
inserted: inserted,
|
|
800
|
-
};
|
|
718
|
+
const updated = await this.query(compiler.update(query, update));
|
|
719
|
+
return _.map(updated, x => this._decodeObject(query.className, x));
|
|
801
720
|
}
|
|
802
|
-
async
|
|
721
|
+
async upsert(query, update, setOnInsert) {
|
|
803
722
|
const compiler = this._makeCompiler(true, query.extraFilter);
|
|
804
|
-
const
|
|
805
|
-
return _.
|
|
723
|
+
const upserted = await this.query(compiler.upsert(query, update, setOnInsert));
|
|
724
|
+
return _.map(upserted, x => this._decodeObject(query.className, x));
|
|
806
725
|
}
|
|
807
|
-
async
|
|
726
|
+
async delete(query) {
|
|
808
727
|
const compiler = this._makeCompiler(true, query.extraFilter);
|
|
809
|
-
const deleted = await this.query(compiler.
|
|
810
|
-
return deleted.
|
|
728
|
+
const deleted = await this.query(compiler.delete(query));
|
|
729
|
+
return _.map(deleted, x => this._decodeObject(query.className, x));
|
|
811
730
|
}
|
|
812
731
|
}
|
|
813
732
|
|