Update to 7.4.0

Author: mbtools

src/classes/zcl_semver.clas.abap

@@ -79,10 +79,11 @@ CLASS zcl_semver DEFINITION
 
     METHODS inc
       IMPORTING
-        release       TYPE string
-        identifier    TYPE string OPTIONAL
+        release         TYPE string
+        identifier      TYPE string OPTIONAL
+        identifier_base TYPE i DEFAULT 0
       RETURNING
-        VALUE(result) TYPE REF TO zcl_semver
+        VALUE(result)   TYPE REF TO zcl_semver
       RAISING
         zcx_semver_error.
 
@@ -320,26 +321,26 @@ CLASS zcl_semver IMPLEMENTATION.
         patch = 0.
         minor = 0.
         major += 1.
-        inc( release = 'pre' identifier = identifier ).
+        inc( release = 'pre' identifier = identifier identifier_base = identifier_base ).
       WHEN 'preminor'.
         CLEAR prerelease.
         patch = 0.
         minor += 1.
-        inc( release = 'pre' identifier = identifier ).
+        inc( release = 'pre' identifier = identifier identifier_base = identifier_base ).
       WHEN 'prepatch'.
         " If this is already a prerelease, it will bump to the next version
         " drop any prereleases that might already exist, since they are not
         " relevant at this point.
         CLEAR prerelease.
-        inc( release = 'patch' identifier = identifier ).
-        inc( release = 'pre' identifier = identifier ).
+        inc( release = 'patch' identifier = identifier identifier_base = identifier_base ).
+        inc( release = 'pre' identifier = identifier identifier_base = identifier_base ).
       WHEN 'prerelease'.
         " If the input is a non-prerelease version, this acts the same as
         " prepatch.
         IF prerelease IS INITIAL.
-          inc( release = 'patch' identifier = identifier ).
+          inc( release = 'patch' identifier = identifier identifier_base = identifier_base ).
         ENDIF.
-        inc( release = 'pre' identifier = identifier ).
+        inc( release = 'pre' identifier = identifier identifier_base = identifier_base ).
       WHEN 'major'.
         " If this is a pre-major version, bump up to the same major version.
         " Otherwise increment major.
@@ -391,14 +392,15 @@ CLASS zcl_semver IMPLEMENTATION.
           ENDIF.
         ENDIF.
         IF identifier IS NOT INITIAL.
+          DATA(base) = COND #( WHEN identifier_base <> 0 THEN `1` ELSE `0` ).
           " 1.2.0-beta.1 bumps to 1.2.0-beta.2,
           " 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
           IF zcl_semver_identifiers=>compare_identifiers( a = prerelease[ 1 ] b = identifier ) = 0.
             IF NOT zcl_semver_utils=>is_numeric( VALUE #( prerelease[ 2 ] DEFAULT `-` ) ).
-              prerelease = VALUE #( ( identifier ) ( `0` ) ).
+              prerelease = VALUE #( ( identifier ) ( base ) ).
             ENDIF.
           ELSE.
-            prerelease = VALUE #( ( identifier ) ( `0` ) ).
+            prerelease = VALUE #( ( identifier ) ( base ) ).
           ENDIF.
         ENDIF.
 

src/classes/zcl_semver.clas.testclasses.abap

@@ -118,7 +118,10 @@ CLASS ltcl_semver IMPLEMENTATION.
         TRY.
             DATA(s) = zcl_semver=>create( version = increments-version loose = increments-loose ).
 
-            s->inc( release = increments-release identifier = increments-identifier ).
+            s->inc(
+              release         = increments-release
+              identifier      = increments-identifier
+              identifier_base = increments-identifier_base ).
             cl_abap_unit_assert=>fail( msg = msg ).
           CATCH zcx_semver_error ##NO_HANDLER.
             " throws when presented with garbage
@@ -127,7 +130,10 @@ CLASS ltcl_semver IMPLEMENTATION.
         s = zcl_semver=>create( version = increments-version loose = increments-loose ).
 
         cl_abap_unit_assert=>assert_equals(
-          act = s->inc( release = increments-release identifier = increments-identifier )->version
+          act = s->inc(
+            release         = increments-release
+            identifier      = increments-identifier
+            identifier_base = increments-identifier_base )->version
           exp = increments-res
           msg = msg ).
       ENDIF.

src/classes/zcl_semver_comparator.clas.abap

@@ -160,40 +160,90 @@ CLASS zcl_semver_comparator IMPLEMENTATION.
         result = semrange->test( semcomp->semver ).
       ENDIF.
     ELSE.
-      DATA(same_direction_increasing) = xsdbool(
-        ( operator = '>=' OR operator = '>' ) AND
-        ( semcomp->operator = '>=' OR semcomp->operator = '>' ) ).
-      DATA(same_direction_decreasing) = xsdbool(
-        ( operator = '<=' OR operator = '<' ) AND
-        ( semcomp->operator = '<=' OR semcomp->operator = '<' ) ).
-      DATA(same_semver) = xsdbool(
-        semver->version = semcomp->semver->version ).
-      DATA(different_directions_inclusive) = xsdbool(
-        ( operator = '>=' OR operator = '<=' ) AND
-        ( semcomp->operator = '>=' OR semcomp->operator = '<=' ) ).
-      DATA(opposite_directions_less) = xsdbool(
-        zcl_semver_functions=>cmp(
-          a     = semver->version
-          op    = '<'
-          b     = semcomp->semver->version
-          loose = loose ) AND
-        ( operator = '>=' OR operator = '>' ) AND
-        ( semcomp->operator = '<=' OR semcomp->operator = '<' ) ).
-      DATA(opposite_directions_greater) = xsdbool(
-        zcl_semver_functions=>cmp(
-          a     = semver->version
-          op    = '>'
-          b     = semcomp->semver->version
-          loose = loose ) AND
-        ( operator = '<=' OR operator = '<' ) AND
-        ( semcomp->operator = '>=' OR semcomp->operator = '>' ) ).
-
-      result = xsdbool(
-        same_direction_increasing = abap_true OR
-        same_direction_decreasing = abap_true OR
-        ( same_semver = abap_true AND different_directions_inclusive = abap_true ) OR
-        opposite_directions_less = abap_true OR
-        opposite_directions_greater = abap_true ).
+      " Special cases where nothing can possibly be lower
+      IF incpre = abap_true AND value = '<0.0.0-0' OR semcomp->value = '<0.0.0-0'.
+        result = abap_false.
+        RETURN.
+      ENDIF.
+      IF incpre = abap_false AND value CP '<0.0.0*' OR semcomp->value CP '<0.0.0*'.
+        result = abap_false.
+        RETURN.
+      ENDIF.
+
+      " Same direction increasing (> or >=)
+      IF operator CP '>*' AND semcomp->operator CP '>*'.
+        result = abap_true.
+        RETURN.
+      ENDIF.
+      " Same direction decreasing (< or <=)
+      IF operator CP '<*' AND semcomp->operator CP '<*'.
+        result = abap_true.
+        RETURN.
+      ENDIF.
+
+      " same SemVer and both sides are inclusive (<= or >=)
+      IF semver->version = semcomp->semver->version AND operator CA '=' AND semcomp->operator CA '='.
+        result = abap_true.
+        RETURN.
+      ENDIF.
+
+      " opposite directions less than
+      IF zcl_semver_functions=>cmp(
+        a      = semver->version
+        op     = '<'
+        b      = semcomp->semver->version
+        loose  = loose
+        incpre = incpre ) AND operator CP '>*' AND semcomp->operator CP '<*'.
+        result = abap_true.
+        RETURN.
+      ENDIF.
+      " opposite directions greater than
+      IF zcl_semver_functions=>cmp(
+        a      = semver->version
+        op     = '>'
+        b      = semcomp->semver->version
+        loose  = loose
+        incpre = incpre ) AND operator CP '<*' AND semcomp->operator CP '>*'.
+        result = abap_true.
+        RETURN.
+      ENDIF.
+      result = abap_false.
+
+
+*      DATA(same_direction_increasing) = xsdbool(
+*      ( operator = '>=' OR operator = '>' ) AND
+*      ( semcomp->operator = '>=' OR semcomp->operator = '>' ) ).
+*      DATA(same_direction_decreasing) = xsdbool(
+*      ( operator = '<=' OR operator = '<' ) AND
+*      ( semcomp->operator = '<=' OR semcomp->operator = '<' ) ).
+*      DATA(same_semver) = xsdbool(
+*      semver->version = semcomp->semver->version ).
+*      DATA(different_directions_inclusive) = xsdbool(
+*      ( operator = '>=' OR operator = '<=' ) AND
+*      ( semcomp->operator = '>=' OR semcomp->operator = '<=' ) ).
+*      DATA(opposite_directions_less) = xsdbool(
+*      zcl_semver_functions=>cmp(
+*      a     = semver->version
+*      op    = '<'
+*      b     = semcomp->semver->version
+*      loose = loose ) AND
+*      ( operator = '>=' OR operator = '>' ) AND
+*      ( semcomp->operator = '<=' OR semcomp->operator = '<' ) ).
+*      DATA(opposite_directions_greater) = xsdbool(
+*      zcl_semver_functions=>cmp(
+*      a     = semver->version
+*      op    = '>'
+*      b     = semcomp->semver->version
+*      loose = loose ) AND
+*      ( operator = '<=' OR operator = '<' ) AND
+*      ( semcomp->operator = '>=' OR semcomp->operator = '>' ) ).
+*
+*      result = xsdbool(
+*      same_direction_increasing = abap_true OR
+*      same_direction_decreasing = abap_true OR
+*      ( same_semver = abap_true AND different_directions_inclusive = abap_true ) OR
+*      opposite_directions_less = abap_true OR
+*      opposite_directions_greater = abap_true ).
     ENDIF.
 
   ENDMETHOD.

src/classes/zcl_semver_comparator.clas.testclasses.abap

@@ -60,7 +60,12 @@ CLASS ltcl_semver_comparator IMPLEMENTATION.
       DATA(comp1) = zcl_semver_comparator=>create( intersection-c1 ).
 
       cl_abap_unit_assert=>assert_equals(
-        act = comp0->intersects( comp1 )
+        act = comp0->intersects( comp = comp1 incpre = intersection-incpre )
+        exp = intersection-res
+        msg = msg ).
+
+      cl_abap_unit_assert=>assert_equals(
+        act = comp1->intersects( comp = comp0 incpre = intersection-incpre )
         exp = intersection-res
         msg = msg ).
     ENDLOOP.

src/cli/zcl_semver_cli.clas.abap

@@ -34,16 +34,17 @@ CLASS zcl_semver_cli DEFINITION
   PRIVATE SECTION.
 
     CLASS-DATA:
-      argv       TYPE string_table,
-      versions   TYPE string_table,
-      ranges     TYPE string_table,
-      inc        TYPE string,
-      identifier TYPE string,
-      loose      TYPE abap_bool,
-      incpre     TYPE abap_bool,
-      coerce     TYPE abap_bool,
-      rtl        TYPE abap_bool,
-      reverse    TYPE abap_bool.
+      argv            TYPE string_table,
+      versions        TYPE string_table,
+      ranges          TYPE string_table,
+      inc             TYPE string,
+      identifier      TYPE string,
+      identifier_base TYPE i,
+      loose           TYPE abap_bool,
+      incpre          TYPE abap_bool,
+      coerce          TYPE abap_bool,
+      rtl             TYPE abap_bool,
+      reverse         TYPE abap_bool.
 
 ENDCLASS.
 
@@ -83,6 +84,9 @@ CLASS zcl_semver_cli IMPLEMENTATION.
       ( `-l --loose` )
       ( `        Interpret versions and ranges loosely` )
       ( `` )
+      ( `-n <0|1>` )
+      ( `        This is the base to be used for the prerelease identifier.` )
+      ( `` )
       ( `-p --include-prerelease` )
       ( `        Always include prerelease versions in range matching` )
       ( `` )
@@ -107,7 +111,9 @@ CLASS zcl_semver_cli IMPLEMENTATION.
 
   METHOD main.
 
-    CLEAR: argv, versions, ranges, inc, identifier, loose, incpre, coerce, rtl, reverse.
+    CLEAR:
+      argv, versions, ranges, inc, identifier, identifier_base,
+      loose, incpre, coerce, rtl, reverse.
 
     IF args IS INITIAL.
       result = help( ).
@@ -153,6 +159,12 @@ CLASS zcl_semver_cli IMPLEMENTATION.
           idx += 1.
           val = VALUE #( argv[ idx ] OPTIONAL ).
           INSERT val INTO TABLE ranges.
+        WHEN '-n'.
+          idx += 1.
+          TRY.
+              identifier_base = VALUE #( argv[ idx ] OPTIONAL ).
+            CATCH cx_root.
+          ENDTRY.
         WHEN '-c' OR '--coerce'.
           coerce = abap_true.
         WHEN '--rtl'.
@@ -230,8 +242,13 @@ CLASS zcl_semver_cli IMPLEMENTATION.
 
     IF inc IS NOT INITIAL.
       LOOP AT versions ASSIGNING <version>.
-        DATA(semver) = zcl_semver_functions=>inc( version = <version> release = inc identifier = identifier
-                                                  loose = loose incpre = incpre ).
+        DATA(semver) = zcl_semver_functions=>inc(
+          version         = <version>
+          release         = inc
+          identifier      = identifier
+          identifier_base = identifier_base
+          loose           = loose
+          incpre          = incpre ).
 
         IF semver IS BOUND.
           <version> = semver->version.

src/cli/zcl_semver_cli.clas.testclasses.abap

@@ -86,6 +86,10 @@ CLASS ltcl_semver_cli IMPLEMENTATION.
       args = '-i premajor 1.0.0 --preid=beta'
       out  = |2.0.0-beta.0\n| ).
 
+    test(
+      args = '-i premajor 1.0.0 --preid=beta -n 1'
+      out  = |2.0.0-beta.1\n| ).
+
     test(
       args = '-i 1.2.3'
       out  = |1.2.4\n| ).

src/functions/zcl_semver_functions.clas.abap

@@ -120,13 +120,14 @@ CLASS zcl_semver_functions DEFINITION
 
     CLASS-METHODS inc
       IMPORTING
-        version       TYPE any
-        release       TYPE string
-        identifier    TYPE string OPTIONAL
-        loose         TYPE abap_bool DEFAULT abap_false
-        incpre        TYPE abap_bool DEFAULT abap_false
+        version         TYPE any
+        release         TYPE string
+        identifier      TYPE string OPTIONAL
+        identifier_base TYPE i DEFAULT 0
+        loose           TYPE abap_bool DEFAULT abap_false
+        incpre          TYPE abap_bool DEFAULT abap_false
       RETURNING
-        VALUE(result) TYPE REF TO zcl_semver.
+        VALUE(result)   TYPE REF TO zcl_semver.
 
     CLASS-METHODS lt
       IMPORTING
@@ -445,6 +446,16 @@ CLASS zcl_semver_functions IMPLEMENTATION.
       result = prefix && 'minor'.
     ELSEIF semver_1->patch <> semver_2->patch.
       result = prefix && 'patch'.
+    ELSEIF semver_1->prerelease IS INITIAL OR semver_2->prerelease IS INITIAL.
+      IF semver_1->patch IS NOT INITIAL.
+        result = 'patch'.
+      ELSEIF semver_1->minor IS NOT INITIAL.
+        result = 'minor'.
+      ELSEIF semver_1->major IS NOT INITIAL.
+        result = 'major'.
+      ELSE.
+        result = default_result. " may be undefined
+      ENDIF.
     ELSE.
       result = default_result. " may be undefined
     ENDIF.
@@ -500,7 +511,7 @@ CLASS zcl_semver_functions IMPLEMENTATION.
 
         CHECK result IS BOUND.
 
-        result->inc( release = release identifier = identifier ).
+        result->inc( release = release identifier = identifier identifier_base = identifier_base ).
       CATCH zcx_semver_error.
         CLEAR result.
     ENDTRY.
@@ -558,25 +569,9 @@ CLASS zcl_semver_functions IMPLEMENTATION.
 
     CHECK strlen( version ) <= zif_semver_constants=>max_length.
 
-    DATA(r) = COND #(
-      WHEN loose = abap_true
-      THEN zcl_semver_re=>token-loose-regex
-      ELSE zcl_semver_re=>token-full-regex ).
-
     TRY.
-        DATA(m) = r->create_matcher( text = version ).
-
-        IF m->match( ).
-
-          TRY.
-              result = zcl_semver=>create( version = version loose = loose incpre = incpre ).
-            CATCH zcx_semver_error ##NO_HANDLER.
-          ENDTRY.
-
-        ENDIF.
-
-      CATCH cx_sy_matcher.
-        zcx_semver_error=>raise( |Error evaluating regex for { version }| ).
+        result = zcl_semver=>create( version = version loose = loose incpre = incpre ).
+      CATCH zcx_semver_error ##NO_HANDLER.
     ENDTRY.
 
   ENDMETHOD.