@zuplo/cli 6.69.6 → 6.69.9

package/node_modules/@zuplo/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/core",
-  "version": "6.69.6",
+  "version": "6.69.9",
   "repository": "https://github.com/zuplo/zuplo",
   "author": "Zuplo, Inc.",
   "type": "module",

package/node_modules/@zuplo/editor/node_modules/find-my-way/.github/workflows/node.js.yml

@@ -63,6 +63,6 @@ jobs:
       pull-requests: write
       contents: write
     steps:
-    - uses: fastify/github-action-merge-dependabot@1b2ed42db8f9d81a46bac83adedfc03eb5149dff # v3.11.2
+    - uses: fastify/github-action-merge-dependabot@30c3f8f14a4f7b315ba38dbc1b793d27128fef82 # v3.12.0
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

package/node_modules/@zuplo/editor/node_modules/find-my-way/README.md

@@ -126,6 +126,16 @@ const router = require('find-my-way')({
 })
 ```
 
+If you want to handle the case where the `maxParamLength` is exceeded, you can provide a custom `onMaxParamLength` handler. This handler will be invoked if no other route (e.g. a wildcard) matches the path.
+```js
+const router = require('find-my-way')({
+  onMaxParamLength: function (path, req, res) {
+    res.statusCode = 414
+    res.end('URI Too Long')
+  }
+})
+```
+
 If you are using a regex based route, `find-my-way` will throw an error if detects potentially catastrophic exponential-time regular expressions *(internally uses [`safe-regex2`](https://github.com/fastify/safe-regex2))*.<br/>
 If you want to disable this behavior, pass the option `allowUnsafeRegex`.
 ```js

package/node_modules/@zuplo/editor/node_modules/find-my-way/index.d.ts

@@ -103,6 +103,12 @@ declare namespace Router {
       res: Res<V>
     ): void;
 
+    onMaxParamLength?(
+      path: string,
+      req: Req<V>,
+      res: Res<V>
+    ): void;
+
     constraints? : {
       [key: string]: ConstraintStrategy<V>
     }

package/node_modules/@zuplo/editor/node_modules/find-my-way/index.js

@@ -96,6 +96,7 @@ function Router (opts) {
   this.ignoreTrailingSlash = opts.ignoreTrailingSlash || false
   this.ignoreDuplicateSlashes = opts.ignoreDuplicateSlashes || false
   this.maxParamLength = opts.maxParamLength || 100
+  this.onMaxParamLength = opts.onMaxParamLength || null
   this.allowUnsafeRegex = opts.allowUnsafeRegex || false
   this.constrainer = new Constrainer(opts.constraints)
   this.useSemicolonDelimiter = opts.useSemicolonDelimiter || false
@@ -608,6 +609,7 @@ Router.prototype.find = function find (method, path, derivedConstraints) {
   const pathLen = path.length
 
   const brothersNodesStack = []
+  let maxParamLengthExceeded = false
 
   while (true) {
     if (pathIndex === pathLen && currentNode.isLeafNode) {
@@ -626,6 +628,9 @@ Router.prototype.find = function find (method, path, derivedConstraints) {
 
     if (node === null) {
       if (brothersNodesStack.length === 0) {
+        if (maxParamLengthExceeded && this.onMaxParamLength) {
+          return this._onMaxParamLength(originPath)
+        }
         return null
       }
 
@@ -667,18 +672,34 @@ Router.prototype.find = function find (method, path, derivedConstraints) {
 
     if (currentNode.isRegex) {
       const matchedParameters = currentNode.regex.exec(param)
-      if (matchedParameters === null) continue
+      if (matchedParameters === null) {
+        node = null
+        continue
+      }
 
+      let regexMaxParamLengthExceeded = false
       for (let i = 1; i < matchedParameters.length; i++) {
         const matchedParam = matchedParameters[i]
         if (matchedParam.length > maxParamLength) {
-          return null
+          regexMaxParamLengthExceeded = true
+          break
         }
-        params.push(matchedParam)
+      }
+
+      if (regexMaxParamLengthExceeded) {
+        maxParamLengthExceeded = true
+        node = null
+        continue
+      }
+
+      for (let i = 1; i < matchedParameters.length; i++) {
+        params.push(matchedParameters[i])
       }
     } else {
       if (param.length > maxParamLength) {
-        return null
+        maxParamLengthExceeded = true
+        node = null
+        continue
       }
       params.push(param)
     }
@@ -719,6 +740,18 @@ Router.prototype._onBadUrl = function (path) {
   }
 }
 
+Router.prototype._onMaxParamLength = function (path) {
+  if (this.onMaxParamLength === null) {
+    return null
+  }
+  const onMaxParamLength = this.onMaxParamLength
+  return {
+    handler: (req, res, ctx) => onMaxParamLength(path, req, res),
+    params: {},
+    store: null
+  }
+}
+
 Router.prototype.prettyPrint = function (options = {}) {
   const method = options.method
 

package/node_modules/@zuplo/editor/node_modules/find-my-way/lib/handler-storage.js

@@ -165,8 +165,8 @@ class HandlerStorage {
       }
     }
 
-    // Return the first handler who's bit is set in the candidates https://stackoverflow.com/questions/18134985/how-to-find-index-of-first-set-bit
-    lines.push('return this.handlers[Math.floor(Math.log2(candidates))]')
+    // Return the highest set bit index in the candidates bitmask.
+    lines.push('return this.handlers[31 - Math.clz32(candidates)]')
 
     this._getHandlerMatchingConstraints = new Function('derivedConstraints', lines.join('\n')) // eslint-disable-line
   }

package/node_modules/@zuplo/editor/node_modules/find-my-way/package.json

@@ -1,6 +1,6 @@
 {
   "name": "find-my-way",
-  "version": "9.5.0",
+  "version": "9.6.0",
   "description": "Crazy fast http radix based router",
   "main": "index.js",
   "type": "commonjs",
@@ -36,10 +36,10 @@
   "devDependencies": {
     "@types/node": "^25.0.3",
     "benchmark": "^2.1.4",
-    "borp": "^0.21.0",
+    "borp": "^1.0.0",
     "chalk": "^5.4.1",
     "inquirer": "^13.1.0",
-    "pre-commit": "^1.2.2",
+    "pre-commit": "^2.0.0",
     "proxyquire": "^2.1.3",
     "rfdc": "^1.3.0",
     "simple-git": "^3.7.1",

package/node_modules/@zuplo/editor/node_modules/find-my-way/test/repro-issue-414.test.js

@@ -0,0 +1,57 @@
+'use strict'
+
+const { test } = require('node:test')
+const FindMyWay = require('../')
+
+test('should return null when maxParamLength is exceeded (current behavior)', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({ maxParamLength: 5 })
+  findMyWay.on('GET', '/test/:param', () => 'param')
+
+  const handle = findMyWay.find('GET', '/test/123456')
+  t.assert.equal(handle, null)
+})
+
+test('should still match other routes if one parametric route exceeds maxParamLength (static)', t => {
+  t.plan(2)
+  const findMyWay = FindMyWay({ maxParamLength: 5 })
+  findMyWay.on('GET', '/test/:param', () => 'param')
+  findMyWay.on('GET', '/test/special', () => 'special')
+
+  const handle = findMyWay.find('GET', '/test/special')
+  t.assert.ok(handle)
+  t.assert.equal(handle.handler(), 'special')
+})
+
+test('should fail to match any route if the only candidate exceeds maxParamLength', t => {
+  t.plan(1)
+  const findMyWay = FindMyWay({ maxParamLength: 5 })
+  findMyWay.on('GET', '/test/:param', () => 'param')
+
+  const handle = findMyWay.find('GET', '/test/123456789')
+  t.assert.equal(handle, null)
+})
+
+test('should match wildcard if parametric exceeds maxParamLength', t => {
+  t.plan(2)
+  const findMyWay = FindMyWay({ maxParamLength: 5 })
+  findMyWay.on('GET', '/test/:param', () => 'param')
+  findMyWay.on('GET', '/test/*', () => 'wildcard')
+
+  const handle = findMyWay.find('GET', '/test/123456789')
+  t.assert.ok(handle)
+  t.assert.equal(handle.handler(), 'wildcard')
+})
+
+test('should return custom onMaxParamLength handler if provided and no other route matches', t => {
+  t.plan(2)
+  const findMyWay = FindMyWay({
+    maxParamLength: 5,
+    onMaxParamLength: (path, req, res) => 'custom error'
+  })
+  findMyWay.on('GET', '/test/:param', () => 'param')
+
+  const handle = findMyWay.find('GET', '/test/123456')
+  t.assert.ok(handle)
+  t.assert.equal(handle.handler(), 'custom error')
+})

package/node_modules/@zuplo/editor/node_modules/find-my-way/test/types/router.test-d.ts

@@ -27,6 +27,7 @@ expectType<string>(Router.trimLastSlash('/hello/'))
     querystringParser: (queryString) => {},
     defaultRoute (http1Req, http1Res) {},
     onBadUrl (path, http1Req, http1Res) {},
+    onMaxParamLength (path, http1Req, http1Res) {},
     constraints: {
       foo: {
         name: 'foo',

package/node_modules/@zuplo/graphql/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zuplo/graphql",
   "type": "module",
-  "version": "6.69.6",
+  "version": "6.69.9",
   "repository": "https://github.com/zuplo/zuplo",
   "author": "Zuplo, Inc.",
   "exports": {

package/node_modules/@zuplo/openapi-tools/package.json

@@ -2,7 +2,7 @@
   "name": "@zuplo/openapi-tools",
   "type": "module",
   "sideEffects": false,
-  "version": "6.69.6",
+  "version": "6.69.9",
   "description": "Tooling for OpenAPI files",
   "repository": {
     "type": "git",

package/node_modules/@zuplo/otel/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zuplo/otel",
   "type": "module",
-  "version": "6.69.6",
+  "version": "6.69.9",
   "repository": "https://github.com/zuplo/zuplo",
   "author": "Zuplo, Inc.",
   "exports": {