Updated namespaces for libraries (#2)

config/example.neon

@@ -27,7 +27,7 @@ extensions:
     ipubDoctrineTimestampable           : IPub\DoctrineTimestampable\DI\DoctrineTimestampableExtension
     ipubDoctrineDynamicDiscriminatorMap : IPub\DoctrineDynamicDiscriminatorMap\DI\DoctrineDynamicDiscriminatorMapExtension
     fbDateTimeFactory                   : FastyBird\DateTimeFactory\DI\DateTimeFactoryExtension
-    fbExchange                          : FastyBird\Exchange\DI\ExchangeExtension
+    fbExchange                          : FastyBird\Library\Exchange\DI\ExchangeExtension
     fbJsonApi                           : FastyBird\JsonApi\DI\JsonApiExtension
     fbSimpleAuth                        : FastyBird\SimpleAuth\DI\SimpleAuthExtension
 

public/lib/models/connectors/index.ts

@@ -24,7 +24,7 @@ import {
   ConnectorsResponseInterface,
   FbBusConnectorUpdateInterface,
   FbMqttConnectorUpdateInterface,
-  Connector\ModbusUpdateInterface,
+  ModbusConnectorUpdateInterface,
   ShellyConnectorUpdateInterface,
   SonoffConnectorUpdateInterface,
   TuyaUpdateInterface,
@@ -162,7 +162,7 @@ const moduleActions: ActionTree<ConnectorState, unknown> = {
     }
   },
 
-  async edit({ state, commit }, payload: { connector: ConnectorInterface, data: FbMqttConnectorUpdateInterface | FbBusConnectorUpdateInterface | ShellyConnectorUpdateInterface | TuyaUpdateInterface | SonoffConnectorUpdateInterface | Connector\ModbusUpdateInterface }): Promise<Item<Connector>> {
+  async edit({ state, commit }, payload: { connector: ConnectorInterface, data: FbMqttConnectorUpdateInterface | FbBusConnectorUpdateInterface | ShellyConnectorUpdateInterface | TuyaUpdateInterface | SonoffConnectorUpdateInterface | ModbusConnectorUpdateInterface }): Promise<Item<Connector>> {
     if (state.semaphore.updating.includes(payload.connector.id)) {
       throw new Error('devices-module.connectors.update.inProgress')
     }

public/lib/models/connectors/types.ts

@@ -119,7 +119,7 @@ export interface SonoffConnectorUpdateInterface extends ConnectorUpdateInterface
   name?: string
 }
 
-export interface Connector\ModbusUpdateInterface extends ConnectorUpdateInterface {
+export interface ModbusConnectorUpdateInterface extends ConnectorUpdateInterface {
   serialInterface?: string | null
   baudRate?: number | null
 }

src/Commands/Connector.php

@@ -22,11 +22,11 @@
 use FastyBird\DevicesModule\Events;
 use FastyBird\DevicesModule\Exceptions;
 use FastyBird\DevicesModule\Models;
-use FastyBird\Exchange\Consumer as ExchangeConsumer;
-use FastyBird\Metadata;
-use FastyBird\Metadata\Entities as MetadataEntities;
-use FastyBird\Metadata\Exceptions as MetadataExceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Exchange\Consumer as ExchangeConsumer;
+use FastyBird\Library\Metadata;
+use FastyBird\Library\Metadata\Entities as MetadataEntities;
+use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use IPub\DoctrineOrmQuery\Exceptions as DoctrineOrmQueryExceptions;
 use Psr\EventDispatcher as PsrEventDispatcher;
 use Psr\Log;

src/Commands/Initialize.php

@@ -16,7 +16,7 @@
 namespace FastyBird\DevicesModule\Commands;
 
 use FastyBird\DevicesModule\DataStorage;
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 use Psr\Log;
 use Symfony\Component\Console;
 use Symfony\Component\Console\Input;

src/Connectors/ConnectorFactory.php

@@ -15,7 +15,7 @@
 
 namespace FastyBird\DevicesModule\Connectors;
 
-use FastyBird\Metadata\Entities as MetadataEntities;
+use FastyBird\Library\Metadata\Entities as MetadataEntities;
 
 /**
  * Connector factory interface

src/Constants.php

@@ -15,7 +15,7 @@
 
 namespace FastyBird\DevicesModule;
 
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 
 /**
  * Service constants

src/Consumers/Connector.php

@@ -16,10 +16,10 @@
 namespace FastyBird\DevicesModule\Consumers;
 
 use FastyBird\DevicesModule\DataStorage;
-use FastyBird\Exchange\Consumer as ExchangeConsumer;
-use FastyBird\Metadata\Constants as MetadataConstants;
-use FastyBird\Metadata\Entities as MetadataEntities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Exchange\Consumer as ExchangeConsumer;
+use FastyBird\Library\Metadata;
+use FastyBird\Library\Metadata\Entities as MetadataEntities;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use League\Flysystem;
 use Nette;
 use Nette\Utils;
@@ -53,19 +53,22 @@ public function consume(
 	): void
 	{
 		if (
-			Utils\Strings::startsWith(strval($routingKey->getValue()), MetadataConstants::MESSAGE_BUS_ENTITY_PREFIX_KEY)
+			Utils\Strings::startsWith(
+				strval($routingKey->getValue()),
+				Metadata\Constants::MESSAGE_BUS_ENTITY_PREFIX_KEY,
+			)
 			&& (
 				Utils\Strings::contains(
 					strval($routingKey->getValue()),
-					MetadataConstants::MESSAGE_BUS_ENTITY_CREATED_KEY,
+					Metadata\Constants::MESSAGE_BUS_ENTITY_CREATED_KEY,
 				)
 				|| Utils\Strings::contains(
 					strval($routingKey->getValue()),
-					MetadataConstants::MESSAGE_BUS_ENTITY_UPDATED_KEY,
+					Metadata\Constants::MESSAGE_BUS_ENTITY_UPDATED_KEY,
 				)
 				|| Utils\Strings::contains(
 					strval($routingKey->getValue()),
-					MetadataConstants::MESSAGE_BUS_ENTITY_DELETED_KEY,
+					Metadata\Constants::MESSAGE_BUS_ENTITY_DELETED_KEY,
 				)
 			)
 		) {

src/Controllers/ChannelPropertiesV1.php

@@ -24,7 +24,7 @@
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
 use FastyBird\JsonApi\Exceptions as JsonApiExceptions;
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 use Fig\Http\Message\StatusCodeInterface;
 use InvalidArgumentException;
 use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions;

src/Controllers/ChannelsV1.php

@@ -24,7 +24,7 @@
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
 use FastyBird\JsonApi\Exceptions as JsonApiExceptions;
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 use Fig\Http\Message\StatusCodeInterface;
 use InvalidArgumentException;
 use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions;

src/Controllers/ConnectorPropertiesV1.php

@@ -25,7 +25,7 @@
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
 use FastyBird\JsonApi\Exceptions as JsonApiExceptions;
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 use Fig\Http\Message\StatusCodeInterface;
 use InvalidArgumentException;
 use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions;

src/Controllers/ConnectorsV1.php

@@ -23,7 +23,7 @@
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
 use FastyBird\JsonApi\Exceptions as JsonApiExceptions;
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 use Fig\Http\Message\StatusCodeInterface;
 use IPub\DoctrineOrmQuery\Exceptions as DoctrineOrmQueryExceptions;
 use Nette\Utils;

src/Controllers/DevicePropertiesV1.php

@@ -24,7 +24,7 @@
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
 use FastyBird\JsonApi\Exceptions as JsonApiExceptions;
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 use Fig\Http\Message\StatusCodeInterface;
 use InvalidArgumentException;
 use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions;

src/Controllers/DevicesV1.php

@@ -24,7 +24,7 @@
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
 use FastyBird\JsonApi\Exceptions as JsonApiExceptions;
-use FastyBird\Metadata;
+use FastyBird\Library\Metadata;
 use Fig\Http\Message\StatusCodeInterface;
 use InvalidArgumentException;
 use IPub\DoctrineCrud\Exceptions as DoctrineCrudExceptions;

src/DI/DevicesModuleExtension.php

@@ -36,6 +36,7 @@
 use Nette\Schema;
 use stdClass;
 use function assert;
+use function is_dir;
 use function is_string;
 use function ucfirst;
 use const DIRECTORY_SEPARATOR;
@@ -556,6 +557,13 @@ public function beforeCompile(): void
 				'addPaths',
 				[[__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'Entities']],
 			);
+
+			if (is_dir(__DIR__ . '/../../tests/fixtures/dummy')) {
+				$ormAnnotationDriverService->addSetup(
+					'addPaths',
+					[[__DIR__ . '/../../tests/fixtures/dummy']],
+				);
+			}
 		}
 
 		$ormAnnotationDriverChainService = $builder->getDefinitionByType(
@@ -567,6 +575,13 @@ public function beforeCompile(): void
 				$ormAnnotationDriverService,
 				'FastyBird\DevicesModule\Entities',
 			]);
+
+			if (is_dir(__DIR__ . '/../../tests/fixtures/dummy')) {
+				$ormAnnotationDriverChainService->addSetup('addDriver', [
+					$ormAnnotationDriverService,
+					'FastyBird\DevicesModule\Tests\Fixtures\Dummy',
+				]);
+			}
 		}
 
 		/**

src/Entities/Channels/Channel.php

@@ -18,7 +18,7 @@
 use Doctrine\Common;
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineTimestampable;
 use Ramsey\Uuid;

src/Entities/Channels/Controls/Control.php

@@ -17,7 +17,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineTimestampable;
 use Ramsey\Uuid;

src/Entities/Channels/Properties/Dynamic.php

@@ -16,7 +16,7 @@
 namespace FastyBird\DevicesModule\Entities\Channels\Properties;
 
 use Doctrine\ORM\Mapping as ORM;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 
 /**
  * @ORM\Entity

src/Entities/Channels/Properties/Mapped.php

@@ -19,7 +19,7 @@
 use FastyBird\DevicesModule\Entities;
 use FastyBird\DevicesModule\Exceptions;
 use FastyBird\DevicesModule\Utilities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use Ramsey\Uuid;
 use function array_merge;
 

src/Entities/Channels/Properties/Property.php

@@ -20,9 +20,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
 use FastyBird\DevicesModule\Exceptions;
-use FastyBird\Metadata\Exceptions as MetadataExceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
-use FastyBird\Metadata\ValueObjects as MetadataValueObjects;
+use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\ValueObjects as MetadataValueObjects;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use Ramsey\Uuid;
 use function array_merge;

src/Entities/Channels/Properties/Variable.php

@@ -18,7 +18,7 @@
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Exceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 
 /**
  * @ORM\Entity

src/Entities/Connectors/Connector.php

@@ -18,7 +18,7 @@
 use Doctrine\Common;
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use FastyBird\SimpleAuth\Entities as SimpleAuthEntities;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineDynamicDiscriminatorMap\Entities as DoctrineDynamicDiscriminatorMapEntities;

src/Entities/Connectors/Controls/Control.php

@@ -17,7 +17,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineTimestampable;
 use Ramsey\Uuid;

src/Entities/Connectors/Properties/Dynamic.php

@@ -16,7 +16,7 @@
 namespace FastyBird\DevicesModule\Entities\Connectors\Properties;
 
 use Doctrine\ORM\Mapping as ORM;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 
 /**
  * @ORM\Entity

src/Entities/Connectors/Properties/Variable.php

@@ -16,7 +16,7 @@
 namespace FastyBird\DevicesModule\Entities\Connectors\Properties;
 
 use Doctrine\ORM\Mapping as ORM;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 
 /**
  * @ORM\Entity

src/Entities/Devices/Attributes/Attribute.php

@@ -18,7 +18,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
 use FastyBird\DevicesModule\Exceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineTimestampable;
 use Nette\Utils;

src/Entities/Devices/Controls/Control.php

@@ -17,7 +17,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineTimestampable;
 use Ramsey\Uuid;

src/Entities/Devices/Device.php

@@ -18,7 +18,7 @@
 use Doctrine\Common;
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use FastyBird\SimpleAuth\Entities as SimpleAuthEntities;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineDynamicDiscriminatorMap\Entities as DoctrineDynamicDiscriminatorMapEntities;

src/Entities/Devices/Properties/Dynamic.php

@@ -16,7 +16,7 @@
 namespace FastyBird\DevicesModule\Entities\Devices\Properties;
 
 use Doctrine\ORM\Mapping as ORM;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 
 /**
  * @ORM\Entity

src/Entities/Devices/Properties/Mapped.php

@@ -19,8 +19,8 @@
 use FastyBird\DevicesModule\Entities;
 use FastyBird\DevicesModule\Exceptions;
 use FastyBird\DevicesModule\Utilities;
-use FastyBird\Metadata\Exceptions as MetadataExceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use Ramsey\Uuid;
 use function array_merge;
 

src/Entities/Devices/Properties/Property.php

@@ -20,9 +20,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Entities;
 use FastyBird\DevicesModule\Exceptions;
-use FastyBird\Metadata\Exceptions as MetadataExceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
-use FastyBird\Metadata\ValueObjects as MetadataValueObjects;
+use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\ValueObjects as MetadataValueObjects;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use Ramsey\Uuid;
 use function array_merge;

src/Entities/Devices/Properties/Variable.php

@@ -18,7 +18,7 @@
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Exceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 
 /**
  * @ORM\Entity

src/Entities/Entity.php

@@ -15,7 +15,7 @@
 
 namespace FastyBird\DevicesModule\Entities;
 
-use FastyBird\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
 use IPub\DoctrineCrud;
 use Ramsey\Uuid;
 

src/Entities/Property.php

@@ -20,10 +20,10 @@
 use Doctrine\ORM\Mapping as ORM;
 use FastyBird\DevicesModule\Exceptions;
 use FastyBird\DevicesModule\Utilities;
-use FastyBird\Metadata;
-use FastyBird\Metadata\Exceptions as MetadataExceptions;
-use FastyBird\Metadata\Types as MetadataTypes;
-use FastyBird\Metadata\ValueObjects as MetadataValueObjects;
+use FastyBird\Library\Metadata;
+use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
+use FastyBird\Library\Metadata\Types as MetadataTypes;
+use FastyBird\Library\Metadata\ValueObjects as MetadataValueObjects;
 use IPub\DoctrineCrud\Mapping\Annotation as IPubDoctrine;
 use IPub\DoctrineTimestampable;
 use Nette\Utils;