api 5.0.7 → 6.0.0

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

@@ -163,11 +163,18 @@ 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(__spreadArray([], npmInstall, true), [installDir], false).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);
                                 }
+                            })["catch"](function (err) {
+                                if (opts.dryRun) {
+                                    (opts.logger ? opts.logger : logger_1["default"])(err.message);
+                                    return;
+                                }
+                                throw err;
                             })];
                 }
             });

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/packageInfo.d.ts

@@ -1,2 +1,2 @@
 export declare const PACKAGE_NAME = "api";
-export declare const PACKAGE_VERSION = "5.0.7";
+export declare const PACKAGE_VERSION = "6.0.0";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "5.0.7",
+  "version": "6.0.0",
   "description": "Magical SDK generation from an OpenAPI definition 🪄",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "Jon Ursenbach <jon@readme.io>",
   "license": "MIT",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "keywords": [
     "api",
@@ -60,7 +60,7 @@
     "lodash.setwith": "^4.3.2",
     "lodash.startcase": "^4.4.0",
     "make-dir": "^3.1.0",
-    "node-abort-controller": "^3.0.1",
+    "node-abort-controller": "^3.1.1",
     "oas": "^20.4.0",
     "ora": "^5.4.1",
     "prettier": "^2.8.3",
@@ -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.3",
-    "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": "b003a05707215a4145a54fe28b98032b78742082"
+  "gitHead": "9759db4c067baf3928ad3a9d76b4965658955d78"
 }

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

@@ -153,12 +153,21 @@ 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, installDir].filter(Boolean)).then(res => {
-      if (opts.dryRun) {
-        (opts.logger ? opts.logger : logger)(res.command);
-        (opts.logger ? opts.logger : logger)(res.stdout);
-      }
-    });
+    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);
+        }
+      })
+      .catch(err => {
+        if (opts.dryRun) {
+          (opts.logger ? opts.logger : logger)(err.message);
+          return;
+        }
+
+        throw err;
+      });
   }
 
   /**

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