@ceramicnetwork/indexing 2.3.0 → 2.4.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/local-index-api.d.ts +4 -3
- package/lib/local-index-api.d.ts.map +1 -1
- package/lib/local-index-api.js +8 -7
- package/lib/local-index-api.js.map +1 -1
- package/lib/tables-manager.d.ts +4 -3
- package/lib/tables-manager.d.ts.map +1 -1
- package/lib/tables-manager.js +22 -16
- package/lib/tables-manager.js.map +1 -1
- package/package.json +13 -12
package/lib/local-index-api.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BaseQuery, IndexApi, ModelData, Page, PaginationQuery, StreamState, DiagnosticsLogger,
|
|
1
|
+
import type { BaseQuery, IndexApi, ModelData, Page, PaginationQuery, StreamState, DiagnosticsLogger, StreamStateLoader, StreamReader } from '@ceramicnetwork/common';
|
|
2
2
|
import type { IndexModelArgs } from './database-index-api.js';
|
|
3
3
|
import { IndexStreamArgs } from './database-index-api.js';
|
|
4
4
|
import { StreamID } from '@ceramicnetwork/streamid';
|
|
@@ -7,11 +7,12 @@ import { Networks } from '@ceramicnetwork/common';
|
|
|
7
7
|
import { type LoadingInterfaceImplements } from '@ceramicnetwork/stream-model';
|
|
8
8
|
import { ISyncQueryApi } from './history-sync/interfaces.js';
|
|
9
9
|
export declare class LocalIndexApi implements IndexApi {
|
|
10
|
-
private readonly
|
|
10
|
+
private readonly reader;
|
|
11
|
+
private readonly loader;
|
|
11
12
|
private readonly logger;
|
|
12
13
|
private readonly databaseIndexApi;
|
|
13
14
|
readonly enabled: boolean;
|
|
14
|
-
constructor(indexingConfig: IndexingConfig | undefined,
|
|
15
|
+
constructor(indexingConfig: IndexingConfig | undefined, reader: StreamReader, loader: StreamStateLoader, logger: DiagnosticsLogger, networkName: Networks);
|
|
15
16
|
setSyncQueryApi(api: ISyncQueryApi): void;
|
|
16
17
|
shouldIndexStream(args: StreamID): boolean;
|
|
17
18
|
indexStream(args: IndexStreamArgs): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-index-api.d.ts","sourceRoot":"","sources":["../src/local-index-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"local-index-api.d.ts","sourceRoot":"","sources":["../src/local-index-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACb,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EACL,KAAK,0BAA0B,EAGhC,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AA0C5D,qBAAa,aAAc,YAAW,QAAQ;IAM1C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAPzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA8B;IAC/D,SAAgB,OAAO,EAAE,OAAO,CAAA;gBAG9B,cAAc,EAAE,cAAc,GAAG,SAAS,EACzB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,iBAAiB,EAC1C,WAAW,EAAE,QAAQ;IAMvB,eAAe,CAAC,GAAG,EAAE,aAAa;IAMlC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAcpC,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjD,KAAK,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxC,KAAK,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAwCtE,aAAa,IAAI,KAAK,CAAC,SAAS,CAAC;IAI3B,iCAAiC,CACrC,qBAAqB,EAAE,KAAK,CAAC,SAAS,CAAC,EACvC,SAAS,EAAE,SAAS,EACpB,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,cAAc,CAAC;IAiBpB,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
|
package/lib/local-index-api.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { makeIndexApi } from './make-index-api.js';
|
|
2
2
|
import { Model, loadAllModelInterfaces, } from '@ceramicnetwork/stream-model';
|
|
3
|
-
async function _getIndexModelArgs(
|
|
3
|
+
async function _getIndexModelArgs(reader, req, loading = {}) {
|
|
4
4
|
const modelStreamId = req.streamID;
|
|
5
5
|
if (modelStreamId.type != Model.STREAM_TYPE_ID && !modelStreamId.equals(Model.MODEL)) {
|
|
6
6
|
throw new Error(`Cannot index ${modelStreamId.toString()}, it is not a Model StreamID`);
|
|
@@ -9,7 +9,7 @@ async function _getIndexModelArgs(req, core, loading = {}) {
|
|
|
9
9
|
model: modelStreamId,
|
|
10
10
|
};
|
|
11
11
|
if (modelStreamId.type == Model.STREAM_TYPE_ID) {
|
|
12
|
-
const modelState = await
|
|
12
|
+
const modelState = await reader.loadStream(modelStreamId, {});
|
|
13
13
|
const content = modelState.state.next?.content ?? modelState.state.content;
|
|
14
14
|
Model.assertVersionValid(content, 'major');
|
|
15
15
|
if (content.interface) {
|
|
@@ -19,15 +19,16 @@ async function _getIndexModelArgs(req, core, loading = {}) {
|
|
|
19
19
|
opts.relations = content.relations;
|
|
20
20
|
}
|
|
21
21
|
if (content.implements) {
|
|
22
|
-
opts.implements = await loadAllModelInterfaces(
|
|
22
|
+
opts.implements = await loadAllModelInterfaces(reader, content.implements, loading);
|
|
23
23
|
}
|
|
24
24
|
opts.indices = req.indices;
|
|
25
25
|
}
|
|
26
26
|
return opts;
|
|
27
27
|
}
|
|
28
28
|
export class LocalIndexApi {
|
|
29
|
-
constructor(indexingConfig,
|
|
30
|
-
this.
|
|
29
|
+
constructor(indexingConfig, reader, loader, logger, networkName) {
|
|
30
|
+
this.reader = reader;
|
|
31
|
+
this.loader = loader;
|
|
31
32
|
this.logger = logger;
|
|
32
33
|
this.databaseIndexApi = makeIndexApi(indexingConfig, networkName, logger);
|
|
33
34
|
this.enabled = indexingConfig != null && !indexingConfig.disableComposedb;
|
|
@@ -67,7 +68,7 @@ export class LocalIndexApi {
|
|
|
67
68
|
}
|
|
68
69
|
const page = await this.databaseIndexApi.page(query);
|
|
69
70
|
const edges = await Promise.all(page.edges.map(async (edge) => {
|
|
70
|
-
const node = (await this.
|
|
71
|
+
const node = (await this.loader.loadStreamState(edge.node)) ?? null;
|
|
71
72
|
if (!node) {
|
|
72
73
|
this.logger.warn(`
|
|
73
74
|
Did not find stream state for streamid ${edge.node} in our state store when serving an indexed query.
|
|
@@ -98,7 +99,7 @@ export class LocalIndexApi {
|
|
|
98
99
|
if (modelNoLongerIndexed) {
|
|
99
100
|
throw new Error(`Cannot re-index model ${modelStreamId.toString()}, data may not be up-to-date`);
|
|
100
101
|
}
|
|
101
|
-
return await _getIndexModelArgs(
|
|
102
|
+
return await _getIndexModelArgs(this.reader, modelData, loading);
|
|
102
103
|
}
|
|
103
104
|
async indexModels(models) {
|
|
104
105
|
const modelsNoLongerIndexed = (await this.databaseIndexApi?.getModelsNoLongerIndexed()) ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-index-api.js","sourceRoot":"","sources":["../src/local-index-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"local-index-api.js","sourceRoot":"","sources":["../src/local-index-api.ts"],"names":[],"mappings":"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"}
|
package/lib/tables-manager.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export declare class TablesManager {
|
|
|
13
13
|
constructor(dbType: DatabaseType, dataSource: Knex, logger: DiagnosticsLogger);
|
|
14
14
|
listMidTables(): Promise<Array<string>>;
|
|
15
15
|
initMidTables(_modelsToIndex: Array<IndexModelArgs>): Promise<void>;
|
|
16
|
-
|
|
16
|
+
assertHasMidIndices(_tableName: string, _args: IndexModelArgs): Promise<void>;
|
|
17
17
|
hasJsonBSupport(): boolean;
|
|
18
18
|
listConfigTables(): Array<ConfigTable>;
|
|
19
19
|
initConfigTables(network: Networks): Promise<void>;
|
|
@@ -23,13 +23,14 @@ export declare class TablesManager {
|
|
|
23
23
|
_verifyMidTables(modelsToIndex: Array<IndexModelArgs>): Promise<void>;
|
|
24
24
|
_verifyMidTable(tableName: string, modelsToIndex: Array<IndexModelArgs>): Promise<void>;
|
|
25
25
|
verifyTables(modelsToIndex: Array<IndexModelArgs>): Promise<void>;
|
|
26
|
+
validateIndices(tableName: string, expect: Array<string>, actual: Array<string>): void;
|
|
26
27
|
}
|
|
27
28
|
export declare class PostgresTablesManager extends TablesManager {
|
|
28
29
|
constructor(dataSource: Knex, logger: DiagnosticsLogger);
|
|
29
30
|
listMidTables(): Promise<Array<string>>;
|
|
30
31
|
initMidTables(modelsToIndex: Array<IndexModelArgs>): Promise<void>;
|
|
31
32
|
initMidTable(modelIndexArgs: IndexModelArgs): Promise<void>;
|
|
32
|
-
|
|
33
|
+
assertHasMidIndices(tableName: string, args: IndexModelArgs): Promise<void>;
|
|
33
34
|
hasJsonBSupport(): boolean;
|
|
34
35
|
}
|
|
35
36
|
export declare class SqliteTablesManager extends TablesManager {
|
|
@@ -37,7 +38,7 @@ export declare class SqliteTablesManager extends TablesManager {
|
|
|
37
38
|
listMidTables(): Promise<Array<string>>;
|
|
38
39
|
initMidTables(modelsToIndex: Array<IndexModelArgs>): Promise<void>;
|
|
39
40
|
initMidTable(modelIndexArgs: IndexModelArgs, existingTables: Array<string>): Promise<void>;
|
|
40
|
-
|
|
41
|
+
assertHasMidIndices(tableName: string, args: IndexModelArgs): Promise<void>;
|
|
41
42
|
hasJsonBSupport(): boolean;
|
|
42
43
|
}
|
|
43
44
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables-manager.d.ts","sourceRoot":"","sources":["../src/tables-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAUb,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,EAEL,cAAc,EAGf,MAAM,yBAAyB,CAAA;AAQhC,aAAK,WAAW,GAAG;IACjB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC7B,CAAA;AAcD,qBAAa,aAAa;IAEtB,QAAQ,CAAC,MAAM,EAAE,YAAY;IAC7B,QAAQ,CAAC,UAAU,EAAE,IAAI;IACzB,QAAQ,CAAC,MAAM,EAAE,iBAAiB;gBAFzB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,iBAAiB;IAM9B,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAOvC,aAAa,CAAC,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IASnE,
|
|
1
|
+
{"version":3,"file":"tables-manager.d.ts","sourceRoot":"","sources":["../src/tables-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAUb,MAAM,sCAAsC,CAAA;AAE7C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,EAEL,cAAc,EAGf,MAAM,yBAAyB,CAAA;AAQhC,aAAK,WAAW,GAAG;IACjB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAC7B,CAAA;AAcD,qBAAa,aAAa;IAEtB,QAAQ,CAAC,MAAM,EAAE,YAAY;IAC7B,QAAQ,CAAC,UAAU,EAAE,IAAI;IACzB,QAAQ,CAAC,MAAM,EAAE,iBAAiB;gBAFzB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,iBAAiB;IAM9B,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAOvC,aAAa,CAAC,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IASnE,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnF,eAAe,IAAI,OAAO;IAO1B,gBAAgB,IAAI,KAAK,CAAC,WAAW,CAAC;IAkBhC,gBAAgB,CAAC,OAAO,EAAE,QAAQ;IAYlC,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ;IAwBrD,mBAAmB;IAYnB,kBAAkB,CAAC,KAAK,EAAE,WAAW;IAerC,gBAAgB,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,CAAC;IAYrD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,cAAc,CAAC;IA+BvE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,CAAC;IAIvD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;CAWhF;AAWD,qBAAa,qBAAsB,SAAQ,aAAa;gBAC1C,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB;IAOxC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAavC,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,CAAC;IAW3D,YAAY,CAAC,cAAc,EAAE,cAAc;IAkClC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBjF,eAAe,IAAI,OAAO;CAGpC;AASD,qBAAa,mBAAoB,SAAQ,aAAa;gBACxC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB;IAOxC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAYvC,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,CAAC;IAY3D,YAAY,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC;IA8BjE,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBjF,eAAe,IAAI,OAAO;CAGpC"}
|
package/lib/tables-manager.js
CHANGED
|
@@ -25,7 +25,7 @@ export class TablesManager {
|
|
|
25
25
|
async initMidTables(_modelsToIndex) {
|
|
26
26
|
throw new Error('Must be implemented in extending class');
|
|
27
27
|
}
|
|
28
|
-
async
|
|
28
|
+
async assertHasMidIndices(_tableName, _args) {
|
|
29
29
|
throw new Error('Must be implemented in extending class');
|
|
30
30
|
}
|
|
31
31
|
hasJsonBSupport() {
|
|
@@ -106,13 +106,21 @@ export class TablesManager {
|
|
|
106
106
|
if (validSchema != actualSchema) {
|
|
107
107
|
throw new Error(`Schema verification failed for index: ${tableName}. Please make sure latest migrations have been applied.`);
|
|
108
108
|
}
|
|
109
|
-
|
|
110
|
-
throw new Error(`Schema verification failed for index: ${tableName}. Please make sure latest migrations have been applied.`);
|
|
111
|
-
}
|
|
109
|
+
await this.assertHasMidIndices(tableName, modelIndexArgs);
|
|
112
110
|
}
|
|
113
111
|
async verifyTables(modelsToIndex) {
|
|
114
112
|
await Promise.all([this._verifyConfigTables(), this._verifyMidTables(modelsToIndex)]);
|
|
115
113
|
}
|
|
114
|
+
validateIndices(tableName, expect, actual) {
|
|
115
|
+
const missingIndices = expect.filter((indexName) => {
|
|
116
|
+
return !actual.includes(indexName);
|
|
117
|
+
});
|
|
118
|
+
if (missingIndices.length > 0) {
|
|
119
|
+
throw new Error(`Schema verification failed for index: ${tableName}. Please make sure latest migrations have been applied.
|
|
120
|
+
Missing Indices=${JSON.stringify(missingIndices)}
|
|
121
|
+
Actual=${JSON.stringify(actual)}`);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
116
124
|
}
|
|
117
125
|
export class PostgresTablesManager extends TablesManager {
|
|
118
126
|
constructor(dataSource, logger) {
|
|
@@ -157,21 +165,20 @@ export class PostgresTablesManager extends TablesManager {
|
|
|
157
165
|
});
|
|
158
166
|
}
|
|
159
167
|
}
|
|
160
|
-
async
|
|
168
|
+
async assertHasMidIndices(tableName, args) {
|
|
161
169
|
const expectedIndices = defaultIndices(tableName).indices.flatMap((index) => index.name);
|
|
162
170
|
if (args && args.indices) {
|
|
163
171
|
for (const index of args.indices) {
|
|
164
|
-
expectedIndices.push(fieldsIndexName(index, tableName));
|
|
172
|
+
expectedIndices.push(fieldsIndexName(index, tableName).toLowerCase());
|
|
165
173
|
}
|
|
166
174
|
}
|
|
167
|
-
const
|
|
168
|
-
const actualIndices = await this.dataSource.raw(`
|
|
175
|
+
const indicesResult = (await this.dataSource.raw(`
|
|
169
176
|
select *
|
|
170
177
|
from pg_indexes
|
|
171
178
|
where tablename like '${tableName}'
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
179
|
+
`));
|
|
180
|
+
const actualIndices = indicesResult ? indicesResult.rows.map((row) => row.indexname) : [];
|
|
181
|
+
this.validateIndices(tableName, expectedIndices, actualIndices);
|
|
175
182
|
}
|
|
176
183
|
hasJsonBSupport() {
|
|
177
184
|
return true;
|
|
@@ -217,23 +224,22 @@ export class SqliteTablesManager extends TablesManager {
|
|
|
217
224
|
await createSqliteIndices(this.dataSource, tableName, modelIndexArgs.indices);
|
|
218
225
|
}
|
|
219
226
|
}
|
|
220
|
-
async
|
|
227
|
+
async assertHasMidIndices(tableName, args) {
|
|
221
228
|
const expectedIndices = defaultIndices(tableName).indices.flatMap((index) => index.name);
|
|
222
229
|
if (args && args.indices) {
|
|
223
230
|
for (const index of args.indices) {
|
|
224
231
|
expectedIndices.push(fieldsIndexName(index, tableName));
|
|
225
232
|
}
|
|
226
233
|
}
|
|
227
|
-
const
|
|
228
|
-
const actualIndices = await this.dataSource.raw(`
|
|
234
|
+
const indicesResult = await this.dataSource.raw(`
|
|
229
235
|
select name, tbl_name
|
|
230
236
|
FROM sqlite_master
|
|
231
237
|
WHERE type='index'
|
|
232
238
|
and tbl_name like '${tableName}'
|
|
233
|
-
and name in (${sqlIndices})
|
|
234
239
|
;
|
|
235
240
|
`);
|
|
236
|
-
|
|
241
|
+
const actualIndices = indicesResult ? indicesResult.map((row) => row.name) : [];
|
|
242
|
+
this.validateIndices(tableName, expectedIndices, actualIndices);
|
|
237
243
|
}
|
|
238
244
|
hasJsonBSupport() {
|
|
239
245
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables-manager.js","sourceRoot":"","sources":["../src/tables-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,UAAU,EACV,iBAAiB,EACjB,wBAAwB,EACxB,sBAAsB,EACtB,cAAc,EACd,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,KAAK,EAA4B,MAAM,8BAA8B,CAAA;AAE9E,OAAO,EACL,+BAA+B,EAE/B,2BAA2B,EAC3B,eAAe,GAChB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAavD,SAAS,gCAAgC,CAAC,SAAoC;IAC5E,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,EAAE,CAAA;KACV;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5C,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,CAAA;IACpE,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,OAAO,aAAa;IACxB,YACW,MAAoB,EACpB,UAAgB,EAChB,MAAyB;QAFzB,WAAM,GAAN,MAAM,CAAc;QACpB,eAAU,GAAV,UAAU,CAAM;QAChB,WAAM,GAAN,MAAM,CAAmB;IACjC,CAAC;IAKJ,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,cAAqC;QACvD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAOD,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"tables-manager.js","sourceRoot":"","sources":["../src/tables-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,UAAU,EACV,iBAAiB,EACjB,wBAAwB,EACxB,sBAAsB,EACtB,cAAc,EACd,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,KAAK,EAA4B,MAAM,8BAA8B,CAAA;AAE9E,OAAO,EACL,+BAA+B,EAE/B,2BAA2B,EAC3B,eAAe,GAChB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAA;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAavD,SAAS,gCAAgC,CAAC,SAAoC;IAC5E,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,EAAE,CAAA;KACV;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5C,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,CAAA;IACpE,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,OAAO,aAAa;IACxB,YACW,MAAoB,EACpB,UAAgB,EAChB,MAAyB;QAFzB,WAAM,GAAN,MAAM,CAAc;QACpB,eAAU,GAAV,UAAU,CAAM;QAChB,WAAM,GAAN,MAAM,CAAmB;IACjC,CAAC;IAKJ,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,cAAqC;QACvD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAOD,KAAK,CAAC,mBAAmB,CAAC,UAAkB,EAAE,KAAqB;QACjE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAKD,eAAe;QACb,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;IAC3D,CAAC;IAKD,gBAAgB;QAEd,OAAO;YACL;gBACE,SAAS,EAAE,+BAA+B;gBAC1C,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,wBAAwB;aAC9D;YACD,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE;YACnF;gBACE,SAAS,EAAE,2BAA2B;gBACtC,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,sBAAsB;aAC5D;SACF,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,gBAAgB,CAAC,OAAiB;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC5C,MAAM,OAAO,CAAC,GAAG,CACf,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAC/B,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAC5C,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,eAAe,CAAC,KAAkB,EAAE,OAAiB;QACzD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACrE,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oCAAoC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;YACtE,MAAM,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAA;SAC3F;aAAM;YACL,MAAM,kBAAkB,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAA;YAClF,IAAI,KAAK,CAAC,SAAS,KAAK,iBAAiB,EAAE;gBACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;qBACjC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;qBACrB,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC;qBAC1B,KAAK,CAAC,OAAO,CAAC,CAAA;gBACjB,IAAI,MAAM,CAAC,KAAK,KAAK,OAAO,EAAE;oBAC5B,MAAM,IAAI,KAAK,CACb,2CAA2C,KAAK,CAAC,SAAS,mDAAmD,MAAM,CAAC,KAAK,+BAA+B,OAAO,GAAG,CACnK,CAAA;iBACF;aACF;SACF;IACH,CAAC;IAKD,KAAK,CAAC,mBAAmB;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC5C,MAAM,OAAO,CAAC,GAAG,CACf,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YACrC,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;QAC5C,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,kBAAkB,CAAC,KAAkB;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,CAAA;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACrD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAE5C,IAAI,WAAW,IAAI,YAAY,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,gDAAgD,KAAK,CAAC,SAAS,mDAAmD,CACnH,CAAA;SACF;IACH,CAAC;IAKD,KAAK,CAAC,gBAAgB,CAAC,aAAoC;QACzD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAC7C,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;YACjC,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,eAAe,CAAC,SAAiB,EAAE,aAAoC;QAC3E,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,IAAI,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3F,IAAI,CAAC,cAAc,EAAE;YAEnB,OAAM;SACP;QAID,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAA;QACtF,IAAI,cAAc,CAAC,SAAS,EAAE;YAC5B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAC5D,sBAAsB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,eAAe,CAAA;aAC5F;SACF;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAA;QAE1D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,CAAA;QACnE,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAC5C,IAAI,WAAW,IAAI,YAAY,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,yCAAyC,SAAS,yDAAyD,CAC5G,CAAA;SACF;QAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;IAC3D,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,aAAoC;QACrD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IACvF,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,MAAqB,EAAE,MAAqB;QAC7E,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;YACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACpC,CAAC,CAAC,CAAA;QACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,yCAAyC,SAAS;4BAC5C,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;mBACvC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CACpC,CAAA;SACF;IACH,CAAC;CACF;AAWD,MAAM,OAAO,qBAAsB,SAAQ,aAAa;IACtD,YAAY,UAAgB,EAAE,MAAyB;QACrD,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;IAClD,CAAC;IAKQ,KAAK,CAAC,aAAa;QAC1B,MAAM,MAAM,GAAiC,MAAM,IAAI,CAAC,UAAU;aAC/D,MAAM,CAAC,WAAW,CAAC;aACnB,IAAI,CAAC,WAAW,CAAC;aACjB,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACd,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAC9E,CAAA;QACH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAC/C,CAAC;IAKQ,KAAK,CAAC,aAAa,CAAC,aAAoC;QAC/D,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;YACzC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;QACzC,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,cAA8B;QAC/C,MAAM,SAAS,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QACnD,IAAI,SAAS,CAAC,MAAM,GAAG,EAAE,EAAE;YACzB,MAAM,MAAM,GAAG,sBAAsB,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,8BAA8B,SAAS,EAAE,CAAA;YAC7G,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACvB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAA;SACxB;QAED,MAAM,eAAe,GAAG,gCAAgC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;QAClF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gDAAgD,SAAS,EAAE,CAAC,CAAA;YAC5E,MAAM,wBAAwB,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAA;YAC3E,IAAI,cAAc,CAAC,OAAO,EAAE;gBAC1B,MAAM,qBAAqB,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC,CAAA;aAChF;SACF;aAAM,IAAI,eAAe,CAAC,MAAM,EAAE;YAEjC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC3D,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;oBACpC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE;wBACrC,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;wBAC/C,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAA;qBAClD;iBACF;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC;IAOQ,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,IAAoB;QACxE,MAAM,eAAe,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACxF,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE;YACxB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAA;aACtE;SACF;QACD,MAAM,aAAa,GAAG,CACpB,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAgB;;;wBAGvB,SAAS;KAC5B,CAAC,CACD,CAAA;QACD,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzF,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,eAAe,EAAE,aAAa,CAAC,CAAA;IACjE,CAAC;IAEQ,eAAe;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AASD,MAAM,OAAO,mBAAoB,SAAQ,aAAa;IACpD,YAAY,UAAgB,EAAE,MAAyB;QACrD,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;IAChD,CAAC;IAKQ,KAAK,CAAC,aAAa;QAC1B,MAAM,MAAM,GAA4B,MAAM,IAAI,CAAC,UAAU;aAC1D,IAAI,CAAC,eAAe,CAAC;aACrB,MAAM,CAAC,MAAM,CAAC;aACd,OAAO,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC;aAC1B,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QACvF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAKQ,KAAK,CAAC,aAAa,CAAC,aAAoC;QAC/D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QACjD,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;YACzC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;QACzD,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,cAA8B,EAAE,cAA6B;QAC9E,MAAM,SAAS,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,eAAe,GAAG,gCAAgC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;QAClF,IAAI,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACtC,IAAI,eAAe,CAAC,MAAM,EAAE;gBAE1B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC3D,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;wBACpC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE;4BACrC,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;4BAC/C,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAA;yBAClD;qBACF;gBACH,CAAC,CAAC,CAAA;aACH;YACD,OAAM;SACP;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gDAAgD,SAAS,EAAE,CAAC,CAAA;QAC5E,MAAM,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAA;QACzE,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,MAAM,mBAAmB,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC,CAAA;SAC9E;IACH,CAAC;IAOQ,KAAK,CAAC,mBAAmB,CAAC,SAAiB,EAAE,IAAoB;QACxE,MAAM,eAAe,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACxF,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE;YACxB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAA;aACxD;SACF;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAoB;;;;qBAIlD,SAAS;;GAE3B,CAAC,CAAA;QACA,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC/E,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,eAAe,EAAE,aAAa,CAAC,CAAA;IACjE,CAAC;IAEQ,eAAe;QACtB,OAAO,KAAK,CAAA;IACd,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ceramicnetwork/indexing",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0-rc.0",
|
|
4
4
|
"description": "Ceramic indexing and querying logic",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ceramic",
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"author": "3Box Labs",
|
|
31
31
|
"license": "(Apache-2.0 OR MIT)",
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@ceramicnetwork/anchor-listener": "^2.
|
|
34
|
-
"@ceramicnetwork/anchor-utils": "^2.
|
|
35
|
-
"@ceramicnetwork/common": "^3.
|
|
36
|
-
"@ceramicnetwork/job-queue": "^2.
|
|
37
|
-
"@ceramicnetwork/stream-model": "^2.
|
|
38
|
-
"@ceramicnetwork/streamid": "^3.
|
|
33
|
+
"@ceramicnetwork/anchor-listener": "^2.4.0-rc.0",
|
|
34
|
+
"@ceramicnetwork/anchor-utils": "^2.4.0-rc.0",
|
|
35
|
+
"@ceramicnetwork/common": "^3.4.0-rc.0",
|
|
36
|
+
"@ceramicnetwork/job-queue": "^2.4.0-rc.0",
|
|
37
|
+
"@ceramicnetwork/stream-model": "^2.4.0-rc.0",
|
|
38
|
+
"@ceramicnetwork/streamid": "^3.4.0-rc.0",
|
|
39
39
|
"@ethersproject/providers": "^5.5.1",
|
|
40
40
|
"knex": "^2.5.1",
|
|
41
41
|
"lodash.clonedeep": "^4.5.0",
|
|
@@ -46,10 +46,11 @@
|
|
|
46
46
|
"uint8arrays": "^5.0.1"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@ceramicnetwork/3id-did-resolver": "^3.
|
|
50
|
-
"@ceramicnetwork/
|
|
51
|
-
"@ceramicnetwork/
|
|
52
|
-
"@ceramicnetwork/stream-
|
|
49
|
+
"@ceramicnetwork/3id-did-resolver": "^3.4.0-rc.0",
|
|
50
|
+
"@ceramicnetwork/common-test-utils": "^1.2.0-rc.0",
|
|
51
|
+
"@ceramicnetwork/ipfs-daemon": "^3.4.0-rc.0",
|
|
52
|
+
"@ceramicnetwork/stream-model-instance": "^2.4.0-rc.0",
|
|
53
|
+
"@ceramicnetwork/stream-tile": "^3.4.0-rc.0",
|
|
53
54
|
"@stablelib/sha256": "^1.0.1",
|
|
54
55
|
"did-resolver": "^4.0.1",
|
|
55
56
|
"dids": "^5.0.0",
|
|
@@ -60,5 +61,5 @@
|
|
|
60
61
|
"publishConfig": {
|
|
61
62
|
"access": "public"
|
|
62
63
|
},
|
|
63
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "b30b69592c722eb1544b03b2bc00e45c14491138"
|
|
64
65
|
}
|