api 5.0.6 → 5.0.8

package/README.md

@@ -43,7 +43,18 @@ const petstore = require('api')(
   'https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/examples/v3.0/petstore.json'
 );
 
-petstore.listPets().then(({ data })) => {
+petstore.listPets().then(({ data }) => {
+  console.log(`My pets name is ${data[0].name}!`);
+});
+```
+
+The ESM syntax is supported as well:
+
+```js
+import api from 'api';
+const petstore = api('@petstore/v1.0#tl1e4kl1cl8eg8');
+
+petstore.listPets().then(({ data }) => {
   console.log(`My pets name is ${data[0].name}!`);
 });
 ```

package/dist/cli/commands/install.js

@@ -61,6 +61,7 @@ cmd
     'js-esm',
     'ts',
 ]))
+    .addOption(new commander_1.Option('-y, --yes', 'Automatically answer "yes" to any prompts printed'))
     .action(function (uri, options) { return __awaiter(void 0, void 0, void 0, function () {
     var language, identifier, spinner, storage, oas, generator, sdkSource, err_1;
     return __generator(this, function (_a) {
@@ -183,12 +184,13 @@ cmd
                     })];
             case 11:
                 _a.sent();
-                if (!generator.hasRequiredPackages()) return [3 /*break*/, 16];
+                if (!generator.hasRequiredPackages()) return [3 /*break*/, 17];
                 (0, logger_1["default"])("".concat(figures_1["default"].warning, " This generator requires some packages to be installed alongside it:"));
                 Object.entries(generator.requiredPackages).forEach(function (_a) {
                     var pkg = _a[0], pkgInfo = _a[1];
                     (0, logger_1["default"])("  ".concat(figures_1["default"].pointerSmall, " ").concat(pkg, ": ").concat(pkgInfo.reason, " ").concat(pkgInfo.url));
                 });
+                if (!!options.yes) return [3 /*break*/, 13];
                 return [4 /*yield*/, (0, prompt_1["default"])({
                         type: 'confirm',
                         name: 'value',
@@ -204,23 +206,25 @@ cmd
                     })];
             case 12:
                 _a.sent();
-                spinner = (0, ora_1["default"])('Installing required packages').start();
                 _a.label = 13;
             case 13:
-                _a.trys.push([13, 15, , 16]);
-                return [4 /*yield*/, generator.installer(storage)];
+                spinner = (0, ora_1["default"])('Installing required packages').start();
+                _a.label = 14;
             case 14:
+                _a.trys.push([14, 16, , 17]);
+                return [4 /*yield*/, generator.installer(storage)];
+            case 15:
                 _a.sent();
                 spinner.succeed(spinner.text);
-                return [3 /*break*/, 16];
-            case 15:
+                return [3 /*break*/, 17];
+            case 16:
                 err_1 = _a.sent();
                 // @todo cleanup installed files
                 spinner.fail(spinner.text);
                 (0, logger_1["default"])(err_1.message, true);
                 process.exit(1);
-                return [3 /*break*/, 16];
-            case 16:
+                return [3 /*break*/, 17];
+            case 17:
                 (0, logger_1["default"])('🚀 All done!');
                 return [2 /*return*/];
         }

package/dist/core/prepareParams.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var promises_1 = __importDefault(require("fs/promises"));
+var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var stream_1 = __importDefault(require("stream"));
 var caseless_1 = __importDefault(require("caseless"));
@@ -100,32 +100,42 @@ function merge(src, target) {
  *
  */
 function processFile(paramName, file) {
+    var _this = this;
     if (typeof file === 'string') {
         // In order to support relative pathed files, we need to attempt to resolve them.
         var resolvedFile_1 = path_1["default"].resolve(file);
-        return promises_1["default"]
-            .stat(resolvedFile_1)
-            .then(function () { return (0, sync_1["default"])(resolvedFile_1); })
-            .then(function (fileMetadata) {
-            var payloadFilename = encodeURIComponent(path_1["default"].basename(resolvedFile_1));
-            return {
-                paramName: paramName,
-                base64: fileMetadata.content.replace(';base64', ";name=".concat(payloadFilename, ";base64")),
-                filename: payloadFilename,
-                buffer: fileMetadata.buffer
-            };
-        })["catch"](function (err) {
-            if (err.code === 'ENOENT') {
-                // It's less than ideal for us to handle files that don't exist like this but because
-                // `file` is a string it might actually be the full text contents of the file and not
-                // actually a path.
-                //
-                // We also can't really regex to see if `file` *looks*` like a path because one should be
-                // able to pass in a relative `owlbert.png` (instead of `./owlbert.png`) and though that
-                // doesn't *look* like a path, it is one that should still work.
-                return undefined;
-            }
-            throw err;
+        return new Promise(function (resolve, reject) {
+            fs_1["default"].stat(resolvedFile_1, function (err) { return __awaiter(_this, void 0, void 0, function () {
+                var fileMetadata, payloadFilename;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (err) {
+                                if (err.code === 'ENOENT') {
+                                    // It's less than ideal for us to handle files that don't exist like this but because
+                                    // `file` is a string it might actually be the full text contents of the file and not
+                                    // actually a path.
+                                    //
+                                    // We also can't really regex to see if `file` *looks*` like a path because one should be
+                                    // able to pass in a relative `owlbert.png` (instead of `./owlbert.png`) and though that
+                                    // doesn't *look* like a path, it is one that should still work.
+                                    return [2 /*return*/, resolve(undefined)];
+                                }
+                                return [2 /*return*/, reject(err)];
+                            }
+                            return [4 /*yield*/, (0, sync_1["default"])(resolvedFile_1)];
+                        case 1:
+                            fileMetadata = _a.sent();
+                            payloadFilename = encodeURIComponent(path_1["default"].basename(resolvedFile_1));
+                            return [2 /*return*/, resolve({
+                                    paramName: paramName,
+                                    base64: fileMetadata.content.replace(';base64', ";name=".concat(payloadFilename, ";base64")),
+                                    filename: payloadFilename,
+                                    buffer: fileMetadata.buffer
+                                })];
+                    }
+                });
+            }); });
         });
     }
     else if (file instanceof stream_1["default"].Readable) {

package/dist/index.js

@@ -149,7 +149,7 @@ var Sdk = /** @class */ (function () {
                 // returning a Promise. When that happens, chaining `sdk.auth().operationId()` will fail.
                 if (['auth', 'config'].includes(method)) {
                     // @todo split this up so we have better types for `auth` and `config`
-                    return function () {
+                    return function authAndConfigHandler() {
                         var args = [];
                         for (var _i = 0; _i < arguments.length; _i++) {
                             args[_i] = arguments[_i];
@@ -157,7 +157,7 @@ var Sdk = /** @class */ (function () {
                         return target[method].apply(this, args);
                     };
                 }
-                return function () {
+                return function accessorHandler() {
                     var args = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
                         args[_i] = arguments[_i];

package/dist/packageInfo.d.ts

@@ -1,2 +1,2 @@
 export declare const PACKAGE_NAME = "api";
-export declare const PACKAGE_VERSION = "5.0.6";
+export declare const PACKAGE_VERSION = "5.0.8";

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.6';
+exports.PACKAGE_VERSION = '5.0.8';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "5.0.6",
+  "version": "5.0.8",
   "description": "Magical SDK generation from an OpenAPI definition 🪄",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,10 +41,10 @@
     "@readme/openapi-parser": "^2.4.0",
     "caseless": "^0.12.0",
     "chalk": "^4.1.2",
-    "commander": "^9.5.0",
+    "commander": "^10.0.0",
     "datauri": "^4.1.0",
     "execa": "^5.1.1",
-    "fetch-har": "^8.1.4",
+    "fetch-har": "^8.1.5",
     "figures": "^3.2.0",
     "find-cache-dir": "^3.3.1",
     "form-data-encoder": "^1.7.2",
@@ -60,10 +60,10 @@
     "lodash.setwith": "^4.3.2",
     "lodash.startcase": "^4.4.0",
     "make-dir": "^3.1.0",
-    "node-abort-controller": "^3.0.1",
-    "oas": "^20.3.0",
+    "node-abort-controller": "^3.1.1",
+    "oas": "^20.4.0",
     "ora": "^5.4.1",
-    "prettier": "^2.8.2",
+    "prettier": "^2.8.3",
     "prompts": "^2.4.2",
     "remove-undefined-objects": "^2.0.2",
     "semver": "^7.3.8",
@@ -94,11 +94,11 @@
     "mocha": "^10.1.0",
     "mock-require": "^3.0.3",
     "nyc": "^15.1.0",
-    "oas-normalize": "^8.3.1",
+    "oas-normalize": "^8.3.2",
     "sinon": "^15.0.0",
     "sinon-chai": "^3.7.0",
-    "type-fest": "^3.5.1",
-    "typescript": "^4.9.4",
+    "type-fest": "^3.5.4",
+    "typescript": "^4.9.5",
     "unique-temp-dir": "^1.0.0"
   },
   "prettier": "@readme/eslint-config/prettier",
@@ -108,5 +108,5 @@
       "test/"
     ]
   },
-  "gitHead": "33d0a4e279fd30aa7673b8fdf7bb00399a7c8c4e"
+  "gitHead": "bd15ecccb3aadea9ee821056c41d7897638bbe9d"
 }

package/src/cli/commands/install.ts

@@ -26,7 +26,8 @@ cmd
       'ts',
     ])
   )
-  .action(async (uri: string, options: { lang: string }) => {
+  .addOption(new Option('-y, --yes', 'Automatically answer "yes" to any prompts printed'))
+  .action(async (uri: string, options: { lang: string; yes?: boolean }) => {
     let language: SupportedLanguages;
     if (options.lang) {
       language = options.lang as SupportedLanguages;
@@ -155,18 +156,20 @@ cmd
         logger(`  ${figures.pointerSmall} ${pkg}: ${pkgInfo.reason} ${pkgInfo.url}`);
       });
 
-      await promptTerminal({
-        type: 'confirm',
-        name: 'value',
-        message: 'OK to proceed with package installation?',
-        initial: true,
-      }).then(({ value }) => {
-        if (!value) {
-          // @todo cleanup installed files
-          logger('Installation cancelled.', true);
-          process.exit(1);
-        }
-      });
+      if (!options.yes) {
+        await promptTerminal({
+          type: 'confirm',
+          name: 'value',
+          message: 'OK to proceed with package installation?',
+          initial: true,
+        }).then(({ value }) => {
+          if (!value) {
+            // @todo cleanup installed files
+            logger('Installation cancelled.', true);
+            process.exit(1);
+          }
+        });
+      }
 
       spinner = ora('Installing required packages').start();
       try {

package/src/core/prepareParams.ts

@@ -2,7 +2,7 @@ import type { ReadStream } from 'fs';
 import type { Operation } from 'oas';
 import type { ParameterObject, SchemaObject } from 'oas/dist/rmoas.types';
 
-import fs from 'fs/promises';
+import fs from 'fs';
 import path from 'path';
 import stream from 'stream';
 
@@ -81,33 +81,34 @@ function processFile(
     // In order to support relative pathed files, we need to attempt to resolve them.
     const resolvedFile = path.resolve(file);
 
-    return fs
-      .stat(resolvedFile)
-      .then(() => datauri(resolvedFile))
-      .then(fileMetadata => {
+    return new Promise((resolve, reject) => {
+      fs.stat(resolvedFile, async err => {
+        if (err) {
+          if (err.code === 'ENOENT') {
+            // It's less than ideal for us to handle files that don't exist like this but because
+            // `file` is a string it might actually be the full text contents of the file and not
+            // actually a path.
+            //
+            // We also can't really regex to see if `file` *looks*` like a path because one should be
+            // able to pass in a relative `owlbert.png` (instead of `./owlbert.png`) and though that
+            // doesn't *look* like a path, it is one that should still work.
+            return resolve(undefined);
+          }
+
+          return reject(err);
+        }
+
+        const fileMetadata = await datauri(resolvedFile);
         const payloadFilename = encodeURIComponent(path.basename(resolvedFile));
 
-        return {
+        return resolve({
           paramName,
           base64: fileMetadata.content.replace(';base64', `;name=${payloadFilename};base64`),
           filename: payloadFilename,
           buffer: fileMetadata.buffer,
-        };
-      })
-      .catch(err => {
-        if (err.code === 'ENOENT') {
-          // It's less than ideal for us to handle files that don't exist like this but because
-          // `file` is a string it might actually be the full text contents of the file and not
-          // actually a path.
-          //
-          // We also can't really regex to see if `file` *looks*` like a path because one should be
-          // able to pass in a relative `owlbert.png` (instead of `./owlbert.png`) and though that
-          // doesn't *look* like a path, it is one that should still work.
-          return undefined;
-        }
-
-        throw err;
+        });
       });
+    });
   } else if (file instanceof stream.Readable) {
     return getStream.buffer(file).then(buffer => {
       const filePath = file.path as string;

package/src/index.ts

@@ -103,12 +103,12 @@ class Sdk {
         // returning a Promise. When that happens, chaining `sdk.auth().operationId()` will fail.
         if (['auth', 'config'].includes(method)) {
           // @todo split this up so we have better types for `auth` and `config`
-          return function (...args: any) {
+          return function authAndConfigHandler(...args: any) {
             return target[method].apply(this, args);
           };
         }
 
-        return async function (...args: unknown[]) {
+        return async function accessorHandler(...args: unknown[]) {
           if (!(method in target)) {
             // If this method doesn't exist on the proxy, have we loaded the SDK? If we have, then
             // this method isn't valid.

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