@squidcloud/local-backend 1.0.88 → 1.0.90
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/common/src/ai-assistant.types.d.ts +8 -0
- package/dist/common/src/backend-run.types.d.ts +1 -1
- package/dist/common/src/backend-run.types.js +4 -0
- package/dist/common/src/backend-run.types.js.map +1 -1
- package/dist/common/src/bundle-api.types.d.ts +3 -0
- package/dist/common/src/bundle-data.types.d.ts +1 -0
- package/dist/common/src/index.d.ts +1 -0
- package/dist/common/src/index.js +1 -0
- package/dist/common/src/index.js.map +1 -1
- package/dist/common/src/mutation.types.js +3 -3
- package/dist/common/src/mutation.types.js.map +1 -1
- package/dist/common/src/native-query.context.d.ts +7 -0
- package/dist/common/src/native-query.context.js +12 -0
- package/dist/common/src/native-query.context.js.map +1 -0
- package/dist/common/src/query/pagination.js +15 -13
- package/dist/common/src/query/pagination.js.map +1 -1
- package/dist/common/src/query/query-context.js +6 -6
- package/dist/common/src/query/query-context.js.map +1 -1
- package/dist/common/src/schema/schema.types.js +1 -1
- package/dist/common/src/schema/schema.types.js.map +1 -1
- package/dist/common/src/utils/http.js +11 -1
- package/dist/common/src/utils/http.js.map +1 -1
- package/dist/common/src/utils/lock.manager.js +1 -1
- package/dist/common/src/utils/lock.manager.js.map +1 -1
- package/dist/common/src/utils/serialization.js +4 -4
- package/dist/common/src/utils/serialization.js.map +1 -1
- package/dist/common/src/utils/validation.js +2 -2
- package/dist/common/src/utils/validation.js.map +1 -1
- package/dist/common/src/websocket.impl.js +7 -4
- package/dist/common/src/websocket.impl.js.map +1 -1
- package/dist/internal-common/src/async-queue.js +1 -1
- package/dist/internal-common/src/async-queue.js.map +1 -1
- package/dist/internal-common/src/environment/local.environment.js +1 -1
- package/dist/internal-common/src/environment/local.environment.js.map +1 -1
- package/dist/internal-common/src/kafka/kafka.manager.js +6 -5
- package/dist/internal-common/src/kafka/kafka.manager.js.map +1 -1
- package/dist/internal-common/src/observability-publisher.js +2 -2
- package/dist/internal-common/src/observability-publisher.js.map +1 -1
- package/dist/internal-common/src/shutdown.manager.js +4 -4
- package/dist/internal-common/src/shutdown.manager.js.map +1 -1
- package/dist/local-backend/package.json +64 -0
- package/dist/local-backend/src/index.js +6 -0
- package/dist/local-backend/src/index.js.map +1 -1
- package/dist/local-backend/src/local-backend-socket.service.d.ts +0 -1
- package/dist/local-backend/src/local-backend-socket.service.js +0 -3
- package/dist/local-backend/src/local-backend-socket.service.js.map +1 -1
- package/dist/local-backend/src/local-backend.service.d.ts +1 -1
- package/dist/local-backend/src/local-backend.service.js +4 -2
- package/dist/local-backend/src/local-backend.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -1
|
@@ -14,6 +14,14 @@ export interface AiAssistantChatRequest extends BaseAiAssistantRequest {
|
|
|
14
14
|
prompt: string;
|
|
15
15
|
options?: AiAssistantChatOptions;
|
|
16
16
|
}
|
|
17
|
+
export interface AskQuestionInternalRequest {
|
|
18
|
+
model: AiModelName;
|
|
19
|
+
prompt: string;
|
|
20
|
+
temperature?: number;
|
|
21
|
+
}
|
|
22
|
+
export interface AskQuestionInternalResponse {
|
|
23
|
+
answer: string;
|
|
24
|
+
}
|
|
17
25
|
export interface BaseAiAssistantMutateRequest extends BaseAiAssistantRequest {
|
|
18
26
|
type: AiAssistantMutationType;
|
|
19
27
|
resource: AiAssistantResourceType;
|
|
@@ -21,7 +21,7 @@ export interface RunConfiguration {
|
|
|
21
21
|
export interface LoadJsPayload {
|
|
22
22
|
codeUrl: string;
|
|
23
23
|
}
|
|
24
|
-
export declare const ExecuteFunctionSecureAnnotations: readonly ["secureDistributedLock", "secureQuery", "secureMutation", "secureNamedQuery", "secureGraphQL", "secureApi", "secureAiAssistantChat", "secureAiAssistantMutation"];
|
|
24
|
+
export declare const ExecuteFunctionSecureAnnotations: readonly ["secureDistributedLock", "secureQuery", "secureMutation", "secureNamedQuery", "secureNativeQuery", "secureGraphQL", "secureApi", "secureAiAssistantChat", "secureAiAssistantMutation"];
|
|
25
25
|
export type ExecuteFunctionSecureAnnotationType = (typeof ExecuteFunctionSecureAnnotations)[number];
|
|
26
26
|
export type ExecuteFunctionAnnotationType = 'executable' | 'webhook' | 'scheduler' | 'trigger' | 'transformRead' | 'transformWrite' | 'metadata' | ExecuteFunctionSecureAnnotationType;
|
|
27
27
|
export interface ExecuteFunctionPayload {
|
|
@@ -11,11 +11,13 @@ const query_1 = require("./query");
|
|
|
11
11
|
const secret_types_1 = require("./secret.types");
|
|
12
12
|
const serialization_1 = require("./utils/serialization");
|
|
13
13
|
const assertic_1 = require("assertic");
|
|
14
|
+
const native_query_context_1 = require("./native-query.context");
|
|
14
15
|
exports.ExecuteFunctionSecureAnnotations = [
|
|
15
16
|
'secureDistributedLock',
|
|
16
17
|
'secureQuery',
|
|
17
18
|
'secureMutation',
|
|
18
19
|
'secureNamedQuery',
|
|
20
|
+
'secureNativeQuery',
|
|
19
21
|
'secureGraphQL',
|
|
20
22
|
'secureApi',
|
|
21
23
|
'secureAiAssistantChat',
|
|
@@ -31,6 +33,8 @@ function transformParams(params, executeFunctionAnnotationType) {
|
|
|
31
33
|
return [new mutation_context_1.MutationContext(params[0].mutation, params[0].beforeAndAfterDocs, params[0].serverTimestamp)];
|
|
32
34
|
case 'secureNamedQuery':
|
|
33
35
|
return [new named_query_context_1.NamedQueryContext(params[0])];
|
|
36
|
+
case 'secureNativeQuery':
|
|
37
|
+
return [new native_query_context_1.NativeQueryContext(params[0], params[1], params[2])];
|
|
34
38
|
case 'secureDistributedLock':
|
|
35
39
|
return [new distributed_lock_context_1.DistributedLockContext(params[0].mutex, params[0].exclusive)];
|
|
36
40
|
case 'secureGraphQL':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend-run.types.js","sourceRoot":"","sources":["../../../../common/src/backend-run.types.ts"],"names":[],"mappings":";;;AAAA,iEAA4F;AAC5F,yDAAoD;AAEpD,yEAAoE;AACpE,uDAAmD;AACnD,yDAAqD;AACrD,+DAA0D;AAC1D,mCAAuC;AACvC,iDAA6F;AAE7F,yDAAqD;AACrD,uCAAkC;
|
|
1
|
+
{"version":3,"file":"backend-run.types.js","sourceRoot":"","sources":["../../../../common/src/backend-run.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ import { DistributedLockContext } from './distributed-lock.context';
|
|
|
13
13
|
import { AiAssistantChatContext, AiAssistantMutationContext } from './ai-assistant.context';
|
|
14
14
|
import { ClientId, EnvironmentId, SquidDeveloperId } from './communication.types';
|
|
15
15
|
import { ClientConnectionState } from './socket.types';
|
|
16
|
+
import { NativeQueryContext } from './native-query.context';
|
|
16
17
|
export type DocHash = string;
|
|
17
18
|
export type SecurityResponse = {
|
|
18
19
|
docsToHash: Record<SquidDocId, DocHash | undefined>;
|
|
@@ -33,6 +34,7 @@ export interface ServiceConfig {
|
|
|
33
34
|
export type SecureDatabaseAction<T extends DatabaseActionType> = T extends 'all' ? () => boolean | Promise<boolean> : T extends 'read' ? ((context: QueryContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>) : ((context: MutationContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>);
|
|
34
35
|
export type SecureApiAction = ((context: ApiCallContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>);
|
|
35
36
|
export type SecureNamedQueryAction = ((context: NamedQueryContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>);
|
|
37
|
+
export type SecureNativeQueryAction = ((context: NativeQueryContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>);
|
|
36
38
|
export type SecureDistributedLockAction = ((context: DistributedLockContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>);
|
|
37
39
|
export type SecureGraphQLAction = ((context: GraphqlContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>);
|
|
38
40
|
export type SecureAiAssistantAction<T extends AiAssistantActionType> = T extends 'all' ? () => boolean | Promise<boolean> : T extends 'chat' ? ((context: AiAssistantChatContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>) : ((context: AiAssistantMutationContext) => boolean | Promise<boolean>) | (() => boolean | Promise<boolean>);
|
|
@@ -49,6 +51,7 @@ export type SchedulerAction = () => void | Promise<void>;
|
|
|
49
51
|
export type WebhookAction = ((request: WebhookRequest) => any) | (() => any);
|
|
50
52
|
export interface WebhookRequest {
|
|
51
53
|
body: any;
|
|
54
|
+
rawBody?: string;
|
|
52
55
|
queryParams: Record<string, string>;
|
|
53
56
|
headers: Record<string, string>;
|
|
54
57
|
httpMethod: 'post' | 'get' | 'put' | 'delete';
|
|
@@ -18,6 +18,7 @@ export interface ApplicationBundleData {
|
|
|
18
18
|
schedulers: Record<SchedulerId, SchedulerConfig>;
|
|
19
19
|
webhooks: Record<WebhookId, WebhookConfig>;
|
|
20
20
|
namedQueries: Record<IntegrationId, Record<QueryName, NamedQueryMetadata>>;
|
|
21
|
+
nativeQueries: Record<IntegrationId, Array<ServiceFunctionName>>;
|
|
21
22
|
distributedLocks: {
|
|
22
23
|
security?: Array<ServiceFunctionName>;
|
|
23
24
|
mutexes?: Record<string, {
|
|
@@ -25,6 +25,7 @@ export * from './mutation.types';
|
|
|
25
25
|
export * from './named-query.context';
|
|
26
26
|
export * from './named-query.schemas';
|
|
27
27
|
export * from './named-query.types';
|
|
28
|
+
export * from './native-query.context';
|
|
28
29
|
export * from './query';
|
|
29
30
|
export * from './query.types';
|
|
30
31
|
export * from './regions';
|
package/dist/common/src/index.js
CHANGED
|
@@ -41,6 +41,7 @@ __exportStar(require("./mutation.types"), exports);
|
|
|
41
41
|
__exportStar(require("./named-query.context"), exports);
|
|
42
42
|
__exportStar(require("./named-query.schemas"), exports);
|
|
43
43
|
__exportStar(require("./named-query.types"), exports);
|
|
44
|
+
__exportStar(require("./native-query.context"), exports);
|
|
44
45
|
__exportStar(require("./query"), exports);
|
|
45
46
|
__exportStar(require("./query.types"), exports);
|
|
46
47
|
__exportStar(require("./regions"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../common/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,uDAAqC;AACrC,qDAAmC;AACnC,8CAA4B;AAC5B,wDAAsC;AACtC,sDAAoC;AACpC,6DAA2C;AAC3C,2DAAyC;AACzC,sDAAoC;AACpC,qDAAmC;AACnC,sDAAoC;AACpC,wDAAsC;AACtC,kDAAgC;AAChC,6DAA2C;AAC3C,mDAAiC;AACjC,oDAAkC;AAClC,kDAAgC;AAChC,qDAAmC;AACnC,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,qDAAmC;AACnC,qDAAmC;AACnC,mDAAiC;AACjC,wDAAsC;AACtC,wDAAsC;AACtC,sDAAoC;AACpC,0CAAwB;AACxB,gDAA8B;AAC9B,4CAA0B;AAC1B,wDAAsC;AACtC,mDAAiC;AACjC,iDAA+B;AAC/B,mDAAiC;AACjC,mDAAiC;AACjC,iDAA+B;AAC/B,+CAA6B;AAC7B,kDAAgC;AAChC,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,gDAA8B;AAC9B,+CAA6B;AAC7B,6CAA2B;AAC3B,uDAAqC;AACrC,iDAA+B;AAC/B,wDAAsC;AACtC,qDAAmC;AACnC,8CAA4B;AAC5B,qDAAmC;AACnC,qDAAmC;AACnC,oDAAkC;AAClC,uDAAqC;AACrC,mDAAiC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../common/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,uDAAqC;AACrC,qDAAmC;AACnC,8CAA4B;AAC5B,wDAAsC;AACtC,sDAAoC;AACpC,6DAA2C;AAC3C,2DAAyC;AACzC,sDAAoC;AACpC,qDAAmC;AACnC,sDAAoC;AACpC,wDAAsC;AACtC,kDAAgC;AAChC,6DAA2C;AAC3C,mDAAiC;AACjC,oDAAkC;AAClC,kDAAgC;AAChC,qDAAmC;AACnC,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,qDAAmC;AACnC,qDAAmC;AACnC,mDAAiC;AACjC,wDAAsC;AACtC,wDAAsC;AACtC,sDAAoC;AACpC,yDAAuC;AACvC,0CAAwB;AACxB,gDAA8B;AAC9B,4CAA0B;AAC1B,wDAAsC;AACtC,mDAAiC;AACjC,iDAA+B;AAC/B,mDAAiC;AACjC,mDAAiC;AACjC,iDAA+B;AAC/B,+CAA6B;AAC7B,kDAAgC;AAChC,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,gDAA8B;AAC9B,+CAA6B;AAC7B,6CAA2B;AAC3B,uDAAqC;AACrC,iDAA+B;AAC/B,wDAAsC;AACtC,qDAAmC;AACnC,8CAA4B;AAC5B,qDAAmC;AACnC,qDAAmC;AACnC,oDAAkC;AAClC,uDAAqC;AACrC,mDAAiC"}
|
|
@@ -129,12 +129,12 @@ exports.convertInsertToUpdate = convertInsertToUpdate;
|
|
|
129
129
|
function reduceMutations(mutations) {
|
|
130
130
|
let result = [];
|
|
131
131
|
(0, rxjs_1.from)(mutations)
|
|
132
|
-
.pipe((0, rxjs_1.groupBy)(
|
|
132
|
+
.pipe((0, rxjs_1.groupBy)(mutation => {
|
|
133
133
|
return `${mutation.squidDocIdObj.integrationId}${mutation.squidDocIdObj.collectionName}/${mutation.squidDocIdObj.docId}`;
|
|
134
|
-
}), (0, rxjs_1.mergeMap)(
|
|
134
|
+
}), (0, rxjs_1.mergeMap)(mutationsGroup => mutationsGroup.pipe((0, rxjs_1.reduce)((mutationA, mutationB) => {
|
|
135
135
|
return mergeMutations(mutationA, mutationB);
|
|
136
136
|
}))), (0, rxjs_1.toArray)())
|
|
137
|
-
.subscribe(
|
|
137
|
+
.subscribe(value => {
|
|
138
138
|
result = value;
|
|
139
139
|
});
|
|
140
140
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutation.types.js","sourceRoot":"","sources":["../../../../common/src/mutation.types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mutation.types.js","sourceRoot":"","sources":["../../../../common/src/mutation.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { ClientId } from './communication.types';
|
|
2
|
+
export declare class NativeQueryContext {
|
|
3
|
+
readonly query: string;
|
|
4
|
+
readonly params: Record<string, any>;
|
|
5
|
+
readonly clientId: ClientId;
|
|
6
|
+
constructor(query: string, params: Record<string, any>, clientId: ClientId);
|
|
7
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NativeQueryContext = void 0;
|
|
4
|
+
class NativeQueryContext {
|
|
5
|
+
constructor(query, params, clientId) {
|
|
6
|
+
this.query = query;
|
|
7
|
+
this.params = params;
|
|
8
|
+
this.clientId = clientId;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.NativeQueryContext = NativeQueryContext;
|
|
12
|
+
//# sourceMappingURL=native-query.context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-query.context.js","sourceRoot":"","sources":["../../../../common/src/native-query.context.ts"],"names":[],"mappings":";;;AAGA,MAAa,kBAAkB;IAE7B,YAAqB,KAAa,EAAW,MAA2B,EAAW,QAAkB;QAAhF,UAAK,GAAL,KAAK,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAqB;QAAW,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;CAC1G;AAHD,gDAGC"}
|
|
@@ -13,7 +13,7 @@ class Pagination {
|
|
|
13
13
|
this.onFirstPage = true;
|
|
14
14
|
this.navigatingToLastPage = false;
|
|
15
15
|
this.lastElement = null;
|
|
16
|
-
this.snapshotSubject.pipe((0, rxjs_1.switchAll)()).subscribe(
|
|
16
|
+
this.snapshotSubject.pipe((0, rxjs_1.switchAll)()).subscribe(data => this.dataReceived(data));
|
|
17
17
|
this.templateSnapshotEmitter = snapshotEmitter.clone();
|
|
18
18
|
this.options = Object.assign({ pageSize: 100, subscribe: true }, options);
|
|
19
19
|
this.goToFirstPage();
|
|
@@ -61,7 +61,7 @@ class Pagination {
|
|
|
61
61
|
return 0;
|
|
62
62
|
}
|
|
63
63
|
async dataReceived(data) {
|
|
64
|
-
const extractedData = data.map(
|
|
64
|
+
const extractedData = data.map(s => this.templateSnapshotEmitter.extractData(s));
|
|
65
65
|
if (data.length === 0) {
|
|
66
66
|
if (this.onFirstPage) {
|
|
67
67
|
this.internalStateObserver.next({ numBefore: 0, numAfter: 0, data, extractedData });
|
|
@@ -73,7 +73,7 @@ class Pagination {
|
|
|
73
73
|
}
|
|
74
74
|
if (this.firstElement === null) {
|
|
75
75
|
if (this.lastElement !== null) {
|
|
76
|
-
const numAfter = extractedData.filter(
|
|
76
|
+
const numAfter = extractedData.filter(s => this.compare(s, this.lastElement) === 1).length;
|
|
77
77
|
this.firstElement = extractedData[data.length - numAfter - this.options.pageSize];
|
|
78
78
|
this.lastElement = null;
|
|
79
79
|
}
|
|
@@ -82,7 +82,7 @@ class Pagination {
|
|
|
82
82
|
this.navigatingToLastPage = false;
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
|
-
const numBefore = extractedData.filter(
|
|
85
|
+
const numBefore = extractedData.filter(s => this.compare(s, this.firstElement) === -1).length;
|
|
86
86
|
const numAfter = Math.max(0, data.length - numBefore - this.options.pageSize);
|
|
87
87
|
if (numBefore === data.length) {
|
|
88
88
|
this.prevInternal({ numBefore, numAfter, data, extractedData });
|
|
@@ -98,24 +98,24 @@ class Pagination {
|
|
|
98
98
|
.limit(this.options.pageSize * 3)
|
|
99
99
|
.flipSortOrder();
|
|
100
100
|
if (startingDoc) {
|
|
101
|
-
newSnapshotEmitter.addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map(
|
|
101
|
+
newSnapshotEmitter.addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map(sortOrder => {
|
|
102
102
|
return {
|
|
103
103
|
fieldName: sortOrder.fieldName,
|
|
104
104
|
operator: sortOrder.asc ? '<=' : '>=',
|
|
105
|
-
value: (0, object_1.getInPath)(startingDoc, sortOrder.fieldName),
|
|
105
|
+
value: (0, object_1.getInPath)(startingDoc, sortOrder.fieldName) || null,
|
|
106
106
|
};
|
|
107
107
|
}));
|
|
108
108
|
}
|
|
109
|
-
this.snapshotSubject.next(newSnapshotEmitter.snapshots(this.options.subscribe).pipe((0, rxjs_1.map)(
|
|
109
|
+
this.snapshotSubject.next(newSnapshotEmitter.snapshots(this.options.subscribe).pipe((0, rxjs_1.map)(s => s.reverse())));
|
|
110
110
|
}
|
|
111
111
|
else {
|
|
112
112
|
const newSnapshotEmitter = this.templateSnapshotEmitter.clone().limit(this.options.pageSize * 3);
|
|
113
113
|
if (startingDoc) {
|
|
114
|
-
newSnapshotEmitter.addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map(
|
|
114
|
+
newSnapshotEmitter.addCompositeCondition(this.templateSnapshotEmitter.getSortOrders().map(sortOrder => {
|
|
115
115
|
return {
|
|
116
116
|
fieldName: sortOrder.fieldName,
|
|
117
117
|
operator: sortOrder.asc ? '>=' : '<=',
|
|
118
|
-
value: (0, object_1.getInPath)(startingDoc, sortOrder.fieldName),
|
|
118
|
+
value: (0, object_1.getInPath)(startingDoc, sortOrder.fieldName) || null,
|
|
119
119
|
};
|
|
120
120
|
}));
|
|
121
121
|
}
|
|
@@ -127,7 +127,7 @@ class Pagination {
|
|
|
127
127
|
if (internalState !== null) {
|
|
128
128
|
return internalState;
|
|
129
129
|
}
|
|
130
|
-
return await (0, rxjs_1.firstValueFrom)((0, rxjs_1.race)(this.isDestroyed.pipe((0, rxjs_1.filter)(Boolean), (0, rxjs_1.map)(
|
|
130
|
+
return await (0, rxjs_1.firstValueFrom)((0, rxjs_1.race)(this.isDestroyed.pipe((0, rxjs_1.filter)(Boolean), (0, rxjs_1.map)(_ => ({
|
|
131
131
|
data: [],
|
|
132
132
|
extractedData: [],
|
|
133
133
|
numBefore: 0,
|
|
@@ -163,7 +163,9 @@ class Pagination {
|
|
|
163
163
|
}
|
|
164
164
|
async next() {
|
|
165
165
|
const { numBefore, extractedData } = await this.waitForInternalState();
|
|
166
|
-
|
|
166
|
+
if (numBefore + this.options.pageSize < extractedData.length) {
|
|
167
|
+
this.firstElement = extractedData[numBefore + this.options.pageSize];
|
|
168
|
+
}
|
|
167
169
|
this.internalStateObserver.next(null);
|
|
168
170
|
this.doNewQuery(extractedData[numBefore], false);
|
|
169
171
|
return await this.waitForData();
|
|
@@ -172,7 +174,7 @@ class Pagination {
|
|
|
172
174
|
return this.internalStateToState(await this.waitForInternalState());
|
|
173
175
|
}
|
|
174
176
|
observeState() {
|
|
175
|
-
return this.internalStateObserver.pipe((0, rxjs_1.filter)((state) => state !== null), (0, rxjs_1.map)(
|
|
177
|
+
return this.internalStateObserver.pipe((0, rxjs_1.filter)((state) => state !== null), (0, rxjs_1.map)(state => {
|
|
176
178
|
return this.internalStateToState(state);
|
|
177
179
|
}));
|
|
178
180
|
}
|
|
@@ -201,7 +203,7 @@ class Pagination {
|
|
|
201
203
|
.limit(this.options.pageSize * 3)
|
|
202
204
|
.flipSortOrder()
|
|
203
205
|
.snapshots(this.options.subscribe)
|
|
204
|
-
.pipe((0, rxjs_1.map)(
|
|
206
|
+
.pipe((0, rxjs_1.map)(s => s.reverse()));
|
|
205
207
|
this.snapshotSubject.next(lastPageSnapshot);
|
|
206
208
|
return await this.waitForData();
|
|
207
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../../../common/src/query/pagination.ts"],"names":[],"mappings":";;;AACA,+BAAgH;AAChH,4CAA4C;AAC5C,mCAAuB;AA4BvB,MAAa,UAAU;IAoCrB,YAAY,eAA4C,EAAE,UAAsC,EAAE;QAlB1F,0BAAqB,GAAG,IAAI,sBAAe,CAAmC,IAAI,CAAC,CAAC;QACpF,iBAAY,GAAQ,IAAI,CAAC;QAEhB,gBAAW,GAAG,IAAI,sBAAe,CAAC,KAAK,CAAC,CAAC;QAGlD,oBAAe,GAAG,IAAI,cAAO,EAA4B,CAAC;QAC1D,gBAAW,GAAG,IAAI,CAAC;QAOnB,yBAAoB,GAAG,KAAK,CAAC;QAC7B,gBAAW,GAAQ,IAAI,CAAC;QAI9B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAA,gBAAS,GAAE,CAAC,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../../../common/src/query/pagination.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,12 +60,12 @@ class QueryContext {
|
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
isSubqueryOfCondition(condition) {
|
|
63
|
-
const conditions = this.parsedConditions.filter(
|
|
64
|
-
return !!conditions.find(
|
|
63
|
+
const conditions = this.parsedConditions.filter(c => c.fieldName === condition.fieldName);
|
|
64
|
+
return !!conditions.find(c => this.evaluateSubset(c, condition));
|
|
65
65
|
}
|
|
66
66
|
isSubqueryOfConditions(conditions) {
|
|
67
67
|
const parsedConditions = this.parseConditions(conditions);
|
|
68
|
-
return parsedConditions.every(
|
|
68
|
+
return parsedConditions.every(c => this.isSubqueryOfCondition(c));
|
|
69
69
|
}
|
|
70
70
|
isSubqueryOfQuery(query) {
|
|
71
71
|
if (query.collectionName !== this.collectionName || query.integrationId !== this.integrationId)
|
|
@@ -77,10 +77,10 @@ class QueryContext {
|
|
|
77
77
|
return subsetOfConditions && subsetOfOrder && withinLimit;
|
|
78
78
|
}
|
|
79
79
|
getConditionsFor(...fieldNames) {
|
|
80
|
-
return this.parsedConditions.filter(
|
|
80
|
+
return this.parsedConditions.filter(cond => fieldNames.includes(cond.fieldName));
|
|
81
81
|
}
|
|
82
82
|
getConditionsForField(fieldName) {
|
|
83
|
-
return this.parsedConditions.filter(
|
|
83
|
+
return this.parsedConditions.filter(cond => cond.fieldName === fieldName);
|
|
84
84
|
}
|
|
85
85
|
documentMatchesQuery(doc) {
|
|
86
86
|
for (const contextCondition of this.parsedConditions) {
|
|
@@ -124,7 +124,7 @@ class QueryContext {
|
|
|
124
124
|
const parsedConditions = [];
|
|
125
125
|
const inMap = new Map();
|
|
126
126
|
const notInMap = new Map();
|
|
127
|
-
conditions.forEach(
|
|
127
|
+
conditions.forEach(c => {
|
|
128
128
|
switch (c.operator) {
|
|
129
129
|
case '==':
|
|
130
130
|
case 'in':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-context.js","sourceRoot":"","sources":["../../../../../common/src/query/query-context.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"query-context.js","sourceRoot":"","sources":["../../../../../common/src/query/query-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -101,7 +101,7 @@ function validateSchema(schema, data, updatedPaths = [], dataBefore = {}) {
|
|
|
101
101
|
fieldPath = `${fieldPath}/${schemaError.params['missingProperty']}`;
|
|
102
102
|
}
|
|
103
103
|
fieldPath = fieldPath.slice(1).replace(/\//g, '.') + '.';
|
|
104
|
-
if (updatedPaths.some(
|
|
104
|
+
if (updatedPaths.some(updatedPath => fieldPath.startsWith(updatedPath + '.'))) {
|
|
105
105
|
throw new validation_1.ValidationError(`${fieldPath} does not conform with the collection schema.`, http_status_enum_1.HttpStatus.BAD_REQUEST);
|
|
106
106
|
}
|
|
107
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.types.js","sourceRoot":"","sources":["../../../../../common/src/schema/schema.types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schema.types.js","sourceRoot":"","sources":["../../../../../common/src/schema/schema.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getApplicationHttpHeaders = exports.getApplicationUrl = void 0;
|
|
4
|
-
const kotlinControllers = [
|
|
4
|
+
const kotlinControllers = [
|
|
5
|
+
'query',
|
|
6
|
+
'aiData',
|
|
7
|
+
'api',
|
|
8
|
+
'backend-function',
|
|
9
|
+
'webhooks',
|
|
10
|
+
'ws',
|
|
11
|
+
'quota',
|
|
12
|
+
'named-query',
|
|
13
|
+
'native-query',
|
|
14
|
+
];
|
|
5
15
|
function getApplicationUrl(regionPrefix, appId, path) {
|
|
6
16
|
const baseUrl = 'https://squid.cloud';
|
|
7
17
|
const parsedBaseUrl = new URL(baseUrl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../common/src/utils/http.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../common/src/utils/http.ts"],"names":[],"mappings":";;;AAAA,MAAM,iBAAiB,GAAG;IACxB,OAAO;IACP,QAAQ;IACR,KAAK;IACL,kBAAkB;IAClB,UAAU;IACV,IAAI;IACJ,OAAO;IACP,aAAa;IACb,cAAc;CACf,CAAC;AAEF,SAAgB,iBAAiB,CAAC,YAAoB,EAAE,KAAa,EAAE,IAAY;IACjF,MAAM,OAAO,GAAG,qBAAqB,CAAC;IACtC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACvC,aAAa,CAAC,IAAI,GAAG,GAAG,KAAK,IAAI,YAAY,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;IACtE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAE5C,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE;QACzB,aAAa,CAAC,QAAQ,GAAG,MAAM,CAAC;QAChC,aAAa,CAAC,IAAI,GAAG,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;QAC9E,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE;YAC3B,aAAa,CAAC,IAAI,GAAG,UAAU,CAAC;SACjC;aAAM,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE;YAC9B,aAAa,CAAC,IAAI,GAAG,WAAW,CAAC;SAClC;KACF;IAED,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;IACrC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC;AACtD,CAAC;AAnBD,8CAmBC;AAED,SAAgB,yBAAyB,CAAC,YAAoB,EAAE,KAAa;IAC3E,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE;QACzB,OAAO,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;KAClC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAPD,8DAOC;AAED,SAAS,OAAO,CAAC,YAAoB;IACnC,OAAO,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,SAAS,CAAC,YAAoB;IACrC,OAAO,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,KAAK,CAAC,YAAoB;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACnC,CAAC"}
|
|
@@ -27,7 +27,7 @@ class LockManager {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
canGetLock(...mutexes) {
|
|
30
|
-
return !mutexes.some(
|
|
30
|
+
return !mutexes.some(mutex => { var _a; return (_a = this.locks[mutex]) === null || _a === void 0 ? void 0 : _a.value; });
|
|
31
31
|
}
|
|
32
32
|
lockSync(...mutexes) {
|
|
33
33
|
(0, assertic_1.assertTruthy)(this.canGetLock(...mutexes), 'Cannot acquire lock sync');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.manager.js","sourceRoot":"","sources":["../../../../../common/src/utils/lock.manager.ts"],"names":[],"mappings":";;;AAAA,+BAAmF;AACnF,uCAAgD;AAUhD,MAAa,WAAW;IAAxB;QACmB,UAAK,GAAuC,EAAE,CAAC;IAwClE,CAAC;IAtCC,KAAK,CAAC,IAAI,CAAC,GAAG,OAAoB;QAChC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC;YAC1B,OAAO;SACR;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;aAC7C,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC;QAExD,MAAM,IAAA,oBAAa,EACjB,IAAA,oBAAa,EAAC,aAAa,CAAC,CAAC,IAAI,CAC/B,IAAA,aAAM,EAAC,CAAC,aAAwB,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EACnE,IAAA,WAAI,EAAC,CAAC,CAAC,CACR,CACF,CAAC;QACF,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,GAAG,OAAoB;QAC7B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YAC3B,MAAM,eAAe,GAAG,IAAA,iBAAM,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAClD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC;IAED,UAAU,CAAC,GAAG,OAAoB;QAChC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"lock.manager.js","sourceRoot":"","sources":["../../../../../common/src/utils/lock.manager.ts"],"names":[],"mappings":";;;AAAA,+BAAmF;AACnF,uCAAgD;AAUhD,MAAa,WAAW;IAAxB;QACmB,UAAK,GAAuC,EAAE,CAAC;IAwClE,CAAC;IAtCC,KAAK,CAAC,IAAI,CAAC,GAAG,OAAoB;QAChC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC;YAC1B,OAAO;SACR;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;aAC7C,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC;QAExD,MAAM,IAAA,oBAAa,EACjB,IAAA,oBAAa,EAAC,aAAa,CAAC,CAAC,IAAI,CAC/B,IAAA,aAAM,EAAC,CAAC,aAAwB,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EACnE,IAAA,WAAI,EAAC,CAAC,CAAC,CACR,CACF,CAAC;QACF,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,GAAG,OAAoB;QAC7B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YAC3B,MAAM,eAAe,GAAG,IAAA,iBAAM,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAClD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC;IAED,UAAU,CAAC,GAAG,OAAoB;QAChC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,0CAAE,KAAK,CAAA,EAAA,CAAC,CAAC;IAC1D,CAAC;IAED,QAAQ,CAAC,GAAG,OAAoB;QAC9B,IAAA,uBAAY,EAAC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,EAAE,0BAA0B,CAAC,CAAC;QACtE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YAC3B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,sBAAe,CAAU,IAAI,CAAC,CAAC;SACxD;IACH,CAAC;CACF;AAzCD,kCAyCC"}
|
|
@@ -4,14 +4,14 @@ exports.recodeValue = exports.decodeValueForMapping = exports.encodeValueForMapp
|
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
function sortKeys(json) {
|
|
6
6
|
if (Array.isArray(json)) {
|
|
7
|
-
return json.map(
|
|
7
|
+
return json.map(o => sortKeys(o));
|
|
8
8
|
}
|
|
9
9
|
if (typeof json !== 'object' || json === null || json instanceof Date) {
|
|
10
10
|
return json;
|
|
11
11
|
}
|
|
12
12
|
const keys = Object.keys(json);
|
|
13
13
|
const result = {};
|
|
14
|
-
keys.sort().forEach(
|
|
14
|
+
keys.sort().forEach(key => {
|
|
15
15
|
result[key] = sortKeys(json[key]);
|
|
16
16
|
});
|
|
17
17
|
return result;
|
|
@@ -23,7 +23,7 @@ exports.normalizeJsonAsString = normalizeJsonAsString;
|
|
|
23
23
|
function serializeObj(obj) {
|
|
24
24
|
if (obj === undefined)
|
|
25
25
|
return null;
|
|
26
|
-
const objWithReplacedDates = _.cloneDeepWith(obj,
|
|
26
|
+
const objWithReplacedDates = _.cloneDeepWith(obj, value => {
|
|
27
27
|
return _.isDate(value) ? { $date: value.toISOString() } : undefined;
|
|
28
28
|
});
|
|
29
29
|
return JSON.stringify(objWithReplacedDates);
|
|
@@ -31,7 +31,7 @@ function serializeObj(obj) {
|
|
|
31
31
|
exports.serializeObj = serializeObj;
|
|
32
32
|
function deserializeObj(str) {
|
|
33
33
|
const deserializedObj = JSON.parse(str);
|
|
34
|
-
return _.cloneDeepWith(deserializedObj,
|
|
34
|
+
return _.cloneDeepWith(deserializedObj, value => {
|
|
35
35
|
return _.isObject(value) && _.has(value, '$date') && Object.keys(value).length === 1
|
|
36
36
|
? new Date(value['$date'])
|
|
37
37
|
: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../../../../common/src/utils/serialization.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAE5B,SAAS,QAAQ,CAAC,IAAS;IACzB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../../../../common/src/utils/serialization.ts"],"names":[],"mappings":"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"}
|
|
@@ -198,13 +198,13 @@ function validateCorrectStringType(value) {
|
|
|
198
198
|
}
|
|
199
199
|
function isRightType(value, type) {
|
|
200
200
|
if (Array.isArray(value)) {
|
|
201
|
-
return value.every(
|
|
201
|
+
return value.every(element => typeof element === type);
|
|
202
202
|
}
|
|
203
203
|
return typeof value === type;
|
|
204
204
|
}
|
|
205
205
|
exports.isRightType = isRightType;
|
|
206
206
|
function hasOnlyKeys(obj, keys) {
|
|
207
|
-
return !Array.isArray(obj) && [...Object.keys(obj)].every(
|
|
207
|
+
return !Array.isArray(obj) && [...Object.keys(obj)].every(key => keys.includes(key));
|
|
208
208
|
}
|
|
209
209
|
exports.hasOnlyKeys = hasOnlyKeys;
|
|
210
210
|
//# sourceMappingURL=validation.js.map
|