@asyncapi/cli 1.12.2 → 1.13.0

package/lib/base.d.ts

@@ -14,6 +14,7 @@ export default abstract class extends Command {
     recordActionFinished(action: string, metadata?: MetricMetadata, rawDocument?: string): Promise<void>;
     recordActionInvoked(action: string, metadata?: MetricMetadata): Promise<void>;
     recordActionMetric(recordFunc: (recorder: Recorder) => Promise<void>): Promise<void>;
+    setSource(): Promise<void>;
     finally(error: Error | undefined): Promise<any>;
     recorderFromEnv(prefix: string): Promise<Recorder>;
 }

package/lib/base.js

@@ -9,7 +9,7 @@ const fs_extra_1 = require("fs-extra");
 const fs_1 = require("fs");
 const uuid_1 = require("uuid");
 const os_1 = require("os");
-const { readFile, writeFile } = fs_1.promises;
+const { readFile, writeFile, stat } = fs_1.promises;
 class DiscardSink {
     send() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -86,6 +86,7 @@ class default_1 extends core_1.Command {
     recordActionMetric(recordFunc) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
+                yield this.setSource();
                 yield recordFunc(yield this.recorder);
                 yield (yield this.recorder).flush();
             }
@@ -96,6 +97,22 @@ class default_1 extends core_1.Command {
             }
         });
     }
+    setSource() {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const specFilePath = (_a = this.specFile) === null || _a === void 0 ? void 0 : _a.getFilePath();
+            if (!specFilePath) {
+                return;
+            }
+            try {
+                const stats = yield stat(specFilePath);
+                this.metricsMetadata['file_creation_timestamp'] = stats.birthtimeMs;
+            }
+            catch (e) {
+                // If there's an error with the file, we don't handle it here because it's expected to be handled and reported in the 'finally' method of the command.
+            }
+        });
+    }
     finally(error) {
         const _super = Object.create(null, {
             finally: { get: () => super.finally }

package/lib/commands/generate/fromTemplate.d.ts

@@ -16,6 +16,9 @@ export default class Template extends Command {
         watch: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         param: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         'map-base-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'registry-url': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'registry-auth': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'registry-token': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static args: {
         name: string;
@@ -25,6 +28,8 @@ export default class Template extends Command {
     run(): Promise<void>;
     private parseArgs;
     private parseFlags;
+    private registryURLParser;
+    private registryValidation;
     private paramParser;
     private disableHooksParser;
     private mapBaseURLParser;

package/lib/commands/generate/fromTemplate.js

@@ -17,6 +17,7 @@ const generator_error_1 = require("../../errors/generator-error");
 const parser_1 = require("@asyncapi/parser");
 const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
+const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const templatesNotSupportingV3 = {
     '@asyncapi/minimaltemplate': 'some link',
     '@asyncapi/dotnet-nats-template': 'https://github.com/asyncapi/dotnet-nats-template/issues/384',
@@ -84,7 +85,7 @@ class Template extends base_1.default {
                 template = parsedArgs.template;
                 output = parsedArgs.output;
             }
-            const parsedFlags = this.parseFlags(flags['disable-hook'], flags['param'], flags['map-base-url']);
+            const parsedFlags = this.parseFlags(flags['disable-hook'], flags['param'], flags['map-base-url'], flags['registry.url'], flags['registry.auth'], flags['registry.token']);
             const options = {
                 forceWrite: flags['force-write'],
                 install: flags.install,
@@ -93,6 +94,11 @@ class Template extends base_1.default {
                 noOverwriteGlobs: flags['no-overwrite'],
                 mapBaseUrlToFolder: parsedFlags.mapBaseUrlToFolder,
                 disabledHooks: parsedFlags.disableHooks,
+                registry: {
+                    url: flags['registry-url'],
+                    auth: flags['registry-auth'],
+                    token: flags['registry-token']
+                }
             };
             const asyncapiInput = (yield (0, SpecificationFile_1.load)(asyncapi)) || (yield (0, SpecificationFile_1.load)());
             this.specFile = asyncapiInput;
@@ -165,13 +171,32 @@ class Template extends base_1.default {
             return { asyncapi, template, output };
         });
     }
-    parseFlags(disableHooks, params, mapBaseUrl) {
+    parseFlags(disableHooks, params, mapBaseUrl, registryUrl, registryAuth, registryToken) {
         return {
             params: this.paramParser(params),
             disableHooks: this.disableHooksParser(disableHooks),
             mapBaseUrlToFolder: this.mapBaseURLParser(mapBaseUrl),
+            registryURLValidation: this.registryURLParser(registryUrl),
+            registryAuthentication: this.registryValidation(registryUrl, registryAuth, registryToken)
         };
     }
+    registryURLParser(input) {
+        if (!input) {
+            return;
+        }
+        const isURL = /^https?:/;
+        if (!isURL.test(input.toLowerCase())) {
+            throw new Error('Invalid --registry-url flag. The param requires a valid http/https url.');
+        }
+    }
+    registryValidation(registryUrl, registryAuth, registryToken) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const response = yield (0, node_fetch_1.default)(registryUrl);
+            if (response.status === 401 && !registryAuth && !registryToken) {
+                throw new Error('Need to pass either registryAuth in username:password encoded in Base64 or need to pass registryToken');
+            }
+        });
+    }
     paramParser(inputs) {
         if (!inputs) {
             return {};
@@ -363,6 +388,16 @@ Template.flags = {
     'map-base-url': core_1.Flags.string({
         description: 'Maps all schema references from base url to local folder'
     }),
+    'registry-url': core_1.Flags.string({
+        default: 'https://registry.npmjs.org',
+        description: 'Specifies the URL of the private registry for fetching templates and dependencies'
+    }),
+    'registry-auth': core_1.Flags.string({
+        description: 'The registry username and password encoded with base64, formatted as username:password'
+    }),
+    'registry-token': core_1.Flags.string({
+        description: 'The npm registry authentication token, that can be passed instead of base64 encoded username and password'
+    })
 };
 Template.args = [
     { name: 'asyncapi', description: '- Local path, url or context-name pointing to AsyncAPI file' },

package/oclif.manifest.json

@@ -605,6 +605,28 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "registry-url": {
+          "description": "Specifies the URL of the private registry for fetching templates and dependencies",
+          "name": "registry-url",
+          "default": "https://registry.npmjs.org",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "registry-auth": {
+          "description": "The registry username and password encoded with base64, formatted as username:password",
+          "name": "registry-auth",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "registry-token": {
+          "description": "The npm registry authentication token, that can be passed instead of base64 encoded username and password",
+          "name": "registry-token",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1448,5 +1470,5 @@
       ]
     }
   },
-  "version": "1.12.2"
+  "version": "1.13.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -13,7 +13,7 @@
     "@asyncapi/converter": "^1.4.19",
     "@asyncapi/diff": "^0.4.1",
     "@asyncapi/generator": "^1.17.25",
-    "@asyncapi/modelina": "^3.4.9",
+    "@asyncapi/modelina": "^3.5.0",
     "@asyncapi/openapi-schema-parser": "^3.0.22",
     "@asyncapi/optimizer": "^1.0.2",
     "@asyncapi/parser": "^3.0.14",