api 5.0.2 → 5.0.4

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,11 +5,11 @@ 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 type TSGeneratorOptions = {
     outputJS?: boolean;
     compilerTarget?: 'cjs' | 'esm';
 };
-declare type OperationTypeHousing = {
+type OperationTypeHousing = {
     types: {
         params?: false | Record<'body' | 'formData' | 'metadata', string>;
         responses?: Record<string, string>;

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]) {
@@ -78,6 +78,7 @@ var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var execa_1 = __importDefault(require("execa"));
 var lodash_setwith_1 = __importDefault(require("lodash.setwith"));
+var semver_1 = __importDefault(require("semver"));
 var ts_morph_1 = require("ts-morph");
 var logger_1 = __importDefault(require("../../logger"));
 var language_1 = __importDefault(require("../language"));
@@ -99,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'
             },
@@ -127,13 +128,21 @@ var TSGenerator = /** @class */ (function (_super) {
     TSGenerator.prototype.installer = function (storage, opts) {
         if (opts === void 0) { opts = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var installDir, pkg, npmInstall;
+            var installDir, info, pkgVersion, pkg, npmInstall;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         installDir = storage.getIdentifierStorageDir();
+                        info = this.spec.getDefinition().info;
+                        pkgVersion = semver_1["default"].coerce(info.version);
+                        if (!pkgVersion) {
+                            // If the version that's in `info.version` isn't compatible with semver NPM won't be able to
+                            // handle it properly so we need to fallback to something it can.
+                            pkgVersion = semver_1["default"].coerce('0.0.0');
+                        }
                         pkg = {
                             name: "@api/".concat(storage.identifier),
+                            version: pkgVersion.version,
                             main: "./index.".concat(this.outputJS ? 'js' : 'ts'),
                             types: './index.d.ts'
                         };

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,7 +65,7 @@ export default class Storage {
      */
     save(spec: OASDocument): OASDocument;
 }
-export declare type Lockfile = {
+export type Lockfile = {
     /**
      * The `api.json` schema version. This will only ever change if we introduce breaking changes to
      * this store.
@@ -73,7 +73,7 @@ export declare type Lockfile = {
     version: '1.0';
     apis: LockfileAPI[];
 };
-export declare type LockfileAPI = {
+export type 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>`.

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 type 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.2";
+export declare const PACKAGE_VERSION = "5.0.4";

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.2';
+exports.PACKAGE_VERSION = '5.0.4';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Magical SDK generation from an OpenAPI definition 🪄",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -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,19 +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.7.1",
+    "prettier": "^2.8.0",
     "prompts": "^2.4.2",
     "remove-undefined-objects": "^2.0.1",
+    "semver": "^7.3.8",
     "ssri": "^10.0.0",
-    "ts-morph": "^16.0.0",
+    "ts-morph": "^17.0.1",
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
     "@readme/oas-examples": "^5.7.1",
     "@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",
@@ -81,10 +82,11 @@
     "@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/sinon-chai": "^3.2.8",
+    "@types/prompts": "^2.4.1",
+    "@types/semver": "^7.3.13",
+    "@types/sinon-chai": "^3.2.9",
     "@types/ssri": "^7.1.1",
     "@types/validate-npm-package-name": "^4.0.0",
     "chai": "^4.3.6",
@@ -92,9 +94,10 @@
     "mocha": "^10.0.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
-    "oas-normalize": "^7.1.0",
-    "sinon": "^14.0.0",
+    "oas-normalize": "^8.1.3",
+    "sinon": "^15.0.0",
     "sinon-chai": "^3.7.0",
+    "type-fest": "^3.3.0",
     "typescript": "^4.7.4",
     "unique-temp-dir": "^1.0.0"
   },
@@ -105,5 +108,5 @@
       "test/"
     ]
   },
-  "gitHead": "f51774f2d2cc8da42fdf1c4d4980e32379cef7ed"
+  "gitHead": "e566a19f6b6b36cad43b7e4edbe1deb4a6fe8609"
 }

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

@@ -4,12 +4,14 @@ import type Oas from 'oas';
 import type { Operation } from 'oas';
 import type { HttpMethods, SchemaObject } from 'oas/dist/rmoas.types';
 import type { ClassDeclaration, JSDocStructure, OptionalKind, ParameterDeclarationStructure } from 'ts-morph';
+import type { PackageJson } from 'type-fest';
 
 import fs from 'fs';
 import path from 'path';
 
 import execa from 'execa';
 import setWith from 'lodash.setwith';
+import semver from 'semver';
 import { IndentationText, Project, QuoteKind, ScriptTarget, VariableDeclarationKind } from 'ts-morph';
 
 import logger from '../../logger';
@@ -76,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',
       },
@@ -119,8 +121,17 @@ export default class TSGenerator extends CodeGeneratorLanguage {
   async installer(storage: Storage, opts: InstallerOptions = {}): Promise<void> {
     const installDir = storage.getIdentifierStorageDir();
 
-    const pkg = {
+    const info = this.spec.getDefinition().info;
+    let pkgVersion = semver.coerce(info.version);
+    if (!pkgVersion) {
+      // If the version that's in `info.version` isn't compatible with semver NPM won't be able to
+      // handle it properly so we need to fallback to something it can.
+      pkgVersion = semver.coerce('0.0.0');
+    }
+
+    const pkg: PackageJson = {
       name: `@api/${storage.identifier}`,
+      version: pkgVersion.version,
       main: `./index.${this.outputJS ? 'js' : 'ts'}`,
       types: './index.d.ts', // Types are always present regardless if you're getting compiled JS.
     };

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.2';
+export const PACKAGE_VERSION = '5.0.4';