@anteros/core 0.0.2 → 0.0.3

package/database/file.ts

@@ -10,13 +10,11 @@ async function syncFileCollections() {
         const fileCollections: FileCollection[] = []
         for (let tenant of cfg.tenants ?? []) {
             const TENANT_PATH = path.join(process.cwd(), tenant.dir)
-            const FILES_PATH = path.join(TENANT_PATH, 'files')
-            let exist = await fs.exists(FILES_PATH)
-            if (!exist) continue;
-            const isDirectory = await (await fs.stat(FILES_PATH)).isDirectory()
 
-            if (isDirectory) {
-                // Charger les fichiers *.file.ts
+            // Scan files/ directory
+            const FILES_PATH = path.join(TENANT_PATH, 'files')
+            const filesExist = await fs.exists(FILES_PATH).catch(() => false)
+            if (filesExist && (await fs.stat(FILES_PATH)).isDirectory()) {
                 const globFiles = new Glob(path.join(FILES_PATH, '**/*.file.ts'))
                 for await (let file of globFiles.scan('.')) {
                     let fileModule = await import(file)
@@ -28,7 +26,7 @@ async function syncFileCollections() {
                     }
                 }
 
-                // Charger aussi les fichiers *.model.ts avec _isFileCollection_
+                // Also scan *.model.ts in files/ with _isFileCollection_
                 const globModels = new Glob(path.join(FILES_PATH, '**/*.model.ts'))
                 for await (let file of globModels.scan('.')) {
                     let fileModule = await import(file)
@@ -40,6 +38,22 @@ async function syncFileCollections() {
                     }
                 }
             }
+
+            // Also scan collections/ directory for *.file.ts
+            const COLLECTIONS_PATH = path.join(TENANT_PATH, 'collections')
+            const collectionsExist = await fs.exists(COLLECTIONS_PATH).catch(() => false)
+            if (collectionsExist && (await fs.stat(COLLECTIONS_PATH)).isDirectory()) {
+                const globFiles = new Glob(path.join(COLLECTIONS_PATH, '**/*.file.ts'))
+                for await (let file of globFiles.scan('.')) {
+                    let fileModule = await import(file)
+                    if (fileModule?.default?._isFileCollection_) {
+                        fileCollections.push({
+                            ...fileModule?.default,
+                            _tenant_: tenant.id
+                        })
+                    }
+                }
+            }
         }
 
         cfg.fileCollections = fileCollections

package/lib/files.ts

@@ -6,7 +6,7 @@ import type { FileCollection } from "../types/file";
 import path from "path";
 import fs from "fs/promises";
 import { createReadStream, existsSync, mkdirSync } from "fs";
-import crypto from "crypto";
+import { ObjectId } from "mongodb";
 
 // ─── Storage Interface ──────────────────────────────────────────────────────
 
@@ -257,38 +257,79 @@ export async function handleUpload(options: UploadOptions): Promise<FileResult>
     });
   }
 
-  const id = crypto.randomUUID();
-  const storage = getStorageForCollection(collection, tenant_id);
-  const subpath = col.storage?.path || undefined;
-  const { path: filepath, size } = await storage.save(tenant_id, collection, file, { id, mimetype, subpath });
+  // Insert metadata first to get the MongoDB auto-generated ObjectId
+  let _id: string;
+  try {
+    // Coerce relation field IDs from string to ObjectId before insert.
+    // Form-data / JSON always sends IDs as strings, but MongoDB expects
+    // ObjectId for fields that reference other collections.
+    const insertDoc: Record<string, any> = {
+      _file: {
+        filename: '',
+        name: file.name,
+        mimetype,
+        size: 0,
+        url: '',
+      },
+    }
+    if (data) {
+      const relationFields =
+        col.fields?.filter(
+          (f) => f.type === 'relationship' && f.relation?.to && data[f.name] !== undefined && data[f.name] !== null,
+        ) ?? []
+      for (const [key, value] of Object.entries(data)) {
+        const field = relationFields.find((f) => f.name === key)
+        if (field) {
+          const hasMany = field.relation?.hasMany ?? false
+          if (hasMany && Array.isArray(value)) {
+            insertDoc[key] = value.map((id) =>
+              ObjectId.isValid(id) ? new ObjectId(id) : id,
+            )
+          } else if (!hasMany) {
+            insertDoc[key] =
+              typeof value === 'string' && ObjectId.isValid(value)
+                ? new ObjectId(value)
+                : value
+          } else {
+            insertDoc[key] = value
+          }
+        } else {
+          insertDoc[key] = value
+        }
+      }
+    }
+    const rest = new useRest({ tenant_id, internal: false, useHook: false, useCustomApi: false });
+    const result = await rest.db.collection(collection).insertOne(insertDoc);
+    _id = String(result.insertedId);
+  } catch (err) {
+    throw new AppError('Failed to save file metadata', {
+      code: 'FILE_METADATA_ERROR', status: 500,
+    });
+  }
 
+  // Save the physical file to storage
   const ext = path.extname(file.name);
-  const filename = `${id}${ext}`;
-
-  // Enregistrer les métadonnées en base si trackMetaData est activé
-  if (col.trackMetaData !== false) {
-    try {
-      const rest = new useRest({ tenant_id, internal: false, useHook: false, useCustomApi: false });
-      await rest.insertOne(collection, {
-        _id: id,
-        _file: {
-          filename,
-          name: file.name,
-          mimetype,
-          size,
-          url: `/files/${tenant_id}/${collection}/${filename}`,
-        },
-        ...(data || {}),
-      });
-    } catch (err) {
-      await storage.delete(tenant_id, collection, id, filename).catch(() => {});
-      throw new AppError('Failed to save file metadata', {
-        code: 'FILE_METADATA_ERROR', status: 500,
-      });
-    }
+  const filename = `${_id}${ext}`;
+  const storage = getStorageForCollection(collection, tenant_id);
+  const subpath = col.storage?.path || undefined;
+  const { path: filepath, size } = await storage.save(tenant_id, collection, file, { id: _id, mimetype, subpath });
+
+  // Update MongoDB with actual file info
+  const url = `/files/${tenant_id}/${collection}/${filename}`;
+  try {
+    const rest = new useRest({ tenant_id, internal: true, useHook: false, useCustomApi: false });
+    await rest.db.collection(collection).updateOne(
+      { _id: new ObjectId(_id) },
+      { $set: { '_file.filename': filename, '_file.size': size, '_file.url': url } },
+    );
+  } catch (err) {
+    await storage.delete(tenant_id, collection, _id, filename, subpath).catch(() => {});
+    throw new AppError('Failed to update file metadata', {
+      code: 'FILE_METADATA_ERROR', status: 500,
+    });
   }
 
-  // Réplication vers les destinations configurées
+  // Replicate to configured destinations
   if (col.replicate?.length) {
     replicateFile(filepath, filename, col.replicate).catch(err => {
       console.error('Replication failed:', err?.message || err);
@@ -296,13 +337,13 @@ export async function handleUpload(options: UploadOptions): Promise<FileResult>
   }
 
   return {
-    _id: id,
+    _id,
     _file: {
       filename,
       name: file.name,
       mimetype,
       size,
-      url: `/files/${tenant_id}/${collection}/${filename}`,
+      url,
     },
     ...(data || {}),
   };
@@ -355,23 +396,24 @@ export async function handleDelete(
 ): Promise<void> {
   const storage = getStorageForCollection(collection, tenant_id);
   const col = getFileCollection(collection, tenant_id);
+  const subpath = col?.storage?.path || undefined;
 
-  // Look up the document to get the stored filename
+  // Look up the document in MongoDB to get the stored filename
   let filename: string | undefined;
-  if (col?.trackMetaData !== false) {
-    try {
-      const rest = new useRest({ tenant_id, internal: true, useHook: false, useCustomApi: false });
-      const doc = await rest.findOne<any>(collection, fileId);
-      filename = doc?._file?.filename;
-    } catch {}
-  }
+  try {
+    const rest = new useRest({ tenant_id, internal: true, useHook: false, useCustomApi: false });
+    const doc = await rest.db.collection(collection).findOne(
+      { _id: ObjectId.isValid(fileId) ? new ObjectId(fileId) : fileId },
+      { projection: { '_file.filename': 1 } },
+    );
+    filename = doc?._file?.filename;
+  } catch {}
 
   // Delete the physical file from storage
-  const subpath = col?.storage?.path || undefined;
   if (filename) {
     await storage.delete(tenant_id, collection, fileId, filename, subpath);
   } else {
-    // Fallback: try common extensions
+    // Fallback: try common extensions using the fileId as base name
     for (const ext of ['.jpg', '.jpeg', '.png', '.webp', '.avif', '.gif', '.svg', '.pdf', '.mp4', '.webm', '.mp3', '.wav', '.json', '.csv', '.zip', '']) {
       try {
         await storage.delete(tenant_id, collection, fileId, fileId + ext, subpath);
@@ -380,14 +422,14 @@ export async function handleDelete(
     }
   }
 
-  // Delete the metadata document from MongoDB
-  if (col?.trackMetaData !== false) {
-    try {
-      const rest = new useRest({ tenant_id, internal: true, useHook: false, useCustomApi: false });
-      await rest.deleteOne(collection, fileId);
-    } catch (err: any) {
-      console.error('Failed to delete file metadata:', err?.message || err);
-    }
+  // Delete the document from MongoDB
+  try {
+    const rest = new useRest({ tenant_id, internal: true, useHook: false, useCustomApi: false });
+    await rest.db.collection(collection).deleteOne({
+      _id: ObjectId.isValid(fileId) ? new ObjectId(fileId) : fileId,
+    });
+  } catch (err: any) {
+    console.error('Failed to delete file metadata:', err?.message || err);
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@anteros/core",
   "module": "index.ts",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "description": "Anteros Core",
   "private": false,
@@ -20,9 +20,9 @@
     "bentocache": "^1.6.1",
     "boxen": "^8.0.1",
     "dayjs": "^1.11.21",
-    "hono": "^4.12.25",
+    "hono": "^4.12.27",
     "ioredis": "^5.11.1",
-    "joi": "^18.2.1",
+    "joi": "^18.2.3",
     "jose": "^6.2.3",
     "mongodb": "6.21.0",
     "socket.io": "^4.8.3",