Fixed Pongo databases and collections identifiers to be unique urns

Author: oskardudycz

src/packages/dumbo/src/core/schema/dumboSchema/dumboSchema.unit.spec.ts

@@ -1,9 +1,9 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { SQL } from '../../sql';
+import type { Equal, Expect } from '../../testing';
 import type { TableRowType } from '../components';
 import { dumboSchema } from './index';
-import type { Expect, Equal } from '../../testing';
 
 const { database, schema, table, column, index } = dumboSchema;
 const { Varchar } = SQL.column.type;
@@ -183,9 +183,9 @@ const multiSchemaDb = database('myapp', {
 
 // Access using name-based maps
 const publicSchema = multiSchemaDb.schemas.public;
-const usersTable = publicSchema.tables.users;
+const _usersTable = publicSchema.tables.users;
 
-type Users = TableRowType<typeof usersTable>;
+type Users = TableRowType<typeof _usersTable>;
 
 type _IdColumnIsNonNullableString = Expect<Equal<Users['id'], string>>;
 type _EmailColumnIsNonNullableString = Expect<Equal<Users['email'], string>>;

src/packages/pongo/src/core/collection/pongoCollectionSchemaComponent.ts

@@ -6,8 +6,11 @@ import {
 } from '@event-driven-io/dumbo';
 import type { PongoCollectionSchema, PongoCollectionSQLBuilder } from '..';
 
+export type PongoCollectionURNType = 'sc:pongo:collection';
+export type PongoCollectionURN = `${PongoCollectionURNType}:${string}`;
+
 export type PongoCollectionSchemaComponent =
-  SchemaComponent<'pongo:schema-component:collection'> & {
+  SchemaComponent<PongoCollectionURN> & {
     collectionName: string;
     definition: PongoCollectionSchema;
     sqlBuilder: PongoCollectionSQLBuilder;
@@ -31,7 +34,7 @@ export const PongoCollectionSchemaComponent = <
 }: PongoCollectionSchemaComponentOptions<DriverType>): PongoCollectionSchemaComponent =>
   ({
     ...schemaComponent(
-      'pongo:schema-component:collection',
+      `sc:pongo:collection:${definition.name}`,
       migrationsOrSchemaComponents,
     ),
     sqlBuilder,

src/packages/pongo/src/core/database/pongoDatabaseSchemaComponent.ts

@@ -14,14 +14,17 @@ import {
 } from '../schema';
 import type { PongoDocument } from '../typing';
 
+export type PongoDatabaseURNType = 'sc:dumbo:database';
+export type PongoDatabaseURN = `${PongoDatabaseURNType}:${string}`;
+
 export type PongoDatabaseSchemaComponent<
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   DriverType extends DatabaseDriverType = DatabaseDriverType,
   T extends Record<string, PongoCollectionSchema> = Record<
     string,
     PongoCollectionSchema
   >,
-> = SchemaComponent<'pongo:schema-component:database'> & {
+> = SchemaComponent<PongoDatabaseURN> & {
   definition: PongoDbSchema<T>;
   collections: ReadonlyArray<PongoCollectionSchemaComponent>;
 
@@ -54,7 +57,7 @@ export const PongoDatabaseSchemaComponent = <
     Object.values(definition.collections).map(collectionFactory) ?? [];
 
   return {
-    ...schemaComponent('pongo:schema-component:database', {
+    ...schemaComponent(`sc:dumbo:database:${definition.name}`, {
       components: collections,
     }),
     definition,