refactor: angular

api/graphql/package.json

@@ -9,8 +9,8 @@
     "barrels": "barrelsby --config .barrelsby.json",
     "start": "pnpm run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only -r tsconfig-paths/register src/index.ts",
     "start:prod": "cross-env NODE_ENV=production node dist/index.js",
-    "format": "eslint --ext .ts --fix .",
-    "lint": "eslint --ext .ts",
+    "format": "eslint --ext .ts --fix src",
+    "lint": "eslint --ext .ts src",
     "test": "pnpm run test:coverage",
     "test:unit": "cross-env NODE_ENV=test jest",
     "test:coverage": "pnpm run test:unit"

api/graphql/src/Server.integration.spec.ts

@@ -1,7 +1,7 @@
 import { PlatformTest } from '@tsed/common';
+import { TestMongooseContext } from '@tsed/testing-mongoose';
 import SuperTest from 'supertest';
 import { Server } from './Server';
-import { TestMongooseContext } from '@tsed/testing-mongoose';
 
 describe('Server', () => {
   let request: SuperTest.SuperTest<SuperTest.Test>;

api/graphql/src/Server.ts

@@ -1,15 +1,15 @@
-import { join } from 'path';
-import { Configuration, Inject } from '@tsed/di';
+import '@tsed/ajv';
 import { PlatformApplication } from '@tsed/common';
+import { Configuration, Inject } from '@tsed/di';
+import '@tsed/mongoose';
 import '@tsed/platform-express'; // /!\ keep this import
-import '@tsed/ajv';
 import '@tsed/swagger';
-import '@tsed/mongoose';
 import '@tsed/typegraphql';
-import './resolvers/index';
+import { join } from 'path';
 import { config } from './config/index';
-import * as rest from './controllers/rest/index';
 import * as pages from './controllers/pages/index';
+import * as rest from './controllers/rest/index';
+import './resolvers/index';
 
 @Configuration({
   ...config,

api/graphql/src/controllers/pages/IndexController.ts

@@ -1,8 +1,8 @@
 import { Constant, Controller } from '@tsed/di';
 import { HeaderParams } from '@tsed/platform-params';
 import { View } from '@tsed/platform-views';
+import { Get, Hidden, Returns } from '@tsed/schema';
 import { SwaggerSettings } from '@tsed/swagger';
-import { Hidden, Get, Returns } from '@tsed/schema';
 
 @Hidden()
 @Controller('/')

api/graphql/src/controllers/rest/HelloWorldController.integration.spec.ts

@@ -1,7 +1,7 @@
+import { TestMongooseContext } from '@tsed/testing-mongoose';
 import SuperTest from 'supertest';
-import { HelloWorldController } from './HelloWorldController';
 import { Server } from '../../Server';
-import { TestMongooseContext } from '@tsed/testing-mongoose';
+import { HelloWorldController } from './HelloWorldController';
 
 describe('HelloWorldController', () => {
   let request: SuperTest.SuperTest<SuperTest.Test>;

api/graphql/src/models/Comment.ts

@@ -1,5 +1,5 @@
-import { Required } from '@tsed/schema';
 import { Model, ObjectID, Ref } from '@tsed/mongoose';
+import { Required } from '@tsed/schema';
 import { Field, ID, InputType, ObjectType } from 'type-graphql';
 import { Trip } from './Trip';
 

api/graphql/src/models/Trip.ts

@@ -1,5 +1,5 @@
-import { CollectionOf, Property, Required } from '@tsed/schema';
 import { Model, ObjectID, Ref } from '@tsed/mongoose';
+import { CollectionOf, Property, Required } from '@tsed/schema';
 import { Field, ID, InputType, ObjectType } from 'type-graphql';
 import { Comment } from './Comment';
 

api/graphql/src/resolvers/Comment.spec.ts

@@ -1,9 +1,9 @@
+import { TestMongooseContext } from '@tsed/testing-mongoose';
+import { TypeGraphQLService } from '@tsed/typegraphql';
 import { ApolloServerTestClient, createTestClient } from 'apollo-server-testing';
 import gql from 'graphql-tag';
 import { Server } from '../Server';
 import { CommentService } from '../services/Comment';
-import { TestMongooseContext } from '@tsed/testing-mongoose';
-import { TypeGraphQLService } from '@tsed/typegraphql';
 
 const GET_TRIP_COMMENTS = gql`
   query TripComments($id: String!) {

api/graphql/src/resolvers/Comment.ts

@@ -1,7 +1,7 @@
 import { Inject } from '@tsed/di';
 import { ResolverController } from '@tsed/typegraphql';
-import { Comment } from '../models/Comment';
 import { Arg, Query } from 'type-graphql';
+import { Comment } from '../models/Comment';
 import { CommentService } from '../services/Comment';
 
 @ResolverController()

api/graphql/src/resolvers/Trip.spec.ts

@@ -1,12 +1,12 @@
+import { TestMongooseContext } from '@tsed/testing-mongoose';
+import { TypeGraphQLService } from '@tsed/typegraphql';
 import { ApolloServerTestClient, createTestClient } from 'apollo-server-testing';
 import gql from 'graphql-tag';
 import { Server } from '../Server';
-import { TripService } from '../services/Trip';
-import { TestMongooseContext } from '@tsed/testing-mongoose';
-import { TypeGraphQLService } from '@tsed/typegraphql';
-import { Trip } from '../models/Trip';
 import { TripNotFoundError } from '../errors/TripNotFoundError';
 import { Comment } from '../models/Comment';
+import { Trip } from '../models/Trip';
+import { TripService } from '../services/Trip';
 
 const GET_TRIP = gql`
   query Trip($id: String!) {

api/graphql/src/resolvers/Trip.ts

@@ -1,10 +1,10 @@
 import { Inject } from '@tsed/di';
 import { ResolverController } from '@tsed/typegraphql';
+import { Arg, Mutation, Query } from 'type-graphql';
+import { TripNotFoundError } from '../errors/TripNotFoundError';
+import { AddCommentInput, Comment } from '../models/Comment';
 import { AddTripInput, Trip } from '../models/Trip';
-import { Arg, Query, Mutation } from 'type-graphql';
 import { TripService } from '../services/Trip';
-import { TripNotFoundError } from '../errors/TripNotFoundError';
-import { Comment, AddCommentInput } from '../models/Comment';
 
 @ResolverController()
 export class TripResolver {

api/graphql/src/services/Comment.spec.ts

@@ -1,8 +1,8 @@
 import { PlatformTest } from '@tsed/common';
-import { CommentService } from './Comment';
-import { TestMongooseContext } from '@tsed/testing-mongoose';
 import { MongooseModel } from '@tsed/mongoose';
+import { TestMongooseContext } from '@tsed/testing-mongoose';
 import { Comment } from '../models/Comment';
+import { CommentService } from './Comment';
 
 describe('CommentService', () => {
   beforeEach(TestMongooseContext.create);

api/graphql/src/services/Comment.ts

@@ -1,7 +1,7 @@
 import { Inject, Service } from '@tsed/common';
+import { Injectable } from '@tsed/di';
 import { MongooseModel } from '@tsed/mongoose';
 import { Comment } from '../models/Comment';
-import { Injectable } from '@tsed/di';
 
 @Injectable()
 @Service()

api/graphql/src/services/Trip.spec.ts

@@ -1,9 +1,9 @@
 import { PlatformTest } from '@tsed/common';
-import { TripService } from './Trip';
-import { TestMongooseContext } from '@tsed/testing-mongoose';
 import { MongooseModel } from '@tsed/mongoose';
+import { TestMongooseContext } from '@tsed/testing-mongoose';
 import { Comment } from '../models/Comment';
 import { Trip } from '../models/Trip';
+import { TripService } from './Trip';
 
 describe('TripService', () => {
   beforeEach(TestMongooseContext.create);

api/graphql/src/services/Trip.ts

@@ -1,7 +1,7 @@
 import { Inject, Service } from '@tsed/common';
 import { MongooseModel } from '@tsed/mongoose';
+import { AddCommentInput, Comment } from '../models/Comment';
 import { AddTripInput, Trip } from '../models/Trip';
-import { Comment, AddCommentInput } from '../models/Comment';
 
 @Service()
 export class TripService {

package.json

@@ -8,6 +8,7 @@
     "build": "pnpm --stream -r run build",
     "clean": "rm -rf .parcel-cache && pnpm -r run clean",
     "lint": "pnpm --stream -r run lint",
+    "format": "pnpm --stream -r run format",
     "test": "pnpm --stream -r run test"
   }
 }

packages/eslint-config/index.js

@@ -1,3 +1,5 @@
+const prettier = require('./prettier');
+
 module.exports = {
   parser: '@typescript-eslint/parser',
   extends: [
@@ -6,22 +8,12 @@ module.exports = {
     'plugin:import/typescript',
     'plugin:prettier/recommended' // must be last
   ],
-  plugins: ['prettier'],
   parserOptions: {
     ecmaVersion: 'latest',
     sourceType: 'module'
   },
   rules: {
-    'prettier/prettier': [
-      'error',
-      {
-        tabWidth: 2,
-        semi: true,
-        singleQuote: true,
-        trailingComma: 'none',
-        printWidth: 120
-      }
-    ],
+    ...prettier,
     'import/no-named-as-default': 'off'
   },
   settings: {

packages/eslint-config/package.json

@@ -8,10 +8,13 @@
   },
   "peerDependencies": {
     "eslint": "^8.48.0",
-    "prettier": "^3.0.3",
     "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.6.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-prettier": "^5.0.0"
+    "eslint-plugin-prettier": "^5.0.0",
+    "prettier": "^3.0.3"
+  },
+  "devDependencies": {
+    "prettier-plugin-organize-imports": "^3.2.3"
   }
 }

packages/eslint-config/prettier.js

@@ -0,0 +1,38 @@
+module.exports = {
+  'prettier/prettier': [
+    'error',
+    {
+      tabWidth: 2,
+      semi: true,
+      singleQuote: true,
+      trailingComma: 'none',
+      printWidth: 120,
+      htmlWhitespaceSensitivity: 'ignore',
+      jsxBracketSameLine: true,
+      plugins: ['prettier-plugin-organize-imports'],
+      overrides: [
+        {
+          files: '*.html',
+          options: {
+            parser: 'html',
+            htmlWhitespaceSensitivity: 'ignore',
+            singleQuote: false
+          }
+        },
+        {
+          files: '*.component.html',
+          options: {
+            parser: 'angular',
+            htmlWhitespaceSensitivity: 'ignore',
+          }
+        },
+        {
+          files: ['*.scss'],
+          options: {
+            singleQuote: false
+          }
+        }
+      ]
+    }
+  ]
+}