headers);
+
+ /**
+ * Generate a token for the given entity file. This token can be used to grant temporary access to the file without requiring authentication.
+ *
+ * @param entityFile entity file
+ * @return token
+ */
+ String generateToken(EntityFile entityFile);
+
+
+}
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/StoredEntityFile.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/StoredEntityFile.java
index 5040a075..79667dac 100644
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/StoredEntityFile.java
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/StoredEntityFile.java
@@ -20,41 +20,66 @@
import java.io.File;
import java.io.Serializable;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+import tools.dynamia.io.VirtualFile;
import tools.dynamia.modules.entityfile.domain.EntityFile;
public abstract class StoredEntityFile implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 421213041955145817L;
- private EntityFile entityFile;
- private String url;
- private File realFile;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 421213041955145817L;
+ private EntityFile entityFile;
+ private String url;
+ private File realFile;
- public StoredEntityFile(EntityFile entityFile, String url, File realFile) {
- super();
- this.entityFile = entityFile;
- this.url = url;
- this.realFile = realFile;
- }
+ public StoredEntityFile(EntityFile entityFile, String url, File realFile) {
+ super();
+ this.entityFile = entityFile;
+ this.url = url;
+ this.realFile = realFile;
+ }
- public EntityFile getEntityFile() {
- return entityFile;
- }
+ public EntityFile getEntityFile() {
+ return entityFile;
+ }
- public String getUrl() {
- return url;
- }
+ public String getUrl() {
+ return url;
+ }
- public String getThumbnailUrl() {
- return getThumbnailUrl(200, 200);
- }
+ public String getThumbnailUrl() {
+ return getThumbnailUrl(200, 200);
+ }
- public abstract String getThumbnailUrl(int width, int height);
+ public abstract String getThumbnailUrl(int width, int height);
- public File getRealFile() {
- return realFile;
- }
+ public File getRealFile() {
+ return realFile;
+ }
+ public File getThumbnailFile(int width, int height) {
+ return realFile;
+ }
+
+ public Resource toResource() {
+ if (realFile != null) {
+ if (realFile.exists() && realFile.isFile()) {
+ return new FileSystemResource(realFile);
+ }
+ }
+ return null;
+ }
+
+ public Resource toThumbnailResource(int width, int height) {
+ File thumbnailFile = getThumbnailFile(width, height);
+ if (thumbnailFile != null) {
+ if (thumbnailFile.exists() && thumbnailFile.isFile()) {
+ return new FileSystemResource(thumbnailFile);
+ }
+ }
+ return null;
+ }
}
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/UploadedFileInfo.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/UploadedFileInfo.java
index fd5d101c..41517872 100644
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/UploadedFileInfo.java
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/UploadedFileInfo.java
@@ -55,6 +55,11 @@ public UploadedFileInfo(FileInfo info) {
this.fullName = info.getName();
this.length = info.getFile().length();
this.source = info.getFile();
+ try {
+ this.contentType = Files.probeContentType(info.getFile().toPath());
+ } catch (IOException e) {
+
+ }
}
public UploadedFileInfo(Path path) {
@@ -83,6 +88,10 @@ public UploadedFileInfo(String fullName, String contentType, InputStream inputSt
this.source = inputStream;
}
+ public void detectContentType() {
+
+ }
+
public String getStoredFileName() {
return storedFileName;
}
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/EntityFileStorageController.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/EntityFileStorageController.java
new file mode 100644
index 00000000..cd32e128
--- /dev/null
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/EntityFileStorageController.java
@@ -0,0 +1,790 @@
+package tools.dynamia.modules.entityfile.controller;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.jspecify.annotations.NonNull;
+import org.springframework.core.io.Resource;
+import org.springframework.http.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import tools.dynamia.commons.MapBuilder;
+import tools.dynamia.domain.services.CrudService;
+import tools.dynamia.domain.util.DomainUtils;
+import tools.dynamia.integration.Containers;
+import tools.dynamia.integration.sterotypes.Controller;
+import tools.dynamia.modules.entityfile.UploadedFileInfo;
+import tools.dynamia.modules.entityfile.EntityFileAccountProvider;
+import tools.dynamia.modules.entityfile.EntityFileSecurityProvider;
+import tools.dynamia.modules.entityfile.domain.EntityFile;
+import tools.dynamia.modules.entityfile.enums.EntityFileType;
+import tools.dynamia.modules.entityfile.service.EntityFileService;
+import tools.dynamia.web.util.HttpUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.Serializable;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import static tools.dynamia.modules.entityfile.local.LocalEntityFileStorageHandler.getParam;
+import static tools.dynamia.modules.entityfile.local.LocalEntityFileStorageHandler.isThumbnail;
+
+/**
+ * Web controller responsible for exporting, downloading and uploading {@link EntityFile} resources.
+ *
+ * In addition to read/download operations, this controller exposes upload endpoints for both
+ * {@code multipart/form-data} and JSON payloads containing Base64 file content. Upload requests may
+ * optionally be associated with an existing domain entity using its fully qualified class name and ID.
+ */
+@Controller
+public class EntityFileStorageController {
+
+ private final EntityFileService entityFileService;
+ private final CrudService crudService;
+
+ /**
+ * Creates a new controller instance.
+ *
+ * @param entityFileService service used to create, resolve and download entity files
+ * @param crudService service used to resolve target entities dynamically by class name and ID
+ */
+ public EntityFileStorageController(EntityFileService entityFileService, CrudService crudService) {
+ this.entityFileService = entityFileService;
+ this.crudService = crudService;
+ }
+
+ /**
+ * Exports the main metadata of a stored file, including a public or tokenized URL when applicable.
+ *
+ * @param uuid unique file identifier
+ * @param response current HTTP response
+ * @param request current HTTP request
+ * @return a JSON payload with basic file metadata or {@code 404} when the file cannot be resolved
+ */
+ @GetMapping(value = "/api/storage/{uuid}/export", produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity> export(@PathVariable String uuid, HttpServletResponse response, HttpServletRequest request) {
+ var entityFile = entityFileService.getEntityFile(uuid);
+ if (entityFile == null) {
+ return ResponseEntity.notFound().build();
+ }
+
+ if (!isSameAccount(entityFile)) {
+ return ResponseEntity.notFound().build();
+ }
+
+ return ResponseEntity.ok(MapBuilder.put(
+ "name", entityFile.getName(),
+ "id", entityFile.getId(),
+ "uuid", entityFile.getUuid(),
+ "description", entityFile.getDescription(),
+ "size", entityFile.getSize(),
+ "version", entityFile.currentVersion(),
+ "url", buildPublicURL(entityFile)
+ )
+ );
+ }
+
+ /**
+ * Uploads a file using {@code multipart/form-data}.
+ *
+ * The uploaded file can optionally be linked to an existing entity by providing both
+ * {@code className} and {@code entityId}. When {@code parentUuid} is provided, the new file is created
+ * under the referenced directory/file tree.
+ *
+ * @param file multipart file content
+ * @param className fully qualified target entity class name
+ * @param entityId target entity identifier
+ * @param description optional file description
+ * @param shared whether the file should be publicly shared
+ * @param subfolder optional logical subfolder
+ * @param storedFileName optional physical stored file name override
+ * @param parentUuid optional parent entity file UUID
+ * @return the created entity file metadata or an error response describing the validation failure
+ */
+ @PostMapping(value = "/api/storage/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity> uploadMultipart(@RequestParam("file") MultipartFile file,
+ @RequestParam(required = false) String className,
+ @RequestParam(required = false) String entityId,
+ @RequestParam(required = false) String description,
+ @RequestParam(required = false, defaultValue = "false") boolean shared,
+ @RequestParam(required = false) String subfolder,
+ @RequestParam(required = false) String storedFileName,
+ @RequestParam(required = false) String parentUuid) {
+
+ if (file == null || file.isEmpty()) {
+ return error(HttpStatus.BAD_REQUEST, "File is required");
+ }
+
+ var fileName = firstText(file.getOriginalFilename(), file.getName());
+ if (!hasText(fileName)) {
+ return error(HttpStatus.BAD_REQUEST, "Uploaded file name is required");
+ }
+
+ try {
+ UploadedFileInfo info = new UploadedFileInfo(fileName, file.getContentType(), file.getInputStream());
+ info.setLength(file.getSize());
+ info.setShared(shared);
+ info.setSubfolder(subfolder);
+ info.setStoredFileName(normalizeStoredFileName(storedFileName, fileName));
+ return saveUpload(info, description, className, entityId, parentUuid);
+ } catch (Exception e) {
+ return error(HttpStatus.INTERNAL_SERVER_ERROR, "Error reading uploaded file: " + e.getMessage());
+ }
+ }
+
+ /**
+ * Uploads a file using a JSON payload that contains Base64-encoded content.
+ *
+ * The request supports raw Base64 content as well as full data URI values. As with multipart upload,
+ * the file can optionally be attached to an existing entity or nested under an existing parent UUID.
+ *
+ * @param request JSON request containing file metadata and Base64 content
+ * @return the created entity file metadata or an error response when the payload is invalid
+ */
+ @PostMapping(value = "/api/storage/upload-base64", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity> uploadBase64(@RequestBody Base64UploadRequest request) {
+ if (request == null) {
+ return error(HttpStatus.BAD_REQUEST, "Request body is required");
+ }
+
+ var base64Content = firstText(request.getBase64(), request.getData());
+ if (!hasText(base64Content)) {
+ return error(HttpStatus.BAD_REQUEST, "Base64 payload is required");
+ }
+
+ var fileName = request.getResolvedFileName();
+ if (!hasText(fileName)) {
+ return error(HttpStatus.BAD_REQUEST, "fileName is required");
+ }
+
+ try {
+ String contentType = request.getContentType();
+ String normalizedBase64 = base64Content.trim();
+ if (normalizedBase64.startsWith("data:")) {
+ int commaIndex = normalizedBase64.indexOf(',');
+ if (commaIndex < 0) {
+ return error(HttpStatus.BAD_REQUEST, "Invalid data URI payload");
+ }
+
+ if (!hasText(contentType)) {
+ String meta = normalizedBase64.substring(5, commaIndex);
+ int separator = meta.indexOf(';');
+ contentType = separator > -1 ? meta.substring(0, separator) : meta;
+ }
+ normalizedBase64 = normalizedBase64.substring(commaIndex + 1);
+ }
+
+ byte[] data = Base64.getMimeDecoder().decode(normalizedBase64);
+ UploadedFileInfo info = new UploadedFileInfo(fileName, contentType, new ByteArrayInputStream(data));
+ info.setLength(data.length);
+ info.setShared(Boolean.TRUE.equals(request.getShared()));
+ info.setSubfolder(request.getSubfolder());
+ info.setStoredFileName(normalizeStoredFileName(request.getStoredFileName(), fileName));
+ return saveUpload(info, request.getDescription(), request.getClassName(), request.getEntityId(), request.getParentUuid());
+ } catch (IllegalArgumentException e) {
+ return error(HttpStatus.BAD_REQUEST, "Invalid base64 payload");
+ } catch (Exception e) {
+ return error(HttpStatus.INTERNAL_SERVER_ERROR, "Error processing base64 upload: " + e.getMessage());
+ }
+ }
+
+ /**
+ * Streams a stored entity file or its thumbnail representation to the client.
+ *
+ * @param uuid unique file identifier
+ * @param file path placeholder containing the requested file name
+ * @param request current HTTP request
+ * @return the resolved resource stream or {@code 404}/{@code 403} when access is not allowed
+ */
+ @GetMapping(value = "/storage/{uuid}/{file}")
+ public ResponseEntity get(@PathVariable("uuid") String uuid, @PathVariable String file, HttpServletRequest request) {
+ var entityFile = entityFileService.getEntityFile(uuid);
+ if (entityFile == null) {
+ return ResponseEntity.notFound().build();
+ }
+
+ if (!isSameAccount(entityFile)) {
+ return ResponseEntity.notFound().build();
+ }
+
+ if (!entityFile.isShared()) {
+ EntityFileSecurityProvider securityProvider = Containers.get().findObject(EntityFileSecurityProvider.class);
+
+ Map params = HttpUtils.loadParams(request);
+ Map headers = HttpUtils.loadHeaders(request);
+ if (securityProvider != null && !securityProvider.canAccess(entityFile, params, headers)) {
+ return ResponseEntity.status(HttpStatus.FORBIDDEN)
+ .build();
+ }
+ }
+
+ Resource resource = null;
+ var storedEntityFile = entityFile.getStoredEntityFile();
+ var etag = "v" + entityFile.currentVersion();
+
+ if (entityFile.getType() == EntityFileType.IMAGE && isThumbnail(request)) {
+ String w = getParam(request, "w", "200");
+ String h = getParam(request, "h", "200");
+ etag += "-thumb-" + w + "x" + h;
+ resource = storedEntityFile.toThumbnailResource(safeSize(w, 200), safeSize(h, 200));
+ } else {
+ resource = storedEntityFile.toResource();
+ }
+
+
+ if (resource != null && resource.exists() && resource.isReadable()) {
+ var contentType = getMediaType(entityFile);
+
+ CacheControl cacheControl;
+ if (entityFile.isShared()) {
+ cacheControl = CacheControl
+ .maxAge(365, TimeUnit.DAYS)
+ .cachePublic()
+ .immutable();
+ } else {
+ cacheControl = CacheControl
+ .maxAge(365, TimeUnit.DAYS)
+ .cachePrivate()
+ .immutable();
+ }
+
+ String ifNoneMatch = request.getHeader(HttpHeaders.IF_NONE_MATCH);
+
+ if (etag.equals(ifNoneMatch)) {
+ return ResponseEntity
+ .status(HttpStatus.NOT_MODIFIED)
+ .eTag(etag)
+ .cacheControl(cacheControl)
+ .build();
+ }
+
+ return ResponseEntity.ok()
+ .contentType(contentType)
+ .cacheControl(cacheControl)
+ .header(HttpHeaders.ETAG, etag)
+ .body(resource);
+ } else {
+ return ResponseEntity.notFound().build();
+ }
+ }
+
+ /**
+ * Persists the uploaded file after resolving optional parent and target entity references.
+ *
+ * @param fileInfo uploaded file information wrapper
+ * @param description optional file description
+ * @param className fully qualified target entity class name
+ * @param entityId target entity identifier
+ * @param parentUuid optional parent entity file UUID
+ * @return a {@code 201 Created} response containing the created file metadata
+ */
+ private ResponseEntity> saveUpload(UploadedFileInfo fileInfo, String description, String className, String entityId, String parentUuid) {
+ try {
+ EntityFile parent = resolveParent(parentUuid);
+ Object targetEntity = resolveTargetEntity(className, entityId, parent);
+
+ if (parent != null) {
+ fileInfo.setParent(parent);
+ }
+
+ EntityFile entityFile;
+ if (targetEntity != null) {
+ entityFile = entityFileService.createEntityFile(fileInfo, targetEntity, description);
+ } else {
+ entityFile = entityFileService.createTemporalEntityFile(fileInfo);
+ }
+
+ return ResponseEntity.status(HttpStatus.CREATED).body(buildUploadResponse(entityFile));
+ } catch (UploadRequestException e) {
+ return error(e.getStatus(), e.getMessage());
+ } catch (Exception e) {
+ return error(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage());
+ }
+ }
+
+ /**
+ * Resolves a parent {@link EntityFile} by UUID and validates account ownership.
+ *
+ * @param parentUuid optional parent UUID received from the client
+ * @return the resolved parent file or {@code null} when no UUID was provided
+ */
+ private EntityFile resolveParent(String parentUuid) {
+ if (!hasText(parentUuid)) {
+ return null;
+ }
+
+ EntityFile parent = entityFileService.getEntityFile(parentUuid.trim());
+ if (parent == null || !isSameAccount(parent)) {
+ throw new UploadRequestException(HttpStatus.NOT_FOUND, "Parent entity file not found: " + parentUuid);
+ }
+ return parent;
+ }
+
+ /**
+ * Resolves the target domain entity for the upload request.
+ *
+ * The entity may come directly from {@code className/entityId} parameters or be inferred from the
+ * provided parent file when it already belongs to a persistent entity.
+ *
+ * @param className fully qualified target entity class name
+ * @param entityId target entity identifier
+ * @param parent optional parent entity file
+ * @return the resolved entity instance or {@code null} when the upload should remain temporal
+ */
+ private Object resolveTargetEntity(String className, String entityId, EntityFile parent) {
+ boolean hasClassName = hasText(className);
+ boolean hasEntityId = hasText(entityId);
+
+ if (hasClassName != hasEntityId) {
+ throw new UploadRequestException(HttpStatus.BAD_REQUEST, "className and entityId must be provided together");
+ }
+
+ Object target = null;
+ if (hasClassName) {
+ target = loadEntity(className.trim(), entityId.trim());
+ } else if (parent != null) {
+ if ("temporal".equalsIgnoreCase(parent.getTargetEntity())) {
+ throw new UploadRequestException(HttpStatus.BAD_REQUEST,
+ "parentUuid belongs to a temporal entity. Please provide className and entityId");
+ }
+ String parentEntityId = parent.getTargetEntityId() != null ? String.valueOf(parent.getTargetEntityId()) : parent.getTargetEntitySId();
+ target = loadEntity(parent.getTargetEntity(), parentEntityId);
+ }
+
+ if (parent != null && target != null && !matchesParentTarget(parent, target)) {
+ throw new UploadRequestException(HttpStatus.BAD_REQUEST,
+ "Provided className/entityId does not match the parentUuid target entity");
+ }
+
+ return target;
+ }
+
+ /**
+ * Loads a persistent entity by its fully qualified class name and string identifier.
+ *
+ * @param className fully qualified entity class name
+ * @param entityId entity identifier as received from the request
+ * @return the resolved entity instance
+ */
+ private Object loadEntity(String className, String entityId) {
+ if (!hasText(className) || !hasText(entityId)) {
+ throw new UploadRequestException(HttpStatus.BAD_REQUEST, "className and entityId are required");
+ }
+
+ try {
+ Class entityClass = Class.forName(className);
+ Object entity = findEntity(entityClass, entityId);
+ if (entity == null) {
+ throw new UploadRequestException(HttpStatus.NOT_FOUND,
+ "Entity not found: " + className + " with id " + entityId);
+ }
+ return entity;
+ } catch (ClassNotFoundException e) {
+ throw new UploadRequestException(HttpStatus.BAD_REQUEST, "Class not found: " + className);
+ }
+ }
+
+ /**
+ * Attempts to find an entity using either a numeric ID or a string-based identifier.
+ *
+ * @param entityClass target entity class
+ * @param entityId entity identifier in string form
+ * @return the resolved entity instance, or {@code null} when no match exists
+ */
+ private Object findEntity(Class entityClass, String entityId) {
+ if (isNumeric(entityId)) {
+ Object entity = crudService.find((Class) entityClass, Long.valueOf(entityId));
+ if (entity != null) {
+ return entity;
+ }
+ }
+
+ return crudService.find((Class) entityClass, entityId);
+ }
+
+ /**
+ * Verifies that the resolved target entity matches the same target metadata stored in the parent file.
+ *
+ * @param parent parent entity file
+ * @param target resolved target domain entity
+ * @return {@code true} when both point to the same entity, {@code false} otherwise
+ */
+ private boolean matchesParentTarget(EntityFile parent, Object target) {
+ if (!Objects.equals(parent.getTargetEntity(), target.getClass().getName())) {
+ return false;
+ }
+
+ Serializable targetId = DomainUtils.findEntityId(target);
+ if (targetId == null) {
+ return false;
+ }
+
+ if (targetId instanceof Long longId) {
+ return Objects.equals(parent.getTargetEntityId(), longId);
+ }
+
+ return Objects.equals(parent.getTargetEntitySId(), targetId.toString());
+ }
+
+ /**
+ * Builds the JSON response body returned after a successful upload.
+ *
+ * @param entityFile newly created entity file
+ * @return a map containing the most relevant metadata for API clients
+ */
+ private Map buildUploadResponse(EntityFile entityFile) {
+ Map response = new LinkedHashMap<>();
+ response.put("id", entityFile.getId());
+ response.put("uuid", entityFile.getUuid());
+ response.put("name", entityFile.getName());
+ response.put("description", entityFile.getDescription());
+ response.put("contentType", entityFile.getContentType());
+ response.put("size", entityFile.getSize());
+ response.put("shared", entityFile.isShared());
+ response.put("subfolder", entityFile.getSubfolder());
+ response.put("storedFileName", entityFile.getStoredFileName());
+ response.put("targetEntity", entityFile.getTargetEntity());
+ response.put("targetEntityId", entityFile.getTargetEntityId());
+ response.put("targetEntitySId", entityFile.getTargetEntitySId());
+ response.put("parentId", entityFile.getParent() != null ? entityFile.getParent().getId() : null);
+ response.put("version", entityFile.currentVersion());
+ response.put("url", entityFile.toURL());
+ response.put("valid", true);
+ return response;
+ }
+
+ /**
+ * Builds the most appropriate public URL for an entity file.
+ *
+ * When the file is not shared, a security token is appended if a security provider is available.
+ *
+ * @param entityFile entity file to expose
+ * @return resolved public URL
+ */
+ private String buildPublicURL(EntityFile entityFile) {
+ String url = entityFile.toURL();
+ if (!entityFile.isShared()) {
+ EntityFileSecurityProvider securityProvider = Containers.get().findObject(EntityFileSecurityProvider.class);
+ if (securityProvider != null) {
+ String token = securityProvider.generateToken(entityFile);
+ url = entityFile.toURL() + "?token=" + token;
+ }
+ }
+ return url;
+ }
+
+ /**
+ * Creates a standardized JSON error response for upload operations.
+ *
+ * @param status HTTP status to return
+ * @param message human-readable error description
+ * @return response entity containing the error payload
+ */
+ private ResponseEntity> error(HttpStatus status, String message) {
+ return ResponseEntity.status(status)
+ .header("X-Error-Message", message)
+ .body(Map.of("error", message, "valid", false));
+ }
+
+ /**
+ * Checks whether the provided text contains non-blank content.
+ *
+ * @param value text to evaluate
+ * @return {@code true} when the value contains visible characters
+ */
+ private boolean hasText(String value) {
+ return value != null && !value.isBlank();
+ }
+
+ /**
+ * Returns the first non-blank value from the provided list.
+ *
+ * @param values candidate values
+ * @return the first non-blank value, trimmed, or {@code null} when none is available
+ */
+ private String firstText(String... values) {
+ if (values == null) {
+ return null;
+ }
+
+ for (String value : values) {
+ if (hasText(value)) {
+ return value.trim();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Resolves the final stored file name override.
+ *
+ * The special value {@code real} means the original file name should be used.
+ *
+ * @param storedFileName requested stored file name
+ * @param fileName original file name
+ * @return normalized stored file name or {@code null} when not provided
+ */
+ private String normalizeStoredFileName(String storedFileName, String fileName) {
+ if (!hasText(storedFileName)) {
+ return null;
+ }
+ if ("real".equalsIgnoreCase(storedFileName.trim())) {
+ return fileName;
+ }
+ return storedFileName.trim();
+ }
+
+ /**
+ * Determines whether the provided text can be parsed as a {@link Long} value.
+ *
+ * @param value text to evaluate
+ * @return {@code true} when the value is numeric
+ */
+ private boolean isNumeric(String value) {
+ if (!hasText(value)) {
+ return false;
+ }
+
+ try {
+ Long.parseLong(value.trim());
+ return true;
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ }
+
+ /**
+ * Verifies whether the file belongs to the current account when account scoping is enabled.
+ *
+ * @param entityFile file to evaluate
+ * @return {@code true} when the file can be accessed from the current account context
+ */
+ private boolean isSameAccount(EntityFile entityFile) {
+ EntityFileAccountProvider accountProvider = Containers.get().findObject(EntityFileAccountProvider.class);
+ if (accountProvider != null) {
+ if (entityFile.getAccountId() != null) {
+ return entityFile.getAccountId().equals(accountProvider.getAccountId());
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Resolves the media type for the requested file.
+ *
+ * @param entityFile file whose media type should be inferred
+ * @return detected media type or {@link MediaType#APPLICATION_OCTET_STREAM} as fallback
+ */
+ private static @NonNull MediaType getMediaType(EntityFile entityFile) {
+ var contentType = MediaType.APPLICATION_OCTET_STREAM;
+ try {
+
+ if (entityFile.getContentType() != null) {
+ contentType = MediaType.parseMediaType(entityFile.getContentType());
+ } else {
+ contentType = switch (entityFile.getExtension().toLowerCase()) {
+ case "jpg", "jpeg" -> MediaType.IMAGE_JPEG;
+ case "png" -> MediaType.IMAGE_PNG;
+ case "gif" -> MediaType.IMAGE_GIF;
+ case "pdf" -> MediaType.APPLICATION_PDF;
+ case "doc" -> MediaType.TEXT_HTML;
+ case "docx" -> MediaType.TEXT_XML;
+ case "xlsx" -> MediaType.TEXT_XML;
+ case "xls" -> MediaType.TEXT_XML;
+ case "pptx" -> MediaType.TEXT_XML;
+ case "ppt" -> MediaType.TEXT_XML;
+ case "txt" -> MediaType.TEXT_PLAIN;
+ case "html" -> MediaType.TEXT_HTML;
+ case "json" -> MediaType.APPLICATION_JSON;
+ default -> MediaType.APPLICATION_OCTET_STREAM;
+ };
+ }
+
+ } catch (Exception e) {
+
+ }
+ return contentType;
+ }
+
+ /**
+ * Parses and clamps thumbnail dimensions to a safe range.
+ *
+ * @param value requested size value
+ * @param def fallback size when parsing fails
+ * @return a value between 1 and 2000
+ */
+ private int safeSize(String value, int def) {
+ try {
+ return Math.min(Math.max(Integer.parseInt(value), 1), 2000);
+ } catch (Exception e) {
+ return def;
+ }
+ }
+
+ /**
+ * JSON request payload used by the Base64 upload endpoint.
+ *
+ * Supports both {@code fileName} and {@code name}, and both {@code base64} and {@code data}, in order
+ * to simplify integration with different clients.
+ */
+ public static class Base64UploadRequest {
+
+ private String fileName;
+ private String name;
+ private String contentType;
+ private String base64;
+ private String data;
+ private String className;
+ private String entityId;
+ private String description;
+ private Boolean shared;
+ private String subfolder;
+ private String storedFileName;
+ private String parentUuid;
+
+ /**
+ * Resolves the effective file name using the first available non-blank field.
+ *
+ * @return resolved file name or {@code null} when neither field is present
+ */
+ public String getResolvedFileName() {
+ if (fileName != null && !fileName.isBlank()) {
+ return fileName.trim();
+ }
+ if (name != null && !name.isBlank()) {
+ return name.trim();
+ }
+ return null;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public String getBase64() {
+ return base64;
+ }
+
+ public void setBase64(String base64) {
+ this.base64 = base64;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+
+ public String getEntityId() {
+ return entityId;
+ }
+
+ public void setEntityId(String entityId) {
+ this.entityId = entityId;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Boolean getShared() {
+ return shared;
+ }
+
+ public void setShared(Boolean shared) {
+ this.shared = shared;
+ }
+
+ public String getSubfolder() {
+ return subfolder;
+ }
+
+ public void setSubfolder(String subfolder) {
+ this.subfolder = subfolder;
+ }
+
+ public String getStoredFileName() {
+ return storedFileName;
+ }
+
+ public void setStoredFileName(String storedFileName) {
+ this.storedFileName = storedFileName;
+ }
+
+ public String getParentUuid() {
+ return parentUuid;
+ }
+
+ public void setParentUuid(String parentUuid) {
+ this.parentUuid = parentUuid;
+ }
+ }
+
+ /**
+ * Internal exception used to abort upload processing with a controlled HTTP status code.
+ */
+ private static class UploadRequestException extends RuntimeException {
+
+ private final HttpStatus status;
+
+ /**
+ * Creates a new upload request exception.
+ *
+ * @param status HTTP status associated with the failure
+ * @param message validation or processing error description
+ */
+ private UploadRequestException(HttpStatus status, String message) {
+ super(message);
+ this.status = status;
+ }
+
+ /**
+ * Returns the HTTP status associated with this failure.
+ *
+ * @return failure status code
+ */
+ public HttpStatus getStatus() {
+ return status;
+ }
+ }
+}
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/LocalEntityFileStorageController.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/LocalEntityFileStorageController.java
deleted file mode 100644
index 7b9fb793..00000000
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/LocalEntityFileStorageController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package tools.dynamia.modules.entityfile.controller;
-
-import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
-import tools.dynamia.integration.sterotypes.Controller;
-import tools.dynamia.modules.entityfile.local.LocalEntityFileStorageHandler;
-
-@Controller
-public class LocalEntityFileStorageController {
-
- private final LocalEntityFileStorageHandler handler;
-
- public LocalEntityFileStorageController(LocalEntityFileStorageHandler handler) {
- this.handler = handler;
- }
-
- @GetMapping(value = "/storage/{file}")
- public ResponseEntity get(@PathVariable String file, @RequestParam("uuid") String uuid, HttpServletRequest request) {
- var resource = handler.getResource(file, uuid, request);
- if (resource != null && resource.exists() && resource.isReadable()) {
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"")
- .body(resource);
- } else {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
- }
-}
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/domain/EntityFile.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/domain/EntityFile.java
index f8f5dbdc..e61b5744 100644
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/domain/EntityFile.java
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/domain/EntityFile.java
@@ -28,6 +28,7 @@
import tools.dynamia.modules.entityfile.StoredEntityFile;
import tools.dynamia.modules.entityfile.domain.enums.EntityFileState;
import tools.dynamia.modules.entityfile.enums.EntityFileType;
+import tools.dynamia.modules.entityfile.local.LocalEntityFileStorage;
import tools.dynamia.modules.entityfile.service.EntityFileService;
import jakarta.persistence.*;
@@ -273,7 +274,28 @@ public String toURL() {
if (remoteURL != null && !remoteURL.isBlank()) {
return remoteURL;
}
- return getStoredEntityFile().getUrl();
+ LocalEntityFileStorage storage = Containers.get().findObject(LocalEntityFileStorage.class);
+ return storage.generateURL(this);
+ }
+
+ public String toThumbnailURL( int w, int h) {
+ String url = toURL();
+ return url+"?w="+w+"&h="+h;
+ }
+
+ @Transient
+ public String getUrl(){
+ return toURL();
+ }
+
+ @Transient
+ public String getThumbnailUrl(){
+ return toThumbnailURL(200, 200);
+ }
+
+ @Transient
+ public String getThumbnailUrl(int w, int h) {
+ return toThumbnailURL(w, h);
}
public String getExternalRef() {
@@ -309,4 +331,5 @@ public boolean isUploading() {
public void setUploading(boolean uploading) {
this.uploading = uploading;
}
+
}
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorage.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorage.java
index fa255e57..b72c2b6b 100644
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorage.java
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorage.java
@@ -31,10 +31,12 @@
import tools.dynamia.modules.entityfile.UploadedFileInfo;
import tools.dynamia.modules.entityfile.domain.EntityFile;
import tools.dynamia.modules.entityfile.domain.enums.EntityFileState;
+import tools.dynamia.modules.entityfile.service.EntityFileService;
import tools.dynamia.web.util.HttpUtils;
import java.io.File;
import java.io.IOException;
+import java.io.Serial;
@Service
public class LocalEntityFileStorage implements EntityFileStorage {
@@ -54,10 +56,13 @@ public class LocalEntityFileStorage implements EntityFileStorage {
private final Environment environment;
- public LocalEntityFileStorage(Parameters appParams, CrudService crudService, Environment environment) {
+ private final EntityFileService entityFileService;
+
+ public LocalEntityFileStorage(Parameters appParams, CrudService crudService, Environment environment, EntityFileService entityFileService) {
this.appParams = appParams;
this.crudService = crudService;
this.environment = environment;
+ this.entityFileService = entityFileService;
}
@Override
@@ -93,7 +98,7 @@ public StoredEntityFile download(EntityFile entityFile) {
return sef;
}
- private String generateURL(EntityFile entityFile) {
+ public String generateURL(EntityFile entityFile) {
String serverPath = HttpUtils.getServerPath();
boolean useHttps = isUseHttps();
@@ -111,9 +116,8 @@ private String generateURL(EntityFile entityFile) {
String fileName = entityFile.getName();
fileName = fileName.replace(" ", "%20");
- String url = serverPath + context + LOCAL_FILE_HANDLER + fileName + "?uuid=" + entityFile.getUuid();
- return url;
+ return serverPath + context + LOCAL_FILE_HANDLER + entityFile.getUuid() + "/" + fileName;
}
private String getContextPath() {
@@ -192,16 +196,16 @@ public void delete(EntityFile entityFile) {
}
}
- private class LocalStoredEntityFile extends StoredEntityFile {
+ public static class LocalStoredEntityFile extends StoredEntityFile {
/**
*
*/
+ @Serial
private static final long serialVersionUID = -6295813096900514353L;
public LocalStoredEntityFile(EntityFile entityFile, String url, File realFile) {
super(entityFile, url, realFile);
- // TODO Auto-generated constructor stub
}
@Override
@@ -209,6 +213,11 @@ public String getThumbnailUrl(int width, int height) {
return getUrl() + "&w=" + width + "&h=" + height;
}
+ @Override
+ public File getThumbnailFile(int width, int height) {
+ return LocalEntityFileStorageHandler.createThumbnail(getRealFile(), getEntityFile(), width, height);
+ }
+
}
public void copy(EntityFile entityFile, EntityFileStorage otherStorage) {
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorageHandler.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorageHandler.java
index 21dde1b2..19ab25d7 100644
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorageHandler.java
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/local/LocalEntityFileStorageHandler.java
@@ -21,6 +21,7 @@
import jakarta.servlet.http.HttpServletRequest;
+import org.jspecify.annotations.NonNull;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
@@ -63,7 +64,6 @@ public Resource getResource(String fileName, String uuid, HttpServletRequest req
EntityFile entityFile = service.getEntityFile(uuid);
-
if (entityFile != null && (currentAccountId == null || currentAccountId.equals(0L) || entityFile.isShared() || entityFile.getAccountId().equals(currentAccountId))) {
StoredEntityFile storedEntityFile = storage.download(entityFile);
@@ -89,7 +89,7 @@ public Resource getResource(String fileName, String uuid, HttpServletRequest req
}
}
- private boolean isThumbnail(HttpServletRequest request) {
+ public static boolean isThumbnail(HttpServletRequest request) {
return getParam(request, "w", null) != null && getParam(request, "h", null) != null;
}
@@ -97,19 +97,23 @@ private File createOrLoadThumbnail(File realImg, EntityFile entityFile, HttpServ
String w = getParam(request, "w", "200");
String h = getParam(request, "h", "200");
+ return createThumbnail(realImg, entityFile, Integer.parseInt(w), Integer.parseInt(h));
+
+ }
+
+ public static @NonNull File createThumbnail(File realImg, EntityFile entityFile, int w, int h) {
String subfolder = w + "x" + h;
File realThumbImg = new File(realImg.getParentFile(), subfolder + "/" + realImg.getName());
if (!realThumbImg.exists()) {
if (realImg.exists()) {
- ImageUtil.resizeImage(realImg, realThumbImg, entityFile.getExtension(), Integer.parseInt(w), Integer.parseInt(h));
+ ImageUtil.resizeImage(realImg, realThumbImg, entityFile.getExtension(), w, h);
}
}
return realThumbImg;
-
}
- public String getParam(HttpServletRequest request, String name, String defaultValue) {
+ public static String getParam(HttpServletRequest request, String name, String defaultValue) {
String value = request.getParameter(name);
if (value == null || value.trim().isEmpty()) {
value = defaultValue;
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/remote/RemoteEntityFileStorage.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/remote/RemoteEntityFileStorage.java
new file mode 100644
index 00000000..c583a7cf
--- /dev/null
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/remote/RemoteEntityFileStorage.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright (C) 2023 Dynamia Soluciones IT S.A.S - NIT 900302344-1
+ * Colombia / South America
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tools.dynamia.modules.entityfile.remote;
+
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
+import org.springframework.web.client.RestClient;
+import tools.dynamia.commons.logger.LoggingService;
+import tools.dynamia.commons.logger.SLF4JLoggingService;
+import tools.dynamia.domain.query.Parameters;
+import tools.dynamia.domain.services.CrudService;
+import tools.dynamia.integration.sterotypes.Service;
+import tools.dynamia.modules.entityfile.EntityFileException;
+import tools.dynamia.modules.entityfile.EntityFileStorage;
+import tools.dynamia.modules.entityfile.StoredEntityFile;
+import tools.dynamia.modules.entityfile.UploadedFileInfo;
+import tools.dynamia.modules.entityfile.domain.EntityFile;
+import tools.dynamia.modules.entityfile.domain.enums.EntityFileState;
+
+import java.io.File;
+import java.io.Serial;
+
+/**
+ * {@link EntityFileStorage} implementation that stores files in a remote
+ * simple-file-server (SFS) instance.
+ *
+ * Configuration parameters (read from Spring {@link Environment} first, then from application
+ * {@link Parameters}):
+ *
+ * - {@code SFS_URL} – base URL of the SFS server, e.g. {@code http://files.example.com:8080}
+ * - {@code SFS_BUCKET} – bucket name
+ * - {@code SFS_IDENTITY} – SFS identity (used in {@code X-SFS-Identity} header)
+ * - {@code SFS_SECRET} – SFS secret (used in {@code X-SFS-Secret} header)
+ *
+ *
+ * Files are served to the browser through the local proxy endpoint
+ * {@link #PROXY_PATH} so that SFS credentials are never exposed to the client.
+ *
+ * The remote file key follows the same convention as {@code LocalEntityFileStorage}:
+ * {@code Account{accountId}/{subfolder}/{storedFileName|uuid}}
+ *
+ * @author Dynamia Soluciones IT
+ */
+@Service
+public class RemoteEntityFileStorage implements EntityFileStorage {
+
+ private final LoggingService logger = new SLF4JLoggingService(RemoteEntityFileStorage.class, "SFS: ");
+
+ public static final String ID = "RemoteSimpleFileStorage";
+
+ /**
+ * Base path of the local proxy handler that serves SFS files to the browser.
+ */
+ public static final String PROXY_PATH = "/storage/remote/";
+
+ // ── Parameter names ──────────────────────────────────────────────────────
+ public static final String SFS_URL = "SFS_URL";
+ public static final String SFS_BUCKET = "SFS_BUCKET";
+ public static final String SFS_IDENTITY = "SFS_IDENTITY";
+ public static final String SFS_SECRET = "SFS_SECRET";
+
+ // ── Header names ─────────────────────────────────────────────────────────
+ static final String HEADER_IDENTITY = "X-SFS-Identity";
+ static final String HEADER_SECRET = "X-SFS-Secret";
+
+ private final Parameters appParams;
+ private final CrudService crudService;
+ private final Environment environment;
+
+ /**
+ * Lazily-built RestClient; rebuilt whenever {@link #reloadParams()} is invoked.
+ */
+ private volatile RestClient restClient;
+
+ public RemoteEntityFileStorage(Parameters appParams, CrudService crudService, Environment environment) {
+ this.appParams = appParams;
+ this.crudService = crudService;
+ this.environment = environment;
+ }
+
+ // ── EntityFileStorage ────────────────────────────────────────────────────
+
+ @Override
+ public String getId() {
+ return ID;
+ }
+
+ @Override
+ public String getName() {
+ return "Remote Simple File Storage";
+ }
+
+ @Override
+ public void upload(EntityFile entityFile, UploadedFileInfo fileInfo) {
+ String key = buildKey(entityFile);
+ String bucket = getBucket();
+
+ logger.info("Uploading " + entityFile.getName() + " → sfs://" + bucket + "/" + key);
+
+ try {
+ // Stream the InputStream directly — InputStreamResource avoids loading
+ // the entire file into memory (ResourceHttpMessageConverter streams it).
+ var resource = new InputStreamResource(fileInfo.getInputStream()) {
+ @Override
+ public long contentLength() {
+ // Return the known length so the server gets a correct Content-Length
+ // header; -1 means unknown (chunked transfer will be used instead).
+ return fileInfo.getLength() > 0 ? fileInfo.getLength() : -1;
+ }
+
+ @Override
+ public String getFilename() {
+ return fileInfo.getFullName();
+ }
+ };
+
+ var response = client().put()
+ .uri(uriBuilder -> uriBuilder.replacePath("/" + bucket + "/" + key).build())
+ .header(HEADER_IDENTITY, getIdentity())
+ .header(HEADER_SECRET, getSecret())
+ // .contentType(org.springframework.http.MediaType.parseMediaType(contentType(fileInfo)))
+ .body(resource)
+ .retrieve()
+ .toBodilessEntity();
+
+ // Use the length from fileInfo; if 0 fall back to what was set by the caller.
+ if (fileInfo.getLength() > 0) {
+ entityFile.setSize(fileInfo.getLength());
+ }
+ logger.info("Uploaded successfully [" + response.getStatusCode() + "]: " + key);
+ } catch (Exception e) {
+ logger.error("Error uploading entity file to SFS: " + key, e);
+ throw new EntityFileException("Error uploading entity file to SFS: " + key, e);
+ }
+ }
+
+ @Override
+ public StoredEntityFile download(EntityFile entityFile) {
+ String url = buildRemoteUrl(entityFile);
+ return new RemoteStoredEntityFile(entityFile, url, client(), getIdentity(), getSecret());
+ }
+
+ @Override
+ public void delete(EntityFile entityFile) {
+ String key = buildKey(entityFile);
+ String bucket = getBucket();
+
+ logger.info("Deleting from SFS: " + key);
+
+ try {
+ client().delete()
+ .uri(uriBuilder -> uriBuilder.replacePath("/" + bucket + "/" + key).build())
+ .header(HEADER_IDENTITY, getIdentity())
+ .header(HEADER_SECRET, getSecret())
+ .retrieve()
+ .toBodilessEntity();
+
+ entityFile.setState(EntityFileState.DELETED);
+ crudService.update(entityFile);
+ } catch (Exception e) {
+ throw new EntityFileException("Error deleting entity file from SFS: " + key, e);
+ }
+ }
+
+ @Override
+ public void reloadParams() {
+ // Force recreation of the RestClient on next call so the new base URL is picked up.
+ restClient = null;
+ }
+
+ // ── Internal helpers ─────────────────────────────────────────────────────
+
+ /**
+ * Lazily builds (and caches) a {@link RestClient} pointed at {@link #getSfsUrl()}.
+ */
+ RestClient client() {
+ if (restClient == null) {
+ synchronized (this) {
+ if (restClient == null) {
+ String base = getSfsUrl();
+ logger.info("Building RestClient for SFS base URL: " + base);
+ restClient = RestClient.builder()
+ .baseUrl(base)
+ .build();
+ }
+ }
+ }
+ return restClient;
+ }
+
+ public static String getFileName(EntityFile entityFile) {
+ String subfolder = "";
+ if (entityFile.getSubfolder() != null) {
+ subfolder = entityFile.getSubfolder() + "/";
+ }
+
+ var name = entityFile.getName().toLowerCase().trim()
+ .replace(" ", "_")
+ .replace("-", "_")
+ .replace("\u00F1", "n")
+ .replace("\u00E1", "a")
+ .replace("\u00E9", "e")
+ .replace("\u00ED", "i")
+ .replace("\u00F3", "o")
+ .replace("\u00FA", "u");
+ String storedFileName = entityFile.getUuid() + "_" + name;
+ if (entityFile.getStoredFileName() != null && !entityFile.getStoredFileName().isEmpty()) {
+ storedFileName = entityFile.getStoredFileName();
+ }
+
+ return subfolder + storedFileName;
+ }
+
+ public static String getAccountFolderName(Long accountId) {
+ return "account" + accountId + "/";
+ }
+
+ /**
+ * Builds the SFS file key using the same folder structure as {@code LocalEntityFileStorage}:
+ * {@code Account{accountId}/{subfolder}/{storedFileName|uuid}}
+ */
+ String buildKey(EntityFile entityFile) {
+ String folder = getAccountFolderName(entityFile.getAccountId());
+ String fileName = getFileName(entityFile);
+ return folder + fileName;
+ }
+
+ /**
+ * Builds the URL of the local proxy handler that will serve the file to the browser.
+ * Format: {@code /storage/remote/{uuid}/{encodedFileName}}
+ */
+ String buildRemoteUrl(EntityFile entityFile) {
+
+ return getSfsUrl() + "/" + getBucket() + "/" + buildKey(entityFile);
+ }
+
+ // ── Parameter accessors ──────────────────────────────────────────────────
+
+ String getSfsUrl() {
+ return param(SFS_URL, "http://localhost:8081");
+ }
+
+ String getBucket() {
+ return param(SFS_BUCKET, "files");
+ }
+
+ String getIdentity() {
+ return param(SFS_IDENTITY, "");
+ }
+
+ String getSecret() {
+ return param(SFS_SECRET, "");
+ }
+
+ /**
+ * Reads a parameter from the Spring {@link Environment} first; falls back to
+ * application {@link Parameters} (same strategy as {@code LocalEntityFileStorage}).
+ */
+ private String param(String name, String defaultValue) {
+ String value = environment.getProperty(name);
+ if (value != null && !value.isBlank()) {
+ return value;
+ }
+ try {
+ return appParams.getValue(name, defaultValue);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+ private static String contentType(UploadedFileInfo fileInfo) {
+ return fileInfo.getContentType() != null ? fileInfo.getContentType() : "application/octet-stream";
+ }
+
+ // ── Inner class: RemoteStoredEntityFile ──────────────────────────────────
+
+ /**
+ * {@link StoredEntityFile} for files hosted on a remote SFS instance.
+ * There is no local {@link File} — {@link #getRealFile()} returns {@code null}.
+ * Thumbnails are generated server-side by SFS and requested through the proxy.
+ * SFS credentials are included in every download request so the server can
+ * authorise the caller.
+ */
+ public static class RemoteStoredEntityFile extends StoredEntityFile {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ private final transient RestClient restClient;
+ private final String identity;
+ private final String secret;
+
+ public RemoteStoredEntityFile(EntityFile entityFile, String remoteUrl,
+ RestClient restClient, String identity, String secret) {
+ super(entityFile, remoteUrl, null);
+ this.restClient = restClient;
+ this.identity = identity;
+ this.secret = secret;
+ }
+
+ @Override
+ public String getThumbnailUrl(int width, int height) {
+ return getUrl() + "?w=" + width + "&h=" + height;
+ }
+
+ /**
+ * No local thumbnail file available; SFS handles resizing transparently.
+ */
+ @Override
+ public File getThumbnailFile(int width, int height) {
+ return null;
+ }
+
+ @Override
+ public Resource toResource() {
+ return fetchResource(getUrl());
+ }
+
+ @Override
+ public Resource toThumbnailResource(int width, int height) {
+ return fetchResource(getThumbnailUrl(width, height));
+ }
+
+ /**
+ * GETs the given URL through the {@link RestClient} with SFS authentication headers
+ * and wraps the response body in an {@link InputStreamResource}.
+ */
+ private Resource fetchResource(String url) {
+ try {
+ var inputStream = restClient.get()
+ .uri(url)
+ .header(HEADER_IDENTITY, identity)
+ .header(HEADER_SECRET, secret)
+ .retrieve()
+ .body(java.io.InputStream.class);
+ if (inputStream == null) {
+ return null;
+ }
+ return new InputStreamResource(inputStream);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+ }
+
+ @Override
+ public String toString() {
+ return getName();
+ }
+}
+
+
+
+
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/EntityFileService.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/EntityFileService.java
index bd43b4a2..49941cb2 100644
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/EntityFileService.java
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/EntityFileService.java
@@ -23,6 +23,7 @@
import java.io.Serializable;
import java.util.List;
+import tools.dynamia.modules.entityfile.EntityFileStorage;
import tools.dynamia.modules.entityfile.StoredEntityFile;
import tools.dynamia.modules.entityfile.UploadedFileInfo;
import tools.dynamia.modules.entityfile.domain.EntityFile;
@@ -34,140 +35,121 @@
*/
public interface EntityFileService {
- /**
- * Creates the directory.
- *
- * @param ownerEntity
- * the owner entity
- * @param name
- * the name
- * @param description
- * the description
- * @return the entity file
- */
+ /**
+ * Creates the directory.
+ *
+ * @param ownerEntity the owner entity
+ * @param name the name
+ * @param description the description
+ * @return the entity file
+ */
EntityFile createDirectory(Object ownerEntity, String name, String description);
- /**
- * Creates the directory.
- *
- * @param parent
- * the parent
- * @param name
- * the name
- * @param description
- * the description
- * @return the entity file
- */
+ /**
+ * Creates the directory.
+ *
+ * @param parent the parent
+ * @param name the name
+ * @param description the description
+ * @return the entity file
+ */
EntityFile createDirectory(EntityFile parent, String name, String description);
- /**
- * Creates the entity file.
- *
- * @param fileInfo
- * the file info
- * @param target
- * the target
- * @param desc
- * the desc
- * @return the entity file
- */
+ /**
+ * Creates the entity file.
+ *
+ * @param fileInfo the file info
+ * @param target the target
+ * @param desc the desc
+ * @return the entity file
+ */
EntityFile createEntityFile(UploadedFileInfo fileInfo, Object target, String desc);
- /**
- * Creates the entity file.
- *
- * @param fileInfo
- * the file info
- * @param targetEntity
- * the target entity
- * @return the entity file
- */
+ /**
+ * Creates the entity file.
+ *
+ * @param fileInfo the file info
+ * @param targetEntity the target entity
+ * @return the entity file
+ */
EntityFile createEntityFile(UploadedFileInfo fileInfo, Object targetEntity);
- /**
- * Gets the entity files.
- *
- * @param clazz
- * the clazz
- * @param id
- * the id
- * @param parentDirectory
- * the parent directory
- * @return the entity files
- */
+ /**
+ * Gets the entity files.
+ *
+ * @param clazz the clazz
+ * @param id the id
+ * @param parentDirectory the parent directory
+ * @return the entity files
+ */
List getEntityFiles(Class clazz, Serializable id, EntityFile parentDirectory);
- /**
- * Gets the entity files.
- *
- * @param entity
- * the entity
- * @param parentDirectory
- * the parent directory
- * @return the entity files
- */
+ /**
+ * Gets the entity files.
+ *
+ * @param entity the entity
+ * @param parentDirectory the parent directory
+ * @return the entity files
+ */
List getEntityFiles(Object entity, EntityFile parentDirectory);
- /**
- * Gets the entity files.
- *
- * @param entity
- * the entity
- * @return the entity files
- */
+ /**
+ * Gets the entity files.
+ *
+ * @param entity the entity
+ * @return the entity files
+ */
List getEntityFiles(Object entity);
- /**
- * Delete.
- *
- * @param entityFile
- * the entity file
- */
+ /**
+ * Delete.
+ *
+ * @param entityFile the entity file
+ */
void delete(EntityFile entityFile);
- /**
- * Sync entity file aware.
- */
+ /**
+ * Sync entity file aware.
+ */
void syncEntityFileAware();
- /**
- * Get an stored entity file instance for download
- * @param entityFile
- * @return
- */
+ /**
+ * Get an stored entity file instance for download
+ *
+ * @param entityFile
+ * @return
+ */
StoredEntityFile download(EntityFile entityFile);
- /**
- * Download the EntityFile internal file to a local output file, this is
- * usefull when entityfiles are stored in difernte localtion
- *
- * @param entityFile
- * @param outputFile
- */
+ /**
+ * Download the EntityFile internal file to a local output file, this is
+ * usefull when entityfiles are stored in difernte localtion
+ *
+ * @param entityFile
+ * @param outputFile
+ */
void download(EntityFile entityFile, File outputFile);
- /**
- * Creates the temporal entity file.
- *
- * @param fileInfo
- * the file info
- * @return the entity file
- */
+ /**
+ * Creates the temporal entity file.
+ *
+ * @param fileInfo the file info
+ * @return the entity file
+ */
EntityFile createTemporalEntityFile(UploadedFileInfo fileInfo);
- /**
- * Configure entity file. Setup targetEntity and targetEntityId for
- * EntityFile
- *
- * @param target
- * the target
- * @param entityFile
- * the entity file
- */
+ /**
+ * Configure entity file. Setup targetEntity and targetEntityId for
+ * EntityFile
+ *
+ * @param target the target
+ * @param entityFile the entity file
+ */
void configureEntityFile(Object target, EntityFile entityFile);
- void syncEntityFileAware(Object target);
+ void syncEntityFileAware(Object target);
- EntityFile getEntityFile(String uuid);
+ EntityFile getEntityFile(String uuid);
+ EntityFileStorage getStorage(String name);
}
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/impl/EntityFileServiceImpl.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/impl/EntityFileServiceImpl.java
index 83946195..60c96d0b 100644
--- a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/impl/EntityFileServiceImpl.java
+++ b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/service/impl/EntityFileServiceImpl.java
@@ -334,6 +334,11 @@ private EntityFileStorage getCurrentStorage() {
return storage;
}
+ @Override
+ public EntityFileStorage getStorage(String name) {
+ return findStorage(name);
+ }
+
private EntityFileStorage findStorage(String storageId) {
Optional storage = Containers.get().findObjects(EntityFileStorage.class)
.stream()
diff --git a/extensions/entity-files/sources/core/src/test/java/tools/dynamia/modules/entityfile/remote/RemoteEntityFileStorageTest.java b/extensions/entity-files/sources/core/src/test/java/tools/dynamia/modules/entityfile/remote/RemoteEntityFileStorageTest.java
new file mode 100644
index 00000000..da2cc9fc
--- /dev/null
+++ b/extensions/entity-files/sources/core/src/test/java/tools/dynamia/modules/entityfile/remote/RemoteEntityFileStorageTest.java
@@ -0,0 +1,420 @@
+/*
+ * Copyright (C) 2023 Dynamia Soluciones IT S.A.S - NIT 900302344-1
+ * Colombia / South America
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tools.dynamia.modules.entityfile.remote;
+
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.mock.env.MockEnvironment;
+import tools.dynamia.domain.InMemoryCrudService;
+import tools.dynamia.domain.query.Parameter;
+import tools.dynamia.domain.query.Parameters;
+import tools.dynamia.domain.query.QueryParameters;
+import tools.dynamia.modules.entityfile.StoredEntityFile;
+import tools.dynamia.modules.entityfile.UploadedFileInfo;
+import tools.dynamia.modules.entityfile.domain.EntityFile;
+import tools.dynamia.modules.entityfile.domain.enums.EntityFileState;
+import tools.dynamia.modules.entityfile.enums.EntityFileType;
+
+import java.io.ByteArrayInputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+/**
+ * Integration tests for {@link RemoteEntityFileStorage}.
+ *
+ * Pure-logic tests (buildKey, getFileName, etc.) always run.
+ * HTTP tests are skipped automatically via {@code Assume.assumeTrue}
+ * when the SFS server is not reachable.
+ *
+ * Server configuration via system properties or environment variables:
+ *
+ * - {@code SFS_URL} – SFS server base URL (default: {@code http://localhost:8081})
+ * - {@code SFS_BUCKET} – bucket name (default: {@code test})
+ * - {@code SFS_IDENTITY} – SFS identity (default: empty)
+ * - {@code SFS_SECRET} – SFS secret (default: empty)
+ *
+ * Maven example: {@code mvn test -DSFS_URL=http://my-sfs:8081 -DSFS_BUCKET=test}
+ *
+ */
+public class RemoteEntityFileStorageTest {
+
+ private static String sfsUrl;
+ private static String sfsBucket;
+ private static String sfsIdentity;
+ private static String sfsSecret;
+
+ private RemoteEntityFileStorage storage;
+
+ // ── Setup ─────────────────────────────────────────────────────────────────
+
+ @BeforeClass
+ public static void readConfiguration() {
+ sfsUrl = systemOrEnv(RemoteEntityFileStorage.SFS_URL, "http://localhost:8500");
+ sfsBucket = systemOrEnv(RemoteEntityFileStorage.SFS_BUCKET, "test");
+ sfsIdentity = systemOrEnv(RemoteEntityFileStorage.SFS_IDENTITY, "test");
+ sfsSecret = systemOrEnv(RemoteEntityFileStorage.SFS_SECRET, "test");
+
+ System.out.println("[SFS Test] URL=" + sfsUrl + " | BUCKET=" + sfsBucket);
+ }
+
+ @Before
+ public void setUp() {
+ MockEnvironment env = new MockEnvironment();
+ env.setProperty(RemoteEntityFileStorage.SFS_URL, sfsUrl);
+ env.setProperty(RemoteEntityFileStorage.SFS_BUCKET, sfsBucket);
+ env.setProperty(RemoteEntityFileStorage.SFS_IDENTITY, sfsIdentity);
+ env.setProperty(RemoteEntityFileStorage.SFS_SECRET, sfsSecret);
+
+ storage = new RemoteEntityFileStorage(noOpParameters(), new InMemoryCrudService(), env);
+ }
+
+ // ── Pure-logic tests (no server required) ─────────────────────────────────
+
+ @Test
+ public void testGetId() {
+ assertEquals(RemoteEntityFileStorage.ID, storage.getId());
+ }
+
+ @Test
+ public void testGetName() {
+ assertNotNull(storage.getName());
+ assertFalse("Storage name must not be blank", storage.getName().isBlank());
+ }
+
+ @Test
+ public void testBuildKey_withoutSubfolder() {
+ EntityFile ef = buildEntityFile("report.pdf", null, 10L);
+ String key = storage.buildKey(ef);
+
+ assertTrue("Key must start with account10/", key.startsWith("account10/"));
+ assertTrue("Key must contain the uuid", key.contains(ef.getUuid()));
+ }
+
+ @Test
+ public void testBuildKey_withSubfolder() {
+ EntityFile ef = buildEntityFile("image.jpg", "photos/2026", 5L);
+ String key = storage.buildKey(ef);
+
+ assertTrue("Key must start with account5/", key.startsWith("account5/"));
+ assertTrue("Key must contain the subfolder path", key.contains("photos/2026/"));
+ }
+
+ @Test
+ public void testGetFileName_withSpacesAndDashes() {
+ EntityFile ef = buildEntityFile("My File-Final.pdf", null, 1L);
+ String name = RemoteEntityFileStorage.getFileName(ef);
+
+ assertFalse("File name must not contain spaces", name.contains(" "));
+ assertFalse("File name base must not contain dashes",
+ name.substring(name.lastIndexOf('/') + 1).replace(ef.getUuid(), "").contains("-"));
+ }
+
+ @Test
+ public void testGetFileName_withAccentsAndSpecialChars() {
+ EntityFile ef = buildEntityFile("Ñoño Ávido Murió.pdf", null, 1L);
+ String name = RemoteEntityFileStorage.getFileName(ef);
+
+ assertFalse("File name must not contain ñ", name.contains("ñ"));
+ assertFalse("File name must not contain á", name.contains("á"));
+ assertFalse("File name must not contain ó", name.contains("ó"));
+ assertFalse("File name must not contain spaces", name.contains(" "));
+ }
+
+ @Test
+ public void testGetFileName_usesStoredFileNameWhenSet() {
+ EntityFile ef = buildEntityFile("original.pdf", null, 1L);
+ ef.setStoredFileName("custom_stored_name.pdf");
+
+ String name = RemoteEntityFileStorage.getFileName(ef);
+
+ assertEquals("Must use storedFileName when it is set", "custom_stored_name.pdf", name);
+ }
+
+ @Test
+ public void testGetFileName_withoutSubfolder() {
+ EntityFile ef = buildEntityFile("doc.txt", null, 1L);
+ String name = RemoteEntityFileStorage.getFileName(ef);
+
+ assertFalse("Without subfolder the name must not start with /", name.startsWith("/"));
+ assertTrue("Name must contain the uuid", name.contains(ef.getUuid()));
+ }
+
+ @Test
+ public void testGetAccountFolderName() {
+ assertEquals("account42/", RemoteEntityFileStorage.getAccountFolderName(42L));
+ assertEquals("account1/", RemoteEntityFileStorage.getAccountFolderName(1L));
+ assertEquals("account999/", RemoteEntityFileStorage.getAccountFolderName(999L));
+ }
+
+ @Test
+ public void testBuildRemoteUrl_containsUrlBucketAndKey() {
+ EntityFile ef = buildEntityFile("document.pdf", null, 3L);
+ String url = storage.buildRemoteUrl(ef);
+
+ assertTrue("URL must start with the SFS base URL", url.startsWith(sfsUrl));
+ assertTrue("URL must contain the bucket name", url.contains(sfsBucket));
+ assertTrue("URL must contain the account folder", url.contains("account3/"));
+ assertTrue("URL must contain the file uuid", url.contains(ef.getUuid()));
+ }
+
+ @Test
+ public void testDownload_returnsRemoteStoredEntityFile() {
+ EntityFile ef = buildEntityFile("file.txt", null, 1L);
+ StoredEntityFile stored = storage.download(ef);
+
+ assertNotNull("StoredEntityFile must not be null", stored);
+ assertNotNull("URL must not be null", stored.getUrl());
+ assertNull("Remote file must not have a local real file", stored.getRealFile());
+ }
+
+ @Test
+ public void testThumbnailUrl_containsDimensionParameters() {
+ EntityFile ef = buildEntityFile("photo.jpg", null, 1L);
+ StoredEntityFile stored = storage.download(ef);
+
+ String thumb100 = stored.getThumbnailUrl(100, 100);
+ assertTrue("Thumbnail URL must contain w=100", thumb100.contains("w=100"));
+ assertTrue("Thumbnail URL must contain h=100", thumb100.contains("h=100"));
+
+ String thumb200 = stored.getThumbnailUrl(200, 300);
+ assertTrue("Thumbnail URL must contain w=200", thumb200.contains("w=200"));
+ assertTrue("Thumbnail URL must contain h=300", thumb200.contains("h=300"));
+ }
+
+ @Test
+ public void testReloadParams_resetsAndRebuildsClient() {
+ // Force initial client build
+ storage.client();
+
+ // reloadParams must clear the internal client
+ storage.reloadParams();
+
+ // First call after reload must rebuild the client without throwing
+ assertNotNull("Client must be rebuilt after reloadParams", storage.client());
+ }
+
+ @Test
+ public void testToResource_returnsInputStreamResource() {
+ Assume.assumeTrue("SFS server not available at " + sfsUrl, isServerReachable());
+
+ // Upload a file first so the URL is actually retrievable
+ EntityFile ef = buildEntityFile("to-resource-" + System.currentTimeMillis() + ".txt", null, 1L);
+ byte[] bytes = "toResource content".getBytes(StandardCharsets.UTF_8);
+ UploadedFileInfo info = new UploadedFileInfo(ef.getName(), "text/plain", new ByteArrayInputStream(bytes));
+ info.setLength(bytes.length);
+ storage.upload(ef, info);
+
+ StoredEntityFile stored = storage.download(ef);
+ // toResource() must authenticate with SFS and return an InputStreamResource
+ assertNotNull("toResource() must not throw or return null", stored.toResource());
+ }
+
+ @Test
+ public void testToThumbnailResource_returnsInputStreamResource() {
+ Assume.assumeTrue("SFS server not available at " + sfsUrl, isServerReachable());
+
+ EntityFile ef = buildEntityFile("to-thumb-" + System.currentTimeMillis() + ".png", null, 1L);
+ byte[] bytes = new byte[]{(byte) 0xFF, (byte) 0xD8}; // minimal JPEG-like stub
+ UploadedFileInfo info = new UploadedFileInfo(ef.getName(), "image/png", new ByteArrayInputStream(bytes));
+ info.setLength(bytes.length);
+ storage.upload(ef, info);
+
+ StoredEntityFile stored = storage.download(ef);
+ // toThumbnailResource() must authenticate with SFS and return an InputStreamResource
+ assertNotNull("toThumbnailResource() must not throw or return null",
+ stored.toThumbnailResource(200, 200));
+ }
+
+ // ── Integration tests (require a live SFS server) ─────────────────────────
+
+ @Test
+ public void testUpload_textFile() {
+ Assume.assumeTrue("SFS server not available at " + sfsUrl, isServerReachable());
+
+ EntityFile ef = buildEntityFile("test-upload-" + System.currentTimeMillis() + ".txt", null, 1L);
+ String content = "Hello SFS from automated test - " + System.currentTimeMillis();
+ byte[] bytes = content.getBytes(StandardCharsets.UTF_8);
+
+ UploadedFileInfo info = new UploadedFileInfo(
+ ef.getName(), "text/plain", new ByteArrayInputStream(bytes));
+ info.setLength(bytes.length);
+
+ storage.upload(ef, info);
+
+ assertTrue("File size must be > 0 after a successful upload", ef.getSize() > 0);
+ }
+
+ @Test
+ public void testUpload_withSubfolder() {
+ Assume.assumeTrue("SFS server not available at " + sfsUrl, isServerReachable());
+
+ EntityFile ef = buildEntityFile("document.txt", "subfolder/tests", 1L);
+ byte[] bytes = "content with subfolder".getBytes(StandardCharsets.UTF_8);
+
+ UploadedFileInfo info = new UploadedFileInfo(
+ ef.getName(), "text/plain", new ByteArrayInputStream(bytes));
+ info.setLength(bytes.length);
+
+ storage.upload(ef, info);
+
+ String key = storage.buildKey(ef);
+ assertTrue("Key must include the subfolder path", key.contains("subfolder/tests/"));
+ }
+
+ @Test
+ public void testUpload_nameWithSpacesDoesNotFail() {
+ Assume.assumeTrue("SFS server not available at " + sfsUrl, isServerReachable());
+
+ EntityFile ef = buildEntityFile("file with spaces and ñ.txt", null, 1L);
+ byte[] bytes = "content".getBytes(StandardCharsets.UTF_8);
+
+ UploadedFileInfo info = new UploadedFileInfo(
+ ef.getName(), "text/plain", new ByteArrayInputStream(bytes));
+ info.setLength(bytes.length);
+
+ // Must not throw — the name is sanitised before being sent to SFS
+ storage.upload(ef, info);
+ }
+
+ @Test
+ public void testDelete_changesStateToDeleted() {
+ Assume.assumeTrue("SFS server not available at " + sfsUrl, isServerReachable());
+
+ // 1. Upload a file first
+ EntityFile ef = buildEntityFile("test-delete-" + System.currentTimeMillis() + ".txt", null, 1L);
+ byte[] bytes = "temporary file to delete".getBytes(StandardCharsets.UTF_8);
+
+ UploadedFileInfo info = new UploadedFileInfo(
+ ef.getName(), "text/plain", new ByteArrayInputStream(bytes));
+ info.setLength(bytes.length);
+
+ storage.upload(ef, info);
+
+ // 2. Delete it
+ storage.delete(ef);
+
+ // 3. Verify state
+ assertEquals("State must change to DELETED", EntityFileState.DELETED, ef.getState());
+ }
+
+ @Test
+ public void testUploadAndDownloadUrl_areConsistent() {
+ Assume.assumeTrue("SFS server not available at " + sfsUrl, isServerReachable());
+
+ EntityFile ef = buildEntityFile("consistency-" + System.currentTimeMillis() + ".txt", null, 1L);
+ byte[] bytes = "URL consistency check content".getBytes(StandardCharsets.UTF_8);
+
+ UploadedFileInfo info = new UploadedFileInfo(
+ ef.getName(), "text/plain", new ByteArrayInputStream(bytes));
+ info.setLength(bytes.length);
+
+ storage.upload(ef, info);
+
+ StoredEntityFile stored = storage.download(ef);
+ String url = stored.getUrl();
+
+ // The URL returned by download() must point to the same resource that was uploaded
+ assertNotNull(url);
+ assertTrue("URL must contain the bucket name", url.contains(sfsBucket));
+ assertTrue("URL must contain the key of the uploaded file", url.contains(storage.buildKey(ef)));
+ }
+
+ // ── Helpers ───────────────────────────────────────────────────────────────
+
+ /**
+ * Builds a minimal {@link EntityFile} suitable for testing.
+ */
+ private EntityFile buildEntityFile(String name, String subfolder, Long accountId) {
+ EntityFile ef = new EntityFile();
+ ef.setName(name);
+ ef.setSubfolder(subfolder);
+ ef.setAccountId(accountId);
+ ef.setType(EntityFileType.FILE);
+ ef.setExtension("txt");
+ ef.setTargetEntity("TestEntity");
+ ef.setTargetEntityId(1L);
+ return ef;
+ }
+
+ /**
+ * Attempts to open a short-lived connection to the SFS server.
+ * Returns {@code true} if the server responds, {@code false} otherwise.
+ */
+ private boolean isServerReachable() {
+ try {
+ HttpURLConnection con = (HttpURLConnection) URI.create(sfsUrl).toURL().openConnection();
+ con.setConnectTimeout(2000);
+ con.setReadTimeout(2000);
+ con.setRequestMethod("GET");
+ con.connect();
+ int responseCode = con.getResponseCode();
+ con.disconnect();
+ return responseCode > 0;
+ } catch (Exception e) {
+ System.out.println("[SFS Test] Server not reachable: " + e.getMessage());
+ return false;
+ }
+ }
+
+ /**
+ * Reads a value from system properties ({@code -Dkey=value}) first,
+ * then from environment variables, falling back to {@code defaultValue}.
+ */
+ private static String systemOrEnv(String key, String defaultValue) {
+ String value = System.getProperty(key);
+ if (value != null && !value.isBlank()) return value;
+ value = System.getenv(key);
+ if (value != null && !value.isBlank()) return value;
+ return defaultValue;
+ }
+
+ /**
+ * Minimal no-op implementation of {@link Parameters} used as a fallback.
+ * In tests, {@link MockEnvironment} already supplies all SFS values, so
+ * this implementation is never actually invoked except on unexpected errors.
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ private static Parameters noOpParameters() {
+ return new Parameters() {
+ @Override public List getParameters(List n) { return List.of(); }
+ @Override public List getParameters(Class c, List n) { return List.of(); }
+ @Override public List all() { return List.of(); }
+ @Override public Parameter getParameter(String name) { return null; }
+ @Override public String getValue(String p) { return null; }
+ @Override public String getValue(Class c, String p) { return null; }
+ @Override public String getValue(String p, String def) { return def; }
+ @Override public String getValue(Class c, String p, String def) { return def; }
+ @Override public void save(Parameter p) {}
+ @Override public void save(Collection params) {}
+ @Override public void setParameter(Class c, String n, Object v) {}
+ @Override public void setParameter(String n, Object v) {}
+ @Override public Parameter getParameter(Class c, String n) { return null; }
+ @Override public void increaseCounter(Parameter p) {}
+ @Override public long findNextCounterValue(Parameter p) { return 0; }
+ @Override public Parameter findParameter(Class c, String n, QueryParameters f) { return null; }
+ };
+ }
+}
+
diff --git a/extensions/entity-files/sources/pom.xml b/extensions/entity-files/sources/pom.xml
index 0d5e48ae..87655d46 100644
--- a/extensions/entity-files/sources/pom.xml
+++ b/extensions/entity-files/sources/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules
tools.dynamia.modules.parent
- 26.4.1
+ 26.5.0
../../pom.xml
diff --git a/extensions/entity-files/sources/s3/pom.xml b/extensions/entity-files/sources/s3/pom.xml
index 01444438..8444e78d 100644
--- a/extensions/entity-files/sources/s3/pom.xml
+++ b/extensions/entity-files/sources/s3/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules
tools.dynamia.modules.entityfiles.parent
- 26.4.1
+ 26.5.0
DynamiaModules - EntityFiles - S3
@@ -49,7 +49,7 @@
tools.dynamia.modules
tools.dynamia.modules.entityfiles
- 26.4.1
+ 26.5.0
software.amazon.awssdk
diff --git a/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3EntityFileStorage.java b/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3EntityFileStorage.java
index eed5a560..ff626ecc 100644
--- a/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3EntityFileStorage.java
+++ b/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3EntityFileStorage.java
@@ -22,9 +22,15 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
+import software.amazon.awssdk.core.ResponseInputStream;
import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
@@ -39,6 +45,7 @@
import tools.dynamia.modules.entityfile.UploadedFileInfo;
import tools.dynamia.modules.entityfile.domain.EntityFile;
import tools.dynamia.modules.entityfile.enums.EntityFileType;
+import tools.dynamia.modules.entityfile.remote.RemoteEntityFileStorage;
import java.io.File;
import java.net.URL;
@@ -51,6 +58,9 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import static tools.dynamia.modules.entityfile.remote.RemoteEntityFileStorage.getAccountFolderName;
+import static tools.dynamia.modules.entityfile.remote.RemoteEntityFileStorage.getFileName;
+
/**
* {@link EntityFileStorage} implementation that store files in Amazon S3 service.
* The following environment variables are required AWS_ACCESS_KEY_ID, AWS_SECRET_KEY, AWS_S3_ENDPOINT, AWS_S3_BUCKET. The
@@ -64,6 +74,7 @@ public class S3EntityFileStorage implements EntityFileStorage {
public static final String AWS_S3_ENDPOINT = "AWS_S3_ENDPOINT";
public static final String AWS_S3_REGION = "AWS_S3_REGION";
public static final String AWS_S3_BUCKET = "AWS_S3_BUCKET";
+ public static final String AWS_S3_OVERRIDE_ENDPOINT = "AWS_S3_OVERRIDE_ENDPOINT";
private static final Logger log = LoggerFactory.getLogger(S3EntityFileStorage.class);
public static final int PRESIGNED_URL_TIMEOUT = 30;
private final LoggingService logger = new SLF4JLoggingService(S3EntityFileStorage.class, "S3: ");
@@ -148,10 +159,10 @@ public void upload(EntityFile entityFile, UploadedFileInfo fileInfo) {
AsyncRequestBody body = null;
if (fileToUpload != null && fileToUpload.exists()) {
- logger.info("Uploading file " + fileToUpload.getPath() + " to " + key);
+ logger.info("Uploading file " + fileToUpload.getPath() + " to bucket [" + bucket + "] key=" + key);
body = AsyncRequestBody.fromFile(fileToUpload);
} else if (fileInfo.hasInputStream()) {
- logger.info("Uploading input stream from " + fileInfo.getFullName() + " to " + key);
+ logger.info("Uploading input stream from " + fileInfo.getFullName() + " to bucket [" + bucket + "] key=" + key);
body = AsyncRequestBody.fromInputStream(fileInfo.getInputStream(), length, executorService);
}
entityFile.setUploading(true);
@@ -182,10 +193,9 @@ public StoredEntityFile download(EntityFile entityFile) {
String urlKey = entityFile.getUuid();
String url = URL_CACHE.get(urlKey);
String fileName = getFileName(entityFile);
-
+ String folder = getAccountFolderName(entityFile.getAccountId());
if (url == null) {
- String folder = getAccountFolderName(entityFile.getAccountId());
if (entityFile.isShared()) {
url = generateStaticURL(getBucketName(), folder + fileName);
URL_CACHE.add(urlKey, url);
@@ -194,7 +204,7 @@ public StoredEntityFile download(EntityFile entityFile) {
}
}
- return new S3StoredEntityFile(entityFile, url, new File(fileName));
+ return new S3StoredEntityFile(entityFile, url, new File(fileName), folder + fileName);
}
protected String generateSignedURL(String bucketName, String fileName) {
@@ -214,29 +224,6 @@ private String generateStaticURL(String bucketName, String fileName) {
}
- private String getFileName(EntityFile entityFile) {
- String subfolder = "";
- if (entityFile.getSubfolder() != null) {
- subfolder = entityFile.getSubfolder() + "/";
- }
-
- var name = entityFile.getName().toLowerCase().trim()
- .replace(" ", "_")
- .replace("-", "_")
- .replace("\u00F1", "n")
- .replace("\u00E1", "a")
- .replace("\u00E9", "e")
- .replace("\u00ED", "i")
- .replace("\u00F3", "o")
- .replace("\u00FA", "u");
- String storedFileName = entityFile.getUuid() + "_" + name;
- if (entityFile.getStoredFileName() != null && !entityFile.getStoredFileName().isEmpty()) {
- storedFileName = entityFile.getStoredFileName();
- }
-
- return subfolder + storedFileName;
- }
-
/**
* Get or build a S3 async client using static credentials
*
@@ -245,17 +232,20 @@ private String getFileName(EntityFile entityFile) {
protected S3AsyncClient getClient() {
if (s3Client == null) {
- s3Client = S3Utils.buildS3AsyncClient(getAccessKey(), getSecretKey(), getRegion())
- .build();
+ var endpoint = getOverrideEndpoint();
+ if (endpoint != null && !endpoint.isBlank()) {
+ s3Client = S3Utils.buildGenericClient(getAccessKey(), getSecretKey(), endpoint);
+ } else {
+ s3Client = S3Utils.buildS3AsyncClient(getAccessKey(), getSecretKey(), getRegion())
+ .build();
+ }
}
return s3Client;
}
- protected String getAccountFolderName(Long accountId) {
- return "account" + accountId + "/";
- }
+
/**
* Generate thumbnail url
@@ -300,8 +290,8 @@ protected String createAndUploadThumbnail(EntityFile entityFile, String bucketNa
File localDestination = File.createTempFile(System.currentTimeMillis() + "file", entityFile.getName());
File localThumbDestination = File.createTempFile(System.currentTimeMillis() + "thumb", entityFile.getName());
- var url = download(entityFile).getUrl();
- Files.copy(new URL(url).openStream(), localDestination.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ var resource = entityFile.getStoredEntityFile().toResource();
+ Files.copy(resource.getInputStream(), localDestination.toPath(), StandardCopyOption.REPLACE_EXISTING);
ImageUtil.resizeImage(localDestination, localThumbDestination, entityFile.getExtension(), w, h);
// metadata
@@ -366,6 +356,10 @@ public String getAccessKey() {
return getParameter(AWS_ACCESS_KEY_ID);
}
+ public String getOverrideEndpoint() {
+ return getParameter(AWS_S3_OVERRIDE_ENDPOINT);
+ }
+
public String getRegion() {
var region = getParameter(AWS_S3_REGION);
if (region == null || region.isBlank()) {
@@ -398,14 +392,61 @@ public void reloadParams() {
class S3StoredEntityFile extends StoredEntityFile {
- public S3StoredEntityFile(EntityFile entityFile, String url, File realFile) {
+ private final String s3Key;
+
+ public S3StoredEntityFile(EntityFile entityFile, String url, File realFile, String s3Key) {
super(entityFile, url, realFile);
+ this.s3Key = s3Key;
}
@Override
public String getThumbnailUrl(int width, int height) {
return generateThumbnailURL(getEntityFile(), width, width);
}
+
+ @Override
+ public Resource toResource() {
+ ResponseInputStream stream =
+ s3Client.getObject(
+ GetObjectRequest.builder()
+ .bucket(getBucketName())
+ .key(s3Key)
+ .build(),
+ AsyncResponseTransformer.toBlockingInputStream()
+ ).join();
+
+ return new InputStreamResource(stream);
+ }
+
+ @Override
+ public Resource toThumbnailResource(int width, int height) {
+ var entityFile = getEntityFile();
+ if (entityFile.getType() != EntityFileType.IMAGE && EntityFileType.getFileType(entityFile.getExtension()) != EntityFileType.IMAGE) {
+ return null;
+ }
+
+ String folder = getAccountFolderName(entityFile.getAccountId());
+ String fileName = getFileName(entityFile);
+ String thumbKey = folder + width + "x" + height + "/" + fileName;
+
+ if (!objectExists(getBucketName(), thumbKey)) {
+ generateThumbnailURL(entityFile, width, height);
+ if (!objectExists(getBucketName(), thumbKey)) {
+ return null;
+ }
+ }
+
+ ResponseInputStream stream =
+ s3Client.getObject(
+ GetObjectRequest.builder()
+ .bucket(getBucketName())
+ .key(thumbKey)
+ .build(),
+ AsyncResponseTransformer.toBlockingInputStream()
+ ).join();
+
+ return new InputStreamResource(stream);
+ }
}
diff --git a/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3Utils.java b/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3Utils.java
index c71adb5a..e49d93a2 100644
--- a/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3Utils.java
+++ b/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3Utils.java
@@ -14,6 +14,7 @@
import tools.dynamia.commons.StringUtils;
import java.io.File;
+import java.net.URI;
import java.nio.file.Path;
import java.time.Duration;
import java.util.List;
@@ -62,6 +63,23 @@ public static S3AsyncClientBuilder buildS3AsyncClient(String accessKey, String s
}
+ /**
+ * Build a generic client with override endpoint. Useful for servers like MinIO or Seaweed
+ *
+ * @param accessKey the access key
+ * @param secretKey the secret key
+ * @param endpoint the endpoint
+ * @return the S3AsyncClient
+ */
+ public static S3AsyncClient buildGenericClient(String accessKey, String secretKey, String endpoint) {
+ return S3AsyncClient.builder()
+ .credentialsProvider(() -> getCredentials(accessKey, secretKey))
+ .region(Region.US_EAST_1)
+ .endpointOverride(URI.create(endpoint))
+ .forcePathStyle(true)
+ .build();
+ }
+
/**
* Upload file to S3 bucket
*
@@ -161,11 +179,12 @@ public static List getRegions() {
*/
public static boolean objectExists(S3AsyncClient client, String bucketName, String key) {
try {
- getObjectAttributes(client, bucketName, key).wait();
+ headObject(client, bucketName, key).join();
+ return true;
} catch (Exception e) {
return false;
}
- return true;
+
}
/**
@@ -189,7 +208,12 @@ public static CompletableFuture getObjectAttributes
* @return the CompletableFuture
*/
public static CompletableFuture headObject(S3AsyncClient client, String bucketName, String key) {
- return client.headObject(builder -> builder.bucket(bucketName).key(key));
+ HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
+ .bucket(bucketName)
+ .key(key)
+ .build();
+
+ return client.headObject(headObjectRequest);
}
/**
diff --git a/extensions/entity-files/sources/ui/pom.xml b/extensions/entity-files/sources/ui/pom.xml
index 9b8399f0..f0a976a0 100644
--- a/extensions/entity-files/sources/ui/pom.xml
+++ b/extensions/entity-files/sources/ui/pom.xml
@@ -22,7 +22,7 @@
tools.dynamia.modules.entityfiles.parent
tools.dynamia.modules
- 26.4.1
+ 26.5.0
DynamiaModules - EntityFiles UI
tools.dynamia.modules.entityfiles.ui
@@ -48,12 +48,12 @@
tools.dynamia.modules
tools.dynamia.modules.entityfiles
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.zk
- 26.4.1
+ 26.5.0
jar
diff --git a/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/DownloadFileAction.java b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/DownloadFileAction.java
index a186daf1..f5453f59 100644
--- a/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/DownloadFileAction.java
+++ b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/DownloadFileAction.java
@@ -31,7 +31,7 @@
public class DownloadFileAction extends AbstractEntityFileAction implements ReadableOnly {
public DownloadFileAction() {
- setName("Descargar Archivo");
+ setName("Download");
setImage("icons:download");
setGroup(ActionGroup.get("FILES"));
setMenuSupported(true);
@@ -45,25 +45,18 @@ public void actionPerformed(EntityFileActionEvent evt) {
EntityFile file = evt.getEntityFile();
if (file != null) {
-
- StoredEntityFile sef = file.getStoredEntityFile();
- if (sef != null && sef.getUrl() != null) {
- download(sef);
- } else {
- UIMessages.showMessage("No se pudo encontrar archivo " + file.getName()
- + " en el servidor, por favor contacte con el administrador del sistema", MessageType.ERROR);
- }
+ download(file.toURL());
} else {
- UIMessages.showMessage("Seleccion archivo para descargar", MessageType.WARNING);
+ UIMessages.showMessage("Select file to download", MessageType.WARNING);
}
}
- private void download(StoredEntityFile sef) {
+ private void download(String url) {
Execution exec = Executions.getCurrent();
- exec.sendRedirect(sef.getUrl(), "_blank");
+ exec.sendRedirect(url, "_blank");
}
}
diff --git a/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/ReloadEntityFileStoragesAction.java b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/ReloadEntityFileStoragesAction.java
new file mode 100644
index 00000000..ce1b4bbb
--- /dev/null
+++ b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/ReloadEntityFileStoragesAction.java
@@ -0,0 +1,46 @@
+package tools.dynamia.modules.entityfile.ui.actions;
+
+
+import tools.dynamia.actions.ActionEvent;
+import tools.dynamia.actions.InstallAction;
+import tools.dynamia.commons.logger.LoggingService;
+import tools.dynamia.commons.logger.SLF4JLoggingService;
+import tools.dynamia.crud.cfg.AbstractConfigPageAction;
+import tools.dynamia.domain.ValidationError;
+import tools.dynamia.domain.query.QueryConditions;
+import tools.dynamia.domain.query.QueryParameters;
+import tools.dynamia.domain.services.CrudService;
+import tools.dynamia.domain.util.QueryBuilder;
+import tools.dynamia.integration.Containers;
+import tools.dynamia.integration.ProgressMonitor;
+import tools.dynamia.modules.entityfile.EntityFileStorage;
+import tools.dynamia.modules.entityfile.domain.EntityFile;
+import tools.dynamia.modules.entityfile.domain.enums.EntityFileState;
+import tools.dynamia.modules.entityfile.local.LocalEntityFileStorage;
+import tools.dynamia.ui.UIMessages;
+import tools.dynamia.zk.ui.LongOperationMonitorWindow;
+import tools.dynamia.zk.util.LongOperation;
+import tools.dynamia.zk.util.ZKUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@InstallAction
+class ReloadEntityFileStoragesAction extends AbstractConfigPageAction {
+
+
+ private final LoggingService logger = new SLF4JLoggingService(ReloadEntityFileStoragesAction.class);
+
+ public ReloadEntityFileStoragesAction() {
+ setName("Reload Storages");
+ setApplicableConfig("EntityFileCFG");
+ setType("secondary");
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent evt) {
+ Containers.get().findObjects(EntityFileStorage.class).forEach(EntityFileStorage::reloadParams);
+ UIMessages.showMessage("Reloaded");
+ }
+
+}
diff --git a/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/ViewFileURLAction.java b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/ViewFileURLAction.java
index 0d90b7b3..2e5bec0a 100644
--- a/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/ViewFileURLAction.java
+++ b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/ViewFileURLAction.java
@@ -36,7 +36,7 @@ public ViewFileURLAction() {
@Override
public void actionPerformed(EntityFileActionEvent evt) {
if (evt.getEntityFile() != null) {
- String url = evt.getEntityFile().getStoredEntityFile().getUrl();
+ String url = evt.getEntityFile().toURL();
UIMessages.showMessageDialog("" + url + "
");
}
}
diff --git a/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/components/EntityFileImage.java b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/components/EntityFileImage.java
index 10a8496f..c5b23194 100644
--- a/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/components/EntityFileImage.java
+++ b/extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/components/EntityFileImage.java
@@ -76,11 +76,8 @@ private void loadImage() {
if (entityFile != null) {
Long key = entityFile.getId();
try {
- StoredEntityFile sef = entityFile.getStoredEntityFile();
-
if (isThumbnail()) {
- String thumbUrl = URL_THUMB_CACHE.getOrLoad(key, k -> entityFile.getStoredEntityFile().getThumbnailUrl(thumbnailWidth, thumbnailHeight));
- setSrc(thumbUrl);
+ setSrc(URL_THUMB_CACHE.getOrLoad(key, k -> entityFile.toThumbnailURL(thumbnailWidth, thumbnailHeight)));
} else {
setSrc(URL_CACHE.getOrLoad(key, k -> entityFile.toURL()));
}
diff --git a/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileConfig.yml b/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileConfig.yml
index 68518e24..23720908 100644
--- a/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileConfig.yml
+++ b/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileConfig.yml
@@ -56,10 +56,44 @@ fields:
parameterName: AWS_SECRET_KEY
cacheable: true
+ s3Endpoint:
+ label: Endpoint Override
+ description: Optional endpoint override for S3 compatible storage
+ params:
+ parameterName: AWS_S3_OVERRIDE_ENDPOINT
+ cacheable: true
+ span: 2
+
+ sfsUrl:
+ label: Server URL
+ description: Base URL of the simple-file-server instance, e.g. http://files.example.com:8080
+ params:
+ parameterName: SFS_URL
+ cacheable: true
+ span: 2
+ sfsBucket:
+ label: Bucket
+ params:
+ parameterName: SFS_BUCKET
+ cacheable: true
+ sfsIdentity:
+ label: Identity
+ params:
+ parameterName: SFS_IDENTITY
+ cacheable: true
+ sfsSecret:
+ label: Secret
+ params:
+ parameterName: SFS_SECRET
+ cacheable: true
+
groups:
- s3:
- label: Amazon Web Service (S3)
- fields: [ s3BucketName,s3Region,s3User,s3Secret ]
+ s3Config:
+ label: S3 Compatible Storage
+ fields: [ s3BucketName,s3Region,s3User,s3Secret,s3Endpoint ]
+ sfsConfig:
+ label: Remote Simple File Storage
+ fields: [ sfsUrl,sfsBucket,sfsIdentity,sfsSecret ]
layout:
columns: 4
\ No newline at end of file
diff --git a/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileTree.yml b/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileTree.yml
index f47eccd9..8cbfd0b9 100644
--- a/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileTree.yml
+++ b/extensions/entity-files/sources/ui/src/main/resources/META-INF/descriptors/EntityFileTree.yml
@@ -11,7 +11,7 @@ fields:
label: Nombre
params:
header:
- width: 460px
+ width: 600px
creationDate:
label: Fecha
diff --git a/extensions/file-importer/sources/core/pom.xml b/extensions/file-importer/sources/core/pom.xml
index 6948f2ff..80ef3540 100644
--- a/extensions/file-importer/sources/core/pom.xml
+++ b/extensions/file-importer/sources/core/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules.importer.parent
tools.dynamia.modules
- 26.4.1
+ 26.5.0
Dynamia Modules - Importer Core
tools.dynamia.modules.importer
@@ -56,7 +56,7 @@
tools.dynamia
tools.dynamia.reports
- 26.4.1
+ 26.5.0
diff --git a/extensions/file-importer/sources/pom.xml b/extensions/file-importer/sources/pom.xml
index 1c45634b..a7d56064 100644
--- a/extensions/file-importer/sources/pom.xml
+++ b/extensions/file-importer/sources/pom.xml
@@ -26,7 +26,7 @@
tools.dynamia.modules
tools.dynamia.modules.parent
- 26.4.1
+ 26.5.0
../../pom.xml
diff --git a/extensions/file-importer/sources/ui/pom.xml b/extensions/file-importer/sources/ui/pom.xml
index f428ce04..11c92729 100644
--- a/extensions/file-importer/sources/ui/pom.xml
+++ b/extensions/file-importer/sources/ui/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules.importer.parent
tools.dynamia.modules
- 26.4.1
+ 26.5.0
Dynamia Modules - Importer UI
tools.dynamia.modules.importer.ui
@@ -55,13 +55,13 @@
tools.dynamia
tools.dynamia.zk
- 26.4.1
+ 26.5.0
tools.dynamia.modules
tools.dynamia.modules.importer
- 26.4.1
+ 26.5.0
diff --git a/extensions/finances/sources/api/pom.xml b/extensions/finances/sources/api/pom.xml
index 809fa308..ed2fe779 100644
--- a/extensions/finances/sources/api/pom.xml
+++ b/extensions/finances/sources/api/pom.xml
@@ -26,7 +26,7 @@
tools.dynamia.modules
tools.dynamia.modules.finances.parent
- 26.4.1
+ 26.5.0
Dynamia Modules - Finances API
diff --git a/extensions/finances/sources/pom.xml b/extensions/finances/sources/pom.xml
index 12307fd7..4b33867a 100644
--- a/extensions/finances/sources/pom.xml
+++ b/extensions/finances/sources/pom.xml
@@ -26,7 +26,7 @@
tools.dynamia.modules
tools.dynamia.modules.parent
- 26.4.1
+ 26.5.0
../../pom.xml
diff --git a/extensions/pom.xml b/extensions/pom.xml
index a5b92e00..034828b4 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -6,7 +6,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../pom.xml
diff --git a/extensions/reports/packages/reports-sdk/package.json b/extensions/reports/packages/reports-sdk/package.json
index 7bd5e313..7e9fcc04 100644
--- a/extensions/reports/packages/reports-sdk/package.json
+++ b/extensions/reports/packages/reports-sdk/package.json
@@ -1,6 +1,6 @@
{
"name": "@dynamia-tools/reports-sdk",
- "version": "26.4.1",
+ "version": "26.5.0",
"website": "https://dynamia.tools",
"description": "TypeScript/JavaScript client SDK for the Dynamia Reports extension REST API",
"keywords": [
diff --git a/extensions/reports/sources/api/pom.xml b/extensions/reports/sources/api/pom.xml
index 4d2c4162..f278dee8 100644
--- a/extensions/reports/sources/api/pom.xml
+++ b/extensions/reports/sources/api/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules
tools.dynamia.modules.reports.parent
- 26.4.1
+ 26.5.0
DynamiaModules - Reports API
diff --git a/extensions/reports/sources/core/pom.xml b/extensions/reports/sources/core/pom.xml
index 388e29b8..0a15fc02 100644
--- a/extensions/reports/sources/core/pom.xml
+++ b/extensions/reports/sources/core/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules
tools.dynamia.modules.reports.parent
- 26.4.1
+ 26.5.0
DynamiaModules - Reports Core
@@ -50,17 +50,17 @@
tools.dynamia.modules
tools.dynamia.modules.reports.api
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain.jpa
- 26.4.1
+ 26.5.0
tools.dynamia.modules
tools.dynamia.modules.saas.jpa
- 26.4.1
+ 26.5.0
org.springframework
@@ -69,12 +69,12 @@
tools.dynamia
tools.dynamia.reports
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.templates
- 26.4.1
+ 26.5.0
compile
diff --git a/extensions/reports/sources/pom.xml b/extensions/reports/sources/pom.xml
index 3d7a7dff..9ff56312 100644
--- a/extensions/reports/sources/pom.xml
+++ b/extensions/reports/sources/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules
tools.dynamia.modules.parent
- 26.4.1
+ 26.5.0
../../pom.xml
diff --git a/extensions/reports/sources/ui/pom.xml b/extensions/reports/sources/ui/pom.xml
index b3c0f1c1..c8d93e6f 100644
--- a/extensions/reports/sources/ui/pom.xml
+++ b/extensions/reports/sources/ui/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules
tools.dynamia.modules.reports.parent
- 26.4.1
+ 26.5.0
DynamiaModules - Reports UI
@@ -49,17 +49,17 @@
tools.dynamia.modules
tools.dynamia.modules.reports.core
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.zk
- 26.4.1
+ 26.5.0
tools.dynamia.modules
tools.dynamia.modules.dashboard
- 26.4.1
+ 26.5.0
io.swagger.core.v3
diff --git a/extensions/saas/packages/saas-sdk/package.json b/extensions/saas/packages/saas-sdk/package.json
index 373b85c1..4496394a 100644
--- a/extensions/saas/packages/saas-sdk/package.json
+++ b/extensions/saas/packages/saas-sdk/package.json
@@ -1,6 +1,6 @@
{
"name": "@dynamia-tools/saas-sdk",
- "version": "26.4.1",
+ "version": "26.5.0",
"website": "https://dynamia.tools",
"description": "TypeScript/JavaScript client SDK for the Dynamia SaaS extension REST API",
"keywords": [
diff --git a/extensions/saas/sources/api/pom.xml b/extensions/saas/sources/api/pom.xml
index 8cb939f8..770a9341 100644
--- a/extensions/saas/sources/api/pom.xml
+++ b/extensions/saas/sources/api/pom.xml
@@ -26,7 +26,7 @@
tools.dynamia.modules
tools.dynamia.modules.saas.parent
- 26.4.1
+ 26.5.0
@@ -55,7 +55,7 @@
tools.dynamia
tools.dynamia.actions
- 26.4.1
+ 26.5.0
org.springframework.boot
diff --git a/extensions/saas/sources/core/pom.xml b/extensions/saas/sources/core/pom.xml
index dbca4eeb..c011e59a 100644
--- a/extensions/saas/sources/core/pom.xml
+++ b/extensions/saas/sources/core/pom.xml
@@ -22,7 +22,7 @@
tools.dynamia.modules
tools.dynamia.modules.saas.parent
- 26.4.1
+ 26.5.0
DynamiaModules - SaaS Core
@@ -49,18 +49,18 @@
tools.dynamia.modules
tools.dynamia.modules.saas.api
- 26.4.1
+ 26.5.0
tools.dynamia.modules
tools.dynamia.modules.saas.jpa
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
@@ -86,7 +86,7 @@
tools.dynamia.modules
tools.dynamia.modules.entityfiles
- 26.4.1
+ 26.5.0
org.hibernate.orm
diff --git a/extensions/saas/sources/jpa/pom.xml b/extensions/saas/sources/jpa/pom.xml
index d46b7378..d381c404 100644
--- a/extensions/saas/sources/jpa/pom.xml
+++ b/extensions/saas/sources/jpa/pom.xml
@@ -24,7 +24,7 @@
tools.dynamia.modules.saas.parent
tools.dynamia.modules
- 26.4.1
+ 26.5.0
DynamiaModules - SaaS JPA
@@ -35,12 +35,12 @@
tools.dynamia.modules
tools.dynamia.modules.saas.api
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain.jpa
- 26.4.1
+ 26.5.0
diff --git a/extensions/saas/sources/pom.xml b/extensions/saas/sources/pom.xml
index 5b9d53a7..4b66b577 100644
--- a/extensions/saas/sources/pom.xml
+++ b/extensions/saas/sources/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.modules
tools.dynamia.modules.parent
- 26.4.1
+ 26.5.0
../../pom.xml
diff --git a/extensions/saas/sources/remote/pom.xml b/extensions/saas/sources/remote/pom.xml
index c8aa1d0e..0c0557b4 100644
--- a/extensions/saas/sources/remote/pom.xml
+++ b/extensions/saas/sources/remote/pom.xml
@@ -25,7 +25,7 @@
tools.dynamia.modules.saas.parent
tools.dynamia.modules
- 26.4.1
+ 26.5.0
@@ -38,7 +38,7 @@
tools.dynamia.modules
tools.dynamia.modules.saas.jpa
- 26.4.1
+ 26.5.0
diff --git a/extensions/saas/sources/ui/pom.xml b/extensions/saas/sources/ui/pom.xml
index ae813d8d..d51a64e9 100644
--- a/extensions/saas/sources/ui/pom.xml
+++ b/extensions/saas/sources/ui/pom.xml
@@ -22,7 +22,7 @@
tools.dynamia.modules
tools.dynamia.modules.saas.parent
- 26.4.1
+ 26.5.0
DynamiaModules - SaaS UI
tools.dynamia.modules.saas.ui
@@ -54,12 +54,12 @@
tools.dynamia
tools.dynamia.zk
- 26.4.1
+ 26.5.0
tools.dynamia.modules
tools.dynamia.modules.saas
- 26.4.1
+ 26.5.0
@@ -70,7 +70,7 @@
tools.dynamia.modules
tools.dynamia.modules.entityfiles.ui
- 26.4.1
+ 26.5.0
diff --git a/extensions/security/sources/core/pom.xml b/extensions/security/sources/core/pom.xml
index 8230ac74..c340fd85 100644
--- a/extensions/security/sources/core/pom.xml
+++ b/extensions/security/sources/core/pom.xml
@@ -17,7 +17,7 @@
tools.dynamia.modules
tools.dynamia.modules.security.parent
- 26.4.1
+ 26.5.0
4.0.0
@@ -32,34 +32,34 @@
tools.dynamia.modules
tools.dynamia.modules.saas.api
- 26.4.1
+ 26.5.0
tools.dynamia.modules
tools.dynamia.modules.entityfiles
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain.jpa
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.web
- 26.4.1
+ 26.5.0
diff --git a/extensions/security/sources/pom.xml b/extensions/security/sources/pom.xml
index c2b0bcbb..426f8d2f 100644
--- a/extensions/security/sources/pom.xml
+++ b/extensions/security/sources/pom.xml
@@ -19,7 +19,7 @@
tools.dynamia.modules
tools.dynamia.modules.parent
- 26.4.1
+ 26.5.0
../../pom.xml
diff --git a/extensions/security/sources/ui/pom.xml b/extensions/security/sources/ui/pom.xml
index a023c6ac..da1546e5 100644
--- a/extensions/security/sources/ui/pom.xml
+++ b/extensions/security/sources/ui/pom.xml
@@ -17,7 +17,7 @@
tools.dynamia.modules
tools.dynamia.modules.security.parent
- 26.4.1
+ 26.5.0
DynamiaModules - Security UI
@@ -44,18 +44,18 @@
tools.dynamia.modules
tools.dynamia.modules.security
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.zk
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.app
- 26.4.1
+ 26.5.0
diff --git a/platform/app/pom.xml b/platform/app/pom.xml
index d5ab3d79..183f9f16 100644
--- a/platform/app/pom.xml
+++ b/platform/app/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../pom.xml
@@ -74,58 +74,58 @@
tools.dynamia
tools.dynamia.actions
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.crud
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.io
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.navigation
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.reports
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.templates
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.viewers
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.web
- 26.4.1
+ 26.5.0
@@ -205,7 +205,7 @@
tools.dynamia
tools.dynamia.domain.jpa
- 26.4.1
+ 26.5.0
test
diff --git a/platform/core/actions/pom.xml b/platform/core/actions/pom.xml
index 17b5079a..3f094e78 100644
--- a/platform/core/actions/pom.xml
+++ b/platform/core/actions/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -65,12 +65,12 @@
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
diff --git a/platform/core/commons/pom.xml b/platform/core/commons/pom.xml
index 51bbda17..9ce714f1 100644
--- a/platform/core/commons/pom.xml
+++ b/platform/core/commons/pom.xml
@@ -25,7 +25,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
DynamiaTools - Commons
diff --git a/platform/core/crud/pom.xml b/platform/core/crud/pom.xml
index b077e403..0cf2b142 100644
--- a/platform/core/crud/pom.xml
+++ b/platform/core/crud/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -62,23 +62,23 @@
tools.dynamia
tools.dynamia.actions
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.viewers
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.navigation
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain.jpa
- 26.4.1
+ 26.5.0
test
diff --git a/platform/core/domain-jpa/pom.xml b/platform/core/domain-jpa/pom.xml
index 15fba195..0aa32f31 100644
--- a/platform/core/domain-jpa/pom.xml
+++ b/platform/core/domain-jpa/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -65,7 +65,7 @@
tools.dynamia
tools.dynamia.domain
- 26.4.1
+ 26.5.0
diff --git a/platform/core/domain-jpa/src/main/java/tools/dynamia/domain/jpa/SimpleEntity.java b/platform/core/domain-jpa/src/main/java/tools/dynamia/domain/jpa/SimpleEntity.java
index badb4f94..d8520a9d 100644
--- a/platform/core/domain-jpa/src/main/java/tools/dynamia/domain/jpa/SimpleEntity.java
+++ b/platform/core/domain-jpa/src/main/java/tools/dynamia/domain/jpa/SimpleEntity.java
@@ -81,4 +81,12 @@ public Long getRemoteId() {
public void setRemoteId(Long remoteId) {
this.remoteId = remoteId;
}
+
+ /**
+ * Generic getter to query curent entity version
+ * @return version
+ */
+ public int currentVersion() {
+ return version;
+ }
}
diff --git a/platform/core/domain/pom.xml b/platform/core/domain/pom.xml
index aecb3486..5fac0789 100644
--- a/platform/core/domain/pom.xml
+++ b/platform/core/domain/pom.xml
@@ -26,7 +26,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
DynamiaTools - Domain
diff --git a/platform/core/integration/pom.xml b/platform/core/integration/pom.xml
index 7e38a862..4de4388f 100644
--- a/platform/core/integration/pom.xml
+++ b/platform/core/integration/pom.xml
@@ -27,7 +27,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -67,7 +67,7 @@
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
provided
diff --git a/platform/core/io/pom.xml b/platform/core/io/pom.xml
index 0d665e42..b91fc6a7 100644
--- a/platform/core/io/pom.xml
+++ b/platform/core/io/pom.xml
@@ -28,7 +28,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
diff --git a/platform/core/navigation/pom.xml b/platform/core/navigation/pom.xml
index 376bc029..d5257f64 100644
--- a/platform/core/navigation/pom.xml
+++ b/platform/core/navigation/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -63,17 +63,17 @@
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.actions
- 26.4.1
+ 26.5.0
diff --git a/platform/core/reports/pom.xml b/platform/core/reports/pom.xml
index 54d95537..c82663ec 100644
--- a/platform/core/reports/pom.xml
+++ b/platform/core/reports/pom.xml
@@ -26,7 +26,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
diff --git a/platform/core/templates/pom.xml b/platform/core/templates/pom.xml
index 57d96bc1..768a2c54 100644
--- a/platform/core/templates/pom.xml
+++ b/platform/core/templates/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia.parent
tools.dynamia
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -64,12 +64,12 @@
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
diff --git a/platform/core/viewers/pom.xml b/platform/core/viewers/pom.xml
index 2708cea1..556d68cb 100644
--- a/platform/core/viewers/pom.xml
+++ b/platform/core/viewers/pom.xml
@@ -25,7 +25,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -67,27 +67,27 @@
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.io
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.actions
- 26.4.1
+ 26.5.0
org.yaml
diff --git a/platform/core/web/pom.xml b/platform/core/web/pom.xml
index 09183fae..0fc777ca 100644
--- a/platform/core/web/pom.xml
+++ b/platform/core/web/pom.xml
@@ -29,7 +29,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -88,27 +88,27 @@
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.navigation
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.viewers
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.crud
- 26.4.1
+ 26.5.0
org.springframework
diff --git a/platform/core/web/src/main/java/tools/dynamia/web/util/HttpUtils.java b/platform/core/web/src/main/java/tools/dynamia/web/util/HttpUtils.java
index ac93086a..ea03caf7 100644
--- a/platform/core/web/src/main/java/tools/dynamia/web/util/HttpUtils.java
+++ b/platform/core/web/src/main/java/tools/dynamia/web/util/HttpUtils.java
@@ -26,6 +26,7 @@
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.StringJoiner;
@@ -421,5 +422,33 @@ public static String getSubdomain(HttpServletRequest request) {
}
return null;
}
+
+ /**
+ * Load request parameters in to map
+ *
+ * @param request request
+ * @return parameters map
+ */
+ public static Map loadParams(HttpServletRequest request) {
+ Map params = new HashMap<>();
+ request.getParameterNames().asIterator().forEachRemaining(name -> {
+ params.put(name, request.getParameter(name));
+ });
+ return params;
+ }
+
+ /**
+ * Load request headers in to a map
+ *
+ * @param request request
+ * @return headers
+ */
+ public static Map loadHeaders(HttpServletRequest request) {
+ Map headers = new HashMap<>();
+ request.getHeaderNames().asIterator().forEachRemaining(name -> {
+ headers.put(name, request.getHeader(name));
+ });
+ return headers;
+ }
}
diff --git a/platform/packages/cli/package-lock.json b/platform/packages/cli/package-lock.json
index 8ba6d016..7db0111b 100644
--- a/platform/packages/cli/package-lock.json
+++ b/platform/packages/cli/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@dynamia-tools/cli",
- "version": "26.4.1",
+ "version": "26.5.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@dynamia-tools/cli",
- "version": "26.4.1",
+ "version": "26.5.0",
"license": "Apache-2.0",
"dependencies": {
"@inquirer/prompts": "^7.0.0",
diff --git a/platform/packages/cli/package.json b/platform/packages/cli/package.json
index b927182c..a5f124ad 100644
--- a/platform/packages/cli/package.json
+++ b/platform/packages/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@dynamia-tools/cli",
- "version": "26.4.1",
+ "version": "26.5.0",
"description": "Dynamia Tools CLI — Scaffold new Dynamia Platform projects",
"keywords": [
"dynamia",
diff --git a/platform/packages/sdk/package-lock.json b/platform/packages/sdk/package-lock.json
index 4e95bbdd..972682d8 100644
--- a/platform/packages/sdk/package-lock.json
+++ b/platform/packages/sdk/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@dynamia-tools/sdk",
- "version": "26.4.1",
+ "version": "26.5.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@dynamia-tools/sdk",
- "version": "26.4.1",
+ "version": "26.5.0",
"license": "Apache-2.0",
"devDependencies": {
"@types/node": "^22.0.0",
diff --git a/platform/packages/sdk/package.json b/platform/packages/sdk/package.json
index 3ed457c3..f05b3d19 100644
--- a/platform/packages/sdk/package.json
+++ b/platform/packages/sdk/package.json
@@ -1,6 +1,6 @@
{
"name": "@dynamia-tools/sdk",
- "version": "26.4.1",
+ "version": "26.5.0",
"website": "https://dynamia.tools",
"description": "Official JavaScript / TypeScript client SDK for Dynamia Platform REST APIs",
"keywords": [
diff --git a/platform/packages/ui-core/package.json b/platform/packages/ui-core/package.json
index a317d131..0d773767 100644
--- a/platform/packages/ui-core/package.json
+++ b/platform/packages/ui-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@dynamia-tools/ui-core",
- "version": "26.4.1",
+ "version": "26.5.0",
"description": "Framework-agnostic view/viewer/renderer core for Dynamia Platform",
"keywords": [
"dynamia",
diff --git a/platform/packages/vue/package.json b/platform/packages/vue/package.json
index 833195ef..933db10d 100644
--- a/platform/packages/vue/package.json
+++ b/platform/packages/vue/package.json
@@ -1,6 +1,6 @@
{
"name": "@dynamia-tools/vue",
- "version": "26.4.1",
+ "version": "26.5.0",
"description": "Vue 3 adapter for Dynamia Platform UI",
"keywords": [
"dynamia",
diff --git a/platform/starters/zk-starter/pom.xml b/platform/starters/zk-starter/pom.xml
index 30d2feed..672308f4 100644
--- a/platform/starters/zk-starter/pom.xml
+++ b/platform/starters/zk-starter/pom.xml
@@ -4,7 +4,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -28,22 +28,22 @@
tools.dynamia
tools.dynamia.app
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.zk
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain.jpa
- 26.4.1
+ 26.5.0
org.hibernate.validator
diff --git a/platform/ui/ui-shared/pom.xml b/platform/ui/ui-shared/pom.xml
index c8a03fec..e3ddcd27 100644
--- a/platform/ui/ui-shared/pom.xml
+++ b/platform/ui/ui-shared/pom.xml
@@ -23,7 +23,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../../../pom.xml
@@ -64,17 +64,17 @@
tools.dynamia
tools.dynamia.integration
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.commons
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.io
- 26.4.1
+ 26.5.0
diff --git a/platform/ui/zk/pom.xml b/platform/ui/zk/pom.xml
index 87b6df56..b5a2799f 100644
--- a/platform/ui/zk/pom.xml
+++ b/platform/ui/zk/pom.xml
@@ -21,7 +21,7 @@
tools.dynamia.parent
tools.dynamia
- 26.4.1
+ 26.5.0
../../../pom.xml
4.0.0
@@ -99,31 +99,31 @@
tools.dynamia
tools.dynamia.web
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.navigation
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.ui
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.domain
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.viewers
- 26.4.1
+ 26.5.0
org.yaml
@@ -134,19 +134,19 @@
tools.dynamia
tools.dynamia.crud
- 26.4.1
+ 26.5.0
tools.dynamia
tools.dynamia.reports
- 26.4.1
+ 26.5.0
compile
tools.dynamia
tools.dynamia.templates
- 26.4.1
+ 26.5.0
compile
diff --git a/platform/ui/zk/src/main/java/tools/dynamia/zk/crud/cfg/SaveConfigAction.java b/platform/ui/zk/src/main/java/tools/dynamia/zk/crud/cfg/SaveConfigAction.java
index a725a649..03253a6c 100644
--- a/platform/ui/zk/src/main/java/tools/dynamia/zk/crud/cfg/SaveConfigAction.java
+++ b/platform/ui/zk/src/main/java/tools/dynamia/zk/crud/cfg/SaveConfigAction.java
@@ -25,6 +25,7 @@
import tools.dynamia.domain.query.Parameter;
import tools.dynamia.domain.query.Parameters;
import tools.dynamia.domain.services.CrudService;
+import tools.dynamia.integration.Containers;
import tools.dynamia.navigation.NavigationManager;
import tools.dynamia.ui.MessageType;
import tools.dynamia.ui.UIMessages;
diff --git a/platform/ui/zk/src/main/java/tools/dynamia/zk/viewers/form/FormViewRenderer.java b/platform/ui/zk/src/main/java/tools/dynamia/zk/viewers/form/FormViewRenderer.java
index 3bd21f34..849f25e1 100644
--- a/platform/ui/zk/src/main/java/tools/dynamia/zk/viewers/form/FormViewRenderer.java
+++ b/platform/ui/zk/src/main/java/tools/dynamia/zk/viewers/form/FormViewRenderer.java
@@ -71,7 +71,7 @@ public class FormViewRenderer implements ViewRenderer {
* Renders a descriptor into a form view instance.
*
* @param descriptor descriptor to render
- * @param value initial value
+ * @param value initial value
* @return rendered view
*/
@Override
@@ -100,9 +100,9 @@ public View render(ViewDescriptor descriptor, T value) {
/**
* Renders descriptor fields and actions into an existing form view instance.
*
- * @param view target form view
+ * @param view target form view
* @param descriptor descriptor to render
- * @param value initial value
+ * @param value initial value
* @return rendered view
*/
public View render(FormView view, ViewDescriptor descriptor, T value) {
@@ -125,11 +125,12 @@ public View render(FormView view, ViewDescriptor descriptor, T value) {
// protected METHODS
+
/**
* Calculates effective number of columns used by the form layout.
*
* @param view form view
- * @param d descriptor
+ * @param d descriptor
* @return number of columns in range 1..12
*/
protected int renderHeaders(FormView view, ViewDescriptor d) {
@@ -158,10 +159,10 @@ protected int renderHeaders(FormView view, ViewDescriptor d) {
/**
* Renders ungrouped and grouped fields into form rows.
*
- * @param view target form view
+ * @param view target form view
* @param viewDesc descriptor
* @param realCols effective columns
- * @param value current value
+ * @param value current value
* @return root rendered component
*/
protected Component renderRows(FormView view, ViewDescriptor viewDesc, int realCols, T value) {
@@ -176,14 +177,16 @@ protected Component renderRows(FormView view, ViewDescriptor viewDesc, int re
for (Field field : ViewRendererUtil.filterRenderableFields(view, viewDesc)) {
- if (!hasSpace(row, realCols, field)) {
- row = newRow();
- row.setParent(panelBody);
- if (panel.getParent() == null) {
- panel.setParent(view.getContentArea());
+ if (field.getGroup() == null) {
+ if (!hasSpace(row, realCols, field)) {
+ row = newRow();
+ row.setParent(panelBody);
+ if (panel.getParent() == null) {
+ panel.setParent(view.getContentArea());
+ }
}
+ renderField(row, field, view.getBinder(), view, value, realCols);
}
- renderField(row, field, view.getBinder(), view, value, realCols);
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e4d79b1..acd9e4b2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,7 +13,7 @@ importers:
version: 22.19.15
'@vitest/coverage-v8':
specifier: ^3.0.0
- version: 3.2.4(vitest@3.2.4(@types/node@22.19.15))
+ version: 3.2.4(vitest@3.2.4(@types/node@22.19.15)(tsx@4.22.0))
eslint:
specifier: ^9.0.0
version: 9.39.4
@@ -25,13 +25,13 @@ importers:
version: 5.9.3
vite:
specifier: ^6.2.0
- version: 6.4.1(@types/node@22.19.15)
+ version: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vite-plugin-dts:
specifier: ^4.5.0
- version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15))
+ version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
vitest:
specifier: ^3.0.0
- version: 3.2.4(@types/node@22.19.15)
+ version: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
extensions/entity-files/packages/files-sdk:
devDependencies:
@@ -43,19 +43,62 @@ importers:
version: 22.19.15
'@vitest/coverage-v8':
specifier: ^3.0.0
- version: 3.2.4(vitest@3.2.4(@types/node@22.19.15))
+ version: 3.2.4(vitest@3.2.4(@types/node@22.19.15)(tsx@4.22.0))
typescript:
specifier: ^5.7.0
version: 5.9.3
vite:
specifier: ^6.2.0
- version: 6.4.1(@types/node@22.19.15)
+ version: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vite-plugin-dts:
specifier: ^4.5.0
- version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15))
+ version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
vitest:
specifier: ^3.0.0
- version: 3.2.4(@types/node@22.19.15)
+ version: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
+
+ extensions/entity-files/packages/simple-file-server:
+ dependencies:
+ '@hono/node-server':
+ specifier: ^1.13.7
+ version: 1.19.14(hono@4.12.18)
+ commander:
+ specifier: ^13.1.0
+ version: 13.1.0
+ hono:
+ specifier: ^4.7.10
+ version: 4.12.18
+ mime-types:
+ specifier: ^2.1.35
+ version: 2.1.35
+ sharp:
+ specifier: ^0.34.1
+ version: 0.34.5
+ uuid:
+ specifier: ^11.1.0
+ version: 11.1.1
+ devDependencies:
+ '@types/mime-types':
+ specifier: ^2.1.4
+ version: 2.1.4
+ '@types/node':
+ specifier: ^22.0.0
+ version: 22.19.15
+ '@types/uuid':
+ specifier: ^10.0.0
+ version: 10.0.0
+ tsup:
+ specifier: ^8.4.0
+ version: 8.5.1(@microsoft/api-extractor@7.57.7(@types/node@22.19.15))(postcss@8.5.8)(tsx@4.22.0)(typescript@5.9.3)
+ tsx:
+ specifier: ^4.19.0
+ version: 4.22.0
+ typescript:
+ specifier: ^5.7.0
+ version: 5.9.3
+ vitest:
+ specifier: ^3.0.0
+ version: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
extensions/reports/packages/reports-sdk:
devDependencies:
@@ -67,19 +110,19 @@ importers:
version: 22.19.15
'@vitest/coverage-v8':
specifier: ^3.0.0
- version: 3.2.4(vitest@3.2.4(@types/node@22.19.15))
+ version: 3.2.4(vitest@3.2.4(@types/node@22.19.15)(tsx@4.22.0))
typescript:
specifier: ^5.7.0
version: 5.9.3
vite:
specifier: ^6.2.0
- version: 6.4.1(@types/node@22.19.15)
+ version: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vite-plugin-dts:
specifier: ^4.5.0
- version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15))
+ version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
vitest:
specifier: ^3.0.0
- version: 3.2.4(@types/node@22.19.15)
+ version: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
extensions/saas/packages/saas-sdk:
devDependencies:
@@ -91,19 +134,19 @@ importers:
version: 22.19.15
'@vitest/coverage-v8':
specifier: ^3.0.0
- version: 3.2.4(vitest@3.2.4(@types/node@22.19.15))
+ version: 3.2.4(vitest@3.2.4(@types/node@22.19.15)(tsx@4.22.0))
typescript:
specifier: ^5.7.0
version: 5.9.3
vite:
specifier: ^6.2.0
- version: 6.4.1(@types/node@22.19.15)
+ version: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vite-plugin-dts:
specifier: ^4.5.0
- version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15))
+ version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
vitest:
specifier: ^3.0.0
- version: 3.2.4(@types/node@22.19.15)
+ version: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
platform/packages/cli:
dependencies:
@@ -134,19 +177,19 @@ importers:
version: 22.19.15
'@vitest/coverage-v8':
specifier: ^3.0.0
- version: 3.2.4(vitest@3.2.4(@types/node@22.19.15))
+ version: 3.2.4(vitest@3.2.4(@types/node@22.19.15)(tsx@4.22.0))
typescript:
specifier: ^5.7.0
version: 5.9.3
vite:
specifier: ^6.2.0
- version: 6.4.1(@types/node@22.19.15)
+ version: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vite-plugin-dts:
specifier: ^4.5.0
- version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15))
+ version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
vitest:
specifier: ^3.0.0
- version: 3.2.4(@types/node@22.19.15)
+ version: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
platform/packages/ui-core:
dependencies:
@@ -162,13 +205,13 @@ importers:
version: 5.9.3
vite:
specifier: ^6.2.0
- version: 6.4.1(@types/node@22.19.15)
+ version: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vite-plugin-dts:
specifier: ^4.5.0
- version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15))
+ version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
vitest:
specifier: ^3.0.0
- version: 3.2.4(@types/node@22.19.15)
+ version: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
platform/packages/vue:
dependencies:
@@ -184,16 +227,16 @@ importers:
version: 22.19.15
'@vitejs/plugin-vue':
specifier: ^5.0.0
- version: 5.2.4(vite@6.4.1(@types/node@22.19.15))(vue@3.5.30(typescript@5.9.3))
+ version: 5.2.4(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))(vue@3.5.30(typescript@5.9.3))
typescript:
specifier: ^5.7.0
version: 5.9.3
vite:
specifier: ^6.2.0
- version: 6.4.1(@types/node@22.19.15)
+ version: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vite-plugin-dts:
specifier: ^4.5.0
- version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15))
+ version: 4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
vue:
specifier: ^3.4.0
version: 3.5.30(typescript@5.9.3)
@@ -228,162 +271,477 @@ packages:
resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
engines: {node: '>=18'}
+ '@emnapi/runtime@1.10.0':
+ resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==}
+
'@esbuild/aix-ppc64@0.25.12':
resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}
engines: {node: '>=18'}
cpu: [ppc64]
os: [aix]
+ '@esbuild/aix-ppc64@0.27.7':
+ resolution: {integrity: sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==}
+ engines: {node: '>=18'}
+ cpu: [ppc64]
+ os: [aix]
+
+ '@esbuild/aix-ppc64@0.28.0':
+ resolution: {integrity: sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==}
+ engines: {node: '>=18'}
+ cpu: [ppc64]
+ os: [aix]
+
'@esbuild/android-arm64@0.25.12':
resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==}
engines: {node: '>=18'}
cpu: [arm64]
os: [android]
+ '@esbuild/android-arm64@0.27.7':
+ resolution: {integrity: sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [android]
+
+ '@esbuild/android-arm64@0.28.0':
+ resolution: {integrity: sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [android]
+
'@esbuild/android-arm@0.25.12':
resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==}
engines: {node: '>=18'}
cpu: [arm]
os: [android]
+ '@esbuild/android-arm@0.27.7':
+ resolution: {integrity: sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==}
+ engines: {node: '>=18'}
+ cpu: [arm]
+ os: [android]
+
+ '@esbuild/android-arm@0.28.0':
+ resolution: {integrity: sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==}
+ engines: {node: '>=18'}
+ cpu: [arm]
+ os: [android]
+
'@esbuild/android-x64@0.25.12':
resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==}
engines: {node: '>=18'}
cpu: [x64]
os: [android]
+ '@esbuild/android-x64@0.27.7':
+ resolution: {integrity: sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [android]
+
+ '@esbuild/android-x64@0.28.0':
+ resolution: {integrity: sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [android]
+
'@esbuild/darwin-arm64@0.25.12':
resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==}
engines: {node: '>=18'}
cpu: [arm64]
os: [darwin]
+ '@esbuild/darwin-arm64@0.27.7':
+ resolution: {integrity: sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@esbuild/darwin-arm64@0.28.0':
+ resolution: {integrity: sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [darwin]
+
'@esbuild/darwin-x64@0.25.12':
resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==}
engines: {node: '>=18'}
cpu: [x64]
os: [darwin]
+ '@esbuild/darwin-x64@0.27.7':
+ resolution: {integrity: sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [darwin]
+
+ '@esbuild/darwin-x64@0.28.0':
+ resolution: {integrity: sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [darwin]
+
'@esbuild/freebsd-arm64@0.25.12':
resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}
engines: {node: '>=18'}
cpu: [arm64]
os: [freebsd]
+ '@esbuild/freebsd-arm64@0.27.7':
+ resolution: {integrity: sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [freebsd]
+
+ '@esbuild/freebsd-arm64@0.28.0':
+ resolution: {integrity: sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [freebsd]
+
'@esbuild/freebsd-x64@0.25.12':
resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==}
engines: {node: '>=18'}
cpu: [x64]
os: [freebsd]
+ '@esbuild/freebsd-x64@0.27.7':
+ resolution: {integrity: sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [freebsd]
+
+ '@esbuild/freebsd-x64@0.28.0':
+ resolution: {integrity: sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [freebsd]
+
'@esbuild/linux-arm64@0.25.12':
resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [linux]
+ '@esbuild/linux-arm64@0.27.7':
+ resolution: {integrity: sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [linux]
+
+ '@esbuild/linux-arm64@0.28.0':
+ resolution: {integrity: sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [linux]
+
'@esbuild/linux-arm@0.25.12':
resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==}
engines: {node: '>=18'}
cpu: [arm]
os: [linux]
+ '@esbuild/linux-arm@0.27.7':
+ resolution: {integrity: sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==}
+ engines: {node: '>=18'}
+ cpu: [arm]
+ os: [linux]
+
+ '@esbuild/linux-arm@0.28.0':
+ resolution: {integrity: sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==}
+ engines: {node: '>=18'}
+ cpu: [arm]
+ os: [linux]
+
'@esbuild/linux-ia32@0.25.12':
resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==}
engines: {node: '>=18'}
cpu: [ia32]
os: [linux]
+ '@esbuild/linux-ia32@0.27.7':
+ resolution: {integrity: sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==}
+ engines: {node: '>=18'}
+ cpu: [ia32]
+ os: [linux]
+
+ '@esbuild/linux-ia32@0.28.0':
+ resolution: {integrity: sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==}
+ engines: {node: '>=18'}
+ cpu: [ia32]
+ os: [linux]
+
'@esbuild/linux-loong64@0.25.12':
resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==}
engines: {node: '>=18'}
cpu: [loong64]
os: [linux]
+ '@esbuild/linux-loong64@0.27.7':
+ resolution: {integrity: sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==}
+ engines: {node: '>=18'}
+ cpu: [loong64]
+ os: [linux]
+
+ '@esbuild/linux-loong64@0.28.0':
+ resolution: {integrity: sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==}
+ engines: {node: '>=18'}
+ cpu: [loong64]
+ os: [linux]
+
'@esbuild/linux-mips64el@0.25.12':
resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==}
engines: {node: '>=18'}
cpu: [mips64el]
os: [linux]
+ '@esbuild/linux-mips64el@0.27.7':
+ resolution: {integrity: sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==}
+ engines: {node: '>=18'}
+ cpu: [mips64el]
+ os: [linux]
+
+ '@esbuild/linux-mips64el@0.28.0':
+ resolution: {integrity: sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==}
+ engines: {node: '>=18'}
+ cpu: [mips64el]
+ os: [linux]
+
'@esbuild/linux-ppc64@0.25.12':
resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==}
engines: {node: '>=18'}
cpu: [ppc64]
os: [linux]
+ '@esbuild/linux-ppc64@0.27.7':
+ resolution: {integrity: sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==}
+ engines: {node: '>=18'}
+ cpu: [ppc64]
+ os: [linux]
+
+ '@esbuild/linux-ppc64@0.28.0':
+ resolution: {integrity: sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==}
+ engines: {node: '>=18'}
+ cpu: [ppc64]
+ os: [linux]
+
'@esbuild/linux-riscv64@0.25.12':
resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==}
engines: {node: '>=18'}
cpu: [riscv64]
os: [linux]
+ '@esbuild/linux-riscv64@0.27.7':
+ resolution: {integrity: sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==}
+ engines: {node: '>=18'}
+ cpu: [riscv64]
+ os: [linux]
+
+ '@esbuild/linux-riscv64@0.28.0':
+ resolution: {integrity: sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==}
+ engines: {node: '>=18'}
+ cpu: [riscv64]
+ os: [linux]
+
'@esbuild/linux-s390x@0.25.12':
resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==}
engines: {node: '>=18'}
cpu: [s390x]
os: [linux]
+ '@esbuild/linux-s390x@0.27.7':
+ resolution: {integrity: sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==}
+ engines: {node: '>=18'}
+ cpu: [s390x]
+ os: [linux]
+
+ '@esbuild/linux-s390x@0.28.0':
+ resolution: {integrity: sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==}
+ engines: {node: '>=18'}
+ cpu: [s390x]
+ os: [linux]
+
'@esbuild/linux-x64@0.25.12':
resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==}
engines: {node: '>=18'}
cpu: [x64]
os: [linux]
+ '@esbuild/linux-x64@0.27.7':
+ resolution: {integrity: sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [linux]
+
+ '@esbuild/linux-x64@0.28.0':
+ resolution: {integrity: sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [linux]
+
'@esbuild/netbsd-arm64@0.25.12':
resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}
engines: {node: '>=18'}
cpu: [arm64]
os: [netbsd]
+ '@esbuild/netbsd-arm64@0.27.7':
+ resolution: {integrity: sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [netbsd]
+
+ '@esbuild/netbsd-arm64@0.28.0':
+ resolution: {integrity: sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [netbsd]
+
'@esbuild/netbsd-x64@0.25.12':
resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==}
engines: {node: '>=18'}
cpu: [x64]
os: [netbsd]
+ '@esbuild/netbsd-x64@0.27.7':
+ resolution: {integrity: sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [netbsd]
+
+ '@esbuild/netbsd-x64@0.28.0':
+ resolution: {integrity: sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [netbsd]
+
'@esbuild/openbsd-arm64@0.25.12':
resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}
engines: {node: '>=18'}
cpu: [arm64]
os: [openbsd]
+ '@esbuild/openbsd-arm64@0.27.7':
+ resolution: {integrity: sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [openbsd]
+
+ '@esbuild/openbsd-arm64@0.28.0':
+ resolution: {integrity: sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [openbsd]
+
'@esbuild/openbsd-x64@0.25.12':
resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==}
engines: {node: '>=18'}
cpu: [x64]
os: [openbsd]
+ '@esbuild/openbsd-x64@0.27.7':
+ resolution: {integrity: sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [openbsd]
+
+ '@esbuild/openbsd-x64@0.28.0':
+ resolution: {integrity: sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [openbsd]
+
'@esbuild/openharmony-arm64@0.25.12':
resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}
engines: {node: '>=18'}
cpu: [arm64]
os: [openharmony]
+ '@esbuild/openharmony-arm64@0.27.7':
+ resolution: {integrity: sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [openharmony]
+
+ '@esbuild/openharmony-arm64@0.28.0':
+ resolution: {integrity: sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [openharmony]
+
'@esbuild/sunos-x64@0.25.12':
resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==}
engines: {node: '>=18'}
cpu: [x64]
os: [sunos]
+ '@esbuild/sunos-x64@0.27.7':
+ resolution: {integrity: sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [sunos]
+
+ '@esbuild/sunos-x64@0.28.0':
+ resolution: {integrity: sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [sunos]
+
'@esbuild/win32-arm64@0.25.12':
resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==}
engines: {node: '>=18'}
cpu: [arm64]
os: [win32]
+ '@esbuild/win32-arm64@0.27.7':
+ resolution: {integrity: sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [win32]
+
+ '@esbuild/win32-arm64@0.28.0':
+ resolution: {integrity: sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [win32]
+
'@esbuild/win32-ia32@0.25.12':
resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==}
engines: {node: '>=18'}
cpu: [ia32]
os: [win32]
+ '@esbuild/win32-ia32@0.27.7':
+ resolution: {integrity: sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==}
+ engines: {node: '>=18'}
+ cpu: [ia32]
+ os: [win32]
+
+ '@esbuild/win32-ia32@0.28.0':
+ resolution: {integrity: sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==}
+ engines: {node: '>=18'}
+ cpu: [ia32]
+ os: [win32]
+
'@esbuild/win32-x64@0.25.12':
resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==}
engines: {node: '>=18'}
cpu: [x64]
os: [win32]
+ '@esbuild/win32-x64@0.27.7':
+ resolution: {integrity: sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [win32]
+
+ '@esbuild/win32-x64@0.28.0':
+ resolution: {integrity: sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [win32]
+
'@eslint-community/eslint-utils@4.9.1':
resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -422,6 +780,12 @@ packages:
resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@hono/node-server@1.19.14':
+ resolution: {integrity: sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==}
+ engines: {node: '>=18.14.1'}
+ peerDependencies:
+ hono: ^4
+
'@humanfs/core@0.19.1':
resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
engines: {node: '>=18.18.0'}
@@ -438,6 +802,159 @@ packages:
resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
engines: {node: '>=18.18'}
+ '@img/colour@1.1.0':
+ resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
+ engines: {node: '>=18'}
+
+ '@img/sharp-darwin-arm64@0.34.5':
+ resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@img/sharp-darwin-x64@0.34.5':
+ resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [darwin]
+
+ '@img/sharp-libvips-darwin-arm64@1.2.4':
+ resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@img/sharp-libvips-darwin-x64@1.2.4':
+ resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
+ cpu: [x64]
+ os: [darwin]
+
+ '@img/sharp-libvips-linux-arm64@1.2.4':
+ resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
+ cpu: [arm64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-libvips-linux-arm@1.2.4':
+ resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
+ cpu: [arm]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-libvips-linux-ppc64@1.2.4':
+ resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
+ cpu: [ppc64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-libvips-linux-riscv64@1.2.4':
+ resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
+ cpu: [riscv64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-libvips-linux-s390x@1.2.4':
+ resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
+ cpu: [s390x]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-libvips-linux-x64@1.2.4':
+ resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
+ cpu: [x64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+ resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
+ cpu: [arm64]
+ os: [linux]
+ libc: [musl]
+
+ '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+ resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
+ cpu: [x64]
+ os: [linux]
+ libc: [musl]
+
+ '@img/sharp-linux-arm64@0.34.5':
+ resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-linux-arm@0.34.5':
+ resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-linux-ppc64@0.34.5':
+ resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [ppc64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-linux-riscv64@0.34.5':
+ resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [riscv64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-linux-s390x@0.34.5':
+ resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [s390x]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-linux-x64@0.34.5':
+ resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [linux]
+ libc: [glibc]
+
+ '@img/sharp-linuxmusl-arm64@0.34.5':
+ resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm64]
+ os: [linux]
+ libc: [musl]
+
+ '@img/sharp-linuxmusl-x64@0.34.5':
+ resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [linux]
+ libc: [musl]
+
+ '@img/sharp-wasm32@0.34.5':
+ resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [wasm32]
+
+ '@img/sharp-win32-arm64@0.34.5':
+ resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm64]
+ os: [win32]
+
+ '@img/sharp-win32-ia32@0.34.5':
+ resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [ia32]
+ os: [win32]
+
+ '@img/sharp-win32-x64@0.34.5':
+ resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [win32]
+
'@inquirer/ansi@1.0.2':
resolution: {integrity: sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==}
engines: {node: '>=18'}
@@ -809,12 +1326,18 @@ packages:
'@types/json-schema@7.0.15':
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+ '@types/mime-types@2.1.4':
+ resolution: {integrity: sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==}
+
'@types/node@22.19.15':
resolution: {integrity: sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==}
'@types/node@24.12.2':
resolution: {integrity: sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==}
+ '@types/uuid@10.0.0':
+ resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
+
'@vitejs/plugin-vue@5.2.4':
resolution: {integrity: sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -980,6 +1503,9 @@ packages:
resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
engines: {node: '>=12'}
+ any-promise@1.3.0:
+ resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
+
argparse@1.0.10:
resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
@@ -1010,6 +1536,12 @@ packages:
resolution: {integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==}
engines: {node: 18 || 20 || >=22}
+ bundle-require@5.1.0:
+ resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==}
+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+ peerDependencies:
+ esbuild: '>=0.18'
+
cac@6.7.14:
resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
engines: {node: '>=8'}
@@ -1037,6 +1569,10 @@ packages:
resolution: {integrity: sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==}
engines: {node: '>= 16'}
+ chokidar@4.0.3:
+ resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+ engines: {node: '>= 14.16.0'}
+
cli-cursor@5.0.0:
resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
engines: {node: '>=18'}
@@ -1056,6 +1592,14 @@ packages:
color-name@1.1.4:
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+ commander@13.1.0:
+ resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==}
+ engines: {node: '>=18'}
+
+ commander@4.1.1:
+ resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
+ engines: {node: '>= 6'}
+
compare-versions@6.1.1:
resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
@@ -1068,6 +1612,10 @@ packages:
confbox@0.2.4:
resolution: {integrity: sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==}
+ consola@3.4.2:
+ resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==}
+ engines: {node: ^14.18.0 || >=16.10.0}
+
cross-spawn@7.0.6:
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
engines: {node: '>= 8'}
@@ -1094,6 +1642,10 @@ packages:
deep-is@0.1.4:
resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+ detect-libc@2.1.2:
+ resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+ engines: {node: '>=8'}
+
diff@8.0.3:
resolution: {integrity: sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==}
engines: {node: '>=0.3.1'}
@@ -1122,6 +1674,16 @@ packages:
engines: {node: '>=18'}
hasBin: true
+ esbuild@0.27.7:
+ resolution: {integrity: sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==}
+ engines: {node: '>=18'}
+ hasBin: true
+
+ esbuild@0.28.0:
+ resolution: {integrity: sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==}
+ engines: {node: '>=18'}
+ hasBin: true
+
escape-string-regexp@4.0.0:
resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
engines: {node: '>=10'}
@@ -1218,6 +1780,9 @@ packages:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
engines: {node: '>=10'}
+ fix-dts-default-cjs-exports@1.0.1:
+ resolution: {integrity: sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==}
+
flat-cache@4.0.1:
resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
engines: {node: '>=16'}
@@ -1277,6 +1842,10 @@ packages:
resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
hasBin: true
+ hono@4.12.18:
+ resolution: {integrity: sha512-RWzP96k/yv0PQfyXnWjs6zot20TqfpfsNXhOnev8d1InAxubW93L11/oNUc3tQqn2G0bSdAOBpX+2uDFHV7kdQ==}
+ engines: {node: '>=16.9.0'}
+
html-escaper@2.0.2:
resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
@@ -1365,6 +1934,10 @@ packages:
jju@1.4.0:
resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
+ joycon@3.1.1:
+ resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+ engines: {node: '>=10'}
+
js-tokens@10.0.0:
resolution: {integrity: sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==}
@@ -1400,6 +1973,17 @@ packages:
resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
engines: {node: '>= 0.8.0'}
+ lilconfig@3.1.3:
+ resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
+ engines: {node: '>=14'}
+
+ lines-and-columns@1.2.4:
+ resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+ load-tsconfig@0.2.5:
+ resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
local-pkg@1.1.2:
resolution: {integrity: sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==}
engines: {node: '>=14'}
@@ -1438,6 +2022,14 @@ packages:
resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
engines: {node: '>=10'}
+ mime-db@1.52.0:
+ resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+ engines: {node: '>= 0.6'}
+
+ mime-types@2.1.35:
+ resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+ engines: {node: '>= 0.6'}
+
mimic-function@5.0.1:
resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
engines: {node: '>=18'}
@@ -1474,6 +2066,9 @@ packages:
resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==}
engines: {node: ^18.17.0 || >=20.5.0}
+ mz@2.7.0:
+ resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
+
nanoid@3.3.11:
resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -1486,6 +2081,10 @@ packages:
resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==}
engines: {node: '>=18'}
+ object-assign@4.1.1:
+ resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+ engines: {node: '>=0.10.0'}
+
onetime@7.0.0:
resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
engines: {node: '>=18'}
@@ -1553,12 +2152,34 @@ packages:
resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
engines: {node: '>=12'}
+ pirates@4.0.7:
+ resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
+ engines: {node: '>= 6'}
+
pkg-types@1.3.1:
resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
pkg-types@2.3.0:
resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
+ postcss-load-config@6.0.1:
+ resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
+ engines: {node: '>= 18'}
+ peerDependencies:
+ jiti: '>=1.21.0'
+ postcss: '>=8.0.9'
+ tsx: ^4.8.1
+ yaml: ^2.4.2
+ peerDependenciesMeta:
+ jiti:
+ optional: true
+ postcss:
+ optional: true
+ tsx:
+ optional: true
+ yaml:
+ optional: true
+
postcss@8.5.8:
resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==}
engines: {node: ^10 || ^12 || >=14}
@@ -1583,6 +2204,10 @@ packages:
quansync@0.2.11:
resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
+ readdirp@4.1.2:
+ resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+ engines: {node: '>= 14.18.0'}
+
require-from-string@2.0.2:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
@@ -1591,6 +2216,10 @@ packages:
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
engines: {node: '>=4'}
+ resolve-from@5.0.0:
+ resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+ engines: {node: '>=8'}
+
resolve@1.22.11:
resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==}
engines: {node: '>= 0.4'}
@@ -1618,6 +2247,10 @@ packages:
engines: {node: '>=10'}
hasBin: true
+ sharp@0.34.5:
+ resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
shebang-command@2.0.0:
resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
engines: {node: '>=8'}
@@ -1641,6 +2274,10 @@ packages:
resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
engines: {node: '>=0.10.0'}
+ source-map@0.7.6:
+ resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
+ engines: {node: '>= 12'}
+
sprintf-js@1.0.3:
resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
@@ -1689,6 +2326,11 @@ packages:
strip-literal@3.1.0:
resolution: {integrity: sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==}
+ sucrase@3.35.1:
+ resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==}
+ engines: {node: '>=16 || 14 >=14.17'}
+ hasBin: true
+
supports-color@7.2.0:
resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
engines: {node: '>=8'}
@@ -1705,6 +2347,13 @@ packages:
resolution: {integrity: sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==}
engines: {node: '>=18'}
+ thenify-all@1.6.0:
+ resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
+ engines: {node: '>=0.8'}
+
+ thenify@3.3.1:
+ resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
+
tinybench@2.9.0:
resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
@@ -1723,9 +2372,43 @@ packages:
resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
engines: {node: '>=14.0.0'}
- tinyspy@4.0.4:
- resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
- engines: {node: '>=14.0.0'}
+ tinyspy@4.0.4:
+ resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
+ engines: {node: '>=14.0.0'}
+
+ tree-kill@1.2.2:
+ resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+ hasBin: true
+
+ ts-interface-checker@0.1.13:
+ resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
+
+ tslib@2.8.1:
+ resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+ tsup@8.5.1:
+ resolution: {integrity: sha512-xtgkqwdhpKWr3tKPmCkvYmS9xnQK3m3XgxZHwSUjvfTjp7YfXe5tT3GgWi0F2N+ZSMsOeWeZFh7ZZFg5iPhing==}
+ engines: {node: '>=18'}
+ hasBin: true
+ peerDependencies:
+ '@microsoft/api-extractor': ^7.36.0
+ '@swc/core': ^1
+ postcss: ^8.4.12
+ typescript: '>=4.5.0'
+ peerDependenciesMeta:
+ '@microsoft/api-extractor':
+ optional: true
+ '@swc/core':
+ optional: true
+ postcss:
+ optional: true
+ typescript:
+ optional: true
+
+ tsx@4.22.0:
+ resolution: {integrity: sha512-8ccZMPD69s1AbKXx0C5ddTNZfNjwV04iIKgjZmKfKxMynEtSYcK0Lh7iQFh53fI5Yu4pb9usgAiqyPmEONaALg==}
+ engines: {node: '>=18.0.0'}
+ hasBin: true
type-check@0.4.0:
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
@@ -1761,6 +2444,10 @@ packages:
uri-js@4.4.1:
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+ uuid@11.1.1:
+ resolution: {integrity: sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==}
+ hasBin: true
+
vite-node@3.2.4:
resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -1923,84 +2610,245 @@ snapshots:
'@bcoe/v8-coverage@1.0.2': {}
+ '@emnapi/runtime@1.10.0':
+ dependencies:
+ tslib: 2.8.1
+ optional: true
+
'@esbuild/aix-ppc64@0.25.12':
optional: true
+ '@esbuild/aix-ppc64@0.27.7':
+ optional: true
+
+ '@esbuild/aix-ppc64@0.28.0':
+ optional: true
+
'@esbuild/android-arm64@0.25.12':
optional: true
+ '@esbuild/android-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/android-arm64@0.28.0':
+ optional: true
+
'@esbuild/android-arm@0.25.12':
optional: true
+ '@esbuild/android-arm@0.27.7':
+ optional: true
+
+ '@esbuild/android-arm@0.28.0':
+ optional: true
+
'@esbuild/android-x64@0.25.12':
optional: true
+ '@esbuild/android-x64@0.27.7':
+ optional: true
+
+ '@esbuild/android-x64@0.28.0':
+ optional: true
+
'@esbuild/darwin-arm64@0.25.12':
optional: true
+ '@esbuild/darwin-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/darwin-arm64@0.28.0':
+ optional: true
+
'@esbuild/darwin-x64@0.25.12':
optional: true
+ '@esbuild/darwin-x64@0.27.7':
+ optional: true
+
+ '@esbuild/darwin-x64@0.28.0':
+ optional: true
+
'@esbuild/freebsd-arm64@0.25.12':
optional: true
+ '@esbuild/freebsd-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/freebsd-arm64@0.28.0':
+ optional: true
+
'@esbuild/freebsd-x64@0.25.12':
optional: true
+ '@esbuild/freebsd-x64@0.27.7':
+ optional: true
+
+ '@esbuild/freebsd-x64@0.28.0':
+ optional: true
+
'@esbuild/linux-arm64@0.25.12':
optional: true
+ '@esbuild/linux-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/linux-arm64@0.28.0':
+ optional: true
+
'@esbuild/linux-arm@0.25.12':
optional: true
+ '@esbuild/linux-arm@0.27.7':
+ optional: true
+
+ '@esbuild/linux-arm@0.28.0':
+ optional: true
+
'@esbuild/linux-ia32@0.25.12':
optional: true
+ '@esbuild/linux-ia32@0.27.7':
+ optional: true
+
+ '@esbuild/linux-ia32@0.28.0':
+ optional: true
+
'@esbuild/linux-loong64@0.25.12':
optional: true
+ '@esbuild/linux-loong64@0.27.7':
+ optional: true
+
+ '@esbuild/linux-loong64@0.28.0':
+ optional: true
+
'@esbuild/linux-mips64el@0.25.12':
optional: true
+ '@esbuild/linux-mips64el@0.27.7':
+ optional: true
+
+ '@esbuild/linux-mips64el@0.28.0':
+ optional: true
+
'@esbuild/linux-ppc64@0.25.12':
optional: true
+ '@esbuild/linux-ppc64@0.27.7':
+ optional: true
+
+ '@esbuild/linux-ppc64@0.28.0':
+ optional: true
+
'@esbuild/linux-riscv64@0.25.12':
optional: true
+ '@esbuild/linux-riscv64@0.27.7':
+ optional: true
+
+ '@esbuild/linux-riscv64@0.28.0':
+ optional: true
+
'@esbuild/linux-s390x@0.25.12':
optional: true
+ '@esbuild/linux-s390x@0.27.7':
+ optional: true
+
+ '@esbuild/linux-s390x@0.28.0':
+ optional: true
+
'@esbuild/linux-x64@0.25.12':
optional: true
+ '@esbuild/linux-x64@0.27.7':
+ optional: true
+
+ '@esbuild/linux-x64@0.28.0':
+ optional: true
+
'@esbuild/netbsd-arm64@0.25.12':
optional: true
+ '@esbuild/netbsd-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/netbsd-arm64@0.28.0':
+ optional: true
+
'@esbuild/netbsd-x64@0.25.12':
optional: true
+ '@esbuild/netbsd-x64@0.27.7':
+ optional: true
+
+ '@esbuild/netbsd-x64@0.28.0':
+ optional: true
+
'@esbuild/openbsd-arm64@0.25.12':
optional: true
+ '@esbuild/openbsd-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/openbsd-arm64@0.28.0':
+ optional: true
+
'@esbuild/openbsd-x64@0.25.12':
optional: true
+ '@esbuild/openbsd-x64@0.27.7':
+ optional: true
+
+ '@esbuild/openbsd-x64@0.28.0':
+ optional: true
+
'@esbuild/openharmony-arm64@0.25.12':
optional: true
+ '@esbuild/openharmony-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/openharmony-arm64@0.28.0':
+ optional: true
+
'@esbuild/sunos-x64@0.25.12':
optional: true
+ '@esbuild/sunos-x64@0.27.7':
+ optional: true
+
+ '@esbuild/sunos-x64@0.28.0':
+ optional: true
+
'@esbuild/win32-arm64@0.25.12':
optional: true
+ '@esbuild/win32-arm64@0.27.7':
+ optional: true
+
+ '@esbuild/win32-arm64@0.28.0':
+ optional: true
+
'@esbuild/win32-ia32@0.25.12':
optional: true
+ '@esbuild/win32-ia32@0.27.7':
+ optional: true
+
+ '@esbuild/win32-ia32@0.28.0':
+ optional: true
+
'@esbuild/win32-x64@0.25.12':
optional: true
+ '@esbuild/win32-x64@0.27.7':
+ optional: true
+
+ '@esbuild/win32-x64@0.28.0':
+ optional: true
+
'@eslint-community/eslint-utils@4.9.1(eslint@9.39.4)':
dependencies:
eslint: 9.39.4
@@ -2047,6 +2895,10 @@ snapshots:
'@eslint/core': 0.17.0
levn: 0.4.1
+ '@hono/node-server@1.19.14(hono@4.12.18)':
+ dependencies:
+ hono: 4.12.18
+
'@humanfs/core@0.19.1': {}
'@humanfs/node@0.16.7':
@@ -2058,6 +2910,102 @@ snapshots:
'@humanwhocodes/retry@0.4.3': {}
+ '@img/colour@1.1.0': {}
+
+ '@img/sharp-darwin-arm64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-darwin-arm64': 1.2.4
+ optional: true
+
+ '@img/sharp-darwin-x64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-darwin-x64': 1.2.4
+ optional: true
+
+ '@img/sharp-libvips-darwin-arm64@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-darwin-x64@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linux-arm64@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linux-arm@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linux-ppc64@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linux-riscv64@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linux-s390x@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linux-x64@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+ optional: true
+
+ '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+ optional: true
+
+ '@img/sharp-linux-arm64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-arm64': 1.2.4
+ optional: true
+
+ '@img/sharp-linux-arm@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-arm': 1.2.4
+ optional: true
+
+ '@img/sharp-linux-ppc64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-ppc64': 1.2.4
+ optional: true
+
+ '@img/sharp-linux-riscv64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-riscv64': 1.2.4
+ optional: true
+
+ '@img/sharp-linux-s390x@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-s390x': 1.2.4
+ optional: true
+
+ '@img/sharp-linux-x64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-x64': 1.2.4
+ optional: true
+
+ '@img/sharp-linuxmusl-arm64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+ optional: true
+
+ '@img/sharp-linuxmusl-x64@0.34.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+ optional: true
+
+ '@img/sharp-wasm32@0.34.5':
+ dependencies:
+ '@emnapi/runtime': 1.10.0
+ optional: true
+
+ '@img/sharp-win32-arm64@0.34.5':
+ optional: true
+
+ '@img/sharp-win32-ia32@0.34.5':
+ optional: true
+
+ '@img/sharp-win32-x64@0.34.5':
+ optional: true
+
'@inquirer/ansi@1.0.2': {}
'@inquirer/checkbox@4.3.2(@types/node@24.12.2)':
@@ -2386,6 +3334,8 @@ snapshots:
'@types/json-schema@7.0.15': {}
+ '@types/mime-types@2.1.4': {}
+
'@types/node@22.19.15':
dependencies:
undici-types: 6.21.0
@@ -2394,12 +3344,14 @@ snapshots:
dependencies:
undici-types: 7.16.0
- '@vitejs/plugin-vue@5.2.4(vite@6.4.1(@types/node@22.19.15))(vue@3.5.30(typescript@5.9.3))':
+ '@types/uuid@10.0.0': {}
+
+ '@vitejs/plugin-vue@5.2.4(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))(vue@3.5.30(typescript@5.9.3))':
dependencies:
- vite: 6.4.1(@types/node@22.19.15)
+ vite: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
vue: 3.5.30(typescript@5.9.3)
- '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/node@22.19.15))':
+ '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/node@22.19.15)(tsx@4.22.0))':
dependencies:
'@ampproject/remapping': 2.3.0
'@bcoe/v8-coverage': 1.0.2
@@ -2414,7 +3366,7 @@ snapshots:
std-env: 3.10.0
test-exclude: 7.0.2
tinyrainbow: 2.0.0
- vitest: 3.2.4(@types/node@22.19.15)
+ vitest: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
transitivePeerDependencies:
- supports-color
@@ -2426,13 +3378,13 @@ snapshots:
chai: 5.3.3
tinyrainbow: 2.0.0
- '@vitest/mocker@3.2.4(vite@6.4.1(@types/node@22.19.15))':
+ '@vitest/mocker@3.2.4(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))':
dependencies:
'@vitest/spy': 3.2.4
estree-walker: 3.0.3
magic-string: 0.30.21
optionalDependencies:
- vite: 6.4.1(@types/node@22.19.15)
+ vite: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
'@vitest/pretty-format@3.2.4':
dependencies:
@@ -2611,6 +3563,8 @@ snapshots:
ansi-styles@6.2.3: {}
+ any-promise@1.3.0: {}
+
argparse@1.0.10:
dependencies:
sprintf-js: 1.0.3
@@ -2642,6 +3596,11 @@ snapshots:
dependencies:
balanced-match: 4.0.4
+ bundle-require@5.1.0(esbuild@0.27.7):
+ dependencies:
+ esbuild: 0.27.7
+ load-tsconfig: 0.2.5
+
cac@6.7.14: {}
callsites@3.1.0: {}
@@ -2665,6 +3624,10 @@ snapshots:
check-error@2.1.3: {}
+ chokidar@4.0.3:
+ dependencies:
+ readdirp: 4.1.2
+
cli-cursor@5.0.0:
dependencies:
restore-cursor: 5.1.0
@@ -2679,6 +3642,10 @@ snapshots:
color-name@1.1.4: {}
+ commander@13.1.0: {}
+
+ commander@4.1.1: {}
+
compare-versions@6.1.1: {}
concat-map@0.0.1: {}
@@ -2687,6 +3654,8 @@ snapshots:
confbox@0.2.4: {}
+ consola@3.4.2: {}
+
cross-spawn@7.0.6:
dependencies:
path-key: 3.1.1
@@ -2705,6 +3674,8 @@ snapshots:
deep-is@0.1.4: {}
+ detect-libc@2.1.2: {}
+
diff@8.0.3: {}
eastasianwidth@0.2.0: {}
@@ -2748,6 +3719,64 @@ snapshots:
'@esbuild/win32-ia32': 0.25.12
'@esbuild/win32-x64': 0.25.12
+ esbuild@0.27.7:
+ optionalDependencies:
+ '@esbuild/aix-ppc64': 0.27.7
+ '@esbuild/android-arm': 0.27.7
+ '@esbuild/android-arm64': 0.27.7
+ '@esbuild/android-x64': 0.27.7
+ '@esbuild/darwin-arm64': 0.27.7
+ '@esbuild/darwin-x64': 0.27.7
+ '@esbuild/freebsd-arm64': 0.27.7
+ '@esbuild/freebsd-x64': 0.27.7
+ '@esbuild/linux-arm': 0.27.7
+ '@esbuild/linux-arm64': 0.27.7
+ '@esbuild/linux-ia32': 0.27.7
+ '@esbuild/linux-loong64': 0.27.7
+ '@esbuild/linux-mips64el': 0.27.7
+ '@esbuild/linux-ppc64': 0.27.7
+ '@esbuild/linux-riscv64': 0.27.7
+ '@esbuild/linux-s390x': 0.27.7
+ '@esbuild/linux-x64': 0.27.7
+ '@esbuild/netbsd-arm64': 0.27.7
+ '@esbuild/netbsd-x64': 0.27.7
+ '@esbuild/openbsd-arm64': 0.27.7
+ '@esbuild/openbsd-x64': 0.27.7
+ '@esbuild/openharmony-arm64': 0.27.7
+ '@esbuild/sunos-x64': 0.27.7
+ '@esbuild/win32-arm64': 0.27.7
+ '@esbuild/win32-ia32': 0.27.7
+ '@esbuild/win32-x64': 0.27.7
+
+ esbuild@0.28.0:
+ optionalDependencies:
+ '@esbuild/aix-ppc64': 0.28.0
+ '@esbuild/android-arm': 0.28.0
+ '@esbuild/android-arm64': 0.28.0
+ '@esbuild/android-x64': 0.28.0
+ '@esbuild/darwin-arm64': 0.28.0
+ '@esbuild/darwin-x64': 0.28.0
+ '@esbuild/freebsd-arm64': 0.28.0
+ '@esbuild/freebsd-x64': 0.28.0
+ '@esbuild/linux-arm': 0.28.0
+ '@esbuild/linux-arm64': 0.28.0
+ '@esbuild/linux-ia32': 0.28.0
+ '@esbuild/linux-loong64': 0.28.0
+ '@esbuild/linux-mips64el': 0.28.0
+ '@esbuild/linux-ppc64': 0.28.0
+ '@esbuild/linux-riscv64': 0.28.0
+ '@esbuild/linux-s390x': 0.28.0
+ '@esbuild/linux-x64': 0.28.0
+ '@esbuild/netbsd-arm64': 0.28.0
+ '@esbuild/netbsd-x64': 0.28.0
+ '@esbuild/openbsd-arm64': 0.28.0
+ '@esbuild/openbsd-x64': 0.28.0
+ '@esbuild/openharmony-arm64': 0.28.0
+ '@esbuild/sunos-x64': 0.28.0
+ '@esbuild/win32-arm64': 0.28.0
+ '@esbuild/win32-ia32': 0.28.0
+ '@esbuild/win32-x64': 0.28.0
+
escape-string-regexp@4.0.0: {}
eslint-scope@8.4.0:
@@ -2866,6 +3895,12 @@ snapshots:
locate-path: 6.0.0
path-exists: 4.0.0
+ fix-dts-default-cjs-exports@1.0.1:
+ dependencies:
+ magic-string: 0.30.21
+ mlly: 1.8.1
+ rollup: 4.59.0
+
flat-cache@4.0.1:
dependencies:
flatted: 3.4.1
@@ -2921,6 +3956,8 @@ snapshots:
he@1.2.0: {}
+ hono@4.12.18: {}
+
html-escaper@2.0.2: {}
human-signals@8.0.1: {}
@@ -2993,6 +4030,8 @@ snapshots:
jju@1.4.0: {}
+ joycon@3.1.1: {}
+
js-tokens@10.0.0: {}
js-tokens@9.0.1: {}
@@ -3026,6 +4065,12 @@ snapshots:
prelude-ls: 1.2.1
type-check: 0.4.0
+ lilconfig@3.1.3: {}
+
+ lines-and-columns@1.2.4: {}
+
+ load-tsconfig@0.2.5: {}
+
local-pkg@1.1.2:
dependencies:
mlly: 1.8.1
@@ -3067,6 +4112,12 @@ snapshots:
dependencies:
semver: 7.7.4
+ mime-db@1.52.0: {}
+
+ mime-types@2.1.35:
+ dependencies:
+ mime-db: 1.52.0
+
mimic-function@5.0.1: {}
minimatch@10.2.3:
@@ -3100,6 +4151,12 @@ snapshots:
mute-stream@2.0.0: {}
+ mz@2.7.0:
+ dependencies:
+ any-promise: 1.3.0
+ object-assign: 4.1.1
+ thenify-all: 1.6.0
+
nanoid@3.3.11: {}
natural-compare@1.4.0: {}
@@ -3109,6 +4166,8 @@ snapshots:
path-key: 4.0.0
unicorn-magic: 0.3.0
+ object-assign@4.1.1: {}
+
onetime@7.0.0:
dependencies:
mimic-function: 5.0.1
@@ -3173,6 +4232,8 @@ snapshots:
picomatch@4.0.3: {}
+ pirates@4.0.7: {}
+
pkg-types@1.3.1:
dependencies:
confbox: 0.1.8
@@ -3185,6 +4246,13 @@ snapshots:
exsolve: 1.0.8
pathe: 2.0.3
+ postcss-load-config@6.0.1(postcss@8.5.8)(tsx@4.22.0):
+ dependencies:
+ lilconfig: 3.1.3
+ optionalDependencies:
+ postcss: 8.5.8
+ tsx: 4.22.0
+
postcss@8.5.8:
dependencies:
nanoid: 3.3.11
@@ -3203,10 +4271,14 @@ snapshots:
quansync@0.2.11: {}
+ readdirp@4.1.2: {}
+
require-from-string@2.0.2: {}
resolve-from@4.0.0: {}
+ resolve-from@5.0.0: {}
+
resolve@1.22.11:
dependencies:
is-core-module: 2.16.1
@@ -3257,6 +4329,37 @@ snapshots:
semver@7.7.4: {}
+ sharp@0.34.5:
+ dependencies:
+ '@img/colour': 1.1.0
+ detect-libc: 2.1.2
+ semver: 7.7.4
+ optionalDependencies:
+ '@img/sharp-darwin-arm64': 0.34.5
+ '@img/sharp-darwin-x64': 0.34.5
+ '@img/sharp-libvips-darwin-arm64': 1.2.4
+ '@img/sharp-libvips-darwin-x64': 1.2.4
+ '@img/sharp-libvips-linux-arm': 1.2.4
+ '@img/sharp-libvips-linux-arm64': 1.2.4
+ '@img/sharp-libvips-linux-ppc64': 1.2.4
+ '@img/sharp-libvips-linux-riscv64': 1.2.4
+ '@img/sharp-libvips-linux-s390x': 1.2.4
+ '@img/sharp-libvips-linux-x64': 1.2.4
+ '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+ '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+ '@img/sharp-linux-arm': 0.34.5
+ '@img/sharp-linux-arm64': 0.34.5
+ '@img/sharp-linux-ppc64': 0.34.5
+ '@img/sharp-linux-riscv64': 0.34.5
+ '@img/sharp-linux-s390x': 0.34.5
+ '@img/sharp-linux-x64': 0.34.5
+ '@img/sharp-linuxmusl-arm64': 0.34.5
+ '@img/sharp-linuxmusl-x64': 0.34.5
+ '@img/sharp-wasm32': 0.34.5
+ '@img/sharp-win32-arm64': 0.34.5
+ '@img/sharp-win32-ia32': 0.34.5
+ '@img/sharp-win32-x64': 0.34.5
+
shebang-command@2.0.0:
dependencies:
shebang-regex: 3.0.0
@@ -3271,6 +4374,8 @@ snapshots:
source-map@0.6.1: {}
+ source-map@0.7.6: {}
+
sprintf-js@1.0.3: {}
stackback@0.0.2: {}
@@ -3315,6 +4420,16 @@ snapshots:
dependencies:
js-tokens: 9.0.1
+ sucrase@3.35.1:
+ dependencies:
+ '@jridgewell/gen-mapping': 0.3.13
+ commander: 4.1.1
+ lines-and-columns: 1.2.4
+ mz: 2.7.0
+ pirates: 4.0.7
+ tinyglobby: 0.2.15
+ ts-interface-checker: 0.1.13
+
supports-color@7.2.0:
dependencies:
has-flag: 4.0.0
@@ -3331,6 +4446,14 @@ snapshots:
glob: 10.5.0
minimatch: 10.2.4
+ thenify-all@1.6.0:
+ dependencies:
+ thenify: 3.3.1
+
+ thenify@3.3.1:
+ dependencies:
+ any-promise: 1.3.0
+
tinybench@2.9.0: {}
tinyexec@0.3.2: {}
@@ -3346,6 +4469,48 @@ snapshots:
tinyspy@4.0.4: {}
+ tree-kill@1.2.2: {}
+
+ ts-interface-checker@0.1.13: {}
+
+ tslib@2.8.1:
+ optional: true
+
+ tsup@8.5.1(@microsoft/api-extractor@7.57.7(@types/node@22.19.15))(postcss@8.5.8)(tsx@4.22.0)(typescript@5.9.3):
+ dependencies:
+ bundle-require: 5.1.0(esbuild@0.27.7)
+ cac: 6.7.14
+ chokidar: 4.0.3
+ consola: 3.4.2
+ debug: 4.4.3
+ esbuild: 0.27.7
+ fix-dts-default-cjs-exports: 1.0.1
+ joycon: 3.1.1
+ picocolors: 1.1.1
+ postcss-load-config: 6.0.1(postcss@8.5.8)(tsx@4.22.0)
+ resolve-from: 5.0.0
+ rollup: 4.59.0
+ source-map: 0.7.6
+ sucrase: 3.35.1
+ tinyexec: 0.3.2
+ tinyglobby: 0.2.15
+ tree-kill: 1.2.2
+ optionalDependencies:
+ '@microsoft/api-extractor': 7.57.7(@types/node@22.19.15)
+ postcss: 8.5.8
+ typescript: 5.9.3
+ transitivePeerDependencies:
+ - jiti
+ - supports-color
+ - tsx
+ - yaml
+
+ tsx@4.22.0:
+ dependencies:
+ esbuild: 0.28.0
+ optionalDependencies:
+ fsevents: 2.3.3
+
type-check@0.4.0:
dependencies:
prelude-ls: 1.2.1
@@ -3368,13 +4533,15 @@ snapshots:
dependencies:
punycode: 2.3.1
- vite-node@3.2.4(@types/node@22.19.15):
+ uuid@11.1.1: {}
+
+ vite-node@3.2.4(@types/node@22.19.15)(tsx@4.22.0):
dependencies:
cac: 6.7.14
debug: 4.4.3
es-module-lexer: 1.7.0
pathe: 2.0.3
- vite: 6.4.1(@types/node@22.19.15)
+ vite: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
transitivePeerDependencies:
- '@types/node'
- jiti
@@ -3389,7 +4556,7 @@ snapshots:
- tsx
- yaml
- vite-plugin-dts@4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)):
+ vite-plugin-dts@4.5.4(@types/node@22.19.15)(rollup@4.59.0)(typescript@5.9.3)(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0)):
dependencies:
'@microsoft/api-extractor': 7.57.7(@types/node@22.19.15)
'@rollup/pluginutils': 5.3.0(rollup@4.59.0)
@@ -3402,13 +4569,13 @@ snapshots:
magic-string: 0.30.21
typescript: 5.9.3
optionalDependencies:
- vite: 6.4.1(@types/node@22.19.15)
+ vite: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
transitivePeerDependencies:
- '@types/node'
- rollup
- supports-color
- vite@6.4.1(@types/node@22.19.15):
+ vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0):
dependencies:
esbuild: 0.25.12
fdir: 6.5.0(picomatch@4.0.3)
@@ -3419,12 +4586,13 @@ snapshots:
optionalDependencies:
'@types/node': 22.19.15
fsevents: 2.3.3
+ tsx: 4.22.0
- vitest@3.2.4(@types/node@22.19.15):
+ vitest@3.2.4(@types/node@22.19.15)(tsx@4.22.0):
dependencies:
'@types/chai': 5.2.3
'@vitest/expect': 3.2.4
- '@vitest/mocker': 3.2.4(vite@6.4.1(@types/node@22.19.15))
+ '@vitest/mocker': 3.2.4(vite@6.4.1(@types/node@22.19.15)(tsx@4.22.0))
'@vitest/pretty-format': 3.2.4
'@vitest/runner': 3.2.4
'@vitest/snapshot': 3.2.4
@@ -3442,8 +4610,8 @@ snapshots:
tinyglobby: 0.2.15
tinypool: 1.1.1
tinyrainbow: 2.0.0
- vite: 6.4.1(@types/node@22.19.15)
- vite-node: 3.2.4(@types/node@22.19.15)
+ vite: 6.4.1(@types/node@22.19.15)(tsx@4.22.0)
+ vite-node: 3.2.4(@types/node@22.19.15)(tsx@4.22.0)
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 22.19.15
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 324743d4..be01758a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,7 +4,6 @@ packages:
# Extension SDK packages
- 'extensions/*/packages/*'
-
allowBuilds:
esbuild: true
-
+ sharp: false
diff --git a/pom.xml b/pom.xml
index 476c74a6..e9729938 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
4.0.0
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
pom
Dynamia Soluciones IT SAS
@@ -64,7 +64,8 @@
10.2.1-jakarta
1.1.0
- 2.42.30
+ 2.44.5
+ 8.5.17
6.21.4
diff --git a/themes/pom.xml b/themes/pom.xml
index ffead089..90bdb201 100644
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -6,7 +6,7 @@
tools.dynamia
tools.dynamia.parent
- 26.4.1
+ 26.5.0
../pom.xml
diff --git a/themes/theme-dynamical/sources/pom.xml b/themes/theme-dynamical/sources/pom.xml
index 46dd9562..62c40257 100644
--- a/themes/theme-dynamical/sources/pom.xml
+++ b/themes/theme-dynamical/sources/pom.xml
@@ -24,7 +24,7 @@
tools.dynamia.themes
tools.dynamia.themes.parent
- 26.4.1
+ 26.5.0
../../pom.xml
@@ -102,7 +102,7 @@
tools.dynamia
tools.dynamia.zk
- 26.4.1
+ 26.5.0
provided