@eventcatalog/core 0.0.0-202201095842 → 0.0.3

package/CHANGELOG.md

@@ -1 +1,13 @@
 # @eventcatalog/core
+
+## 0.0.3
+
+### Patch Changes
+
+- [`23a96fc`](https://github.com/boyney123/eventcatalog/commit/23a96fc651907517cee937657be14cbf9fe95fb9) [#42](https://github.com/boyney123/eventcatalog/pull/42) Thanks [@boyney123](https://github.com/boyney123)! - fix: now remove the .next folder before we start the dev server foric…
+
+## 0.0.2
+
+### Patch Changes
+
+- [`53b27cb`](https://github.com/boyney123/eventcatalog/commit/53b27cb5bb5ab7fa8d526309c6dd50e1f17f3db1) [#39](https://github.com/boyney123/eventcatalog/pull/39) Thanks [@boyney123](https://github.com/boyney123)! - feat: removed ids from services

package/bin/eventcatalog.js

@@ -69,9 +69,10 @@ cli
   .command('dev [siteDir]')
   .description('Start the development server.')
   .action(() => {
-    if (!fs.existsSync(eventCatalogLibDir)) {
-      copyCoreApplicationCodeIntoUsersProjectDir();
-    }
+    // Fix for https://github.com/boyney123/eventcatalog/issues/41, not the best but will do for now
+    fs.rmSync(eventCatalogLibDir, { recursive: true, force: true });
+
+    copyCoreApplicationCodeIntoUsersProjectDir();
 
     // copy any public assets over (from users to the lib itself)
     fs.copySync(path.join(projectDIR, 'public'), path.join(eventCatalogLibDir, 'public'));

package/components/Sidebars/EventSidebar.tsx

@@ -19,8 +19,8 @@ function EventSideBar({ event, loadedVersion }: EventSideBarProps) {
     try {
       const res = await fetch(`/api/event/${event.name}/download`);
       if (res.status === 404) throw new Error('Failed to find file');
-      const data = await res.text();
-      fileDownload(data, event.name);
+      const { schema, fileName } = await res.json();
+      fileDownload(schema, fileName);
     } catch (error) {
       // TODO: Maybe better error experince
       console.error(error);

package/lib/__tests__/services.spec.ts

@@ -19,7 +19,6 @@ describe('services', () => {
 
       expect(services).toEqual([
         {
-          id: 'Email Platform',
           name: 'Email Platform',
           summary:
             'Internal Email system. Used to send emails to 1000s of customers. Hosted in AWS\n',
@@ -65,7 +64,6 @@ describe('services', () => {
 
       expect(services).toEqual([
         {
-          id: 'Email Platform',
           name: 'Email Platform',
           summary:
             'Internal Email system. Used to send emails to 1000s of customers. Hosted in AWS\n',
@@ -105,7 +103,6 @@ describe('services', () => {
       const { service, markdown } = await getServiceByName('Email Platform');
 
       expect(service).toEqual({
-        id: 'Email Platform',
         name: 'Email Platform',
         summary:
           'Internal Email system. Used to send emails to 1000s of customers. Hosted in AWS\n',

package/lib/events.ts

@@ -206,8 +206,8 @@ export const getAllEventsThatHaveRelationshipWithService = (
 ): { publishes: Event[]; subscribes: Event[] } => {
   const relationshipsBetweenEvents = events.reduce(
     (data, event) => {
-      const serviceSubscribesToEvent = event.consumers.some((id) => id === service.id);
-      const servicePublishesEvent = event.producers.some((id) => id === service.id);
+      const serviceSubscribesToEvent = event.consumers.some((id) => id === service.name);
+      const servicePublishesEvent = event.producers.some((id) => id === service.name);
 
       return {
         publishes: servicePublishesEvent ? data.publishes.concat(event) : data.publishes,

package/lib/services.ts

@@ -8,8 +8,8 @@ import { MarkdownFile } from '../types/index';
 import { getAllEvents, getAllEventsThatHaveRelationshipWithService } from '@/lib/events';
 
 const buildService = (eventFrontMatter: any): Service => {
-  const { id, name, summary, owners = [], repository = {}, tags = [] } = eventFrontMatter;
-  return { id, name, summary, owners, repository, tags };
+  const { name, summary, owners = [], repository = {}, tags = [] } = eventFrontMatter;
+  return { name, summary, owners, repository, tags };
 };
 
 export const getAllServices = (): Service[] => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventcatalog/core",
-  "version": "0.0.0-202201095842",
+  "version": "0.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -37,7 +37,7 @@
     "react-syntax-highlighter": "^15.4.5"
   },
   "devDependencies": {
-    "@eventcatalog/types": "0.0.0",
+    "@eventcatalog/types": "0.0.1",
     "@types/react": "^17.0.36",
     "autoprefixer": "^10.4.0",
     "commander": "^8.3.0",

package/pages/api/event/[name]/download.js

@@ -8,16 +8,19 @@ export default function (req, res) {
   const eventDir = path.join(process.env.PROJECT_DIR, 'events', eventName);
 
   try {
-    // Find the schema file
     const filesInEventDir = fs.readdirSync(eventDir);
     const schemaFileName = filesInEventDir.find((fileName) => fileName.indexOf('schema.') > -1);
 
     if (schemaFileName) {
+      const extension = schemaFileName.split('.').pop();
       const schemaFile = fs.readFileSync(path.join(eventDir, schemaFileName));
-      res.send(schemaFile).end();
-    } else {
-      res.status(404).end();
+
+      res.send({
+        schema: schemaFile.toString(),
+        fileName: `${eventName}.${extension}`,
+      });
     }
+    res.status(404).end();
   } catch (error) {
     console.log(error);
     res.status(404).end();