cruddl 3.1.4 → 3.2.0-0.deploy-test.2
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/.github/workflows/ci.yml +4 -3
- package/.nvmrc +1 -1
- package/README.md +8 -0
- package/dist/spec/{schema/ast-validation-modules/flex-search.spec.d.ts → database/arangodb/ttl.spec.d.ts} +0 -0
- package/dist/spec/database/arangodb/ttl.spec.js +346 -0
- package/dist/spec/database/arangodb/ttl.spec.js.map +1 -0
- package/dist/spec/model/create-model.spec.js +26 -0
- package/dist/spec/model/create-model.spec.js.map +1 -1
- package/dist/spec/model/implementation/field.spec.js +8 -0
- package/dist/spec/model/implementation/field.spec.js.map +1 -1
- package/dist/spec/model/implementation/flex-search-validation.spec.js +70 -5
- package/dist/spec/model/implementation/flex-search-validation.spec.js.map +1 -1
- package/dist/spec/performance/query-pipeline.perf.js +3 -2
- package/dist/spec/performance/query-pipeline.perf.js.map +1 -1
- package/dist/spec/regression/initialization.js +2 -1
- package/dist/spec/regression/initialization.js.map +1 -1
- package/dist/spec/schema/ast-validation-modules/helpers.d.ts +10 -8
- package/dist/spec/schema/ast-validation-modules/helpers.js +28 -24
- package/dist/spec/schema/ast-validation-modules/helpers.js.map +1 -1
- package/dist/spec/schema/ast-validation-modules/ttl.spec.d.ts +1 -0
- package/dist/spec/schema/ast-validation-modules/ttl.spec.js +362 -0
- package/dist/spec/schema/ast-validation-modules/ttl.spec.js.map +1 -0
- package/dist/spec/schema/schema-builder.spec.js +22 -0
- package/dist/spec/schema/schema-builder.spec.js.map +1 -1
- package/dist/spec/schema/source-validation-modules/sidecar-schema.spec.js +14 -0
- package/dist/spec/schema/source-validation-modules/sidecar-schema.spec.js.map +1 -1
- package/dist/spec/schema-generation/create-input-type-generator.spec.js +1 -5
- package/dist/spec/schema-generation/create-input-type-generator.spec.js.map +1 -1
- package/dist/src/database/arangodb/aql-generator.d.ts +8 -1
- package/dist/src/database/arangodb/aql-generator.js +18 -9
- package/dist/src/database/arangodb/aql-generator.js.map +1 -1
- package/dist/src/database/arangodb/arangodb-adapter.js +3 -1
- package/dist/src/database/arangodb/arangodb-adapter.js.map +1 -1
- package/dist/src/database/arangodb/arangojs-instrumentation/custom-connection.d.ts +2 -2
- package/dist/src/database/arangodb/arangojs-instrumentation/custom-connection.js +8 -58
- package/dist/src/database/arangodb/arangojs-instrumentation/custom-connection.js.map +1 -1
- package/dist/src/database/arangodb/arangojs-instrumentation/custom-request.d.ts +18 -8
- package/dist/src/database/arangodb/arangojs-instrumentation/custom-request.js +14 -2
- package/dist/src/database/arangodb/arangojs-instrumentation/custom-request.js.map +1 -1
- package/dist/src/database/arangodb/schema-migration/analyzer.js +4 -4
- package/dist/src/database/arangodb/schema-migration/analyzer.js.map +1 -1
- package/dist/src/database/arangodb/schema-migration/arango-search-helpers.d.ts +9 -9
- package/dist/src/database/arangodb/schema-migration/arango-search-helpers.js +17 -9
- package/dist/src/database/arangodb/schema-migration/arango-search-helpers.js.map +1 -1
- package/dist/src/database/arangodb/schema-migration/migrations.d.ts +9 -5
- package/dist/src/database/arangodb/schema-migration/migrations.js.map +1 -1
- package/dist/src/database/arangodb/schema-migration/performer.js +6 -6
- package/dist/src/database/arangodb/schema-migration/performer.js.map +1 -1
- package/dist/src/database/inmemory/inmemory-adapter.d.ts +2 -1
- package/dist/src/database/inmemory/inmemory-adapter.js +16 -2
- package/dist/src/database/inmemory/inmemory-adapter.js.map +1 -1
- package/dist/src/database/inmemory/js-generator.d.ts +8 -1
- package/dist/src/database/inmemory/js-generator.js +16 -7
- package/dist/src/database/inmemory/js-generator.js.map +1 -1
- package/dist/src/execution/execution-options.d.ts +16 -0
- package/dist/src/execution/execution-options.js +10 -0
- package/dist/src/execution/execution-options.js.map +1 -1
- package/dist/src/execution/operation-resolver.js +4 -2
- package/dist/src/execution/operation-resolver.js.map +1 -1
- package/dist/src/model/config/indices.d.ts +3 -1
- package/dist/src/model/config/time-to-live.d.ts +8 -3
- package/dist/src/model/create-model.js +54 -25
- package/dist/src/model/create-model.js.map +1 -1
- package/dist/src/model/implementation/field-path.d.ts +19 -3
- package/dist/src/model/implementation/field-path.js +37 -3
- package/dist/src/model/implementation/field-path.js.map +1 -1
- package/dist/src/model/implementation/field.js +37 -2
- package/dist/src/model/implementation/field.js.map +1 -1
- package/dist/src/model/implementation/flex-search.d.ts +7 -2
- package/dist/src/model/implementation/flex-search.js +37 -3
- package/dist/src/model/implementation/flex-search.js.map +1 -1
- package/dist/src/model/implementation/relation.d.ts +22 -0
- package/dist/src/model/implementation/relation.js +6 -0
- package/dist/src/model/implementation/relation.js.map +1 -1
- package/dist/src/model/implementation/root-entity-type.js +3 -28
- package/dist/src/model/implementation/root-entity-type.js.map +1 -1
- package/dist/src/model/implementation/time-to-live.d.ts +5 -1
- package/dist/src/model/implementation/time-to-live.js +91 -5
- package/dist/src/model/implementation/time-to-live.js.map +1 -1
- package/dist/src/model/parse-ttl.js +10 -6
- package/dist/src/model/parse-ttl.js.map +1 -1
- package/dist/src/model/validation/message.d.ts +2 -2
- package/dist/src/model/validation/message.js +19 -6
- package/dist/src/model/validation/message.js.map +1 -1
- package/dist/src/project/project.js +16 -7
- package/dist/src/project/project.js.map +1 -1
- package/dist/src/project/time-to-live.d.ts +14 -6
- package/dist/src/project/time-to-live.js +35 -23
- package/dist/src/project/time-to-live.js.map +1 -1
- package/dist/src/schema/graphql-base.js +1 -1
- package/dist/src/schema/preparation/source-validation-modules/schema/schema.json +7 -0
- package/dist/src/schema/preparation/source-validation-modules/schema/validate-schema.js +1 -1
- package/dist/src/schema/schema-builder.js +5 -5
- package/dist/src/schema/schema-builder.js.map +1 -1
- package/dist/src/schema-generation/create-input-types/input-types.d.ts +3 -3
- package/dist/src/schema-generation/create-input-types/input-types.js +6 -9
- package/dist/src/schema-generation/create-input-types/input-types.js.map +1 -1
- package/dist/src/schema-generation/delete-all-generator.d.ts +9 -2
- package/dist/src/schema-generation/delete-all-generator.js +4 -2
- package/dist/src/schema-generation/delete-all-generator.js.map +1 -1
- package/dist/src/schema-generation/flex-search-generator.d.ts +2 -2
- package/dist/src/schema-generation/flex-search-generator.js +5 -5
- package/dist/src/schema-generation/flex-search-generator.js.map +1 -1
- package/dist/src/schema-generation/query-node-object-type/context.d.ts +5 -0
- package/dist/src/schema-generation/query-node-object-type/context.js.map +1 -1
- package/dist/src/schema-generation/query-node-object-type/query-node-generator.d.ts +2 -1
- package/dist/src/schema-generation/query-node-object-type/query-node-generator.js +14 -6
- package/dist/src/schema-generation/query-node-object-type/query-node-generator.js.map +1 -1
- package/dist/src/schema-generation/utils/relations.d.ts +9 -1
- package/dist/src/schema-generation/utils/relations.js +46 -14
- package/dist/src/schema-generation/utils/relations.js.map +1 -1
- package/docs/flexSearch.md +9 -6
- package/docs/modelling.md +2 -2
- package/docs/time-to-live.md +25 -0
- package/package.json +3 -3
- package/dist/spec/schema/ast-validation-modules/flex-search.spec.js +0 -15
- package/dist/spec/schema/ast-validation-modules/flex-search.spec.js.map +0 -1
|
@@ -6,12 +6,22 @@
|
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.createRequest = exports.isBrowser = void 0;
|
|
9
|
-
const btoa_1 = require("arangojs/lib/btoa");
|
|
10
9
|
const joinPath_1 = require("arangojs/lib/joinPath");
|
|
11
10
|
const omit_1 = require("arangojs/lib/omit");
|
|
12
11
|
const http_1 = require("http");
|
|
13
12
|
const https_1 = require("https");
|
|
14
13
|
const url_1 = require("url");
|
|
14
|
+
/**
|
|
15
|
+
* @internal
|
|
16
|
+
*/
|
|
17
|
+
function systemErrorToJSON() {
|
|
18
|
+
return {
|
|
19
|
+
error: true,
|
|
20
|
+
errno: this.errno,
|
|
21
|
+
code: this.code,
|
|
22
|
+
syscall: this.syscall,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
15
25
|
/**
|
|
16
26
|
* collects sockets we already took the lookup/connect events from
|
|
17
27
|
* this is important to not re-add the listeners when sockets are being reused
|
|
@@ -78,7 +88,8 @@ function createRequest(baseUrl, agentOptions, agent) {
|
|
|
78
88
|
headers['content-length'] = String(Buffer.byteLength(body));
|
|
79
89
|
}
|
|
80
90
|
if (!headers['authorization']) {
|
|
81
|
-
|
|
91
|
+
const encoded = Buffer.from(baseUrlParts.auth || 'root:').toString('base64');
|
|
92
|
+
headers['authorization'] = `Basic ${encoded}`;
|
|
82
93
|
}
|
|
83
94
|
const options = { path, method, headers, agent };
|
|
84
95
|
if (socketPath) {
|
|
@@ -128,6 +139,7 @@ function createRequest(baseUrl, agentOptions, agent) {
|
|
|
128
139
|
req.on('error', (err) => {
|
|
129
140
|
const error = err;
|
|
130
141
|
error.request = req;
|
|
142
|
+
error.toJSON = systemErrorToJSON;
|
|
131
143
|
if (called)
|
|
132
144
|
return;
|
|
133
145
|
called = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-request.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/arangojs-instrumentation/custom-request.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"custom-request.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/arangojs-instrumentation/custom-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SchemaAnalyzer = void 0;
|
|
4
|
-
const
|
|
4
|
+
const collection_1 = require("arangojs/collection");
|
|
5
5
|
const flex_search_1 = require("../../../model/implementation/flex-search");
|
|
6
6
|
const arango_basics_1 = require("../arango-basics");
|
|
7
7
|
const config_1 = require("../config");
|
|
@@ -24,8 +24,8 @@ class SchemaAnalyzer {
|
|
|
24
24
|
}
|
|
25
25
|
async getDocumentCollectionMigrations(model) {
|
|
26
26
|
// Get existing collections in ArangoDB
|
|
27
|
-
const existingCollections = (await this.db.listCollections()).filter((coll) => coll.type ===
|
|
28
|
-
const existingCollectionNames = new Set(existingCollections.map((coll) => coll.name));
|
|
27
|
+
const existingCollections = (await this.db.listCollections()).filter((coll) => coll.type === collection_1.CollectionType.DOCUMENT_COLLECTION);
|
|
28
|
+
const existingCollectionNames = new Set(existingCollections.map((coll) => coll.name));
|
|
29
29
|
const migrations = [];
|
|
30
30
|
for (const rootEntity of model.rootEntityTypes) {
|
|
31
31
|
const collectionName = (0, arango_basics_1.getCollectionNameForRootEntity)(rootEntity);
|
|
@@ -42,7 +42,7 @@ class SchemaAnalyzer {
|
|
|
42
42
|
}
|
|
43
43
|
async getEdgeCollectionMigrations(model) {
|
|
44
44
|
// Get existing collections in ArangoDB
|
|
45
|
-
const existingCollections = (await this.db.listCollections()).filter((coll) => coll.type ===
|
|
45
|
+
const existingCollections = (await this.db.listCollections()).filter((coll) => coll.type === collection_1.CollectionType.EDGE_COLLECTION);
|
|
46
46
|
const existingCollectionNames = new Set(existingCollections.map((coll) => coll.name));
|
|
47
47
|
const migrations = [];
|
|
48
48
|
for (const relation of model.relations) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzer.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/analyzer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"analyzer.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/analyzer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Database } from 'arangojs';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { AnalyzerDescription, CreateAnalyzerOptions } from 'arangojs/analyzer';
|
|
3
|
+
import { ArangoSearchViewPropertiesOptions, CreateArangoSearchViewOptions, View, ViewProperties } from 'arangojs/view';
|
|
4
4
|
import { Model, RootEntityType } from '../../../model';
|
|
5
5
|
import { SchemaMigration } from './migrations';
|
|
6
6
|
export declare const FLEX_SEARCH_VIEW_PREFIX = "flex_view_";
|
|
@@ -21,15 +21,15 @@ export interface ArangoSearchConfiguration {
|
|
|
21
21
|
}
|
|
22
22
|
export declare function getRequiredViewsFromModel(model: Model): ReadonlyArray<ArangoSearchDefinition>;
|
|
23
23
|
export declare function getFlexSearchViewNameForRootEntity(rootEntity: RootEntityType): string;
|
|
24
|
-
export declare function calculateRequiredArangoSearchViewCreateOperations(existingViews:
|
|
25
|
-
export declare function calculateRequiredArangoSearchViewDropOperations(views:
|
|
24
|
+
export declare function calculateRequiredArangoSearchViewCreateOperations(existingViews: ReadonlyArray<View>, requiredViews: ReadonlyArray<ArangoSearchDefinition>, db: Database, configuration?: ArangoSearchConfiguration): Promise<ReadonlyArray<SchemaMigration>>;
|
|
25
|
+
export declare function calculateRequiredArangoSearchViewDropOperations(views: ReadonlyArray<View>, definitions: ReadonlyArray<ArangoSearchDefinition>): ReadonlyArray<SchemaMigration>;
|
|
26
26
|
/**
|
|
27
27
|
* Configures the inBackground flag
|
|
28
28
|
*
|
|
29
|
-
* We don'
|
|
29
|
+
* We don't to this initially because it won't be present in the actual view definition, and we would always see a
|
|
30
30
|
* pending change in the migration analyzer (because it would want to add inBackground).
|
|
31
31
|
*/
|
|
32
|
-
export declare function configureForBackgroundCreation(definition:
|
|
33
|
-
export declare function isEqualProperties(definitionProperties:
|
|
34
|
-
export declare function calculateRequiredArangoSearchViewUpdateOperations(views:
|
|
35
|
-
export declare function areAnalyzersEqual(
|
|
32
|
+
export declare function configureForBackgroundCreation<T extends ArangoSearchViewPropertiesOptions>(definition: T): T;
|
|
33
|
+
export declare function isEqualProperties(definitionProperties: CreateArangoSearchViewOptions, viewProperties: ViewProperties): boolean;
|
|
34
|
+
export declare function calculateRequiredArangoSearchViewUpdateOperations(views: ReadonlyArray<View>, definitions: ReadonlyArray<ArangoSearchDefinition>, db: Database, configuration?: ArangoSearchConfiguration): Promise<ReadonlyArray<SchemaMigration>>;
|
|
35
|
+
export declare function areAnalyzersEqual(actual: AnalyzerDescription, target: CreateAnalyzerOptions): boolean;
|
|
@@ -58,7 +58,7 @@ exports.calculateRequiredArangoSearchViewDropOperations = calculateRequiredArang
|
|
|
58
58
|
/**
|
|
59
59
|
* Configures the inBackground flag
|
|
60
60
|
*
|
|
61
|
-
* We don'
|
|
61
|
+
* We don't to this initially because it won't be present in the actual view definition, and we would always see a
|
|
62
62
|
* pending change in the migration analyzer (because it would want to add inBackground).
|
|
63
63
|
*/
|
|
64
64
|
function configureForBackgroundCreation(definition) {
|
|
@@ -69,7 +69,6 @@ function configureForBackgroundCreation(definition) {
|
|
|
69
69
|
key,
|
|
70
70
|
{
|
|
71
71
|
...value,
|
|
72
|
-
// missing in types, see https://github.com/arangodb/arangojs/issues/759
|
|
73
72
|
// if this is not set, creating the view would acquire an exclusive lock on the collections
|
|
74
73
|
inBackground: true,
|
|
75
74
|
},
|
|
@@ -81,6 +80,7 @@ exports.configureForBackgroundCreation = configureForBackgroundCreation;
|
|
|
81
80
|
function getPropertiesFromDefinition(definition, configuration) {
|
|
82
81
|
const recursionDepth = configuration && configuration.recursionDepth ? configuration.recursionDepth : 1;
|
|
83
82
|
return {
|
|
83
|
+
type: 'arangosearch',
|
|
84
84
|
links: {
|
|
85
85
|
[definition.collectionName]: {
|
|
86
86
|
analyzers: [flex_search_1.IDENTITY_ANALYZER],
|
|
@@ -143,12 +143,20 @@ function getPropertiesFromDefinition(definition, configuration) {
|
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
function isEqualProperties(definitionProperties, viewProperties) {
|
|
146
|
+
if (viewProperties.type !== 'arangosearch') {
|
|
147
|
+
// we always need an 'arangosearch' view
|
|
148
|
+
return false;
|
|
149
|
+
}
|
|
146
150
|
return ((0, lodash_1.isEqual)(definitionProperties.links, viewProperties.links) &&
|
|
147
151
|
(0, lodash_1.isEqual)(definitionProperties.primarySort, viewProperties.primarySort) &&
|
|
148
152
|
(0, lodash_1.isEqual)(definitionProperties.commitIntervalMsec, viewProperties.commitIntervalMsec /* somehow missing in types */));
|
|
149
153
|
}
|
|
150
154
|
exports.isEqualProperties = isEqualProperties;
|
|
151
155
|
function isRecreateRequired(definitionProperties, viewProperties) {
|
|
156
|
+
if (viewProperties.type !== 'arangosearch') {
|
|
157
|
+
// we always need an 'arangosearch' view
|
|
158
|
+
return true;
|
|
159
|
+
}
|
|
152
160
|
return !(0, lodash_1.isEqual)(definitionProperties.primarySort, viewProperties.primarySort);
|
|
153
161
|
}
|
|
154
162
|
async function calculateRequiredArangoSearchViewUpdateOperations(views, definitions, db, configuration) {
|
|
@@ -186,17 +194,17 @@ async function calculateRequiredArangoSearchViewUpdateOperations(views, definiti
|
|
|
186
194
|
return viewsWithUpdateRequired;
|
|
187
195
|
}
|
|
188
196
|
exports.calculateRequiredArangoSearchViewUpdateOperations = calculateRequiredArangoSearchViewUpdateOperations;
|
|
189
|
-
function areAnalyzersEqual(
|
|
190
|
-
if (
|
|
197
|
+
function areAnalyzersEqual(actual, target) {
|
|
198
|
+
if (actual.type !== target.type) {
|
|
191
199
|
return false;
|
|
192
200
|
}
|
|
193
|
-
if (
|
|
201
|
+
if (actual.type === 'norm' && target.type === 'norm') {
|
|
194
202
|
// arangodb 3.9 removed the .utf-8 suffix
|
|
195
|
-
return (
|
|
196
|
-
|
|
197
|
-
normalizeLocale(
|
|
203
|
+
return (actual.properties.case === target.properties.case &&
|
|
204
|
+
actual.properties.accent === target.properties.accent &&
|
|
205
|
+
normalizeLocale(actual.properties.locale) === normalizeLocale(target.properties.locale));
|
|
198
206
|
}
|
|
199
|
-
return (0, deep_equal_1.default)(
|
|
207
|
+
return (0, deep_equal_1.default)(actual, target);
|
|
200
208
|
}
|
|
201
209
|
exports.areAnalyzersEqual = areAnalyzersEqual;
|
|
202
210
|
function normalizeLocale(locale) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arango-search-helpers.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/arango-search-helpers.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"arango-search-helpers.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/arango-search-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CreateAnalyzerOptions } from 'arangojs/analyzer';
|
|
2
|
-
import { ArangoSearchViewPropertiesOptions } from 'arangojs/view';
|
|
2
|
+
import { ArangoSearchViewPropertiesOptions, CreateArangoSearchViewOptions } from 'arangojs/view';
|
|
3
3
|
import { Relation } from '../../../model/implementation';
|
|
4
4
|
import { IndexDefinition } from './index-helpers';
|
|
5
5
|
export declare type SchemaMigration = CreateIndexMigration | DropIndexMigration | CreateDocumentCollectionMigration | CreateEdgeCollectionMigration | CreateArangoSearchViewMigration | DropArangoSearchViewMigration | UpdateArangoSearchViewMigration | RecreateArangoSearchViewMigration | CreateArangoSearchAnalyzerMigration | UpdateArangoSearchAnalyzerMigration;
|
|
@@ -48,11 +48,15 @@ export declare class CreateEdgeCollectionMigration {
|
|
|
48
48
|
}
|
|
49
49
|
interface CreateArangoSearchViewMigrationConfig {
|
|
50
50
|
readonly viewName: string;
|
|
51
|
-
readonly properties:
|
|
51
|
+
readonly properties: CreateArangoSearchViewOptions;
|
|
52
52
|
readonly collectionName: string;
|
|
53
53
|
readonly collectionSize?: number;
|
|
54
54
|
}
|
|
55
|
-
interface UpdateArangoSearchViewMigrationConfig
|
|
55
|
+
interface UpdateArangoSearchViewMigrationConfig {
|
|
56
|
+
readonly viewName: string;
|
|
57
|
+
readonly properties: ArangoSearchViewPropertiesOptions;
|
|
58
|
+
readonly collectionName: string;
|
|
59
|
+
readonly collectionSize?: number;
|
|
56
60
|
}
|
|
57
61
|
interface DropArangoSearchViewMigrationConfig {
|
|
58
62
|
readonly viewName: string;
|
|
@@ -80,7 +84,7 @@ export declare class UpdateArangoSearchViewMigration {
|
|
|
80
84
|
export declare class CreateArangoSearchViewMigration {
|
|
81
85
|
readonly type: 'createArangoSearchView';
|
|
82
86
|
readonly viewName: string;
|
|
83
|
-
readonly properties:
|
|
87
|
+
readonly properties: CreateArangoSearchViewOptions;
|
|
84
88
|
readonly collectionName: string;
|
|
85
89
|
readonly collectionSize?: number;
|
|
86
90
|
constructor(config: CreateArangoSearchViewMigrationConfig);
|
|
@@ -91,7 +95,7 @@ export declare class CreateArangoSearchViewMigration {
|
|
|
91
95
|
export declare class RecreateArangoSearchViewMigration {
|
|
92
96
|
readonly type: 'recreateArangoSearchView';
|
|
93
97
|
readonly viewName: string;
|
|
94
|
-
readonly properties:
|
|
98
|
+
readonly properties: CreateArangoSearchViewOptions;
|
|
95
99
|
readonly collectionName: string;
|
|
96
100
|
readonly collectionSize?: number;
|
|
97
101
|
constructor(config: CreateArangoSearchViewMigrationConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/migrations.ts"],"names":[],"mappings":";;;AAGA,mDAAqF;AAmBrF,MAAa,oBAAoB;IAK7B,YAAY,MAAkC;QAJrC,SAAI,GAAkB,aAAa,CAAC;QAKzC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;IAChD,CAAC;IAED,IAAI,WAAW;QACX,OAAO,UAAU,IAAA,6BAAa,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,EAAE;QACF,OAAO,eAAe,IAAA,kCAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAC3D,CAAC;IAED,IAAI,WAAW;QACX,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AArBD,oDAqBC;AAOD,MAAa,kBAAkB;IAK3B,YAAY,MAAgC;QAJnC,SAAI,GAAgB,WAAW,CAAC;QAKrC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;IAChD,CAAC;IAED,IAAI,WAAW;QACX,OAAO,QAAQ,IAAA,6BAAa,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/C,CAAC;IAED,IAAI,EAAE;QACF,OAAO,aAAa,IAAA,kCAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACzD,CAAC;IAED,IAAI,WAAW;QACX,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AArBD,gDAqBC;AAED,MAAa,iCAAiC;IAG1C,YAA4B,cAAsB;QAAtB,mBAAc,GAAd,cAAc,CAAQ;QAFzC,SAAI,GAA+B,0BAA0B,CAAC;IAElB,CAAC;IAEtD,IAAI,WAAW;QACX,OAAO,8BAA8B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC/D,CAAC;IAED,IAAI,EAAE;QACF,OAAO,uCAAuC,IAAI,CAAC,cAAc,EAAE,CAAC;IACxE,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAhBD,8EAgBC;AAED,MAAa,6BAA6B;IAGtC,YAA4B,QAAkB,EAAkB,cAAsB;QAA1D,aAAQ,GAAR,QAAQ,CAAU;QAAkB,mBAAc,GAAd,cAAc,CAAQ;QAF7E,SAAI,GAA2B,sBAAsB,CAAC;IAE0B,CAAC;IAE1F,IAAI,WAAW;QACX,OAAO,0BAA0B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC3D,CAAC;IAED,IAAI,EAAE;QACF,OAAO,mCAAmC,IAAI,CAAC,cAAc,EAAE,CAAC;IACpE,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAhBD,sEAgBC;
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MigrationPerformer = void 0;
|
|
4
|
-
const
|
|
4
|
+
const collection_1 = require("arangojs/collection");
|
|
5
5
|
const config_1 = require("../config");
|
|
6
6
|
const error_codes_1 = require("../error-codes");
|
|
7
7
|
const arango_search_helpers_1 = require("./arango-search-helpers");
|
|
@@ -43,7 +43,7 @@ class MigrationPerformer {
|
|
|
43
43
|
unique: migration.index.unique,
|
|
44
44
|
sparse: migration.index.sparse,
|
|
45
45
|
inBackground: this.config.createIndicesInBackground,
|
|
46
|
-
}
|
|
46
|
+
});
|
|
47
47
|
}
|
|
48
48
|
async dropIndex(migration) {
|
|
49
49
|
try {
|
|
@@ -61,14 +61,14 @@ class MigrationPerformer {
|
|
|
61
61
|
try {
|
|
62
62
|
await this.db.createCollection(migration.collectionName, {
|
|
63
63
|
...this.config.createCollectionOptions,
|
|
64
|
-
type:
|
|
64
|
+
type: collection_1.CollectionType.DOCUMENT_COLLECTION,
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
67
|
catch (e) {
|
|
68
68
|
// maybe the collection has been created in the meantime
|
|
69
69
|
if (e.errorNum === error_codes_1.ERROR_ARANGO_DUPLICATE_NAME) {
|
|
70
70
|
const collection = await this.db.collection(migration.collectionName).get();
|
|
71
|
-
if (collection.type ===
|
|
71
|
+
if (collection.type === collection_1.CollectionType.DOCUMENT_COLLECTION) {
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -79,14 +79,14 @@ class MigrationPerformer {
|
|
|
79
79
|
try {
|
|
80
80
|
await this.db.createCollection(migration.collectionName, {
|
|
81
81
|
...this.config.createCollectionOptions,
|
|
82
|
-
type:
|
|
82
|
+
type: collection_1.CollectionType.EDGE_COLLECTION,
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
85
|
catch (e) {
|
|
86
86
|
// maybe the collection has been created in the meantime
|
|
87
87
|
if (e.errorNum === error_codes_1.ERROR_ARANGO_DUPLICATE_NAME) {
|
|
88
88
|
const collection = await this.db.collection(migration.collectionName).get();
|
|
89
|
-
if (collection.type ===
|
|
89
|
+
if (collection.type === collection_1.CollectionType.EDGE_COLLECTION) {
|
|
90
90
|
return;
|
|
91
91
|
}
|
|
92
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performer.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/performer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"performer.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/performer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { ProjectOptions } from '../../config/interfaces';
|
|
|
2
2
|
import { Model } from '../../model';
|
|
3
3
|
import { QueryNode } from '../../query-tree';
|
|
4
4
|
import { FlexSearchTokenization } from '../../query-tree/flex-search';
|
|
5
|
-
import { DatabaseAdapter, FlexSearchTokenizable } from '../database-adapter';
|
|
5
|
+
import { DatabaseAdapter, ExecutionArgs, ExecutionResult, FlexSearchTokenizable } from '../database-adapter';
|
|
6
6
|
export declare class InMemoryDB {
|
|
7
7
|
collections: {
|
|
8
8
|
[name: string]: any[];
|
|
@@ -22,6 +22,7 @@ export declare class InMemoryAdapter implements DatabaseAdapter {
|
|
|
22
22
|
*/
|
|
23
23
|
private executeQueries;
|
|
24
24
|
execute(queryTree: QueryNode): Promise<any>;
|
|
25
|
+
executeExt(args: ExecutionArgs): Promise<ExecutionResult>;
|
|
25
26
|
updateSchema(model: Model): Promise<void>;
|
|
26
27
|
tokenizeExpressions(tokenizations: ReadonlyArray<FlexSearchTokenizable>): Promise<ReadonlyArray<FlexSearchTokenization>>;
|
|
27
28
|
}
|
|
@@ -7,6 +7,7 @@ const like_helpers_1 = require("../like-helpers");
|
|
|
7
7
|
const inmemory_basics_1 = require("./inmemory-basics");
|
|
8
8
|
const js_generator_1 = require("./js-generator");
|
|
9
9
|
const uuid_1 = require("uuid");
|
|
10
|
+
const execution_options_1 = require("../../execution/execution-options");
|
|
10
11
|
class InMemoryDB {
|
|
11
12
|
constructor() {
|
|
12
13
|
this.collections = {};
|
|
@@ -213,11 +214,21 @@ class InMemoryAdapter {
|
|
|
213
214
|
}
|
|
214
215
|
}
|
|
215
216
|
async execute(queryTree) {
|
|
217
|
+
const result = await this.executeExt({ queryTree });
|
|
218
|
+
if (result.error) {
|
|
219
|
+
throw result.error;
|
|
220
|
+
}
|
|
221
|
+
return result.data;
|
|
222
|
+
}
|
|
223
|
+
async executeExt(args) {
|
|
224
|
+
var _a;
|
|
216
225
|
global_1.globalContext.registerContext(this.schemaContext);
|
|
217
226
|
let executableQueries;
|
|
218
227
|
let jsQuery;
|
|
219
228
|
try {
|
|
220
|
-
jsQuery = (0, js_generator_1.getJSQuery)(queryTree
|
|
229
|
+
jsQuery = (0, js_generator_1.getJSQuery)(args.queryTree, {
|
|
230
|
+
clock: (_a = args.clock) !== null && _a !== void 0 ? _a : new execution_options_1.DefaultClock(),
|
|
231
|
+
});
|
|
221
232
|
executableQueries = jsQuery.getExecutableQueries();
|
|
222
233
|
}
|
|
223
234
|
finally {
|
|
@@ -226,7 +237,10 @@ class InMemoryAdapter {
|
|
|
226
237
|
if (this.logger.isTraceEnabled()) {
|
|
227
238
|
this.logger.trace(`Executing JavaScript: ${jsQuery.toColoredString()}`);
|
|
228
239
|
}
|
|
229
|
-
|
|
240
|
+
const data = this.executeQueries(executableQueries);
|
|
241
|
+
return {
|
|
242
|
+
data,
|
|
243
|
+
};
|
|
230
244
|
}
|
|
231
245
|
async updateSchema(model) {
|
|
232
246
|
const rootEntities = model.rootEntityTypes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inmemory-adapter.js","sourceRoot":"","sources":["../../../../src/database/inmemory/inmemory-adapter.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAIpD,iDAA4F;
|
|
1
|
+
{"version":3,"file":"inmemory-adapter.js","sourceRoot":"","sources":["../../../../src/database/inmemory/inmemory-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { QueryNode } from '../../query-tree';
|
|
2
2
|
import { JSCompoundQuery } from './js';
|
|
3
|
-
|
|
3
|
+
import { Clock } from '../../execution/execution-options';
|
|
4
|
+
export interface QueryGenerationOptions {
|
|
5
|
+
/**
|
|
6
|
+
* An interface to determine the current date/time
|
|
7
|
+
*/
|
|
8
|
+
readonly clock: Clock;
|
|
9
|
+
}
|
|
10
|
+
export declare function getJSQuery(node: QueryNode, options?: Partial<QueryGenerationOptions>): JSCompoundQuery;
|
|
4
11
|
/**
|
|
5
12
|
* Is thrown if a FlexSearch query containing fulltext-filters is performed for an in-memory database.
|
|
6
13
|
*/
|
|
@@ -13,9 +13,15 @@ const utils_1 = require("../../utils/utils");
|
|
|
13
13
|
const like_helpers_1 = require("../like-helpers");
|
|
14
14
|
const inmemory_basics_1 = require("./inmemory-basics");
|
|
15
15
|
const js_1 = require("./js");
|
|
16
|
+
const execution_options_1 = require("../../execution/execution-options");
|
|
16
17
|
const ID_FIELD_NAME = 'id';
|
|
17
18
|
class QueryContext {
|
|
18
|
-
constructor(
|
|
19
|
+
constructor(
|
|
20
|
+
/**
|
|
21
|
+
* Options that do not change within one query tree
|
|
22
|
+
*/
|
|
23
|
+
options) {
|
|
24
|
+
this.options = options;
|
|
19
25
|
this.variableMap = new Map();
|
|
20
26
|
this.preExecQueries = [];
|
|
21
27
|
}
|
|
@@ -24,7 +30,7 @@ class QueryContext {
|
|
|
24
30
|
* context are available.
|
|
25
31
|
*/
|
|
26
32
|
newPreExecContext() {
|
|
27
|
-
const newContext = new QueryContext();
|
|
33
|
+
const newContext = new QueryContext(this.options);
|
|
28
34
|
this.variableMap.forEach((jsVar, varNode) => {
|
|
29
35
|
if (jsVar instanceof js_1.JSQueryResultVariable) {
|
|
30
36
|
newContext.variableMap.set(varNode, jsVar);
|
|
@@ -41,7 +47,7 @@ class QueryContext {
|
|
|
41
47
|
if (this.variableMap.has(variableNode)) {
|
|
42
48
|
throw new Error(`Variable ${variableNode} is introduced twice`);
|
|
43
49
|
}
|
|
44
|
-
const newContext = new QueryContext();
|
|
50
|
+
const newContext = new QueryContext(this.options);
|
|
45
51
|
newContext.variableMap = new Map(this.variableMap);
|
|
46
52
|
newContext.variableMap.set(variableNode, jsVariable);
|
|
47
53
|
newContext.preExecQueries = this.preExecQueries;
|
|
@@ -714,7 +720,7 @@ register(flex_search_2.FlexSearchComplexOperatorQueryNode, (node, context) => {
|
|
|
714
720
|
throw new Error(`Internal Error: FlexSearchComplexOperatorQueryNode must be expanded before generating the query.`);
|
|
715
721
|
});
|
|
716
722
|
register(query_tree_1.CreateBillingEntityQueryNode, (node, context) => {
|
|
717
|
-
const currentTimestamp =
|
|
723
|
+
const currentTimestamp = context.options.clock.getCurrentTimestamp();
|
|
718
724
|
const billingEntities = js_1.js.collection('billingEntities');
|
|
719
725
|
return jsExt.executingFunction((0, js_1.js) `
|
|
720
726
|
const entry = ${billingEntities}.find(value => (value.key === ${node.key} && value.type === ${node.rootEntityTypeName}));
|
|
@@ -733,7 +739,7 @@ register(query_tree_1.CreateBillingEntityQueryNode, (node, context) => {
|
|
|
733
739
|
});
|
|
734
740
|
register(query_tree_1.ConfirmForBillingQueryNode, (node, context) => {
|
|
735
741
|
const key = processNode(node.keyNode, context);
|
|
736
|
-
const currentTimestamp =
|
|
742
|
+
const currentTimestamp = context.options.clock.getCurrentTimestamp();
|
|
737
743
|
const billingEntities = js_1.js.collection('billingEntities');
|
|
738
744
|
return jsExt.executingFunction((0, js_1.js) `
|
|
739
745
|
const entry = ${billingEntities}.find(value => (value.key === ${key} && value.type === ${node.rootEntityTypeName}));
|
|
@@ -809,8 +815,11 @@ function processNode(node, context) {
|
|
|
809
815
|
}
|
|
810
816
|
// TODO I think JSCompoundQuery (JS transaction node) should not be the exported type
|
|
811
817
|
// we should rather export JSExecutableQuery[] (as JS transaction) directly.
|
|
812
|
-
function getJSQuery(node) {
|
|
813
|
-
|
|
818
|
+
function getJSQuery(node, options = {}) {
|
|
819
|
+
var _a;
|
|
820
|
+
return createJSCompoundQuery(node, js_1.js.queryResultVariable('result'), undefined, new QueryContext({
|
|
821
|
+
clock: (_a = options.clock) !== null && _a !== void 0 ? _a : new execution_options_1.DefaultClock(),
|
|
822
|
+
}));
|
|
814
823
|
}
|
|
815
824
|
exports.getJSQuery = getJSQuery;
|
|
816
825
|
function getCollectionForType(type, context) {
|