Update to 7.5.4

- Sync with 7.5.4
- Fix ranges min_version, outside, simplify
- Add tests

Author: mbtools

src/classes/zcl_semver.clas.abap

@@ -397,7 +397,7 @@ CLASS zcl_semver IMPLEMENTATION.
             IF zcl_semver_utils=>is_numeric( prerelease[ i ] ).
               prerelease[ i ] += 1.
               prerelease[ i ] = condense( prerelease[ i ] ).
-              i = 0.
+              i = -2.
             ENDIF.
             i -= 1.
           ENDWHILE.
@@ -427,7 +427,9 @@ CLASS zcl_semver IMPLEMENTATION.
             prerelease = prerelease_tab.
           ENDIF.
         ENDIF.
-
+      WHEN 'prepush'.
+        " Used by zcl_semver_ranges->min_version
+        INSERT identifier_base INTO TABLE prerelease.
       WHEN OTHERS.
         zcx_semver_error=>raise( |Invalid increment argument { release }| ).
     ENDCASE.

src/classes/zcl_semver_range.clas.abap

@@ -255,7 +255,7 @@ CLASS zcl_semver_range IMPLEMENTATION.
 
     " map the range to a 2d array of comparators
     LOOP AT ranges ASSIGNING FIELD-SYMBOL(<range>).
-      INSERT parse_range( <range> ) INTO TABLE set.
+      INSERT parse_range( zcl_semver_utils=>trim( <range> ) ) INTO TABLE set.
     ENDLOOP.
 
     " throw out any comparator lists that are empty
@@ -285,10 +285,13 @@ CLASS zcl_semver_range IMPLEMENTATION.
         " if we have any that are *, then the range is just *
         LOOP AT set ASSIGNING <set>.
           IF lines( <set> ) = 1 AND is_any( <set>[ 1 ] ).
-            set = VALUE #( ( <set> ) ).
+            DATA(star) = <set>.
             EXIT.
           ENDIF.
         ENDLOOP.
+        IF star IS NOT INITIAL.
+          set = VALUE #( ( star ) ).
+        ENDIF.
       ENDIF.
 
     ENDIF.

src/cli/zcl_semver_cli.clas.testclasses.abap

@@ -155,10 +155,9 @@ CLASS ltcl_semver_cli IMPLEMENTATION.
       args = '1.2.3.4.5.6 -c'
       out  = |1.2.3\n| ).
 
-* TODO: rtl
-*    test(
-*      args = '1.2.3.4.5.6 -c --rtl'
-*      out  = |4.5.6\n| ).
+    test(
+      args = '1.2.3.4.5.6 -c --rtl'
+      out  = |4.5.6\n| ).
 
     test(
       args = '1.2.3.4.5.6 -c --rtl --ltr'

src/functions/zcl_semver_functions.clas.abap

@@ -364,7 +364,7 @@ CLASS zcl_semver_functions IMPLEMENTATION.
         <match>-offset = offset.
         <match>-length = strlen( |{ major }{ COND #( WHEN minor IS NOT INITIAL THEN '.' && minor ) }{ COND #( WHEN patch IS NOT INITIAL THEN '.' && patch ) }| ).
         <match>-endpos = <match>-offset + <match>-length.
-        FIND '.' IN version+offset(*) MATCH OFFSET DATA(next_offset).
+        FIND REGEX '^\d' IN version+offset(*) MATCH OFFSET DATA(next_offset).
         offset += next_offset + 1.
         IF offset >= strlen( version ).
           EXIT.

src/functions/zcl_semver_functions.clas.testclasses.abap

@@ -302,7 +302,7 @@ CLASS ltcl_semver_functions IMPLEMENTATION.
 
     tests = VALUE #(
       ( version = '1.2.3.4.5.6' res = '4.5.6' )
-      " TODO: ( version = '1.2.3/a/b/c/2.3.4' res = '2.3.4' )
+      ( version = '1.2.3/a/b/c/2.3.4' res = '2.3.4' )
       ( version = '1.2.3.4.5/6' res = '6.0.0' )
       ( version = '1.2.3.4./6' res = '6.0.0' )
       ( version = '1.2.3.4/6' res = '6.0.0' )
@@ -1167,6 +1167,20 @@ CLASS ltcl_semver_functions IMPLEMENTATION.
       exp = '4.2.0-foo'
       msg = 'looseness as an option' ).
 
+    DATA(mx) = zif_semver_constants=>max_safe_integer.
+
+    DATA(long_build)    = '-928490632884417731e7af463c92b034d6a78268fc993bcb88a57944'.
+    DATA(short_version) = '1.1.1'.
+    DATA(long_version)  = |{ mx }.{ mx }.{ mx }|.
+
+    cl_abap_unit_assert=>assert_equals(
+      act = zcl_semver_functions=>valid( short_version && long_build )
+      exp = short_version && long_build ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = zcl_semver_functions=>valid( long_version && long_build )
+      exp = long_version && long_build ).
+
   ENDMETHOD.
 
 ENDCLASS.

src/internal/zcl_semver_fixtures.clas.abap

@@ -547,7 +547,9 @@ CLASS zcl_semver_fixtures IMPLEMENTATION.
       ( range = '>=1.0.0 <1.1.0' version = '1.1.0' )
       ( range = '>=1.0.0 <1.1.0' version = '1.1.0' incpre = abap_true )
       ( range = '>=1.0.0 <1.1.0' version = '1.1.0-pre' )
-      ( range = '>=1.0.0 <1.1.0-pre' version = '1.1.0-pre' ) ).
+      ( range = '>=1.0.0 <1.1.0-pre' version = '1.1.0-pre' )
+
+      ( range = '== 1.0.0 || foo' version = '2.0.0' loose = abap_true ) ).
 
   ENDMETHOD.
 

src/internal/zcl_semver_integration.clas.testclasses.abap

@@ -47,11 +47,9 @@ CLASS ltcl_semver_integration IMPLEMENTATION.
       act = zcl_semver_ranges=>valid_range( r )
       exp = '1.2.3 <1.3.0' ).
 
-
-    " TODO
-*    cl_abap_unit_assert=>assert_equals(
-*      act = zcl_semver_ranges=>min_version( r )->version
-*      exp = '1.2.3' ).
+    cl_abap_unit_assert=>assert_equals(
+      act = zcl_semver_ranges=>min_version( r )->version
+      exp = '1.2.3' ).
 
     DATA(t) = VALUE string_table( ( `1.2.3` ) ).
 

src/internal/zcl_semver_re.clas.abap

@@ -403,7 +403,7 @@ CLASS zcl_semver_re IMPLEMENTATION.
 
     DATA(safe_regex_replacements) = VALUE ty_regex_replacements(
       ( token = `\s`               max = 1 )
-      ( token = `\d`               max = zif_semver_constants=>max_safe_component_length )
+      ( token = `\d`               max = zif_semver_constants=>max_length )
       ( token = letter_dash_number max = zif_semver_constants=>max_safe_build_length ) ).
 
     result = value.

src/internal/zif_semver_constants.intf.abap

@@ -7,12 +7,12 @@ INTERFACE zif_semver_constants PUBLIC.
 * ABAP Port by Marc Bernard <https://marcbernardtools.com/>
 * SPDX-License-Identifier: ISC
 ************************************************************************
-* Based on node semver package v7.5.0 (April 2023)
-* https://github.com/npm/node-semver/releases/tag/v7.5.0
+* Based on node semver package v7.5.4 (July 2023)
+* https://github.com/npm/node-semver/releases/tag/v7.5.4
 ************************************************************************
 
   " Package version
-  CONSTANTS version TYPE string VALUE '7.5.0' ##NEEDED.
+  CONSTANTS version TYPE string VALUE '7.5.4' ##NEEDED.
 
   " Note: this is the semver.org version of the spec that it implements
   " Not necessarily the package version of this code.

src/ranges/zcl_semver_ranges.clas.abap

@@ -255,19 +255,17 @@ CLASS zcl_semver_ranges IMPLEMENTATION.
         CASE <comparator>->operator.
           WHEN '>'.
             IF compver->prerelease IS INITIAL.
-              " compver->patch++
               compver->inc( 'patch' ).
             ELSE.
-              " compver.prerelease.push(0)
-              compver->inc( release = 'prerelease' identifier = '0' ).
+              compver->inc( release = 'prepush' identifier_base = '0' ).
             ENDIF.
 
-            IF setmin IS NOT INITIAL AND zcl_semver_functions=>gt( a = compver b = setmin ).
+            IF setmin IS INITIAL OR zcl_semver_functions=>gt( a = compver b = setmin ).
               setmin = compver.
             ENDIF.
 
           WHEN '' OR  '>='.
-            IF setmin IS NOT INITIAL AND zcl_semver_functions=>gt( a = compver b = setmin ).
+            IF setmin IS INITIAL OR zcl_semver_functions=>gt( a = compver b = setmin ).
               setmin = compver.
             ENDIF.
 
@@ -401,6 +399,7 @@ CLASS zcl_semver_ranges IMPLEMENTATION.
     DATA minmax TYPE ty_min_max.
     DATA set TYPE ty_set.
     DATA ranges TYPE string_table.
+    DATA original TYPE string.
 
     IF versions IS INITIAL.
       zcx_semver_error=>raise( 'Empty version list' ).
@@ -449,7 +448,14 @@ CLASS zcl_semver_ranges IMPLEMENTATION.
     ENDLOOP.
 
     DATA(simplified) = concat_lines_of( table = ranges sep = ' || ' ).
-    DATA(original) = semrange->to_string( ).
+
+    DATA(kind) = cl_abap_typedescr=>describe_by_data( range )->type_kind.
+
+    IF kind = cl_abap_typedescr=>typekind_char OR kind = cl_abap_typedescr=>typekind_string.
+      original = range.
+    ELSE.
+      original = semrange->to_string( ).
+    ENDIF.
 
     IF strlen( simplified ) < strlen( original ).
       result = simplified.
@@ -497,7 +503,7 @@ CLASS zcl_semver_ranges IMPLEMENTATION.
     "     - If no C has a prerelease and the LT.semver tuple, return false
     " - Else return true
 
-* https://github.com/npm/node-semver/blob/main/ranges/subset.js
+    " https://github.com/npm/node-semver/blob/main/ranges/subset.js
     zcx_semver_error=>raise( 'TODO' ).
 
   ENDMETHOD.