massimo-cli 0.5.0 → 1.1.0

package/help/help.txt

@@ -75,6 +75,5 @@ Options:
 * `--types-comment` - Add a comment at the beginning of the auto generated `.d.ts` type definition.
 * `--with-credentials` - Adds "credentials: 'include'" to all fetch requests (only for frontend clients).
 * `--props-optional` - If `true`, properties will be defined as optional unless they're part of the `required` array. By default this option is `true`.
-* `--skip-config-update` - If `true`, it will not update the `platformatic|watt` config found in your repo. By default this option is `true`.
 * `--retry-timeout-ms` - If passed, the HTTP request to get an Open API schema will be retried (reference: https://undici.nodejs.org/#/docs/api/RetryHandler.md)
 * `--type-extension` - Force the use of module-specific type extensions (.d.mts for ESM, .d.cts for CJS) instead of the default logic.

package/index.js

@@ -681,13 +681,13 @@ export async function command (argv) {
       'frontend',
       'validate-response',
       'props-optional',
-      'skip-config-update',
       'type-extension'
     ],
     default: {
       typescript: false,
       language: 'js',
-      full: true
+      full: true,
+      'props-optional': true
     },
     alias: {
       n: 'name',
@@ -729,7 +729,7 @@ export async function command (argv) {
 
     options.fullRequest = options['full-request']
     options.fullResponse = options['full-response']
-    options.propsOptional = options['props-optional'] ?? true
+    options.propsOptional = options['props-optional']
 
     options.optionalHeaders = options['optional-headers']
       ? options['optional-headers'].split(',').map((h) => h.trim())
@@ -748,7 +748,6 @@ export async function command (argv) {
     options.urlAuthHeaders = options['url-auth-headers']
     options.typesComment = options['types-comment']
     options.withCredentials = options['with-credentials']
-    options.skipConfigUpdate = options['skip-config-update'] ?? true
     options.retryTimeoutMs = options['retry-timeout-ms']
     options.typeExtension = options['type-extension']
     options.explicitModuleFormat = !!options.module

package/lib/get-type.js

@@ -65,18 +65,22 @@ export function getType (typeDef, methodType, spec) {
     return `Array<${getType(typeDef.items, methodType, spec)}>${nullable === true ? ' | null' : ''}`
   }
   if (typeDef.enum) {
+    // Note: null type represented with an enum have no types and single enum element 'null'
+    if (typeDef.type === undefined && typeDef.enum.includes('null')) {
+      // Ignore `nullable` as it is implied by the enum
+      return 'null'
+    }
     const nullable = typeDef.nullable
-    return (
-      typeDef.enum
-        .map(en => {
-          if (typeDef.type === 'string') {
-            return `'${en.replace(/'/g, "\\'")}'`
-          } else {
-            return en
-          }
-        })
-        .join(' | ') + (nullable === true ? ' | null' : '')
-    )
+    const chainedTypes = typeDef.enum
+      .map(en => {
+        if (typeDef.type === 'string') {
+          return `'${en.replace(/'/g, "\\'")}'`
+        } else {
+          return en
+        }
+      })
+      .join(' | ')
+    return nullable === true ? `${chainedTypes} | null` : chainedTypes
   }
   if (typeDef.type === 'object') {
     const additionalProps = typeDef?.additionalProperties
@@ -137,8 +141,8 @@ function JSONSchemaToTsType ({ type, format, nullable }, methodType) {
       resultType = 'boolean'
       break
     case 'null':
-      resultType = 'null'
-      break
+      // Remove duplication, no need to make it nullable later, return directly
+      return 'null'
     // TODO what other types should we support here?
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "massimo-cli",
-  "version": "0.5.0",
+  "version": "1.1.0",
   "description": "A client for HTTP services.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -30,7 +30,7 @@
     "pino-pretty": "^13.0.0",
     "undici": "^7.0.0",
     "yaml": "^2.4.1",
-    "massimo": "0.5.0"
+    "massimo": "1.1.0"
   },
   "devDependencies": {
     "@platformatic/composer": "3.0.0-alpha.6",