swaggie 1.5.1 → 1.5.3-beta.1

package/README.md

@@ -301,7 +301,7 @@ function error(e) {
 | Content types: `JSON`, `text`, `multipart/form-data`                           | Multiple request types (only one will be used)  |
 | Content types: `application/x-www-form-urlencoded`, `application/octet-stream` | References to other spec files                  |
 | Different types of enum definitions (+ OpenAPI 3.1 support for enums)          | OpenAPI callbacks                               |
-| Paths inheritance, comments (descriptions)                                     | OpenAPI webhooks                                |
+| Paths inheritance, comments (descriptions), nullable                           | OpenAPI webhooks                                |
 | Getting documents from remote locations or as path reference (local file)      |                                                 |
 | Grouping endpoints by tags + handle gracefully duplicate operation ids         |                                                 |
 

package/dist/swagger/typesExtractor.js

@@ -48,25 +48,40 @@ var _utils = require('../utils');
     return getSafeIdentifier(refName) || unknownType;
   }
 
+  if (schema.type === 'null') {
+    return 'null';
+  }
+
+  const isNullableSuffix = 'nullable' in schema && schema.nullable === true ? ' | null' : '';
+  const type = getTypeFromSchemaInternal(schema, options);
+
+  if (isNullableSuffix && type.endsWith('| null')) {
+    return type;
+  }
+  return type + isNullableSuffix;
+} exports.getTypeFromSchema = getTypeFromSchema;
+
+function getTypeFromSchemaInternal(
+  schema,
+  options
+) {
+  const unknownType = options.preferAny ? 'any' : 'unknown';
+
   if ('allOf' in schema || 'oneOf' in schema || 'anyOf' in schema) {
     return getTypeFromComposites(schema , options);
   }
 
   if (schema.type === 'array') {
     if (schema.items) {
-      return `${getTypeFromSchema(schema.items, options)}[]`;
+      return `${getNestedTypeFromSchema(schema.items, options)}[]`;
     }
     return `${unknownType}[]`;
   }
   if (schema.type === 'object') {
     return getTypeFromObject(schema, options);
   }
-  if (schema.type === 'null') {
-    return 'null';
-  }
-
   if ('enum' in schema) {
-    return `(${schema.enum.map((v) => JSON.stringify(v)).join(' | ')})`;
+    return `${schema.enum.map((v) => JSON.stringify(v)).join(' | ')}`;
   }
   if (schema.type === 'integer' || schema.type === 'number') {
     return 'number';
@@ -81,7 +96,17 @@ var _utils = require('../utils');
     return 'boolean';
   }
   return unknownType;
-} exports.getTypeFromSchema = getTypeFromSchema;
+}
+
+function getNestedTypeFromSchema(
+  schema,
+  options
+) {
+  if (('nullable' in schema && schema.nullable === true) || ('enum' in schema && schema.enum)) {
+    return `(${getTypeFromSchema(schema, options)})`;
+  }
+  return getTypeFromSchema(schema, options);
+}
 
 /**
  * Knowing that the schema is an object, this function returns a TypeScript type definition

package/dist/utils/documentLoader.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _nodefs = require('node:fs'); var _nodefs2 = _interopRequireDefault(_nodefs);
-var _jsyaml = require('js-yaml'); var _jsyaml2 = _interopRequireDefault(_jsyaml);
+var _yaml = require('yaml');
 
 
 /**
@@ -41,7 +41,7 @@ function readLocalFile(filePath) {
 function parseFileContents(contents, path) {
   // If the path ends with .yaml or .yml, parse as YAML
   if (/.ya?ml$/i.test(path)) {
-    return _jsyaml2.default.load(contents) ;
+    return _yaml.parse.call(void 0, contents);
   }
   // If the path ends with .json, parse as JSON
   if (/.json$/i.test(path)) {
@@ -54,5 +54,5 @@ function parseFileContents(contents, path) {
     return JSON.parse(contents);
   }
 
-  return _jsyaml2.default.load(contents) ;
+  return _yaml.parse.call(void 0, contents);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swaggie",
-  "version": "1.5.1",
+  "version": "1.5.3-beta.1",
   "description": "Generate TypeScript REST client code from an OpenAPI spec",
   "author": {
     "name": "Piotr Dabrowski",
@@ -10,7 +10,7 @@
   "homepage": "https://github.com/yhnavein/swaggie",
   "repository": {
     "type": "git",
-    "url": "https://github.com/yhnavein/swaggie.git"
+    "url": "git+https://github.com/yhnavein/swaggie.git"
   },
   "bugs": {
     "url": "https://github.com/yhnavein/swaggie/issues"
@@ -52,11 +52,10 @@
     "case": "^1.6.3",
     "commander": "^14.0.3",
     "eta": "^4.5.1",
-    "js-yaml": "^4.1.0",
+    "yaml": "^2.8.2",
     "nanocolors": "^0.2.0"
   },
   "devDependencies": {
-    "@types/js-yaml": "4.0.9",
     "bun-types": "1.3.9",
     "openapi-types": "^12.1.3",
     "sucrase": "3.35.1",