Fix long timestamps, update types

Author: mbtools

src/#apmg#cl_pacote.clas.abap

@@ -174,7 +174,7 @@ CLASS /apmg/cl_pacote IMPLEMENTATION.
 
   METHOD /apmg/if_pacote~get_version.
 
-    result = pacote-packument-versions[ key = version ].
+    result = pacote-packument-versions[ key = version ]-manifest.
 
   ENDMETHOD.
 
@@ -330,25 +330,18 @@ CLASS /apmg/cl_pacote IMPLEMENTATION.
     TYPES:
       " Copy of schema but without object attributes (which need to be converted to tables)
       BEGIN OF ty_packument_partial,
-        name        TYPE string,
+        name        TYPE /apmg/if_types=>ty_name,
         description TYPE string,
         readme      TYPE string,
         homepage    TYPE string,
         icon        TYPE string,
-        BEGIN OF bugs,
-          url   TYPE /apmg/if_types=>ty_uri,
-          email TYPE /apmg/if_types=>ty_email,
-        END OF bugs,
+        bugs        TYPE /apmg/if_types=>ty_bugs,
         license     TYPE string,
         keywords    TYPE string_table,
         main        TYPE string,
         man         TYPE string_table,
         author      TYPE /apmg/if_types=>ty_person,
-        BEGIN OF repository,
-          type      TYPE string,
-          url       TYPE /apmg/if_types=>ty_uri,
-          directory TYPE string,
-        END OF repository,
+        repository  TYPE /apmg/if_types=>ty_repository,
         _id         TYPE string,
         _rev        TYPE string,
         access      TYPE string,
@@ -360,7 +353,7 @@ CLASS /apmg/cl_pacote IMPLEMENTATION.
       time         TYPE /apmg/if_types=>ty_time,
       person       TYPE /apmg/if_types=>ty_person,
       user         TYPE /apmg/if_types=>ty_user,
-      version      TYPE /apmg/if_types=>ty_version,
+      version      TYPE /apmg/if_types=>ty_version_manifest,
       attachment   TYPE /apmg/if_types=>ty_attachment,
       packument    TYPE /apmg/if_types=>ty_packument.
 
@@ -380,7 +373,7 @@ CLASS /apmg/cl_pacote IMPLEMENTATION.
         ENDLOOP.
 
         LOOP AT ajson->members( '/time' ) INTO time-key.
-          time-timestamp = ajson->get_timestamp( '/time/' && time-key ).
+          time-timestamp = ajson->get_timestampl( '/time/' && time-key ).
           INSERT time INTO TABLE packument-time.
         ENDLOOP.
 
@@ -407,7 +400,7 @@ CLASS /apmg/cl_pacote IMPLEMENTATION.
         LOOP AT ajson->members( '/versions' ) INTO version-key.
           DATA(ajson_version) = ajson->slice( '/versions/' && version-key ).
           " this also validates the version manifest
-          version-version = /apmg/cl_package_json=>convert_json_to_manifest( ajson_version->stringify( ) ).
+          version-manifest = /apmg/cl_package_json=>convert_json_to_manifest( ajson_version->stringify( ) ).
           INSERT version INTO TABLE packument-versions.
         ENDLOOP.
 
@@ -445,10 +438,9 @@ CLASS /apmg/cl_pacote IMPLEMENTATION.
 
         ajson->setx( '/time:{ }' ).
         LOOP AT packument-time INTO DATA(time).
-          " TODO: Replace with long timestamp
-          ajson->set_timestamp(
+          ajson->set_timestampl(
             iv_path = 'time/' && time-key
-            iv_val  = cl_abap_tstmp=>move_to_short( time-timestamp ) ).
+            iv_val  = time-timestamp ).
         ENDLOOP.
 
         ajson->setx( '/users:{ }' ).
@@ -474,7 +466,7 @@ CLASS /apmg/cl_pacote IMPLEMENTATION.
         ajson->setx( '/versions:{ }' ).
         LOOP AT packument-versions ASSIGNING FIELD-SYMBOL(<version>).
           DATA(version_json) = /apmg/cl_package_json=>convert_manifest_to_json(
-            manifest    = <version>-version
+            manifest    = <version>-manifest
             is_complete = is_complete ).
 
           DATA(ajson_version) = zcl_ajson=>parse(

src/#apmg#cl_pacote.clas.testclasses.abap

@@ -35,13 +35,9 @@ CLASS ltcl_pacote IMPLEMENTATION.
       && `|    "latest": "1.0.0"`
       && `|  },`
       && `|  "time": {`
-* TODO: needs timestampl support in AJSON
-*      && `|    "1.0.0": "2024-05-02T12:17:47.805Z",`
-*      && `|    "created": "2024-05-02T17:59:06.250Z",`
-*      && `|    "modified": "2024-11-10T19:51:04.774Z"`
-      && `|    "1.0.0": "2024-05-02T12:17:47Z",`
-      && `|    "created": "2024-05-02T17:59:06Z",`
-      && `|    "modified": "2024-11-10T19:51:04Z"`
+      && `|    "1.0.0": "2024-05-02T12:17:47.805Z",`
+      && `|    "created": "2024-05-02T17:59:06.251Z",`
+      && `|    "modified": "2024-11-10T19:51:04.774Z"`
       && `|  },`
       && `|  "versions": {`
       && `|    "1.0.0": {`
@@ -226,25 +222,24 @@ CLASS ltcl_pacote IMPLEMENTATION.
           value                      = `1.0.0`
         )
       )
-* TODO: needs timestampl support in AJSON
       time                           = VALUE #(
         (
           key                        = `1.0.0`
-          timestamp                  = 20240502121747
+          timestamp                  = '20240502121747.805'
         )
         (
           key                        = `created`
-          timestamp                  = 20240502175906
+          timestamp                  = '20240502175906.251'
         )
         (
           key                        = `modified`
-          timestamp                  = 20241110195104
+          timestamp                  = '20241110195104.774'
         )
       )
       versions                       = VALUE #(
         (
           key                        = `1.0.0`
-          version                    = VALUE #(
+          manifest                    = VALUE #(
             name                     = `@registrytest/package`
             version                  = `1.0.0`
             description              = `This is an example package`

src/#apmg#if_pacote.intf.abap

@@ -32,7 +32,7 @@ INTERFACE /apmg/if_pacote PUBLIC.
     IMPORTING
       !version      TYPE string
     RETURNING
-      VALUE(result) TYPE /apmg/if_types=>ty_version.
+      VALUE(result) TYPE /apmg/if_types=>ty_manifest.
 
   METHODS set
     IMPORTING