Skip to content

Commit aa931c6

Browse files
paula-stachopaula-stacho
committed
fix typo
1 parent b0706f2 commit aa931c6

8 files changed

+75
-75
lines changed

‎src/schema-accessor.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Schema as InternalSchema } from './schema-analyzer';
2-
import InternalToExpandedConvertor from './schema-convertors/internalToExpanded';
3-
import InternalToMongoDBConvertor from './schema-convertors/internalToMongoDB';
4-
import InternalToStandardConvertor from './schema-convertors/internalToStandard';
2+
import InternalToExpandedConverter from './schema-converters/internalToExpanded';
3+
import InternalToMongoDBConverter from './schema-converters/internalToMongoDB';
4+
import InternalToStandardConverter from './schema-converters/internalToStandard';
55
import { ExpandedJSONSchema, MongoDBJSONSchema, StandardJSONSchema } from './types';
66

77
export interface SchemaAccessor {
@@ -26,15 +26,15 @@ export class InternalSchemaBasedAccessor implements SchemaAccessor {
2626
private standardJSONSchema?: StandardJSONSchema;
2727
private mongodbJSONSchema?: MongoDBJSONSchema;
2828
private ExpandedJSONSchema?: ExpandedJSONSchema;
29-
public internalToStandardConvertor: InternalToStandardConvertor;
30-
public internalToExpandedConvertor: InternalToExpandedConvertor;
31-
public internalToMongoDBConvertor: InternalToMongoDBConvertor;
29+
public internalToStandardConverter: InternalToStandardConverter;
30+
public internalToExpandedConverter: InternalToExpandedConverter;
31+
public internalToMongoDBConverter: InternalToMongoDBConverter;
3232

3333
constructor(internalSchema: InternalSchema) {
3434
this.internalSchema = internalSchema;
35-
this.internalToStandardConvertor = new InternalToStandardConvertor();
36-
this.internalToExpandedConvertor = new InternalToExpandedConvertor();
37-
this.internalToMongoDBConvertor = new InternalToMongoDBConvertor();
35+
this.internalToStandardConverter = new InternalToStandardConverter();
36+
this.internalToExpandedConverter = new InternalToExpandedConverter();
37+
this.internalToMongoDBConverter = new InternalToMongoDBConverter();
3838
}
3939

4040
async getInternalSchema(): Promise<InternalSchema> {
@@ -46,20 +46,20 @@ export class InternalSchemaBasedAccessor implements SchemaAccessor {
4646
* https://json-schema.org/draft/2020-12/schema
4747
*/
4848
async getStandardJsonSchema(options: Options = {}): Promise<StandardJSONSchema> {
49-
return this.standardJSONSchema ??= await this.internalToStandardConvertor.convert(this.internalSchema, options);
49+
return this.standardJSONSchema ??= await this.internalToStandardConverter.convert(this.internalSchema, options);
5050
}
5151

5252
/**
5353
* Get MongoDB's $jsonSchema
5454
*/
5555
async getMongoDBJsonSchema(options: Options = {}): Promise<MongoDBJSONSchema> {
56-
return this.mongodbJSONSchema ??= await this.internalToMongoDBConvertor.convert(this.internalSchema, options);
56+
return this.mongodbJSONSchema ??= await this.internalToMongoDBConverter.convert(this.internalSchema, options);
5757
}
5858

5959
/**
6060
* Get expanded JSON Schema - with additional properties
6161
*/
6262
async getExpandedJSONSchema(options: Options = {}): Promise<ExpandedJSONSchema> {
63-
return this.ExpandedJSONSchema ??= await this.internalToExpandedConvertor.convert(this.internalSchema, options);
63+
return this.ExpandedJSONSchema ??= await this.internalToExpandedConverter.convert(this.internalSchema, options);
6464
}
6565
}

‎src/schema-convertors/internalToExpanded.test.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from 'assert';
22
import { RELAXED_EJSON_DEFINITIONS } from './internalToStandard';
3-
import InternalToExpandedConvertor from './internalToExpanded';
3+
import InternalToExpandedConverter from './internalToExpanded';
44

55
describe('internalSchemaToExpanded', async function() {
66
describe('Converts: ', async function() {
@@ -336,8 +336,8 @@ describe('internalSchemaToExpanded', async function() {
336336
}
337337
]
338338
};
339-
const convertor = new InternalToExpandedConvertor();
340-
const expanded = await convertor.convert(internal);
339+
const converter = new InternalToExpandedConverter();
340+
const expanded = await converter.convert(internal);
341341
const expectedDefinitions: any = RELAXED_EJSON_DEFINITIONS;
342342
delete expectedDefinitions.BSONSymbol;
343343
delete expectedDefinitions.CodeWScope;
@@ -602,8 +602,8 @@ describe('internalSchemaToExpanded', async function() {
602602
}
603603
]
604604
};
605-
const convertor = new InternalToExpandedConvertor();
606-
const expanded = await convertor.convert(internal);
605+
const converter = new InternalToExpandedConverter();
606+
const expanded = await converter.convert(internal);
607607
const expectedDefinitions = {
608608
Double: RELAXED_EJSON_DEFINITIONS.Double
609609
};
@@ -717,8 +717,8 @@ describe('internalSchemaToExpanded', async function() {
717717
}
718718
]
719719
};
720-
const convertor = new InternalToExpandedConvertor();
721-
const expanded = await convertor.convert(internal);
720+
const converter = new InternalToExpandedConverter();
721+
const expanded = await converter.convert(internal);
722722
assert.deepStrictEqual(expanded, {
723723
type: 'object',
724724
'x-bsonType': 'object',
@@ -881,8 +881,8 @@ describe('internalSchemaToExpanded', async function() {
881881
}
882882
]
883883
};
884-
const convertor = new InternalToExpandedConvertor();
885-
const expanded = await convertor.convert(internal);
884+
const converter = new InternalToExpandedConverter();
885+
const expanded = await converter.convert(internal);
886886
assert.deepStrictEqual(expanded, {
887887
type: 'object',
888888
'x-bsonType': 'object',
@@ -1017,8 +1017,8 @@ describe('internalSchemaToExpanded', async function() {
10171017
}
10181018
]
10191019
};
1020-
const convertor = new InternalToExpandedConvertor();
1021-
const expanded = await convertor.convert(internal);
1020+
const converter = new InternalToExpandedConverter();
1021+
const expanded = await converter.convert(internal);
10221022
assert.deepStrictEqual(expanded, {
10231023
type: 'object',
10241024
'x-bsonType': 'object',
@@ -1127,8 +1127,8 @@ describe('internalSchemaToExpanded', async function() {
11271127
}
11281128
]
11291129
};
1130-
const convertor = new InternalToExpandedConvertor();
1131-
const expanded = await convertor.convert(internal);
1130+
const converter = new InternalToExpandedConverter();
1131+
const expanded = await converter.convert(internal);
11321132
assert.deepStrictEqual(expanded, {
11331133
type: 'object',
11341134
'x-bsonType': 'object',
@@ -1269,8 +1269,8 @@ describe('internalSchemaToExpanded', async function() {
12691269
}
12701270
]
12711271
};
1272-
const convertor = new InternalToExpandedConvertor();
1273-
const expanded = await convertor.convert(internal);
1272+
const converter = new InternalToExpandedConverter();
1273+
const expanded = await converter.convert(internal);
12741274
assert.deepStrictEqual(expanded, {
12751275
type: 'object',
12761276
'x-bsonType': 'object',
@@ -1378,8 +1378,8 @@ describe('internalSchemaToExpanded', async function() {
13781378
}
13791379
]
13801380
};
1381-
const convertor = new InternalToExpandedConvertor();
1382-
const expanded = await convertor.convert(internal);
1381+
const converter = new InternalToExpandedConverter();
1382+
const expanded = await converter.convert(internal);
13831383
const expectedDefinitions = {
13841384
ObjectId: RELAXED_EJSON_DEFINITIONS.ObjectId
13851385
};
@@ -1529,8 +1529,8 @@ describe('internalSchemaToExpanded', async function() {
15291529
]
15301530
};
15311531
const abortController = new AbortController();
1532-
const convertor = new InternalToExpandedConvertor();
1533-
const promise = convertor.convert(internal, { signal: abortController.signal });
1532+
const converter = new InternalToExpandedConverter();
1533+
const promise = converter.convert(internal, { signal: abortController.signal });
15341534
abortController.abort(new Error('Too long, didn\'t wait.'));
15351535
await assert.rejects(promise, {
15361536
name: 'Error',

‎src/schema-convertors/internalToExpanded.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { InternalTypeToStandardTypeMap, RELAXED_EJSON_DEFINITIONS } from './inte
44
import { InternalTypeToBsonTypeMap } from './internalToMongoDB';
55
import { allowAbort } from './util';
66

7-
class InternalToExpandedConvertor {
7+
class InternalToExpandedConverter {
88
private usedDefinitions = new Set<string>();
99

1010
private clearUsedDefintions() {
@@ -120,4 +120,4 @@ class InternalToExpandedConvertor {
120120
}
121121
}
122122

123-
export default InternalToExpandedConvertor;
123+
export default InternalToExpandedConverter;

‎src/schema-convertors/internalToMongoDB.test.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from 'assert';
2-
import InternalToMongoDBConvertor from './internalToMongoDB';
2+
import InternalToMongoDBConverter from './internalToMongoDB';
33

44
describe('internalSchemaToMongoDB', async function() {
55
describe('Converts: ', async function() {
@@ -892,8 +892,8 @@ describe('internalSchemaToMongoDB', async function() {
892892
}
893893
]
894894
};
895-
const convertor = new InternalToMongoDBConvertor();
896-
const mongodb = await convertor.convert(internal);
895+
const converter = new InternalToMongoDBConverter();
896+
const mongodb = await converter.convert(internal);
897897
assert.deepStrictEqual(mongodb, {
898898
bsonType: 'object',
899899
required: [],
@@ -1106,8 +1106,8 @@ describe('internalSchemaToMongoDB', async function() {
11061106
}
11071107
]
11081108
};
1109-
const convertor = new InternalToMongoDBConvertor();
1110-
const mongodb = await convertor.convert(internal);
1109+
const converter = new InternalToMongoDBConverter();
1110+
const mongodb = await converter.convert(internal);
11111111
assert.deepStrictEqual(mongodb, {
11121112
bsonType: 'object',
11131113
required: ['author'],
@@ -1192,8 +1192,8 @@ describe('internalSchemaToMongoDB', async function() {
11921192
}
11931193
]
11941194
};
1195-
const convertor = new InternalToMongoDBConvertor();
1196-
const mongodb = await convertor.convert(internal);
1195+
const converter = new InternalToMongoDBConverter();
1196+
const mongodb = await converter.convert(internal);
11971197
assert.deepStrictEqual(mongodb, {
11981198
bsonType: 'object',
11991199
required: [],
@@ -1338,8 +1338,8 @@ describe('internalSchemaToMongoDB', async function() {
13381338
}
13391339
]
13401340
};
1341-
const convertor = new InternalToMongoDBConvertor();
1342-
const mongodb = await convertor.convert(internal);
1341+
const converter = new InternalToMongoDBConverter();
1342+
const mongodb = await converter.convert(internal);
13431343
assert.deepStrictEqual(mongodb, {
13441344
bsonType: 'object',
13451345
required: [],
@@ -1433,8 +1433,8 @@ describe('internalSchemaToMongoDB', async function() {
14331433
}
14341434
]
14351435
};
1436-
const convertor = new InternalToMongoDBConvertor();
1437-
const mongodb = await convertor.convert(internal);
1436+
const converter = new InternalToMongoDBConverter();
1437+
const mongodb = await converter.convert(internal);
14381438
assert.deepStrictEqual(mongodb, {
14391439
bsonType: 'object',
14401440
required: ['arrayMixedType'],
@@ -1512,8 +1512,8 @@ describe('internalSchemaToMongoDB', async function() {
15121512
}
15131513
]
15141514
};
1515-
const convertor = new InternalToMongoDBConvertor();
1516-
const mongodb = await convertor.convert(internal);
1515+
const converter = new InternalToMongoDBConverter();
1516+
const mongodb = await converter.convert(internal);
15171517
assert.deepStrictEqual(mongodb, {
15181518
bsonType: 'object',
15191519
required: [],
@@ -1629,8 +1629,8 @@ describe('internalSchemaToMongoDB', async function() {
16291629
}
16301630
]
16311631
};
1632-
const convertor = new InternalToMongoDBConvertor();
1633-
const mongodb = await convertor.convert(internal);
1632+
const converter = new InternalToMongoDBConverter();
1633+
const mongodb = await converter.convert(internal);
16341634
assert.deepStrictEqual(mongodb, {
16351635
bsonType: 'object',
16361636
required: [],
@@ -1764,8 +1764,8 @@ describe('internalSchemaToMongoDB', async function() {
17641764
]
17651765
};
17661766
const abortController = new AbortController();
1767-
const convertor = new InternalToMongoDBConvertor();
1768-
const promise = convertor.convert(internal, { signal: abortController.signal });
1767+
const converter = new InternalToMongoDBConverter();
1768+
const promise = converter.convert(internal, { signal: abortController.signal });
17691769
abortController.abort(new Error('Too long, didn\'t wait.'));
17701770
await assert.rejects(promise, {
17711771
name: 'Error',

‎src/schema-convertors/internalToMongoDB.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const InternalTypeToBsonTypeMap: Record<
3535
MaxKey: 'maxKey'
3636
};
3737

38-
class InternalToMongoDBConvertor {
38+
class InternalToMongoDBConverter {
3939
private convertInternalType(type: string) {
4040
const bsonType = InternalTypeToBsonTypeMap[type];
4141
if (!bsonType) throw new Error(`Encountered unknown type: ${type}`);
@@ -112,4 +112,4 @@ class InternalToMongoDBConvertor {
112112
}
113113
}
114114

115-
export default InternalToMongoDBConvertor;
115+
export default InternalToMongoDBConverter;

‎src/schema-convertors/internalToStandard.test.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from 'assert';
22
import Ajv2020 from 'ajv/dist/2020';
3-
import InternalToStandardConvertor, { RELAXED_EJSON_DEFINITIONS } from './internalToStandard';
3+
import InternalToStandardConverter, { RELAXED_EJSON_DEFINITIONS } from './internalToStandard';
44

55
describe('internalSchemaToStandard', async function() {
66
const ajv = new Ajv2020();
@@ -895,8 +895,8 @@ describe('internalSchemaToStandard', async function() {
895895
}
896896
]
897897
};
898-
const convertor = new InternalToStandardConvertor();
899-
const standard = await convertor.convert(internal);
898+
const converter = new InternalToStandardConverter();
899+
const standard = await converter.convert(internal);
900900
ajv.validateSchema(standard);
901901
const expectedDefinitions: any = {
902902
...RELAXED_EJSON_DEFINITIONS
@@ -1117,8 +1117,8 @@ describe('internalSchemaToStandard', async function() {
11171117
}
11181118
]
11191119
};
1120-
const convertor = new InternalToStandardConvertor();
1121-
const standard = await convertor.convert(internal);
1120+
const converter = new InternalToStandardConverter();
1121+
const standard = await converter.convert(internal);
11221122
const expectedDefinitions = {
11231123
Double: RELAXED_EJSON_DEFINITIONS.Double
11241124
};
@@ -1209,8 +1209,8 @@ describe('internalSchemaToStandard', async function() {
12091209
}
12101210
]
12111211
};
1212-
const convertor = new InternalToStandardConvertor();
1213-
const standard = await convertor.convert(internal);
1212+
const converter = new InternalToStandardConverter();
1213+
const standard = await converter.convert(internal);
12141214
ajv.validateSchema(standard);
12151215
assert.deepStrictEqual(standard, {
12161216
$schema: 'https://json-schema.org/draft/2020-12/schema',
@@ -1358,8 +1358,8 @@ describe('internalSchemaToStandard', async function() {
13581358
}
13591359
]
13601360
};
1361-
const convertor = new InternalToStandardConvertor();
1362-
const standard = await convertor.convert(internal);
1361+
const converter = new InternalToStandardConverter();
1362+
const standard = await converter.convert(internal);
13631363
ajv.validateSchema(standard);
13641364
assert.deepStrictEqual(standard, {
13651365
$schema: 'https://json-schema.org/draft/2020-12/schema',
@@ -1456,8 +1456,8 @@ describe('internalSchemaToStandard', async function() {
14561456
}
14571457
]
14581458
};
1459-
const convertor = new InternalToStandardConvertor();
1460-
const standard = await convertor.convert(internal);
1459+
const converter = new InternalToStandardConverter();
1460+
const standard = await converter.convert(internal);
14611461
ajv.validateSchema(standard);
14621462
assert.deepStrictEqual(standard, {
14631463
$schema: 'https://json-schema.org/draft/2020-12/schema',
@@ -1538,8 +1538,8 @@ describe('internalSchemaToStandard', async function() {
15381538
}
15391539
]
15401540
};
1541-
const convertor = new InternalToStandardConvertor();
1542-
const standard = await convertor.convert(internal);
1541+
const converter = new InternalToStandardConverter();
1542+
const standard = await converter.convert(internal);
15431543
ajv.validateSchema(standard);
15441544
assert.deepStrictEqual(standard, {
15451545
$schema: 'https://json-schema.org/draft/2020-12/schema',
@@ -1658,8 +1658,8 @@ describe('internalSchemaToStandard', async function() {
16581658
}
16591659
]
16601660
};
1661-
const convertor = new InternalToStandardConvertor();
1662-
const standard = await convertor.convert(internal);
1661+
const converter = new InternalToStandardConverter();
1662+
const standard = await converter.convert(internal);
16631663
ajv.validateSchema(standard);
16641664
assert.deepStrictEqual(standard, {
16651665
$schema: 'https://json-schema.org/draft/2020-12/schema',
@@ -1739,8 +1739,8 @@ describe('internalSchemaToStandard', async function() {
17391739
}
17401740
]
17411741
};
1742-
const convertor = new InternalToStandardConvertor();
1743-
const standard = await convertor.convert(internal);
1742+
const converter = new InternalToStandardConverter();
1743+
const standard = await converter.convert(internal);
17441744
ajv.validateSchema(standard);
17451745
const expectedDefinitions = {
17461746
ObjectId: RELAXED_EJSON_DEFINITIONS.ObjectId
@@ -1868,8 +1868,8 @@ describe('internalSchemaToStandard', async function() {
18681868
]
18691869
};
18701870
const abortController = new AbortController();
1871-
const convertor = new InternalToStandardConvertor();
1872-
const promise = convertor.convert(internal, { signal: abortController.signal });
1871+
const converter = new InternalToStandardConverter();
1872+
const promise = converter.convert(internal, { signal: abortController.signal });
18731873
abortController.abort(new Error('Too long, didn\'t wait.'));
18741874
await assert.rejects(promise, {
18751875
name: 'Error',

0 commit comments

Comments
 (0)