chore(parser): use single namespace for service types

packages/openapi-ts/src/index.ts

@@ -98,7 +98,6 @@ const initConfig = async (userConfig: UserConfig, dependencies: Dependencies) =>
         debug = false,
         dryRun = false,
         enums = false,
-        experimental = false,
         exportCore = true,
         exportModels = true,
         exportServices = true,
@@ -152,7 +151,6 @@ const initConfig = async (userConfig: UserConfig, dependencies: Dependencies) =>
         debug,
         dryRun,
         enums,
-        experimental,
         exportCore,
         exportModels,
         exportServices,

packages/openapi-ts/src/openApi/common/parser/__tests__/operation.spec.ts

@@ -9,7 +9,6 @@ describe('getOperationName', () => {
         debug: false,
         dryRun: true,
         enums: false,
-        experimental: false,
         exportCore: false,
         exportModels: false,
         exportServices: false,
@@ -30,7 +29,6 @@ describe('getOperationName', () => {
         debug: false,
         dryRun: true,
         enums: false,
-        experimental: false,
         exportCore: false,
         exportModels: false,
         exportServices: false,

packages/openapi-ts/src/openApi/common/parser/getEnums.ts

@@ -8,7 +8,9 @@ export const getEnums = (definition: WithEnumExtension, values?: ReadonlyArray<s
     }
 
     const descriptions = (definition['x-enum-descriptions'] ?? []).filter(value => typeof value === 'string');
-    const names = (definition['x-enum-varnames'] ?? definition['x-enumNames'] ?? []).filter(value => typeof value === 'string');
+    const names = (definition['x-enum-varnames'] ?? definition['x-enumNames'] ?? []).filter(
+        value => typeof value === 'string'
+    );
 
     return values
         .filter(unique)

packages/openapi-ts/src/openApi/v2/parser/__tests__/getServices.spec.ts

@@ -10,7 +10,6 @@ describe('getServices', () => {
             debug: false,
             dryRun: true,
             enums: false,
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/openApi/v3/parser/__tests__/getServices.spec.ts

@@ -10,7 +10,6 @@ describe('getServices', () => {
             debug: false,
             dryRun: true,
             enums: false,
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/templates/partials/operationParameters.hbs

@@ -1,10 +1,10 @@
 {{#if @root.$config.useOptions~}}
-{{#if parameters}}data: {{{nameOperationDataType @root 'req' this}}}{{#ifOperationDataOptional parameters}} = {}{{/ifOperationDataOptional}}{{/if}}
+{{#if parameters}}data: {{{nameOperationDataType 'req' this}}}{{#ifOperationDataOptional parameters}} = {}{{/ifOperationDataOptional}}{{/if}}
 {{~else}}
 {{#if parameters}}
 
 {{#each parameters}}
-{{{name}}}{{{modelIsRequired this}}}: {{{nameOperationDataType @root 'req' ../this name}}}{{#hasDefault this}} = {{{getDefaultPrintable this}}}{{/hasDefault}},
+{{{name}}}{{{modelIsRequired this}}}: {{{nameOperationDataType 'req' ../this name}}}{{#hasDefault this}} = {{{getDefaultPrintable this}}}{{/hasDefault}},
 {{/each}}
 {{/if}}
 {{/if}}

packages/openapi-ts/src/templates/partials/operationResult.hbs

@@ -1,7 +1,7 @@
 {{~#if @root.$config.useOptions~}}
 {{~#equals @root.$config.serviceResponse 'response'}}ApiResult<{{/equals~}}
 {{~/if~}}
-{{{nameOperationDataType @root 'res' this}}}
+{{{nameOperationDataType 'res' this}}}
 {{~#if @root.$config.useOptions~}}
 {{~#equals @root.$config.serviceResponse 'response'}}>{{/equals~}}
 {{~/if~}}

packages/openapi-ts/src/types/config.ts

@@ -23,11 +23,6 @@ export interface UserConfig {
      * @default false
      */
     enums?: 'javascript' | 'typescript' | false;
-    /**
-     * Generate an experimental build?
-     * @default false
-     */
-    experimental?: boolean;
     /**
      * Generate core client classes?
      * @default true

packages/openapi-ts/src/utils/__tests__/handlebars.spec.ts

@@ -11,7 +11,6 @@ describe('registerHandlebarHelpers', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,
@@ -49,7 +48,6 @@ describe('registerHandlebarTemplates', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/utils/handlebars.ts

@@ -67,20 +67,9 @@ const dataDestructure = (operation: Operation) => {
     } else {
         if (config.useOptions) {
             if (operation.parameters.length) {
+                // TODO: extract query parameters from query key
                 return `const {
-                    ${config.experimental ? 'query,' : ''}
-                    ${operation.parameters
-                        .map(parameter => {
-                            if (config.experimental) {
-                                if (parameter.in !== 'query') {
-                                    return parameter.name;
-                                }
-                            } else {
-                                return parameter.name;
-                            }
-                        })
-                        .filter(Boolean)
-                        .join(',\n')}
+                    ${operation.parameters.map(parameter => parameter.name).join(',\n')}
                 } = data;`;
             }
         }
@@ -89,24 +78,22 @@ const dataDestructure = (operation: Operation) => {
 };
 
 const dataParameters = (parameters: OperationParameter[]) => {
-    const config = getConfig();
-
-    if (config.experimental) {
-        let output = parameters
-            .filter(parameter => getDefaultPrintable(parameter) !== undefined)
-            .map(parameter => {
-                const key = parameter.prop;
-                const value = parameter.name;
-                if (key === value || escapeName(key) === key) {
-                    return `${key}: ${getDefaultPrintable(parameter)}`;
-                }
-                return `'${key}': ${getDefaultPrintable(parameter)}`;
-            });
-        if (parameters.every(parameter => parameter.in === 'query')) {
-            output = [...output, '...query'];
-        }
-        return output.join(', ');
-    }
+    // if (config.experimental) {
+    //     let output = parameters
+    //         .filter(parameter => getDefaultPrintable(parameter) !== undefined)
+    //         .map(parameter => {
+    //             const key = parameter.prop;
+    //             const value = parameter.name;
+    //             if (key === value || escapeName(key) === key) {
+    //                 return `${key}: ${getDefaultPrintable(parameter)}`;
+    //             }
+    //             return `'${key}': ${getDefaultPrintable(parameter)}`;
+    //         });
+    //     if (parameters.every(parameter => parameter.in === 'query')) {
+    //         output = [...output, '...query'];
+    //     }
+    //     return output.join(', ');
+    // }
 
     const output = parameters.map(parameter => {
         const key = parameter.prop;
@@ -122,26 +109,22 @@ const dataParameters = (parameters: OperationParameter[]) => {
     return output.join(', ');
 };
 
-export const serviceExportedNamespace = (service: Service) => {
-    const exported = `$OpenApiTs${camelCase(service.name, { pascalCase: true })}`;
-    return exported;
-};
-
-export const operationKey = (operation: Service['operations'][number]) => {
-    const key = camelCase(operation.name, { pascalCase: true });
-    return key;
-};
+export const serviceExportedNamespace = () => '$OpenApiTs';
 
 export const nameOperationDataType = (
-    service: Service,
     namespace: 'req' | 'res',
     operation: Service['operations'][number],
     name?: string | object
 ) => {
-    const exported = serviceExportedNamespace(service);
-    const key = operationKey(operation);
-    const path = `${exported}['${namespace}']['${key}']`;
-    return name && typeof name === 'string' ? `${path}['${name}']` : path;
+    const exported = serviceExportedNamespace();
+    if (namespace === 'req') {
+        const path = `${exported}['${operation.path}']['${operation.method.toLocaleLowerCase()}']['${namespace}']`;
+        return name && typeof name === 'string' ? `${path}['${name}']` : path;
+    }
+    if (namespace === 'res') {
+        const path = `${exported}['${operation.path}']['${operation.method.toLocaleLowerCase()}']['${namespace}']`;
+        return name && typeof name === 'string' ? `${path}['${name}']` : path;
+    }
 };
 
 export const registerHandlebarHelpers = (): void => {
@@ -191,12 +174,11 @@ export const registerHandlebarHelpers = (): void => {
     Handlebars.registerHelper(
         'nameOperationDataType',
         function (
-            service: Service,
             namespace: 'req' | 'res',
             operation: Service['operations'][number],
             name: string | undefined
         ) {
-            return nameOperationDataType(service, namespace, operation, name);
+            return nameOperationDataType(namespace, operation, name);
         }
     );
 

packages/openapi-ts/src/utils/write/__tests__/class.spec.ts

@@ -16,7 +16,6 @@ describe('writeClientClass', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/utils/write/__tests__/client.spec.ts

@@ -16,7 +16,6 @@ describe('writeClient', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/utils/write/__tests__/core.spec.ts

@@ -30,7 +30,6 @@ describe('writeClientCore', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,
@@ -71,7 +70,6 @@ describe('writeClientCore', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,
@@ -113,7 +111,6 @@ describe('writeClientCore', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/utils/write/__tests__/index.spec.ts

@@ -15,7 +15,6 @@ describe('writeClientIndex', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/utils/write/__tests__/models.spec.ts

@@ -16,7 +16,6 @@ describe('writeClientModels', () => {
             debug: false,
             dryRun: false,
             enums: 'javascript',
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,

packages/openapi-ts/src/utils/write/__tests__/services.spec.ts

@@ -16,7 +16,6 @@ describe('writeClientServices', () => {
             debug: false,
             dryRun: false,
             enums: false,
-            experimental: false,
             exportCore: true,
             exportModels: true,
             exportServices: true,