Revert "[tweek-client] add client error handling"

js/tweek-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tweek-client",
-  "version": "1.0.0",
+  "version": "1.0.0-rc7",
   "description": "Tweek client for JavaScript",
   "author": "Soluto",
   "license": "MIT",

js/tweek-client/src/TweekClient/TweekClient.ts

@@ -1,38 +1,9 @@
 import { InputParams } from 'query-string';
 import chunk from 'lodash.chunk';
-import { deprecated, normalizeBaseUrl, optimizeInclude, toQueryString } from '../utils';
+import { normalizeBaseUrl, optimizeInclude, toQueryString } from '../utils';
 import { TweekInitConfig } from '../types';
 import { FetchError } from '../FetchError';
-import {
-  Context,
-  GetValuesConfig,
-  ITweekClient,
-  KeyValuesErrorHandler,
-  KeyValuesErrors,
-  TweekClientConfig,
-} from './types';
-import { KeyValuesError } from './KeyValuesError';
-
-type TweekResult<T> = {
-  data: T;
-  errors: KeyValuesErrors;
-};
-
-function extractData<T>(
-  { data, errors }: TweekResult<T>,
-  throwOnError: boolean | undefined,
-  onKeyValueError: KeyValuesErrorHandler | undefined,
-) {
-  if (errors && Object.keys(errors).length > 0) {
-    if (onKeyValueError) {
-      Object.entries(errors as KeyValuesErrors).forEach(([k, e]) => onKeyValueError(k, e));
-    }
-    if (throwOnError) {
-      throw new KeyValuesError(errors, 'Tweek values had errors');
-    }
-  }
-  return data;
-}
+import { Context, GetValuesConfig, ITweekClient, TweekClientConfig } from './types';
 
 export default class TweekClient implements ITweekClient {
   config: TweekClientConfig;
@@ -54,37 +25,26 @@ export default class TweekClient implements ITweekClient {
       ..._config,
     };
 
-    const { include, maxChunkSize = 100, throwOnError, onKeyValueError } = cfg;
+    const { include, maxChunkSize = 100 } = cfg;
 
     if (!include) {
-      return this._fetchChunk<T>(path, cfg).then(res => extractData(res, throwOnError, onKeyValueError));
+      return this._fetchChunk(path, cfg);
     }
 
     const optimizedInclude = optimizeInclude(include);
     const includeChunks = chunk(optimizedInclude, maxChunkSize);
     const fetchConfigChunks = includeChunks.map(ic => ({ ...cfg, include: ic }));
-    const fetchPromises = fetchConfigChunks.map(cc => this._fetchChunk<T>(path, cc));
-    return Promise.all(fetchPromises).then(chunks => {
-      const res = chunks.reduce((res, ch) => ({
-        data: { ...res.data, ...ch.data },
-        errors: { ...res.errors, ...ch.errors },
-      }));
-      return extractData(res, throwOnError, onKeyValueError);
-    });
+    const fetchPromises = fetchConfigChunks.map(cc => this._fetchChunk(path, cc));
+    return <Promise<T>>Promise.all(fetchPromises).then(chunks => chunks.reduce((res, ch) => ({ ...res, ...ch }), {}));
   }
 
-  @deprecated('getValues')
-  fetch<T>(path: string, config?: GetValuesConfig): Promise<T> {
-    return this.getValues(path, config);
-  }
+  fetch = this.getValues;
 
-  private _fetchChunk<T>(path: string, _config: TweekInitConfig & GetValuesConfig): Promise<TweekResult<T>> {
+  private _fetchChunk<T>(path: string, _config: TweekInitConfig & GetValuesConfig): Promise<T> {
     const { flatten, baseServiceUrl, context, include, ignoreKeyTypes } = _config;
 
     const queryParamsObject = this._contextToQueryParams(context);
 
-    queryParamsObject['$includeErrors'] = true;
-
     if (flatten) {
       queryParamsObject['$flatten'] = true;
     }

js/tweek-client/src/TweekClient/createTweekClient.ts

@@ -1,9 +1,11 @@
 import { createFetchClient } from '../utils';
-import { BaseCreateTweekClientConfig } from './types';
+import { CreateClientConfig } from '../types';
+import { Context } from './types';
 import TweekClient from './TweekClient';
 
-export type CreateTweekClientConfig = BaseCreateTweekClientConfig & {
-  baseServiceUrl: string;
+export type CreateTweekClientConfig = CreateClientConfig & {
+  context?: Context;
+  useLegacyEndpoint?: boolean;
 };
 
 export function createTweekClient({

js/tweek-client/src/TweekClient/index.ts

@@ -1,6 +1,3 @@
 export * from './types';
 export { default as TweekClient } from './TweekClient';
-export { default as TweekClientWithFallback } from './TweekClientWithFallback';
 export * from './createTweekClient';
-export * from './createTweekClientWithFallback';
-export * from './KeyValuesError';

js/tweek-client/src/TweekClient/types.ts

@@ -1,4 +1,4 @@
-import { FetchClientConfig, IdentityContext, TweekInitConfig } from '../types';
+import { IdentityContext, TweekInitConfig } from '../types';
 
 export type Context = {
   [identityType: string]: string | ({ id?: string } & IdentityContext);
@@ -8,28 +8,17 @@ type RequestConfig = {
   include?: string[];
 };
 
-export type KeyValuesErrors = { [keyPath: string]: string };
-
-export type KeyValuesErrorHandler = (keyPath: string, error: string) => void;
-
 type ClientConfig = {
   context?: Context;
   flatten?: boolean;
   ignoreKeyTypes?: boolean;
   maxChunkSize?: number;
-  onKeyValueError?: KeyValuesErrorHandler;
-  throwOnError?: boolean;
 };
 
 export type GetValuesConfig = ClientConfig & RequestConfig;
 
 export type TweekClientConfig = TweekInitConfig & ClientConfig;
 
-export type BaseCreateTweekClientConfig = FetchClientConfig & {
-  context?: Context;
-  useLegacyEndpoint?: boolean;
-};
-
 export interface ITweekClient {
   getValues<T>(path: string, config?: GetValuesConfig): Promise<T>;
 

js/tweek-client/src/TweekManagementClient/createTweekManagementClient.ts

@@ -1,15 +1,8 @@
 import { createFetchClient } from '../utils';
-import { FetchClientConfig } from '../types';
+import { CreateClientConfig } from '../types';
 import TweekManagementClient from './TweekManagementClient';
 
-export type CreateTweekManagementClientConfig = FetchClientConfig & {
-  baseServiceUrl: string;
-};
-
-export function createTweekManagementClient({
-  baseServiceUrl,
-  ...fetchClientConfig
-}: CreateTweekManagementClientConfig) {
+export function createTweekManagementClient({ baseServiceUrl, ...fetchClientConfig }: CreateClientConfig) {
   return new TweekManagementClient({
     baseServiceUrl,
     fetch: createFetchClient(fetchClientConfig),

js/tweek-client/src/types.ts

@@ -30,3 +30,7 @@ export type FetchClientConfig = (BearerAuthenticationOptions | ClientCredentials
   requestTimeoutInMillis?: number;
   onError?(response: Response): void;
 };
+
+export type CreateClientConfig = FetchClientConfig & {
+  baseServiceUrl: string;
+};

js/tweek-client/src/utils.ts

@@ -141,21 +141,3 @@ export const toQueryString = (query: InputParams) => {
   const queryString = qs.stringify(query);
   return queryString ? `?${queryString}` : '';
 };
-
-export function deprecated(newMethod: string) {
-  let notified = false;
-  return function(target: Object, propertyKey: string, descriptor: PropertyDescriptor) {
-    const originalValue = descriptor.value;
-    descriptor.value = function() {
-      if (!notified) {
-        if (typeof process !== 'undefined' && process.env.NODE_ENV !== 'production') {
-          const name = target.constructor.name;
-          console.warn(`the ${name}.${propertyKey} method is deprecated, please use ${name}.${newMethod} instead`);
-        }
-        notified = true;
-      }
-
-      return originalValue.apply(this, arguments);
-    };
-  };
-}

js/tweek-client/test/TweekClient/fetchChuncks.spec.ts

@@ -29,16 +29,16 @@ describe('TweekClient fetchChunks', () => {
       expectedUrl: `${defaultUrl}api/v2/values/_`,
       stubCalls: [
         {
-          requestUrl: 'http://test/api/v2/values/_?%24include=a1&%24include=a2&%24include=a3&%24includeErrors=true',
-          response: new Response('{"data": { "a1": 1, "a2": 2, "a3": 3 } }'),
+          requestUrl: 'http://test/api/v2/values/_?%24include=a1&%24include=a2&%24include=a3',
+          response: new Response('{ "a1": 1, "a2": 2, "a3": 3 }'),
         },
         {
-          requestUrl: 'http://test/api/v2/values/_?%24include=b1&%24include=b2&%24include=b3&%24includeErrors=true',
-          response: new Response('{ "data": { "b1": "a", "b2": "b", "b3": "c" } }'),
+          requestUrl: 'http://test/api/v2/values/_?%24include=b1&%24include=b2&%24include=b3',
+          response: new Response('{ "b1": "a", "b2": "b", "b3": "c" }'),
         },
         {
-          requestUrl: 'http://test/api/v2/values/_?%24include=c5&%24includeErrors=true',
-          response: new Response('{ "data": { "c5": true } }'),
+          requestUrl: 'http://test/api/v2/values/_?%24include=c5',
+          response: new Response('{ "c5": true }'),
         },
       ],
       config: {