fix types

terascope · Apr 11, 2024 · bacd4e9 · bacd4e9
1 parent 1f2c8be
commit bacd4e9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/packages/terafoundation/src/connector-utils.ts b/packages/terafoundation/src/connector-utils.ts
@@ -106,7 +106,9 @@ export function getConnectorModule(name: string, reason: string): any {
     return null;
 }
 
-export function getConnectorInitializers(name: string): Terafoundation.Initializers {
+export function getConnectorInitializers<S>(
+    name: string
+): Terafoundation.Initializers<S> {
     const reason = `Could not retrieve schema code for: ${name}\n`;
 
     const mod = getConnectorModule(name, reason);

diff --git a/packages/terafoundation/src/schema.ts b/packages/terafoundation/src/schema.ts
@@ -1,12 +1,12 @@
 import convict from 'convict';
 import { cpus } from 'os';
-import { PartialDeep, Terafoundation } from '@terascope/types';
+import { Terafoundation } from '@terascope/types';
 
 const workerCount = cpus().length;
 const DEFAULT_ASSET_STORAGE_CONNECTION_TYPE = 'elasticsearch-next';
 
-export function getFoundationInitializers(): Terafoundation.Initializers {
-    const schema: convict.Schema<any> = {
+export function getFoundationInitializers<S>(): Terafoundation.Initializers<S> {
+    const schema: convict.Schema<Record<string, any>> = {
         environment: {
             doc: 'If set to `production`, console logging will be disabled and logs will be sent to a file',
             default: 'development',
@@ -88,10 +88,10 @@ export function getFoundationInitializers(): Terafoundation.Initializers {
         }
     };
 
-    function validate_config(sysconfig: Terafoundation.SysConfig<any>,
-        subconfig: PartialDeep<Terafoundation.SysConfig<any>>
+    function validate_config(_sysconfig: Terafoundation.SysConfig<S>,
+        subconfig: Record<string, any>
     ): void {
-        const typedSubconfig = subconfig as unknown as Terafoundation.Foundation;
+        const typedSubconfig = subconfig as Terafoundation.Foundation;
         const connectionType = typedSubconfig.asset_storage_connection_type
                                 || DEFAULT_ASSET_STORAGE_CONNECTION_TYPE;
         const connectionTypesPresent = Object.keys(typedSubconfig.connectors);

diff --git a/packages/terafoundation/src/validate-configs.ts b/packages/terafoundation/src/validate-configs.ts
@@ -44,7 +44,7 @@ function validateConfig(
 function extractInitializers<S>(
     fn: any,
     sysconfig: PartialDeep<i.FoundationSysConfig<S>>
-): Terafoundation.Initializers {
+): Terafoundation.Initializers<S> {
     if (isFunction(fn)) {
         const result = fn(sysconfig);
         if (result.schema) {
@@ -81,16 +81,16 @@ export default function validateConfigs<
         throw new Error('Terafoundation requires a valid system configuration');
     }
 
-    const listOfValidations: Record<string, Terafoundation.ValidationObj> = {};
+    const listOfValidations: Record<string, Terafoundation.ValidationObj<S>> = {};
     const {
         schema: sysconfigSchema,
         validatorFn: terasliceValidatorFn
-    } = extractInitializers(config.config_schema, sysconfig);
+    } = extractInitializers<S>(config.config_schema, sysconfig);
     listOfValidations.teraslice = { validatorFn: terasliceValidatorFn, subconfig: {} };
     const {
         schema: foundationSchema,
         validatorFn: foundationValidatorFn
-    } = getFoundationInitializers();
+    } = getFoundationInitializers<S>();
     listOfValidations.terafoundation = { validatorFn: foundationValidatorFn, subconfig: {} };
     sysconfigSchema.terafoundation = foundationSchema;
 
@@ -126,7 +126,7 @@ export default function validateConfigs<
                 const {
                     schema: connSchema,
                     validatorFn: connValidatorFn
-                } = getConnectorInitializers(connector);
+                } = getConnectorInitializers<S>(connector);
 
                 result[schemaKey].connectors[connector] = {};
                 for (const [connection, connectionConfig] of Object.entries(connectorConfig)) {

diff --git a/packages/types/src/terafoundation.ts b/packages/types/src/terafoundation.ts
@@ -3,7 +3,7 @@ import {
     Cluster as NodeJSCluster,
     Worker as NodeJSWorker
 } from 'node:cluster';
-import type { Overwrite, PartialDeep } from './utility';
+import type { Overwrite } from './utility';
 import type { Logger } from './logger';
 
 interface Format {
@@ -27,22 +27,22 @@ export type Schema<T> = {
     [P in keyof T]: Schema<T[P]> | SchemaObj<T[P]>;
 };
 
-export type Initializers = {
-    schema: Schema<any>,
-    validatorFn?: ValidatorFn
+export type Initializers<S> = {
+    schema: Schema<Record<string, any>>
+    validatorFn?: ValidatorFn<S>
 }
 
-export type ValidatorFn = (
-    sysconfig: SysConfig<any>,
-    subConfig: PartialDeep<SysConfig<any>>,
+export type ValidationObj<S>= {
+    subconfig: Record<string, any>,
+    validatorFn?: ValidatorFn<S>
+}
+
+export type ValidatorFn<S> = (
+    sysconfig: SysConfig<S>,
+    subconfig: Record<string, any>,
     name: string
 ) => void
 
-export type ValidationObj= {
-    validatorFn: ValidatorFn | undefined,
-    subconfig: PartialDeep<SysConfig<any>>
-}
-
 export type Config<
     S = Record<string, any>,
     A = Record<string, any>,