Replace ESLint configuration with neostandard; update lint script and…

… clean up code formatting
microsoft · Feb 21, 2025 · 7e48a8d · 7e48a8d
1 parent 68339a4
commit 7e48a8d
Show file tree

Hide file tree

Showing 9 changed files with 4,040 additions and 6,490 deletions.
diff --git a/samples/basic/copilotstudio-client/nodejs/src/index.ts b/samples/basic/copilotstudio-client/nodejs/src/index.ts
@@ -14,7 +14,7 @@ import path from 'path'
 
 import { MsalCachePlugin } from './msalCachePlugin.js'
 
-async function acquireToken(settings: ConnectionSettings): Promise<string> {
+async function acquireToken (settings: ConnectionSettings): Promise<string> {
   const msalConfig = {
     auth: {
       clientId: settings.appClientId,
@@ -25,8 +25,10 @@ async function acquireToken(settings: ConnectionSettings): Promise<string> {
     },
     system: {
       loggerOptions: {
-        loggerCallback(loglevel: msal.LogLevel, message: string, containsPii: boolean) {
-          console.log(message)
+        loggerCallback (loglevel: msal.LogLevel, message: string, containsPii: boolean) {
+          if (!containsPii) {
+            console.log(loglevel, message)
+          }
         },
         piiLoggingEnabled: false,
         logLevel: msal.LogLevel.Verbose,

diff --git a/samples/basic/copilotstudio-client/nodejs/src/msalCachePlugin.ts b/samples/basic/copilotstudio-client/nodejs/src/msalCachePlugin.ts
@@ -7,11 +7,11 @@ import { ICachePlugin, TokenCacheContext } from '@azure/msal-node'
 
 export class MsalCachePlugin implements ICachePlugin {
   private cacheLocation: string = ''
-  constructor(cacheLocation: string) {
+  constructor (cacheLocation: string) {
     this.cacheLocation = cacheLocation
   }
 
-  async beforeCacheAccess(tokenCacheContext: TokenCacheContext): Promise<void> {
+  async beforeCacheAccess (tokenCacheContext: TokenCacheContext): Promise<void> {
     return new Promise((resolve, reject) => {
       if (fs.existsSync(this.cacheLocation)) {
         fs.readFile(this.cacheLocation, 'utf-8', (error, data) => {
@@ -32,7 +32,7 @@ export class MsalCachePlugin implements ICachePlugin {
     })
   }
 
-  async afterCacheAccess(tokenCacheContext: TokenCacheContext): Promise<void> {
+  async afterCacheAccess (tokenCacheContext: TokenCacheContext): Promise<void> {
     return new Promise((resolve, reject) => {
       if (tokenCacheContext.cacheHasChanged) {
         fs.writeFile(this.cacheLocation, tokenCacheContext.tokenCache.serialize(), (error) => {

diff --git a/samples/basic/echo-bot/nodejs/src/bot.ts b/samples/basic/echo-bot/nodejs/src/bot.ts
@@ -5,7 +5,7 @@ import { ActivityHandler, MessageFactory } from '@microsoft/agents-bot-hosting'
 import { version } from '@microsoft/agents-bot-hosting/package.json'
 
 export class EchoBot extends ActivityHandler {
-  constructor() {
+  constructor () {
     super()
     this.onMessage(async (context, next) => {
       const replyText = `Echo: ${context.activity.text}`

diff --git a/samples/complex/copilotstudio-skill/nodejs/src/bot.js b/samples/complex/copilotstudio-skill/nodejs/src/bot.js
@@ -1,32 +1,32 @@
 // @ts-check
 
-import { ActivityHandler, MessageFactory, MsalTokenProvider } from '@microsoft/agents-bot-hosting'
-import { default as pjson } from '../node_modules/@microsoft/agents-bot-hosting/package.json' with { type: "json" }
+import { ActivityHandler, MessageFactory } from '@microsoft/agents-bot-hosting'
+import pjson from '@microsoft/agents-bot-hosting/package.json'
 
 export class EchoBot extends ActivityHandler {
-    constructor() {
-        super()
-        this.onMessage(async (context, next) => {
-            const text = context.activity.text
-            const replyText = `Echo: ${ text }`
-            await context.sendActivity(MessageFactory.text(replyText, replyText))
-            if (text?.includes('version')) {
-                await context.sendActivity(MessageFactory.text('Running on version ' + pjson.version, 'Running on version ' + pjson.version))
-            }
-            await next()
-        });
+  constructor () {
+    super()
+    this.onMessage(async (context, next) => {
+      const text = context.activity.text
+      const replyText = `Echo: ${text}`
+      await context.sendActivity(MessageFactory.text(replyText, replyText))
+      if (text?.includes('version')) {
+        await context.sendActivity(MessageFactory.text('Running on version ' + pjson.version, 'Running on version ' + pjson.version))
+      }
+      await next()
+    })
 
-        this.onMembersAdded(async (context, next) => {
-            const welcomeText = `Hello from echo bot, running on version ${ pjson.version }`
-            const membersAdded = context.activity.membersAdded
-            if (membersAdded) {
-                for (let cnt = 0; cnt < membersAdded.length; ++cnt) {
-                    if (membersAdded[cnt].id !== context.activity.recipient?.id) {
-                        await context.sendActivity(MessageFactory.text(welcomeText, welcomeText))
-                    }
-                }
-            }
-            await next()
-        })
-    }
+    this.onMembersAdded(async (context, next) => {
+      const welcomeText = `Hello from echo bot, running on version ${pjson.version}`
+      const membersAdded = context.activity.membersAdded
+      if (membersAdded) {
+        for (let cnt = 0; cnt < membersAdded.length; ++cnt) {
+          if (membersAdded[cnt].id !== context.activity.recipient?.id) {
+            await context.sendActivity(MessageFactory.text(welcomeText, welcomeText))
+          }
+        }
+      }
+      await next()
+    })
+  }
 }
diff --git a/samples/complex/copilotstudio-skill/nodejs/src/index.js b/samples/complex/copilotstudio-skill/nodejs/src/index.js
@@ -1,29 +1,28 @@
 // @ts-check
-import express, { json } from 'express';
+import express, { json } from 'express'
 
-import { CloudAdapter, loadAuthConfigFromEnv, authorizeJWT } from '@microsoft/agents-bot-hosting';
+import { CloudAdapter, loadAuthConfigFromEnv, authorizeJWT } from '@microsoft/agents-bot-hosting'
 
-import { EchoBot } from './bot.js';
-import { default as pjson } from '../node_modules/@microsoft/agents-bot-hosting/package.json' with { type: "json" }
+import { EchoBot } from './bot.js'
+import pjson from '@microsoft/agents-bot-hosting/package.json'
 
 const config = loadAuthConfigFromEnv()
-const adapter = new CloudAdapter(config);
+const adapter = new CloudAdapter(config)
 const myBot = new EchoBot()
 
-
 const server = express()
 server.use(express.static('public'))
 server.use(authorizeJWT(config))
 
 server.use(json())
 server.post('/api/messages',
-    async (req, res) => {
-        await adapter.process(req, res, (context) => myBot.run(context));
-    }
+  async (req, res) => {
+    await adapter.process(req, res, (context) => myBot.run(context))
+  }
 )
 
 const port = process.env.PORT || 3978
 
 server.listen(port, () => {
-    console.log(`\n echo bot, running on sdk version ${ pjson.version } lisenting on ${ port } for bot ${ process.env.clientId }`);
-})
+  console.log(`\n echo bot, running on sdk version ${pjson.version} lisenting on ${port} for bot ${process.env.clientId}`)
+})
diff --git a/samples/eslint.config.js b/samples/eslint.config.js
@@ -0,0 +1,3 @@
+import neostandard from 'neostandard'
+
+export default neostandard({ ts: true, ignores: ['node_modules', '**/dist/**'] })
diff --git a/samples/eslint.config.mjs b/samples/eslint.config.mjs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import neostandard from 'neostandard'

		export default neostandard({ ts: true, ignores: ['node_modules', '/dist/'] })