@slates/cli 1.0.0-rc.5 → 1.0.0-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slates/cli",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.9",
   "publishConfig": {
     "access": "public"
   },
@@ -20,14 +20,14 @@
   },
   "scripts": {
     "test": "vitest run --passWithNoTests",
-    "lint": "prettier src/**/*.ts --check",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "biome:check": "biome check --write src"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.4.0",
-    "@slates/client": "1.0.0-rc.7",
-    "@slates/oauth-microsoft": "1.0.0-rc.2",
-    "@slates/profiles": "1.0.0-rc.5",
+    "@slates/client": "1.0.0-rc.11",
+    "@slates/oauth-microsoft": "1.0.0-rc.4",
+    "@slates/profiles": "1.0.0-rc.9",
     "sade": "^1.8.1"
   },
   "devDependencies": {

package/src/commands/auth.test.ts

@@ -8,6 +8,30 @@ describe('normalizeCallbackRedirectUriForIntegration', () => {
     ).toBe('http://localhost:45873/callback');
   });
 
+  it('normalizes Intercom loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('intercom', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
+  it('normalizes Typeform loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('typeform', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
+  it('normalizes Xero loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('xero', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
+  it('normalizes Zendesk loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('zendesk', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
   it('leaves unrelated integration redirects unchanged', () => {
     expect(
       normalizeCallbackRedirectUriForIntegration('attio', 'http://127.0.0.1:45873/callback')

package/src/commands/auth.ts

@@ -3,7 +3,7 @@ import {
   normalizeMicrosoftRedirectUri,
   normalizeMicrosoftRedirectUriForIntegration
 } from '@slates/oauth-microsoft';
-import { SlatesOAuthCredentialRecord, SlatesStoredAuth } from '@slates/profiles';
+import type { SlatesOAuthCredentialRecord, SlatesStoredAuth } from '@slates/profiles';
 import {
   chooseAuthMethod,
   createClientContext,
@@ -17,16 +17,24 @@ import {
   promptForObjectSchema,
   promptForString
 } from '../lib/prompts';
-import { JsonInput, WithProfile } from '../lib/types';
+import type { JsonInput, WithProfile } from '../lib/types';
 
 type JsonObject = Record<string, any>;
 let NOTION_INTEGRATION_KEY = 'notion';
 let SALESFORCE_INTEGRATION_KEY = 'salesforce';
+let INTERCOM_INTEGRATION_KEY = 'intercom';
+let TYPEFORM_INTEGRATION_KEY = 'typeform';
+let XERO_INTEGRATION_KEY = 'xero';
+let ZENDESK_INTEGRATION_KEY = 'zendesk';
 let HUBSPOT_INTEGRATION_KEY = 'hubspot';
 let HUBSPOT_DEVELOPER_PLATFORM_OAUTH_METHOD_ID = 'developer_platform_oauth';
 let LOOPBACK_REDIRECT_NORMALIZED_INTEGRATIONS = new Set([
+  INTERCOM_INTEGRATION_KEY,
   NOTION_INTEGRATION_KEY,
-  SALESFORCE_INTEGRATION_KEY
+  SALESFORCE_INTEGRATION_KEY,
+  TYPEFORM_INTEGRATION_KEY,
+  XERO_INTEGRATION_KEY,
+  ZENDESK_INTEGRATION_KEY
 ]);
 
 type AuthSetupOptions = WithProfile &
@@ -345,6 +353,7 @@ let runAuthSetup = async (opts: AuthSetupOptions): Promise<SlatesStoredAuth> =>
       clientId,
       clientSecret,
       scopes,
+      callbackParams: callbackResult.callbackParams,
       callbackState: callbackState ?? undefined
     });
 

package/src/commands/config.ts

@@ -1,6 +1,6 @@
 import { createClientContext } from '../lib/context';
 import { parseJsonObject, promptForObjectSchema } from '../lib/prompts';
-import { JsonInput, WithProfile } from '../lib/types';
+import type { JsonInput, WithProfile } from '../lib/types';
 
 export let getConfig = async (opts: WithProfile) => {
   let { profile } = await createClientContext(opts);

package/src/commands/profiles.ts

@@ -1,8 +1,8 @@
 import { input } from '@inquirer/prompts';
-import { createSlatesClientFromProfile, openSlatesCliStore } from '@slates/profiles';
+import { createSlatesClientFromProfile, type openSlatesCliStore } from '@slates/profiles';
 import path from 'path';
 import { chooseProfile, openIntegrationStore, syncProfileMetadata } from '../lib/context';
-import { WithProfile } from '../lib/types';
+import type { WithProfile } from '../lib/types';
 
 let normalizeEntry = (rootDir: string, entry: string) => {
   let absolute = path.isAbsolute(entry) ? entry : path.resolve(process.cwd(), entry);
@@ -12,7 +12,9 @@ let normalizeEntry = (rootDir: string, entry: string) => {
     : absolute;
 };
 
-let getNextSetupProfileName = async (store: Awaited<ReturnType<typeof openSlatesCliStore>>) => {
+let getNextSetupProfileName = async (
+  store: Awaited<ReturnType<typeof openSlatesCliStore>>
+) => {
   let names = new Set(store.listProfiles().map(profile => profile.name));
   if (!names.has('default')) {
     return 'default';
@@ -41,10 +43,14 @@ let createProfile = async (
 
   let defaultName =
     opts.name ??
-    (opts.initializeConfig ? await getNextSetupProfileName(store) : `profile-${store.listProfiles().length + 1}`);
+    (opts.initializeConfig
+      ? await getNextSetupProfileName(store)
+      : `profile-${store.listProfiles().length + 1}`);
   let name =
     opts.name ??
-    (interactive ? await input({ message: 'Profile name', default: defaultName }) : defaultName);
+    (interactive
+      ? await input({ message: 'Profile name', default: defaultName })
+      : defaultName);
   let defaultEntry = opts.entry ?? integration.entry;
   let entry =
     opts.entry ??
@@ -56,7 +62,9 @@ let createProfile = async (
       : defaultEntry);
   let exportName =
     opts.exportName ??
-    (interactive ? await input({ message: 'Export name (optional)', default: 'provider' }) : 'provider');
+    (interactive
+      ? await input({ message: 'Export name (optional)', default: 'provider' })
+      : 'provider');
 
   let profile = store.upsertProfile({
     name,

package/src/commands/repl.ts

@@ -1,6 +1,6 @@
 import { input } from '@inquirer/prompts';
 import { print } from '../lib/prompts';
-import { WithProfile } from '../lib/types';
+import type { WithProfile } from '../lib/types';
 import { listAuth, setupAuth } from './auth';
 import { getConfig, setConfig } from './config';
 import { getProfile } from './profiles';

package/src/commands/test.ts

@@ -3,7 +3,7 @@ import { writeFile } from 'fs/promises';
 import path from 'path';
 import { chooseProfile } from '../lib/context';
 import { listWorkspaceIntegrations } from '../lib/integration';
-import { WithProfile } from '../lib/types';
+import type { WithProfile } from '../lib/types';
 
 let runVitest = async (opts: {
   cwd: string;
@@ -43,7 +43,7 @@ export let runVitestWithProfile = async (opts: WithProfile & { vitestArgs: strin
 
   await writeFile(
     contextPath,
-    JSON.stringify(
+    `${JSON.stringify(
       {
         integration: integration.relativeDir,
         profileId: profile.id,
@@ -53,7 +53,7 @@ export let runVitestWithProfile = async (opts: WithProfile & { vitestArgs: strin
       },
       null,
       2
-    ) + '\n',
+    )}\n`,
     'utf-8'
   );
 

package/src/commands/tools.ts

@@ -5,7 +5,7 @@ import {
   syncProfileMetadata
 } from '../lib/context';
 import { parseJsonObject, promptForObjectSchema } from '../lib/prompts';
-import { JsonInput, WithProfile } from '../lib/types';
+import type { JsonInput, WithProfile } from '../lib/types';
 
 export let listTools = async (opts: WithProfile) => {
   let { store, profile, client } = await createClientContext(opts);

package/src/lib/context.ts

@@ -1,10 +1,10 @@
 import { select } from '@inquirer/prompts';
-import { SlatesProtocolClient } from '@slates/client';
+import type { SlatesProtocolClient } from '@slates/client';
 import {
   createSlatesClientFromProfile,
   openSlatesCliStore,
-  SlatesProfileRecord,
-  type SlatesCliStore
+  type SlatesCliStore,
+  type SlatesProfileRecord
 } from '@slates/profiles';
 import { resolveIntegration } from './integration';
 import { promptForObjectSchema } from './prompts';

package/src/lib/integration.test.ts

@@ -26,7 +26,11 @@ describe('resolveIntegration', () => {
       JSON.stringify({ main: 'src/index.ts' }, null, 2),
       'utf-8'
     );
-    await writeFile(path.join(integrationDir, 'src', 'index.ts'), 'export let provider = {};\n', 'utf-8');
+    await writeFile(
+      path.join(integrationDir, 'src', 'index.ts'),
+      'export let provider = {};\n',
+      'utf-8'
+    );
 
     let resolved = await resolveIntegration('demo', { cwd });
 
@@ -44,7 +48,11 @@ describe('resolveIntegration', () => {
       JSON.stringify({ source: 'src/index.ts' }, null, 2),
       'utf-8'
     );
-    await writeFile(path.join(integrationDir, 'src', 'index.ts'), 'export let provider = {};\n', 'utf-8');
+    await writeFile(
+      path.join(integrationDir, 'src', 'index.ts'),
+      'export let provider = {};\n',
+      'utf-8'
+    );
 
     let resolved = await resolveIntegration('./custom/demo', { cwd });
 

package/src/lib/integration.ts

@@ -1,6 +1,6 @@
-import { access, readFile, readdir } from 'fs/promises';
-import path from 'path';
 import { resolveSlatesCliRoot } from '@slates/profiles';
+import { access, readdir, readFile } from 'fs/promises';
+import path from 'path';
 
 export interface ResolvedIntegration {
   input: string;
@@ -142,7 +142,9 @@ export let listWorkspaceIntegrations = async (opts: { cwd?: string } = {}) => {
     );
 
     integrations.push(
-      ...chunk.filter((integration): integration is WorkspaceIntegrationSummary => integration !== null)
+      ...chunk.filter(
+        (integration): integration is WorkspaceIntegrationSummary => integration !== null
+      )
     );
   }
 

package/src/lib/oauth.ts

@@ -34,7 +34,11 @@ export let createOAuthCallbackListener = async () => {
   return new Promise<{
     redirectUri: string;
     state: string;
-    wait: () => Promise<{ code: string; state: string }>;
+    wait: () => Promise<{
+      code: string;
+      state: string;
+      callbackParams: Record<string, string>;
+    }>;
   }>((resolve, reject) => {
     let expectedState = randomUUID();
     let settled = false;
@@ -79,7 +83,11 @@ export let createOAuthCallbackListener = async () => {
         res.end('Authentication complete. You can close this window.');
         server.close();
         settled = true;
-        waiter.resolve({ code, state });
+        waiter.resolve({
+          code,
+          state,
+          callbackParams: Object.fromEntries(url.searchParams.entries())
+        });
       } catch (error) {
         server.close();
         settled = true;
@@ -88,9 +96,17 @@ export let createOAuthCallbackListener = async () => {
     });
 
     let waiter = (() => {
-      let resolvePromise!: (value: { code: string; state: string }) => void;
+      let resolvePromise!: (value: {
+        code: string;
+        state: string;
+        callbackParams: Record<string, string>;
+      }) => void;
       let rejectPromise!: (error: unknown) => void;
-      let promise = new Promise<{ code: string; state: string }>((resolveFn, rejectFn) => {
+      let promise = new Promise<{
+        code: string;
+        state: string;
+        callbackParams: Record<string, string>;
+      }>((resolveFn, rejectFn) => {
         resolvePromise = resolveFn;
         rejectPromise = rejectFn;
       });

package/src/lib/prompts.ts

@@ -1,5 +1,5 @@
 import { checkbox, confirm, input, password, select } from '@inquirer/prompts';
-import { JsonObject } from './types';
+import type { JsonObject } from './types';
 
 export let prettyJson = (value: unknown) => JSON.stringify(value, null, 2);