@nymphjs/tilmeld-setup 1.0.0-beta.7 → 1.0.0-beta.8

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.8](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.7...v1.0.0-beta.8) (2023-01-09)
+
+### Features
+
+- make entities in nymph client instance specific too ([1029f06](https://github.com/sciactive/nymphjs/commit/1029f061a1ad193e4a8a2dab0186b9a4b517f646))
+
 # [1.0.0-beta.7](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2023-01-05)
 
 **Note:** Version bump only for package @nymphjs/tilmeld-setup

package/app/src/App.svelte

@@ -135,8 +135,11 @@
 
 <script lang="ts">
   import { onMount, SvelteComponent } from 'svelte';
-  import type { ClientConfig, CurrentUserData } from '@nymphjs/tilmeld-client';
-  import { User } from '@nymphjs/tilmeld-client';
+  import type {
+    User as UserClass,
+    ClientConfig,
+    CurrentUserData,
+  } from '@nymphjs/tilmeld-client';
   import { Login, Account } from '@nymphjs/tilmeld-components';
   import { mdiGithub, mdiMastodon, mdiTwitter } from '@mdi/js';
   import TopAppBar, { Row, Section, Title } from '@smui/top-app-bar';
@@ -146,6 +149,7 @@
   import Menu from '@smui/menu';
   import { Icon, Svg } from '@smui/common';
 
+  import { User } from './nymph';
   import Intro from './Intro.svelte';
   import Users from './Users.svelte';
   import Groups from './Groups.svelte';
@@ -159,7 +163,7 @@
   let accountMenu: any;
   let active: typeof SvelteComponentDev = Intro;
   let clientConfig: ClientConfig;
-  let user: (User & CurrentUserData) | undefined = undefined;
+  let user: (UserClass & CurrentUserData) | undefined = undefined;
   let userAvatar: string = DEFAULT_AVATAR;
   let tilmeldAdmin: boolean | undefined = undefined;
   let accountOpen = false;
@@ -207,7 +211,7 @@
     },
   ];
 
-  const onLogin = (currentUser: User & CurrentUserData) => {
+  const onLogin = (currentUser: UserClass & CurrentUserData) => {
     user = currentUser;
   };
   const onLogout = () => {

package/app/src/GroupEdit.svelte

@@ -332,7 +332,10 @@
     ClientConfig,
     CurrentUserData,
   } from '@nymphjs/tilmeld-client';
-  import { Group, User } from '@nymphjs/tilmeld-client';
+  import type {
+    Group as GroupClass,
+    User as UserClass,
+  } from '@nymphjs/tilmeld-client';
   import queryParser from '@nymphjs/query-parser';
   import {
     mdiArrowLeft,
@@ -356,14 +359,14 @@
   import Button from '@smui/button';
   import { Icon, Label, Svg } from '@smui/common';
 
-  import nymph from '../nymph';
+  import { nymph, Group, User } from './nymph';
 
   const dispatch = createEventDispatcher();
 
-  export let entity: Group & AdminGroupData;
+  export let entity: GroupClass & AdminGroupData;
 
   let clientConfig: ClientConfig | undefined = undefined;
-  let user: (User & CurrentUserData) | undefined = undefined;
+  let user: (UserClass & CurrentUserData) | undefined = undefined;
   let activeTab: 'General' | 'Parent' | 'Abilities' = 'General';
   let parentSearch = '';
   let ability = '';
@@ -424,7 +427,7 @@
   }
 
   let parentsSearching = false;
-  let parents: (Group & AdminGroupData)[] | undefined = undefined;
+  let parents: (GroupClass & AdminGroupData)[] | undefined = undefined;
   async function searchParents() {
     parentsSearching = true;
     failureMessage = undefined;

package/app/src/Groups.svelte

@@ -96,7 +96,10 @@
     ClientConfig,
     CurrentUserData,
   } from '@nymphjs/tilmeld-client';
-  import { Group, User } from '@nymphjs/tilmeld-client';
+  import type {
+    Group as GroupClass,
+    User as UserClass,
+  } from '@nymphjs/tilmeld-client';
   import { mdiMagnify, mdiArrowRight, mdiPlus } from '@mdi/js';
   import CircularProgress from '@smui/circular-progress';
   import Paper from '@smui/paper';
@@ -105,16 +108,15 @@
   import Fab from '@smui/fab';
   import { Icon, Svg } from '@smui/common';
 
-  import nymph from '../nymph';
-
+  import { nymph, Group, User } from './nymph';
   import GroupEdit from './GroupEdit.svelte';
 
   let clientConfig: ClientConfig | undefined = undefined;
-  let user: (User & CurrentUserData) | undefined = undefined;
+  let user: (UserClass & CurrentUserData) | undefined = undefined;
   let entitySearch = '';
   let failureMessage: string | undefined = undefined;
 
-  let entity: (Group & AdminGroupData) | undefined = undefined;
+  let entity: (GroupClass & AdminGroupData) | undefined = undefined;
 
   onMount(async () => {
     user = (await User.current()) ?? undefined;
@@ -124,7 +126,7 @@
   });
 
   let entitiesSearching = false;
-  let entities: (Group & AdminGroupData)[] | undefined = undefined;
+  let entities: (GroupClass & AdminGroupData)[] | undefined = undefined;
   async function searchEntities() {
     entitiesSearching = true;
     failureMessage = undefined;

package/app/src/UserEdit.svelte

@@ -568,7 +568,10 @@
     ClientConfig,
     CurrentUserData,
   } from '@nymphjs/tilmeld-client';
-  import { Group, User } from '@nymphjs/tilmeld-client';
+  import type {
+    Group as GroupClass,
+    User as UserClass,
+  } from '@nymphjs/tilmeld-client';
   import queryParser from '@nymphjs/query-parser';
   import {
     mdiArrowLeft,
@@ -592,12 +595,14 @@
   import Button from '@smui/button';
   import { Icon, Label, Svg } from '@smui/common';
 
+  import { User, Group } from './nymph';
+
   const dispatch = createEventDispatcher();
 
-  export let entity: User & AdminUserData;
+  export let entity: UserClass & AdminUserData;
 
   let clientConfig: ClientConfig | undefined = undefined;
-  let user: (User & CurrentUserData) | undefined = undefined;
+  let user: (UserClass & CurrentUserData) | undefined = undefined;
   let sysAdmin = false;
   let activeTab: 'General' | 'Groups' | 'Abilities' | 'Security' = 'General';
   let primaryGroupSearch = '';
@@ -690,7 +695,7 @@
   }
 
   let primaryGroupsSearching = false;
-  let primaryGroups: (Group & AdminGroupData)[] | undefined = undefined;
+  let primaryGroups: (GroupClass & AdminGroupData)[] | undefined = undefined;
   async function searchPrimaryGroups() {
     primaryGroupsSearching = true;
     failureMessage = undefined;
@@ -729,7 +734,7 @@
   }
 
   let secondaryGroupsSearching = false;
-  let secondaryGroups: (Group & AdminGroupData)[] | undefined = undefined;
+  let secondaryGroups: (GroupClass & AdminGroupData)[] | undefined = undefined;
   async function searchSecondaryGroups() {
     secondaryGroupsSearching = true;
     failureMessage = undefined;

package/app/src/Users.svelte

@@ -96,7 +96,10 @@
     ClientConfig,
     CurrentUserData,
   } from '@nymphjs/tilmeld-client';
-  import { Group, User } from '@nymphjs/tilmeld-client';
+  import type {
+    Group as GroupClass,
+    User as UserClass,
+  } from '@nymphjs/tilmeld-client';
   import { mdiMagnify, mdiArrowRight, mdiPlus } from '@mdi/js';
   import CircularProgress from '@smui/circular-progress';
   import Paper from '@smui/paper';
@@ -105,16 +108,15 @@
   import Fab from '@smui/fab';
   import { Icon, Svg } from '@smui/common';
 
-  import nymph from '../nymph';
-
+  import { nymph, User, Group } from './nymph';
   import UserEdit from './UserEdit.svelte';
 
   let clientConfig: ClientConfig | undefined = undefined;
-  let user: (User & CurrentUserData) | undefined = undefined;
+  let user: (UserClass & CurrentUserData) | undefined = undefined;
   let entitySearch = '';
   let failureMessage: string | undefined = undefined;
 
-  let entity: (User & AdminUserData) | undefined = undefined;
+  let entity: (UserClass & AdminUserData) | undefined = undefined;
 
   onMount(async () => {
     user = (await User.current()) ?? undefined;
@@ -124,7 +126,7 @@
   });
 
   let entitiesSearching = false;
-  let entities: (User & AdminUserData)[] | undefined = undefined;
+  let entities: (UserClass & AdminUserData)[] | undefined = undefined;
   async function searchEntities() {
     entitiesSearching = true;
     failureMessage = undefined;

package/app/{nymph.ts → src/nymph.ts}

@@ -1,17 +1,21 @@
 import type { NymphOptions } from '@nymphjs/client';
 import { Entity, Nymph } from '@nymphjs/client';
-import { User, Group } from '@nymphjs/tilmeld-client';
+import {
+  User as UserClass,
+  Group as GroupClass,
+} from '@nymphjs/tilmeld-client';
 
 const nymph = new Nymph(
   (window as unknown as { nymphOptions: NymphOptions }).nymphOptions
 );
-nymph.addEntityClass(User);
-nymph.addEntityClass(Group);
-
-export default nymph;
+const User = nymph.addEntityClass(UserClass);
+const Group = nymph.addEntityClass(GroupClass);
+User.init(nymph);
 
 // Helps with admin and debugging.
 (window as any).Entity = Entity;
 (window as any).User = User;
 (window as any).Group = Group;
 (window as any).nymph = nymph;
+
+export { nymph, User, Group };