Merge pull request #46 from ccremer/util

Move pluralizer and url generator to api package

Author: ccremer

packages/kubernetes-client-angular/projects/kubernetes-client-angular/src/lib/kubernetes-url-generator.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, Optional } from '@angular/core'
-import { HttpMethods, KubernetesUrlGenerator, UrlGenerator } from '@ccremer/kubernetes-client/fetch'
+import { HttpMethods, KubernetesUrlGenerator, UrlGenerator } from '@ccremer/kubernetes-client/api'
 import { KubernetesDataServiceFactoryConfig } from './kubernetes-data-service-factory.service'
 
 @Injectable({

packages/kubernetes-client/src/api/index.ts

@@ -1,3 +1,5 @@
 export * from './options'
 export * from './config'
 export * from './client'
+export * from './pluralizer'
+export * from './urlgenerator'

packages/kubernetes-client/src/fetch/pluralizer.spec.ts renamed to packages/kubernetes-client/src/api/pluralizer.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { HttpMethods, KubernetesUrlGenerator, toURLSearchParams } from './urlgenerator'
-import { ClientOptions } from '../api'
+import { ClientOptions } from './index'
 
 describe('KubernetesUrlGenerator', () => {
   const tests: {

packages/kubernetes-client/src/fetch/pluralizer.ts renamed to packages/kubernetes-client/src/api/pluralizer.ts

@@ -1,4 +1,4 @@
-import { OptionValue } from '../api'
+import { OptionValue } from './index'
 import { DefaultPluralizer, Pluralizer } from './pluralizer'
 
 export declare type HttpMethods = 'DELETE' | 'GET' | 'POST' | 'PUT' | 'PATCH'

packages/kubernetes-client/src/fetch/urlgenerator.spec.ts renamed to packages/kubernetes-client/src/api/urlgenerator.spec.ts

@@ -7,9 +7,10 @@ import {
   ClientWithUpdate,
   Config,
   KubeConfig,
+  KubernetesUrlGenerator,
+  UrlGenerator,
 } from '../api'
 import { FetchClient, FetchFn } from './client'
-import { KubernetesUrlGenerator, UrlGenerator } from './urlgenerator'
 import { Authorizer, DefaultAuthorizer, NoopAuthorizer } from './authorizer'
 
 export interface Client

packages/kubernetes-client/src/fetch/urlgenerator.ts renamed to packages/kubernetes-client/src/api/urlgenerator.ts

@@ -1,8 +1,17 @@
 import { ErrorStatus, KubeList, KubeObject, KubernetesError } from '../types/core'
 import { Authorizer } from './authorizer'
-import { ClientOptions, DeleteOptions, GetOptions, ListOptions, MutationOptions, PatchOptions } from '../api'
+import {
+  ClientOptions,
+  DeleteOptions,
+  GetOptions,
+  HttpMethods,
+  ListOptions,
+  MutationOptions,
+  PatchOptions,
+  toURLSearchParams,
+  UrlGenerator,
+} from '../api'
 import { Client } from './builder'
-import { HttpMethods, toURLSearchParams, UrlGenerator } from './urlgenerator'
 
 export declare type FetchFn = (input: RequestInfo | URL, init?: RequestInit | undefined) => Promise<Response>
 

packages/kubernetes-client/src/fetch/builder.ts

@@ -1,6 +1,4 @@
 export * from './client'
 export * from './builder'
 export * from './client'
-export * from './urlgenerator'
 export * from './authorizer'
-export * from './pluralizer'