Merge pull request #10 from DataKitchen/feat/refactor_to_avoid_compilation_issues

Feat/refactor to avoid compilation issues

Author: cavalieredavide

projects/ngx-monaco-editor/README.md

@@ -6,7 +6,7 @@
 ## Install
 With your package manager of preference, install
 ```
-@datakitchen/ngx-monaco-editor
+@datakitchen/ngx-monaco-editor @monaco-editor/loader monaco-editor
 ```
 
 ## Usage

projects/ngx-monaco-editor/src/lib/ngx-monaco-editor.component.spec.ts

@@ -3,11 +3,11 @@ import { NgxMonacoEditorService } from './ngx-monaco-editor.service';
 import { of } from 'rxjs';
 import { FormControl, ReactiveFormsModule } from '@angular/forms';
 import { Component, ViewChild } from '@angular/core';
-import { NGX_MONACO_EDITOR_CONFIG } from './ngx-monaco-editor.module';
 import { NgxMonacoEditorComponent } from './ngx-monaco-editor.component';
 import { MatLegacyFormFieldModule } from '@angular/material/legacy-form-field';
 import Mock = jest.Mock;
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { NGX_MONACO_EDITOR_CONFIG } from './ngx-monaco-editor.model';
 
 /*
   There are two know bugs left to resolve

projects/ngx-monaco-editor/src/lib/ngx-monaco-editor.component.ts

@@ -3,9 +3,9 @@ import { AfterViewInit, Component, ElementRef, inject, Input, ViewChild } from '
 import { BehaviorSubject, catchError, EMPTY, tap } from 'rxjs';
 import { MatLegacyFormFieldControl as MatFormFieldControl } from '@angular/material/legacy-form-field';
 import { NgxMonacoEditorService } from './ngx-monaco-editor.service';
-import { IEditorOptions, StandaloneCodeEditor } from './ngx-monaco-editor.module';
 import { AbstractMatFormFieldControl } from './abstract-mat-form-field-control/abstract-mat-form-field-control.directive';
 import { FormControl } from '@angular/forms';
+import { IEditorOptions, StandaloneCodeEditor } from './ngx-monaco-editor.model';
 
 
 @Component({

projects/ngx-monaco-editor/src/lib/ngx-monaco-editor.model.ts

@@ -0,0 +1,28 @@
+import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api';
+import { editor } from 'monaco-editor/esm/vs/editor/editor.api';
+import IMarker = editor.IMarker;
+import { InjectionToken } from '@angular/core';
+
+export const defaultOptions = {
+  language: 'json',
+  automaticLayout: true,
+  lineNumbers: 'off',
+  roundedSelection: false,
+  scrollBeyondLastLine: false,
+  readOnly: false,
+  theme: 'vs',
+  minimap: {
+    enabled: false
+  },
+  selectOnLineNumbers: true,
+  wordWrap: 'on'
+};
+
+export type IEditorOptions = monacoEditor.editor.IEditorOptions;
+export type IStandaloneCodeEditor = monacoEditor.editor.IStandaloneCodeEditor;
+
+export const NGX_MONACO_EDITOR_CONFIG = new InjectionToken<IEditorOptions>('NGX_MONACO_EDITOR_CONFIG');
+
+export interface StandaloneCodeEditor extends IStandaloneCodeEditor {
+  onDidChangeMarkers: (cb: (errors: IMarker[]) => void) => void;
+}

projects/ngx-monaco-editor/src/lib/ngx-monaco-editor.module.ts

@@ -1,37 +1,12 @@
-import { APP_INITIALIZER, InjectionToken, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import loader from '@monaco-editor/loader';
-import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api';
-import { editor } from 'monaco-editor/esm/vs/editor/editor.api';
-import { NgxMonacoEditorService } from './ngx-monaco-editor.service';
-import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
+import { APP_INITIALIZER, NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
+import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
+import loader from '@monaco-editor/loader';
 import { NgxMonacoEditorComponent } from './ngx-monaco-editor.component';
-import IMarker = editor.IMarker;
-
-export const defaultOptions = {
-  language: 'json',
-  automaticLayout: true,
-  lineNumbers: 'off',
-  roundedSelection: false,
-  scrollBeyondLastLine: false,
-  readOnly: false,
-  theme: 'vs',
-  minimap: {
-    enabled: false
-  },
-  selectOnLineNumbers: true,
-  wordWrap: 'on'
-};
-
-export type IEditorOptions = monacoEditor.editor.IEditorOptions;
-export type IStandaloneCodeEditor = monacoEditor.editor.IStandaloneCodeEditor;
-
-export const NGX_MONACO_EDITOR_CONFIG = new InjectionToken<IEditorOptions>('NGX_MONACO_EDITOR_CONFIG');
+import { NGX_MONACO_EDITOR_CONFIG, defaultOptions } from './ngx-monaco-editor.model';
+import { NgxMonacoEditorService } from './ngx-monaco-editor.service';
 
-export interface StandaloneCodeEditor extends IStandaloneCodeEditor {
-  onDidChangeMarkers: (cb: (errors: IMarker[]) => void) => void;
-}
 
 
 @NgModule({

projects/ngx-monaco-editor/src/lib/ngx-monaco-editor.service.spec.ts

@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { NgxMonacoEditorService } from './ngx-monaco-editor.service';
-import { NGX_MONACO_EDITOR_CONFIG } from './ngx-monaco-editor.module';
+import { NGX_MONACO_EDITOR_CONFIG } from './ngx-monaco-editor.model';
 
 describe('ngx-monaco-editor.service', () => {
 

projects/ngx-monaco-editor/src/lib/ngx-monaco-editor.service.ts

@@ -1,11 +1,11 @@
 /* istanbul ignore file */
 import { Inject, Injectable } from '@angular/core';
-import { AsyncSubject, tap } from 'rxjs';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Monaco } from '@monaco-editor/loader';
-import { IEditorOptions, NGX_MONACO_EDITOR_CONFIG, StandaloneCodeEditor } from './ngx-monaco-editor.module';
 import { editor } from 'monaco-editor';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { AsyncSubject, tap } from 'rxjs';
 import IMarker = editor.IMarker;
+import { IEditorOptions, NGX_MONACO_EDITOR_CONFIG, StandaloneCodeEditor } from './ngx-monaco-editor.model';
 
 @Injectable({
   providedIn: 'root',

projects/ngx-monaco-editor/src/public-api.ts

@@ -5,3 +5,4 @@
 export * from './lib/ngx-monaco-editor.module';
 export * from './lib/ngx-monaco-editor.service';
 export * from './lib/ngx-monaco-editor.component';
+export * from './lib/ngx-monaco-editor.model';