1 files changed, 20 insertions, 12 deletions

diff --git a/src/client/cognitive_services/CognitiveServices.ts b/src/client/cognitive_services/CognitiveServices.ts
index c118d91d3..08fcb4883 100644
--- a/src/client/cognitive_services/CognitiveServices.ts
+++ b/src/client/cognitive_services/CognitiveServices.ts
@@ -7,9 +7,9 @@ import { Utils } from "../../Utils";
 import { InkData } from "../../new_fields/InkField";
 import { UndoManager } from "../util/UndoManager";
 
-type APIManager<D> = { converter: BodyConverter<D>, requester: RequestExecutor, analyzer: AnalysisApplier };
+type APIManager<D> = { converter: BodyConverter<D>, requester: RequestExecutor };
 type RequestExecutor = (apiKey: string, body: string, service: Service) => Promise<string>;
-type AnalysisApplier = (target: Doc, relevantKeys: string[], ...args: any) => any;
+type AnalysisApplier<D> = (target: Doc, relevantKeys: string[], data: D, ...args: any) => any;
 type BodyConverter<D> = (data: D) => string;
 type Converter = (results: any) => Field;
 
@@ -38,7 +38,7 @@ export enum Confidence {
  */
 export namespace CognitiveServices {
 
-    const ExecuteQuery = async <D, R>(service: Service, manager: APIManager<D>, data: D): Promise<Opt<R>> => {
+    const ExecuteQuery = async <D>(service: Service, manager: APIManager<D>, data: D): Promise<any> => {
         return fetch(Utils.prepend(`${RouteStore.cognitiveServices}/${service}`)).then(async response => {
             let apiKey = await response.text();
             if (!apiKey) {
@@ -46,7 +46,7 @@ export namespace CognitiveServices {
                 return undefined;
             }
 
-            let results: Opt<R>;
+            let results: any;
             try {
                 results = await manager.requester(apiKey, manager.converter(data), service).then(json => JSON.parse(json));
             } catch {
@@ -99,7 +99,11 @@ export namespace CognitiveServices {
                 return request.post(options);
             },
 
-            analyzer: async (target: Doc, keys: string[], url: string, service: Service, converter: Converter) => {
+        };
+
+        export namespace Appliers {
+
+            export const ProcessImage: AnalysisApplier<string> = async (target: Doc, keys: string[], url: string, service: Service, converter: Converter) => {
                 let batch = UndoManager.StartBatch("Image Analysis");
 
                 let storageKey = keys[0];
@@ -107,7 +111,7 @@ export namespace CognitiveServices {
                     return;
                 }
                 let toStore: any;
-                let results = await ExecuteQuery<string, any>(service, Manager, url);
+                let results = await ExecuteQuery(service, Manager, url);
                 if (!results) {
                     toStore = "Cognitive Services could not process the given image URL.";
                 } else {
@@ -120,9 +124,9 @@ export namespace CognitiveServices {
                 target[storageKey] = toStore;
 
                 batch.end();
-            }
+            };
 
-        };
+        }
 
         export type Face = { faceAttributes: any, faceId: string, faceRectangle: Rectangle };
 
@@ -179,10 +183,14 @@ export namespace CognitiveServices {
                 return new Promise<any>(promisified);
             },
 
-            analyzer: async (target: Doc, keys: string[], inkData: InkData) => {
+        };
+
+        export namespace Appliers {
+
+            export const ConcatenateHandwriting: AnalysisApplier<InkData> = async (target: Doc, keys: string[], inkData: InkData) => {
                 let batch = UndoManager.StartBatch("Ink Analysis");
 
-                let results = await ExecuteQuery<InkData, any>(Service.Handwriting, Manager, inkData);
+                let results = await ExecuteQuery(Service.Handwriting, Manager, inkData);
                 if (results) {
                     results.recognitionUnits && (results = results.recognitionUnits);
                     target[keys[0]] = Docs.Get.DocumentHierarchyFromJson(results, "Ink Analysis");
@@ -192,9 +200,9 @@ export namespace CognitiveServices {
                 }
 
                 batch.end();
-            }
+            };
 
-        };
+        }
 
         export interface AzureStrokeData {
             id: number;