made generation less restrictive

freon4dsl · Jun 26, 2024 · d35ef75 · d35ef75
1 parent 6878673
commit d35ef75
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 41 deletions.
diff --git a/packages/meta/src/commandline/FreonGenerateAllAction.ts b/packages/meta/src/commandline/FreonGenerateAllAction.ts
@@ -112,12 +112,10 @@ export class FreonGenerateAllAction extends FreonGenerateAction {
         try {
             if (this.typerFiles.length > 0) {
                 typer = new FreTyperMerger(this.language).parseMulti(this.typerFiles);
-                 if (!!typer) {
-                     this.typerGenerator.language = this.language;
-                     this.typerGenerator.outputfolder = this.outputFolder;
-                     this.typerGenerator.generate(typer);
-                 }
             }
+            this.typerGenerator.language = this.language;
+            this.typerGenerator.outputfolder = this.outputFolder;
+            this.typerGenerator.generate(typer);
         } catch (e: unknown) {
             if (e instanceof Error) {
                 LOG2USER.error("Stopping typer generation because of errors: " + e.message + "\n" + e.stack);
@@ -160,12 +158,10 @@ export class FreonGenerateAllAction extends FreonGenerateAction {
         try {
             if (this.scopeFiles.length > 0) {
                 scoper = new ScoperParser(this.language).parseMulti(this.scopeFiles);
-                if (!!scoper) {
-                    this.scoperGenerator.language = this.language;
-                    this.scoperGenerator.outputfolder = this.outputFolder;
-                    this.scoperGenerator.generate(scoper);
-                }
             }
+            this.scoperGenerator.language = this.language;
+            this.scoperGenerator.outputfolder = this.outputFolder;
+            this.scoperGenerator.generate(scoper);
         } catch (e: unknown) {
             if (e instanceof Error) {
                 LOG2USER.error("Stopping scoper generation because of errors: " + e.message + "\n" + e.stack);
@@ -183,12 +179,10 @@ export class FreonGenerateAllAction extends FreonGenerateAction {
         try {
             if (this.validFiles.length > 0) {
                 validator = new ValidatorParser(this.language).parseMulti(this.validFiles);
-                if (!!validator) {
-                    this.validatorGenerator.language = this.language;
-                    this.validatorGenerator.outputfolder = this.outputFolder;
-                    this.validatorGenerator.generate(validator);
-                }
             }
+            this.validatorGenerator.language = this.language;
+            this.validatorGenerator.outputfolder = this.outputFolder;
+            this.validatorGenerator.generate(validator);
         } catch (e: unknown) {
             if (e instanceof Error) {
                 LOG2USER.error("Stopping validator generation because of errors: " + e.message + "\n" + e.stack);

diff --git a/packages/meta/src/commandline/FreonGenerateScoper.ts b/packages/meta/src/commandline/FreonGenerateScoper.ts
@@ -15,6 +15,7 @@ export class FreonGenerateScoper extends FreonGeneratePartAction {
             documentation:
                 "Generates TypeScript code for the scoper of language defined in the .ast files. " + "The scoper definition is found in the .scope files."
         });
+        this.scoperGenerator = new ScoperGenerator();
     }
 
     generate(): void {
@@ -23,7 +24,6 @@ export class FreonGenerateScoper extends FreonGeneratePartAction {
         if (this.language === null || this.language === undefined) {
             return;
         }
-        this.scoperGenerator = new ScoperGenerator();
         this.scoperGenerator.language = this.language;
         this.scoperGenerator.outputfolder = this.outputFolder;
 

diff --git a/packages/meta/src/scoperdef/generator/ScoperGenerator.ts b/packages/meta/src/scoperdef/generator/ScoperGenerator.ts
@@ -16,7 +16,7 @@ export class ScoperGenerator {
     protected scoperGenFolder: string = '';
     protected scoperFolder: string = '';
 
-    generate(scopedef: ScopeDef): void {
+    generate(scopedef: ScopeDef | undefined): void {
         if (this.language === null) {
             LOGGER.error("Cannot generate scoper because language is not set.");
             return;
@@ -29,14 +29,14 @@ export class ScoperGenerator {
             scopedef.namespaces.push(MetaElementReference.create<FreMetaModelDescription>(this.language.modelConcept, "FreModelDescription"));
         }
 
-        const generationStatus = new GenerationStatus();
+        const generationStatus: GenerationStatus = new GenerationStatus();
         this.getFolderNames();
-        const name = scopedef ? scopedef.scoperName + " " : "";
+        const name: string = scopedef ? scopedef.scoperName + " " : "";
         LOGGER.log("Generating scoper " + name + "in folder " + this.scoperGenFolder);
 
-        const scoper = new ScoperTemplate();
-        const scoperDefTemplate = new ScoperDefTemplate();
-        const customScoperTemplate = new CustomScoperTemplate();
+        const scoper: ScoperTemplate = new ScoperTemplate();
+        const scoperDefTemplate: ScoperDefTemplate = new ScoperDefTemplate();
+        const customScoperTemplate: CustomScoperTemplate = new CustomScoperTemplate();
 
         // Prepare folders
         FileUtil.createDirIfNotExisting(this.scoperFolder);

diff --git a/packages/meta/src/typerdef/generator/FreonTyperGenerator.ts b/packages/meta/src/typerdef/generator/FreonTyperGenerator.ts
@@ -10,7 +10,7 @@ import { LOG2USER } from "../../utils/UserLogger";
 import { FreTypeConceptMaker } from "./templates/FreTypeConceptMaker";
 import { TyperDefTemplate } from "./templates/TyperDefTemplate";
 
-const LOGGER = new MetaLogger("FreonTyperGenerator").mute();
+const LOGGER = new MetaLogger("FreonTyperGenerator");
 
 /**
  * This class generates the implementation for a typer definition.
@@ -23,7 +23,7 @@ export class FreonTyperGenerator {
     protected typerConceptsFolder: string = '';
     protected typerFolder: string = '';
 
-    generate(typerdef: TyperDef): void {
+    generate(typerdef: TyperDef | undefined): void {
         if (this.language === null) {
             LOGGER.error("Cannot generate typer because language is not set.");
             return;

diff --git a/packages/meta/src/typerdef/generator/templates/FreTyperPartTemplate.ts b/packages/meta/src/typerdef/generator/templates/FreTyperPartTemplate.ts
@@ -13,7 +13,7 @@ export class FreTyperPartTemplate {
     imports: string[] = [];
     importedClassifiers: FreMetaClassifier[] = []; // holds all classifiers that need to be imported, either from LANGUAGE_GEN_FOLDER, or from TYPER_CONCEPTS_FOLDER
 
-    generateTyperPart(language: FreMetaLanguage, typerdef: TyperDef, relativePath: string): string {
+    generateTyperPart(language: FreMetaLanguage, typerdef: TyperDef | undefined, relativePath: string): string {
         if (!!typerdef) {
             return this.generateFromDefinition(typerdef, language, relativePath);
         } else {

diff --git a/packages/meta/src/validatordef/generator/ValidatorGenerator.ts b/packages/meta/src/validatordef/generator/ValidatorGenerator.ts
@@ -19,7 +19,7 @@ export class ValidatorGenerator {
     protected validatorGenFolder: string = '';
     protected validatorFolder: string = '';
 
-    generate(validdef: ValidatorDef): void {
+    generate(validdef: ValidatorDef| undefined): void {
         if (this.language === null) {
             LOGGER.error("Cannot generate validator because language is not set.");
             return;

diff --git a/packages/meta/src/validatordef/generator/templates/ValidatorTemplate.ts b/packages/meta/src/validatordef/generator/templates/ValidatorTemplate.ts
@@ -13,8 +13,8 @@ export class ValidatorTemplate {
     validatorInterfaceName: string = Names.FreValidator;
     typerInterfaceName: string = Names.FreTyper;
 
-    generateValidator(language: FreMetaLanguage, validdef: ValidatorDef, relativePath: string): string {
-        const doValidDef = validdef !== null && validdef !== undefined;
+    generateValidator(language: FreMetaLanguage, validdef: ValidatorDef | undefined, relativePath: string): string {
+        const doValidDef: boolean = validdef !== null && validdef !== undefined;
 
         const allLangConcepts: string = Names.allConcepts();
         const generatedClassName: string = Names.validator(language);
@@ -101,7 +101,7 @@ export class ValidatorTemplate {
         }`;
     }
 
-    generateGenIndex(language: FreMetaLanguage, validdef: ValidatorDef): string {
+    generateGenIndex(language: FreMetaLanguage, validdef: ValidatorDef | undefined): string {
         return `
         export * from "./${Names.nonOptionalsChecker(language)}";
         export * from "./${Names.validator(language)}";

diff --git a/packages/meta/tsconfig.json b/packages/meta/tsconfig.json
@@ -29,7 +29,7 @@
     // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Strict Type-Checking Options */
-//     "strict": true,                              /* Enable all strict type-checking options. */
+//    "strict": true,                              /* Enable all strict type-checking options. */
     "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
     "strictNullChecks": true,                    /* Enable strict null checks. */
     "strictFunctionTypes": true,                 /* Enable strict checking of function types. */

diff --git a/packages/samples/Calculator/package.json b/packages/samples/Calculator/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/DocuProject/package.json b/packages/samples/DocuProject/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/Education/package.json b/packages/samples/Education/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/Example/package.json b/packages/samples/Example/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/MpsExpressions/package.json b/packages/samples/MpsExpressions/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/Octopus/package.json b/packages/samples/Octopus/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/PiLanguage/package.json b/packages/samples/PiLanguage/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/TaxRules/package.json b/packages/samples/TaxRules/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/samples/UndoTester/package.json b/packages/samples/UndoTester/package.json
@@ -11,7 +11,7 @@
     "build": "npm run generate && tsc && rollup --config",
     "install-local": "npm install --registry http://localhost:4873",
     "generate": "bash ../../../scripts/freon-samples-dev.sh -v all -d src/defs -o src/",
-    "clean-gen": "bash ../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
+    "clean-gen": "bash ../../../scripts/freon-samples-dev.sh clean-it -d src/defs -o src/",
     "clean-config": "rm */config/FreonConfiguration.ts",
     "clean-custom": "rm */*/Custom*.ts",
     "clean-all": "npm run clean-gen && npm run clean-config && npm run clean-custom"

diff --git a/packages/webapp-lib/package.json b/packages/webapp-lib/package.json
@@ -44,7 +44,8 @@
     "!dist/**/*.spec.*"
   ],
   "dependencies": {
-    "@freon4dsl/core": "0.7.0-beta"
+    "@freon4dsl/core": "0.7.0-beta",
+    "svelte": "^4.2.17"
   },
   "devDependencies": {
     "@material/theme": "^14.0.0",
@@ -81,7 +82,6 @@
     "@sveltejs/vite-plugin-svelte": "^3.1.1",
     "publint": "^0.2.8",
     "sass": "^1.77.6",
-    "svelte": "^4.2.17",
     "svelte-check": "^3.8.0",
     "typescript": "^5.4.5",
     "vite": "^5.2.12"