refactor: remove annotations support

README.md

@@ -6,6 +6,14 @@ Work with AWS DynamoDB and Single-Table-Designed tables in your apps.
 
 Requires `aws/aws-sdk-php` with `3.*` version. 
 
+## Getting started
+
+### Installation
+
+`composer require dynamite/dynamite`
+
+### Configuration
+
 ## Some important things you need to know:
 
 ### Your table schema
@@ -14,23 +22,7 @@ Requires `aws/aws-sdk-php` with `3.*` version.
 - Dynamite assumes that tables/indexes are created and active.
 
 ### You need to bring your own ID Generator
-There are some proposals you can use:
-
-#### 1. [ramsey/uuid](https://github.com/ramsey/uuid)
-  - Literally an UUID
-  - Really low chance of collision
-
-#### 2. [robinvdvleuten/ulid](https://github.com/robinvdvleuten/php-ulid)  ([**see ULID spec**](https://github.com/ulid/spec))
-  - Time-based
-  - Lexicographically sortable
-  - UUID compliant
-  - Really low chance of collision
-  - Higher precision than KSUID
-#### 3. [tuupola/ksuid](https://github.com/tuupola/ksuid)  ([**Read more about KSUID**](https://github.com/segmentio/ksuid))
-  - Time-based
-  - Lexicographically sortable
-  - Naturally ordered
-  - Really low chance of collision
+See `docs/bring-your-own-id.md` for more information.
 
 ## The unordered roadmap to `v1.0.0`
 - [x] Creating an item

composer.json

@@ -6,7 +6,6 @@
     "require": {
         "php": ">= 8 | 8.1",
         "guzzlehttp/guzzle": "> 7",
-        "doctrine/annotations": "^1.13",
         "aws/aws-sdk-php": "^3.216",
         "symfony/polyfill-php80": "^1.23"
     },

src/Dynamite/Configuration/DuplicateTo.php

@@ -3,38 +3,27 @@
 
 namespace Dynamite\Configuration;
 
-
-use Doctrine\Common\Annotations\Annotation\Target;
-
 /**
  * When spotted in configuration, takes props from main item and writes them to new record.
  * This enforces persisting items via batchWriteItem.
  *
- * @Annotation
- * @Target({"CLASS"})
- *
  * @author pizzaminded <[email protected]>
  * @license MIT
  */
-#[\Attribute(flags: \Attribute::TARGET_CLASS)]
+#[\Attribute(flags: \Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
 class DuplicateTo
 {
-    public string $pk;
-
-    public ?string $sk;
-
-    /**
-     * Applies transformations to Primary key attributes.
-     * @Enum({"UPPER", "LOWER"})
-     * @deprecated - soon to be removed - use {upper:propName} or {lower:propName} filter
-     */
-    public ?string $transform = null;
-
-    /**
-     * Properties from base entity that should be put in duplicated item
-     * @var array<string, mixed>
-     */
-    public array $props = [];
+    public function __construct(
+        protected string $pk,
+        protected ?string $sk,
+        /**
+         * Properties from base entity that should be put in duplicated item
+         * @var array<string>
+        */
+        protected array $props = []
+    )
+    {
+    }
 
     /**
      * @return array
@@ -53,13 +42,4 @@ public function getSortKeyFormat(): string
     {
         return $this->sk;
     }
-
-    /**
-     * @return string|null
-     */
-    public function getTransform(): ?string
-    {
-        return $this->transform;
-    }
-
 }

src/Dynamite/Configuration/NestedItem.php

@@ -17,24 +17,24 @@
 #[\Attribute(flags: \Attribute::TARGET_CLASS)]
 class NestedItem
 {
-    /**
-     * When set, payload from persistence layer will be passed as a first argument
-     * Method must be public and static
-     * @var string|null
-     */
-    private ?string $deserializeMethod;
-
-    /**
-     * When set, values from properties will be ignored and given method will be called
-     * Function cannot be static, must be public and return array
-     * @var string|null
-     */
-    private ?string $serializeMethod;
 
-    public function __construct(array $props)
+    public function __construct(
+        /**
+         * When set, payload from persistence layer will be passed as a first argument
+         * Method must be public and static
+         * @var string|null
+         */
+        private ?string $deserializeMethod = null,
+
+        /**
+         * When set, values from properties will be ignored and given method will be called
+         * Function cannot be static, must be public and return array
+         * @var string|null
+         */
+        private ?string $serializeMethod = null
+    )
     {
-        $this->deserializeMethod = $props['deserializeMethod'] ?? null;
-        $this->serializeMethod = $props['serializeMethod'] ?? null;
+
     }
 
     /**

src/Dynamite/Configuration/NestedItemAttribute.php

@@ -14,17 +14,40 @@
  * @license MIT
  */
 #[\Attribute(flags: \Attribute::TARGET_PROPERTY)]
-class NestedItemAttribute extends AbstractAttribute
+class NestedItemAttribute implements AttributeInterface
 {
 
+    /**
+     * @throws ConfigurationException
+     */
+    public function __construct(
+        protected string $type,
+        protected string $name,
+    ) {
+        $this->assertType($this->type);
+    }
+
     /**
      * @param string $type
      * @return void
+     * @throws ConfigurationException
      */
-    protected function assertType(string $type)
+    protected function assertType(string $type): void
     {
         if (!class_exists($type)) {
-            throw new ConfigurationException(sprintf('Class "%s" does not exists and cannot be used as a type in "%s" annotation.', $type, self::class));
+            throw new ConfigurationException(sprintf('Class "%s" does not exists and cannot be used as a type in "%s" attribute.', $type, self::class));
         }
     }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+
 }

src/Dynamite/Configuration/NestedValueObjectAttribute.php

@@ -10,37 +10,29 @@
  * A object-with-single-property (or array of them) which will be converted to scalar value (or array of them).
  * Use cases: Value objects with single values (eg: Colour, Currency)
  *
- * @Annotation
  * @author pizzaminded <[email protected]>
  * @license MIT
  */
 #[\Attribute(flags: \Attribute::TARGET_PROPERTY)]
 class NestedValueObjectAttribute extends AbstractAttribute
 {
+    public function __construct(
+        string $type,
+        string $name,
+        /**
+         * Which property should hold value going to persistence layer?
+         * @var string
+         */
+        protected string $property,
+        protected bool $collection = false
+    ) {
 
-    /**
-     * Which property should hold value going to persistence layer?
-     * @var string
-     */
-    protected string $property;
-
-    /**
-     * Does it store a collection of classes?
-     * @var bool
-     */
-    protected bool $collection = false;
-
-
-    public function __construct(array $props)
-    {
-        parent::__construct($props);
-        $this->assertPropertiesPresence($props, ['property']);
-
-        if (isset($props['collection'])) {
-            $this->collection = (bool)$props['collection'];
-        }
+        parent::__construct([
+            'type' => $type,
+            'property' => $property,
+            'name' => $name,
 
-        $this->property = $props['property'];
+        ]);
     }
 
     /**

src/Dynamite/ItemRepository.php

@@ -39,8 +39,8 @@ public function __construct(
 
     /**
      * When passing a string to $partitionKey or $sortKey, Dynamite will pass them to DB directly.
-     * But when passing an array, it will build an key using data from SortKeyFormat and PrimaryKeyFormat annotations.
-     * Remember to pass all "fragments" of key in array in given format:
+     * But when passing an array, it will build an key using data from SortKeyFormat and PrimaryKeyFormat attributes.
+     * Remember to pass all fragments of key in array in given format:
      * [ fieldName => value ].
      *
      * @param array<string, string>|string $partitionKey

src/Dynamite/ItemSerializer.php

@@ -4,6 +4,7 @@
 
 namespace Dynamite;
 
+use Aws\DynamoDb\SetValue;
 use Dynamite\Configuration\Attribute;
 use Dynamite\Configuration\NestedItemAttribute;
 use Dynamite\Configuration\NestedValueObjectAttribute;
@@ -135,6 +136,10 @@ public function hydrateObject(string $className, ItemMapping $itemMapping, array
                     }
                 }
 
+                if($propValue instanceof SetValue) {
+                    $propValue = $propValue->toArray();
+                }
+
                 $propertyReflection->setValue($instantiatedObject, $propValue);
                 continue;
             }