Merge branch 'main' into 1.31-releases

Author: mcasimir

configs/webpack-config-compass/src/index.ts

@@ -19,6 +19,7 @@ import {
   lessLoader,
   assetsLoader,
   resourceLoader,
+  sharedObjectLoader,
 } from './loaders';
 import {
   entriesToNamedEntries,
@@ -58,6 +59,7 @@ export function createElectronMainConfig(
         javascriptLoader(opts),
         nodeLoader(opts),
         resourceLoader(opts),
+        sharedObjectLoader(opts),
         sourceLoader(opts),
       ],
     },
@@ -124,6 +126,7 @@ export function createElectronRendererConfig(
         cssLoader(opts),
         lessLoader(opts),
         assetsLoader(opts),
+        sharedObjectLoader(opts),
         sourceLoader(opts),
       ],
     },

configs/webpack-config-compass/src/loaders.ts

@@ -162,13 +162,23 @@ export const resourceLoader = (_args: ConfigArgs) => ({
   type: 'asset/resource',
 });
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const sharedObjectLoader = (_args: ConfigArgs) => ({
+  test: /\.(dylib|so|dll)(\?.+?)?$/,
+  // asset/resource always compiles imports to paths to files, this is a good
+  // strategy for electron main (node.js) process where handling data uris might
+  // be more work than handling files
+  type: 'asset/resource',
+});
+
 export const sourceLoader = (args: ConfigArgs) => ({
   exclude: [
     javascriptLoader(args).test,
     nodeLoader(args).test,
     cssLoader(args).test,
     lessLoader(args).test,
     assetsLoader(args).test,
+    sharedObjectLoader(args).test,
     // Produced by html-webpack-plugin and should not be handled
     /\.(ejs|html)$/,
     // Handled nicely by Webpack by default, no need to load it as raw source

package-lock.json

@@ -104,7 +104,6 @@ class PipelineWorkspace extends PureComponent {
       sourceName={this.props.sourceName}
       stage={stage.stage}
       stageOperator={stage.stageOperator}
-      snippet={stage.snippet}
       error={stage.error}
       syntaxError={stage.syntaxError}
       isValid={stage.isValid}
@@ -115,7 +114,6 @@ class PipelineWorkspace extends PureComponent {
       isExpanded={stage.isExpanded}
       isCommenting={this.props.isCommenting}
       isAutoPreviewing={this.props.isAutoPreviewing}
-      fromStageOperators={stage.fromStageOperators || false}
       previewDocuments={stage.previewDocuments}
       runStage={this.props.runStage}
       openLink={this.props.openLink}

packages/compass-aggregations/src/components/pipeline-builder-workspace/pipeline-builder-workspace.jsx

@@ -18,8 +18,6 @@ const PIPELINE_1 = [
     'syntaxError': null,
     'error': null,
     'projections': [],
-    'snippet': '/**\n * query: The query in MQL.\n */\n{\n  ${1:query}\n}',
-    'fromStageOperators': false,
     'executor': {
       '$match': {
         'x': 1
@@ -39,8 +37,6 @@ const PIPELINE_1 = [
     'syntaxError': null,
     'error': null,
     'projections': [],
-    'snippet': '/**\n * Provide the number of documents to limit.\n */\n${1:number}',
-    'fromStageOperators': false,
     'executor': {
       '$limit': 3
     }

packages/compass-aggregations/src/components/pipeline-builder-workspace/pipeline-builder-workspace.spec.jsx

@@ -6,8 +6,6 @@ import { StageAutoCompleter } from 'mongodb-ace-autocompleter';
 
 import styles from './stage-editor.module.less';
 
-const INDEX_STATS = '$indexStats';
-
 /**
  * Edit a single stage in the aggregation pipeline.
  */
@@ -17,7 +15,6 @@ class StageEditor extends Component {
   static propTypes = {
     stage: PropTypes.string,
     stageOperator: PropTypes.string,
-    snippet: PropTypes.string,
     error: PropTypes.string,
     syntaxError: PropTypes.string,
     runStage: PropTypes.func.isRequired,
@@ -27,7 +24,6 @@ class StageEditor extends Component {
     stageChanged: PropTypes.func.isRequired,
     isAutoPreviewing: PropTypes.bool.isRequired,
     isValid: PropTypes.bool.isRequired,
-    fromStageOperators: PropTypes.bool.isRequired,
     setIsModified: PropTypes.func.isRequired,
     projections: PropTypes.array.isRequired,
     projectionsChanged: PropTypes.func.isRequired,
@@ -76,8 +72,6 @@ class StageEditor extends Component {
   }
 
   /**
-   * On update if the stage operator is changed insert the snippet and focus on the editor.
-   *
    * @param {Object} prevProps - The previous properties.
    */
   componentDidUpdate(prevProps) {
@@ -87,9 +81,13 @@ class StageEditor extends Component {
     );
     this.completer.version = this.props.serverVersion;
     if (this.props.stageOperator !== prevProps.stageOperator && this.editor) {
-      this.editor.setValue('');
-      this.editor.insertSnippet(this.props.snippet || '');
+      // Focus the editor when the stage operator has changed.
       this.editor.focus();
+
+      // When the underlying stage operator changes, re-run the preview.
+      if (this.props.isAutoPreviewing) {
+        this.debounceRun();
+      }
     }
   }
 
@@ -110,11 +108,7 @@ class StageEditor extends Component {
     this.props.projectionsChanged();
     this.props.setIsModified(true);
 
-    if (
-      (this.props.fromStageOperators === false ||
-        this.props.stageOperator === INDEX_STATS) &&
-      this.props.isAutoPreviewing
-    ) {
+    if (this.props.isAutoPreviewing) {
       this.debounceRun();
     }
   };

packages/compass-aggregations/src/components/stage-editor/stage-editor.jsx

@@ -25,7 +25,6 @@ describe('StageEditor [Component]', function() {
         isValid={isValid}
         index={0}
         isAutoPreviewing
-        fromStageOperators={false}
         fields={[]}
         serverVersion="3.6.0"
         runStage={runStageSpy}

packages/compass-aggregations/src/components/stage-editor/stage-editor.spec.jsx

@@ -50,7 +50,6 @@ class Stage extends Component {
     sourceName: PropTypes.string,
     stage: PropTypes.string.isRequired,
     stageOperator: PropTypes.string,
-    snippet: PropTypes.string,
     error: PropTypes.string,
     syntaxError: PropTypes.string,
     isValid: PropTypes.bool.isRequired,
@@ -60,7 +59,6 @@ class Stage extends Component {
     isComplete: PropTypes.bool.isRequired,
     // Can be undefined on the initial render
     isMissingAtlasOnlyStageSupport: PropTypes.bool,
-    fromStageOperators: PropTypes.bool.isRequired,
     previewDocuments: PropTypes.array.isRequired,
     index: PropTypes.number.isRequired,
     isCommenting: PropTypes.bool.isRequired,
@@ -89,7 +87,6 @@ class Stage extends Component {
   shouldComponentUpdate(nextProps) {
     const should = (
       nextProps.stageOperator !== this.props.stageOperator ||
-      nextProps.snippet !== this.props.snippet ||
       nextProps.error !== this.props.error ||
       nextProps.syntaxError !== this.props.syntaxError ||
       nextProps.isValid !== this.props.isValid ||
@@ -98,7 +95,6 @@ class Stage extends Component {
       nextProps.isLoading !== this.props.isLoading ||
       nextProps.isComplete !== this.props.isComplete ||
       nextProps.isMissingAtlasOnlyStageSupport !== this.props.isMissingAtlasOnlyStageSupport ||
-      nextProps.fromStageOperators !== this.props.fromStageOperators ||
       nextProps.index !== this.props.index ||
       nextProps.isCommenting !== this.props.isCommenting ||
       nextProps.isAutoPreviewing !== this.props.isAutoPreviewing ||
@@ -150,11 +146,9 @@ class Stage extends Component {
           <StageEditor
             stage={this.props.stage}
             stageOperator={this.props.stageOperator}
-            snippet={this.props.snippet}
             error={this.props.error}
             syntaxError={this.props.syntaxError}
             isValid={this.props.isValid}
-            fromStageOperators={this.props.fromStageOperators}
             runStage={this.props.runStage}
             index={this.props.index}
             serverVersion={this.props.serverVersion}

packages/compass-aggregations/src/components/stage/stage.jsx

@@ -17,7 +17,7 @@ import _reducer, {
   STAGE_PREVIEW_UPDATED,
   LOADING_STAGE_RESULTS,
   STAGE_TOGGLED,
-  replaceAceTokens,
+  replaceOperatorSnippetTokens,
   INITIAL_STATE,
 } from './pipeline';
 import { generatePipelineStages } from './pipeline';
@@ -120,11 +120,7 @@ describe('pipeline module', function () {
               expect(
                 newState[0].stage,
                 `${name} stage on ${env} env.`
-              ).to.equal(`${comment}${snippet}`);
-              expect(
-                newState[0].snippet,
-                `${name} snippet on ${env} env.`
-              ).to.equal(`${comment}${snippet}`);
+              ).to.equal(replaceOperatorSnippetTokens(`${comment}${snippet}`));
             });
           });
         });
@@ -134,8 +130,7 @@ describe('pipeline module', function () {
           );
           const stage = {
             stageOperator: geoNear.name,
-            stage: replaceAceTokens(`${geoNear.comment}${geoNear.snippet}`),
-            snippet: `${geoNear.comment}${geoNear.snippet}`,
+            stage: replaceOperatorSnippetTokens(`${geoNear.comment}${geoNear.snippet}`),
           };
           STAGE_OPERATORS.filter((x) => x.name !== '$geoNear').forEach(
             ({ name, comment, snippet, env: envs }) => {
@@ -151,11 +146,7 @@ describe('pipeline module', function () {
                 expect(
                   newState[0].stage,
                   `${name} stage on ${env} env.`
-                ).to.equal(`${comment}${snippet}`);
-                expect(
-                  newState[0].snippet,
-                  `${name} snippet on ${env} env.`
-                ).to.equal(`${comment}${snippet}`);
+                ).to.equal(replaceOperatorSnippetTokens(`${comment}${snippet}`));
               });
             }
           );
@@ -165,7 +156,6 @@ describe('pipeline module', function () {
           const stage = {
             stageOperator: limit.name,
             stage: '20',
-            snippet: `${limit.comment}${limit.snippet}`,
           };
           STAGE_OPERATORS.filter((x) => x.name !== '$limit').forEach(
             ({ name, env: envs }) => {
@@ -182,10 +172,6 @@ describe('pipeline module', function () {
                   newState[0].stage,
                   `${name} stage on ${env} env.`
                 ).to.equal('20');
-                expect(
-                  newState[0].snippet,
-                  `${name} snippet on ${env} env.`
-                ).to.equal('20');
               });
             }
           );