From 22cc3166bdf3eb0f66505b6dc2110dda967e4ef9 Mon Sep 17 00:00:00 2001 From: Lennart Heinrich Date: Fri, 17 Oct 2025 00:37:26 +0200 Subject: [PATCH] fix model --- TelosysTools/telosys-tools.cfg | 2 +- .../backend/backend_entity_java.vm | 2 +- .../templates/infinimotion/backend/pom_xml.vm | 8 ++++++ .../templates/infinimotion/frontend/.npmrc.vm | 2 +- .../infinimotion/frontend/Xmodel_ts.vm | 6 ----- .../frontend/frontend_entity_ts.vm | 13 ++++++++++ .../infinimotion/frontend/package_json.vm | 6 ++--- .../persistence/persistence_entity_id_java.vm | 2 +- .../persistence/persistence_entity_java.vm | 2 +- .../infinimotion/persistence/pom_xml.vm | 10 ++++++- .../templates/infinimotion/templates.cfg | 2 +- build-all.sh | 26 +++++++++++++++++++ input-telosys-cli.txt | 3 +++ 13 files changed, 68 insertions(+), 16 deletions(-) delete mode 100644 TelosysTools/templates/infinimotion/frontend/Xmodel_ts.vm create mode 100644 TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm create mode 100644 build-all.sh create mode 100644 input-telosys-cli.txt diff --git a/TelosysTools/telosys-tools.cfg b/TelosysTools/telosys-tools.cfg index cc926c4..200dc66 100644 --- a/TelosysTools/telosys-tools.cfg +++ b/TelosysTools/telosys-tools.cfg @@ -22,7 +22,7 @@ ENTITY_PKG=de.infinimotion.bean ProjectVariable.MAVEN_ARTIFACT_ID=model ProjectVariable.MAVEN_GROUP_ID=de.infinimotion ProjectVariable.PROJECT_NAME=infinimodel -ProjectVariable.PROJECT_VERSION=0.0.0 +ProjectVariable.PROJECT_VERSION=0.0.3 ProjectVariable.REST_SERVER_PORT=3000 ProjectVariable.REST_API_ROOT=/api/v1 ProjectVariable.REST_URL_ROOT=http://localhost:3000 diff --git a/TelosysTools/templates/infinimotion/backend/backend_entity_java.vm b/TelosysTools/templates/infinimotion/backend/backend_entity_java.vm index 3d2ae7e..485eda6 100644 --- a/TelosysTools/templates/infinimotion/backend/backend_entity_java.vm +++ b/TelosysTools/templates/infinimotion/backend/backend_entity_java.vm @@ -3,7 +3,7 @@ * Created on $now.date ( $now.time ) * Generated by $generator.name ( version $generator.version ) */ -package ${target.javaPackageFromFolder(${SRC})}; +package ${target.javaPackageFromFolder("backend/${SRC}")}; import java.io.Serializable; diff --git a/TelosysTools/templates/infinimotion/backend/pom_xml.vm b/TelosysTools/templates/infinimotion/backend/pom_xml.vm index 69ead2b..22f4eb2 100644 --- a/TelosysTools/templates/infinimotion/backend/pom_xml.vm +++ b/TelosysTools/templates/infinimotion/backend/pom_xml.vm @@ -30,4 +30,12 @@ + + + gitea + InfiniMotion Apache Maven Packages + https://git.chequeo.de/api/packages/infinimotion/maven + + + diff --git a/TelosysTools/templates/infinimotion/frontend/.npmrc.vm b/TelosysTools/templates/infinimotion/frontend/.npmrc.vm index ae6098b..e622437 100644 --- a/TelosysTools/templates/infinimotion/frontend/.npmrc.vm +++ b/TelosysTools/templates/infinimotion/frontend/.npmrc.vm @@ -1 +1 @@ -@InfiniMotion:registry=https://npm.pkg.github.com \ No newline at end of file +@infinimotion:registry=https://git.chequeo.de/api/packages/infinimotion/npm/ \ No newline at end of file diff --git a/TelosysTools/templates/infinimotion/frontend/Xmodel_ts.vm b/TelosysTools/templates/infinimotion/frontend/Xmodel_ts.vm deleted file mode 100644 index 8c28f2d..0000000 --- a/TelosysTools/templates/infinimotion/frontend/Xmodel_ts.vm +++ /dev/null @@ -1,6 +0,0 @@ -#set( $env.language = 'TypeScript' ) -export default interface $entity.name { -#foreach( $attribute in $entity.attributes ) - ${attribute.name}: ${attribute.type}; -#end -} \ No newline at end of file diff --git a/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm b/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm new file mode 100644 index 0000000..97fe1d6 --- /dev/null +++ b/TelosysTools/templates/infinimotion/frontend/frontend_entity_ts.vm @@ -0,0 +1,13 @@ +#set( $env.language = 'TypeScript' ) +#foreach( $link in $entity.links ) +import $link.fieldType from "./${link.fieldType}"; +#end + +export default interface $entity.name { +#foreach( $attribute in $entity.attributes ) + ${attribute.name}: ${attribute.type}; +#end +#foreach( $link in $entity.links ) + ${link.fieldName}: ${link.fieldType}; +#end +} \ No newline at end of file diff --git a/TelosysTools/templates/infinimotion/frontend/package_json.vm b/TelosysTools/templates/infinimotion/frontend/package_json.vm index 445aa50..651c104 100644 --- a/TelosysTools/templates/infinimotion/frontend/package_json.vm +++ b/TelosysTools/templates/infinimotion/frontend/package_json.vm @@ -1,6 +1,6 @@ { - "name": "@InfiniMotion/model-frontend", - "version": "0.0.0", + "name": "@infinimotion/model-frontend", + "version": "$fn.get("PROJECT_VERSION","0.0.0")", "description": "InfiniMotion Model for Frontend", "main": "./dist/index.js", "module": "./dist/index.mjs", @@ -22,6 +22,6 @@ }, "repository": "https://github.com/InfiniMotion/model.git", "publishConfig": { - "registry": "https://npm.pkg.github.com" + "registry": "https://git.chequeo.de/api/packages/infinimotion/npm/" } } diff --git a/TelosysTools/templates/infinimotion/persistence/persistence_entity_id_java.vm b/TelosysTools/templates/infinimotion/persistence/persistence_entity_id_java.vm index 403e890..f71e795 100644 --- a/TelosysTools/templates/infinimotion/persistence/persistence_entity_id_java.vm +++ b/TelosysTools/templates/infinimotion/persistence/persistence_entity_id_java.vm @@ -2,7 +2,7 @@ #parse("persistence/include/init_var_entity.vm") #parse("persistence/include/java_header.vm") ##-------------------------------------------------------------------------------------------------------- -package ${target.javaPackageFromFolder($SRC)}; +package ${target.javaPackageFromFolder("persistence/${SRC}")}; import java.io.Serializable; diff --git a/TelosysTools/templates/infinimotion/persistence/persistence_entity_java.vm b/TelosysTools/templates/infinimotion/persistence/persistence_entity_java.vm index e4f398b..c0a61eb 100644 --- a/TelosysTools/templates/infinimotion/persistence/persistence_entity_java.vm +++ b/TelosysTools/templates/infinimotion/persistence/persistence_entity_java.vm @@ -26,7 +26,7 @@ ## #set($jpa.oneToManyFetchType = "EAGER" ) ## #set($jpa.manyToManyFetchType = "EAGER" ) ##--------------------------------------------------------------------------------------- -package ${target.javaPackageFromFolder(${SRC})}; +package ${target.javaPackageFromFolder("persistence/${SRC}")}; ## IF ENTITY HAS A COMPOSITE PRIMARY KEY => GENERATE AN 'ID CLASS' FOR THIS PRIMARY KEY #if ( $entity.hasCompositePrimaryKey() ) $generator.generate($target.entityName , "${jpaEntityIdClass}.java", $target.folder, "persistence/persistence_entity_id_java.vm" ) diff --git a/TelosysTools/templates/infinimotion/persistence/pom_xml.vm b/TelosysTools/templates/infinimotion/persistence/pom_xml.vm index df6f9f4..54a68fb 100644 --- a/TelosysTools/templates/infinimotion/persistence/pom_xml.vm +++ b/TelosysTools/templates/infinimotion/persistence/pom_xml.vm @@ -7,7 +7,7 @@ 4.0.0 $fn.get("MAVEN_GROUP_ID","to.be.defined") $fn.get("MAVEN_ARTIFACT_ID","to.be.defined")-persistence - $fn.get("PROJECT_VERSION","1.0.0") + $fn.get("PROJECT_VERSION","0.0.0") jar @@ -38,4 +38,12 @@ + + + gitea + InfiniMotion Apache Maven Packages + https://git.chequeo.de/api/packages/infinimotion/maven + + + diff --git a/TelosysTools/templates/infinimotion/templates.cfg b/TelosysTools/templates/infinimotion/templates.cfg index db8ca5f..8b2487d 100644 --- a/TelosysTools/templates/infinimotion/templates.cfg +++ b/TelosysTools/templates/infinimotion/templates.cfg @@ -20,7 +20,7 @@ package.json ; package.json ; frontend tsconfig.json ; tsconfig.json ; frontend ; frontend/tsconfig_json.vm ; 1 tsup.config.ts ; tsup.config.ts ; frontend ; frontend/tsup.config_ts.vm ; 1 index.ts ; index.ts ; frontend ; frontend/index_ts.vm ; 1 -TypeScript Models ; ${BEANNAME}.ts ; frontend ; frontend/Xmodel_ts.vm +TypeScript Models ; ${BEANNAME}.ts ; frontend ; frontend/frontend_entity_ts.vm ### Backend ### Java Backend Models ; ${BEANNAME}.java ; backend/${SRC}/${ROOT_PKG}/backend ; backend/backend_entity_java.vm diff --git a/build-all.sh b/build-all.sh new file mode 100644 index 0000000..cfcbd18 --- /dev/null +++ b/build-all.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +latest=$(npm view @infinimotion/model-frontend --registry https://git.chequeo.de/api/packages/infinimotion/npm/ | grep latest) +latest=($latest) +version=${latest[1]} + +major=$(cut -d'.' -f1 <<<"$version") +minor=$(cut -d'.' -f2 <<<"$version") +patch=$(cut -d'.' -f3 <<<"$version") + +new_patch=$((patch+1)) +new_version=$major.$minor.$new_patch + +version_cfg="ProjectVariable\.PROJECT_VERSION=[0-9]*\.[0-9]*\.[0-9]*$" +new_version_cfg="ProjectVariable.PROJECT_VERSION="$new_version + +echo "Changing version..." +sed -i -E -e "s/"$version_cfg"/"$new_version_cfg"/g" ./TelosysTools/telosys-tools.cfg +echo $version" -> "$new_version + +java -jar /c/Program\ Files/telosys-cli/telosys-cli-4.2.0-001.jar -h . -i input-telosys-cli.txt +(cd frontend && npm install && tsup && npm publish) +(cd backend && mvn package deploy) +(cd persistence && mvn package deploy) + +echo "Published new version "$new_version diff --git a/input-telosys-cli.txt b/input-telosys-cli.txt new file mode 100644 index 0000000..d031743 --- /dev/null +++ b/input-telosys-cli.txt @@ -0,0 +1,3 @@ +gen * * -y +q +