@dbos-inc/koa-serve 2.11.7-preview.gc208400219 → 2.11.13-preview

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbos-inc/koa-serve",
-  "version": "2.11.7-preview.gc208400219",
+  "version": "2.11.13-preview",
   "description": "DBOS HTTP Package for serving workflows with Koa",
   "license": "MIT",
   "repository": {

package/src/dboshttp.ts

@@ -50,25 +50,6 @@ export interface DBOSHTTPArgInfo {
   argSource?: ArgSources;
 }
 
-enum ArgRequiredOptions {
-  REQUIRED = 'REQUIRED',
-  OPTIONAL = 'OPTIONAL',
-  DEFAULT = 'DEFAULT',
-}
-
-interface ValidatorClassInfo {
-  defaultArgRequired?: ArgRequiredOptions;
-  defaultArgValidate?: boolean;
-}
-
-interface ValidatorFuncInfo {
-  performArgValidation?: boolean;
-}
-
-interface ValidatorArgInfo {
-  required?: ArgRequiredOptions;
-}
-
 /**
  * HTTPRequest includes useful information from http.IncomingMessage and parsed body,
  *   URL parameters, and parsed query string.
@@ -107,8 +88,6 @@ export function isClientRequestError(e: Error) {
   return DBOSErrors.isDataValidationError(e);
 }
 
-const VALIDATOR = 'validator';
-
 export class DBOSHTTPBase extends DBOSLifecycleCallback {
   static HTTP_OPERATION_TYPE: string = 'http';
 
@@ -170,7 +149,7 @@ export class DBOSHTTPBase extends DBOSLifecycleCallback {
   }
 
   /** Parameter decorator indicating which source to use (URL, BODY, etc) for arg data */
-  argSource(source: ArgSources) {
+  static argSource(source: ArgSources) {
     return function (target: object, propertyKey: string | symbol, parameterIndex: number) {
       const curParam = DBOS.associateParamWithInfo(
         DBOSHTTP,
@@ -187,7 +166,7 @@ export class DBOSHTTPBase extends DBOSLifecycleCallback {
     };
   }
 
-  getArgSource(arg: MethodParameter) {
+  protected getArgSource(arg: MethodParameter) {
     const arginfo = arg.getRegisteredInfo(DBOSHTTP) as DBOSHTTPArgInfo;
     return arginfo?.argSource ?? ArgSources.AUTO;
   }

package/tests/argsource.test.ts

@@ -111,42 +111,42 @@ describe('httpserver-argsource-tests', () => {
   @DBOSKoa.defaultArgRequired
   class ArgTestEndpoints {
     @dhttp.getApi('/getquery')
-    static async getQuery(@dhttp.argSource(ArgSources.QUERY) name: string) {
+    static async getQuery(@DBOSKoa.argSource(ArgSources.QUERY) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
 
     @dhttp.getApi('/getbody')
-    static async getBody(@dhttp.argSource(ArgSources.BODY) name: string) {
+    static async getBody(@DBOSKoa.argSource(ArgSources.BODY) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
 
     @dhttp.getApi('/getdefault')
-    static async getDefault(@dhttp.argSource(ArgSources.DEFAULT) name: string) {
+    static async getDefault(@DBOSKoa.argSource(ArgSources.DEFAULT) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
 
     @dhttp.getApi('/getauto')
-    static async getAuto(@dhttp.argSource(ArgSources.AUTO) name: string) {
+    static async getAuto(@DBOSKoa.argSource(ArgSources.AUTO) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
 
     @dhttp.postApi('/postquery')
-    static async postQuery(@dhttp.argSource(ArgSources.QUERY) name: string) {
+    static async postQuery(@DBOSKoa.argSource(ArgSources.QUERY) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
 
     @dhttp.postApi('/postbody')
-    static async postBody(@dhttp.argSource(ArgSources.BODY) name: string) {
+    static async postBody(@DBOSKoa.argSource(ArgSources.BODY) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
 
     @dhttp.postApi('/postdefault')
-    static async postDefault(@dhttp.argSource(ArgSources.DEFAULT) name: string) {
+    static async postDefault(@DBOSKoa.argSource(ArgSources.DEFAULT) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
 
     @dhttp.postApi('/postauto')
-    static async postAuto(@dhttp.argSource(ArgSources.AUTO) name: string) {
+    static async postAuto(@DBOSKoa.argSource(ArgSources.AUTO) name: string) {
       return Promise.resolve(`hello ${name}`);
     }
   }