Nodarx/provider_jmapc
1
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Projects Releases Activity

Compare commits

base: Nodarx:main
Branches Tags
Nodarx:main Nodarx:renovate/vuetify-4.x-lockfile Nodarx:renovate/vue-language-tools-monorepo Nodarx:renovate/vue-router-5.x-lockfile Nodarx:renovate/vue-monorepo Nodarx:renovate/phpunit-phpunit-13.x
..
compare: Nodarx:renovate/phpunit-phpunit-13.x
Branches Tags
Nodarx:renovate/vuetify-4.x-lockfile Nodarx:renovate/vue-language-tools-monorepo Nodarx:renovate/vue-router-5.x-lockfile Nodarx:renovate/vue-monorepo Nodarx:main Nodarx:renovate/phpunit-phpunit-13.x

1 Commits
main ... renovate/p

Author SHA1 Message Date
Sebastian Krupinski
4e6ead9767 chore(deps): update dependency phpunit/phpunit to v13
Some checks failed
renovate/artifacts Artifact file update failure
Build Test / test (pull_request) Successful in 31s
Details
JS Unit Tests / test (pull_request) Successful in 31s
Details
PHP Unit Tests / test (pull_request) Failing after 54s
Details
2026-05-23 03:02:04 +00:00
6 changed files with 344 additions and 694 deletions
Expand all files Collapse all files

2
composer.json
View File

@@ -29,7 +29,7 @@
"sebastiankrupinski/jmap-client-php": "dev-main" "sebastiankrupinski/jmap-client-php": "dev-main"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^11.0" "phpunit/phpunit": "^13.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

113
lib/Providers/Mail/MessageProperties.php
View File

@@ -23,91 +23,91 @@ class MessageProperties extends MessagePropertiesMutableAbstract {
*/ */
public function fromJmap(array $parameters): static { public function fromJmap(array $parameters): static {
if (isset($parameters['size'])) {
$this->data[static::PROPERTY_SIZE] = $parameters['size'];
}
if (isset($parameters['headers']) && is_array($parameters['headers'])) {
$this->data[static::PROPERTY_HEADERS] = $parameters['headers'];
}
if (isset($parameters['messageId'])) { if (isset($parameters['messageId'])) {
$this->data[static::PROPERTY_URID] = $parameters['messageId'][0]; $this->data['urid'] = $parameters['messageId'][0];
}
if (isset($parameters['size'])) {
$this->data['size'] = $parameters['size'];
} }
if (isset($parameters['receivedAt'])) { if (isset($parameters['receivedAt'])) {
$this->data[static::PROPERTY_RECEIVED] = $parameters['receivedAt']; $this->data['received'] = $parameters['receivedAt'];
} }
if (isset($parameters['sentAt'])) { if (isset($parameters['sentAt'])) {
$this->data[static::PROPERTY_SENT] = $parameters['sentAt']; $this->data['date'] = $parameters['sentAt'];
} }
if (isset($parameters['inReplyTo'])) { if (isset($parameters['inReplyTo'])) {
$this->data[static::PROPERTY_IN_REPLY_TO] = $parameters['inReplyTo']; $this->data['inReplyTo'] = $parameters['inReplyTo'];
} }
if (isset($parameters['references'])) { if (isset($parameters['references'])) {
$this->data[static::PROPERTY_REFERENCES] = is_array($parameters['references']) ? $parameters['references'] : []; $this->data['references'] = is_array($parameters['references']) ? $parameters['references'] : [];
}
if (isset($parameters['subject'])) {
$this->data['subject'] = $parameters['subject'];
}
if (isset($parameters['preview'])) {
$this->data['snippet'] = $parameters['preview'];
} }
if (isset($parameters['sender'])) { if (isset($parameters['sender'])) {
$this->data[static::PROPERTY_SENDER] = $parameters['sender']; $this->data['sender'] = $parameters['sender'];
} }
if (isset($parameters['from']) && is_array($parameters['from']) && !empty($parameters['from'])) { if (isset($parameters['from']) && is_array($parameters['from']) && !empty($parameters['from'])) {
$this->data[static::PROPERTY_FROM] = [ $this->data['from'] = [
'address' => $parameters['from'][0]['email'] ?? '', 'address' => $parameters['from'][0]['email'] ?? '',
'label' => $parameters['from'][0]['name'] ?? null 'label' => $parameters['from'][0]['name'] ?? null
]; ];
} }
if (isset($parameters['replyTo']) && is_array($parameters['replyTo'])) {
$this->data[static::PROPERTY_REPLY_TO] = [];
foreach ($parameters['replyTo'] as $addr) {
$this->data[static::PROPERTY_REPLY_TO][] = [
'address' => $addr['email'] ?? '',
'label' => $addr['name'] ?? null
];
}
}
if (isset($parameters['to']) && is_array($parameters['to'])) { if (isset($parameters['to']) && is_array($parameters['to'])) {
$this->data[static::PROPERTY_TO] = []; $this->data['to'] = [];
foreach ($parameters['to'] as $addr) { foreach ($parameters['to'] as $addr) {
$this->data[static::PROPERTY_TO][] = [ $this->data['to'][] = [
'address' => $addr['email'] ?? '', 'address' => $addr['email'] ?? '',
'label' => $addr['name'] ?? null 'label' => $addr['name'] ?? null
]; ];
} }
} }
if (isset($parameters['cc']) && is_array($parameters['cc'])) { if (isset($parameters['cc']) && is_array($parameters['cc'])) {
$this->data[static::PROPERTY_CC] = []; $this->data['cc'] = [];
foreach ($parameters['cc'] as $addr) { foreach ($parameters['cc'] as $addr) {
$this->data[static::PROPERTY_CC][] = [ $this->data['cc'][] = [
'address' => $addr['email'] ?? '', 'address' => $addr['email'] ?? '',
'label' => $addr['name'] ?? null 'label' => $addr['name'] ?? null
]; ];
} }
} }
if (isset($parameters['bcc']) && is_array($parameters['bcc'])) { if (isset($parameters['bcc']) && is_array($parameters['bcc'])) {
$this->data[static::PROPERTY_BCC] = []; $this->data['bcc'] = [];
foreach ($parameters['bcc'] as $addr) { foreach ($parameters['bcc'] as $addr) {
$this->data[static::PROPERTY_BCC][] = [ $this->data['bcc'][] = [
'address' => $addr['email'] ?? '', 'address' => $addr['email'] ?? '',
'label' => $addr['name'] ?? null 'label' => $addr['name'] ?? null
]; ];
} }
} }
if (isset($parameters['replyTo']) && is_array($parameters['replyTo'])) {
if (isset($parameters['subject'])) { $this->data['replyTo'] = [];
$this->data[static::PROPERTY_SUBJECT] = $parameters['subject']; foreach ($parameters['replyTo'] as $addr) {
$this->data['replyTo'][] = [
'address' => $addr['email'] ?? '',
'label' => $addr['name'] ?? null
];
}
}
if (isset($parameters['keywords']) && is_array($parameters['keywords'])) {
$this->data['flags'] = [];
foreach ($parameters['keywords'] as $keyword => $value) {
$flag = match($keyword) {
'$seen' => 'read',
'$flagged' => 'flagged',
'$answered' => 'answered',
'$draft' => 'draft',
'$deleted' => 'deleted',
default => $keyword
};
$this->data['flags'][$flag] = $value;
}
} }
if (isset($parameters['bodyStructure'])) { if (isset($parameters['bodyStructure'])) {
$this->data[static::PROPERTY_BODY] = $parameters['bodyStructure']; $this->data['body'] = $parameters['bodyStructure'];
// Recursively add content from bodyValues to matching parts // Recursively add content from bodyValues to matching parts
if (isset($parameters['bodyValues']) && is_array($parameters['bodyValues'])) { if (isset($parameters['bodyValues']) && is_array($parameters['bodyValues'])) {
$addContentToParts = function(&$structure, $bodyValues) use (&$addContentToParts) { $addContentToParts = function(&$structure, $bodyValues) use (&$addContentToParts) {
@@ -123,27 +123,14 @@ class MessageProperties extends MessagePropertiesMutableAbstract {
} }
}; };
$addContentToParts($this->data[static::PROPERTY_BODY], $parameters['bodyValues']); $addContentToParts($this->data['body'], $parameters['bodyValues']);
} }
} }
if (isset($parameters['headers']) && is_array($parameters['headers'])) {
$this->data['headers'] = $parameters['headers'];
}
if (isset($parameters['attachments'])) { if (isset($parameters['attachments'])) {
$this->data[static::PROPERTY_ATTACHMENTS] = $parameters['attachments']; $this->data['attachments'] = $parameters['attachments'];
}
if (isset($parameters['keywords']) && is_array($parameters['keywords'])) {
$this->data[static::PROPERTY_FLAGS] = [];
foreach ($parameters['keywords'] as $keyword => $value) {
$flag = match($keyword) {
'$seen' => 'read',
'$flagged' => 'flagged',
'$answered' => 'answered',
'$draft' => 'draft',
'$deleted' => 'deleted',
default => $keyword
};
$this->data[static::PROPERTY_FLAGS][$flag] = $value;
}
} }
return $this; return $this;

12
lib/Providers/Mail/Provider.php
View File

@@ -14,7 +14,6 @@ use KTXF\Mail\Provider\ProviderServiceDiscoverInterface;
use KTXF\Mail\Provider\ProviderServiceMutateInterface; use KTXF\Mail\Provider\ProviderServiceMutateInterface;
use KTXF\Mail\Provider\ProviderServiceTestInterface; use KTXF\Mail\Provider\ProviderServiceTestInterface;
use KTXF\Mail\Service\ServiceBaseInterface; use KTXF\Mail\Service\ServiceBaseInterface;
use KTXF\Mail\Service\ServiceMutableInterface;
use KTXF\Resource\Provider\ResourceServiceLocationInterface; use KTXF\Resource\Provider\ResourceServiceLocationInterface;
use KTXF\Resource\Provider\ResourceServiceMutateInterface; use KTXF\Resource\Provider\ResourceServiceMutateInterface;
use KTXM\ProviderJmapc\Service\Discovery; use KTXM\ProviderJmapc\Service\Discovery;
@@ -24,9 +23,10 @@ use KTXM\ProviderJmapc\Stores\ServiceStore;
/** /**
* JMAP Mail Provider * JMAP Mail Provider
*/ */
class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface, ProviderServiceDiscoverInterface, ProviderServiceTestInterface class Provider implements ProviderServiceMutateInterface, ProviderServiceDiscoverInterface, ProviderServiceTestInterface
{ {
public const JSON_TYPE = ProviderBaseInterface::JSON_TYPE;
protected const PROVIDER_IDENTIFIER = 'jmap'; protected const PROVIDER_IDENTIFIER = 'jmap';
protected const PROVIDER_LABEL = 'JMAP Mail Provider'; protected const PROVIDER_LABEL = 'JMAP Mail Provider';
protected const PROVIDER_DESCRIPTION = 'Provides mail services via JMAP protocol (RFC 8620)'; protected const PROVIDER_DESCRIPTION = 'Provides mail services via JMAP protocol (RFC 8620)';
@@ -155,7 +155,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface,
} }
$updated = $this->serviceStore->modify($tenantId, $userId, $service); $updated = $this->serviceStore->modify($tenantId, $userId, $service);
return (string) $updated['sid']; return (string) $updated['id'];
} }
public function serviceDestroy(string $tenantId, string $userId, ResourceServiceMutateInterface $service): bool public function serviceDestroy(string $tenantId, string $userId, ResourceServiceMutateInterface $service): bool
@@ -180,8 +180,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface,
return $discovery->discover($identity, $location, $secret, $verifySSL); return $discovery->discover($identity, $location, $secret, $verifySSL);
} }
public function serviceTest(ServiceBaseInterface|ServiceMutableInterface $service, array $options = []): array public function serviceTest(ServiceBaseInterface $service, array $options = []): array {
{
$startTime = microtime(true); $startTime = microtime(true);
try { try {
@@ -200,7 +199,8 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface,
. ' (Account ID: ' . ($session->username() ?? 'N/A') . ')' . ' (Account ID: ' . ($session->username() ?? 'N/A') . ')'
. ' (Latency: ' . $latency . ' ms)', . ' (Latency: ' . $latency . ' ms)',
]; ];
} catch (\Throwable $e) { } catch (\Exception $e) {
$latency = round((microtime(true) - $startTime) * 1000);
return [ return [
'success' => false, 'success' => false,
'message' => 'Test failed: ' . $e->getMessage(), 'message' => 'Test failed: ' . $e->getMessage(),

450
lib/Providers/Mail/Service.php
View File

@@ -13,16 +13,13 @@ use Generator;
use KTXF\Mail\Collection\CollectionBaseInterface; use KTXF\Mail\Collection\CollectionBaseInterface;
use KTXF\Mail\Collection\CollectionRoles; use KTXF\Mail\Collection\CollectionRoles;
use KTXF\Mail\Collection\CollectionMutableInterface; use KTXF\Mail\Collection\CollectionMutableInterface;
use KTXF\Mail\Collection\CollectionPropertiesBaseInterface;
use KTXF\Mail\Object\Address; use KTXF\Mail\Object\Address;
use KTXF\Mail\Object\AddressInterface; use KTXF\Mail\Object\AddressInterface;
use KTXF\Mail\Object\MessagePropertiesMutableInterface;
use KTXF\Mail\Service\ServiceBaseInterface; use KTXF\Mail\Service\ServiceBaseInterface;
use KTXF\Mail\Service\ServiceCollectionMutableInterface; use KTXF\Mail\Service\ServiceCollectionMutableInterface;
use KTXF\Mail\Service\ServiceConfigurableInterface; use KTXF\Mail\Service\ServiceConfigurableInterface;
use KTXF\Mail\Service\ServiceEntityMutableInterface; use KTXF\Mail\Service\ServiceEntityMutableInterface;
use KTXF\Mail\Service\ServiceMutableInterface; use KTXF\Mail\Service\ServiceMutableInterface;
use KTXF\Resource\BinaryResource;
use KTXF\Resource\Provider\ResourceServiceIdentityInterface; use KTXF\Resource\Provider\ResourceServiceIdentityInterface;
use KTXF\Resource\Provider\ResourceServiceLocationInterface; use KTXF\Resource\Provider\ResourceServiceLocationInterface;
use KTXF\Resource\Delta\Delta; use KTXF\Resource\Delta\Delta;
@@ -30,7 +27,6 @@ use KTXF\Resource\Filter\Filter;
use KTXF\Resource\Filter\IFilter; use KTXF\Resource\Filter\IFilter;
use KTXF\Resource\Identifier\CollectionIdentifier; use KTXF\Resource\Identifier\CollectionIdentifier;
use KTXF\Resource\Identifier\EntityIdentifier; use KTXF\Resource\Identifier\EntityIdentifier;
use KTXF\Resource\Identifier\EntityIdentifierInterface;
use KTXF\Resource\Range\IRange; use KTXF\Resource\Range\IRange;
use KTXF\Resource\Range\Range; use KTXF\Resource\Range\Range;
use KTXF\Resource\Range\RangeType; use KTXF\Resource\Range\RangeType;
@@ -41,8 +37,9 @@ use KTXM\ProviderJmapc\Providers\ServiceLocation;
use KTXM\ProviderJmapc\Service\Remote\RemoteMailService; use KTXM\ProviderJmapc\Service\Remote\RemoteMailService;
use KTXM\ProviderJmapc\Service\Remote\RemoteService; use KTXM\ProviderJmapc\Service\Remote\RemoteService;
class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceConfigurableInterface, ServiceCollectionMutableInterface, ServiceEntityMutableInterface class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceConfigurableInterface, ServiceCollectionMutableInterface
{ {
public const JSON_TYPE = ServiceBaseInterface::JSON_TYPE;
private const PROVIDER_IDENTIFIER = 'jmap'; private const PROVIDER_IDENTIFIER = 'jmap';
@@ -51,6 +48,7 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
private ?string $serviceIdentifier = null; private ?string $serviceIdentifier = null;
private ?string $serviceLabel = null; private ?string $serviceLabel = null;
private bool $serviceEnabled = false; private bool $serviceEnabled = false;
private bool $serviceDebug = false;
private string $primaryAddress = ''; private string $primaryAddress = '';
private array $secondaryAddresses = []; private array $secondaryAddresses = [];
private ?ServiceLocation $location = null; private ?ServiceLocation $location = null;
@@ -60,20 +58,18 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
private array $serviceAbilities = [ private array $serviceAbilities = [
self::CAPABILITY_COLLECTION_LIST => true, self::CAPABILITY_COLLECTION_LIST => true,
self::CAPABILITY_COLLECTION_LIST_FILTER => [ self::CAPABILITY_COLLECTION_LIST_FILTER => [
self::CAPABILITY_COLLECTION_FILTER_LABEL => 's:128:256:256', self::CAPABILITY_COLLECTION_FILTER_LABEL => 's:100:256:256',
self::CAPABILITY_COLLECTION_FILTER_ROLE => 's:32:1:1', self::CAPABILITY_COLLECTION_FILTER_ROLE => 's:100:256:256',
self::CAPABILITY_COLLECTION_FILTER_SUBSCRIBED => 'b:0:1:1',
], ],
self::CAPABILITY_COLLECTION_LIST_SORT => [ self::CAPABILITY_COLLECTION_LIST_SORT => [
self::CAPABILITY_COLLECTION_SORT_LABEL, self::CAPABILITY_COLLECTION_SORT_LABEL,
self::CAPABILITY_COLLECTION_SORT_RANK, self::CAPABILITY_COLLECTION_SORT_RANK,
], ],
self::CAPABILITY_COLLECTION_FETCH => true,
self::CAPABILITY_COLLECTION_EXTANT => true, self::CAPABILITY_COLLECTION_EXTANT => true,
self::CAPABILITY_COLLECTION_FETCH => true,
self::CAPABILITY_COLLECTION_CREATE => true, self::CAPABILITY_COLLECTION_CREATE => true,
self::CAPABILITY_COLLECTION_UPDATE => true, self::CAPABILITY_COLLECTION_UPDATE => true,
self::CAPABILITY_COLLECTION_DELETE => true, self::CAPABILITY_COLLECTION_DELETE => true,
self::CAPABILITY_COLLECTION_MOVE => true,
self::CAPABILITY_ENTITY_LIST => true, self::CAPABILITY_ENTITY_LIST => true,
self::CAPABILITY_ENTITY_LIST_FILTER => [ self::CAPABILITY_ENTITY_LIST_FILTER => [
self::CAPABILITY_ENTITY_FILTER_ALL => 's:200:256:256', self::CAPABILITY_ENTITY_FILTER_ALL => 's:200:256:256',
@@ -99,14 +95,11 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
self::CAPABILITY_ENTITY_LIST_RANGE => [ self::CAPABILITY_ENTITY_LIST_RANGE => [
'tally' => ['absolute', 'relative'] 'tally' => ['absolute', 'relative']
], ],
self::CAPABILITY_ENTITY_FETCH => true, self::CAPABILITY_ENTITY_DELTA => true,
self::CAPABILITY_ENTITY_EXTANT => true, self::CAPABILITY_ENTITY_EXTANT => true,
self::CAPABILITY_ENTITY_CREATE => false, self::CAPABILITY_ENTITY_FETCH => true,
self::CAPABILITY_ENTITY_MODIFY => false, //self::CAPABILITY_ENTITY_DELETE => true,
self::CAPABILITY_ENTITY_PATCH => true, //self::CAPABILITY_ENTITY_MOVE => true,
self::CAPABILITY_ENTITY_DELETE => true,
self::CAPABILITY_ENTITY_MOVE => true,
self::CAPABILITY_ENTITY_COPY => false,
]; ];
private readonly RemoteMailService $mailService; private readonly RemoteMailService $mailService;
@@ -114,22 +107,21 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
public function __construct( public function __construct(
) {} ) {}
private function initialize(): void private function initialize(): void {
{
if (!isset($this->mailService)) { if (!isset($this->mailService)) {
$client = RemoteService::freshClient($this); $client = RemoteService::freshClient($this);
$this->mailService = RemoteService::mailService($client); $this->mailService = RemoteService::mailService($client);
} }
} }
public function toStore(): array public function toStore(): array {
{
return array_filter([ return array_filter([
'tid' => $this->serviceTenantId, 'tid' => $this->serviceTenantId,
'uid' => $this->serviceUserId, 'uid' => $this->serviceUserId,
'sid' => $this->serviceIdentifier, 'sid' => $this->serviceIdentifier,
'enabled' => $this->serviceEnabled,
'label' => $this->serviceLabel, 'label' => $this->serviceLabel,
'enabled' => $this->serviceEnabled,
'debug' => $this->serviceDebug,
'primaryAddress' => $this->primaryAddress, 'primaryAddress' => $this->primaryAddress,
'secondaryAddresses' => $this->secondaryAddresses, 'secondaryAddresses' => $this->secondaryAddresses,
'location' => $this->location?->toStore(), 'location' => $this->location?->toStore(),
@@ -138,13 +130,13 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
], fn($v) => $v !== null); ], fn($v) => $v !== null);
} }
public function fromStore(array $data): static public function fromStore(array $data): static {
{
$this->serviceTenantId = $data['tid'] ?? null; $this->serviceTenantId = $data['tid'] ?? null;
$this->serviceUserId = $data['uid'] ?? null; $this->serviceUserId = $data['uid'] ?? null;
$this->serviceIdentifier = $data['sid']; $this->serviceIdentifier = $data['sid'];
$this->serviceLabel = $data['label'] ?? ''; $this->serviceLabel = $data['label'] ?? '';
$this->serviceEnabled = $data['enabled'] ?? false; $this->serviceEnabled = $data['enabled'] ?? false;
$this->serviceDebug = $data['debug'] ?? false;
if (isset($data['primaryAddress'])) { if (isset($data['primaryAddress'])) {
$this->primaryAddress = $data['primaryAddress']; $this->primaryAddress = $data['primaryAddress'];
@@ -167,8 +159,7 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
return $this; return $this;
} }
public function jsonSerialize(): array public function jsonSerialize(): array {
{
return array_filter([ return array_filter([
self::JSON_PROPERTY_TYPE => self::JSON_TYPE, self::JSON_PROPERTY_TYPE => self::JSON_TYPE,
self::JSON_PROPERTY_PROVIDER => self::PROVIDER_IDENTIFIER, self::JSON_PROPERTY_PROVIDER => self::PROVIDER_IDENTIFIER,
@@ -184,18 +175,17 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
], fn($v) => $v !== null); ], fn($v) => $v !== null);
} }
public function jsonDeserialize(array|string $data, bool $delta = false): static public function jsonDeserialize(array|string $data, bool $delta = false): static {
{
if (is_string($data)) { if (is_string($data)) {
$data = json_decode($data, true, 512, JSON_THROW_ON_ERROR); $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
} }
if (isset($data[self::JSON_PROPERTY_ENABLED])) {
$this->setEnabled($data[self::JSON_PROPERTY_ENABLED]);
}
if (isset($data[self::JSON_PROPERTY_LABEL])) { if (isset($data[self::JSON_PROPERTY_LABEL])) {
$this->setLabel($data[self::JSON_PROPERTY_LABEL]); $this->setLabel($data[self::JSON_PROPERTY_LABEL]);
} }
if (isset($data[self::JSON_PROPERTY_ENABLED])) {
$this->setEnabled($data[self::JSON_PROPERTY_ENABLED]);
}
if (isset($data[self::JSON_PROPERTY_LOCATION])) { if (isset($data[self::JSON_PROPERTY_LOCATION])) {
$this->setLocation($this->freshLocation(null, $data[self::JSON_PROPERTY_LOCATION])); $this->setLocation($this->freshLocation(null, $data[self::JSON_PROPERTY_LOCATION]));
} }
@@ -223,8 +213,7 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
return isset($this->serviceAbilities[$value]); return isset($this->serviceAbilities[$value]);
} }
public function capabilities(): array public function capabilities(): array {
{
return $this->serviceAbilities; return $this->serviceAbilities;
} }
@@ -337,12 +326,12 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
public function getDebug(): bool public function getDebug(): bool
{ {
return ($this->auxiliary['debug'] ?? false) === true; return $this->serviceDebug;
} }
public function setDebug(bool $debug): static public function setDebug(bool $debug): static
{ {
$this->auxiliary['debug'] = $debug; $this->serviceDebug = $debug;
return $this; return $this;
} }
@@ -357,6 +346,8 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
return $this; return $this;
} }
// Collection operations
public function collectionList(string|int|null $location, ?IFilter $filter = null, ?ISort $sort = null): array public function collectionList(string|int|null $location, ?IFilter $filter = null, ?ISort $sort = null): array
{ {
$this->initialize(); $this->initialize();
@@ -391,132 +382,82 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
return $this->mailService->collectionExtant(...$identifiers); return $this->mailService->collectionExtant(...$identifiers);
} }
public function collectionFetch(string|int $identifier): ?CollectionResource public function collectionFetch(string|int $identifier): ?CollectionBaseInterface
{ {
$this->initialize(); $this->initialize();
$mailbox = $this->mailService->collectionFetch($identifier); $collection = $this->mailService->collectionFetch($identifier);
if (!is_array($mailbox) || !isset($mailbox['id'])) { if (is_array($collection) && isset($collection['id'])) {
return null; $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
$object->fromJmap($collection);
$collection = $object;
} }
$collection = $this->collectionFresh();
$collection->fromJmap($mailbox);
return $collection; return $collection;
} }
public function collectionFresh(): CollectionResource public function collectionFresh(): CollectionMutableInterface
{ {
return new CollectionResource($this->provider(), $this->identifier()); return new CollectionResource(provider: $this->provider(), service: $this->identifier());
} }
public function collectionCreate(CollectionIdentifier|null $target, CollectionPropertiesBaseInterface $properties, array $options = []): CollectionBaseInterface public function collectionCreate(string|int|null $location, CollectionMutableInterface $collection, array $options = []): CollectionBaseInterface
{ {
$this->initialize(); $this->initialize();
if ($properties instanceof CollectionProperties === false) { if ($collection instanceof CollectionResource === false) {
$native = new CollectionProperties([]); $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
$native->jsonDeserialize($properties->jsonSerialize()); $object->jsonDeserialize($collection->jsonSerialize());
} else { $collection = $object;
$native = $properties;
} }
$collection = $native->toJmap(); $collection = $collection->toJmap();
$collection = $this->mailService->collectionCreate($target?->collection(), $collection, $options); $collection = $this->mailService->collectionCreate($location, $collection, $options);
$object = $this->collectionFresh(); $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
$object->fromJmap($collection); $object->fromJmap($collection);
return $object; return $object;
} }
public function collectionUpdate(CollectionIdentifier $target, CollectionPropertiesBaseInterface $properties): CollectionBaseInterface public function collectionUpdate(string|int $identifier, CollectionMutableInterface $collection): CollectionBaseInterface
{ {
$this->initialize(); $this->initialize();
if ($properties instanceof CollectionProperties === false) { if ($collection instanceof CollectionResource === false) {
$native = new CollectionProperties([]); $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
$native->jsonDeserialize($properties->jsonSerialize()); $object->jsonDeserialize($collection->jsonSerialize());
} else { $collection = $object;
$native = $properties;
} }
$collection = $native->toJmap(); $collection = $collection->toJmap();
$collection = $this->mailService->collectionModify($target->collection(), $collection); $collection = $this->mailService->collectionModify($identifier, $collection);
$object = $this->collectionFresh(); $object = new CollectionResource(provider: $this->provider(), service: $this->identifier());
$object->fromJmap($collection); $object->fromJmap($collection);
return $object; return $object;
} }
public function collectionDelete(CollectionIdentifier $target, bool $force = false): CollectionBaseInterface | true public function collectionDelete(string|int $identifier, bool $force = false, bool $recursive = false): bool
{ {
$this->initialize(); $this->initialize();
$deleteMode = $this->auxiliary['deleteMode'] ?? 'soft'; return $this->mailService->collectionDestroy($identifier, $force, $recursive) !== null;
$deleteTarget = $this->auxiliary['deleteTarget'] ?? null;
if ($deleteMode !== 'soft' && $deleteMode !== 'hard') {
throw new \InvalidArgumentException("Invalid delete mode: $deleteMode");
} }
// Move to target collection (e.g. Trash) instead of deleting public function collectionMove(string|int $identifier, string|int|null $targetLocation): CollectionBaseInterface
if ($deleteMode === 'soft' && $deleteTarget !== null) {
return $this->collectionMove(new CollectionIdentifier($target->provider(), $target->service(), $deleteTarget), $target);
}
if ($deleteMode === 'soft' && $deleteTarget === null) {
$filter = $this->collectionListFilter();
$filter->condition('role', CollectionRoles::Trash->value);
$mailboxes = iterator_to_array($this->mailService->collectionList(null, $filter, null));
if (empty($mailboxes)) {
throw new \RuntimeException('No Trash collection configured or found for deletion');
}
$deleteTarget = key($mailboxes);
}
// we need to determine if the folder being deleted is already in the trash
if (str_starts_with((string) $target->collection(), (string) $deleteTarget)) {
// if so, we should hard delete instead of moving to avoid duplicates in the trash
$deleteMode = 'hard';
}
$result = match ($deleteMode) {
'soft' => $this->collectionMove(new CollectionIdentifier($target->provider(), $target->service(), $deleteTarget), $target),
'hard' => $this->mailService->collectionDestroy($target->collection(), $force),
};
return $result;
}
public function collectionMove(CollectionIdentifier $target, CollectionIdentifier $source): CollectionBaseInterface
{ {
// TODO: Implement collection move
$this->initialize(); $this->initialize();
$collection = new CollectionResource(provider: $this->provider(), service: $this->identifier());
$sourceMailbox = $this->mailService->collectionFetch((string) $source->collection());
$targetMailbox = $this->mailService->collectionFetch((string) $target->collection());
if ($sourceMailbox === null) {
throw new \RuntimeException('Source collection not found for move operation');
}
if ($targetMailbox === null) {
throw new \RuntimeException('Target collection not found for move operation');
}
$mutation['parentId'] = $targetMailbox['id'];
$mutation = $this->mailService->collectionModify($sourceMailbox['id'], $mutation);
$mutation = array_merge($sourceMailbox, $mutation);
$collection = $this->collectionFresh();
$collection->fromJmap($mutation);
return $collection; return $collection;
} }
public function entityListBulk(string|int $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): array // Entity operations
public function entityList(string|int $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): array
{ {
$this->initialize(); $this->initialize();
@@ -525,9 +466,9 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
$list = []; $list = [];
foreach ($result['list'] as $index => $entry) { foreach ($result['list'] as $index => $entry) {
if (is_array($entry) && isset($entry['id'])) { if (is_array($entry) && isset($entry['id'])) {
$object = $this->entityFresh(); $object = new EntityResource(provider: $this->provider(), service: $this->identifier());
$object->fromJmap($entry); $object->fromJmap($entry);
$list[$object->urn()] = $object; $list[$object->identifier()] = $object;
} }
unset($result['list'][$index]); unset($result['list'][$index]);
} }
@@ -537,8 +478,17 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
public function entityListStream(string|int $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): Generator public function entityListStream(string|int $collection, ?IFilter $filter = null, ?ISort $sort = null, ?IRange $range = null, ?array $properties = null): Generator
{ {
foreach ($this->entityListBulk($collection, $filter, $sort, $range, $properties) as $urn => $entity) { $this->initialize();
yield $urn => $entity;
$result = $this->mailService->entityList($collection, $filter, $sort, $range, $properties);
foreach ($result['list'] as $index => $entry) {
if (is_array($entry) && isset($entry['id'])) {
$object = new EntityResource(provider: $this->provider(), service: $this->identifier());
$object->fromJmap($entry);
yield $object;
}
unset($result['list'][$index]);
} }
} }
@@ -557,45 +507,6 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
return new Range(); return new Range();
} }
public function entityFetchBulk(EntityIdentifierInterface ...$identifiers): array
{
$this->initialize();
$ids = [];
foreach ($identifiers as $identifier) {
$ids[] = $identifier->entity();
}
$entities = $this->mailService->entityFetch(...$ids);
$list = [];
foreach ($entities as $entity) {
if (is_array($entity) && isset($entity['id'])) {
$object = $this->entityFresh();
$object->fromJmap($entity);
$list[$object->urn()] = $object;
}
}
return $list;
}
public function entityFetchStream(EntityIdentifierInterface ...$identifiers): Generator
{
foreach ($this->entityFetchBulk(...$identifiers) as $urn => $entity) {
yield $urn => $entity;
}
}
public function entityDownload(EntityIdentifierInterface $target, array|null $part): BinaryResource
{
$this->initialize();
$blobId = isset($part['blobId']) ? (string) $part['blobId'] : null;
return $this->mailService->entityDownload($target->entity(), $blobId);
}
public function entityDelta(string|int $collection, string $signature, string $detail = 'ids'): Delta public function entityDelta(string|int $collection, string $signature, string $detail = 'ids'): Delta
{ {
$this->initialize(); $this->initialize();
@@ -610,159 +521,53 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
return $this->mailService->entityExtant(...$identifiers); return $this->mailService->entityExtant(...$identifiers);
} }
public function entityFresh(): EntityResource public function entityFetch(string|int $collection, string|int ...$identifiers): array
{ {
return new EntityResource($this->provider(), $this->identifier());
}
public function entityCreate(CollectionIdentifier $target, MessagePropertiesMutableInterface $properties, array $options = []): EntityResource
{
// TODO: Implement entity create
return $this->entityFresh();
}
public function entityModify(EntityIdentifier $identifier, MessagePropertiesMutableInterface $properties): EntityResource
{
// TODO: Implement entity modify
return $this->entityFresh();
}
public function entityPatch(MessagePropertiesMutableInterface $properties, EntityIdentifier ...$targets): array
{
// validate identifiers and construct ID list
$targets = $this->mapEntities(...$targets);
// move entities on remote store and construct result map
$this->initialize(); $this->initialize();
$patch = $this->mailService->entityFresh(); $entities = $this->mailService->entityFetch(...$identifiers);
$flags = $properties->getFlags();
foreach ($flags as $flag => $value) { foreach ($entities as &$entity) {
$patch->keyword($flag, $value); if (is_array($entity) && isset($entity['id'])) {
$object = new EntityResource(provider: $this->provider(), service: $this->identifier());
$object->fromJmap($entity);
$entity = $object;
}
} }
$dispositions = $this->mailService->entityPatch($patch, ...array_keys($targets)); return $entities;
$list = [];
foreach ($targets as $target) {
$entityId = $target->entity();
// if the source entity ID is not in the dispositions, it means an unknown error occurred during the move operation for that entity
if (!isset($dispositions[$entityId])) {
$list[(string)$target] = [
'disposition' => 'error',
'error' => 'Unknown error occurred during move operation',
];
continue;
}
// if the disposition for the entity ID is not true, it means the move operation failed for that entity with a known error
if ($dispositions[$entityId] !== true) {
$list[(string)$target] = [
'disposition' => 'error',
'error' => $dispositions[$entityId] ?? 'Unknown error occurred during move operation',
];
continue;
} }
$list[(string)$target] = [ public function entityDelete(EntityIdentifier ...$identifiers): array
'disposition' => 'patched'
];
unset($targets[$entityId]);
}
return $list;
}
public function entityDelete(EntityIdentifier ...$targets): array
{ {
// validate identifiers and construct ID list // validate identifiers and construct ID list
$targets = $this->mapEntities(...$targets); $ids = [];
foreach ($identifiers as $identifier) {
// determine delete mode and target collection (e.g. Trash) if applicable if ($identifier->provider() !== $this->provider() || $identifier->service() !== (string)$this->identifier()) {
$deleteMode = $this->auxiliary['deleteMode'] ?? 'soft'; throw new \InvalidArgumentException('Entity identifier does not belong to this service: ' . (string)$identifier);
$deleteTarget = $this->auxiliary['deleteTarget'] ?? null; }
$ids[] = $identifier->entity();
if ($deleteMode !== 'soft' && $deleteMode !== 'hard') {
throw new \InvalidArgumentException("Invalid delete mode: $deleteMode");
} }
// connect to remote store
$this->initialize(); $this->initialize();
// attempt to find a target collection for soft deletion if none was specified $deleteMode = strtolower(trim((string) ($this->getAuxiliary()['deleteMode'] ?? 'soft')));
if ($deleteMode === 'soft' && $deleteTarget === null) {
$filter = $this->collectionListFilter();
$filter->condition('role', CollectionRoles::Trash->value);
$mailboxes = iterator_to_array($this->mailService->collectionList(null, $filter, null));
if (empty($mailboxes)) {
throw new \RuntimeException('No Trash collection configured or found for deletion');
}
$targetMailbox = reset($mailboxes);
if ($targetMailbox === false) {
throw new \RuntimeException('No Trash collection configured or found for deletion');
}
$deleteTargetNative = $targetMailbox->id();
$deleteTargetIdentifier = new CollectionIdentifier($this->provider(), (string) $this->identifier(), $deleteTargetNative);
} else {
$deleteTargetNative = $deleteTarget;
$deleteTargetIdentifier = new CollectionIdentifier($this->provider(), (string) $this->identifier(), $deleteTargetNative);
}
// if all targets are already in the delete target collection, we should hard delete instead of moving to avoid duplicates in the trash
$targetCollections = [];
foreach ($targets as $target) {
$targetCollections[$target->collection()] = true;
}
if (array_keys($targetCollections) === [$deleteTargetNative]) {
$deleteMode = 'hard';
}
// move or delete target entities on remote store and construct result map
$dispositions = match ($deleteMode) {
'soft' => $this->mailService->entityMove($deleteTargetNative, ...array_keys($targets)),
'hard' => $this->mailService->entityDelete(...array_keys($targets)),
};
$list = [];
foreach ($targets as $target) {
$entityId = $target->entity();
// if the source entity ID is not in the dispositions, it means an unknown error occurred during the move operation for that entity
if (!isset($dispositions[$entityId])) {
$list[(string)$target] = [
'disposition' => 'error',
'error' => 'Unknown error occurred during move operation',
];
continue;
}
// if the disposition for the entity ID is not true, it means the move operation failed for that entity with a known error
if ($dispositions[$entityId] !== true) {
$list[(string)$target] = [
'disposition' => 'error',
'error' => $dispositions[$entityId] ?? 'Unknown error occurred during move operation',
];
continue;
}
if ($deleteMode === 'soft') { if ($deleteMode === 'soft') {
$list[(string)$target] = [ $filter = $this->collectionListFilter();
'disposition' => 'moved', $filter->condition('role', 'trash');
'destination' => $deleteTargetIdentifier, $targets = $this->collectionList(null, $filter);
'mutation' => new EntityIdentifier($this->provider(), $this->identifier(), $target->collection(), $entityId),
]; if (empty($targets)) {
} else { throw new \RuntimeException('No trash collection found for soft delete');
$list[(string)$target] = [
'disposition' => 'deleted',
];
}
unset($targets[$entityId]);
} }
return $list; return $this->mailService->entityMove(reset($targets)->identifier(), ...$ids);
} }
public function entityMove(CollectionIdentifier $target, EntityIdentifier ...$sources): array return $this->mailService->entityDelete(...$ids);
}
public function entityMove(CollectionIdentifier $target, EntityIdentifier ...$identifiers): array
{ {
// validate target belongs to this service // validate target belongs to this service
if ($target->provider() !== $this->provider() || $target->service() !== (string)$this->identifier()) { if ($target->provider() !== $this->provider() || $target->service() !== (string)$this->identifier()) {
@@ -770,59 +575,16 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
} }
// validate identifiers and construct ID list // validate identifiers and construct ID list
$sources = $this->mapEntities(...$sources); $ids = [];
// move entities on remote store and construct result map
$this->initialize();
$dispositions = $this->mailService->entityMove($target->collection(), ...array_keys($sources));
$list = [];
foreach ($sources as $source) {
$entityId = $source->entity();
// if the source entity ID is not in the dispositions, it means an unknown error occurred during the move operation for that entity
if (!isset($dispositions[$entityId])) {
$list[(string)$source] = [
'disposition' => 'error',
'error' => 'Unknown error occurred during move operation',
];
continue;
}
// if the disposition for the entity ID is not true, it means the move operation failed for that entity with a known error
if ($dispositions[$entityId] !== true) {
$list[(string)$source] = [
'disposition' => 'error',
'error' => $dispositions[$entityId] ?? 'Unknown error occurred during move operation',
];
continue;
}
$list[(string)$source] = [
'disposition' => 'moved',
'destination' => $target,
'mutation' => new EntityIdentifier($this->provider(), $this->identifier(), $target->collection(), $entityId),
];
unset($sources[$entityId]);
}
return $list;
}
public function entityCopy(CollectionIdentifier $target, EntityIdentifier ...$sources): array
{
// TODO: Implement entity copy
return [];
}
private function mapEntities(EntityIdentifier ...$identifiers): array
{
$list = [];
foreach ($identifiers as $identifier) { foreach ($identifiers as $identifier) {
if ($identifier->provider() !== $this->provider() || $identifier->service() !== (string)$this->identifier()) { if ($identifier->provider() !== $this->provider() || $identifier->service() !== (string)$this->identifier()) {
throw new \InvalidArgumentException('Entity identifier does not belong to this service: ' . (string)$identifier); throw new \InvalidArgumentException('Entity identifier does not belong to this service: ' . (string)$identifier);
} }
$list[$identifier->entity()] = $identifier; $ids[] = $identifier->entity();
} }
return $list;
$this->initialize();
return $this->mailService->entityMove($target->collection(), ...$ids);
} }
} }

185
lib/Service/Remote/RemoteMailService.php
View File

@@ -11,6 +11,8 @@ namespace KTXM\ProviderJmapc\Service\Remote;
use Exception; use Exception;
use JmapClient\Client; use JmapClient\Client;
use JmapClient\Requests\Blob\BlobGet;
use JmapClient\Requests\Blob\BlobSet;
use JmapClient\Requests\Mail\MailboxGet; use JmapClient\Requests\Mail\MailboxGet;
use JmapClient\Requests\Mail\MailboxParameters as MailboxParametersRequest; use JmapClient\Requests\Mail\MailboxParameters as MailboxParametersRequest;
use JmapClient\Requests\Mail\MailboxQuery; use JmapClient\Requests\Mail\MailboxQuery;
@@ -23,16 +25,17 @@ use JmapClient\Requests\Mail\MailQuery;
use JmapClient\Requests\Mail\MailQueryChanges; use JmapClient\Requests\Mail\MailQueryChanges;
use JmapClient\Requests\Mail\MailSet; use JmapClient\Requests\Mail\MailSet;
use JmapClient\Requests\Mail\MailSubmissionSet; use JmapClient\Requests\Mail\MailSubmissionSet;
use JmapClient\Requests\RequestBundle;
use JmapClient\Responses\Mail\MailboxParameters as MailboxParametersResponse; use JmapClient\Responses\Mail\MailboxParameters as MailboxParametersResponse;
use JmapClient\Responses\Mail\MailPart;
use JmapClient\Responses\Mail\MailParameters as MailParametersResponse; use JmapClient\Responses\Mail\MailParameters as MailParametersResponse;
use JmapClient\Responses\ResponseException; use JmapClient\Responses\ResponseException;
use KTXF\Resource\BinaryResource;
use KTXF\Resource\Delta\Delta; use KTXF\Resource\Delta\Delta;
use KTXF\Resource\Delta\DeltaCollection; use KTXF\Resource\Delta\DeltaCollection;
use KTXF\Resource\Filter\Filter; use KTXF\Resource\Filter\Filter;
use KTXF\Resource\Filter\IFilter; use KTXF\Resource\Filter\IFilter;
use KTXF\Resource\Range\IRange; use KTXF\Resource\Range\IRange;
use KTXF\Resource\Range\IRangeTally;
use KTXF\Resource\Range\Range;
use KTXF\Resource\Range\RangeAnchorType; use KTXF\Resource\Range\RangeAnchorType;
use KTXF\Resource\Range\RangeTally; use KTXF\Resource\Range\RangeTally;
use KTXF\Resource\Sort\ISort; use KTXF\Resource\Sort\ISort;
@@ -493,103 +496,6 @@ class RemoteMailService {
return new RangeTally(); return new RangeTally();
} }
/**
* retrieve entity from remote storage
*
* @since Release 1.0.0
*/
public function entityFetch(string ...$identifiers): ?array {
// construct request
$r0 = new MailGet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
$r0->target(...$identifiers);
// select properties to return
$r0->property(...$this->defaultMailProperties);
$r0->bodyAll(true);
// transceive
$bundle = $this->dataStore->perform([$r0]);
// extract response
$response = $bundle->response(0);
// convert json objects to message objects
$list = [];
foreach ($response->objects() as $so) {
if (!$so instanceof MailParametersResponse) {
continue;
}
$id = $so->id();
$list[$id] = $so->parametersRaw();
$list[$id]['signature'] = $response->state();
}
// return message collection
return $list;
}
public function entityDownload(string $identifier, string|null $blobId = null): BinaryResource {
// construct request
$r0 = new MailGet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
$r0->target($identifier);
// select properties to return
$r0->property(...['id', 'blobId', 'bodyStructure']);
// transceive
$bundle = $this->dataStore->perform([$r0]);
// extract response
$response = $bundle->response(0);
$parameters = $response->object(0);
if (!$parameters instanceof MailParametersResponse) {
throw new Exception('Unexpected response type received from server.', 1);
}
if ($blobId === null) {
$blobId = $parameters->blob();
$filename = 'message.eml';
$mimeType = 'text/plain';
} else {
$walk = function (?MailPart $part) use (&$walk, $blobId): ?MailPart {
if ($part === null) {
return null;
}
if ($part->blob() === $blobId) {
return $part;
}
foreach ($part->parts() ?? [] as $subPart) {
$subPartResult = $walk($subPart);
if ($subPartResult !== null) {
return $subPartResult;
}
}
return null;
};
$part = $walk($parameters->bodyPartStructure());
$filename = $part->name() ?? 'file.bin';
$mimeType = $part->type() ?? 'application/octet-stream';
}
$streamResource = $this->dataStore->downloadStream($this->dataAccount, $blobId, $mimeType, $filename);
$stream = (function () use ($streamResource): \Generator {
try {
while (!$streamResource->eof()) {
$chunk = $streamResource->read(8192);
if ($chunk === '' && !$streamResource->eof()) {
throw new Exception('Unable to read from download stream.', 1);
}
if ($chunk !== '') {
yield $chunk;
}
}
} finally {
$streamResource->close();
}
})();
return new BinaryResource($filename, $mimeType, $stream);
}
/** /**
* check existence of entities in remote storage * check existence of entities in remote storage
* *
@@ -718,8 +624,34 @@ class RemoteMailService {
return $delta; return $delta;
} }
public function entityFresh(): MailParametersRequest { /**
return new MailParametersRequest(); * retrieve entity from remote storage
*
* @since Release 1.0.0
*/
public function entityFetch(string ...$identifiers): ?array {
// construct request
$r0 = new MailGet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
$r0->target(...$identifiers);
// select properties to return
$r0->property(...$this->defaultMailProperties);
$r0->bodyAll(true);
// transceive
$bundle = $this->dataStore->perform([$r0]);
// extract response
$response = $bundle->response(0);
// convert json objects to message objects
$list = [];
foreach ($response->objects() as $so) {
if (!$so instanceof MailParametersResponse) {
continue;
}
$id = $so->id();
$list[$id] = $so->parametersRaw();
$list[$id]['signature'] = $response->state();
}
// return message collection
return $list;
} }
/** /**
@@ -792,37 +724,6 @@ class RemoteMailService {
return null; return null;
} }
public function entityPatch(MailParametersRequest $properties, string ...$identifiers): ?array {
// construct request
$r0 = new MailSet($this->dataAccount);
foreach ($identifiers as $id) {
$r0->patch($id, $properties);
}
// transceive
$bundle = $this->dataStore->perform([$r0]);
// extract response
$response = $bundle->first();
// check for command error
if ($response instanceof ResponseException) {
if ($response->type() === 'unknownMethod') {
throw new JmapUnknownMethod($response->description(), 1);
} else {
throw new Exception($response->type() . ': ' . $response->description(), 1);
}
}
$results = [];
// check for success
foreach ($response->updateSuccesses() as $id => $data) {
$results[$id] = true;
}
// check for failure
foreach ($response->updateFailures() as $id => $data) {
$results[$id] = $data['type'] ?? 'unknownError';
}
return $results;
}
/** /**
* delete entities from remote storage * delete entities from remote storage
* *
@@ -860,6 +761,16 @@ class RemoteMailService {
return $results; return $results;
} }
/**
* copy entity in remote storage
*
* @since Release 1.0.0
*
*/
public function entityCopy(string $target, string ...$identifiers): array {
return [];
}
/** /**
* move entity in remote storage * move entity in remote storage
* *
@@ -897,16 +808,6 @@ class RemoteMailService {
return $results; return $results;
} }
/**
* copy entity in remote storage
*
* @since Release 1.0.0
*
*/
public function entityCopy(string $target, string ...$identifiers): array {
return [];
}
/** /**
* send entity * send entity
* *

282
package-lock.json generated
View File

@@ -242,9 +242,9 @@
} }
}, },
"node_modules/@oxc-project/types": { "node_modules/@oxc-project/types": {
"version": "0.132.0", "version": "0.130.0",
"resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.132.0.tgz", "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.130.0.tgz",
"integrity": "sha512-FESMOxil5Se014ui/Eq8fT5uHJo6nIRwH0PfJrZJXs6Gek3ZVFOrpUv3YIZT20m+extU98Hg1Ym72U58rlsxUQ==", "integrity": "sha512-ibD2usx9JRu7f5pu2tMKMI4cpA4NgXJQoYRP4pQ7Pxmn1l6k/53qWtQWZayhYy3X4QZkt90Ot+mJEaeXouio6Q==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"funding": { "funding": {
@@ -259,9 +259,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@rolldown/binding-android-arm64": { "node_modules/@rolldown/binding-android-arm64": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.1.tgz",
"integrity": "sha512-ZS4D1JPGn/MYQN/SYDWftIE/nVsM8j/AFOYEzAoOE2O3NktQOZru+/vYXGbR/qtdLdIfGCP0lcoJiYVzsEz+iQ==", "integrity": "sha512-fJI3I0r3C3Oj/zdBCpaCmBRZYf07xpaq4yCfDDoSFm+beWNzbIl26puW8RraUdugoJw/95zerNOn6jasAhzSmg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -276,9 +276,9 @@
} }
}, },
"node_modules/@rolldown/binding-darwin-arm64": { "node_modules/@rolldown/binding-darwin-arm64": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.1.tgz",
"integrity": "sha512-vdFA9+C/rekyGce7WqHs/xoT0ioZEWaOFyZLIV1mEeNFaFDUQrPIo8Vs2GvJ6eetb3rzDUtUBgzto3ExpXJB3w==", "integrity": "sha512-cKnAhWEsV7TPcA/5EAteDp6KcJZBQ2G+BqE7zayMMi7kMvwRsbv7WT9aOnn0WNl4SKEIf43vjS31iUPu80nzXg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -293,9 +293,9 @@
} }
}, },
"node_modules/@rolldown/binding-darwin-x64": { "node_modules/@rolldown/binding-darwin-x64": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.1.tgz",
"integrity": "sha512-BewSOwTHazv77DTYiAZXSqqKZ4KP/KonFisDMVU7PImxoWfB2aepnPhd2E4SWz3zDzYgDNbs6jBmTdgNnF02GA==", "integrity": "sha512-YKrVwQjIRBPo+5G/u03wGjbdy4q7pyzCe93DK9VJ7zkVmeg8LJ7GbgsiHWdR4xSoe4CAXRD7Bcjgbtr64bkXNg==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -310,9 +310,9 @@
} }
}, },
"node_modules/@rolldown/binding-freebsd-x64": { "node_modules/@rolldown/binding-freebsd-x64": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.1.tgz",
"integrity": "sha512-m41o7M0YWtUdqk61Tb+jnKb2rN++iRdIASlExkUoKfIAH30DOHCB8fVLzSUpbWHHU8esmEioY62PxzexE8MBuA==", "integrity": "sha512-z/oBsREo46SsFqBwYtFe0kpJeBijAT48O/WXLI4suiCLBkr03RTtTJMCzSdDd2znlh8VJizL09XVkQgk8IZonw==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -327,9 +327,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-arm-gnueabihf": { "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.1.tgz",
"integrity": "sha512-jcojB9H7W/jS29pMKWAK1N+fU99vXodHDTatS3b3y/XSOCiHo0kkA74pL3jJmkoQtYpOCxDvaKs1fo2Ij/1X5w==", "integrity": "sha512-ik8q7GM11zxvYxFc2PeDcT6TBvhCQMaUxfph/M5l9sKuTs/Sjg3L+Byw0F7w0ZVLBZmx30P+gG0ECzzN+MFcmQ==",
"cpu": [ "cpu": [
"arm" "arm"
], ],
@@ -344,9 +344,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-arm64-gnu": { "node_modules/@rolldown/binding-linux-arm64-gnu": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.1.tgz",
"integrity": "sha512-1jn6qDU5iiOgFgygDzKUuKP0maTi0/f1+sBLgvij/76C77Nm3ts6ufz9Bjg5q5dduxiUIxtq86JIoBvo1xQ4Ig==", "integrity": "sha512-QoSx2EkyrrdZ6kcyE8stqZ62t0Yra8Fs5ia9lOxJrh6TMQJK7gQKmscdTHf7pOXKREKrVwOtJcQG3qVSfc866A==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -361,9 +361,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-arm64-musl": { "node_modules/@rolldown/binding-linux-arm64-musl": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.1.tgz",
"integrity": "sha512-QVLO/czFMdoMFSqlX3bcswcJNm/23r+qoa/jgtmFc/qEp6/jXmIkDjF/XIo8dPfGaiwy1xfQn8o77L79GeXFgw==", "integrity": "sha512-uwNwFpwKeNiZawfAWBgg0VIztPTV3ihhh1vV334h9ivnNLorxnQMU6Fz8wG1Zb4Qh9LC1/MkcyT3YlDXG3Rsgg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -378,9 +378,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-ppc64-gnu": { "node_modules/@rolldown/binding-linux-ppc64-gnu": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.1.tgz",
"integrity": "sha512-hgO5Abm0w5UL6FEa2iFnZqo2KlK7TQ5QhV5x09hujBf7t5KzHQ1VmfPuTpqRy/rNlSxua3eWH374xxiVrP+lcA==", "integrity": "sha512-zY1bul7OWr7DFBiJ++wofXvnr8B45ce3QsQUhKrIhXsygAh7bTkwyeM1bi1a2g5C/yC/N8TZyGDEoMfm/l9mpg==",
"cpu": [ "cpu": [
"ppc64" "ppc64"
], ],
@@ -395,9 +395,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-s390x-gnu": { "node_modules/@rolldown/binding-linux-s390x-gnu": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.1.tgz",
"integrity": "sha512-fy8rXxuYEu602abC8MUNaPjYLIFzReOaEIEMKMUa0rFEUxNpVXhs15KSSQ4qlqSaM7B6rcj9rDZgADh/IGDzLQ==", "integrity": "sha512-0frlsT/f4Ft6I7SMESTKnF3cZsdicQn1dCMkF/jT9wDLE+gGoiQfv1nmT9e+s7s/fekvvy6tZM2jHvI2tkbJDQ==",
"cpu": [ "cpu": [
"s390x" "s390x"
], ],
@@ -412,9 +412,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-x64-gnu": { "node_modules/@rolldown/binding-linux-x64-gnu": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.1.tgz",
"integrity": "sha512-0+bOkiQ779+r1WpoHOWHqncvyySci0vKph+myNDYb+im6meJAzHQXay6oEgnkHuUGouM1LKTZwqKpBow6Kj7CQ==", "integrity": "sha512-XABVmGp9Tg0WspTVvwduTc4fpqy6JnAUrSQe6OuyqD/03nI7r0O9OWUkMIwFrjKAIqolvqoA4ZrJppgwE0Gxmw==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -429,9 +429,9 @@
} }
}, },
"node_modules/@rolldown/binding-linux-x64-musl": { "node_modules/@rolldown/binding-linux-x64-musl": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.1.tgz",
"integrity": "sha512-mjSkrzZK5Qsl0a9d1JgILOiuZOSDTVdKENcSXBoqbzSrspLR/4/IRVDo5wd2GgZjNss/viBFJdeq+j7qH2nypw==", "integrity": "sha512-bV4fzswuzVcKD90o/VM6QqKxnxlDq0g2BISDLNVmxrnhpv1DDbyPhCIjYfvzYLV+MvkKKnQt2Q6AO86SEBULUQ==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -446,9 +446,9 @@
} }
}, },
"node_modules/@rolldown/binding-openharmony-arm64": { "node_modules/@rolldown/binding-openharmony-arm64": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.1.tgz",
"integrity": "sha512-1v5vHasdfQAZoEHakBV72LIFAC9JjnymsiKxp+GEr/ma3+NJCPSaYK+qavInOovJkgwFrs7GccX2d6IgDA3Z5w==", "integrity": "sha512-/Mh0Zhq3OP7fVs0kcQHZP6lZEthMGTaSf8UBQYSFEZDWGXXlEC+nJ6EqenaK2t4LBXMe3A+K/G2BVXXdtOr4PQ==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -463,9 +463,9 @@
} }
}, },
"node_modules/@rolldown/binding-wasm32-wasi": { "node_modules/@rolldown/binding-wasm32-wasi": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.1.tgz",
"integrity": "sha512-mb1VobWn6NheziTk5/WEaR6AKVbrwT5sOi6C7zk3gy/pD1qtJfU1j4PgTo2NJnOtbL9Dl3Aeei8w9jJ7qC2jZQ==", "integrity": "sha512-+1xc9X45l8ufsBAm6Gjvx2qDRIY9lTVt0cgWNcJ+1gdhXvkbxePA60yRTwSTuXL09CMhyJmjpV7E3NoyxbqFQQ==",
"cpu": [ "cpu": [
"wasm32" "wasm32"
], ],
@@ -482,9 +482,9 @@
} }
}, },
"node_modules/@rolldown/binding-win32-arm64-msvc": { "node_modules/@rolldown/binding-win32-arm64-msvc": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.1.tgz",
"integrity": "sha512-SqKonF56vA/L2yHwHYcEp2P34URpOZ7d1fS635cTkpDnUtEGdUbhI6NzsPdqeSWvAAeGDrxjWjNmibDIdFf9/A==", "integrity": "sha512-1D+UqZdfnuR+Jy1GgMJwi85bD40H21uNmOPRWQhw4oRSuolZ/B5rixZ45DK2KXOTCvmVCecauWgEhbw8bI7tOw==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -499,9 +499,9 @@
} }
}, },
"node_modules/@rolldown/binding-win32-x64-msvc": { "node_modules/@rolldown/binding-win32-x64-msvc": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.1.tgz",
"integrity": "sha512-v7qRI7gXLRINcOGXt+7YmAZ6iFuyZVMIoXAxhd8oP+DR9dLfL9GfNIx7PLMxmhZdvq8waUJBQiWN9EKNy+TRBQ==", "integrity": "sha512-INAycaWuhlOK3wk4mRHGsdgwYWmd9cChdPdE9bwWmy6rn9VqVNYNFGhOdXrofXUxwHIncSiPNb8tNm8knDVIeQ==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -592,14 +592,14 @@
} }
}, },
"node_modules/@vitest/coverage-v8": { "node_modules/@vitest/coverage-v8": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.6.tgz",
"integrity": "sha512-qsYPeXc5Q9dFLd1i8Ap+Bx8sQgcp+rFVQo4R0dDsWNBzl26ldVF1qOO+RL24K7FDrR6pA+50XedRLSoSG24bVQ==", "integrity": "sha512-36l628fQ/9a/8ihy97eOtEnvWQEdqULQOJtcaxtoNq0G1w3Mxd4szSahOaMM9/NGyZ+hyKcMtIW/WIxq0XQViQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@bcoe/v8-coverage": "^1.0.2", "@bcoe/v8-coverage": "^1.0.2",
"@vitest/utils": "4.1.7", "@vitest/utils": "4.1.6",
"ast-v8-to-istanbul": "^1.0.0", "ast-v8-to-istanbul": "^1.0.0",
"istanbul-lib-coverage": "^3.2.2", "istanbul-lib-coverage": "^3.2.2",
"istanbul-lib-report": "^3.0.1", "istanbul-lib-report": "^3.0.1",
@@ -613,8 +613,8 @@
"url": "https://opencollective.com/vitest" "url": "https://opencollective.com/vitest"
}, },
"peerDependencies": { "peerDependencies": {
"@vitest/browser": "4.1.7", "@vitest/browser": "4.1.6",
"vitest": "4.1.7" "vitest": "4.1.6"
}, },
"peerDependenciesMeta": { "peerDependenciesMeta": {
"@vitest/browser": { "@vitest/browser": {
@@ -623,17 +623,17 @@
} }
}, },
"node_modules/@vitest/expect": { "node_modules/@vitest/expect": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.6.tgz",
"integrity": "sha512-1R+tw0ortHEbZDGMymm+pN7/AFQ/RkFFdtd7EN+VBpynKmLbP8A3rpEXdshBJ7+8hQ9zBJh/i1s0yKNtxAnU7w==", "integrity": "sha512-7EHDquPthALSV0jhhjgEW8FXaviMx7rSqu8W6oqCoAuOhKov814P99QDV1pxMA3QPv21YudvJngIhjrNI4opLg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@standard-schema/spec": "^1.1.0", "@standard-schema/spec": "^1.1.0",
"@types/chai": "^5.2.2", "@types/chai": "^5.2.2",
"@vitest/spy": "4.1.7", "@vitest/spy": "4.1.6",
"@vitest/utils": "4.1.7", "@vitest/utils": "4.1.6",
"chai": "^6.2.2", "chai": "^6.2.2",
"tinyrainbow": "^3.1.0" "tinyrainbow": "^3.1.0"
}, },
@@ -642,14 +642,14 @@
} }
}, },
"node_modules/@vitest/mocker": { "node_modules/@vitest/mocker": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.6.tgz",
"integrity": "sha512-vY7nuamKgfvpA1Koa3oYIw/k7D6kZnpGyNMZW8loow2bsBYla1TFdqTaXncWdRn4pgwNs+90RhnXhJScDwQeJA==", "integrity": "sha512-MCFc63czMjEInOlcY2cpQCvCN+KgbAn+60xu9cMgP4sKaLC5JNAKw7JH8QdAnoAC88hW1IiSNZ+GgVXlN1UcMQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@vitest/spy": "4.1.7", "@vitest/spy": "4.1.6",
"estree-walker": "^3.0.3", "estree-walker": "^3.0.3",
"magic-string": "^0.30.21" "magic-string": "^0.30.21"
}, },
@@ -681,9 +681,9 @@
} }
}, },
"node_modules/@vitest/pretty-format": { "node_modules/@vitest/pretty-format": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.6.tgz",
"integrity": "sha512-umgCarTOYQWIaDMvGDRZij+6b9oVeLIyJzfN+AS88e0ZOU3QTgNNSTtjQOpcvWr3np1N0j4WgZj+sb3oYBDscw==", "integrity": "sha512-h5SxD/IzNhZYnrSZRsUZQIC+vD0GY8cUvq0iwsmkFKixRCKLLWqCXa/FIQ4S1R+sI+PGoojkHsdNrbZiM9Qpgw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -694,14 +694,14 @@
} }
}, },
"node_modules/@vitest/runner": { "node_modules/@vitest/runner": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.6.tgz",
"integrity": "sha512-BapjmAQ2aI78WdMEfeUWivnfVzB+VPGwWRQcJE0OUq7qEeEcBsCSf+0T5iREBNE5nBb4wA5Ya0W6IA+sghdEFw==", "integrity": "sha512-nOPCmn2+yD0ZNmKdsXGv/UxMMWbMuKeD6GyYncNwdkYDxpQvrPSKYj2rWuDjC2Y4b6w6hjip5dBKFzEUuZe3vA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@vitest/utils": "4.1.7", "@vitest/utils": "4.1.6",
"pathe": "^2.0.3" "pathe": "^2.0.3"
}, },
"funding": { "funding": {
@@ -709,15 +709,15 @@
} }
}, },
"node_modules/@vitest/snapshot": { "node_modules/@vitest/snapshot": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.6.tgz",
"integrity": "sha512-ZacLzja+TmJeZ1h14xW2FB/WpeimUD3haBXQPyJqxvo8jQTmfeA8zv58mtjN2C7EHXZDYVcVYdYmAxjkWVvKCw==", "integrity": "sha512-YhsdE6xAVfTDmzjxL2ZDUvjj+ZsgyOKe+TdQzqkD72wIOmHka8NuGQ6NpTNZv9D2Z63fbwWKJPeVpEw4EQgYxw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@vitest/pretty-format": "4.1.7", "@vitest/pretty-format": "4.1.6",
"@vitest/utils": "4.1.7", "@vitest/utils": "4.1.6",
"magic-string": "^0.30.21", "magic-string": "^0.30.21",
"pathe": "^2.0.3" "pathe": "^2.0.3"
}, },
@@ -726,9 +726,9 @@
} }
}, },
"node_modules/@vitest/spy": { "node_modules/@vitest/spy": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.6.tgz",
"integrity": "sha512-kbkI5LMWakyuTIvs6fUJ5qdIVb1XVKsYJAT4OJ938cHMROYMSfmoQdZy0aaAnjbbc8F61vkoTqz/Az+/HiIu5Q==", "integrity": "sha512-JFKxMx6udhwKh/Ldo270e17QX710vgunMkuPAvXjHSvC6oqLWAHhVhjg/I71q0u0CBSErIODV1Kjv0FQNSWjdg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
@@ -737,13 +737,13 @@
} }
}, },
"node_modules/@vitest/ui": { "node_modules/@vitest/ui": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.1.6.tgz",
"integrity": "sha512-TP6utB2yX6rsJNVRo2qAlsi48i1YwFTrLV2tnTtWqJaYX7m4lRCCLirZBjU6xC5m0RsPHr+L2+N+eIPhgEzFfw==", "integrity": "sha512-wiu5em68DfGv/2HFvI1Njr7JI2CHcBlQvereSzVG8my53PRxjTNOCsD9VOkRKrsJBDHmyuXvosxWZw7T91a2mw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vitest/utils": "4.1.7", "@vitest/utils": "4.1.6",
"fflate": "^0.8.2", "fflate": "^0.8.2",
"flatted": "^3.4.2", "flatted": "^3.4.2",
"pathe": "^2.0.3", "pathe": "^2.0.3",
@@ -755,17 +755,17 @@
"url": "https://opencollective.com/vitest" "url": "https://opencollective.com/vitest"
}, },
"peerDependencies": { "peerDependencies": {
"vitest": "4.1.7" "vitest": "4.1.6"
} }
}, },
"node_modules/@vitest/utils": { "node_modules/@vitest/utils": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.7.tgz", "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.6.tgz",
"integrity": "sha512-T532WBu791cBxJlCl6SO+J14l81DQx6uQHm1bQbmCDY7nqlEIgkza/UFnSBNaUtSf41unldDFjdOBYEQC4b5Hw==", "integrity": "sha512-FxIY+U81R3LGKCxaHHFRQ5+g6/iRgGLmeHWdp2Amj4ljQRrEIWHmZyDfDYBRZlpyqA7qKxtS9DD1dhk8RnRIVQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vitest/pretty-format": "4.1.7", "@vitest/pretty-format": "4.1.6",
"convert-source-map": "^2.0.0", "convert-source-map": "^2.0.0",
"tinyrainbow": "^3.1.0" "tinyrainbow": "^3.1.0"
}, },
@@ -937,9 +937,9 @@
} }
}, },
"node_modules/@vue/language-core": { "node_modules/@vue/language-core": {
"version": "3.3.1", "version": "3.3.0",
"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.1.tgz", "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.0.tgz",
"integrity": "sha512-NP8g6V7x81NVOXbLupUvYY6i6LqUkjkVowe2epRedmpgaFCOdjgWHE/rQBvEJ4r7koAYODIjGeBWEdt6n7jYXQ==", "integrity": "sha512-EyUxq1b8Yoxk6hQ6X33BIRnfFLb9Rbm9w/8G8y6uMxlQu7CW7yy9JS/z54xSpIvBvVWX6Lt5v1aBGwmrqD4aJw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -1760,9 +1760,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/nanoid": { "node_modules/nanoid": {
"version": "3.3.12", "version": "3.3.11",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
"integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
"funding": [ "funding": [
{ {
"type": "github", "type": "github",
@@ -1867,9 +1867,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.5.15", "version": "8.5.14",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz",
"integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==", "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==",
"funding": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@@ -1886,7 +1886,7 @@
], ],
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"nanoid": "^3.3.12", "nanoid": "^3.3.11",
"picocolors": "^1.1.1", "picocolors": "^1.1.1",
"source-map-js": "^1.2.1" "source-map-js": "^1.2.1"
}, },
@@ -1930,13 +1930,13 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/rolldown": { "node_modules/rolldown": {
"version": "1.0.2", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.2.tgz", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.1.tgz",
"integrity": "sha512-oZx5zVDtVB44AW3eaifgDml1gWRDZGvjcfdxonE4swNPG98PrrXjaO/KrnUjzlMnztCCRVlUueA1kCXhARGk6g==", "integrity": "sha512-X0KQHljNnEkWNqqiz9zJrGunh1B0HgOxLXvnFpCOcadzcy5qohZ3tqMEUg00vncoRovXuK3ZqCT9KnnKzoInFQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@oxc-project/types": "=0.132.0", "@oxc-project/types": "=0.130.0",
"@rolldown/pluginutils": "^1.0.0" "@rolldown/pluginutils": "^1.0.0"
}, },
"bin": { "bin": {
@@ -1946,21 +1946,21 @@
"node": "^20.19.0 || >=22.12.0" "node": "^20.19.0 || >=22.12.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"@rolldown/binding-android-arm64": "1.0.2", "@rolldown/binding-android-arm64": "1.0.1",
"@rolldown/binding-darwin-arm64": "1.0.2", "@rolldown/binding-darwin-arm64": "1.0.1",
"@rolldown/binding-darwin-x64": "1.0.2", "@rolldown/binding-darwin-x64": "1.0.1",
"@rolldown/binding-freebsd-x64": "1.0.2", "@rolldown/binding-freebsd-x64": "1.0.1",
"@rolldown/binding-linux-arm-gnueabihf": "1.0.2", "@rolldown/binding-linux-arm-gnueabihf": "1.0.1",
"@rolldown/binding-linux-arm64-gnu": "1.0.2", "@rolldown/binding-linux-arm64-gnu": "1.0.1",
"@rolldown/binding-linux-arm64-musl": "1.0.2", "@rolldown/binding-linux-arm64-musl": "1.0.1",
"@rolldown/binding-linux-ppc64-gnu": "1.0.2", "@rolldown/binding-linux-ppc64-gnu": "1.0.1",
"@rolldown/binding-linux-s390x-gnu": "1.0.2", "@rolldown/binding-linux-s390x-gnu": "1.0.1",
"@rolldown/binding-linux-x64-gnu": "1.0.2", "@rolldown/binding-linux-x64-gnu": "1.0.1",
"@rolldown/binding-linux-x64-musl": "1.0.2", "@rolldown/binding-linux-x64-musl": "1.0.1",
"@rolldown/binding-openharmony-arm64": "1.0.2", "@rolldown/binding-openharmony-arm64": "1.0.1",
"@rolldown/binding-wasm32-wasi": "1.0.2", "@rolldown/binding-wasm32-wasi": "1.0.1",
"@rolldown/binding-win32-arm64-msvc": "1.0.2", "@rolldown/binding-win32-arm64-msvc": "1.0.1",
"@rolldown/binding-win32-x64-msvc": "1.0.2" "@rolldown/binding-win32-x64-msvc": "1.0.1"
} }
}, },
"node_modules/scule": { "node_modules/scule": {
@@ -2177,16 +2177,16 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "8.0.14", "version": "8.0.13",
"resolved": "https://registry.npmjs.org/vite/-/vite-8.0.14.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.13.tgz",
"integrity": "sha512-s4BJJ+5y1pYL6Otw51FHhVJQhPnuRinKig64g/1+EUNaJsd3gCKdD31IPFvswUgW9/60QT9oFHbZHbQK5imcxw==", "integrity": "sha512-MFtjBYgzmSxmgA4RAfjIyXWpGe1oALnjgUTzzV7QLx/TKxCzjtMH6Fd9/eVK+5Fg1qNoz5VAwsmMs/NofrmJvw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"lightningcss": "^1.32.0", "lightningcss": "^1.32.0",
"picomatch": "^4.0.4", "picomatch": "^4.0.4",
"postcss": "^8.5.15", "postcss": "^8.5.14",
"rolldown": "1.0.2", "rolldown": "1.0.1",
"tinyglobby": "^0.2.16" "tinyglobby": "^0.2.16"
}, },
"bin": { "bin": {
@@ -2255,20 +2255,20 @@
} }
}, },
"node_modules/vitest": { "node_modules/vitest": {
"version": "4.1.7", "version": "4.1.6",
"resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.7.tgz", "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.6.tgz",
"integrity": "sha512-flYyaFd2CgoCoU+0UKt3pxksgC+S02iTDN0n3LtqaMeXsI9SBcdNujc2k0DeFLzUn/0k538yNjOSdwgCqcrwJA==", "integrity": "sha512-6lvjbS3p9b4CrdCmguzbh2/4uoXhGE2q71R4OX5sqF9R1bo9Xd6fGrMAfvp5wnCzlBnFVdCOp6onuTQVbo8iUQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@vitest/expect": "4.1.7", "@vitest/expect": "4.1.6",
"@vitest/mocker": "4.1.7", "@vitest/mocker": "4.1.6",
"@vitest/pretty-format": "4.1.7", "@vitest/pretty-format": "4.1.6",
"@vitest/runner": "4.1.7", "@vitest/runner": "4.1.6",
"@vitest/snapshot": "4.1.7", "@vitest/snapshot": "4.1.6",
"@vitest/spy": "4.1.7", "@vitest/spy": "4.1.6",
"@vitest/utils": "4.1.7", "@vitest/utils": "4.1.6",
"es-module-lexer": "^2.0.0", "es-module-lexer": "^2.0.0",
"expect-type": "^1.3.0", "expect-type": "^1.3.0",
"magic-string": "^0.30.21", "magic-string": "^0.30.21",
@@ -2296,12 +2296,12 @@
"@edge-runtime/vm": "*", "@edge-runtime/vm": "*",
"@opentelemetry/api": "^1.9.0", "@opentelemetry/api": "^1.9.0",
"@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
"@vitest/browser-playwright": "4.1.7", "@vitest/browser-playwright": "4.1.6",
"@vitest/browser-preview": "4.1.7", "@vitest/browser-preview": "4.1.6",
"@vitest/browser-webdriverio": "4.1.7", "@vitest/browser-webdriverio": "4.1.6",
"@vitest/coverage-istanbul": "4.1.7", "@vitest/coverage-istanbul": "4.1.6",
"@vitest/coverage-v8": "4.1.7", "@vitest/coverage-v8": "4.1.6",
"@vitest/ui": "4.1.7", "@vitest/ui": "4.1.6",
"happy-dom": "*", "happy-dom": "*",
"jsdom": "*", "jsdom": "*",
"vite": "^6.0.0 || ^7.0.0 || ^8.0.0" "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -2419,14 +2419,14 @@
} }
}, },
"node_modules/vue-tsc": { "node_modules/vue-tsc": {
"version": "3.3.1", "version": "3.3.0",
"resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.3.1.tgz", "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.3.0.tgz",
"integrity": "sha512-webBP3jhlxzhELZ2g+11KJ6pg5OVY1xWhWrj7N/yQMi1CrtxJnW+tUACyRVeDK0cQNLP2Va5HNYK8pe+7c+msw==", "integrity": "sha512-kY8RcoTOENASi0P1GLPvJgA2+hoGF+t8We1UGgmnAb1r/GjTUMSE3zz+WGfjPORZNnBHdAt67sVPhBLXWunkeg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@volar/typescript": "2.4.28", "@volar/typescript": "2.4.28",
"@vue/language-core": "3.3.1" "@vue/language-core": "3.3.0"
}, },
"bin": { "bin": {
"vue-tsc": "bin/vue-tsc.js" "vue-tsc": "bin/vue-tsc.js"