Merge pull request #2152 from aeternity/dependabot/npm_and_yarn/lodash-4.17.23

chore(deps): bump lodash from 4.17.21 to 4.17.23

Author: davidyuk

package-lock.json

@@ -115,7 +115,7 @@
     "@types/sinon": "^17.0.4",
     "@typescript-eslint/eslint-plugin": "^7.15.0",
     "@typescript-eslint/parser": "^7.15.0",
-    "autorest": "^3.7.1",
+    "autorest": "^3.7.2",
     "babel-loader": "^10.0.0",
     "babel-plugin-import-globals": "^2.0.0",
     "babel-plugin-transform-import-meta": "^2.3.2",

package.json

@@ -15,10 +15,10 @@ directive:
       throw errors even for explained response with not 200 code
       https://github.com/Azure/autorest.typescript/issues/463#issuecomment-524203041
 
-version: ^3.7.1
+version: 3.7.2
 use-extension:
-  '@autorest/typescript': ^6.0.39
-  '@autorest/modelerfour': ^4.27.0
+  '@autorest/typescript': 6.0.55
+  '@autorest/modelerfour': 4.27.2
 # replace with a link to https://github.com/aeternity/aesophia_http/blob/master/config/swagger.yaml
 # at specific version after fixing https://github.com/aeternity/aesophia_http/issues/87
 input-file: compiler-swagger.yaml

tooling/autorest/compiler.yaml

@@ -184,10 +184,10 @@ directive:
     set: middleware
     reason: the whole SDK already about aeternity
 
-version: ^3.7.1
+version: 3.7.2
 use-extension:
-  '@autorest/typescript': ^6.0.39
-  '@autorest/modelerfour': ^4.27.0
+  '@autorest/typescript': 6.0.55
+  '@autorest/modelerfour': 4.27.2
 input-file: middleware-openapi.yaml
 output-folder: ../../src/apis/middleware
 source-code-folder-path: .

tooling/autorest/middleware.yaml

@@ -148,10 +148,10 @@ directive:
     set: node
     reason: the whole SDK already about aeternity
 
-version: ^3.7.1
+version: 3.7.2
 use-extension:
-  '@autorest/typescript': ^6.0.39
-  '@autorest/modelerfour': ^4.27.0
+  '@autorest/typescript': 6.0.55
+  '@autorest/modelerfour': 4.27.2
 input-file: https://raw.githubusercontent.com/aeternity/aeternity/v7.3.0-rc5/apps/aehttp/priv/oas3.yaml
 output-folder: ../../src/apis/node
 source-code-folder-path: .

tooling/autorest/node.yaml

@@ -132,9 +132,14 @@ await Promise.all(
             /extends PaginatedResponse,(\s+)(\w+) {}/gs,
             'extends $2,$1PaginatedResponse {}',
           );
-          const responseRe = /export interface (\w+)\s+extends (\w+),\s+PaginatedResponse {}/s;
-          while (content.match(responseRe)) {
-            const [response, responseTypeName, dataTypeName] = content.match(responseRe);
+          const responseRe = /export interface (\w+)\s+extends\s+(\w+),\s+PaginatedResponse {}/s;
+          const responseReReversed =
+            /export interface (\w+)\s+extends\s+PaginatedResponse,\s+(\w+) {}/s;
+          let matchedResponse;
+          while (
+            (matchedResponse = content.match(responseRe) ?? content.match(responseReReversed))
+          ) {
+            const [response, responseTypeName, dataTypeName] = matchedResponse;
             const regExp = new RegExp(
               String.raw`export interface ${dataTypeName} {\s+data: (\w+)\[\];\s+}\n\n`,
               's',