Merge master to develop

.eslintrc

@@ -22,6 +22,14 @@
       ]
     }]
   },
+  "overrides": [
+    {
+      "files": [ "packages/**/src/**/*.js" ],
+      "rules": {
+        "import/no-default-export": "error"
+      }
+    }
+  ],
   "plugins": [
     "import"
   ]

packages/form-js-editor/src/FormEditor.js

@@ -1,21 +1,20 @@
-import { clone, createFormContainer, createInjector, schemaVersion } from '@bpmn-io/form-js-viewer';
 import Ids from 'ids';
+import { clone, createFormContainer, createInjector, schemaVersion } from '@bpmn-io/form-js-viewer';
 import { isString, set } from 'min-dash';
 
-import core from './core';
-
-import EditorActionsModule from './features/editor-actions';
-import DraggingModule from './features/dragging';
-import KeyboardModule from './features/keyboard';
-import ModelingModule from './features/modeling';
-import SelectionModule from './features/selection';
-import PaletteModule from './features/palette';
-import PropertiesPanelModule from './features/properties-panel';
-import RenderInjectionModule from './features/render-injection';
-import RepeatRenderManagerModule from './features/repeat-render';
-import ExpressionLanguageModule from './features/expression-language';
+import { CoreModule } from './core';
+import { EditorActionsModule } from './features/editor-actions';
+import { EditorExpressionLanguageModule } from './features/expression-language';
+import { FormEditorKeyboardModule } from './features/keyboard';
+import { DraggingModule } from './features/dragging';
+import { ModelingModule } from './features/modeling';
+import { SelectionModule } from './features/selection';
+import { PaletteModule } from './features/palette';
+import { PropertiesPanelModule } from './features/properties-panel';
+import { RenderInjectionModule } from './features/render-injection';
+import { RepeatRenderModule } from './features/repeat-render';
 
-import { MarkdownModule } from '@bpmn-io/form-js-viewer';
+import { MarkdownRendererModule } from '@bpmn-io/form-js-viewer';
 
 const ids = new Ids([ 32, 36, 1 ]);
 
@@ -40,7 +39,7 @@ const ids = new Ids([ 32, 36, 1 ]);
 /**
  * The form editor.
  */
-export default class FormEditor {
+export class FormEditor {
 
   /**
    * @constructor
@@ -265,7 +264,7 @@ export default class FormEditor {
     return createInjector([
       { config: [ 'value', enrichedConfig ] },
       { formEditor: [ 'value', this ] },
-      core,
+      CoreModule,
       ...modules,
       ...additionalModules
     ]);
@@ -304,15 +303,15 @@ export default class FormEditor {
     return [
       ModelingModule,
       EditorActionsModule,
+      FormEditorKeyboardModule,
       DraggingModule,
-      KeyboardModule,
       SelectionModule,
       PaletteModule,
-      ExpressionLanguageModule,
-      MarkdownModule,
+      EditorExpressionLanguageModule,
+      MarkdownRendererModule,
       PropertiesPanelModule,
       RenderInjectionModule,
-      RepeatRenderManagerModule
+      RepeatRenderModule
     ];
   }
 

packages/form-js-editor/src/core/Debounce.js

@@ -5,7 +5,7 @@ import { debounce } from 'min-dash';
  *
  * @param {number|boolean} [config=true]
  */
-export default function DebounceFactory(config = true) {
+export function DebounceFactory(config = true) {
 
   const timeout = typeof config === 'number' ? config : config ? 300 : 0;
 

packages/form-js-editor/src/core/EventBus.js

@@ -1 +1 @@
-export { default } from 'diagram-js/lib/core/EventBus';
+export { default as EventBus } from 'diagram-js/lib/core/EventBus';

packages/form-js-editor/src/core/FormFieldRegistry.js

@@ -3,7 +3,7 @@ import {
 } from '@bpmn-io/form-js-viewer';
 
 
-export default class FormFieldRegistry extends BaseFieldRegistry {
+export class FormFieldRegistry extends BaseFieldRegistry {
 
   /**
    * Updates a form fields id.

packages/form-js-editor/src/core/FormLayoutValidator.js

@@ -3,13 +3,13 @@ export const MAX_COLUMNS = 16;
 export const MIN_COLUMNS = 2;
 export const MAX_FIELDS_PER_ROW = 4;
 
-export default class FormLayoutValidator {
+export class FormLayoutValidator {
 
   /**
    * @constructor
    *
-   * @param { import('./FormLayouter').default } formLayouter
-   * @param { import('./FormFieldRegistry').default } formFieldRegistry
+   * @param { import('./FormLayouter').FormLayouter } formLayouter
+   * @param { import('./FormFieldRegistry').FormFieldRegistry } formFieldRegistry
    */
   constructor(formLayouter, formFieldRegistry) {
     this._formLayouter = formLayouter;

packages/form-js-editor/src/core/FormLayouter.js

@@ -1 +1 @@
-export { FormLayouter as default } from '@bpmn-io/form-js-viewer';
+export { FormLayouter } from '@bpmn-io/form-js-viewer';

packages/form-js-editor/src/core/index.js

@@ -1,16 +1,16 @@
 import { FieldFactory, Importer, PathRegistry } from '@bpmn-io/form-js-viewer';
 
-import EventBus from './EventBus';
-import DebounceFactory from './Debounce';
-import FormFieldRegistry from './FormFieldRegistry';
-import FormLayouter from './FormLayouter';
-import FormLayoutValidator from './FormLayoutValidator';
+import { EventBus } from './EventBus';
+import { DebounceFactory } from './Debounce';
+import { FormFieldRegistry } from './FormFieldRegistry';
+import { FormLayouter } from './FormLayouter';
+import { FormLayoutValidator } from './FormLayoutValidator';
 
-import renderModule from '../render';
+import { RenderModule } from '../render';
 
-export default {
+export const CoreModule = {
   __depends__: [
-    renderModule
+    RenderModule
   ],
   debounce: [ 'factory', DebounceFactory ],
   eventBus: [ 'type', EventBus ],

packages/form-js-editor/src/features/SectionModuleBase.js

@@ -6,7 +6,7 @@
  *
  * @class SectionModuleBase
  */
-export default class SectionModuleBase {
+export class SectionModuleBase {
 
   /**
    * Create a SectionModuleBase instance.

packages/form-js-editor/src/features/dragging/Dragging.js

@@ -17,16 +17,16 @@ export const ERROR_DROP_CLS = 'fjs-error-drop';
  * @typedef { { id: String, components: Array<any> } } FormRow
  */
 
-export default class Dragging {
+export class Dragging {
 
   /**
    * @constructor
    *
-   * @param { import('../../core/FormFieldRegistry').default } formFieldRegistry
-   * @param { import('../../core/FormLayouter').default } formLayouter
-   * @param { import('../../core/FormLayoutValidator').default } formLayoutValidator
-   * @param { import('../../core/EventBus').default } eventBus
-   * @param { import('../modeling/Modeling').default } modeling
+   * @param { import('../../core/FormFieldRegistry').FormFieldRegistry } formFieldRegistry
+   * @param { import('../../core/FormLayouter').FormLayouter } formLayouter
+   * @param { import('../../core/FormLayoutValidator').FormLayoutValidator } formLayoutValidator
+   * @param { import('../../core/EventBus').EventBus } eventBus
+   * @param { import('../modeling/Modeling').Modeling } modeling
    * @param { import('@bpmn-io/form-js-viewer').PathRegistry } pathRegistry
    */
   constructor(formFieldRegistry, formLayouter, formLayoutValidator, eventBus, modeling, pathRegistry) {

packages/form-js-editor/src/features/dragging/index.js

@@ -1,6 +1,6 @@
-import Dragging from './Dragging';
+import { Dragging } from './Dragging';
 
-export default {
+export const DraggingModule = {
   __init__: [ 'dragging' ],
   dragging: [ 'type', Dragging ]
 };

packages/form-js-editor/src/features/editor-actions/FormEditorActions.js

@@ -1,7 +1,7 @@
 import EditorActions from 'diagram-js/lib/features/editor-actions/EditorActions';
 
 
-export default class FormEditorActions extends EditorActions {
+export class FormEditorActions extends EditorActions {
   constructor(eventBus, injector) {
     super(eventBus, injector);
 

packages/form-js-editor/src/features/editor-actions/index.js

@@ -1,10 +1,10 @@
-import EditorActionsModule from 'diagram-js/lib/features/editor-actions';
+import BaseEditorActionsModule from 'diagram-js/lib/features/editor-actions';
 
-import FormEditorActions from './FormEditorActions';
+import { FormEditorActions } from './FormEditorActions';
 
-export default {
+export const EditorActionsModule = {
   __depends__: [
-    EditorActionsModule
+    BaseEditorActionsModule
   ],
   editorActions: [ 'type', FormEditorActions ]
 };

packages/form-js-editor/src/features/expression-language/EditorTemplating.js

@@ -1,6 +1,6 @@
 import { isString } from 'min-dash';
 
-export default class EditorTemplating {
+export class EditorTemplating {
 
   // same rules as viewer templating
   isTemplate(value) { return isString(value) && (value.startsWith('=') || /{{/.test(value)); }

packages/form-js-editor/src/features/expression-language/index.js

@@ -1,7 +1,7 @@
 import { FeelExpressionLanguage } from '@bpmn-io/form-js-viewer';
-import EditorTemplating from './EditorTemplating';
+import { EditorTemplating } from './EditorTemplating';
 
-export default {
+export const EditorExpressionLanguageModule = {
   __init__: [ 'expressionLanguage', 'templating' ],
   expressionLanguage: [ 'type', FeelExpressionLanguage ],
   templating: [ 'type', EditorTemplating ]

packages/form-js-editor/src/features/keyboard/FormEditorKeyboardBindings.js

@@ -11,7 +11,7 @@ import {
 
 const LOW_PRIORITY = 500;
 
-export default class FormEditorKeyboardBindings {
+export class FormEditorKeyboardBindings {
   constructor(eventBus, keyboard) {
     eventBus.on('editorActions.init', LOW_PRIORITY, (event) => {
       const { editorActions } = event;

packages/form-js-editor/src/features/keyboard/index.js

@@ -1,8 +1,8 @@
 import KeyboardModule from 'diagram-js/lib/features/keyboard';
 
-import FormEditorKeyboardBindings from './FormEditorKeyboardBindings';
+import { FormEditorKeyboardBindings } from './FormEditorKeyboardBindings';
 
-export default {
+export const FormEditorKeyboardModule = {
   __depends__: [
     KeyboardModule
   ],

packages/form-js-editor/src/features/modeling/FormLayoutUpdater.js

@@ -5,7 +5,7 @@ import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 import { clone } from '@bpmn-io/form-js-viewer';
 
 
-export default class FormLayoutUpdater extends CommandInterceptor {
+export class FormLayoutUpdater extends CommandInterceptor {
 
   constructor(eventBus, formLayouter, modeling, formEditor) {
     super(eventBus);

packages/form-js-editor/src/features/modeling/Modeling.js

@@ -1,15 +1,15 @@
-import AddFormFieldHandler from './cmd/AddFormFieldHandler';
-import EditFormFieldHandler from './cmd/EditFormFieldHandler';
-import MoveFormFieldHandler from './cmd/MoveFormFieldHandler';
-import RemoveFormFieldHandler from './cmd/RemoveFormFieldHandler';
-import UpdateIdClaimHandler from './cmd/UpdateIdClaimHandler';
-import UpdateKeyClaimHandler from './cmd/UpdateKeyClaimHandler';
-import UpdatePathClaimHandler from './cmd/UpdatePathClaimHandler';
+import { AddFormFieldHandler } from './cmd/AddFormFieldHandler';
+import { EditFormFieldHandler } from './cmd/EditFormFieldHandler';
+import { MoveFormFieldHandler } from './cmd/MoveFormFieldHandler';
+import { RemoveFormFieldHandler } from './cmd/RemoveFormFieldHandler';
+import { UpdateIdClaimHandler } from './cmd/UpdateIdClaimHandler';
+import { UpdateKeyClaimHandler } from './cmd/UpdateKeyClaimHandler';
+import { UpdatePathClaimHandler } from './cmd/UpdatePathClaimHandler';
 
 import { isObject } from 'min-dash';
 
 
-export default class Modeling {
+export class Modeling {
   constructor(commandStack, eventBus, formEditor, formFieldRegistry, fieldFactory) {
     this._commandStack = commandStack;
     this._formEditor = formEditor;

packages/form-js-editor/src/features/modeling/behavior/IdBehavior.js

@@ -1,6 +1,6 @@
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-export default class IdBehavior extends CommandInterceptor {
+export class IdBehavior extends CommandInterceptor {
   constructor(eventBus, modeling) {
     super(eventBus);
 

packages/form-js-editor/src/features/modeling/behavior/KeyBehavior.js

@@ -1,6 +1,6 @@
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-export default class KeyBehavior extends CommandInterceptor {
+export class KeyBehavior extends CommandInterceptor {
   constructor(eventBus, modeling, formFields) {
     super(eventBus);
 

packages/form-js-editor/src/features/modeling/behavior/OptionsSourceBehavior.js

@@ -7,7 +7,7 @@ import {
   OPTIONS_SOURCES_PATHS
 } from '@bpmn-io/form-js-viewer';
 
-export default class OptionsSourceBehavior extends CommandInterceptor {
+export class OptionsSourceBehavior extends CommandInterceptor {
   constructor(eventBus) {
     super(eventBus);
 

packages/form-js-editor/src/features/modeling/behavior/PathBehavior.js

@@ -1,6 +1,6 @@
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-export default class PathBehavior extends CommandInterceptor {
+export class PathBehavior extends CommandInterceptor {
   constructor(eventBus, modeling, formFields) {
     super(eventBus);
 

packages/form-js-editor/src/features/modeling/behavior/ValidateBehavior.js

@@ -1,6 +1,6 @@
 import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor';
 
-export default class ValidateBehavior extends CommandInterceptor {
+export class ValidateBehavior extends CommandInterceptor {
   constructor(eventBus) {
     super(eventBus);
 

packages/form-js-editor/src/features/modeling/behavior/index.js

@@ -1,12 +1,12 @@
-import IdBehavior from './IdBehavior';
-import KeyBehavior from './KeyBehavior';
-import PathBehavior from './PathBehavior';
-import ValidateBehavior from './ValidateBehavior';
-import OptionsSourceBehavior from './OptionsSourceBehavior';
+import { IdBehavior } from './IdBehavior';
+import { KeyBehavior } from './KeyBehavior';
+import { PathBehavior } from './PathBehavior';
+import { ValidateBehavior } from './ValidateBehavior';
+import { OptionsSourceBehavior } from './OptionsSourceBehavior';
 import { ColumnsSourceBehavior } from './ColumnsSourceBehavior';
 import { TableDataSourceBehavior } from './TableDataSourceBehavior';
 
-export default {
+export const BehaviorModule = {
   __init__: [
     'idBehavior',
     'keyBehavior',

packages/form-js-editor/src/features/modeling/cmd/AddFormFieldHandler.js

@@ -6,12 +6,12 @@ import {
   updatePath
 } from './Util';
 
-export default class AddFormFieldHandler {
+export class AddFormFieldHandler {
 
   /**
    * @constructor
-   * @param { import('../../../FormEditor').default } formEditor
-   * @param { import('../../../core/FormFieldRegistry').default } formFieldRegistry
+   * @param { import('../../../FormEditor').FormEditor } formEditor
+   * @param { import('../../../core/FormFieldRegistry').FormFieldRegistry } formFieldRegistry
    */
   constructor(formEditor, formFieldRegistry) {
     this._formEditor = formEditor;

packages/form-js-editor/src/features/modeling/cmd/EditFormFieldHandler.js

@@ -1,9 +1,9 @@
-export default class EditFormFieldHandler {
+export class EditFormFieldHandler {
 
   /**
    * @constructor
-   * @param { import('../../../FormEditor').default } formEditor
-   * @param { import('../../../core/FormFieldRegistry').default } formFieldRegistry
+   * @param { import('../../../FormEditor').FormEditor } formEditor
+   * @param { import('../../../core/FormFieldRegistry').FormFieldRegistry } formFieldRegistry
    */
   constructor(formEditor, formFieldRegistry) {
     this._formEditor = formEditor;

packages/form-js-editor/src/features/modeling/cmd/MoveFormFieldHandler.js

@@ -8,12 +8,12 @@ import {
   updateRow
 } from './Util';
 
-export default class MoveFormFieldHandler {
+export class MoveFormFieldHandler {
 
   /**
    * @constructor
-   * @param { import('../../../FormEditor').default } formEditor
-   * @param { import('../../../core/FormFieldRegistry').default } formFieldRegistry
+   * @param { import('../../../FormEditor').FormEditor } formEditor
+   * @param { import('../../../core/FormFieldRegistry').FormFieldRegistry } formFieldRegistry
    * @param { import('@bpmn-io/form-js-viewer').PathRegistry } pathRegistry
    * @param { import('@bpmn-io/form-js-viewer').FormLayouter } formLayouter
    */