Merge pull request #90 from bootgs/max/next

Max/next

Author: MaksymStoianov

config/eslint/overrides-tests.ts

@@ -10,7 +10,7 @@ const config: Linter.Config = {
      * Disallows usage of the `any` type.
      * @see {@link https://typescript-eslint.io/rules/no-explicit-any/ no-explicit-any}
      */
-    "@typescript-eslint/no-explicit-any": "error",
+    "@typescript-eslint/no-explicit-any": "off",
 
     /**
      * Disallows unused variables.

src/controller/BootApplication.ts

@@ -1,7 +1,14 @@
-import { ApplicationConfig, InjectionToken, Newable } from "../domain/types";
+import { isString } from "apps-script-utils";
+import { ApplicationConfig, AppsScriptMenuProxy, InjectionToken, Newable } from "../domain/types";
 import { AppsScriptEventType, RequestMethod } from "../domain/enums";
-import { EventDispatcher, RequestFactory, Resolver, ResponseBuilder, Router, RouterExplorer } from "../service";
-import { isSymbol } from "apps-script-utils";
+import {
+  EventDispatcher,
+  RequestFactory,
+  Resolver,
+  ResponseBuilder,
+  Router,
+  RouterExplorer
+} from "../service";
 
 /**
  * Main application class for bootstrapping and handling Google Apps Script events.
@@ -130,20 +137,24 @@ export class BootApplication {
   /**
    * Returns a Proxy object that can be used to handle Google Apps Script menu actions.
    *
-   * @returns {any} A Proxy object.
+   * @returns {AppsScriptMenuProxy} A Proxy object.
    */
-  public onMenu(): any {
+  public onMenu(): AppsScriptMenuProxy {
     return new Proxy(this, {
       get(target, prop, receiver) {
-        if (prop === "inspect" || isSymbol(prop)) {
+        if (!isString(prop)) {
+          return Reflect.get(target, prop, receiver);
+        }
+
+        if (prop === "inspect") {
           return Reflect.get(target, prop, receiver);
         }
 
         return (event: GoogleAppsScript.Events.AppsScriptEvent) => {
-          return target._eventDispatcher.dispatchByName(prop as string, event);
+          return target._eventDispatcher.dispatchByName(prop, event);
         };
       }
-    });
+    }) as unknown as AppsScriptMenuProxy;
   }
 
   /**

src/domain/types/AppsScriptMenuProxy.ts

@@ -0,0 +1,6 @@
+/**
+ * A Proxy object that can be used to handle Google Apps Script menu actions.
+ */
+export type AppsScriptMenuProxy = {
+  [key: string]: (event: GoogleAppsScript.Events.AppsScriptEvent) => Promise<void>;
+};

src/domain/types/index.ts

@@ -1,3 +1,4 @@
+export * from "./AppsScriptMenuProxy";
 export * from "./ApplicationConfig";
 export * from "./ClassProvider";
 export * from "./ErrorResponse";

src/index.ts

@@ -2,7 +2,7 @@ import "reflect-metadata";
 import { BootApplication, BootApplicationFactory } from "./controller";
 
 export * from "./controller";
-export * from "./utils";
+export * from "./shared/utils";
 export * from "./domain/types";
 export * from "./domain/enums";
 

src/repository/assignInjectMetadata.ts

@@ -18,6 +18,6 @@ export function assignInjectMetadata(
 
   return {
     ...existing,
-    [ `${type as string}:${index}` ]: { type, token, index }
+    [ `${type}:${index}` ]: { type, token, index }
   };
 }

src/repository/assignParamMetadata.ts

@@ -18,6 +18,6 @@ export function assignParamMetadata(
 ): Record<string, ParamDefinition> {
   return {
     ...existing,
-    [ `${type as string}:${index}` ]: { type, key, index }
+    [ `${type}:${index}` ]: { type, key, index }
   };
 }

src/service/EventDispatcher.ts

@@ -8,7 +8,8 @@ import { AppsScriptEventType, ParamSource } from "../domain/enums";
 import { InjectTokenDefinition, Newable, ParamDefinition } from "../domain/types";
 import { getInjectionTokens } from "../repository";
 import { Resolver } from "../service";
-import { isFunctionLike } from "apps-script-utils";
+import { isFunctionLike, isRegExp } from "apps-script-utils";
+import { isChangeEvent, isEditEvent, isFormSubmitEvent, isRecord } from "../shared/utils";
 
 /**
  * Service for dispatching events to controllers.
@@ -39,7 +40,9 @@ export class EventDispatcher {
       const propertyNames = Object.getOwnPropertyNames(prototype);
 
       for (const propertyName of propertyNames) {
-        if (propertyName === "constructor") continue;
+        if (propertyName === "constructor") {
+          continue;
+        }
 
         const methodHandler = prototype[ propertyName ];
 
@@ -50,12 +53,15 @@ export class EventDispatcher {
         if (eventMetadata === eventType && this.checkFilters(eventType, event, options)) {
           const instance = this.resolver.resolve(controller);
 
-          const args = this.buildMethodParams(instance as object, propertyName, event);
+          if (!isRecord(instance)) continue;
+
+          const args = this.buildMethodParams(instance, propertyName, event);
 
-          const handler = (instance as Record<string | symbol, unknown>)[ propertyName ] as (
-            ...args: unknown[]
-          ) => unknown;
-          await handler.apply(instance, args);
+          const handler = instance[ propertyName ];
+
+          if (isFunctionLike(handler)) {
+            await Reflect.apply(handler, instance, args);
+          }
         }
       }
     }
@@ -70,7 +76,9 @@ export class EventDispatcher {
    */
   public async dispatchByName(methodName: string, event: unknown): Promise<void> {
     for (const controller of this.controllers.keys()) {
-      const instance = this.resolver.resolve(controller) as Record<string, any>;
+      const instance = this.resolver.resolve(controller);
+
+      if (!isRecord(instance)) continue;
 
       const prototype = Object.getPrototypeOf(instance);
 
@@ -91,9 +99,9 @@ export class EventDispatcher {
         continue;
       }
 
-      const handler = instance[ methodName ].bind(instance);
+      const method = instance[ methodName ];
 
-      if (!isFunctionLike(handler)) {
+      if (!isFunctionLike(method)) {
         console.warn(
           "Method '%s' in controller '%s' is not a callable function and was skipped during event handling.",
           methodName,
@@ -103,10 +111,10 @@ export class EventDispatcher {
         continue;
       }
 
-      const args = this.buildMethodParams(instance as object, methodName, event);
+      const args = this.buildMethodParams(instance, methodName, event);
 
       try {
-        await handler(...args);
+        await Reflect.apply(method, instance, args);
       } catch (err: unknown) {
         console.error("Error:", err instanceof Error ? err.stack : String(err));
       }
@@ -136,9 +144,10 @@ export class EventDispatcher {
       propertyKey
     );
 
-    const metadata: (ParamDefinition | InjectTokenDefinition)[] = (
-      Object.values(rawMetadata) as (ParamDefinition | InjectTokenDefinition)[]
-    ).concat(Object.values(rawInjectMetadata) as (ParamDefinition | InjectTokenDefinition)[]);
+    const metadata: (ParamDefinition | InjectTokenDefinition)[] = [
+      ...Object.values(rawMetadata),
+      ...Object.values(rawInjectMetadata)
+    ];
 
     metadata.sort((a, b) => a.index - b.index);
 
@@ -150,10 +159,7 @@ export class EventDispatcher {
     for (const param of metadata) {
       switch (param.type) {
         case ParamSource.EVENT:
-          args[ param.index ] =
-            param.key && typeof event === "object" && event !== null
-              ? (event as Record<string, unknown>)[ param.key ]
-              : event;
+          args[ param.index ] = param.key && isRecord(event) ? event[ param.key ] : event;
           break;
 
         case ParamSource.INJECT:
@@ -188,36 +194,40 @@ export class EventDispatcher {
     event: unknown,
     options: Record<string, unknown> | undefined
   ): boolean {
-    if (!options) return true;
+    if (!options) {
+      return true;
+    }
 
     switch (eventType) {
       case AppsScriptEventType.EDIT:
         if (options.range) {
-          const editEvent = event as GoogleAppsScript.Events.SheetsOnEdit;
-          const eventRangeA1 =
-            typeof editEvent.range?.getA1Notation === "function"
-              ? editEvent.range.getA1Notation()
-              : null;
+          if (!isEditEvent(event)) {
+            return false;
+          }
+
+          const eventRangeA1 = isFunctionLike(event.range?.getA1Notation)
+            ? event.range.getA1Notation()
+            : null;
 
           if (!eventRangeA1) {
             return false;
           }
 
           const ranges = Array.isArray(options.range) ? options.range : [ options.range ];
 
-          // TODO: isRegExp
           return ranges.some((r: string | RegExp) =>
-            r instanceof RegExp ? r.test(eventRangeA1) : eventRangeA1 === r
+            isRegExp(r) ? r.test(eventRangeA1) : eventRangeA1 === r
           );
         }
         break;
 
       case AppsScriptEventType.FORM_SUBMIT:
         if (options.formId) {
-          const submitEvent = event as GoogleAppsScript.Events.FormsOnFormSubmit;
-          const eventFormId = (
-            submitEvent.source as unknown as { getId?: () => string }
-          )?.getId?.();
+          if (!isFormSubmitEvent(event)) {
+            return false;
+          }
+
+          const eventFormId = isFunctionLike(event.source?.getId) ? event.source.getId() : null;
 
           if (!eventFormId) {
             return false;
@@ -231,8 +241,11 @@ export class EventDispatcher {
 
       case AppsScriptEventType.CHANGE:
         if (options.changeType) {
-          const changeEvent = event as GoogleAppsScript.Events.SheetsOnChange;
-          const eventChangeType = changeEvent.changeType;
+          if (!isChangeEvent(event)) {
+            return false;
+          }
+
+          const eventChangeType = event.changeType;
 
           if (!eventChangeType) {
             return false;

src/service/RequestFactory.ts

@@ -1,6 +1,7 @@
 import { isString, normalize } from "apps-script-utils";
 import { HttpHeaders, HttpRequest, ParsedUrl } from "../domain/types";
 import { RequestMethod } from "../domain/enums";
+import { isRecord } from "../shared/utils";
 
 /**
  * Factory for creating structured HttpRequest objects.
@@ -24,7 +25,8 @@ export class RequestFactory {
         }
 
         try {
-          return JSON.parse(input.trim()) as HttpHeaders;
+          const parsed = JSON.parse(input.trim());
+          return isRecord(parsed) ? (parsed as HttpHeaders) : null;
         } catch (err: unknown) {
           console.warn("Failed to parse JSON:", err);
         }
@@ -34,9 +36,7 @@ export class RequestFactory {
 
     const methodParam = event?.parameter?.method?.toLowerCase();
 
-    const method = Object.values(RequestMethod).includes(methodParam as RequestMethod)
-      ? (methodParam as RequestMethod)
-      : methodRequest;
+    const method = Object.values(RequestMethod).find((v) => v === methodParam) || methodRequest;
 
     const rawPathname =
       event?.pathInfo || event?.parameter?.path || event?.parameter?.pathname || "/";

src/service/Resolver.ts

@@ -78,21 +78,21 @@ export class Resolver {
           );
         }
 
-        const tokenName =
-          typeof tokenToResolve === "function" ? tokenToResolve.name : String(tokenToResolve);
+        const tokenName = isFunctionLike(tokenToResolve)
+          ? tokenToResolve.name
+          : String(tokenToResolve);
 
         throw new Error(
           `[Resolve ERROR]: '${tokenName}' is not registered as a provider or controller.`
         );
       }
 
       deps[ i ] = isFunctionLike(tokenToResolve)
-        ? this.resolve(tokenToResolve as Newable)
+        ? this.resolve(tokenToResolve)
         : this._providers.get(tokenToResolve);
     }
 
-    const TargetClass = target as unknown as new (...args: unknown[]) => T;
-    const instance = new TargetClass(...deps);
+    const instance = Reflect.construct(target, deps);
 
     if (isController(target)) {
       this._controllers.set(target, instance);