Merge remote-tracking branch 'origin/main' into 1.37-releases

Author: gribnoysup

THIRD-PARTY-NOTICES.md

@@ -1,7 +1,7 @@
 # Third-Party Notices
 
 The following third-party software is used by and included in **MongoDB Compass**.
-This document was automatically generated on Sun May 14 2023.
+This document was automatically generated on Mon May 15 2023.
 
 ## List of dependencies
 

packages/compass-e2e-tests/tests/collection-import.test.ts

@@ -569,6 +569,7 @@ describe('Collection import', function () {
     delete importCompletedEvent.duration; // Duration varies.
     expect(importCompletedEvent).to.deep.equal({
       delimiter: ',',
+      newline: '\n',
       file_type: 'csv',
       all_fields: false,
       stop_on_error_selected: false,

packages/compass-e2e-tests/tests/collection-indexes-tab.test.ts

@@ -169,11 +169,11 @@ describe('Collection indexes tab', function () {
     });
   });
 
-  describe('server version 6.3.0', function () {
+  describe('server version 20.0.0', function () {
     // This feature got moved behind a feature flag
     // https://jira.mongodb.org/browse/SERVER-74901
     it.skip('supports creating a columnstore index', async function () {
-      if (serverSatisfies('< 6.3.0-alpha0')) {
+      if (serverSatisfies('< 20.0.0-alpha0')) {
         return this.skip();
       }
 

packages/compass-import-export/scripts/analyze-csv.ts

@@ -5,6 +5,7 @@ function run() {
   console.log(process.argv);
   const input = fs.createReadStream(process.argv[2]);
   const delimiter = ' ';
+  const newline = '\n';
   let numRows = 0;
   let start = Date.now();
   const progressCallback = () => {
@@ -14,7 +15,7 @@ function run() {
       start = Date.now();
     }
   };
-  return analyzeCSVFields({ input, delimiter, progressCallback });
+  return analyzeCSVFields({ input, delimiter, newline, progressCallback });
 }
 
 run()

packages/compass-import-export/src/components/import-modal.tsx

@@ -37,9 +37,9 @@ import {
   setFieldType,
 } from '../modules/import';
 import type { RootImportState } from '../stores/import-store';
-import type { CSVDelimiter, FieldFromCSV } from '../modules/import';
+import type { FieldFromCSV } from '../modules/import';
 import { ImportFileInput } from './import-file-input';
-import type { CSVParsableFieldType } from '../csv/csv-types';
+import type { Delimiter, CSVParsableFieldType } from '../csv/csv-types';
 
 const closeButtonStyles = css({
   marginRight: spacing[2],
@@ -82,8 +82,8 @@ type ImportModalProps = {
    * See `<ImportOptions />`
    */
   selectImportFileName: (fileName: string) => void;
-  setDelimiter: (delimiter: CSVDelimiter) => void;
-  delimiter: CSVDelimiter;
+  setDelimiter: (delimiter: Delimiter) => void;
+  delimiter: Delimiter;
   fileType: AcceptedFileType | '';
   fileName: string;
   stopOnErrors: boolean;

packages/compass-import-export/src/components/import-options.tsx

@@ -11,7 +11,7 @@ import {
 } from '@mongodb-js/compass-components';
 
 import type { AcceptedFileType } from '../constants/file-types';
-import type { CSVDelimiter } from '../modules/import';
+import type { Delimiter } from '../csv/csv-types';
 import { ImportFileInput } from './import-file-input';
 
 const formStyles = css({
@@ -43,7 +43,7 @@ const checkboxStyles = css({
 });
 
 const delimiters: {
-  value: CSVDelimiter;
+  value: Delimiter;
   label: string;
 }[] = [
   {
@@ -66,8 +66,8 @@ const delimiters: {
 
 type ImportOptionsProps = {
   selectImportFileName: (fileName: string) => void;
-  setDelimiter: (delimiter: CSVDelimiter) => void;
-  delimiter: CSVDelimiter;
+  setDelimiter: (delimiter: Delimiter) => void;
+  delimiter: Delimiter;
   fileType: AcceptedFileType | '';
   fileName: string;
   stopOnErrors: boolean;
@@ -120,7 +120,7 @@ function ImportOptions({
               aria-label="Delimiter"
               data-testid="import-delimiter-select"
               onChange={(delimiter: string) =>
-                void setDelimiter(delimiter as CSVDelimiter)
+                void setDelimiter(delimiter as Delimiter)
               }
               value={delimiter}
               allowDeselect={false}

packages/compass-import-export/src/csv/csv-types.ts

@@ -15,7 +15,7 @@ import type {
 export const supportedDelimiters = [',', '\t', ';', ' '] as const;
 export type Delimiter = typeof supportedDelimiters[number];
 
-export const supportedLinebreaks = ['\r\n', '\n'];
+export const supportedLinebreaks = ['\r\n', '\n'] as const;
 export type Linebreak = typeof supportedLinebreaks[number];
 
 // the subset of bson types that we can detect

packages/compass-import-export/src/export/export-csv.spec.ts

@@ -448,9 +448,11 @@ async function analyzeAndImportCSV(
   assert(typeResult.type === 'csv');
 
   const csvDelimiter = typeResult.csvDelimiter;
+  const newline = typeResult.newline;
   const analyzeResult = await analyzeCSVFields({
     input: fs.createReadStream(filepath),
     delimiter: csvDelimiter,
+    newline,
     ignoreEmptyStrings: true,
   });
 
@@ -486,6 +488,7 @@ async function analyzeAndImportCSV(
     fields,
     input: fs.createReadStream(filepath),
     delimiter: csvDelimiter,
+    newline,
     ignoreEmptyStrings: true,
   });
 

packages/compass-import-export/src/export/gather-fields.spec.ts

@@ -364,9 +364,11 @@ async function analyzeAndImportCSV(
   assert(typeResult.type === 'csv');
 
   const csvDelimiter = typeResult.csvDelimiter;
+  const newline = typeResult.newline;
   const analyzeResult = await analyzeCSVFields({
     input: fs.createReadStream(filepath),
     delimiter: csvDelimiter,
+    newline,
     ignoreEmptyStrings: true,
   });
 
@@ -400,6 +402,7 @@ async function analyzeAndImportCSV(
     dataService,
     ns: testNS,
     fields,
+    newline,
     input: fs.createReadStream(filepath),
     delimiter: csvDelimiter,
     ignoreEmptyStrings: true,

packages/compass-import-export/src/import/analyze-csv-fields.spec.ts

@@ -18,12 +18,14 @@ describe('analyzeCSVFields', function () {
       });
       assert(typeResult.type === 'csv');
       const csvDelimiter = typeResult.csvDelimiter;
+      const newline = typeResult.newline;
 
       const abortController = new AbortController();
       const progressCallback = sinon.spy();
       const result = await analyzeCSVFields({
         input: fs.createReadStream(filepath),
         delimiter: csvDelimiter,
+        newline,
         abortSignal: abortController.signal,
         progressCallback,
         ignoreEmptyStrings: true,
@@ -137,6 +139,7 @@ describe('analyzeCSVFields', function () {
       const result = await analyzeCSVFields({
         input: fs.createReadStream(filepath),
         delimiter: ',',
+        newline: '\n',
         abortSignal: abortController.signal,
         progressCallback,
         ignoreEmptyStrings: true,
@@ -166,6 +169,7 @@ describe('analyzeCSVFields', function () {
     const result = await analyzeCSVFields({
       input: fs.createReadStream(fixtures.csvByType.null),
       delimiter: ',',
+      newline: '\n',
       abortSignal: abortController.signal,
       progressCallback,
       ignoreEmptyStrings: false,
@@ -196,6 +200,7 @@ describe('analyzeCSVFields', function () {
     const result = await analyzeCSVFields({
       input: fs.createReadStream(fixtures.csv.complex),
       delimiter: ',',
+      newline: '\n',
       abortSignal: abortController.signal,
       progressCallback,
       ignoreEmptyStrings: true,
@@ -215,6 +220,7 @@ describe('analyzeCSVFields', function () {
     const result = await analyzeCSVFields({
       input,
       delimiter: ',',
+      newline: '\n',
     });
     expect(Object.keys(result.fields)).to.deep.equal(['_id', 'value']);
   });
@@ -227,6 +233,7 @@ describe('analyzeCSVFields', function () {
       analyzeCSVFields({
         input,
         delimiter: ',',
+        newline: '\n',
       })
     ).to.be.rejectedWith(
       TypeError,
@@ -240,6 +247,7 @@ describe('analyzeCSVFields', function () {
     const result = await analyzeCSVFields({
       input,
       delimiter: ',',
+      newline: '\n',
     });
     expect(Object.keys(result.fields)).to.deep.equal(['_id', 'value']);
   });