@asyncapi/cli 5.0.4 → 5.0.6

package/lib/domains/services/validation.service.js

@@ -44,6 +44,29 @@ const convertGitHubWebUrl = (url) => {
     }
     return url;
 };
+/**
+ * Helper function to fetch with error handling
+ */
+const fetchWithErrorHandling = (url, headers, errorMessage) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(url, { headers });
+    if (!res.ok) {
+        throw new Error(`${errorMessage}: ${url} - ${res.statusText}`);
+    }
+    return res;
+});
+/**
+ * Helper function to fetch content from GitHub API
+ */
+const fetchGitHubApiContent = (url, headers) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    headers['Accept'] = 'application/vnd.github.v3+json';
+    const res = yield fetchWithErrorHandling(url, headers, 'Failed to fetch GitHub API URL');
+    const fileInfo = (yield res.json());
+    if (!fileInfo.download_url) {
+        throw new Error(`No download URL found in GitHub API response for: ${url}`);
+    }
+    const contentRes = yield fetchWithErrorHandling(fileInfo.download_url, headers, 'Failed to fetch content from download URL');
+    return yield contentRes.text();
+});
 /**
  * Custom resolver for private repositories
  */
@@ -65,36 +88,15 @@ const createHttpWithAuthResolver = () => ({
             Object.assign(headers, authInfo.headers); // merge custom headers
         }
         if (url.includes('api.github.com')) {
-            headers['Accept'] = 'application/vnd.github.v3+json';
-            const res = yield fetch(url, { headers });
-            if (!res.ok) {
-                throw new Error(`Failed to fetch GitHub API URL: ${url} - ${res.statusText}`);
-            }
-            const fileInfo = (yield res.json());
-            if (fileInfo.download_url) {
-                const contentRes = yield fetch(fileInfo.download_url, { headers });
-                if (!contentRes.ok) {
-                    throw new Error(`Failed to fetch content from download URL: ${fileInfo.download_url} - ${contentRes.statusText}`);
-                }
-                return yield contentRes.text();
-            }
-            throw new Error(`No download URL found in GitHub API response for: ${url}`);
+            return yield fetchGitHubApiContent(url, headers);
         }
-        else if (url.includes('raw.githubusercontent.com')) {
+        if (url.includes('raw.githubusercontent.com')) {
             headers['Accept'] = 'application/vnd.github.v3.raw';
-            const res = yield fetch(url, { headers });
-            if (!res.ok) {
-                throw new Error(`Failed to fetch GitHub URL: ${url} - ${res.statusText}`);
-            }
-            return yield res.text();
-        }
-        else {
-            const res = yield fetch(url, { headers });
-            if (!res.ok) {
-                throw new Error(`Failed to fetch URL: ${url} - ${res.statusText}`);
-            }
+            const res = yield fetchWithErrorHandling(url, headers, 'Failed to fetch GitHub URL');
             return yield res.text();
         }
+        const res = yield fetchWithErrorHandling(url, headers, 'Failed to fetch URL');
+        return yield res.text();
     }),
 });
 const { writeFile } = fs_1.promises;

package/oclif.manifest.json

@@ -1427,162 +1427,6 @@
         "models.js"
       ]
     },
-    "new:file": {
-      "aliases": [],
-      "args": {},
-      "description": "Creates a new asyncapi file",
-      "examples": [
-        "asyncapi new\t - start creation of a file in interactive mode",
-        "asyncapi new --file-name=my-asyncapi.yaml --example=default-example.yaml --no-tty\t - create a new file with a specific name, using one of the examples and without interactive mode"
-      ],
-      "flags": {
-        "help": {
-          "char": "h",
-          "description": "Show CLI help.",
-          "name": "help",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "file-name": {
-          "char": "n",
-          "description": "name of the file",
-          "name": "file-name",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "example": {
-          "char": "e",
-          "description": "name of the example to use. Available examples are:\n\t - simple-asyncapi.yml\n\t - adeo-kafka-request-reply-asyncapi.yml\n\t - anyof-asyncapi.yml\n\t - application-headers-asyncapi.yml\n\t - correlation-id-asyncapi.yml\n\t - websocket-gemini-asyncapi.yml\n\t - gitter-streaming-asyncapi.yml\n\t - kraken-websocket-request-reply-message-filter-in-reply-asyncapi.yml\n\t - kraken-websocket-request-reply-multiple-channels-asyncapi.yml\n\t - mercure-asyncapi.yml\n\t - not-asyncapi.yml\n\t - operation-security-asyncapi.yml\n\t - oneof-asyncapi.yml\n\t - rpc-client-asyncapi.yml\n\t - rpc-server-asyncapi.yml\n\t - slack-rtm-asyncapi.yml\n\t - tutorial.yml\n\t - streetlights-kafka-asyncapi.yml\n\t - streetlights-operation-security-asyncapi.yml\n\t - streetlights-mqtt-asyncapi.yml",
-          "name": "example",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "studio": {
-          "char": "s",
-          "description": "open in Studio",
-          "name": "studio",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "port": {
-          "char": "p",
-          "description": "port in which to start Studio",
-          "name": "port",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "no-tty": {
-          "description": "do not use an interactive terminal",
-          "name": "no-tty",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "new:file",
-      "pluginAlias": "@asyncapi/cli",
-      "pluginName": "@asyncapi/cli",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "apps",
-        "cli",
-        "commands",
-        "new",
-        "file.js"
-      ]
-    },
-    "new": {
-      "aliases": [],
-      "args": {},
-      "description": "Create a new AsyncAPI project, specification files, or templates for clients and applications.",
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "new",
-      "pluginAlias": "@asyncapi/cli",
-      "pluginName": "@asyncapi/cli",
-      "pluginType": "core",
-      "strict": true,
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "apps",
-        "cli",
-        "commands",
-        "new",
-        "index.js"
-      ]
-    },
-    "new:template": {
-      "aliases": [],
-      "args": {},
-      "description": "Creates a new template",
-      "flags": {
-        "help": {
-          "char": "h",
-          "description": "Show CLI help.",
-          "name": "help",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "name": {
-          "char": "n",
-          "description": "Name of the Project",
-          "name": "name",
-          "default": "project",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "template": {
-          "char": "t",
-          "description": "Name of the Template",
-          "name": "template",
-          "default": "default",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "file": {
-          "char": "f",
-          "description": "The path to the AsyncAPI file for generating a template.",
-          "name": "file",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "force-write": {
-          "description": "Force writing of the generated files to given directory even if it is a git repo with unstaged files or not empty dir (defaults to false)",
-          "name": "force-write",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "new:template",
-      "pluginAlias": "@asyncapi/cli",
-      "pluginName": "@asyncapi/cli",
-      "pluginType": "core",
-      "strict": true,
-      "errorMessages": {},
-      "isESM": false,
-      "relativePath": [
-        "lib",
-        "apps",
-        "cli",
-        "commands",
-        "new",
-        "template.js"
-      ]
-    },
     "start:api": {
       "aliases": [],
       "args": {},
@@ -1805,6 +1649,162 @@
         "studio.js"
       ]
     },
+    "new:file": {
+      "aliases": [],
+      "args": {},
+      "description": "Creates a new asyncapi file",
+      "examples": [
+        "asyncapi new\t - start creation of a file in interactive mode",
+        "asyncapi new --file-name=my-asyncapi.yaml --example=default-example.yaml --no-tty\t - create a new file with a specific name, using one of the examples and without interactive mode"
+      ],
+      "flags": {
+        "help": {
+          "char": "h",
+          "description": "Show CLI help.",
+          "name": "help",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "file-name": {
+          "char": "n",
+          "description": "name of the file",
+          "name": "file-name",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "example": {
+          "char": "e",
+          "description": "name of the example to use. Available examples are:\n\t - simple-asyncapi.yml\n\t - adeo-kafka-request-reply-asyncapi.yml\n\t - anyof-asyncapi.yml\n\t - application-headers-asyncapi.yml\n\t - correlation-id-asyncapi.yml\n\t - websocket-gemini-asyncapi.yml\n\t - gitter-streaming-asyncapi.yml\n\t - kraken-websocket-request-reply-message-filter-in-reply-asyncapi.yml\n\t - kraken-websocket-request-reply-multiple-channels-asyncapi.yml\n\t - mercure-asyncapi.yml\n\t - not-asyncapi.yml\n\t - operation-security-asyncapi.yml\n\t - oneof-asyncapi.yml\n\t - rpc-client-asyncapi.yml\n\t - rpc-server-asyncapi.yml\n\t - slack-rtm-asyncapi.yml\n\t - tutorial.yml\n\t - streetlights-kafka-asyncapi.yml\n\t - streetlights-operation-security-asyncapi.yml\n\t - streetlights-mqtt-asyncapi.yml",
+          "name": "example",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "studio": {
+          "char": "s",
+          "description": "open in Studio",
+          "name": "studio",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "port": {
+          "char": "p",
+          "description": "port in which to start Studio",
+          "name": "port",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "no-tty": {
+          "description": "do not use an interactive terminal",
+          "name": "no-tty",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "new:file",
+      "pluginAlias": "@asyncapi/cli",
+      "pluginName": "@asyncapi/cli",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "apps",
+        "cli",
+        "commands",
+        "new",
+        "file.js"
+      ]
+    },
+    "new": {
+      "aliases": [],
+      "args": {},
+      "description": "Create a new AsyncAPI project, specification files, or templates for clients and applications.",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "new",
+      "pluginAlias": "@asyncapi/cli",
+      "pluginName": "@asyncapi/cli",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "apps",
+        "cli",
+        "commands",
+        "new",
+        "index.js"
+      ]
+    },
+    "new:template": {
+      "aliases": [],
+      "args": {},
+      "description": "Creates a new template",
+      "flags": {
+        "help": {
+          "char": "h",
+          "description": "Show CLI help.",
+          "name": "help",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "name": {
+          "char": "n",
+          "description": "Name of the Project",
+          "name": "name",
+          "default": "project",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "template": {
+          "char": "t",
+          "description": "Name of the Template",
+          "name": "template",
+          "default": "default",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "file": {
+          "char": "f",
+          "description": "The path to the AsyncAPI file for generating a template.",
+          "name": "file",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "force-write": {
+          "description": "Force writing of the generated files to given directory even if it is a git repo with unstaged files or not empty dir (defaults to false)",
+          "name": "force-write",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "new:template",
+      "pluginAlias": "@asyncapi/cli",
+      "pluginName": "@asyncapi/cli",
+      "pluginType": "core",
+      "strict": true,
+      "errorMessages": {},
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "apps",
+        "cli",
+        "commands",
+        "new",
+        "template.js"
+      ]
+    },
     "config:auth:add": {
       "aliases": [],
       "args": {
@@ -2146,5 +2146,5 @@
       ]
     }
   },
-  "version": "5.0.4"
+  "version": "5.0.6"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -16,7 +16,7 @@
     "@asyncapi/bundler": "^0.6.4",
     "@asyncapi/converter": "^1.6.2",
     "@asyncapi/diff": "^0.5.0",
-    "@asyncapi/generator": "^3.0.1",
+    "@asyncapi/generator": "^3.1.0",
     "@asyncapi/modelina-cli": "^5.10.1",
     "@asyncapi/openapi-schema-parser": "^3.0.24",
     "@asyncapi/optimizer": "^1.0.4",