massimo-cli 1.3.0 → 1.5.1

package/lib/frontend-openapi-generator.js

@@ -68,6 +68,7 @@ function generateFrontendImplementationFromOpenAPI ({
     useTabs: false,
     useSingleQuote: true
   })
+  const hasPathParameters = operations.some(operation => operation.path.includes('{'))
 
   writer.write('// This client was generated by Platformatic from an OpenAPI specification.')
   writer.blankLine()
@@ -132,6 +133,18 @@ function generateFrontendImplementationFromOpenAPI ({
       writer.writeLine('return output')
     })
   }
+  if (hasPathParameters) {
+    writer.newLine()
+    writer
+      .write(`function encodePathParameter(value${isTsLang ? ': unknown' : ''})${isTsLang ? ': string' : ''} `)
+      .block(() => {
+        writer.writeLine(`const encoded = encodeURIComponent(value${isTsLang ? ' as string' : ''})`)
+        writer.write('if (encoded === \'.\' || encoded === \'..\') ').block(() => {
+          writer.writeLine('throw new Error(\'Path parameters cannot be "." or ".."\')')
+        })
+        writer.writeLine('return encoded')
+      })
+  }
   writer.blankLine()
   const allOperations = []
   const originalFullResponse = fullResponse
@@ -192,7 +205,9 @@ function generateFrontendImplementationFromOpenAPI ({
       // /organizations/{orgId}/members/{memberId}
       // to
       // /organizations/${request.orgId}/members/${request.memberId}
-      const stringLiteralPath = path.replace(/\{/gm, '${' + req + "['").replace(/\}/gm, "']}")
+      const stringLiteralPath = path
+        .replace(/\{/gm, '${encodePathParameter(' + req + "['")
+        .replace(/\}/gm, "'])}")
       // GET methods need query strings instead of JSON bodies
       if (queryParams.length) {
         // query parameters should be appended to the url
@@ -446,6 +461,12 @@ function generateTypesFromOpenAPI ({ schema, name, fullRequest, fullResponse, pr
     })
   })
 
+  // Declare the module-level named exports emitted by the implementation file,
+  // so consumers relying on the .d.ts can `import { setBaseUrl, ... }` without type errors.
+  writer.writeLine(`export declare const setBaseUrl: ${camelCaseName}['setBaseUrl'];`)
+  writer.writeLine(`export declare const setDefaultHeaders: ${camelCaseName}['setDefaultHeaders'];`)
+  writer.writeLine(`export declare const setDefaultFetchParams: ${camelCaseName}['setDefaultFetchParams'];`)
+
   writer.writeLine(`type PlatformaticFrontendClient = Omit<${camelCaseName}, 'setBaseUrl'>`)
   writer.write('type BuildOptions = ').block(() => {
     writer.writeLine('headers?: object')

package/lib/get-type.js

@@ -1,16 +1,21 @@
 import jsonpointer from 'jsonpointer'
 
-export function getType (typeDef, methodType, spec) {
+export function getType (typeDef, methodType, spec, seenRefs = new Set()) {
   if (typeDef.$ref) {
+    if (seenRefs.has(typeDef.$ref)) {
+      return 'unknown'
+    }
+    seenRefs = new Set(seenRefs)
+    seenRefs.add(typeDef.$ref)
     typeDef = jsonpointer.get(spec, typeDef.$ref.replace('#', ''))
   }
   if (typeDef.schema) {
-    return getType(typeDef.schema, methodType, spec)
+    return getType(typeDef.schema, methodType, spec, seenRefs)
   }
   if (typeDef.anyOf) {
     // recursively call this function
     const mapped = typeDef.anyOf.map(t => {
-      return getType(t, methodType, spec)
+      return getType(t, methodType, spec, seenRefs)
     })
     return mapped.join(' | ')
   }
@@ -18,7 +23,7 @@ export function getType (typeDef, methodType, spec) {
   if (typeDef.oneOf) {
     // recursively call this function
     const mapped = typeDef.oneOf.map(t => {
-      return getType(t, methodType, spec)
+      return getType(t, methodType, spec, seenRefs)
     })
 
     if (typeDef.discriminator && typeDef.discriminator.propertyName) {
@@ -56,13 +61,13 @@ export function getType (typeDef, methodType, spec) {
     // recursively call this function
     return typeDef.allOf
       .map(t => {
-        return getType(t, methodType, spec)
+        return getType(t, methodType, spec, seenRefs)
       })
       .join(' & ')
   }
   if (typeDef.type === 'array') {
     const nullable = typeDef.nullable
-    return `Array<${getType(typeDef.items, methodType, spec)}>${nullable === true ? ' | null' : ''}`
+    return `Array<${getType(typeDef.items, methodType, spec, seenRefs)}>${nullable === true ? ' | null' : ''}`
   }
   if (typeDef.enum) {
     // Note: null type represented with an enum have no types and single enum element 'null'
@@ -73,11 +78,10 @@ export function getType (typeDef, methodType, spec) {
     const nullable = typeDef.nullable
     const chainedTypes = typeDef.enum
       .map(en => {
-        if (typeDef.type === 'string') {
-          return `'${en.replace(/'/g, "\\'")}'`
-        } else {
-          return en
-        }
+        // Quote by the runtime type of the value: the schema may omit `type`
+        if (en === null) return 'null'
+        if (typeof en === 'string') return `'${en.replace(/'/g, "\\'")}'`
+        return en
       })
       .join(' | ')
     return nullable === true ? `${chainedTypes} | null` : chainedTypes
@@ -108,7 +112,7 @@ export function getType (typeDef, methodType, spec) {
       if (additionalPropsRequired) {
         required = required || !!additionalPropsRequired.includes(prop)
       }
-      return `'${prop}'${required ? '' : '?'}: ${getType(objProperties[prop], methodType, spec)}`
+      return `'${prop}'${required ? '' : '?'}: ${getType(objProperties[prop], methodType, spec, seenRefs)}`
     })
     if (additionalProps === true) {
       props.push('[key: string]: unknown')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "massimo-cli",
-  "version": "1.3.0",
+  "version": "1.5.1",
   "description": "A client for HTTP services.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -25,21 +25,21 @@
     "graphql": "^16.8.1",
     "help-me": "^5.0.0",
     "jsonpointer": "^5.0.1",
+    "massimo": "1.5.1",
     "minimist": "^1.2.8",
     "pino": "^9.9.0",
     "pino-pretty": "^13.0.0",
     "undici": "^7.0.0",
-    "yaml": "^2.4.1",
-    "massimo": "1.3.0"
+    "yaml": "^2.4.1"
   },
   "devDependencies": {
-    "@platformatic/composer": "3.54.0",
-    "@platformatic/db": "3.0.0-alpha.6",
-    "@platformatic/foundation": "3.54.0",
-    "@platformatic/runtime": "3.52.4",
-    "@platformatic/service": "3.0.0-alpha.6",
-    "@platformatic/sql-graphql": "3.53.0",
-    "@platformatic/sql-mapper": "3.52.4",
+    "@platformatic/composer": "3.68.0",
+    "@platformatic/db": "3.67.0",
+    "@platformatic/foundation": "3.68.0",
+    "@platformatic/runtime": "3.68.0",
+    "@platformatic/service": "3.67.0",
+    "@platformatic/sql-graphql": "3.68.0",
+    "@platformatic/sql-mapper": "3.68.0",
     "@playwright/test": "^1.42.1",
     "@types/react": "^19.1.6",
     "@types/react-dom": "^19.1.5",
@@ -48,18 +48,18 @@
     "dotenv": "^16.4.5",
     "eslint": "9",
     "execa": "^9.0.0",
-    "fastify": "^5.0.0",
+    "fastify": "^5.12.0",
     "fastify-tsconfig": "^3.0.0",
     "fs-extra": "^11.2.0",
-    "neostandard": "^0.12.0",
+    "neostandard": "^0.13.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "scheduler": "^0.27.0",
     "split2": "^4.2.0",
-    "tsd": "^0.32.0",
+    "tsd": "^0.33.0",
     "typescript": "^5.5.4",
     "vite": "^5.1.6",
-    "wattpm": "3.0.0-alpha.5",
+    "wattpm": "3.67.0",
     "why-is-node-running": "^2.2.2"
   },
   "engines": {