Merge pull request #400 from jaredwray/fixing-object-curly-spacing-to…

…-xo-fix fixing object curly spacing to xo fix
jaredwray · Dec 6, 2024 · 936e51b · 936e51b
2 parents e1f1402 + d140e12
commit 936e51b
Show file tree

Hide file tree

Showing 23 changed files with 65 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -56,7 +56,6 @@
   "xo": {
     "rules": {
       "@typescript-eslint/naming-convention": 0,
-      "@typescript-eslint/object-curly-spacing": 0,
       "@typescript-eslint/parameter-properties": 0,
       "@typescript-eslint/no-unsafe-call": 0,
       "@typescript-eslint/no-unsafe-assignment": 0,

diff --git a/src/airhorn.ts b/src/airhorn.ts
@@ -1,7 +1,7 @@
-import { type AirhornTemplateProvider, AirhornTemplateService } from './template-service.js';
-import { ProviderService } from './provider-service.js';
-import { AirhornProviderType } from './provider-type.js';
-import { AirhornTemplateSync } from './template-sync.js';
+import {type AirhornTemplateProvider, AirhornTemplateService} from './template-service.js';
+import {ProviderService} from './provider-service.js';
+import {AirhornProviderType} from './provider-type.js';
+import {AirhornTemplateSync} from './template-sync.js';
 
 export type CreateAirhornOptions = {
 	TEMPLATE_PATH?: string;
@@ -29,7 +29,7 @@ export class Airhorn {
 
 	constructor(options?: AirhornOptions) {
 		if (options) {
-			this.options = { ...this.options, ...options };
+			this.options = {...this.options, ...options};
 
 			if (this.options.TEMPLATE_PROVIDER) {
 				this._templates = new AirhornTemplateService(this.options.TEMPLATE_PROVIDER);
@@ -107,8 +107,8 @@ export const syncTemplatesToAirhorn = async (templatePath: string, airhorn: Airh
 	await templateSync.sync();
 };
 
-export { AirhornProviderType } from './provider-type.js';
-export { type AirhornTemplateProvider } from './template-service.js';
-export { AirhornTemplateSync } from './template-sync.js';
-export { MemoryTemplateProvider } from './template-providers/memory.js';
-export { MongoTemplateProvider } from './template-providers/mongo.js';
+export {AirhornProviderType} from './provider-type.js';
+export {type AirhornTemplateProvider} from './template-service.js';
+export {AirhornTemplateSync} from './template-sync.js';
+export {MemoryTemplateProvider} from './template-providers/memory.js';
+export {MongoTemplateProvider} from './template-providers/mongo.js';
diff --git a/src/provider-service.ts b/src/provider-service.ts
@@ -1,12 +1,12 @@
-import { AirhornProviderType } from './provider-type.js';
-import { WebHook } from './providers/webhook.js';
-import { TwilioSMS } from './providers/twilio-sms.js';
-import { TwilioSendgrid } from './providers/twilio-sendgrid.js';
-import { AWSSES } from './providers/aws-ses.js';
-import { AWSSMS } from './providers/aws-sms.js';
-import { FirebaseMessaging } from './providers/firebase-messaging.js';
-import { AWSSNS } from './providers/aws-sns.js';
-import { type AirhornOptions } from './airhorn.js';
+import {AirhornProviderType} from './provider-type.js';
+import {WebHook} from './providers/webhook.js';
+import {TwilioSMS} from './providers/twilio-sms.js';
+import {TwilioSendgrid} from './providers/twilio-sendgrid.js';
+import {AWSSES} from './providers/aws-ses.js';
+import {AWSSMS} from './providers/aws-sms.js';
+import {FirebaseMessaging} from './providers/firebase-messaging.js';
+import {AWSSNS} from './providers/aws-sns.js';
+import {type AirhornOptions} from './airhorn.js';
 
 export type ProviderInterface = {
 	name: string;
@@ -20,7 +20,7 @@ export class ProviderService {
 
 	constructor(options?: any) {
 		if (options) {
-			this.options = { ...this.options, ...options };
+			this.options = {...this.options, ...options};
 		}
 
 		this.loadProviders();

diff --git a/src/providers/firebase-messaging.ts b/src/providers/firebase-messaging.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/no-negated-condition */
-import firebase, { type ServiceAccount} from 'firebase-admin';
+import firebase, {type ServiceAccount} from 'firebase-admin';
 import type {ProviderInterface} from '../provider-service.js';
 import {AirhornProviderType} from '../provider-type.js';
 

diff --git a/src/template-providers/memory.ts b/src/template-providers/memory.ts
@@ -1,5 +1,5 @@
-import { type AirhornTemplate } from '../template.js';
-import { type AirhornTemplateProvider } from '../template-service.js';
+import {type AirhornTemplate} from '../template.js';
+import {type AirhornTemplateProvider} from '../template-service.js';
 
 export class MemoryTemplateProvider implements AirhornTemplateProvider {
 	private _name = 'memory';

diff --git a/src/template-providers/mongo.ts b/src/template-providers/mongo.ts
@@ -1,8 +1,8 @@
 import {
 	MongoClient, type Db, type Collection, ObjectId, type Document,
 } from 'mongodb';
-import { AirhornTemplate } from '../template.js';
-import { type AirhornTemplateProvider } from '../template-service.js';
+import {AirhornTemplate} from '../template.js';
+import {type AirhornTemplateProvider} from '../template-service.js';
 
 export type MongoStoreProviderOptions = {
 	uri?: string;

diff --git a/src/template-service.ts b/src/template-service.ts
@@ -1,5 +1,5 @@
-import { MemoryTemplateProvider } from './template-providers/memory.js';
-import { type AirhornTemplate } from './template.js';
+import {MemoryTemplateProvider} from './template-providers/memory.js';
+import {type AirhornTemplate} from './template.js';
 
 export type AirhornTemplateProvider = {
 	name: string;

diff --git a/src/template-sync.ts b/src/template-sync.ts
@@ -1,8 +1,8 @@
-import { promises as fs } from 'node:fs';
-import { Ecto } from 'ecto';
-import { type AirhornTemplateProvider } from './template-service.js';
-import { AirhornTemplate, AirhornTemplateText } from './template.js';
-import { AirhornProviderType } from './provider-type.js';
+import {promises as fs} from 'node:fs';
+import {Ecto} from 'ecto';
+import {type AirhornTemplateProvider} from './template-service.js';
+import {AirhornTemplate, AirhornTemplateText} from './template.js';
+import {AirhornProviderType} from './provider-type.js';
 
 export class AirhornTemplateSync {
 	private readonly _src: string;

diff --git a/src/template.ts b/src/template.ts
@@ -1,5 +1,5 @@
 import {Ecto} from 'ecto';
-import { AirhornProviderType } from './provider-type.js';
+import {AirhornProviderType} from './provider-type.js';
 
 export type AirhornTemplateTextOptions = {
 	langCode?: string;

diff --git a/test/airhorn.test.ts b/test/airhorn.test.ts
@@ -6,7 +6,7 @@ import type * as admin from 'firebase-admin';
 import {AirhornProviderType} from '../src/provider-type.js';
 import {Airhorn, createAirhorn} from '../src/airhorn.js';
 import {FirebaseMessaging} from '../src/providers/firebase-messaging.js';
-import { MemoryTemplateProvider } from '../src/template-providers/memory.js';
+import {MemoryTemplateProvider} from '../src/template-providers/memory.js';
 import {TestingData, TestingDataTwo} from './testing-data.js';
 
 // eslint-disable-next-line n/prefer-global/process
@@ -22,7 +22,7 @@ vi.mock('firebase-admin', async () => {
 		apps: [],
 		auth: vi.fn(() => ({
 			...actual.auth(), // Use actual auth methods
-			verifyIdToken: vi.fn().mockResolvedValue({ uid: 'mocked-uid' }), // Mock specific methods
+			verifyIdToken: vi.fn().mockResolvedValue({uid: 'mocked-uid'}), // Mock specific methods
 		})),
 	};
 });
@@ -39,15 +39,15 @@ describe('Airhorn', async () => {
 	});
 
 	test('Airhorn - Get Templates', async () => {
-		const options = { TEMPLATE_PATH: './test/templates' };
+		const options = {TEMPLATE_PATH: './test/templates'};
 		const airhorn = await createAirhorn(options);
 
 		expect(airhorn.templates).toBeDefined();
 	});
 
 	test('Airhorn - set the template provider', async () => {
 		const TEMPLATE_PROVIDER = new MemoryTemplateProvider();
-		const options = { TEMPLATE_PROVIDER };
+		const options = {TEMPLATE_PROVIDER};
 		const airhorn = await createAirhorn(options);
 
 		expect(airhorn.templates.provider).toBeDefined();

diff --git a/test/providers/aws-ses.test.ts b/test/providers/aws-ses.test.ts
@@ -1,5 +1,5 @@
 import {test, expect, vi} from 'vitest';
-import { AWSSES } from '../../src/providers/aws-ses.js';
+import {AWSSES} from '../../src/providers/aws-ses.js';
 
 const AWS_SES_REGION = 'us-east-1';
 

diff --git a/test/providers/aws-sms.test.ts b/test/providers/aws-sms.test.ts
@@ -1,5 +1,5 @@
 import {test, expect, vi} from 'vitest';
-import { AWSSMS } from '../../src/providers/aws-sms.js';
+import {AWSSMS} from '../../src/providers/aws-sms.js';
 
 const AWS_SES_REGION = 'us-east-1';
 

diff --git a/test/providers/aws-sns.test.ts b/test/providers/aws-sns.test.ts
@@ -1,5 +1,5 @@
 import {test, expect, vi} from 'vitest';
-import { AWSSNS } from '../../src/providers/aws-sns.js';
+import {AWSSNS} from '../../src/providers/aws-sns.js';
 
 const AWS_SNS_REGION = 'us-east-1';
 

diff --git a/test/providers/firebase-messaging.test.ts b/test/providers/firebase-messaging.test.ts
@@ -1,4 +1,4 @@
-import { test, expect, vi } from 'vitest';
+import {test, expect, vi} from 'vitest';
 import type * as admin from 'firebase-admin';
 
 vi.mock('firebase-admin', async () => {
@@ -11,15 +11,15 @@ vi.mock('firebase-admin', async () => {
 		apps: [],
 		auth: vi.fn(() => ({
 			...actual.auth(), // Use actual auth methods
-			verifyIdToken: vi.fn().mockResolvedValue({ uid: 'mocked-uid' }), // Mock specific methods
+			verifyIdToken: vi.fn().mockResolvedValue({uid: 'mocked-uid'}), // Mock specific methods
 		})),
 	};
 });
 
 // eslint-disable-next-line n/prefer-global/process
 const FIREBASE_CERT = process.env.FIREBASE_CERT ?? './firebase-cert.json';
 
-const { FirebaseMessaging } = await import('../../src/providers/firebase-messaging.js');
+const {FirebaseMessaging} = await import('../../src/providers/firebase-messaging.js');
 
 const notification = {
 	title: 'Sample notification Title',

diff --git a/test/providers/twilio-sendgrid.test.ts b/test/providers/twilio-sendgrid.test.ts
@@ -1,5 +1,5 @@
 import {test, expect, vi} from 'vitest';
-import { TwilioSendgrid } from '../../src/providers/twilio-sendgrid.js';
+import {TwilioSendgrid} from '../../src/providers/twilio-sendgrid.js';
 
 const TWILIO_SENGRID_API_KEY = 'SG.test-key';
 

diff --git a/test/providers/twilio-sms.test.ts b/test/providers/twilio-sms.test.ts
@@ -1,5 +1,5 @@
 import {test, expect, vi} from 'vitest';
-import { TwilioSMS } from '../../src/providers/twilio-sms.js';
+import {TwilioSMS} from '../../src/providers/twilio-sms.js';
 
 const TWILIO_SMS_ACCOUNT_SID = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
 const TWILIO_SMS_AUTH_TOKEN = 'your_auth_token';

diff --git a/test/store-providers/memory.test.ts b/test/store-providers/memory.test.ts
@@ -1,5 +1,5 @@
-import { describe, test, expect} from 'vitest';
-import { MemoryTemplateProvider } from '../../src/template-providers/memory.js';
+import {describe, test, expect} from 'vitest';
+import {MemoryTemplateProvider} from '../../src/template-providers/memory.js';
 import {
 	airhornTestTemplate,
 } from '../testing-data.js';

diff --git a/test/store-providers/mongo.test.ts b/test/store-providers/mongo.test.ts
@@ -1,9 +1,9 @@
-import { text } from 'node:stream/consumers';
+import {text} from 'node:stream/consumers';
 import {test, describe, expect} from 'vitest';
 import {MongoTemplateProvider} from '../../src/template-providers/mongo.js';
-import { airhornTestTemplate } from '../testing-data.js';
-import { AirhornTemplateText } from '../../src/template.js';
-import { AirhornProviderType } from '../../src/provider-type.js';
+import {airhornTestTemplate} from '../testing-data.js';
+import {AirhornTemplateText} from '../../src/template.js';
+import {AirhornProviderType} from '../../src/provider-type.js';
 
 const uri = 'mongodb://localhost:27017';
 const mongoStoreProvider = new MongoTemplateProvider({uri});
@@ -65,7 +65,7 @@ describe('MongoStoreProvider Templates', () => {
 		const provider = mongoStoreProvider;
 		await provider.templatesCollection.deleteMany({});
 		const template = await provider.createTemplate(airhornTestTemplate);
-		template.text = [new AirhornTemplateText({ text: 'updated', providerType: AirhornProviderType.SMS })];
+		template.text = [new AirhornTemplateText({text: 'updated', providerType: AirhornProviderType.SMS})];
 		const updatedTemplate = await provider.updateTemplate(template);
 		expect(updatedTemplate.getText(AirhornProviderType.SMS, 'en')?.text).toBe('updated');
 		await provider.templatesCollection.deleteMany({});

diff --git a/test/template-service.test.ts b/test/template-service.test.ts
@@ -1,8 +1,8 @@
 import {describe, test, expect} from 'vitest';
 import {AirhornTemplateService} from '../src/template-service.js';
-import { MemoryTemplateProvider } from '../src/template-providers/memory.js';
-import { AirhornTemplate, AirhornTemplateText } from '../src/template.js';
-import { AirhornProviderType } from '../src/provider-type.js';
+import {MemoryTemplateProvider} from '../src/template-providers/memory.js';
+import {AirhornTemplate, AirhornTemplateText} from '../src/template.js';
+import {AirhornProviderType} from '../src/provider-type.js';
 
 describe('TemplateService', () => {
 	test('template service can initialize', () => {

diff --git a/test/template-sync.test.ts b/test/template-sync.test.ts
@@ -1,9 +1,9 @@
 import path from 'node:path';
 import process from 'node:process';
-import { describe, test, expect} from 'vitest';
-import { AirhornTemplateSync } from '../src/template-sync.js';
-import { MemoryTemplateProvider } from '../src/template-providers/memory.js';
-import { AirhornProviderType } from '../src/provider-type.js';
+import {describe, test, expect} from 'vitest';
+import {AirhornTemplateSync} from '../src/template-sync.js';
+import {MemoryTemplateProvider} from '../src/template-providers/memory.js';
+import {AirhornProviderType} from '../src/provider-type.js';
 
 enum AirhornTemplatePaths {
 	DEFAULT = 'test/templates',

diff --git a/test/template.test.ts b/test/template.test.ts
@@ -1,6 +1,6 @@
 import {describe, test, expect} from 'vitest';
-import { AirhornProviderType } from '../src/provider-type.js';
-import { AirhornTemplate, AirhornTemplateText } from '../src/template.js';
+import {AirhornProviderType} from '../src/provider-type.js';
+import {AirhornTemplate, AirhornTemplateText} from '../src/template.js';
 
 describe('AirhornTemplate', () => {
 	test('AirhornTemplate initialize', () => {

diff --git a/test/testing-data.ts b/test/testing-data.ts
@@ -1,4 +1,4 @@
-import { AirhornTemplate, AirhornTemplateText } from '../src/template.js';
+import {AirhornTemplate, AirhornTemplateText} from '../src/template.js';
 
 export class TestingData {
 	public users = new Array<TestingUser>();

diff --git a/test/webhook.test.ts b/test/webhook.test.ts
@@ -4,8 +4,8 @@ import {
 	describe, test, expect, vi,
 } from 'vitest';
 import type * as admin from 'firebase-admin';
-import { createAirhorn} from '../src/airhorn.js';
-import { AirhornTemplateSync } from '../src/template-sync.js';
+import {createAirhorn} from '../src/airhorn.js';
+import {AirhornTemplateSync} from '../src/template-sync.js';
 import {TestingDataTwo} from './testing-data.js';
 
 // eslint-disable-next-line n/prefer-global/process
@@ -21,7 +21,7 @@ vi.mock('firebase-admin', async () => {
 		apps: [],
 		auth: vi.fn(() => ({
 			...actual.auth(), // Use actual auth methods
-			verifyIdToken: vi.fn().mockResolvedValue({ uid: 'mocked-uid' }), // Mock specific methods
+			verifyIdToken: vi.fn().mockResolvedValue({uid: 'mocked-uid'}), // Mock specific methods
 		})),
 	};
 });