api 5.0.1 → 5.0.3

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

@@ -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"));
@@ -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'
                         };
@@ -154,7 +163,7 @@ var TSGenerator = /** @class */ (function (_super) {
                         // This will install the installed SDK as a dependency within the current working directory,
                         // adding `@api/<sdk identifier>` as a dependency there so you can load it with
                         // `require('@api/<sdk identifier>)`.
-                        return [2 /*return*/, (0, execa_1["default"])('npm', __spreadArray([], npmInstall, true).filter(Boolean)).then(function (res) {
+                        return [2 /*return*/, (0, execa_1["default"])('npm', __spreadArray(__spreadArray([], npmInstall, true), [installDir], false).filter(Boolean)).then(function (res) {
                                 if (opts.dryRun) {
                                     (opts.logger ? opts.logger : logger_1["default"])(res.command);
                                     (opts.logger ? opts.logger : logger_1["default"])(res.stdout);

package/dist/packageInfo.d.ts

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

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.1';
+exports.PACKAGE_VERSION = '5.0.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "Magical SDK generation from an OpenAPI definition 🪄",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -63,9 +63,10 @@
     "node-abort-controller": "^3.0.1",
     "oas": "^20.0.0",
     "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",
     "validate-npm-package-name": "^5.0.0"
@@ -84,6 +85,7 @@
     "@types/mocha": "^10.0.0",
     "@types/prettier": "^2.7.1",
     "@types/prompts": "^2.0.14",
+    "@types/semver": "^7.3.13",
     "@types/sinon-chai": "^3.2.8",
     "@types/ssri": "^7.1.1",
     "@types/validate-npm-package-name": "^4.0.0",
@@ -95,6 +97,7 @@
     "oas-normalize": "^7.1.0",
     "sinon": "^14.0.0",
     "sinon-chai": "^3.7.0",
+    "type-fest": "^3.2.0",
     "typescript": "^4.7.4",
     "unique-temp-dir": "^1.0.0"
   },
@@ -105,5 +108,5 @@
       "test/"
     ]
   },
-  "gitHead": "81bb654e395fce5aefaeb8228666faa6e1f3f09d"
+  "gitHead": "7aba675afe57fccdd23144a7917bc71bc7d28ed7"
 }

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';
@@ -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.
     };
@@ -142,7 +153,7 @@ export default class TSGenerator extends CodeGeneratorLanguage {
     // This will install the installed SDK as a dependency within the current working directory,
     // adding `@api/<sdk identifier>` as a dependency there so you can load it with
     // `require('@api/<sdk identifier>)`.
-    return execa('npm', [...npmInstall].filter(Boolean)).then(res => {
+    return execa('npm', [...npmInstall, installDir].filter(Boolean)).then(res => {
       if (opts.dryRun) {
         (opts.logger ? opts.logger : logger)(res.command);
         (opts.logger ? opts.logger : logger)(res.stdout);

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