@geexcode/geex-angular 0.0.27 → 0.0.29

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { WritableSignal, Signal, Injector, InjectionToken, Provider } from '@angular/core';
+import { WritableSignal, Signal, Injector, Provider, InjectionToken } from '@angular/core';
 
 interface Tenant {
     /** Unique identifier */
@@ -89,7 +89,7 @@ interface MessagingModule extends GeexModule {
     /**
      * Subscribe to server broadcast events.
      */
-    onPublicNotify(): void;
+    onPublicNotify(notify: any): void;
 }
 interface SettingsModule extends GeexModule {
     settings: WritableSignal<SettingItem[]>;
@@ -102,8 +102,12 @@ interface UiModule extends GeexModule {
     /** Currently active routed component (framework dependent) */
     activeRoutedComponent?: any;
 }
-type GeexModules<TExtensionModules extends Record<string, GeexModule> = {}> = {
-    init: () => Promise<any>;
+declare const ExtensionModule: Record<string, any> & {};
+type ExtensionModule = typeof ExtensionModule;
+type GeexModules<TExtensionModules extends ExtensionModule = ExtensionModule> = {
+    init(): Promise<{
+        [K in keyof GeexModules<TExtensionModules>]: any;
+    }>;
     tenant: TenantModule;
     auth: AuthModule;
     identity: IdentityModule;
@@ -111,13 +115,13 @@ type GeexModules<TExtensionModules extends Record<string, GeexModule> = {}> = {
     settings: SettingsModule;
     ui: UiModule;
 } & TExtensionModules;
-type GeexModule<TExtension = any> = {
+type GeexModule<TExtension = ExtensionModule> = {
     /**
      * A module combines both reactive state (signals) and business logic methods.
      * Concrete modules can extend this interface to expose their own signals & methods.
      * This empty base exists mainly for typing convenience and future extension.
      */
-    init?: () => Promise<any>;
+    init: () => Promise<any>;
 } & TExtension;
 declare function createTenantModule(injector: Injector): TenantModule;
 declare function createAuthModule(injector: Injector): AuthModule;
@@ -126,24 +130,17 @@ declare function createMessagingModule(injector: Injector): MessagingModule;
 declare function createSettingsModule(injector: Injector): SettingsModule;
 declare function createUiModule(injector: Injector): UiModule;
 
-type GeexOverrides<TExtensionModules extends Record<string, GeexModule> = {}> = Partial<GeexModules<TExtensionModules>>;
+declare function provideGeex<TExtensionModules extends Record<string, GeexModule> = {}>(overrides: GeexModules, extensions?: TExtensionModules): Provider[];
+
+type GeexOverrides<TExtensionModules extends Record<string, GeexModule> = {}> = Partial<Omit<GeexModules<TExtensionModules>, "init">>;
+type GeexExtensions<TExtensionModules extends Record<string, GeexModule> = {}> = Partial<TExtensionModules>;
 declare let geex: GeexModules;
-declare let Geex: InjectionToken<{
-    init: () => Promise<any>;
-    tenant: TenantModule;
-    auth: AuthModule;
-    identity: IdentityModule;
-    messaging: MessagingModule;
-    settings: SettingsModule;
-    ui: UiModule;
-}>;
+declare let Geex: InjectionToken<GeexModules>;
 /**
  * Initialize geex singleton with concrete dependencies
  * @param deps   Required runtime services
  * @param overrides  Custom module overrides – properties will be merged into generated modules
  */
-declare function configGeex<TExtensionModules extends Record<string, GeexModule> = {}>(injector: Injector, overrides?: GeexOverrides<TExtensionModules>): void;
-
-declare function provideGeex(overrides?: GeexOverrides): Provider[];
+declare function configGeex<TExtensionModules extends Record<string, GeexModule> = ExtensionModule>(injector: Injector, overrides?: GeexOverrides<TExtensionModules>): void;
 
-export { type AuthModule, Geex, type GeexModule, type GeexModules, type GeexOverrides, type IdentityModule, LoginProviderEnum, type MessagingModule, type Org, OrgTypeEnum, type SettingItem, type SettingsModule, type Tenant, type TenantModule, type UiModule, type User, type UserOrgMembership, configGeex, createAuthModule, createIdentityModule, createMessagingModule, createSettingsModule, createTenantModule, createUiModule, geex, provideGeex };
+export { type AuthModule, ExtensionModule, Geex, type GeexExtensions, type GeexModule, type GeexModules, type GeexOverrides, type IdentityModule, LoginProviderEnum, type MessagingModule, type Org, OrgTypeEnum, type SettingItem, type SettingsModule, type Tenant, type TenantModule, type UiModule, type User, type UserOrgMembership, configGeex, createAuthModule, createIdentityModule, createMessagingModule, createSettingsModule, createTenantModule, createUiModule, geex, provideGeex };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { WritableSignal, Signal, Injector, InjectionToken, Provider } from '@angular/core';
+import { WritableSignal, Signal, Injector, Provider, InjectionToken } from '@angular/core';
 
 interface Tenant {
     /** Unique identifier */
@@ -89,7 +89,7 @@ interface MessagingModule extends GeexModule {
     /**
      * Subscribe to server broadcast events.
      */
-    onPublicNotify(): void;
+    onPublicNotify(notify: any): void;
 }
 interface SettingsModule extends GeexModule {
     settings: WritableSignal<SettingItem[]>;
@@ -102,8 +102,12 @@ interface UiModule extends GeexModule {
     /** Currently active routed component (framework dependent) */
     activeRoutedComponent?: any;
 }
-type GeexModules<TExtensionModules extends Record<string, GeexModule> = {}> = {
-    init: () => Promise<any>;
+declare const ExtensionModule: Record<string, any> & {};
+type ExtensionModule = typeof ExtensionModule;
+type GeexModules<TExtensionModules extends ExtensionModule = ExtensionModule> = {
+    init(): Promise<{
+        [K in keyof GeexModules<TExtensionModules>]: any;
+    }>;
     tenant: TenantModule;
     auth: AuthModule;
     identity: IdentityModule;
@@ -111,13 +115,13 @@ type GeexModules<TExtensionModules extends Record<string, GeexModule> = {}> = {
     settings: SettingsModule;
     ui: UiModule;
 } & TExtensionModules;
-type GeexModule<TExtension = any> = {
+type GeexModule<TExtension = ExtensionModule> = {
     /**
      * A module combines both reactive state (signals) and business logic methods.
      * Concrete modules can extend this interface to expose their own signals & methods.
      * This empty base exists mainly for typing convenience and future extension.
      */
-    init?: () => Promise<any>;
+    init: () => Promise<any>;
 } & TExtension;
 declare function createTenantModule(injector: Injector): TenantModule;
 declare function createAuthModule(injector: Injector): AuthModule;
@@ -126,24 +130,17 @@ declare function createMessagingModule(injector: Injector): MessagingModule;
 declare function createSettingsModule(injector: Injector): SettingsModule;
 declare function createUiModule(injector: Injector): UiModule;
 
-type GeexOverrides<TExtensionModules extends Record<string, GeexModule> = {}> = Partial<GeexModules<TExtensionModules>>;
+declare function provideGeex<TExtensionModules extends Record<string, GeexModule> = {}>(overrides: GeexModules, extensions?: TExtensionModules): Provider[];
+
+type GeexOverrides<TExtensionModules extends Record<string, GeexModule> = {}> = Partial<Omit<GeexModules<TExtensionModules>, "init">>;
+type GeexExtensions<TExtensionModules extends Record<string, GeexModule> = {}> = Partial<TExtensionModules>;
 declare let geex: GeexModules;
-declare let Geex: InjectionToken<{
-    init: () => Promise<any>;
-    tenant: TenantModule;
-    auth: AuthModule;
-    identity: IdentityModule;
-    messaging: MessagingModule;
-    settings: SettingsModule;
-    ui: UiModule;
-}>;
+declare let Geex: InjectionToken<GeexModules>;
 /**
  * Initialize geex singleton with concrete dependencies
  * @param deps   Required runtime services
  * @param overrides  Custom module overrides – properties will be merged into generated modules
  */
-declare function configGeex<TExtensionModules extends Record<string, GeexModule> = {}>(injector: Injector, overrides?: GeexOverrides<TExtensionModules>): void;
-
-declare function provideGeex(overrides?: GeexOverrides): Provider[];
+declare function configGeex<TExtensionModules extends Record<string, GeexModule> = ExtensionModule>(injector: Injector, overrides?: GeexOverrides<TExtensionModules>): void;
 
-export { type AuthModule, Geex, type GeexModule, type GeexModules, type GeexOverrides, type IdentityModule, LoginProviderEnum, type MessagingModule, type Org, OrgTypeEnum, type SettingItem, type SettingsModule, type Tenant, type TenantModule, type UiModule, type User, type UserOrgMembership, configGeex, createAuthModule, createIdentityModule, createMessagingModule, createSettingsModule, createTenantModule, createUiModule, geex, provideGeex };
+export { type AuthModule, ExtensionModule, Geex, type GeexExtensions, type GeexModule, type GeexModules, type GeexOverrides, type IdentityModule, LoginProviderEnum, type MessagingModule, type Org, OrgTypeEnum, type SettingItem, type SettingsModule, type Tenant, type TenantModule, type UiModule, type User, type UserOrgMembership, configGeex, createAuthModule, createIdentityModule, createMessagingModule, createSettingsModule, createTenantModule, createUiModule, geex, provideGeex };

package/dist/index.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  ExtensionModule: () => ExtensionModule,
   Geex: () => Geex,
   LoginProviderEnum: () => LoginProviderEnum,
   OrgTypeEnum: () => OrgTypeEnum,
@@ -66,6 +67,7 @@ var LoginProviderEnum = {
 var OrgTypeEnum = {
   Default: "Default"
 };
+var ExtensionModule = {};
 var GQL_CHECK_TENANT = import_graphql_tag.default`mutation checkTenant($code: String!) { checkTenant(code: $code) { id code name isEnabled createdOn } }`;
 var GQL_FEDERATE_AUTH = import_graphql_tag.default`mutation federateAuthenticate(
   $code: String!
@@ -176,7 +178,7 @@ function createAuthModule(injector) {
     async loadUserData() {
       const oAuthService = injector.get(import_angular_oauth2_oidc.OAuthService);
       try {
-        await oAuthService.loadDiscoveryDocumentAndTryLogin();
+        await oAuthService.loadDiscoveryDocument();
         if (!oAuthService.hasValidAccessToken()) {
           return void 0;
         }
@@ -203,46 +205,56 @@ function createAuthModule(injector) {
 function createIdentityModule(injector) {
   const orgsSignal = (0, import_core.signal)([]);
   const userOwnedOrgsSignal = (0, import_core.signal)([]);
-  return {
+  const module2 = {
     orgs: orgsSignal,
     userOwnedOrgs: userOwnedOrgsSignal,
-    init() {
-      const orgs$ = injector.get(import_apollo_angular.Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe((0, import_rxjs.map)((res) => (0, import_util.deepCopy)(res.data.orgs.items)));
-      orgs$.subscribe((orgs) => {
-        (0, import_core.runInInjectionContext)(injector, () => {
-          orgsSignal.set(orgs);
-          const userData = geex.auth.user();
-          let allOwned = [];
-          if (orgs?.length && userData) {
-            if (userData.id === "000000000000000000000001") {
-              allOwned = (0, import_util.deepCopy)(orgs);
-            } else {
-              const ownedCodes = userData.orgs.map((x) => x.code);
-              allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
+    async init() {
+      try {
+        const orgs$ = injector.get(import_apollo_angular.Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe((0, import_rxjs.map)((res) => (0, import_util.deepCopy)(res.data.orgs.items)));
+        orgs$.subscribe((orgs) => {
+          (0, import_core.runInInjectionContext)(injector, () => {
+            orgsSignal.set(orgs);
+            const userData = geex.auth.user();
+            let allOwned = [];
+            if (orgs?.length && userData) {
+              if (userData.id === "000000000000000000000001") {
+                allOwned = (0, import_util.deepCopy)(orgs);
+              } else {
+                const ownedCodes = userData.orgs.map((x) => x.code);
+                allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
+              }
             }
-          }
-          userOwnedOrgsSignal.set(allOwned);
+            userOwnedOrgsSignal.set(allOwned);
+          });
         });
-      });
+      } catch (error) {
+        console.error(error);
+      }
     }
   };
+  return module2;
 }
 function createMessagingModule(injector) {
-  return {
-    init: async () => {
-      return;
+  const module2 = {
+    async init() {
+      try {
+        const subClient = injector.get(import_apollo_angular.Apollo).use("subscription");
+        subClient.subscribe({ query: GQL_ON_PUBLIC_NOTIFY }).pipe((0, import_rxjs.map)((res) => res?.data?.onPublicNotify)).subscribe((notify) => {
+          module2.onPublicNotify(notify);
+        });
+      } catch (err) {
+        console.error(err);
+      }
     },
-    onPublicNotify() {
-      const subClient = injector.get(import_apollo_angular.Apollo).use("subscription");
-      subClient.subscribe({ query: GQL_ON_PUBLIC_NOTIFY }).pipe((0, import_rxjs.map)((res) => res?.data?.onPublicNotify)).subscribe((notify) => {
-        console.log("Public notify", notify);
-      });
+    onPublicNotify(notify) {
+      console.log("Public notify", notify);
     }
   };
+  return module2;
 }
 function createSettingsModule(injector) {
   const settingsSignal = (0, import_core.signal)([]);
-  return {
+  const module2 = {
     settings: settingsSignal,
     async init() {
       const res = await (0, import_rxjs.firstValueFrom)(
@@ -252,6 +264,7 @@ function createSettingsModule(injector) {
       settingsSignal.set(settings);
     }
   };
+  return module2;
 }
 function createUiModule(injector) {
   const fullScreenSignal = (0, import_core.signal)(false);
@@ -259,55 +272,60 @@ function createUiModule(injector) {
     (0, import_operators.debounceTime)(200),
     (0, import_operators.switchMap)(async () => window.innerHeight / window.innerWidth >= 1.5)
   ));
-  return {
+  const module2 = {
     fullScreen: fullScreenSignal,
     isMobile,
-    activeRoutedComponent: void 0
+    activeRoutedComponent: void 0,
+    async init() {
+      return;
+    }
   };
+  return module2;
 }
 
 // src/geex.ts
 var geex;
 var Geex = new import_core2.InjectionToken("Geex");
-function configGeex(injector, overrides) {
+function configGeex(injector, overrides = {}) {
+  const modules = {
+    ...overrides
+  };
   (0, import_core2.runInInjectionContext)(injector, () => {
-    const modules = {
-      init: async () => {
-        const entries = Object.entries(modules).filter(([key]) => key !== "init");
-        await Promise.all(
-          entries.map(async ([, mod]) => {
-            const maybeInit = mod.init;
-            if (typeof maybeInit === "function") {
-              try {
-                await maybeInit();
-              } catch (err) {
-                console.error(err);
-              }
-            }
-          })
-        );
-      },
-      tenant: createTenantModule(injector),
-      auth: createAuthModule(injector),
-      identity: createIdentityModule(injector),
-      messaging: createMessagingModule(injector),
-      settings: createSettingsModule(injector),
-      ui: createUiModule(injector)
-    };
-    if (overrides) {
-      Object.assign(modules, overrides);
-    }
+    modules.init ?? (modules.init = async () => {
+      const entries = Object.entries(modules).filter(([key]) => key !== "init");
+      return Object.fromEntries(await Promise.all(
+        entries.map(async ([key, mod]) => {
+          const maybeInit = mod.init;
+          try {
+            return [key, await maybeInit()];
+          } catch (err) {
+            console.error(err);
+            return [key, null];
+          }
+        })
+      ));
+    });
+    modules.tenant ?? (modules.tenant = createTenantModule(injector));
+    modules.auth ?? (modules.auth = createAuthModule(injector));
+    modules.identity ?? (modules.identity = createIdentityModule(injector));
+    modules.messaging ?? (modules.messaging = createMessagingModule(injector));
+    modules.settings ?? (modules.settings = createSettingsModule(injector));
+    modules.ui ?? (modules.ui = createUiModule(injector));
     geex = modules;
   });
 }
 
 // src/provide-geex.ts
-function provideGeex(overrides) {
+function provideGeex(overrides, extensions = {}) {
   return [
     {
       provide: Geex,
       useFactory: (injector) => {
-        configGeex(injector, overrides);
+        const mergedModules = {
+          ...extensions,
+          ...overrides
+        };
+        configGeex(injector, mergedModules);
         return geex;
       },
       deps: [import_core3.Injector]
@@ -316,6 +334,7 @@ function provideGeex(overrides) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ExtensionModule,
   Geex,
   LoginProviderEnum,
   OrgTypeEnum,

package/dist/index.mjs

@@ -21,6 +21,7 @@ var LoginProviderEnum = {
 var OrgTypeEnum = {
   Default: "Default"
 };
+var ExtensionModule = {};
 var GQL_CHECK_TENANT = gql`mutation checkTenant($code: String!) { checkTenant(code: $code) { id code name isEnabled createdOn } }`;
 var GQL_FEDERATE_AUTH = gql`mutation federateAuthenticate(
   $code: String!
@@ -131,7 +132,7 @@ function createAuthModule(injector) {
     async loadUserData() {
       const oAuthService = injector.get(OAuthService);
       try {
-        await oAuthService.loadDiscoveryDocumentAndTryLogin();
+        await oAuthService.loadDiscoveryDocument();
         if (!oAuthService.hasValidAccessToken()) {
           return void 0;
         }
@@ -158,46 +159,56 @@ function createAuthModule(injector) {
 function createIdentityModule(injector) {
   const orgsSignal = signal([]);
   const userOwnedOrgsSignal = signal([]);
-  return {
+  const module = {
     orgs: orgsSignal,
     userOwnedOrgs: userOwnedOrgsSignal,
-    init() {
-      const orgs$ = injector.get(Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe(map((res) => deepCopy(res.data.orgs.items)));
-      orgs$.subscribe((orgs) => {
-        runInInjectionContext(injector, () => {
-          orgsSignal.set(orgs);
-          const userData = geex.auth.user();
-          let allOwned = [];
-          if (orgs?.length && userData) {
-            if (userData.id === "000000000000000000000001") {
-              allOwned = deepCopy(orgs);
-            } else {
-              const ownedCodes = userData.orgs.map((x) => x.code);
-              allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
+    async init() {
+      try {
+        const orgs$ = injector.get(Apollo).watchQuery({ query: GQL_ORGS_CACHE }).valueChanges.pipe(map((res) => deepCopy(res.data.orgs.items)));
+        orgs$.subscribe((orgs) => {
+          runInInjectionContext(injector, () => {
+            orgsSignal.set(orgs);
+            const userData = geex.auth.user();
+            let allOwned = [];
+            if (orgs?.length && userData) {
+              if (userData.id === "000000000000000000000001") {
+                allOwned = deepCopy(orgs);
+              } else {
+                const ownedCodes = userData.orgs.map((x) => x.code);
+                allOwned = orgs.filter((o) => ownedCodes.some((code) => o.code.startsWith(code)));
+              }
             }
-          }
-          userOwnedOrgsSignal.set(allOwned);
+            userOwnedOrgsSignal.set(allOwned);
+          });
         });
-      });
+      } catch (error) {
+        console.error(error);
+      }
     }
   };
+  return module;
 }
 function createMessagingModule(injector) {
-  return {
-    init: async () => {
-      return;
+  const module = {
+    async init() {
+      try {
+        const subClient = injector.get(Apollo).use("subscription");
+        subClient.subscribe({ query: GQL_ON_PUBLIC_NOTIFY }).pipe(map((res) => res?.data?.onPublicNotify)).subscribe((notify) => {
+          module.onPublicNotify(notify);
+        });
+      } catch (err) {
+        console.error(err);
+      }
     },
-    onPublicNotify() {
-      const subClient = injector.get(Apollo).use("subscription");
-      subClient.subscribe({ query: GQL_ON_PUBLIC_NOTIFY }).pipe(map((res) => res?.data?.onPublicNotify)).subscribe((notify) => {
-        console.log("Public notify", notify);
-      });
+    onPublicNotify(notify) {
+      console.log("Public notify", notify);
     }
   };
+  return module;
 }
 function createSettingsModule(injector) {
   const settingsSignal = signal([]);
-  return {
+  const module = {
     settings: settingsSignal,
     async init() {
       const res = await firstValueFrom(
@@ -207,6 +218,7 @@ function createSettingsModule(injector) {
       settingsSignal.set(settings);
     }
   };
+  return module;
 }
 function createUiModule(injector) {
   const fullScreenSignal = signal(false);
@@ -214,55 +226,60 @@ function createUiModule(injector) {
     debounceTime(200),
     switchMap(async () => window.innerHeight / window.innerWidth >= 1.5)
   ));
-  return {
+  const module = {
     fullScreen: fullScreenSignal,
     isMobile,
-    activeRoutedComponent: void 0
+    activeRoutedComponent: void 0,
+    async init() {
+      return;
+    }
   };
+  return module;
 }
 
 // src/geex.ts
 var geex;
 var Geex = new InjectionToken("Geex");
-function configGeex(injector, overrides) {
+function configGeex(injector, overrides = {}) {
+  const modules = {
+    ...overrides
+  };
   runInInjectionContext2(injector, () => {
-    const modules = {
-      init: async () => {
-        const entries = Object.entries(modules).filter(([key]) => key !== "init");
-        await Promise.all(
-          entries.map(async ([, mod]) => {
-            const maybeInit = mod.init;
-            if (typeof maybeInit === "function") {
-              try {
-                await maybeInit();
-              } catch (err) {
-                console.error(err);
-              }
-            }
-          })
-        );
-      },
-      tenant: createTenantModule(injector),
-      auth: createAuthModule(injector),
-      identity: createIdentityModule(injector),
-      messaging: createMessagingModule(injector),
-      settings: createSettingsModule(injector),
-      ui: createUiModule(injector)
-    };
-    if (overrides) {
-      Object.assign(modules, overrides);
-    }
+    modules.init ?? (modules.init = async () => {
+      const entries = Object.entries(modules).filter(([key]) => key !== "init");
+      return Object.fromEntries(await Promise.all(
+        entries.map(async ([key, mod]) => {
+          const maybeInit = mod.init;
+          try {
+            return [key, await maybeInit()];
+          } catch (err) {
+            console.error(err);
+            return [key, null];
+          }
+        })
+      ));
+    });
+    modules.tenant ?? (modules.tenant = createTenantModule(injector));
+    modules.auth ?? (modules.auth = createAuthModule(injector));
+    modules.identity ?? (modules.identity = createIdentityModule(injector));
+    modules.messaging ?? (modules.messaging = createMessagingModule(injector));
+    modules.settings ?? (modules.settings = createSettingsModule(injector));
+    modules.ui ?? (modules.ui = createUiModule(injector));
     geex = modules;
   });
 }
 
 // src/provide-geex.ts
-function provideGeex(overrides) {
+function provideGeex(overrides, extensions = {}) {
   return [
     {
       provide: Geex,
       useFactory: (injector) => {
-        configGeex(injector, overrides);
+        const mergedModules = {
+          ...extensions,
+          ...overrides
+        };
+        configGeex(injector, mergedModules);
         return geex;
       },
       deps: [Injector3]
@@ -270,6 +287,7 @@ function provideGeex(overrides) {
   ];
 }
 export {
+  ExtensionModule,
   Geex,
   LoginProviderEnum,
   OrgTypeEnum,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geexcode/geex-angular",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Angular adapter for Geex core.",
   "module": "dist/index.js",
   "main": "dist/index.cjs",