diff --git a/src/demo/app/properties.dialog.component.ts b/projects/demo/app/properties.dialog.component.ts
similarity index 100%
rename from src/demo/app/properties.dialog.component.ts
rename to projects/demo/app/properties.dialog.component.ts
diff --git a/src/demo/app/renderer.ts b/projects/demo/app/renderer.ts
similarity index 100%
rename from src/demo/app/renderer.ts
rename to projects/demo/app/renderer.ts
diff --git a/src/demo/app/text-to-graph.ts b/projects/demo/app/text-to-graph.ts
similarity index 100%
rename from src/demo/app/text-to-graph.ts
rename to projects/demo/app/text-to-graph.ts
diff --git a/projects/demo/environments/environment.prod.ts b/projects/demo/environments/environment.prod.ts
new file mode 100644
index 0000000..3612073
--- /dev/null
+++ b/projects/demo/environments/environment.prod.ts
@@ -0,0 +1,3 @@
+export const environment = {
+ production: true
+};
diff --git a/projects/demo/environments/environment.ts b/projects/demo/environments/environment.ts
new file mode 100644
index 0000000..f56ff47
--- /dev/null
+++ b/projects/demo/environments/environment.ts
@@ -0,0 +1,16 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+ production: false
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
diff --git a/integration/src/favicon.ico b/projects/demo/favicon.ico
similarity index 100%
rename from integration/src/favicon.ico
rename to projects/demo/favicon.ico
diff --git a/src/demo/icons/cog.svg b/projects/demo/icons/cog.svg
similarity index 100%
rename from src/demo/icons/cog.svg
rename to projects/demo/icons/cog.svg
diff --git a/src/demo/icons/delete.svg b/projects/demo/icons/delete.svg
similarity index 100%
rename from src/demo/icons/delete.svg
rename to projects/demo/icons/delete.svg
diff --git a/src/demo/icons/error.svg b/projects/demo/icons/error.svg
similarity index 100%
rename from src/demo/icons/error.svg
rename to projects/demo/icons/error.svg
diff --git a/src/demo/index.html b/projects/demo/index.html
similarity index 78%
rename from src/demo/index.html
rename to projects/demo/index.html
index f51c19c..a6b8841 100644
--- a/src/demo/index.html
+++ b/projects/demo/index.html
@@ -5,7 +5,7 @@
-
+
diff --git a/projects/demo/karma.conf.js b/projects/demo/karma.conf.js
new file mode 100644
index 0000000..71e79c5
--- /dev/null
+++ b/projects/demo/karma.conf.js
@@ -0,0 +1,44 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+ config.set({
+ basePath: '',
+ frameworks: ['jasmine', '@angular-devkit/build-angular'],
+ plugins: [
+ require('karma-jasmine'),
+ require('karma-chrome-launcher'),
+ require('karma-jasmine-html-reporter'),
+ require('karma-coverage'),
+ require('@angular-devkit/build-angular/plugins/karma')
+ ],
+ client: {
+ jasmine: {
+ // you can add configuration options for Jasmine here
+ // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+ // for example, you can disable the random execution with `random: false`
+ // or set a specific seed with `seed: 4321`
+ },
+ clearContext: false // leave Jasmine Spec Runner output visible in browser
+ },
+ jasmineHtmlReporter: {
+ suppressAll: true // removes the duplicated traces
+ },
+ coverageReporter: {
+ dir: require('path').join(__dirname, '../../coverage/showcase'),
+ subdir: '.',
+ reporters: [
+ { type: 'html' },
+ { type: 'text-summary' }
+ ]
+ },
+ reporters: ['progress', 'kjhtml'],
+ port: 9876,
+ colors: true,
+ logLevel: config.LOG_INFO,
+ autoWatch: true,
+ browsers: ['Chrome'],
+ singleRun: false,
+ restartOnFileChange: true
+ });
+};
diff --git a/integration/src/main.ts b/projects/demo/main.ts
similarity index 100%
rename from integration/src/main.ts
rename to projects/demo/main.ts
diff --git a/src/demo/polyfills.ts b/projects/demo/polyfills.ts
similarity index 100%
rename from src/demo/polyfills.ts
rename to projects/demo/polyfills.ts
diff --git a/src/demo/styles.css b/projects/demo/styles.css
similarity index 71%
rename from src/demo/styles.css
rename to projects/demo/styles.css
index 200024f..8c42ab9 100644
--- a/src/demo/styles.css
+++ b/projects/demo/styles.css
@@ -1,8 +1,8 @@
@import "./../../node_modules/jointjs/dist/joint.core.css";
-@import "./../../node_modules/codemirror-minified/lib/codemirror.css";
-@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css";
-@import "./../../node_modules/codemirror-minified/addon/lint/lint.css";
-@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css";
+@import "./../../node_modules/codemirror/lib/codemirror.css";
+@import "./../../node_modules/codemirror/addon/hint/show-hint.css";
+@import "./../../node_modules/codemirror/addon/lint/lint.css";
+@import "./../../node_modules/codemirror/addon/scroll/simplescrollbars.css";
h1 {
color: #369;
diff --git a/projects/demo/test.ts b/projects/demo/test.ts
new file mode 100644
index 0000000..51bb020
--- /dev/null
+++ b/projects/demo/test.ts
@@ -0,0 +1,14 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+ BrowserDynamicTestingModule,
+ platformBrowserDynamicTesting(),
+);
diff --git a/src/demo/tsconfig.dev.json b/projects/demo/tsconfig.dev.json
similarity index 54%
rename from src/demo/tsconfig.dev.json
rename to projects/demo/tsconfig.dev.json
index 14aa68c..25a66af 100644
--- a/src/demo/tsconfig.dev.json
+++ b/projects/demo/tsconfig.dev.json
@@ -2,21 +2,24 @@
"extends": "../../tsconfig.json",
"angularCompilerOptions": {
"paths": {
- "spring-flo": [ "../lib/index.ts" ]
+ "spring-flo": [ "../spring-flo/index.ts" ]
}
},
"compilerOptions": {
- "baseUrl": "",
- "module": "commonjs",
+ "outDir": "../../out-tsc/app",
"declaration": false,
"emitDecoratorMetadata": true,
"paths": {
"spring-flo": [
- "../lib/index.ts"
+ "../spring-flo/index.ts"
]
}
},
- "exclude": [
- "main-aot.ts"
+ "files": [
+ "main.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "**/*.d.ts"
]
}
diff --git a/projects/demo/tsconfig.json b/projects/demo/tsconfig.json
new file mode 100644
index 0000000..8db2d57
--- /dev/null
+++ b/projects/demo/tsconfig.json
@@ -0,0 +1,24 @@
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../out-tsc/app",
+ "declaration": false,
+ "emitDecoratorMetadata": true,
+ "paths": {
+ "spring-flo/*": [
+ "../../dist/spring-flo/*"
+ ],
+ "spring-flo": [
+ "../../dist/spring-flo"
+ ]
+ }
+ },
+ "files": [
+ "main.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "**/*.d.ts"
+ ]
+ }
+
\ No newline at end of file
diff --git a/projects/demo/tsconfig.prod.json b/projects/demo/tsconfig.prod.json
new file mode 100644
index 0000000..3331c7e
--- /dev/null
+++ b/projects/demo/tsconfig.prod.json
@@ -0,0 +1,28 @@
+{
+ "extends": "../../tsconfig.json",
+ "angularCompilerOptions": {
+ "paths": {
+ "spring-flo": [ "../../dist/spring-flo" ]
+ }
+ },
+ "compilerOptions": {
+ "outDir": "../../out-tsc/app",
+ "declaration": false,
+ "emitDecoratorMetadata": true,
+ "paths": {
+ "spring-flo/*": [
+ "../../dist/spring-flo/*"
+ ],
+ "spring-flo": [
+ "../../dist/spring-flo"
+ ]
+ }
+ },
+ "files": [
+ "main.ts",
+ "polyfills.ts"
+ ],
+ "include": [
+ "**/*.d.ts"
+ ]
+}
diff --git a/src/demo/typings.d.ts b/projects/demo/typings.d.ts
similarity index 100%
rename from src/demo/typings.d.ts
rename to projects/demo/typings.d.ts
diff --git a/src/lib/@types/codemirror-minified/index.d.ts b/projects/flo/@types/codemirror-minified/index.d.ts
similarity index 100%
rename from src/lib/@types/codemirror-minified/index.d.ts
rename to projects/flo/@types/codemirror-minified/index.d.ts
diff --git a/src/lib/code-editor/code-editor.component.html b/projects/flo/code-editor/code-editor.component.html
similarity index 100%
rename from src/lib/code-editor/code-editor.component.html
rename to projects/flo/code-editor/code-editor.component.html
diff --git a/src/lib/code-editor/code-editor.component.scss b/projects/flo/code-editor/code-editor.component.scss
similarity index 100%
rename from src/lib/code-editor/code-editor.component.scss
rename to projects/flo/code-editor/code-editor.component.scss
diff --git a/src/lib/code-editor/code-editor.component.ts b/projects/flo/code-editor/code-editor.component.ts
similarity index 77%
rename from src/lib/code-editor/code-editor.component.ts
rename to projects/flo/code-editor/code-editor.component.ts
index 4ea1bea..14974ff 100644
--- a/src/lib/code-editor/code-editor.component.ts
+++ b/projects/flo/code-editor/code-editor.component.ts
@@ -1,35 +1,34 @@
import { Component, Input, Output, ElementRef, EventEmitter, OnInit, ViewEncapsulation, forwardRef } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import * as CodeMirror from 'codemirror-minified';
+import * as CodeMirror from 'codemirror';
-import * as _$ from 'jquery';
-const $: any = _$;
+import $ from 'jquery';
// CodeMirror extensions
-import 'codemirror-minified/mode/meta';
-import 'codemirror-minified/addon/lint/lint';
-import 'codemirror-minified/addon/hint/show-hint';
-// import 'codemirror-minified/addon/mode/loadmode';
-import 'codemirror-minified/addon/edit/matchbrackets';
-import 'codemirror-minified/addon/edit/closebrackets';
-import 'codemirror-minified/addon/display/placeholder';
-import 'codemirror-minified/addon/scroll/annotatescrollbar';
-import 'codemirror-minified/addon/scroll/simplescrollbars';
+import 'codemirror/mode/meta';
+import 'codemirror/addon/lint/lint';
+import 'codemirror/addon/hint/show-hint';
+// import 'codemirror/addon/mode/loadmode';
+import 'codemirror/addon/edit/matchbrackets';
+import 'codemirror/addon/edit/closebrackets';
+import 'codemirror/addon/display/placeholder';
+import 'codemirror/addon/scroll/annotatescrollbar';
+import 'codemirror/addon/scroll/simplescrollbars';
// Lint support
// Unclear how to import this dynamically...
-// import 'codemirror-minified/addon/lint/javascript-lint';
-// import 'codemirror-minified/addon/lint/json-lint';
-// import 'codemirror-minified/addon/lint/yaml-lint';
+// import 'codemirror/addon/lint/javascript-lint';
+// import 'codemirror/addon/lint/json-lint';
+// import 'codemirror/addon/lint/yaml-lint';
// TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD
// Supported languages until dynamic loading
-// import 'codemirror-minified/mode/groovy/groovy';
-// import 'codemirror-minified/mode/javascript/javascript';
-// import 'codemirror-minified/mode/python/python';
-// import 'codemirror-minified/mode/ruby/ruby';
-// import 'codemirror-minified/mode/clike/clike';
-// import 'codemirror-minified/mode/yaml/yaml';
+// import 'codemirror/mode/groovy/groovy';
+// import 'codemirror/mode/javascript/javascript';
+// import 'codemirror/mode/python/python';
+// import 'codemirror/mode/ruby/ruby';
+// import 'codemirror/mode/clike/clike';
+// import 'codemirror/mode/yaml/yaml';
@Component({
selector: 'code-editor',
@@ -63,31 +62,31 @@ export class CodeEditorComponent implements OnInit, ControlValueAccessor {
private _onTouchHandler: () => void;
@Input('line-numbers')
- private lineNumbers = false;
+ lineNumbers = false;
@Input('line-wrapping')
- private lineWrapping = false;
+ lineWrapping = false;
@Input('scrollbar-style')
- private scrollbarStyle: string;
+ scrollbarStyle: string;
@Input()
- private placeholder: string;
+ placeholder: string;
@Input('overview-ruler')
- private overviewRuler: boolean;
+ overviewRuler: boolean;
@Output()
- private dslChange = new EventEmitter
();
+ dslChange = new EventEmitter();
@Output()
- private focus = new EventEmitter();
+ focus = new EventEmitter();
@Output()
- private blur = new EventEmitter();
+ blur = new EventEmitter();
@Output()
- private editor = new EventEmitter();
+ editor = new EventEmitter();
private _dslChangedHandler = () => {
this._dsl = this.doc.getValue();
diff --git a/src/lib/directives/resizer.ts b/projects/flo/directives/resizer.ts
similarity index 98%
rename from src/lib/directives/resizer.ts
rename to projects/flo/directives/resizer.ts
index fb7c205..724b047 100644
--- a/src/lib/directives/resizer.ts
+++ b/projects/flo/directives/resizer.ts
@@ -4,8 +4,7 @@ import { fromEvent } from 'rxjs';
import { sampleTime } from 'rxjs/operators';
import { CompositeDisposable, Disposable } from 'ts-disposables';
-import * as _$ from 'jquery';
-const $: any = _$;
+import $ from 'jquery';
@Directive({
selector: '[resizer]',
diff --git a/src/lib/dsl-editor/dsl-editor.component.html b/projects/flo/dsl-editor/dsl-editor.component.html
similarity index 100%
rename from src/lib/dsl-editor/dsl-editor.component.html
rename to projects/flo/dsl-editor/dsl-editor.component.html
diff --git a/src/lib/dsl-editor/dsl-editor.component.scss b/projects/flo/dsl-editor/dsl-editor.component.scss
similarity index 100%
rename from src/lib/dsl-editor/dsl-editor.component.scss
rename to projects/flo/dsl-editor/dsl-editor.component.scss
diff --git a/src/lib/dsl-editor/dsl-editor.component.ts b/projects/flo/dsl-editor/dsl-editor.component.ts
similarity index 74%
rename from src/lib/dsl-editor/dsl-editor.component.ts
rename to projects/flo/dsl-editor/dsl-editor.component.ts
index 92affec..609fad0 100644
--- a/src/lib/dsl-editor/dsl-editor.component.ts
+++ b/projects/flo/dsl-editor/dsl-editor.component.ts
@@ -1,14 +1,13 @@
import { Component, Input, Output, ElementRef, EventEmitter, OnInit, ViewEncapsulation } from '@angular/core';
-import * as _ from 'lodash';
-import * as CodeMirror from 'codemirror-minified';
-import * as _$ from 'jquery';
-const $: any = _$;
+import debounce from 'lodash/debounce';
+import * as CodeMirror from 'codemirror';
+import $ from 'jquery';
-import 'codemirror-minified/addon/lint/lint';
-import 'codemirror-minified/addon/hint/show-hint';
-import 'codemirror-minified/addon/display/placeholder';
-import 'codemirror-minified/addon/scroll/annotatescrollbar';
-import 'codemirror-minified/addon/scroll/simplescrollbars';
+import 'codemirror/addon/lint/lint';
+import 'codemirror/addon/hint/show-hint';
+import 'codemirror/addon/display/placeholder';
+import 'codemirror/addon/scroll/annotatescrollbar';
+import 'codemirror/addon/scroll/simplescrollbars';
@Component({
selector: 'dsl-editor',
@@ -27,31 +26,31 @@ export class DslEditorComponent implements OnInit {
private _hint: any;
@Input('line-numbers')
- private lineNumbers = false;
+ lineNumbers = false;
@Input('line-wrapping')
- private lineWrapping = false;
+ lineWrapping = false;
@Input('scrollbar-style')
- private scrollbarStyle: string;
+ scrollbarStyle: string;
@Input()
- private placeholder: string;
+ placeholder: string;
@Input()
- private debounce = 0;
+ debounce = 0;
@Output()
- private dslChange = new EventEmitter();
+ dslChange = new EventEmitter();
@Output()
- private focus = new EventEmitter();
+ focus = new EventEmitter();
@Output()
- private blur = new EventEmitter();
+ blur = new EventEmitter();
@Output()
- private editor = new EventEmitter();
+ editor = new EventEmitter();
private _dslChangedHandler = () => {
this._dsl = this.doc.getValue();
@@ -124,7 +123,7 @@ export class DslEditorComponent implements OnInit {
// Turns out "value" in the option doesn't set it.
this.doc.setValue(this._dsl || '');
- this.doc.on('change', this.debounce ? _.debounce(this._dslChangedHandler, this.debounce) : this._dslChangedHandler);
+ this.doc.on('change', this.debounce ? debounce(this._dslChangedHandler, this.debounce) : this._dslChangedHandler);
this.doc.on('focus', () => this.focus.emit());
this.doc.on('blur', () => this.blur.emit());
diff --git a/src/lib/editor/editor-utils.ts b/projects/flo/editor/editor-utils.ts
similarity index 100%
rename from src/lib/editor/editor-utils.ts
rename to projects/flo/editor/editor-utils.ts
diff --git a/src/lib/editor/editor.component.html b/projects/flo/editor/editor.component.html
similarity index 100%
rename from src/lib/editor/editor.component.html
rename to projects/flo/editor/editor.component.html
diff --git a/src/lib/editor/editor.component.scss b/projects/flo/editor/editor.component.scss
similarity index 100%
rename from src/lib/editor/editor.component.scss
rename to projects/flo/editor/editor.component.scss
diff --git a/src/lib/editor/editor.component.ts b/projects/flo/editor/editor.component.ts
similarity index 99%
rename from src/lib/editor/editor.component.ts
rename to projects/flo/editor/editor.component.ts
index 042417b..896dafb 100644
--- a/src/lib/editor/editor.component.ts
+++ b/projects/flo/editor/editor.component.ts
@@ -14,12 +14,13 @@ import { Flo } from '../shared/flo-common';
import { Shapes, Constants } from '../shared/shapes';
import { Utils } from './editor-utils';
import { CompositeDisposable, Disposable } from 'ts-disposables';
-import * as _$ from 'jquery';
-import * as _ from 'lodash';
+import $ from 'jquery';
+import isEqual from 'lodash/isEqual';
+import partial from 'lodash/partial';
+
import { Observable, Subject, BehaviorSubject } from 'rxjs';
import { Logger } from '../shared/logger';
const joint: any = Flo.joint;
-const $: any = _$;
export interface VisibilityState {
visibility: string;
@@ -559,7 +560,7 @@ export class EditorComponent implements OnInit, OnDestroy {
if (this.highlighted === dragDescriptor) {
return;
}
- if (this.highlighted && dragDescriptor && _.isEqual(this.highlighted.sourceComponent, dragDescriptor.sourceComponent)) {
+ if (this.highlighted && dragDescriptor && isEqual(this.highlighted.sourceComponent, dragDescriptor.sourceComponent)) {
if (this.highlighted.source === dragDescriptor.source && this.highlighted.target === dragDescriptor.target) {
return;
}
@@ -673,7 +674,7 @@ export class EditorComponent implements OnInit, OnDestroy {
// }
let oldVisibility = excludeViews.map(_x => this._hideNode(_x.el));
- let targetElement = document.elementFromPoint(event.clientX, event.clientY);
+ let targetElement = document.elementFromPoint(event.clientX, event.clientY) as HTMLElement;
excludeViews.forEach((excluded, i) => {
this._restoreNodeVisibility(excluded.el, oldVisibility[i]);
});
@@ -724,7 +725,7 @@ export class EditorComponent implements OnInit, OnDestroy {
handleDropFromPalette(event: Flo.DnDEvent) {
let cellview = event.view;
let evt = event.event;
- if (this.paper.el === evt.target || $.contains(this.paper.el, evt.target)) {
+ if (this.paper.el === evt.target || $.contains(this.paper.el, evt.target as HTMLElement)) {
if (this.readOnlyCanvas) {
this.setDragDescriptor(undefined);
} else {
@@ -1173,7 +1174,7 @@ export class EditorComponent implements OnInit, OnDestroy {
}
});
// adjust vertices when a cell is removed or its source/target was changed
- this.graph.on('add remove change:source change:target change:vertices change:position', _.partial(Utils.fanRoute, this.graph));
+ this.graph.on('add remove change:source change:target change:vertices change:position', partial(Utils.fanRoute, this.graph));
this.graph.on('startDeletion', (cell: dia.Cell) => {
if (this.editor && this.editor.preDelete) {
diff --git a/src/lib/editor/paper.component.ts b/projects/flo/editor/paper.component.ts
similarity index 100%
rename from src/lib/editor/paper.component.ts
rename to projects/flo/editor/paper.component.ts
diff --git a/src/lib/index.ts b/projects/flo/index.ts
similarity index 100%
rename from src/lib/index.ts
rename to projects/flo/index.ts
diff --git a/src/lib/module.ts b/projects/flo/module.ts
similarity index 100%
rename from src/lib/module.ts
rename to projects/flo/module.ts
diff --git a/projects/flo/ng-package.json b/projects/flo/ng-package.json
new file mode 100644
index 0000000..d6d2f49
--- /dev/null
+++ b/projects/flo/ng-package.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+ "dest": "../../dist/flo",
+ "deleteDestPath": true,
+ "lib": {
+ "entryFile": "./index.ts"
+ },
+ "allowedNonPeerDependencies": [
+ "codemirror",
+ "jointjs",
+ "jquery",
+ "lodash",
+ "ts-disposables"
+ ]
+}
diff --git a/projects/flo/package.json b/projects/flo/package.json
new file mode 100644
index 0000000..5310075
--- /dev/null
+++ b/projects/flo/package.json
@@ -0,0 +1,24 @@
+{
+ "name": "spring-flo",
+ "version": "0.13.0-alpha.0",
+ "description": "Library for quickly building text DSL visualization diagram editor",
+ "author": "Andy Clement, Alex Boyko",
+ "license": "Apache-2.0",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/spring-projects/spring-flo.git"
+ },
+ "dependencies": {
+ "codemirror": "5.65.12",
+ "jointjs": "3.4.1",
+ "jquery": "^3.6.3",
+ "lodash": "^4.17.21",
+ "ts-disposables": "2.2.3"
+ },
+ "peerDependencies": {
+ "@angular/core": ">=15.0.0 <17.0.0",
+ "@angular/forms": ">=15.0.0 < 17.0.0",
+ "@angular/common": ">=15.0.0 <17.0.0",
+ "rxjs": ">=7.0.0 <8.0.0"
+ }
+}
diff --git a/src/lib/palette/palette.component.html b/projects/flo/palette/palette.component.html
similarity index 100%
rename from src/lib/palette/palette.component.html
rename to projects/flo/palette/palette.component.html
diff --git a/src/lib/palette/palette.component.scss b/projects/flo/palette/palette.component.scss
similarity index 100%
rename from src/lib/palette/palette.component.scss
rename to projects/flo/palette/palette.component.scss
diff --git a/src/lib/palette/palette.component.ts b/projects/flo/palette/palette.component.ts
similarity index 99%
rename from src/lib/palette/palette.component.ts
rename to projects/flo/palette/palette.component.ts
index 1d32d87..34b7513 100644
--- a/src/lib/palette/palette.component.ts
+++ b/projects/flo/palette/palette.component.ts
@@ -6,10 +6,9 @@ import { Flo } from '../shared/flo-common';
import '../shared/shapes';
import { Shapes, Constants } from '../shared/shapes';
import { DOCUMENT } from '@angular/common'
-import * as _$ from 'jquery';
+import $ from 'jquery';
import {Logger} from '../shared/logger';
const joint: any = Flo.joint;
-const $: any = _$;
const DEBOUNCE_TIME = 300;
diff --git a/src/lib/properties/df.property.component.html b/projects/flo/properties/df.property.component.html
similarity index 95%
rename from src/lib/properties/df.property.component.html
rename to projects/flo/properties/df.property.component.html
index dbf123c..0890065 100644
--- a/src/lib/properties/df.property.component.html
+++ b/projects/flo/properties/df.property.component.html
@@ -30,8 +30,8 @@
+ [formControlName]="model.id" [language]="model['language']" [(ngModel)]="model.value" [line-numbers]="true"
+ scrollbar-style="simple" [placeholder]="model.defaultValue || 'Enter code snippet...'" [overview-ruler]="true">
0;
@@ -45,7 +45,7 @@ export function loadShapes() {
let amount = Number.isFinite(args.amount) ? args.amount : 1;
- return _.template(
+ return template(
'',
{
a: 1 - 0.96 * amount,
@@ -66,7 +66,7 @@ export function loadShapes() {
let amount = Number.isFinite(args.amount) ? args.amount : 1;
- return _.template(
+ return template(
'',
{
a: 1.0 + 0.5 * amount,
@@ -355,7 +355,7 @@ export function loadShapes() {
// }
// },
drag: function(evt: MouseEvent, x: number, y: number) {
- let interactive = _.isFunction(this.options.interactive) ? this.options.interactive(this, 'pointermove') :
+ let interactive = isFunction(this.options.interactive) ? this.options.interactive(this, 'pointermove') :
this.options.interactive;
if (interactive !== false) {
this.paper.trigger('dragging-node-over-canvas', {type: Flo.DnDEventType.DRAG, view: this, event: evt});
@@ -646,7 +646,7 @@ export namespace Shapes {
position = {x: 0, y: 0};
}
- if (renderer && _.isFunction(renderer.createNode)) {
+ if (renderer && isFunction(renderer.createNode)) {
node = renderer.createNode({graph, paper}, metadata, props);
} else {
node = new joint.shapes.flo.Node();
@@ -665,7 +665,7 @@ export namespace Shapes {
if (graph) {
graph.addCell(node);
}
- if (renderer && _.isFunction(renderer.initializeNewNode)) {
+ if (renderer && isFunction(renderer.initializeNewNode)) {
let descriptor: Flo.ViewerDescriptor = {
paper: paper,
graph: graph
@@ -685,7 +685,7 @@ export namespace Shapes {
let graph = params.graph || (params.paper ? params.paper.model : undefined);
let link: dia.Link;
- if (renderer && _.isFunction(renderer.createLink)) {
+ if (renderer && isFunction(renderer.createLink)) {
link = renderer.createLink(source, target, metadata, props);
} else {
link = new joint.shapes.flo.Link();
@@ -706,7 +706,7 @@ export namespace Shapes {
if (graph) {
graph.addCell(link);
}
- if (renderer && _.isFunction(renderer.initializeNewLink)) {
+ if (renderer && isFunction(renderer.initializeNewLink)) {
let descriptor: Flo.ViewerDescriptor = {
paper: paper,
graph: graph
@@ -728,7 +728,7 @@ export namespace Shapes {
let graph = params.graph || (params.paper ? params.paper.model : undefined);
let decoration: dia.Element;
- if (renderer && _.isFunction(renderer.createDecoration)) {
+ if (renderer && isFunction(renderer.createDecoration)) {
decoration = renderer.createDecoration(kind, parent);
}
if (decoration) {
@@ -742,7 +742,7 @@ export namespace Shapes {
graph.addCell(decoration);
}
parent.embed(decoration);
- if (renderer && _.isFunction(renderer.initializeNewDecoration)) {
+ if (renderer && isFunction(renderer.initializeNewDecoration)) {
let descriptor: Flo.ViewerDescriptor = {
paper: paper,
graph: graph
@@ -766,7 +766,7 @@ export namespace Shapes {
if (!location) {
location = {x: 0, y: 0};
}
- if (renderer && _.isFunction(renderer.createHandle)) {
+ if (renderer && isFunction(renderer.createHandle)) {
handle = renderer.createHandle(kind, parent);
} else {
handle = new joint.shapes.flo.ErrorDecoration({
@@ -788,7 +788,7 @@ export namespace Shapes {
graph.addCell(handle);
}
parent.embed(handle);
- if (renderer && _.isFunction(renderer.initializeNewHandle)) {
+ if (renderer && isFunction(renderer.initializeNewHandle)) {
let descriptor: Flo.ViewerDescriptor = {
paper: paper,
graph: graph
diff --git a/projects/flo/styles.scss b/projects/flo/styles.scss
new file mode 100644
index 0000000..b6d8423
--- /dev/null
+++ b/projects/flo/styles.scss
@@ -0,0 +1,8 @@
+@import "./../../node_modules/jointjs/dist/joint.core.css";
+/*
+@import "./../../node_modules/codemirror/lib/codemirror.css";
+
+@import "./../../node_modules/codemirror/addon/hint/show-hint.css";
+@import "./../../node_modules/codemirror/addon/lint/lint.css";
+@import "./../../node_modules/codemirror/addon/scroll/simplescrollbars.css";
+*/
diff --git a/projects/flo/tsconfig.dev.json b/projects/flo/tsconfig.dev.json
new file mode 100644
index 0000000..7a32fe6
--- /dev/null
+++ b/projects/flo/tsconfig.dev.json
@@ -0,0 +1,15 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../out-tsc/flo",
+ "declaration": true,
+ "declarationMap": true,
+ "inlineSources": true,
+ "types": []
+ },
+ "exclude": [
+ "test.ts",
+ "**/*.spec.ts"
+ ]
+}
diff --git a/projects/flo/tsconfig.prod.json b/projects/flo/tsconfig.prod.json
new file mode 100644
index 0000000..6c9020d
--- /dev/null
+++ b/projects/flo/tsconfig.prod.json
@@ -0,0 +1,13 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+ "extends": "./tsconfig.dev.json",
+ "compilerOptions": {
+ "declarationMap": false,
+ "sourceMap": false,
+ "inlineSourceMap": false,
+ "inlineSources": false
+ },
+ "angularCompilerOptions": {
+ "compilationMode": "partial"
+ }
+}
diff --git a/scss-bundle.config.json b/scss-bundle.config.json
deleted file mode 100644
index d56018c..0000000
--- a/scss-bundle.config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "bundlerOptions": {
- "ignoreImports": ["~@angular/.*"],
- "logLevel": "silent"
- }
-}
diff --git a/src/demo/favicon.ico b/src/demo/favicon.ico
deleted file mode 100644
index 8081c7c..0000000
Binary files a/src/demo/favicon.ico and /dev/null differ
diff --git a/src/demo/main.ts b/src/demo/main.ts
deleted file mode 100644
index 311c44b..0000000
--- a/src/demo/main.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-
-platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/demo/systemjs-angular-loader.js b/src/demo/systemjs-angular-loader.js
deleted file mode 100644
index 38e5cc5..0000000
--- a/src/demo/systemjs-angular-loader.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var templateUrlRegex = /templateUrl\s*:(\s*['"`](.*?)['"`]\s*)/gm;
-var stylesRegex = /styleUrls *:(\s*\[[^\]]*?\])/g;
-var stringRegex = /(['`"])((?:[^\\]\\\1|.)*?)\1/g;
-
-module.exports.translate = function (load) {
- if (load.source.indexOf('moduleId') != -1) return load;
-
- var url = document.createElement('a');
- url.href = load.address;
-
- var basePathParts = url.pathname.split('/');
-
- basePathParts.pop();
- var basePath = basePathParts.join('/');
-
- var baseHref = document.createElement('a');
- baseHref.href = this.baseURL;
- baseHref = baseHref.pathname;
-
- if (!baseHref.startsWith('/base/')) { // it is not karma
- basePath = basePath.replace(baseHref, '');
- }
-
- load.source = load.source
- .replace(templateUrlRegex, function (match, quote, url) {
- let resolvedUrl = url;
-
- if (url.startsWith('.')) {
- resolvedUrl = basePath + url.substr(1);
- }
-
- return 'templateUrl: "' + resolvedUrl + '"';
- })
- .replace(stylesRegex, function (match, relativeUrls) {
- var urls = [];
-
- while ((match = stringRegex.exec(relativeUrls)) !== null) {
- if (match[2].startsWith('.')) {
- urls.push('"' + basePath + match[2].substr(1) + '"');
- } else {
- urls.push('"' + match[2] + '"');
- }
- }
-
- return "styleUrls: [" + urls.join(', ') + "]";
- });
-
- return load;
-};
diff --git a/src/demo/systemjs.config.js b/src/demo/systemjs.config.js
deleted file mode 100644
index aaaec7d..0000000
--- a/src/demo/systemjs.config.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * System configuration for Angular samples
- * Adjust as necessary for your application needs.
- */
-(function (global) {
- System.config({
- transpiler: false,
- paths: {
- // paths serve as alias
- 'npm:': 'node_modules/'
- },
- // map tells the System loader where to look for things
- map: {
- // our app is within the app folder
- app: 'app',
-
- // angular bundles
- '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
- '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
- '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
- '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
- '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
- '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
- '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
- '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
- '@angular/animations': 'npm:@angular/animations/bundles/animations.umd.js',
-
- 'ngx-bootstrap': 'npm:ngx-bootstrap/bundles/ngx-bootstrap.umd.min.js',
- // Below workaround due to https://github.com/valor-software/ngx-bootstrap/issues/5195
- 'ngx-bootstrap/chronos': 'npm:ngx-bootstrap/chronos/bundles/ngx-bootstrap-chronos.umd.min.js',
- 'ngx-bootstrap/utils': 'npm:ngx-bootstrap/utils/bundles/ngx-bootstrap-utils.umd.min.js',
- 'ngx-bootstrap/dropdown': 'npm:ngx-bootstrap/dropdown/bundles/ngx-bootstrap-dropdown.umd.min.js',
- 'ngx-bootstrap/accordion': 'npm:ngx-bootstrap/accordion/bundles/ngx-bootstrap-accordion.umd.min.js',
- 'ngx-bootstrap/collapse': 'npm:ngx-bootstrap/collapse/bundles/ngx-bootstrap-collapse.umd.min.js',
- 'ngx-bootstrap/alert': 'npm:ngx-bootstrap/alert/bundles/ngx-bootstrap-alert.umd.min.js',
- 'ngx-bootstrap/buttons': 'npm:ngx-bootstrap/buttons/bundles/ngx-bootstrap-buttons.umd.min.js',
- 'ngx-bootstrap/carousel': 'npm:ngx-bootstrap/carousel/bundles/ngx-bootstrap-carousel.umd.min.js',
- 'ngx-bootstrap/mini-ngrx': 'npm:ngx-bootstrap/mini-ngrx/bundles/ngx-bootstrap-mini-ngrx.umd.min.js',
- 'ngx-bootstrap/component-loader': 'npm:ngx-bootstrap/component-loader/bundles/ngx-bootstrap-component-loader.umd.min.js',
- 'ngx-bootstrap/positioning': 'npm:ngx-bootstrap/positioning/bundles/ngx-bootstrap-positioning.umd.min.js',
- 'ngx-bootstrap/pagination': 'npm:ngx-bootstrap/pagination/bundles/ngx-bootstrap-pagination.umd.min.js',
- 'ngx-bootstrap/progressbar': 'npm:ngx-bootstrap/progressbar/bundles/ngx-bootstrap-progressbar.umd.min.js',
- 'ngx-bootstrap/rating': 'npm:ngx-bootstrap/rating/bundles/ngx-bootstrap-rating.umd.min.js',
- 'ngx-bootstrap/tabs': 'npm:ngx-bootstrap/tabs/bundles/ngx-bootstrap-tabs.umd.min.js',
- 'ngx-bootstrap/timepicker': 'npm:ngx-bootstrap/timepicker/bundles/ngx-bootstrap-timepicker.umd.min.js',
- 'ngx-bootstrap/tooltip': 'npm:ngx-bootstrap/tooltip/bundles/ngx-bootstrap-tooltip.umd.min.js',
- 'ngx-bootstrap/typeahead': 'npm:ngx-bootstrap/typeahead/bundles/ngx-bootstrap-typeahead.umd.min.js',
- 'ngx-bootstrap/popover': 'npm:ngx-bootstrap/popover/bundles/ngx-bootstrap-popover.umd.min.js',
- 'ngx-bootstrap/locale': 'npm:ngx-bootstrap/locale/bundles/ngx-bootstrap-locale.umd.min.js',
- 'ngx-bootstrap/sortable': 'npm:ngx-bootstrap/sortable/bundles/ngx-bootstrap-sortable.umd.min.js',
- 'ngx-bootstrap/datepicker': 'npm:ngx-bootstrap/datepicker/bundles/ngx-bootstrap-datepicker.umd.min.js',
- 'ngx-bootstrap/modal': 'npm:ngx-bootstrap/modal/bundles/ngx-bootstrap-modal.umd.min.js',
-
- // other libraries
- 'rxjs': 'npm:rxjs',
- 'jointjs': 'npm:jointjs',
- 'jquery': 'npm:jquery',
- 'backbone': 'npm:backbone',
- 'lodash': 'npm:lodash',
- 'underscore': 'npm:lodash',
- 'dagre': 'npm:dagre',
- 'codemirror': 'npm:codemirror-minified',
- 'codemirror-minified': 'npm:codemirror-minified',
- 'moment': 'npm:moment/moment.js',
- 'ts-disposables': 'npm:ts-disposables',
- 'jshint': 'npm:jshint/dist/jshint.js'
- },
- meta: {
- 'lodash': {
- exports: '_',
- format: 'global'
- },
- 'jshint': {
- deps: ['lodash'],
- format: 'global'
- }
- },
- // packages tells the System loader how to load when no filename and/or no extension
- packages: {
- app: {
- defaultExtension: 'js',
- meta: {
- './*.js': {
- loader: 'systemjs-angular-loader.js'
- },
- }
- },
- rx: {
- main: './dist/rx.js'
- },
- rxjs: {
- main: 'index.js',
- defaultExtension: 'js'
- },
- 'rxjs/operators': {
- main: './index.js'
- },
- 'ts-disposables': {
- defaultExtension: 'js',
- main: './dist/index.js'
- },
- jointjs: {
- main: './dist/joint.js'
- },
- jquery: {
- main: './dist/jquery.js'
- },
- backbone: {
- main: './backbone.js'
- },
- lodash: {
- main: './index.js'
- },
- dagre: {
- main: './dist/dagre.js'
- },
- codemirror: {
- main: './lib/codemirror.js'
- },
- jshint: {
- meta: {
- lodash: {
- format: 'global'
- }
- }
- },
- 'spring-flo': {
- main: 'index.js',
- defaultExtension: 'js',
- meta: {
- './*.js': {
- loader: 'systemjs-angular-loader.js'
- }
- }
- }
- }
- });
-})(this);
diff --git a/src/demo/tsconfig.packaged.json b/src/demo/tsconfig.packaged.json
deleted file mode 100644
index 7fb390b..0000000
--- a/src/demo/tsconfig.packaged.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "extends": "../../tsconfig.json",
- "angularCompilerOptions": {
- "paths": {
- "spring-flo": [ "../../dist/lib" ]
- }
- },
- "compilerOptions": {
- "baseUrl": "",
- "module": "commonjs",
- "declaration": false,
- "emitDecoratorMetadata": true,
- "paths": {
- "spring-flo": [
- "../../dist/lib"
- ]
- }
- },
- "exclude": [
- "main-aot.ts"
- ]
-}
diff --git a/src/lib/package.json b/src/lib/package.json
deleted file mode 100644
index 16493a2..0000000
--- a/src/lib/package.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "spring-flo",
- "version": "0.12.0",
- "description": "Library for quickly building text DSL visualization diagram editor",
- "author": "Andy Clement, Alex Boyko",
- "license": "Apache-2.0",
- "repository": {
- "type": "git",
- "url": "https://github.com/spring-projects/spring-flo.git"
- },
- "engines": {
- "node": ">= 6.9.0",
- "npm": ">= 3.0.0"
- },
- "dependencies": {
- "codemirror-minified": "5.54.0",
- "jointjs": "3.4.1",
- "ts-disposables": "2.2.3"
- },
- "peerDependencies": {
- "@angular/core": ">=11.0.0 ",
- "@angular/forms": ">=11.0.0",
- "@angular/common": ">=11.0.0",
- "rxjs": ">=6.0.0"
- },
- "ngPackage": {
- "lib": {
- "entryFile": "./index.ts",
- "umdModuleIds": {
- "jointjs": "joint",
- "jquery": "$",
- "lodash": "_",
- "ts-disposables": "tsDisposables",
- "codemirror-minified": "codemirror"
- }
- },
- "whitelistedNonPeerDependencies": [
- "codemirror-minified",
- "jointjs",
- "ts-disposables"
- ],
- "dest": "../../dist",
- "deleteDestPath": true
- }
-}
diff --git a/src/lib/styles.scss b/src/lib/styles.scss
deleted file mode 100644
index 0636111..0000000
--- a/src/lib/styles.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "./../../node_modules/jointjs/dist/joint.core.css";
-@import "./../../node_modules/codemirror-minified/lib/codemirror.css";
-@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css";
-@import "./../../node_modules/codemirror-minified/addon/lint/lint.css";
-@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css";
diff --git a/tsconfig.json b/tsconfig.json
index 8bb515a..023c086 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,13 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
+ "compileOnSave": false,
"compilerOptions": {
- "target": "es5",
- "module": "es2015",
+ "paths": {
+ "spring-flo": ["projects/flo"],
+ "spring-flo/*": ["projects/flo/*"]
+ },
+ "baseUrl": "./",
+ "outDir": "./dist/out-tsc",
"moduleResolution": "node",
"sourceMap": true,
"inlineSources": true,
@@ -11,17 +17,16 @@
"suppressImplicitAnyIndexErrors": true,
"skipLibCheck": true,
"stripInternal": true,
- "lib": [
- "es2015",
- "dom"
- ],
- "typeRoots": [
- "node_modules/@types",
- "src/lib/@types"
- ],
- "strictNullChecks":false
+ "target": "ES2022",
+ "module": "ES2022",
+ "useDefineForClassFields": false,
+ "allowSyntheticDefaultImports": true,
+ "lib": ["ES2022", "dom"]
},
"angularCompilerOptions": {
- "enableIvy": true
+ "enableI18nLegacyMessageIdFormat": false,
+ "strictInjectionParameters": true,
+ "strictInputAccessModifiers": true,
+ "strictTemplates": true
}
}
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index 3690782..0000000
--- a/tslint.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "rules": {
- "class-name": true,
- "comment-format": [
- false,
- "check-space"
- ],
- "curly": true,
- "eofline": true,
- "forin": true,
- "indent": [
- true,
- "spaces"
- ],
- "label-position": true,
- "max-line-length": [
- false,
- 140
- ],
- "member-access": false,
- "member-ordering": [
- {
- "name": "static field",
- "kinds": [
- "public-static-field",
- "protected-static-field",
- "private-static-field"
- ]
- },
- {
- "name": "instance field",
- "kinds": [
- "public-instance-field",
- "protected-instance-field",
- "private-instance-field"
- ]
- },
- {
- "name": "static method",
- "kinds": [
- "public-static-method",
- "private-static-method",
- "protected-static-method",
- "public-static-accessor",
- "protected-static-accessor",
- "private-static-accessor"
- ]
- },
- {
- "name": "instance method",
- "kinds": [
- "public-constructor",
- "protected-constructor",
- "private-constructor",
- "public-instance-method",
- "protected-instance-method",
- "private-instance-method",
- "public-instance-accessor",
- "protected-instance-accessor",
- "private-instance-accessor"
- ]
- }
- ],
- "no-arg": true,
- "no-bitwise": true,
- "no-console": [
- true,
- "info",
- "time",
- "timeEnd",
- "trace"
- ],
- "no-construct": true,
- "no-debugger": true,
- "no-duplicate-variable": true,
- "no-empty": false,
- "no-eval": true,
- "no-inferrable-types": [true, "ignore-params"],
- "no-shadowed-variable": true,
- "no-string-literal": false,
- "no-switch-case-fall-through": true,
- "no-trailing-whitespace": true,
- "no-unused-expression": true,
- "no-var-keyword": true,
- "object-literal-sort-keys": false,
- "one-line": [
- true,
- "check-open-brace",
- "check-catch",
- "check-else",
- "check-whitespace"
- ],
- "quotemark": [
- true,
- "single"
- ],
- "radix": true,
- "semicolon": [
- "always"
- ],
- "triple-equals": [
- true,
- "allow-null-check"
- ],
- "typedef-whitespace": [
- true,
- {
- "call-signature": "nospace",
- "index-signature": "nospace",
- "parameter": "nospace",
- "property-declaration": "nospace",
- "variable-declaration": "nospace"
- }
- ],
- "variable-name": false,
- "whitespace": [
- true,
- "check-branch",
- "check-decl",
- "check-operator",
- "check-separator",
- "check-type"
- ]
- }
-}