api 5.0.3 → 5.0.5

package/dist/bin.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/cache.d.ts

@@ -1,7 +1,7 @@
 import type { OASDocument } from 'oas/dist/rmoas.types';
 import 'isomorphic-fetch';
 import Fetcher from './fetcher';
-declare type CacheStore = Record<string, {
+type CacheStore = Record<string, {
     hash: string;
     path?: string;
     original: string | OASDocument;

package/dist/cache.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/cli/codegen/index.d.ts

@@ -1,4 +1,4 @@
 import type CodeGeneratorLanguage from './language';
 import type Oas from 'oas';
-export declare type SupportedLanguages = 'js' | 'js-cjs' | 'js-esm' | 'ts';
+export type SupportedLanguages = 'js' | 'js-cjs' | 'js-esm' | 'ts';
 export default function codegen(language: SupportedLanguages, spec: Oas, specPath: string, identifier: string): CodeGeneratorLanguage;

package/dist/cli/codegen/languages/typescript.d.ts

@@ -5,17 +5,17 @@ import type { Operation } from 'oas';
 import type { ClassDeclaration } from 'ts-morph';
 import { Project } from 'ts-morph';
 import CodeGeneratorLanguage from '../language';
-export declare type TSGeneratorOptions = {
+export interface TSGeneratorOptions {
     outputJS?: boolean;
     compilerTarget?: 'cjs' | 'esm';
-};
-declare type OperationTypeHousing = {
+}
+interface OperationTypeHousing {
     types: {
         params?: false | Record<'body' | 'formData' | 'metadata', string>;
         responses?: Record<string, string>;
     };
     operation: Operation;
-};
+}
 export default class TSGenerator extends CodeGeneratorLanguage {
     project: Project;
     outputJS: boolean;

package/dist/cli/codegen/languages/typescript.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -100,7 +100,7 @@ var TSGenerator = /** @class */ (function (_super) {
                 reason: "Required for the `api/dist/core` library that the codegen'd SDK uses for making requests.",
                 url: 'https://npm.im/api'
             },
-            'json-schema-to-ts': {
+            'json-schema-to-ts@beta': {
                 reason: 'Required for TypeScript type handling.',
                 url: 'https://npm.im/json-schema-to-ts'
             },
@@ -186,15 +186,28 @@ var TSGenerator = /** @class */ (function (_super) {
                 if (Object.keys(this.schemas).length) {
                     this.createSchemasFile();
                     this.createTypesFile();
-                    types = Array.from(this.types.keys());
-                    types.sort();
-                    sdkSource.addExportDeclarations([
-                        {
-                            isTypeOnly: true,
-                            namedExports: types,
-                            moduleSpecifier: './types'
-                        },
-                    ]);
+                    /**
+                     * Export all of our available types so they can be used in SDK implementations. Types are
+                     * exported individually because TS has no way right now of allowing us to do
+                     * `export type * from './types'` on a non-named entry.
+                     *
+                     * Types in the main entry point are only being exported for TS outputs as JS users won't be
+                     * able to use them and it clashes with the default SDK export present.
+                     *
+                     * @see {@link https://github.com/microsoft/TypeScript/issues/37238}
+                     * @see {@link https://github.com/readmeio/api/issues/588}
+                     */
+                    if (!this.outputJS) {
+                        types = Array.from(this.types.keys());
+                        types.sort();
+                        sdkSource.addExportDeclarations([
+                            {
+                                isTypeOnly: true,
+                                namedExports: types,
+                                moduleSpecifier: './types'
+                            },
+                        ]);
+                    }
                 }
                 else {
                     // If we don't have any schemas then we shouldn't import a `types` file that doesn't exist.
@@ -381,7 +394,14 @@ var TSGenerator = /** @class */ (function (_super) {
                 },
             ]
         });
-        sourceFile.addExportAssignment({ isExportEquals: false, expression: 'createSDK' });
+        sourceFile.addExportAssignment({
+            // Because CJS targets have `createSDK` exported with `module.exports`, but the TS type side
+            // of things to work right we need to set this as `export =`. Thankfully `ts-morph` will
+            // handle this accordingly and still create our JS file with `module.exports` and not
+            // `export =` -- only TS types will have this export style.
+            isExportEquals: this.compilerTarget === 'cjs' && this.outputJS,
+            expression: 'createSDK'
+        });
         return sourceFile;
     };
     /**

package/dist/cli/commands/install.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/cli/lib/prompt.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/cli/storage.d.ts

@@ -65,15 +65,15 @@ export default class Storage {
      */
     save(spec: OASDocument): OASDocument;
 }
-export declare type Lockfile = {
+export interface Lockfile {
     /**
      * The `api.json` schema version. This will only ever change if we introduce breaking changes to
      * this store.
      */
     version: '1.0';
     apis: LockfileAPI[];
-};
-export declare type LockfileAPI = {
+}
+export interface LockfileAPI {
     /**
      * A unique identifier of the API. This'll be used to do requires on `@api/<identifier>` and also
      * where the SDK code will be located in `.api/apis/<identifier>`.
@@ -102,4 +102,4 @@ export declare type LockfileAPI = {
      * @example 5.0.0
      */
     installerVersion: string;
-};
+}

package/dist/cli/storage.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/core/index.d.ts

@@ -14,14 +14,14 @@ export interface ConfigOptions {
      */
     timeout?: number;
 }
-export declare type FetchResponse<status, data> = {
+export interface FetchResponse<status, data> {
     data: data;
     status: status;
     headers: Headers;
     res: Response;
-};
-declare type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N ? Acc[number] : Enumerate<N, [...Acc, Acc['length']]>;
-export declare type HTTPMethodRange<F extends number, T extends number> = Exclude<Enumerate<T>, Enumerate<F>>;
+}
+type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N ? Acc[number] : Enumerate<N, [...Acc, Acc['length']]>;
+export type HTTPMethodRange<F extends number, T extends number> = Exclude<Enumerate<T>, Enumerate<F>>;
 export { getJSONSchemaDefaults, parseResponse, prepareAuth, prepareParams, prepareServer };
 export default class APICore {
     spec: Oas;

package/dist/core/index.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/core/parseResponse.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/core/prepareParams.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/fetcher.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/index.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/packageInfo.d.ts

@@ -1,2 +1,2 @@
 export declare const PACKAGE_NAME = "api";
-export declare const PACKAGE_VERSION = "5.0.3";
+export declare const PACKAGE_VERSION = "5.0.5";

package/dist/packageInfo.js

@@ -3,4 +3,4 @@ exports.__esModule = true;
 exports.PACKAGE_VERSION = exports.PACKAGE_NAME = void 0;
 // This file is automatically updated by the build script.
 exports.PACKAGE_NAME = 'api';
-exports.PACKAGE_VERSION = '5.0.3';
+exports.PACKAGE_VERSION = '5.0.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "description": "Magical SDK generation from an OpenAPI definition 🪄",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -37,11 +37,11 @@
     "swagger"
   ],
   "dependencies": {
-    "@readme/oas-to-har": "^20.0.0",
-    "@readme/openapi-parser": "^2.2.0",
+    "@readme/oas-to-har": "^20.0.1",
+    "@readme/openapi-parser": "^2.4.0",
     "caseless": "^0.12.0",
     "chalk": "^4.1.2",
-    "commander": "^9.4.0",
+    "commander": "^9.4.1",
     "datauri": "^4.1.0",
     "execa": "^5.1.1",
     "fetch-har": "^8.1.3",
@@ -52,7 +52,7 @@
     "get-stream": "^6.0.1",
     "isomorphic-fetch": "^3.0.0",
     "js-yaml": "^4.1.0",
-    "json-schema-to-ts": "^2.5.5",
+    "json-schema-to-ts": "^2.6.2-beta.0",
     "json-schema-traverse": "^1.0.0",
     "lodash.camelcase": "^4.3.0",
     "lodash.deburr": "^4.1.0",
@@ -61,20 +61,20 @@
     "lodash.startcase": "^4.4.0",
     "make-dir": "^3.1.0",
     "node-abort-controller": "^3.0.1",
-    "oas": "^20.0.0",
+    "oas": "^20.0.1",
     "ora": "^5.4.1",
-    "prettier": "^2.8.0",
+    "prettier": "^2.8.1",
     "prompts": "^2.4.2",
-    "remove-undefined-objects": "^2.0.1",
+    "remove-undefined-objects": "^2.0.2",
     "semver": "^7.3.8",
-    "ssri": "^10.0.0",
-    "ts-morph": "^16.0.0",
+    "ssri": "^10.0.1",
+    "ts-morph": "^17.0.1",
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@readme/oas-examples": "^5.7.1",
+    "@readme/oas-examples": "^5.9.0",
     "@types/caseless": "^0.12.2",
-    "@types/chai": "^4.3.1",
+    "@types/chai": "^4.3.4",
     "@types/find-cache-dir": "^3.2.1",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash.camelcase": "^4.3.7",
@@ -82,23 +82,23 @@
     "@types/lodash.merge": "^4.6.7",
     "@types/lodash.setwith": "^4.3.7",
     "@types/lodash.startcase": "^4.4.7",
-    "@types/mocha": "^10.0.0",
+    "@types/mocha": "^10.0.1",
     "@types/prettier": "^2.7.1",
-    "@types/prompts": "^2.0.14",
+    "@types/prompts": "^2.4.2",
     "@types/semver": "^7.3.13",
-    "@types/sinon-chai": "^3.2.8",
+    "@types/sinon-chai": "^3.2.9",
     "@types/ssri": "^7.1.1",
     "@types/validate-npm-package-name": "^4.0.0",
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "fetch-mock": "^9.11.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.1.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
-    "oas-normalize": "^7.1.0",
-    "sinon": "^14.0.0",
+    "oas-normalize": "^8.1.4",
+    "sinon": "^15.0.0",
     "sinon-chai": "^3.7.0",
-    "type-fest": "^3.2.0",
-    "typescript": "^4.7.4",
+    "type-fest": "^3.3.0",
+    "typescript": "^4.9.4",
     "unique-temp-dir": "^1.0.0"
   },
   "prettier": "@readme/eslint-config/prettier",
@@ -108,5 +108,5 @@
       "test/"
     ]
   },
-  "gitHead": "7aba675afe57fccdd23144a7917bc71bc7d28ed7"
+  "gitHead": "2d399495a06a79e5d2c812766e03281e8d7a1299"
 }

package/src/cli/codegen/languages/typescript.ts

@@ -19,18 +19,18 @@ import CodeGeneratorLanguage from '../language';
 
 import { docblockEscape, formatter, generateTypeName, wordWrap } from './typescript/util';
 
-export type TSGeneratorOptions = {
+export interface TSGeneratorOptions {
   outputJS?: boolean;
   compilerTarget?: 'cjs' | 'esm';
-};
+}
 
-type OperationTypeHousing = {
+interface OperationTypeHousing {
   types: {
     params?: false | Record<'body' | 'formData' | 'metadata', string>;
     responses?: Record<string, string>;
   };
   operation: Operation;
-};
+}
 
 export default class TSGenerator extends CodeGeneratorLanguage {
   project: Project;
@@ -78,7 +78,7 @@ export default class TSGenerator extends CodeGeneratorLanguage {
         reason: "Required for the `api/dist/core` library that the codegen'd SDK uses for making requests.",
         url: 'https://npm.im/api',
       },
-      'json-schema-to-ts': {
+      'json-schema-to-ts@beta': {
         reason: 'Required for TypeScript type handling.',
         url: 'https://npm.im/json-schema-to-ts',
       },
@@ -172,22 +172,29 @@ export default class TSGenerator extends CodeGeneratorLanguage {
       this.createSchemasFile();
       this.createTypesFile();
 
-      // Export all of our available types so they can be used in SDK implementations.
-      //
-      // We're exporting all of the types individually because TS has no way right now of allowing
-      // us to do `export type * from './types'` on a non-named entry.
-      //
-      // https://github.com/microsoft/TypeScript/issues/37238
-      const types = Array.from(this.types.keys());
-      types.sort();
-
-      sdkSource.addExportDeclarations([
-        {
-          isTypeOnly: true,
-          namedExports: types,
-          moduleSpecifier: './types',
-        },
-      ]);
+      /**
+       * Export all of our available types so they can be used in SDK implementations. Types are
+       * exported individually because TS has no way right now of allowing us to do
+       * `export type * from './types'` on a non-named entry.
+       *
+       * Types in the main entry point are only being exported for TS outputs as JS users won't be
+       * able to use them and it clashes with the default SDK export present.
+       *
+       * @see {@link https://github.com/microsoft/TypeScript/issues/37238}
+       * @see {@link https://github.com/readmeio/api/issues/588}
+       */
+      if (!this.outputJS) {
+        const types = Array.from(this.types.keys());
+        types.sort();
+
+        sdkSource.addExportDeclarations([
+          {
+            isTypeOnly: true,
+            namedExports: types,
+            moduleSpecifier: './types',
+          },
+        ]);
+      }
     } else {
       // If we don't have any schemas then we shouldn't import a `types` file that doesn't exist.
       sdkSource
@@ -406,7 +413,14 @@ sdk.server('https://eu.api.example.com/v14');`)
       ],
     });
 
-    sourceFile.addExportAssignment({ isExportEquals: false, expression: 'createSDK' });
+    sourceFile.addExportAssignment({
+      // Because CJS targets have `createSDK` exported with `module.exports`, but the TS type side
+      // of things to work right we need to set this as `export =`. Thankfully `ts-morph` will
+      // handle this accordingly and still create our JS file with `module.exports` and not
+      // `export =` -- only TS types will have this export style.
+      isExportEquals: this.compilerTarget === 'cjs' && this.outputJS,
+      expression: 'createSDK',
+    });
 
     return sourceFile;
   }

package/src/cli/storage.ts

@@ -253,16 +253,16 @@ export default class Storage {
   }
 }
 
-export type Lockfile = {
+export interface Lockfile {
   /**
    * The `api.json` schema version. This will only ever change if we introduce breaking changes to
    * this store.
    */
   version: '1.0';
   apis: LockfileAPI[];
-};
+}
 
-export type LockfileAPI = {
+export interface LockfileAPI {
   /**
    * A unique identifier of the API. This'll be used to do requires on `@api/<identifier>` and also
    * where the SDK code will be located in `.api/apis/<identifier>`.
@@ -294,4 +294,4 @@ export type LockfileAPI = {
    * @example 5.0.0
    */
   installerVersion: string;
-};
+}

package/src/core/index.ts

@@ -24,12 +24,12 @@ export interface ConfigOptions {
   timeout?: number;
 }
 
-export type FetchResponse<status, data> = {
+export interface FetchResponse<status, data> {
   data: data;
   status: status;
   headers: Headers;
   res: Response;
-};
+}
 
 // https://stackoverflow.com/a/39495173
 type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N

package/src/packageInfo.ts

@@ -1,3 +1,3 @@
 // This file is automatically updated by the build script.
 export const PACKAGE_NAME = 'api';
-export const PACKAGE_VERSION = '5.0.3';
+export const PACKAGE_VERSION = '5.0.5';