Merge pull request #1023 from joshunrau/v1.6.2

Author: joshunrau

apps/api/src/auth/auth.service.ts

@@ -44,7 +44,7 @@ export class AuthService {
 
   /** Wraps UserService.getByUsername with appropriate exception handling */
   private async getUser(username: string) {
-    let user: { groups: GroupModel[] } & UserModel;
+    let user: UserModel & { groups: GroupModel[] };
     try {
       user = await this.usersService.findByUsername(username);
       // user = await this.usersService.findByUsername(username).then((doc) => doc.toObject({ virtuals: true }));

apps/api/src/auth/strategies/jwt.strategy.ts

@@ -35,7 +35,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
 
   /** Returns the user associated with the JWT if they exist, otherwise throws UnauthorizedException */
   private async getUser(username: string) {
-    let user: { groups: GroupModel[] } & UserModel;
+    let user: UserModel & { groups: GroupModel[] };
     try {
       user = await this.usersService.findByUsername(username);
     } catch (error) {

apps/api/src/demo/demo.service.ts

@@ -74,7 +74,7 @@ export class DemoService {
       await this.instrumentsService.create({ bundle: happinessQuestionnaireWithConsent });
       this.logger.debug('Done creating series instruments');
 
-      const groups: ({ dummyIdPrefix?: string } & Group)[] = [];
+      const groups: (Group & { dummyIdPrefix?: string })[] = [];
       for (const group of DEMO_GROUPS) {
         const { dummyIdPrefix, ...createGroupData } = group;
         const groupModel = await this.groupsService.create(createGroupData);

apps/api/src/instruments/instruments.service.ts

@@ -145,7 +145,7 @@ export class InstrumentsService {
   async findById(
     id: string,
     { ability }: EntityOperationOptions = {}
-  ): Promise<{ bundle: string; id: string } & AnyInstrument> {
+  ): Promise<AnyInstrument & { bundle: string; id: string }> {
     const instrument = await this.instrumentModel.findFirst({
       where: { AND: [accessibleQuery(ability, 'read', 'Instrument')], id }
     });

apps/api/src/prisma/prisma.types.ts

@@ -5,7 +5,7 @@ import type { ExtendedPrismaClient } from './prisma.factory';
 
 export type ModelReferenceName = Uncapitalize<Prisma.ModelName>;
 
-export type ModelName<T extends ModelEntityName> = `${T}Model` & Prisma.ModelName;
+export type ModelName<T extends ModelEntityName> = Prisma.ModelName & `${T}Model`;
 
 export type ModelEntityName = Replace<Prisma.ModelName, 'Model', ''>;
 

apps/playground/src/components/Editor/EditorPane.tsx

@@ -34,7 +34,7 @@ export const EditorPane = React.forwardRef<EditorPaneRef, EditorPaneProps>(funct
   const editorRef = useRef<MonacoEditorType | null>(null);
   const monacoRef = useRef<MonacoType | null>(null);
 
-  const [defaultFile, setDefaultFile] = useState<({ id: string } & EditorFile) | null>(null);
+  const [defaultFile, setDefaultFile] = useState<(EditorFile & { id: string }) | null>(null);
   const filesRef = useFilesRef();
 
   useImperativeHandle(

apps/playground/src/components/Header/UploadButton/UploadButton.tsx

@@ -20,7 +20,7 @@ export const UploadButton = () => {
   const instruments = useAppStore((store) => store.instruments);
 
   const handleSubmit = async (files: File[]) => {
-    const zip = new JSZip() as { comment?: unknown } & JSZip;
+    const zip = new JSZip() as JSZip & { comment?: unknown };
     await zip.loadAsync(files[0]!);
     let label: string;
     try {

apps/playground/src/instruments/examples/interactive/Interactive-With-Vanilla/index.ts

@@ -78,6 +78,7 @@ export default defineInstrument({
                 dy = -dy;
                 b.status = 0;
                 score++;
+                // eslint-disable-next-line max-depth
                 if (score === brickRowCount * brickColumnCount) {
                   done({
                     livesRemaining: lives,

apps/playground/src/utils/encode.ts

@@ -4,7 +4,7 @@ import { z } from 'zod';
 import { $EditorFile, type EditorFile } from '@/models/editor-file.model';
 import type { InstrumentRepository } from '@/models/instrument-repository.model';
 
-type ShareURL = { size: number } & URL;
+type ShareURL = URL & { size: number };
 
 const $EditorFiles = z.array($EditorFile);
 

apps/playground/src/vim/adapter.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 /* eslint-disable no-fallthrough */
 
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */