@travetto/web-upload 6.0.3 → 7.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web-upload",
-  "version": "6.0.3",
+  "version": "7.0.0-rc.0",
   "description": "Provides integration between the travetto asset and web module.",
   "keywords": [
     "web",
@@ -26,13 +26,13 @@
   },
   "dependencies": {
     "@fastify/busboy": "^3.2.0",
-    "@travetto/config": "^6.0.1",
-    "@travetto/web": "^6.0.3",
-    "file-type": "^21.0.0",
+    "@travetto/config": "^7.0.0-rc.0",
+    "@travetto/web": "^7.0.0-rc.0",
+    "file-type": "^21.1.1",
     "mime": "^4.1.0"
   },
   "peerDependencies": {
-    "@travetto/test": "^6.0.2"
+    "@travetto/test": "^7.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/decorator.ts

@@ -1,6 +1,6 @@
-import { AppError, toConcrete, ClassInstance } from '@travetto/runtime';
-import { ControllerRegistry, EndpointParamConfig, Param } from '@travetto/web';
-import { SchemaRegistry } from '@travetto/schema';
+import { AppError, toConcrete, ClassInstance, getClass } from '@travetto/runtime';
+import { ControllerRegistryIndex, EndpointParameterConfig, Param } from '@travetto/web';
+import { SchemaRegistryIndex } from '@travetto/schema';
 
 import { WebUploadInterceptor } from './interceptor.ts';
 import { WebUploadConfig } from './config.ts';
@@ -14,55 +14,57 @@ const FileMapContract = toConcrete<FileMap>();
 /**
  * Allows for supporting uploads
  *
- * @augments `@travetto/web-upload:Upload`
- * @augments `@travetto/web:Param`
+ * @augments `@travetto/schema:Input`
+ * @kind decorator
  */
 export function Upload(
-  param: string | Partial<EndpointParamConfig> & UploadConfig = {},
-): (inst: ClassInstance, prop: string, idx: number) => void {
-
-  if (typeof param === 'string') {
-    param = { name: param };
-  }
+  param: Partial<EndpointParameterConfig> & UploadConfig = {},
+): (instance: ClassInstance, property: string | symbol, idx: number) => void {
 
   const finalConf = { ...param };
 
-  return (inst: ClassInstance, prop: string, idx: number): void => {
+  return (instance: ClassInstance, property: string | symbol, idx: number): void => {
     // Register field
-    ControllerRegistry.registerEndpointInterceptorConfig(
-      inst.constructor, inst[prop], WebUploadInterceptor,
-      {
-        applies: true,
-        maxSize: finalConf.maxSize,
-        types: finalConf.types,
-        cleanupFiles: finalConf.cleanupFiles,
-        uploads: {
-          [finalConf.name ?? prop]: {
-            maxSize: finalConf.maxSize,
-            types: finalConf.types,
-            cleanupFiles: finalConf.cleanupFiles
+    const cls = ControllerRegistryIndex.getForRegister(getClass(instance));
+    const getName = (): string => SchemaRegistryIndex.getMethodConfig(instance.constructor, property).parameters[idx].name!.toString();
+
+    cls.registerFinalizeHandler(() => {
+      cls.registerEndpointInterceptorConfig(
+        property,
+        WebUploadInterceptor,
+        {
+          applies: true,
+          maxSize: finalConf.maxSize,
+          types: finalConf.types,
+          cleanupFiles: finalConf.cleanupFiles,
+          uploads: {
+            [getName()]: {
+              maxSize: finalConf.maxSize,
+              types: finalConf.types,
+              cleanupFiles: finalConf.cleanupFiles
+            }
           }
         }
-      }
-    );
+      );
+    });
 
     return Param('body', {
       ...finalConf,
-      extract: (request, config) => {
-        const field = SchemaRegistry.getMethodSchema(inst.constructor, prop)[idx];
+      extract: (request) => {
+        const input = SchemaRegistryIndex.getMethodConfig(instance.constructor, property).parameters[idx];
 
-        if (!field) {
+        if (!input) {
           throw new AppError(`Unknown field type, ensure you are using ${Blob.name}, ${File.name} or ${FileMapContract.name}`);
         }
 
-        if (!(field.type === Blob || field.type === File || field.type === FileMapContract)) {
-          throw new AppError(`Cannot use upload decorator with ${field.type.name}, but only an ${Blob.name}, ${File.name} or ${FileMapContract.name}`);
+        if (!(input.type === Blob || input.type === File || input.type === FileMapContract)) {
+          throw new AppError(`Cannot use upload decorator with ${input.type.name}, but only an ${Blob.name}, ${File.name} or ${FileMapContract.name}`);
         }
 
-        const isMap = field.type === FileMapContract;
+        const isMap = input.type === FileMapContract;
         const map = WebUploadUtil.getRequestUploads(request);
-        return isMap ? map : map[config.name!];
+        return isMap ? map : map[getName()];
       }
-    })(inst, prop, idx);
+    })(instance, property, idx);
   };
 }

package/support/test/server.ts

@@ -3,7 +3,7 @@ import assert from 'node:assert';
 import { BinaryUtil, castTo } from '@travetto/runtime';
 import { Controller, Post } from '@travetto/web';
 import { BeforeAll, Suite, Test, TestFixtures } from '@travetto/test';
-import { RootRegistry } from '@travetto/registry';
+import { Registry } from '@travetto/registry';
 
 import { BaseWebSuite } from '@travetto/web/support/test/suite/base.ts';
 
@@ -28,17 +28,17 @@ class TestUploadController {
   }
 
   @Post('/all-named')
-  async uploads(@Upload('file1') file1: Blob, @Upload('file2') file2: Blob) {
+  async uploads(@Upload() file1: Blob, @Upload() file2: Blob) {
     return { hash1: bHash(file1), hash2: bHash(file2) };
   }
 
   @Post('/all-named-custom')
-  async uploadVariousLimits(@Upload({ name: 'file1', types: ['!image/png'] }) file1: Blob, @Upload('file2') file2: Blob) {
+  async uploadVariousLimits(@Upload({ types: ['!image/png'] }) file1: Blob, @Upload() file2: Blob) {
     return { hash1: bHash(file1), hash2: bHash(file2) };
   }
 
   @Post('/all-named-size')
-  async uploadVariousSizeLimits(@Upload({ name: 'file1', maxSize: 100 }) file1: File, @Upload({ name: 'file2', maxSize: 8000 }) file2: File) {
+  async uploadVariousSizeLimits(@Upload({ maxSize: 100 }) file1: File, @Upload({ maxSize: 8000 }) file2: File) {
     return { hash1: bHash(file1), hash2: bHash(file2) };
   }
 }
@@ -63,7 +63,7 @@ export abstract class WebUploadServerSuite extends BaseWebSuite {
   @BeforeAll()
   async init() {
     this.fixture = new TestFixtures(['@travetto/asset']);
-    await RootRegistry.init();
+    await Registry.init();
   }
 
   @Test()