From d0110ad06311927c104656b36772ff9a0fec6a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20D=C3=B6lker?= Date: Sun, 26 Jul 2026 19:47:27 +0200 Subject: [PATCH] fix:rewrite calcexport url, no cds types --- abap_transpile.json | 12 +-- package-lock.json | 78 +++++++++++-------- package.json | 6 +- src/bo/zasis_cl_calc_export_url.clas.abap | 15 ++-- src/bo/zasis_cl_interprettypetext.clas.abap | 2 - .../zasis_cl_catstattext.clas.abap | 1 - 6 files changed, 59 insertions(+), 55 deletions(-) diff --git a/abap_transpile.json b/abap_transpile.json index aa7b94d..7c202d1 100644 --- a/abap_transpile.json +++ b/abap_transpile.json @@ -12,24 +12,14 @@ "\\.g4ba\\.", "zbp_", "zasis_cl_interprettypetext", - "zasis_cl_calc_export_url", - "zasis_cl_catstattext", "zasis_cl_get_domain_fix_values" ], "output_folder": "output", "libs": [ { "url": "https://github.com/open-abap/open-abap-core" }, { "url": "https://github.com/open-abap/express-icf-shim" }, - { "url": "https://github.com/open-abap/open-abap-gui" }, { "url": "https://github.com/open-abap/open-abap-rap" }, - { "url": "https://github.com/open-abap/open-abap-xco" }, - { "url": "https://github.com/open-abap/open-abap-rest" }, - { "url": "https://github.com/open-abap/open-abap-adt" }, - { "url": "https://github.com/open-abap/open-abap-seo" }, - { "url": "https://github.com/open-abap/open-abap-lock" }, - { "url": "https://github.com/open-abap/open-abap-jobs" }, - { "url": "https://github.com/open-abap/open-abap-ci" }, - { "url": "https://github.com/open-abap/open-abap-proxy" } + { "url": "https://github.com/open-abap/open-abap-sadl"} ], "write_unit_tests": true, "write_source_map": true, diff --git a/package-lock.json b/package-lock.json index 87ed4d7..79b7365 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,10 +9,10 @@ "version": "1.0.0", "license": "MIT", "devDependencies": { - "@abaplint/cli": "^2.120.4", + "@abaplint/cli": "^2.120.5", "@abaplint/database-sqlite": "^2.13.40", - "@abaplint/runtime": "^2.13.42", - "@abaplint/transpiler-cli": "^2.13.42", + "@abaplint/runtime": "^2.13.46", + "@abaplint/transpiler-cli": "^2.13.46", "@types/node": "^26.1.1", "abap-adt-api": "^8.4.1", "express": "^4.22.2", @@ -20,9 +20,9 @@ } }, "node_modules/@abaplint/cli": { - "version": "2.120.4", - "resolved": "https://registry.npmjs.org/@abaplint/cli/-/cli-2.120.4.tgz", - "integrity": "sha512-tE1wRYTXC5q2aA7C1aB+XjQueqNN/7TmP7QcOaYFtubI+xsHkL6dcumu3/hTqApfdYwI265j9SRQeX38nbv+ZQ==", + "version": "2.120.5", + "resolved": "https://registry.npmjs.org/@abaplint/cli/-/cli-2.120.5.tgz", + "integrity": "sha512-sjEzODWdvtUCNEB7oez0LmuvyxxID//rcRF3vcfgLW2SlD67VjgGhNPUy4zqqHEn15cwSbj3EnueBhtKkygovQ==", "dev": true, "license": "MIT", "bin": { @@ -46,9 +46,9 @@ } }, "node_modules/@abaplint/runtime": { - "version": "2.13.42", - "resolved": "https://registry.npmjs.org/@abaplint/runtime/-/runtime-2.13.42.tgz", - "integrity": "sha512-jtnTzTh+xL8o8D8nwLk0f54iv3NBYQhACZBAGBw6z8Hf5hiIU0+xytPQCyqjmTVpXIkmGoRkxX5pQYHbsdWqqg==", + "version": "2.13.46", + "resolved": "https://registry.npmjs.org/@abaplint/runtime/-/runtime-2.13.46.tgz", + "integrity": "sha512-BzV0ggiGh2C0vxJXkn8GSB/OVsPWqTipg52gvi+xZOD/Ghiwl50kGwr8/lWcf0ejapekYv/q5u2/uVyvtYtcrA==", "dev": true, "license": "MIT", "dependencies": { @@ -59,9 +59,9 @@ } }, "node_modules/@abaplint/transpiler-cli": { - "version": "2.13.42", - "resolved": "https://registry.npmjs.org/@abaplint/transpiler-cli/-/transpiler-cli-2.13.42.tgz", - "integrity": "sha512-wfdXJWBnnzxQ7maQ7Zh4nZqbZZKz5O4K/A9G5R3dQKJL3ynwZMxmsUgULAzT2ePrIf27quA3HrYcC4RqRc3ERA==", + "version": "2.13.46", + "resolved": "https://registry.npmjs.org/@abaplint/transpiler-cli/-/transpiler-cli-2.13.46.tgz", + "integrity": "sha512-yLAZirgNXZ6cQRfRxuY1Rriwxu25KP802wGYKmoN6yL8hClRj5uwPNFLHRIiT6IXJaELhNF6Z1iRUFcgIcQ4nA==", "dev": true, "license": "MIT", "bin": { @@ -72,9 +72,9 @@ } }, "node_modules/@nodable/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-3.0.0.tgz", + "integrity": "sha512-8L9xFeTYKhm49xfIypoe2W5wV1m/3Z58kT+7kR9A8OyFxcPduI4VmxaUMQyKYrRjUoLLSXv6EKKID5Tvj9cUVw==", "dev": true, "funding": [ { @@ -551,9 +551,9 @@ } }, "node_modules/body-parser": { - "version": "1.20.5", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz", - "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==", + "version": "1.20.6", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.6.tgz", + "integrity": "sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==", "dev": true, "license": "MIT", "dependencies": { @@ -873,9 +873,9 @@ } }, "node_modules/fast-xml-parser": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz", - "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==", + "version": "5.10.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.10.1.tgz", + "integrity": "sha512-IEMIf7298kXuZSRFoGfMYrl7is8LpavODgbNz1cwIudv7KwVFnuU+UsMporfq6PD6aXSlawZlARiA3UywCTfMw==", "dev": true, "funding": [ { @@ -885,17 +885,33 @@ ], "license": "MIT", "dependencies": { - "@nodable/entities": "^2.2.0", + "@nodable/entities": "^3.0.0", "fast-xml-builder": "^1.2.0", - "is-unsafe": "^1.0.1", - "path-expression-matcher": "^1.5.0", + "is-unsafe": "^2.0.0", + "path-expression-matcher": "^1.6.2", "strnum": "^2.4.1", - "xml-naming": "^0.1.0" + "xml-naming": "^0.3.0" }, "bin": { "fxparser": "src/cli/cli.js" } }, + "node_modules/fast-xml-parser/node_modules/xml-naming": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.3.0.tgz", + "integrity": "sha512-ghig2TBE/H11aOVgmahA3MhimvkBr6JIYknH/Dhdk10nXwdbIqBJsbfMxpvFPG8bAw77gN29aQWvKpmVoPlvPQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/finalhandler": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", @@ -1216,9 +1232,9 @@ } }, "node_modules/is-unsafe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-1.0.1.tgz", - "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-2.0.0.tgz", + "integrity": "sha512-2LdV822R+wmI86unXA93WCFpL6g+av8ynWk0nrHyJqGop5VoocYsSLFgN8jrfalT6iGeLNM4KXuVSsULP53kEA==", "dev": true, "funding": [ { @@ -1358,9 +1374,9 @@ } }, "node_modules/path-expression-matcher": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.6.1.tgz", - "integrity": "sha512-h7bxdzhHk8Knyc4Tj+jMaa7fEEoUJy7p1qtbVgkYg1Uhpe5Np5VuGXCRZnkZvU+Q42M1vStt0ifa3ueykRJPmQ==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.6.2.tgz", + "integrity": "sha512-enSlaiat05iasnzmgNxRj8reFdj3puY2QpNgP1aPIaVfT6nn9ICuPoFlKHk8EN22HcwewshO+mN2DGbkCEOtqQ==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 01b815d..d7b08f3 100644 --- a/package.json +++ b/package.json @@ -16,10 +16,10 @@ "author": "Philipp Doelker", "license": "MIT", "devDependencies": { - "@abaplint/cli": "^2.120.4", + "@abaplint/cli": "^2.120.5", "@abaplint/database-sqlite": "^2.13.40", - "@abaplint/runtime": "^2.13.42", - "@abaplint/transpiler-cli": "^2.13.42", + "@abaplint/runtime": "^2.13.46", + "@abaplint/transpiler-cli": "^2.13.46", "@types/node": "^26.1.1", "abap-adt-api": "^8.4.1", "express": "^4.22.2", diff --git a/src/bo/zasis_cl_calc_export_url.clas.abap b/src/bo/zasis_cl_calc_export_url.clas.abap index 8a3bb58..c5e1888 100644 --- a/src/bo/zasis_cl_calc_export_url.clas.abap +++ b/src/bo/zasis_cl_calc_export_url.clas.abap @@ -4,7 +4,6 @@ CLASS zasis_cl_calc_export_url DEFINITION CREATE PUBLIC. PUBLIC SECTION. - INTERFACES if_sadl_exit. INTERFACES if_sadl_exit_calc_element_read. PROTECTED SECTION. PRIVATE SECTION. @@ -26,14 +25,16 @@ CLASS zasis_cl_calc_export_url IMPLEMENTATION. ENDMETHOD. METHOD if_sadl_exit_calc_element_read~calculate. - DATA calculated TYPE STANDARD TABLE OF zasis_c_ruleset. - calculated = CORRESPONDING #( it_original_data ). + ct_calculated_data = CORRESPONDING #( it_original_data ). - LOOP AT calculated ASSIGNING FIELD-SYMBOL(). - -exporturl = |/sap/bc/http/sap/zasis_ext_api_cld/{ zasis_constants=>export-resource_path }/{ -rulesetid }|. - ENDLOOP. + LOOP AT ct_calculated_data ASSIGNING FIELD-SYMBOL(). + ASSIGN COMPONENT 'RULESETID' OF STRUCTURE TO FIELD-SYMBOL(). + CHECK sy-subrc = 0. + ASSIGN COMPONENT 'EXPORTURL' OF STRUCTURE TO FIELD-SYMBOL(). + CHECK sy-subrc = 0. - ct_calculated_data = CORRESPONDING #( calculated ). + = |/sap/bc/http/sap/zasis_ext_api_cld/{ zasis_constants=>export-resource_path }/{ }|. + ENDLOOP. ENDMETHOD. ENDCLASS. diff --git a/src/bo/zasis_cl_interprettypetext.clas.abap b/src/bo/zasis_cl_interprettypetext.clas.abap index 9a2c785..2d8ea45 100644 --- a/src/bo/zasis_cl_interprettypetext.clas.abap +++ b/src/bo/zasis_cl_interprettypetext.clas.abap @@ -3,8 +3,6 @@ CLASS zasis_cl_interprettypetext DEFINITION CREATE PUBLIC. PUBLIC SECTION. - - INTERFACES if_sadl_exit . INTERFACES if_sadl_exit_calc_element_read . PROTECTED SECTION. PRIVATE SECTION. diff --git a/src/catalogs/sharedobjects/zasis_cl_catstattext.clas.abap b/src/catalogs/sharedobjects/zasis_cl_catstattext.clas.abap index 15c943d..0957858 100644 --- a/src/catalogs/sharedobjects/zasis_cl_catstattext.clas.abap +++ b/src/catalogs/sharedobjects/zasis_cl_catstattext.clas.abap @@ -4,7 +4,6 @@ CLASS zasis_cl_catstattext DEFINITION PUBLIC SECTION. - INTERFACES if_sadl_exit . INTERFACES if_sadl_exit_calc_element_read . PROTECTED SECTION. PRIVATE SECTION.