@wtfalch/foundry 0.15.0 → 0.16.1

package/dist/store/postgres.js

@@ -1,5 +1,5 @@
 import { and, asc, eq, sql } from 'drizzle-orm';
-import { APP_ENTRY_KEY, DEFAULT_MAIL_APPS, DEFAULT_NO_REPLY_LOCAL_PART, validateBuyerIdentity, validateDomain, validateHosting, validateMail, validateOwner, validateSite, } from '../org.js';
+import { APP_ENTRY_KEY, DEFAULT_MAIL_APPS, DEFAULT_NO_REPLY_LOCAL_PART, validateBuyerIdentity, validateDomain, validateHosting, validateMail, validateOwners, validateSite, } from '../org.js';
 import { lockedHostnames } from '../plan/locked-hostnames.js';
 import { validatePlatform } from '../platform.js';
 import { RequestedChangeError, classifyChange } from '../requested-changes.js';
@@ -99,7 +99,7 @@ function rowToOrg(row) {
         adoptedApp: row.adoptedAppForm
             ? { form: row.adoptedAppForm }
             : null,
-        owner: rowToOwner(row),
+        owners: row.owners ?? [],
         test: row.isTest,
     };
 }
@@ -142,9 +142,7 @@ function orgToRow(org) {
         vatRegistered: org.buyer.vatRegistered,
         bespokeAppRepo: org.bespokeAppRepo,
         adoptedAppForm: org.adoptedApp?.form ?? null,
-        ownerEmail: org.owner?.email ?? null,
-        ownerGivenName: org.owner?.givenName ?? null,
-        ownerFamilyName: org.owner?.familyName ?? null,
+        owners: org.owners,
         isTest: org.test,
     };
 }
@@ -173,17 +171,6 @@ function rowToBuyer(row) {
         vatRegistered: row.vatRegistered,
     };
 }
-/**
- * Reassembles `DeclaredOrg.owner` from the row's three separate nullable
- * columns -- present only when all three are, same "all parts or none"
- * pattern {@link rowToBuyer} uses for the buyer's address.
- */
-function rowToOwner(row) {
-    const { ownerEmail, ownerGivenName, ownerFamilyName } = row;
-    if (ownerEmail === null || ownerGivenName === null || ownerFamilyName === null)
-        return null;
-    return { email: ownerEmail, givenName: ownerGivenName, familyName: ownerFamilyName };
-}
 /**
  * `DeclaredOrgStore` (`../store.ts`) on Postgres, for #18: create, read and
  * edit a {@link DeclaredOrg}, and read and write the {@link AppliedState}
@@ -272,7 +259,7 @@ export function createPostgresDeclaredOrgStore(db) {
     // Same place `requireValidHosting` checks hosting, on both `create` and
     // the merged result of `update`.
     function requireValidOwner(org) {
-        const reason = validateOwner(org.owner);
+        const reason = validateOwners(org.owners);
         if (reason)
             throw new DeclaredOrgError(`owner invalid: ${reason}`);
     }

package/dist/store/schema.d.ts

@@ -1,4 +1,4 @@
-import type { AppEnvSource, HostingEntry, IssuerApp } from '../org.js';
+import type { AppEnvSource, HostingEntry, IssuerApp, OwnerIdentity } from '../org.js';
 import type { Plan } from '../plan.js';
 import type { Checkpoint } from '../state.js';
 /**
@@ -754,57 +754,25 @@ export declare const declaredOrgs: import("drizzle-orm/pg-core").PgTableWithColu
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        ownerEmail: import("drizzle-orm/pg-core").PgColumn<{
-            name: "owner_email";
+        owners: import("drizzle-orm/pg-core").PgColumn<{
+            name: "owners";
             tableName: "foundry_declared_orgs";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: false;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        ownerGivenName: import("drizzle-orm/pg-core").PgColumn<{
-            name: "owner_given_name";
-            tableName: "foundry_declared_orgs";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: false;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        ownerFamilyName: import("drizzle-orm/pg-core").PgColumn<{
-            name: "owner_family_name";
-            tableName: "foundry_declared_orgs";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: false;
-            hasDefault: false;
+            dataType: "json";
+            columnType: "PgJsonb";
+            data: OwnerIdentity[];
+            driverParam: unknown;
+            notNull: true;
+            hasDefault: true;
             isPrimaryKey: false;
             isAutoincrement: false;
             hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
+            enumValues: undefined;
             baseColumn: never;
             identity: undefined;
             generated: undefined;
-        }, {}, {}>;
+        }, {}, {
+            $type: OwnerIdentity[];
+        }>;
         isTest: import("drizzle-orm/pg-core").PgColumn<{
             name: "is_test";
             tableName: "foundry_declared_orgs";

package/dist/store/schema.js

@@ -27,7 +27,7 @@ export const declaredOrgs = pgTable('foundry_declared_orgs', {
     // MailConfig.roleMailboxes (org.ts, #230). Local parts of the role mailboxes
     // pre-created on the org's mail domain; empty by default.
     roleMailboxes: jsonb('role_mailboxes').notNull().default([]).$type(),
-    chatEnabled: boolean('chat_enabled').notNull().default(false),
+    chatEnabled: boolean('chat_enabled').notNull().default(true),
     chatUsesDomain: boolean('chat_uses_domain').notNull().default(false),
     callsEnabled: boolean('calls_enabled').notNull().default(false),
     callsUsesDomain: boolean('calls_uses_domain').notNull().default(false),
@@ -78,13 +78,10 @@ export const declaredOrgs = pgTable('foundry_declared_orgs', {
     vatRegistered: boolean('vat_registered'),
     bespokeAppRepo: text('bespoke_app_repo'),
     adoptedAppForm: text('adopted_app_form'),
-    // OwnerIdentity (org.ts): the org's owner, invited by ZITADEL email. All
-    // three nullable -- a brand new org has none of them, reassembled as one
-    // object only once all three are non-null (same shape as BuyerIdentity's
-    // own contact fields above).
-    ownerEmail: text('owner_email'),
-    ownerGivenName: text('owner_given_name'),
-    ownerFamilyName: text('owner_family_name'),
+    // OwnerIdentity[] (org.ts): the org's current owners, in order (the first
+    // is the primary). jsonb, like `hosting_entries`: an ordered list read and
+    // written whole with the org, never queried by owner.
+    owners: jsonb('owners').notNull().default([]).$type(),
     // `test: boolean` (org.ts): only a test org can be destroyed. A brand new
     // org defaults to real (false).
     isTest: boolean('is_test').notNull().default(false),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wtfalch/foundry",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "description": "Foundry's SDK: the declared org's types, the plan and apply contracts, and the state store's interface.",
   "repository": {
     "type": "git",