From 36f50888b012ac569636737711758e4b2945d903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Susanne=20G=C3=B6bel?= Date: Sat, 3 Oct 2026 14:05:10 +0200 Subject: [PATCH 1/5] Fix import on generated spec --- .../package-selection-dialog.spec.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts b/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts index c6f6a51..c2e4466 100644 --- a/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts +++ b/src/app/generation/package-selection-dialog/package-selection-dialog.spec.ts @@ -1,17 +1,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { PackageSelectionDialog } from './package-selection-dialog'; +import {PackageSelectionDialogComponent} from './package-selection-dialog'; describe('PackageSelectionDialog', () => { - let component: PackageSelectionDialog; - let fixture: ComponentFixture; + let component: PackageSelectionDialogComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [PackageSelectionDialog], + imports: [PackageSelectionDialogComponent], }).compileComponents(); - fixture = TestBed.createComponent(PackageSelectionDialog); + fixture = TestBed.createComponent(PackageSelectionDialogComponent); component = fixture.componentInstance; await fixture.whenStable(); }); From 170ef09324b908a880b02f78f264301053dc3c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Susanne=20G=C3=B6bel?= Date: Sat, 3 Oct 2026 15:01:24 +0200 Subject: [PATCH 2/5] adapt to new integration with its correct packages, already adapt editor template to that --- .../angular/package.json.template.json | 8 ++++---- .../model/editor/editor.component.html | 6 +++--- .../editor/editor.component.ts.template.ts | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/assets/templates/angular/package.json.template.json b/src/assets/templates/angular/package.json.template.json index 992dd39..131b5c8 100644 --- a/src/assets/templates/angular/package.json.template.json +++ b/src/assets/templates/angular/package.json.template.json @@ -18,10 +18,10 @@ "@angular/platform-browser-dynamic": "^19.2.0", "@angular/router": "^19.2.0", - "emfular": "%%emfularVersion%%", - "ngx-emfular-helper": "^1.0.0", - "ngx-emfular-integration": "^0.4.1", - "ngx-svg-graphics": "^3.0.0", + "emfular-core": "^1.3.0", + "ngx-emfular-diagram": "^2.0.2", + "ngx-emfular-tool": "^1.1.1", + "ngx-emfular-integration": "^2.0.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", diff --git a/src/assets/templates/model/editor/editor.component.html b/src/assets/templates/model/editor/editor.component.html index b475eec..eb00e3d 100644 --- a/src/assets/templates/model/editor/editor.component.html +++ b/src/assets/templates/model/editor/editor.component.html @@ -4,14 +4,14 @@ [modelService]="modelService" > - - + - diff --git a/src/assets/templates/model/editor/editor.component.ts.template.ts b/src/assets/templates/model/editor/editor.component.ts.template.ts index 7c875da..0e1a7e3 100644 --- a/src/assets/templates/model/editor/editor.component.ts.template.ts +++ b/src/assets/templates/model/editor/editor.component.ts.template.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; import { - TreeModelDetailsService, - EditButtonDef, - ModelEditingBarComponent, + ActionButtonDef, BasicEditorComponent, - ReferencableBoxComponent + GraphicalTreeDetailsService, + ModelSpecificPaletteComponent, + TreeModelElementComponent } from "ngx-emfular-integration"; -import { BoundingBox } from 'ngx-svg-graphics'; -import { Referencable} from "emfular"; +import { BoundingBox } from "ngx-emfular-diagram"; +import { Referencable} from "emfular-core"; import { %%modelName%%Service } from "../edit/%%modelName%%.service"; import { %%root%% } from "../core/%%root%%"; @@ -15,9 +15,9 @@ import { %%root%% } from "../core/%%root%%"; @Component({ selector: '%%modelName%%-editor', imports: [ - ModelEditingBarComponent, + ModelSpecificPaletteComponent, BasicEditorComponent, - ReferencableBoxComponent + TreeModelElementComponent ], templateUrl: './%%modelName%%-editor.component.html', styleUrl: './%%modelName%%-editor.component.css' @@ -27,10 +27,10 @@ export class %%modelName%%EditorComponent{ svgwidth = 1500; svgheigth = 1000; initialBBox : BoundingBox = {x: this.svgwidth/2, y: 20, w: 200, h: 25} - sidebarButtons: Array | null = null; + sidebarButtons: Array | null = null; constructor( - public treeDetailsService: TreeModelDetailsService<%%root%%>, + public treeDetailsService: GraphicalTreeDetailsService<%%root%%>, public modelService: %%modelName%%Service, ) { this.sidebarButtons = [ From df51e361c2a196bceee67d44afd4cb243c3a5330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Susanne=20G=C3=B6bel?= Date: Sat, 3 Oct 2026 15:03:18 +0200 Subject: [PATCH 3/5] Fix imports on services --- .../model/services/model-history.service.ts.template.ts | 4 ++-- .../templates/model/services/model.service.ts.template.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/templates/model/services/model-history.service.ts.template.ts b/src/assets/templates/model/services/model-history.service.ts.template.ts index 177e27b..203d371 100644 --- a/src/assets/templates/model/services/model-history.service.ts.template.ts +++ b/src/assets/templates/model/services/model-history.service.ts.template.ts @@ -1,6 +1,6 @@ import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; -import { HistoryService } from 'ngx-emfular-helper'; -import { JsonOf } from 'emfular'; +import { HistoryService } from 'ngx-emfular-tool'; +import { JsonOf } from 'emfular-core'; import { %%root%% } from '../core/%%root%%'; @Injectable({ diff --git a/src/assets/templates/model/services/model.service.ts.template.ts b/src/assets/templates/model/services/model.service.ts.template.ts index ec77861..d7167e9 100644 --- a/src/assets/templates/model/services/model.service.ts.template.ts +++ b/src/assets/templates/model/services/model.service.ts.template.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ModelService } from 'ngx-emfular-integration'; -import { IoService } from 'ngx-emfular-helper'; +import { IoService } from 'ngx-emfular-tool'; import { %%modelName%%HistoryService } from './%%modelName%%-history.service'; %%ALL_REAL_CLASSES_IMPORTS%% From f0e4c44fe30006a86a4381eba673b6c2ebc8bf84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Susanne=20G=C3=B6bel?= Date: Sat, 3 Oct 2026 15:17:39 +0200 Subject: [PATCH 4/5] Adapt all imports to new package names --- src/app/generation/model/class-generation.service.ts | 6 +++--- .../templates/model/v10/meta/model-meta.ts.template.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/generation/model/class-generation.service.ts b/src/app/generation/model/class-generation.service.ts index 0bea83d..1a24ce4 100644 --- a/src/app/generation/model/class-generation.service.ts +++ b/src/app/generation/model/class-generation.service.ts @@ -98,7 +98,7 @@ export class ClassGenerationService { model: EPackageJson): string { const imports = new Set(); //basic import: eClass and attribuets and reference decorators if needed from emfular: - imports.add(`import { eClass${cls.references.length>0? ', reference': ''}${cls.attributes.length>0? ', attribute': ''} } from 'emfular'`) + imports.add(`import { eClass${cls.references.length>0? ', reference': ''}${cls.attributes.length>0? ', attribute': ''} } from 'emfular-core'`) // interface supertypes (type-only) interfaces.forEach(i => @@ -112,7 +112,7 @@ export class ClassGenerationService { }); //modelList if needed (type-only) if (cls.references.some(r => r.upperBound !== 1)) { - imports.add(`import type { ModelList } from 'emfular';`); + imports.add(`import type { ModelList } from 'emfular-core';`); } // meta: imports.add(`import { ${model.name}Meta${cls.references.length> 0?`, ${cls.name}Refs`:'' }${usedEnums.size>0?", "+Array.from(usedEnums).join(", "):''} } from './_meta_';`) @@ -120,7 +120,7 @@ export class ClassGenerationService { if (realParent) { imports.add(`import { ${realParent} } from './${realParent}';`); } else { - imports.add(`import { Referencable } from 'emfular';`); + imports.add(`import { Referencable } from 'emfular-core';`); } return Array.from(imports).join('\n'); diff --git a/src/assets/templates/model/v10/meta/model-meta.ts.template.ts b/src/assets/templates/model/v10/meta/model-meta.ts.template.ts index a6c1d21..9bd6a62 100644 --- a/src/assets/templates/model/v10/meta/model-meta.ts.template.ts +++ b/src/assets/templates/model/v10/meta/model-meta.ts.template.ts @@ -1,4 +1,4 @@ -import { ModelDefinition, ReferenceMeta } from "emfular"; +import { ModelDefinition, ReferenceMeta } from "emfular-core"; %%TYPES%% %%ENUMS%% From b559b7a25b1551de9a2f91b71d573aacbcd4b2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Susanne=20G=C3=B6bel?= Date: Sat, 3 Oct 2026 15:34:43 +0200 Subject: [PATCH 5/5] Nicer button size and position on initial view --- .../model/editor/editor.component.ts.template.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/templates/model/editor/editor.component.ts.template.ts b/src/assets/templates/model/editor/editor.component.ts.template.ts index 0e1a7e3..de8ea58 100644 --- a/src/assets/templates/model/editor/editor.component.ts.template.ts +++ b/src/assets/templates/model/editor/editor.component.ts.template.ts @@ -24,10 +24,10 @@ import { %%root%% } from "../core/%%root%%"; }) export class %%modelName%%EditorComponent{ - svgwidth = 1500; - svgheigth = 1000; - initialBBox : BoundingBox = {x: this.svgwidth/2, y: 20, w: 200, h: 25} - sidebarButtons: Array | null = null; + svgwidth = 750; + svgheigth = 500; + initialBBox : BoundingBox = {x: this.svgwidth/2-100, y: 20, w: 200, h: 50} + sidebarButtons: ActionButtonDef[] = []; constructor( public treeDetailsService: GraphicalTreeDetailsService<%%root%%>,