cleanup

Author: paula-stacho

package.json

@@ -33,7 +33,7 @@
     ".esm-wrapper.mjs"
   ],
   "scripts": {
-    "test": "nyc mocha --timeout 5000 --colors -r ts-node/register test/*.ts",
+    "test": "nyc mocha --timeout 5000 --colors -r ts-node/register test/*.ts src/**/*.test.ts",
     "test-example-parse-from-file": "ts-node examples/parse-from-file.ts",
     "test-example-parse-schema": "ts-node examples/parse-schema.ts",
     "test-time": "ts-node ./test/time-testing.ts",

src/index.ts

@@ -18,7 +18,7 @@ import type {
   SimplifiedSchema
 } from './schema-analyzer';
 import * as schemaStats from './stats';
-import { AnyIterable, StandardJSONSchema, MongoDBJSONSchema, ExtendedJSONSchema } from './types';
+import { AnyIterable, StandardJSONSchema, MongoDBJSONSchema, ExpandedJSONSchema } from './types';
 
 /**
  * Analyze documents - schema can be retrieved in different formats.
@@ -77,7 +77,7 @@ export type {
   SimplifiedSchema,
   StandardJSONSchema,
   MongoDBJSONSchema,
-  ExtendedJSONSchema
+  ExpandedJSONSchema
 };
 
 export {

src/schema-accessor.ts

@@ -1,11 +1,11 @@
 import { Schema as InternalSchema } from './schema-analyzer';
 import convertors from './schema-convertors';
-import { ExtendedJSONSchema, MongoDBJSONSchema, StandardJSONSchema } from './types';
+import { ExpandedJSONSchema, MongoDBJSONSchema, StandardJSONSchema } from './types';
 
 export interface SchemaAccessor {
   getStandardJsonSchema: () => Promise<StandardJSONSchema>;
   getMongoDBJsonSchema: () => Promise<MongoDBJSONSchema>;
-  getExtendedJsonSchema: () => Promise<ExtendedJSONSchema>;
+  getExpandedJSONSchema: () => Promise<ExpandedJSONSchema>;
   getInternalSchema: () => Promise<InternalSchema>;
 }
 
@@ -23,7 +23,7 @@ export class InternalSchemaBasedAccessor implements SchemaAccessor {
   private internalSchema: InternalSchema;
   private standardJSONSchema?: StandardJSONSchema;
   private mongodbJSONSchema?: MongoDBJSONSchema;
-  private extendedJSONSchema?: ExtendedJSONSchema;
+  private ExpandedJSONSchema?: ExpandedJSONSchema;
 
   constructor(internalSchema: InternalSchema) {
     this.internalSchema = internalSchema;
@@ -41,7 +41,7 @@ export class InternalSchemaBasedAccessor implements SchemaAccessor {
     return this.mongodbJSONSchema ??= await convertors.internalSchemaToMongoDB(this.internalSchema, options);
   }
 
-  async getExtendedJsonSchema(options: Options = {}): Promise<ExtendedJSONSchema> {
-    return this.extendedJSONSchema ??= await convertors.internalSchemaToExtended(this.internalSchema, options);
+  async getExpandedJSONSchema(options: Options = {}): Promise<ExpandedJSONSchema> {
+    return this.ExpandedJSONSchema ??= await convertors.internalSchemaToExpanded(this.internalSchema, options);
   }
 }

src/schema-convertors.ts

@@ -0,0 +1,9 @@
+import internalSchemaToExpanded from './internalToExpanded';
+import internalSchemaToMongoDB from './internalToMongoDB';
+import internalSchemaToStandard from './internalToStandard';
+
+export default {
+  internalSchemaToStandard,
+  internalSchemaToMongoDB,
+  internalSchemaToExpanded
+};

src/schema-convertors/index.ts

@@ -0,0 +1,11 @@
+import { InternalSchema } from '..';
+import { ExpandedJSONSchema } from '../types';
+
+export default function internalSchemaToExpanded(
+  internalSchema: InternalSchema,
+  options: {
+    signal?: AbortSignal
+}): ExpandedJSONSchema {
+  // TODO: COMPASS-8702
+  return {} as ExpandedJSONSchema;
+}

src/schema-convertors/internalToExpanded.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 import internalSchemaToStandard from './internalToMongoDB';
 
-describe.only('internalSchemaToStandard', function() {
+describe('internalSchemaToStandard', function() {
   describe('Converts: ', function() {
     it('get me analyzed thing', async function() {
       const internal = {

src/schema-convertors/internalToMongoDB.test.ts

@@ -0,0 +1,11 @@
+import { InternalSchema } from '..';
+import { StandardJSONSchema } from '../types';
+
+export default function internalSchemaToStandard(
+  internalSchema: InternalSchema,
+  options: {
+    signal?: AbortSignal
+}): StandardJSONSchema {
+  // TODO: COMPASS-8700
+  return {} as StandardJSONSchema;
+}

src/schema-convertors/internalToStandard.ts

@@ -9,7 +9,7 @@ export type MongoDBJSONSchema = Pick<StandardJSONSchema, 'title' | 'required' |
   anyOf?: MongoDBJSONSchema[];
 }
 
-export type ExtendedJSONSchema = StandardJSONSchema & {
+export type ExpandedJSONSchema = StandardJSONSchema & {
   ['x-bsonType']: string;
   ['x-metadata']: {
     hasDuplicates: boolean;

src/types.ts

@@ -15,11 +15,11 @@ describe('analyzeDocuments', function() {
   });
 
   it('Only converts the same format once', async function() {
-    const convertSpy = sinon.spy(convertors, 'internalSchemaToExtended');
+    const convertSpy = sinon.spy(convertors, 'internalSchemaToExpanded');
     const analyzeResults = await analyzeDocuments(docs);
-    await analyzeResults.getExtendedJsonSchema();
-    await analyzeResults.getExtendedJsonSchema();
-    await analyzeResults.getExtendedJsonSchema();
+    await analyzeResults.getExpandedJSONSchema();
+    await analyzeResults.getExpandedJSONSchema();
+    await analyzeResults.getExpandedJSONSchema();
     assert.strictEqual(convertSpy.calledOnce, true);
   });
 });