@eventcatalog/core 2.13.3 → 2.14.0

package/scripts/catalog-to-astro-content-directory.js

@@ -7,7 +7,18 @@ import { verifyRequiredFieldsAreInCatalogConfigFile, addPropertyToFrontMatter }
 import { mapCatalogToAstro } from './map-catalog-to-astro.js';
 
 const __filename = fileURLToPath(import.meta.url);
-const scriptsDir = path.dirname(__filename);
+const rootPkg = path.resolve(
+  path.dirname(__filename),
+  /**
+   * TODO: fix me =0
+   *
+   * The following is a workaround until organize the structure to have the correct path
+   * for any value of NODE_ENV
+   *
+   * @author carlosallexandre
+   */
+  process.env.NODE_ENV === 'test' ? '../' : '../../'
+);
 
 const copyFiles = async (source, target) => {
   const files = await glob(path.join(source, '**'), {
@@ -67,7 +78,7 @@ const ensureAstroCollectionNotEmpty = async (astroDir) => {
   }
 
   // Hydrate empty collections
-  const defaultCollectionFilesDir = path.join(scriptsDir, 'default-files-for-collections');
+  const defaultCollectionFilesDir = path.join(rootPkg, 'default-files-for-collections');
   for (const collection of emptyCollections) {
     const defaultFile = path.join(defaultCollectionFilesDir, `${collection}.md`);
     const targetDir = path.join(astroDir, 'src/content/', collection);
@@ -102,11 +113,3 @@ export const catalogToAstro = async (source, astroDir) => {
   // insert empty one that is filtered out
   await ensureAstroCollectionNotEmpty(astroDir);
 };
-
-if (process.env.NODE_ENV !== 'test') {
-  // // Get the project directory of the source
-  const source = process.env.PROJECT_DIR;
-  const astroDir = process.env.CATALOG_DIR;
-
-  catalogToAstro(source, astroDir);
-}

package/scripts/constants.ts

@@ -0,0 +1,3 @@
+import { version } from '../package.json';
+
+export const VERSION = version;

package/scripts/generate.js

@@ -17,8 +17,7 @@ function getDefaultExport(importedModule) {
   return importedModule;
 }
 
-const generate = async () => {
-  const PROJECT_DIRECTORY = process.env.PROJECT_DIR;
+export const generate = async (PROJECT_DIRECTORY) => {
   try {
     const config = await getEventCatalogConfigFile(PROJECT_DIRECTORY);
 
@@ -64,5 +63,3 @@ const generate = async () => {
     await cleanup(PROJECT_DIRECTORY);
   }
 };
-
-generate();

package/scripts/start-catalog-locally.js

@@ -1,18 +1,26 @@
 #!/usr/bin/env node
 import { join } from 'node:path';
 import { execSync } from 'node:child_process';
-const __dirname = import.meta.dirname;
 
-const args = process.argv.slice(2);
-const catalog = args[0] || 'default';
+async function main() {
+  const __dirname = import.meta.dirname;
 
-const catalogDir = join(__dirname, '../');
-const projectDIR = join(__dirname, `../examples/${catalog}`);
+  const args = process.argv.slice(2);
+  const catalog = args[0] || 'default';
 
-execSync(
-  `cross-env NODE_ENV=development PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npm run scripts:hydrate-content && cross-env PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npm run dev:local`,
-  {
-    cwd: catalogDir,
+  const catalogDir = join(__dirname, '../');
+  const projectDIR = join(__dirname, `../examples/${catalog}`);
+
+  execSync('npm run build:bin', { stdio: 'inherit' });
+
+  execSync(`cross-env NODE_ENV=development PROJECT_DIR=${projectDIR} CATALOG_DIR=${catalogDir} npx . dev`, {
     stdio: 'inherit',
-  }
-);
+  });
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });

package/scripts/watcher.js

@@ -1,6 +1,5 @@
 import watcher from '@parcel/watcher';
 import fs from 'node:fs';
-import path from 'node:path';
 import { mapCatalogToAstro } from './map-catalog-to-astro.js';
 import { rimrafSync } from 'rimraf';
 import { addPropertyToFrontMatter } from './eventcatalog-config-file-utils.js';
@@ -116,19 +115,3 @@ function retryEPERM(fn) {
     }
   };
 }
-
-/**
- * TODO: call `watch` from the dev command.
- * Calling `watch` there will avoid these if statement.
- * The same could be done to `catalog-to-astro-content-directory`
- */
-if (process.env.NODE_ENV !== 'test') {
-  // Where the users project is located
-  const projectDirectory = process.env.PROJECT_DIR || process.cwd();
-  // Where the catalog code is located.
-  const catalogDirectory = process.env.CATALOG_DIR || path.join(projectDirectory, '.eventcatalog-core');
-
-  const unsub = await watch(projectDirectory, catalogDirectory);
-
-  process.on('exit', () => unsub());
-}

package/src/utils/node-graphs/services-node-graph.ts

@@ -11,6 +11,10 @@ import {
 import { findMatchingNodes, getItemsFromCollectionByIdAndSemverOrLatest } from '@utils/collections/util';
 import { MarkerType } from 'reactflow';
 import type { CollectionMessageTypes } from '@types';
+import { getCommands } from '@utils/commands';
+import { getEvents } from '@utils/events';
+import { getQueries } from '@utils/queries';
+import { getChannels } from '@utils/channels';
 
 type DagreGraph = any;
 
@@ -67,10 +71,10 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
   const receivesRaw = service?.data.receives || [];
   const sendsRaw = service?.data.sends || [];
 
-  const events = await getCollection('events');
-  const commands = await getCollection('commands');
-  const queries = await getCollection('queries');
-  const channels = await getCollection('channels');
+  const events = await getEvents();
+  const commands = await getCommands();
+  const queries = await getQueries();
+  const channels = await getChannels();
 
   const messages = [...events, ...commands, ...queries];