@wabot-dev/framework 0.9.5 → 0.9.7

package/dist/src/feature/project-runner/ProjectRunner.js

@@ -36,20 +36,23 @@ import { RepositoryAdapterRegistry } from '../repository/RepositoryAdapterRegist
 
 const logger = new Logger('wabot:project-runner');
 const TEST_FILE_PATTERNS = /\.(test|spec|unit|integration|e2e|multiprocess)\.(ts|js)$/;
+const DEFAULT_EXCLUDE = ['run.ts', 'cmd.ts'];
 const DEFAULT_CHAT_ADAPTERS = [
-    ['../../addon/chat-bot/openia', 'OpenaiChatAdapter'],
-    ['../../addon/chat-bot/openrouter', 'OpenRouterChatAdapter'],
-    ['../../addon/chat-bot/anthropic', 'AnthropicChatAdapter'],
-    ['../../addon/chat-bot/google', 'GoogleChatAdapter'],
+    ['../../addon/chat-bot/openia/OpenaiChatAdapter', 'OpenaiChatAdapter'],
+    ['../../addon/chat-bot/openrouter/OpenRouterChatAdapter', 'OpenRouterChatAdapter'],
+    ['../../addon/chat-bot/anthropic/AnthropicChatAdapter', 'AnthropicChatAdapter'],
+    ['../../addon/chat-bot/google/GoogleChatAdapter', 'GoogleChatAdapter'],
 ];
 class ProjectRunner {
     directories;
+    exclude;
     chatAdapters;
     connectionString;
     isPg;
     pool = null;
     constructor(config = {}) {
         this.directories = config.directories ?? ['src'];
+        this.exclude = [...DEFAULT_EXCLUDE, ...(config.exclude ?? [])];
         this.chatAdapters = config.chatAdapters;
         this.connectionString = this.resolveConnectionString(config.connectionString);
         this.isPg = this.connectionString != null && isPostgresUrl(this.connectionString);
@@ -86,10 +89,30 @@ class ProjectRunner {
             seen.add(d);
             return true;
         });
-        const results = await Promise.all(roots.map((dir) => scanDir(dir).catch((err) => {
-            logger.warn(`Could not read directory ${dir}: ${err.message}`);
-            return [];
-        })));
+        const excludedNames = new Set();
+        const excludedPathsByRoot = new Map();
+        for (const entry of this.exclude) {
+            if (entry.includes('/') || entry.includes('\\')) {
+                for (const root of roots) {
+                    let paths = excludedPathsByRoot.get(root);
+                    if (!paths) {
+                        paths = new Set();
+                        excludedPathsByRoot.set(root, paths);
+                    }
+                    paths.add(resolve(root, entry));
+                }
+            }
+            else {
+                excludedNames.add(entry);
+            }
+        }
+        const results = await Promise.all(roots.map((dir) => {
+            const excludedPaths = excludedPathsByRoot.get(dir) ?? new Set();
+            return scanDir(dir, excludedNames, excludedPaths).catch((err) => {
+                logger.warn(`Could not read directory ${dir}: ${err.message}`);
+                return [];
+            });
+        }));
         return results.flat();
     }
     async importFiles(files) {
@@ -153,23 +176,28 @@ class ProjectRunner {
     }
     async registerMemoryAdapters(components) {
         const needsJobs = components.commandHandlers.length > 0 || components.cronHandlers.length > 0;
-        const [chatBotMod, lockMod, asyncMod] = await Promise.all([
-            import('../../addon/chat-bot/in-memory/index.js'),
-            import('../../addon/lock/index.js'),
-            needsJobs ? import('../../addon/async/in-memory/index.js') : Promise.resolve(null),
+        const [chatBotMod, lockMod, jobMod, cronJobMod] = await Promise.all([
+            import('../../addon/chat-bot/in-memory/InMemoryChatRepository.js'),
+            import('../../addon/lock/InMemoryLocker.js'),
+            needsJobs
+                ? import('../../addon/async/in-memory/InMemoryJobRepository.js')
+                : Promise.resolve(null),
+            components.cronHandlers.length > 0
+                ? import('../../addon/async/in-memory/InMemoryCronJobRepository.js')
+                : Promise.resolve(null),
         ]);
         container.register(ChatRepository, { useToken: chatBotMod.InMemoryChatRepository });
         container.register(Locker, { useToken: lockMod.InMemoryLocker });
         const memoryAdapter = new MemoryRepositoryAdapter();
         container.resolve(RepositoryAdapterRegistry).setDefault(memoryAdapter);
         container.resolve(RepositoryMetadataStore).validateExtensionsRegistered(memoryAdapter.id);
-        if (asyncMod) {
-            container.register(JobRepository, { useToken: asyncMod.InMemoryJobRepository });
-            if (components.cronHandlers.length > 0) {
-                container.register(CronJobRepository, {
-                    useToken: asyncMod.InMemoryCronJobRepository,
-                });
-            }
+        if (jobMod) {
+            container.register(JobRepository, { useToken: jobMod.InMemoryJobRepository });
+        }
+        if (cronJobMod) {
+            container.register(CronJobRepository, {
+                useToken: cronJobMod.InMemoryCronJobRepository,
+            });
         }
         logger.info('Configured with in-memory adapters');
     }
@@ -177,25 +205,32 @@ class ProjectRunner {
         if (!this.pool) {
             throw new Error('Postgres pool was not initialized');
         }
-        const [chatBotMod, pgMod, asyncMod] = await Promise.all([
-            import('../../addon/chat-bot/pg/index.js'),
-            import('../pg/index.js'),
-            import('../../addon/async/pg/index.js'),
+        const hasCommandHandlers = components.commandHandlers.length > 0;
+        const hasCronHandlers = components.cronHandlers.length > 0;
+        const [chatBotMod, lockerMod, repoAdapterMod, txMod, jobMod, cronJobMod] = await Promise.all([
+            import('../../addon/chat-bot/pg/PgChatRepository.js'),
+            import('../pg/PgLocker.js'),
+            import('../pg/PgJsonRepositoryAdapter.js'),
+            import('../../addon/async/pg/PgTransactionAdapter.js'),
+            hasCommandHandlers || hasCronHandlers
+                ? import('../../addon/async/pg/PgJobRepository.js')
+                : Promise.resolve(null),
+            hasCronHandlers
+                ? import('../../addon/async/pg/PgCronJobRepository.js')
+                : Promise.resolve(null),
         ]);
         container.register(ChatRepository, { useToken: chatBotMod.PgChatRepository });
-        container.register(Locker, { useToken: pgMod.PgLocker });
-        const pgAdapter = new pgMod.PgJsonRepositoryAdapter(this.pool);
+        container.register(Locker, { useToken: lockerMod.PgLocker });
+        const pgAdapter = new repoAdapterMod.PgJsonRepositoryAdapter(this.pool);
         container.resolve(RepositoryAdapterRegistry).setDefault(pgAdapter);
         container.resolve(RepositoryMetadataStore).validateExtensionsRegistered(pgAdapter.id);
         const transactionStore = container.resolve(TransactionMetadataStore);
-        transactionStore.registerAdapter('default', new asyncMod.PgTransactionAdapter(this.pool));
-        const hasCommandHandlers = components.commandHandlers.length > 0;
-        const hasCronHandlers = components.cronHandlers.length > 0;
-        if (hasCommandHandlers || hasCronHandlers) {
-            container.register(JobRepository, { useToken: asyncMod.PgJobRepository });
+        transactionStore.registerAdapter('default', new txMod.PgTransactionAdapter(this.pool));
+        if (jobMod) {
+            container.register(JobRepository, { useToken: jobMod.PgJobRepository });
         }
-        if (hasCronHandlers) {
-            container.register(CronJobRepository, { useToken: asyncMod.PgCronJobRepository });
+        if (cronJobMod) {
+            container.register(CronJobRepository, { useToken: cronJobMod.PgCronJobRepository });
         }
         logger.info('Configured with PostgreSQL adapters');
     }
@@ -250,14 +285,19 @@ function run(config) {
 function isPostgresUrl(cs) {
     return cs.startsWith('postgres://') || cs.startsWith('postgresql://');
 }
-async function scanDir(dir) {
+async function scanDir(dir, excludedNames, excludedPaths) {
     const entries = await readdir(dir, { withFileTypes: true });
     const subResults = await Promise.all(entries.map(async (entry) => {
         const name = entry.name;
+        const fullPath = join(dir, name);
+        if (excludedNames.has(name))
+            return [];
+        if (excludedPaths.has(fullPath))
+            return [];
         if (entry.isDirectory()) {
             if (name.startsWith('__'))
                 return [];
-            return scanDir(join(dir, name));
+            return scanDir(fullPath, excludedNames, excludedPaths);
         }
         if (!entry.isFile())
             return [];
@@ -265,7 +305,6 @@ async function scanDir(dir) {
             return [];
         if (name.endsWith('.d.ts'))
             return [];
-        const fullPath = join(dir, name);
         if (TEST_FILE_PATTERNS.test(fullPath))
             return [];
         return [fullPath];

package/dist/src/index.d.ts

@@ -1125,11 +1125,13 @@ declare function safeJsonParse<T = unknown>(json: string | undefined | null, con
 
 interface IProjectRunnerConfig {
     directories?: string[];
+    exclude?: string[];
     connectionString?: string;
     chatAdapters?: IConstructor<IChatAdapter>[];
 }
 declare class ProjectRunner {
     private directories;
+    private exclude;
     private chatAdapters;
     private connectionString;
     private isPg;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",

package/dist/src/addon/async/in-memory/index.js

@@ -1,2 +0,0 @@
-export { InMemoryJobRepository } from './InMemoryJobRepository.js';
-export { InMemoryCronJobRepository } from './InMemoryCronJobRepository.js';

package/dist/src/addon/async/pg/index.js

@@ -1,3 +0,0 @@
-export { PgCronJobRepository } from './PgCronJobRepository.js';
-export { PgJobRepository } from './PgJobRepository.js';
-export { PgTransactionAdapter } from './PgTransactionAdapter.js';

package/dist/src/addon/chat-bot/in-memory/index.js

@@ -1,2 +0,0 @@
-export { InMemoryChatMemory } from './InMemoryChatMemory.js';
-export { InMemoryChatRepository } from './InMemoryChatRepository.js';

package/dist/src/addon/chat-bot/pg/index.js

@@ -1,2 +0,0 @@
-export { PgChatRepository } from './PgChatRepository.js';
-export { PgChatMemory } from './PgChatMemory.js';

package/dist/src/addon/lock/index.js

@@ -1,2 +0,0 @@
-export { InMemoryLockKey } from './InMemoryLockKey.js';
-export { InMemoryLocker } from './InMemoryLocker.js';

package/dist/src/feature/pg/index.js

@@ -1,10 +0,0 @@
-export { PG_ADAPTER_ID, pgExtension } from './@pgExtension.js';
-export { PgCrudRepository } from './PgCrudRepository.js';
-export { PgJsonRepositoryAdapter } from './PgJsonRepositoryAdapter.js';
-export { PgLocker } from './PgLocker.js';
-export { PgLockKey } from './PgLockKey.js';
-export { PgRepositoryBase, PgRepositoryBase as PgRepositoryExtension } from './PgRepositoryBase.js';
-export { getClientMap, pgStorage } from './pgStorage.js';
-export { buildQuerySql } from './buildQuerySql.js';
-export { getPgClient, withPgClient } from './withPgClient.js';
-export { withPgTransaction } from './withPgTransaction.js';