@eventcatalog/create-eventcatalog 2.0.14 → 2.0.16

package/dist/index.js

@@ -1203,7 +1203,7 @@ var require_has_flag = __commonJS({
 var require_supports_color = __commonJS({
   "node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
-    var os2 = require("os");
+    var os3 = require("os");
     var hasFlag = require_has_flag();
     var env = process.env;
     var forceColor;
@@ -1241,7 +1241,7 @@ var require_supports_color = __commonJS({
       }
       const min = forceColor ? 1 : 0;
       if (process.platform === "win32") {
-        const osRelease = os2.release().split(".");
+        const osRelease = os3.release().split(".");
         if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -7884,9 +7884,9 @@ var require_path = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.convertPosixPathToPattern = exports2.convertWindowsPathToPattern = exports2.convertPathToPattern = exports2.escapePosixPath = exports2.escapeWindowsPath = exports2.escape = exports2.removeLeadingDotSegment = exports2.makeAbsolute = exports2.unixify = void 0;
-    var os2 = require("os");
+    var os3 = require("os");
     var path8 = require("path");
-    var IS_WINDOWS_PLATFORM = os2.platform() === "win32";
+    var IS_WINDOWS_PLATFORM = os3.platform() === "win32";
     var LEADING_DOT_SEGMENT_CHARACTERS_COUNT = 2;
     var POSIX_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()*?[\]{|}]|^!|[!+@](?=\()|\\(?![!()*+?@[\]{|}]))/g;
     var WINDOWS_UNESCAPED_GLOB_SYMBOLS_RE = /(\\?)([()[\]{}]|^!|[!+@](?=\())/g;
@@ -13106,8 +13106,8 @@ var require_settings4 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
     var fs7 = require("fs");
-    var os2 = require("os");
-    var CPU_COUNT = Math.max(os2.cpus().length, 1);
+    var os3 = require("os");
+    var CPU_COUNT = Math.max(os3.cpus().length, 1);
     exports2.DEFAULT_FILE_SYSTEM_ADAPTER = {
       lstat: fs7.lstat,
       lstatSync: fs7.lstatSync,
@@ -22452,7 +22452,7 @@ function install(root, dependencies, { packageManager: packageManager2, isOnline
 }
 
 // templates/index.ts
-var import_os2 = __toESM(require("os"));
+var import_os3 = __toESM(require("os"));
 var import_fs16 = __toESM(require("fs"));
 var import_path9 = __toESM(require("path"));
 var import_chalk3 = __toESM(require_chalk());
@@ -22460,8 +22460,69 @@ var import_uuid = require("uuid");
 
 // templates/analytics.ts
 var import_axios = __toESM(require("axios"));
+var import_os2 = __toESM(require("os"));
+
+// package.json
+var package_default = {
+  name: "@eventcatalog/create-eventcatalog",
+  description: "Create EventCatalog with one command",
+  version: "2.0.16",
+  bin: {
+    "create-catalog": "./dist/index.js"
+  },
+  files: [
+    "dist",
+    "templates"
+  ],
+  publishConfig: {
+    access: "public"
+  },
+  scripts: {
+    prepublishOnly: "npm run build",
+    build: "tsup index.ts --format cjs --dts",
+    run: "node dist/index.js",
+    dev: "npm run build --watch",
+    changeset: "changeset",
+    release: "changeset publish"
+  },
+  devDependencies: {
+    "@types/async-retry": "1.4.2",
+    "@types/ci-info": "2.0.0",
+    "@types/cross-spawn": "6.0.0",
+    "@types/node": "^12.6.8",
+    "@types/prompts": "2.0.1",
+    "@types/rimraf": "3.0.0",
+    "@types/tar": "4.0.3",
+    "@types/uuid": "^10.0.0",
+    "@types/validate-npm-package-name": "3.0.0",
+    "@vercel/ncc": "0.34.0",
+    "async-retry": "1.3.1",
+    chalk: "2.4.2",
+    "ci-info": "watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540",
+    commander: "2.20.0",
+    cpy: "^11.0.0",
+    "cross-spawn": "6.0.5",
+    "fast-glob": "^3.3.2",
+    got: "^14.0.0",
+    prompts: "2.1.0",
+    rimraf: "^5.0.7",
+    tar: "^4.4.19",
+    tsup: "^8.1.0",
+    typescript: "^5.4.5",
+    "update-check": "1.5.4",
+    "validate-npm-package-name": "3.0.0"
+  },
+  dependencies: {
+    "@changesets/cli": "^2.27.6",
+    axios: "^1.7.7",
+    uuid: "^10.0.0"
+  }
+};
+
+// templates/analytics.ts
 async function raiseEvent(eventData) {
   const url2 = "https://queue.simpleanalyticscdn.com/events";
+  const userAgent = `@eventcatalog/create-eventcatalog/${package_default.version} (${import_os2.default.platform()}; ${import_os2.default.arch()}; Node/${process.version})`;
   const headers = {
     "Content-Type": "application/json"
   };
@@ -22469,14 +22530,15 @@ async function raiseEvent(eventData) {
     type: "event",
     hostname: "eventcatalog.dev",
     event: "@eventcatalog/create-eventcatalog",
-    metadata: eventData,
-    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+    metadata: {
+      ...eventData,
+      ua: userAgent
+    },
+    ua: userAgent
   };
   try {
     await import_axios.default.post(url2, payload, { headers });
-    console.log("Event successfully sent");
   } catch (error) {
-    console.log("Error sending event:", error);
   }
 }
 
@@ -22510,7 +22572,7 @@ var installTemplate = async ({
   };
   import_fs16.default.writeFileSync(
     import_path9.default.join(root, "package.json"),
-    JSON.stringify(packageJson, null, 2) + import_os2.default.EOL
+    JSON.stringify(packageJson, null, 2) + import_os3.default.EOL
   );
   const installFlags = { packageManager: packageManager2, isOnline };
   const dependencies = [];
@@ -22518,7 +22580,8 @@ var installTemplate = async ({
     "@parcel/watcher",
     "concurrently",
     "cross-env",
-    "@types/lodash.merge"
+    "@types/lodash.merge",
+    "@types/diff"
   ];
   if (dependencies.length) {
     console.log();
@@ -22559,12 +22622,13 @@ var installTemplate = async ({
       }
     }
   });
+  const cId = (0, import_uuid.v4)();
   const eventCatalogConfigPath = import_path9.default.join(root, "eventcatalog.config.js");
   let eventCatalogConfig = import_fs16.default.readFileSync(eventCatalogConfigPath, "utf8");
   eventCatalogConfig = eventCatalogConfig.replace(/<organizationName>/g, organizationName2);
-  eventCatalogConfig = eventCatalogConfig.replace(/<cId>/g, (0, import_uuid.v4)());
+  eventCatalogConfig = eventCatalogConfig.replace(/<cId>/g, cId);
   import_fs16.default.writeFileSync(eventCatalogConfigPath, eventCatalogConfig);
-  await raiseEvent({ command: "create", org: organizationName2, id: (0, import_uuid.v4)() });
+  await raiseEvent({ command: "create", org: organizationName2, cId });
   if (!eslint) {
     await import_fs16.default.promises.unlink(import_path9.default.join(root, ".eslintrc.json"));
   }
@@ -22685,63 +22749,6 @@ function validateNpmName(name) {
   };
 }
 
-// package.json
-var package_default = {
-  name: "@eventcatalog/create-eventcatalog",
-  description: "Create EventCatalog with one command",
-  version: "2.0.14",
-  bin: {
-    "create-catalog": "./dist/index.js"
-  },
-  files: [
-    "dist",
-    "templates"
-  ],
-  publishConfig: {
-    access: "public"
-  },
-  scripts: {
-    prepublishOnly: "npm run build",
-    build: "tsup index.ts --format cjs --dts",
-    run: "node dist/index.js",
-    dev: "npm run build --watch",
-    changeset: "changeset",
-    release: "changeset publish"
-  },
-  devDependencies: {
-    "@types/async-retry": "1.4.2",
-    "@types/ci-info": "2.0.0",
-    "@types/cross-spawn": "6.0.0",
-    "@types/node": "^12.6.8",
-    "@types/prompts": "2.0.1",
-    "@types/rimraf": "3.0.0",
-    "@types/tar": "4.0.3",
-    "@types/uuid": "^10.0.0",
-    "@types/validate-npm-package-name": "3.0.0",
-    "@vercel/ncc": "0.34.0",
-    "async-retry": "1.3.1",
-    chalk: "2.4.2",
-    "ci-info": "watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540",
-    commander: "2.20.0",
-    cpy: "^11.0.0",
-    "cross-spawn": "6.0.5",
-    "fast-glob": "^3.3.2",
-    got: "^14.0.0",
-    prompts: "2.1.0",
-    rimraf: "^5.0.7",
-    tar: "^4.4.19",
-    tsup: "^8.1.0",
-    typescript: "^5.4.5",
-    "update-check": "1.5.4",
-    "validate-npm-package-name": "3.0.0"
-  },
-  dependencies: {
-    "@changesets/cli": "^2.27.6",
-    axios: "^1.7.7",
-    uuid: "^10.0.0"
-  }
-};
-
 // index.ts
 var projectPath = "";
 var organizationName = "";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eventcatalog/create-eventcatalog",
   "description": "Create EventCatalog with one command",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "bin": {
     "create-catalog": "./dist/index.js"
   },

package/templates/analytics.ts

@@ -1,13 +1,16 @@
 import axios from 'axios';
+import os from 'os';
+import pkg from '../package.json';
 
 interface EventMetadata {
   command: string;
   org: string;
-  id: string;
+  cId: string;
 }
 
 async function raiseEvent(eventData: EventMetadata): Promise<void> {
   const url = "https://queue.simpleanalyticscdn.com/events";
+  const userAgent = `@eventcatalog/create-eventcatalog/${pkg.version} (${os.platform()}; ${os.arch()}; Node/${process.version})`;
   const headers = {
     "Content-Type": "application/json",
   };
@@ -16,15 +19,17 @@ async function raiseEvent(eventData: EventMetadata): Promise<void> {
     type: "event",
     hostname: "eventcatalog.dev",
     event: "@eventcatalog/create-eventcatalog",
-    metadata: eventData,
-    timestamp: new Date().toISOString(),
+    metadata: {
+      ...eventData,
+      ua: userAgent
+    },
+    ua: userAgent
   };
 
   try {
     await axios.post(url, payload, { headers });
-    console.log("Event successfully sent");
   } catch (error) {
-    console.log("Error sending event:", error);
+    // swallow the error
   }
 }
 

package/templates/index.ts

@@ -79,6 +79,7 @@ export const installTemplate = async ({
     "concurrently",
     "cross-env",
     "@types/lodash.merge",
+    "@types/diff",
   ] as any;
 
   /**
@@ -134,14 +135,16 @@ export const installTemplate = async ({
     },
   });
 
+  const cId = v4();
+
   // update the properties in the eventcatalog.config.js
   const eventCatalogConfigPath = path.join(root, "eventcatalog.config.js");
   let eventCatalogConfig = fs.readFileSync(eventCatalogConfigPath, "utf8");
   eventCatalogConfig = eventCatalogConfig.replace( /<organizationName>/g, organizationName );
-  eventCatalogConfig = eventCatalogConfig.replace( /<cId>/g, v4() );
+  eventCatalogConfig = eventCatalogConfig.replace( /<cId>/g, cId );
   fs.writeFileSync(eventCatalogConfigPath, eventCatalogConfig);
 
-  await raiseEvent({ command: 'create', org: organizationName, id: v4() });
+  await raiseEvent({ command: 'create', org: organizationName, cId });
 
   if (!eslint) {
     // remove un-necessary template file if eslint is not desired