@superblocksteam/shared 0.9618.1 → 0.9619.0

package/src/plugins/templates/shared/auth.ts

@@ -1,11 +1,12 @@
 import {
   ApiKeyMethod,
-  DropdownOption,
+  type AuthType,
+  type DropdownOption,
   EditorLanguage,
   ExtendedIntegrationPluginId,
   FormComponentType,
-  FormItem,
-  FormSection,
+  type FormItem,
+  type FormSection,
   getDisplayName,
   GoogleSheetsAuthType,
   InputDataType,
@@ -49,7 +50,9 @@ export type AuthMethods = {
   firebase?: boolean;
   oauth?: boolean;
   bearer?: boolean;
-  apiKey?: boolean;
+  // An object overrides the Key / Value placeholders for plugins where the key is a fixed header
+  // name rather than a provider-specific API key (e.g. MCP servers take Authorization: Bearer <token>).
+  apiKey?: boolean | { key?: BasicAuthConfig; value?: BasicAuthConfig };
   apiKeyForm?: ApiKeyFormItem[];
   apiKeyFormDisplayName?: string;
   tokenPrefixed?: boolean | { prefix: string };
@@ -153,7 +156,12 @@ export const authSections = ({
   isProto = false,
   // allow caller to provide optional customized auth items
   prependItems = [],
-  authOptionsLdFlag
+  authOptionsLdFlag,
+  defaultTokenScope,
+  excludedAuthTypes = [],
+  authTypeOrder,
+  oauthConnect = false,
+  sendBearerHeader = false
 }: {
   startVersion: string;
   pkceStartVersion?: string;
@@ -169,6 +177,24 @@ export const authSections = ({
   // Rollout gate on the Authentication dropdown: see DropdownFormItem.optionsLdFlag.
   authOptionsLdFlag?: { ldFlag: string; keep: string[] };
   prependItems?: FormItem[];
+  // Initial value of the "Share access token across all users" checkbox.
+  // Existing templates share by default; omit to keep that.
+  defaultTokenScope?: TokenScope;
+  // Auth types to leave out of the Authentication dropdown even though the
+  // method family that produces them is enabled (e.g. drop the implicit grant
+  // while keeping the rest of `oauth`).
+  excludedAuthTypes?: AuthType[];
+  // Dropdown option keys in display order. Options not listed keep their
+  // default relative order after the listed ones.
+  authTypeOrder?: readonly string[];
+  // Render the Connect / Revoke buttons and the share-token checkbox for the
+  // generic `oauth` authorization code flow, whose endpoints the user types
+  // in. Bring-your-own and Superblocks-client flows always render them.
+  oauthConnect?: boolean;
+  // For the generic `oauth` client credentials grant: put the minted token on the Authorization
+  // header (what the fixed-endpoint templates always do). REST API leaves it off; its users place
+  // `{{ oauth.token }}` in a header of their own choosing.
+  sendBearerHeader?: boolean;
 }): FormSection[] => {
   // Extract display name override before filtering methods
   const apiKeyFormDisplayName = enabledMethods.apiKeyFormDisplayName;
@@ -220,7 +246,14 @@ export const authSections = ({
           startVersion: startVersion,
           componentType: FormComponentType.DROPDOWN,
           initialValue: authTypeInitialValue,
-          options: authTypeOptions({ enabledMethods, allowNone, apiKeyFormDisplayName, pkceStartVersion }),
+          options: authTypeOptions({
+            enabledMethods,
+            allowNone,
+            apiKeyFormDisplayName,
+            pkceStartVersion,
+            excludedAuthTypes,
+            authTypeOrder
+          }),
           ...(authOptionsLdFlag ? { optionsLdFlag: authOptionsLdFlag } : {}),
           disabled: !allowNone && enabledMethodKeys.length === 1
         }
@@ -461,6 +494,9 @@ export const authSections = ({
     }
   }
   if (enabledMethods.apiKey) {
+    const apiKeyOverrides = typeof enabledMethods.apiKey === 'object' ? enabledMethods.apiKey : {};
+    const apiKeyPlaceholder = apiKeyOverrides.key?.placeholder ?? 'api key';
+    const apiKeyValuePlaceholder = apiKeyOverrides.value?.placeholder ?? 'value';
     addField(
       authFields,
       [
@@ -470,7 +506,7 @@ export const authSections = ({
           startVersion: startVersion,
           componentType: FormComponentType.DYNAMIC_INPUT_TEXT,
           rules: [{ required: true, message: 'Key is required' }],
-          placeholder: `api key`,
+          placeholder: apiKeyPlaceholder,
           tooltip: { markdownText: apiKeyMarkdownText(pluginId) },
           singleLine: true,
           display: {
@@ -485,7 +521,7 @@ export const authSections = ({
           startVersion: startVersion,
           componentType: FormComponentType.INPUT_TEXT,
           rules: [{ required: true, message: 'Value is required' }],
-          placeholder: `value`,
+          placeholder: apiKeyValuePlaceholder,
           dataType: InputDataType.PASSWORD,
           tooltip: {
             markdownText: `The value corresponding to the API key`
@@ -524,7 +560,8 @@ export const authSections = ({
         ],
         fieldNamesToHide
       );
-    } else if (pluginId === ExtendedIntegrationPluginId.GRAPHQL) {
+    } else if (HEADER_ONLY_API_KEY_PLUGINS.has(pluginId)) {
+      // Other templates never persisted authConfig.method; leave them alone.
       addField(
         authFields,
         [
@@ -1125,6 +1162,74 @@ export const authSections = ({
       fieldNamesToHide
     );
   }
+  if (enabledMethods.oauth && sendBearerHeader) {
+    addField(
+      authFields,
+      [
+        {
+          label: 'Send bearer header',
+          name: 'authConfig.sendBearerHeader',
+          startVersion: startVersion,
+          componentType: FormComponentType.CHECKBOX,
+          hidden: true,
+          initialValue: true,
+          display: {
+            show: {
+              authType: [IntegrationAuthType.OAUTH2_CLIENT_CREDS]
+            }
+          }
+        }
+      ],
+      fieldNamesToHide
+    );
+  }
+  if (enabledMethods.oauth && oauthConnect) {
+    // The bring-your-own flow carries a hidden, template-fixed revoke URL under
+    // the same name; a template enabling both keeps that one.
+    const revokeUrlField: FormItem[] = enabledMethods.oauth2BringYourOwn
+      ? []
+      : [
+          {
+            label: 'Revoke token URL',
+            name: 'authConfig.revokeTokenUrl',
+            startVersion: startVersion,
+            componentType: FormComponentType.DYNAMIC_INPUT_TEXT,
+            placeholder: `https://example.com/login/oauth/revoke`,
+            tooltip: {
+              markdownText: `Optional. The endpoint tokens are revoked at when you click Revoke token. Without it, Revoke token only deletes the tokens Superblocks stored.`
+            },
+            singleLine: true,
+            display: {
+              show: {
+                authType: [IntegrationAuthType.OAUTH2_CODE]
+              }
+            }
+          }
+        ];
+    const accessTypeField: FormItem = {
+      label: 'Access type',
+      name: 'authConfig.accessType',
+      startVersion: startVersion,
+      componentType: FormComponentType.DYNAMIC_INPUT_TEXT,
+      // Same default the per-user login has always sent for the authorization code flow.
+      initialValue: 'offline',
+      placeholder: `offline`,
+      tooltip: {
+        markdownText: `Sent as \`access_type\` on the authorization request. Google needs \`offline\` to issue a refresh token; most other servers ignore it. Clear it for a server that rejects unknown parameters.`
+      },
+      singleLine: true,
+      display: {
+        show: {
+          authType: [IntegrationAuthType.OAUTH2_CODE]
+        }
+      }
+    };
+    addField(
+      authFields,
+      [...revokeUrlField, accessTypeField, sharedTokenCheckbox({ startVersion, pluginName, defaultTokenScope })],
+      fieldNamesToHide
+    );
+  }
   if (enabledMethods.oauth2BringYourOwn) {
     addField(
       authFields,
@@ -1278,29 +1383,7 @@ export const authSections = ({
             }
           }
         },
-        {
-          label: 'Share access token across all users',
-          name: 'authConfig.tokenScope',
-          startVersion: startVersion,
-          componentType: FormComponentType.CHECKBOX,
-          display: {
-            show: {
-              authType: [IntegrationAuthType.OAUTH2_CODE]
-            }
-          },
-          mapBooleansTo: {
-            true: TokenScope.DATASOURCE,
-            false: TokenScope.USER
-          },
-          initialValue: TokenScope.DATASOURCE,
-          validateReduxPath: {
-            true: {
-              selector: 'selectHasConnectedTokens',
-              validValue: true,
-              errorMessage: `You must connect to ${pluginName} before you can share access token`
-            }
-          }
-        }
+        sharedTokenCheckbox({ startVersion, pluginName, defaultTokenScope })
       ],
       fieldNamesToHide
     );
@@ -1531,35 +1614,17 @@ export const authSections = ({
             }
           }
         },
-        {
-          label: 'Share access token across all users',
-          name: 'authConfig.tokenScope',
-          startVersion: startVersion,
-          componentType: FormComponentType.CHECKBOX,
-          display: {
-            show: {
-              authType: [IntegrationAuthType.OAUTH2_CODE]
-            }
-          },
-          mapBooleansTo: {
-            true: TokenScope.DATASOURCE,
-            false: TokenScope.USER
-          },
-          initialValue: TokenScope.DATASOURCE,
-          validateReduxPath: {
-            true: {
-              selector: 'selectHasConnectedTokens',
-              validValue: true,
-              errorMessage: `You must connect to ${pluginName} before you can share access token`
-            }
-          }
-        }
+        sharedTokenCheckbox({ startVersion, pluginName, defaultTokenScope })
       ],
       fieldNamesToHide
     );
   }
 
-  if (enabledMethods.oauth2SuperblocksClient || enabledMethods.oauth2BringYourOwn) {
+  const rendersConnectButton = Boolean(
+    enabledMethods.oauth2SuperblocksClient || enabledMethods.oauth2BringYourOwn || (enabledMethods.oauth && oauthConnect)
+  );
+
+  if (rendersConnectButton) {
     addField(
       authFields,
       [
@@ -1594,9 +1659,13 @@ export const authSections = ({
 
   const authButtons: FormItem[] = [];
 
-  if (enabledMethods.oauth2BringYourOwn || enabledMethods.oauth2SuperblocksClient) {
+  if (rendersConnectButton) {
     const authorizationExtraParams =
       enabledMethods?.oauth2BringYourOwn?.authorizationExtraParams || enabledMethods.oauth2SuperblocksClient?.authorizationExtraParams;
+    // The fixed-endpoint flows declare their authorization parameters per template. The generic
+    // flow talks to a server the user typed in, so it carries what every authorization code grant
+    // needs (response_type=code) and takes prompt / access_type from the form.
+    const genericConnectParams: AuthorizationExtraParams = enabledMethods.oauth && oauthConnect ? { responseType: 'code' } : {};
     const iconUrl = enabledMethods?.oauth2BringYourOwn?.iconUrl || enabledMethods.oauth2SuperblocksClient?.iconUrl;
     addField(
       authButtons,
@@ -1619,6 +1688,8 @@ export const authSections = ({
             'authConfig.refreshTokenFromServer',
             'authConfig.clientAuthMethod',
             'authConfig.usePkce',
+            'authConfig.promptType',
+            'authConfig.accessType',
             // Resolves the tenant placeholder in the URLs above for providers that host each
             // customer on their own subdomain.
             RestApiFields.OPENAPI_TENANT_NAME,
@@ -1627,6 +1698,7 @@ export const authSections = ({
           ],
           extraValues: {
             pluginId: pluginId,
+            ...genericConnectParams,
             ...authorizationExtraParams
           },
           iconUrl,
@@ -1700,10 +1772,16 @@ export const authSections = ({
   return formSections;
 };
 
+// Plugins whose API key can only travel in a header. GraphQL has no query
+// parameters to put it in; the MCP authorization spec forbids credentials in
+// the query string.
+const HEADER_ONLY_API_KEY_PLUGINS: ReadonlySet<ExtendedIntegrationPluginId> = new Set([
+  ExtendedIntegrationPluginId.GRAPHQL,
+  ExtendedIntegrationPluginId.MCP
+]);
+
 function apiKeyMarkdownText(pluginId: ExtendedIntegrationPluginId): string {
-  return `Specify the header key ${
-    pluginId === ExtendedIntegrationPluginId.GRAPHQL ? '' : 'or the query parameter'
-  } used to pass the API key`;
+  return `Specify the header key ${HEADER_ONLY_API_KEY_PLUGINS.has(pluginId) ? '' : 'or the query parameter'} used to pass the API key`;
 }
 
 function apiKeyAuthOptions(pluginId: ExtendedIntegrationPluginId): DropdownOption[] {
@@ -1715,7 +1793,7 @@ function apiKeyAuthOptions(pluginId: ExtendedIntegrationPluginId): DropdownOptio
     }
   ];
 
-  if (pluginId === ExtendedIntegrationPluginId.REST_API) {
+  if (!HEADER_ONLY_API_KEY_PLUGINS.has(pluginId)) {
     options.push({
       displayName: 'Query parameter',
       key: ApiKeyMethod.QUERY_PARAM,
@@ -1728,6 +1806,35 @@ function apiKeyAuthOptions(pluginId: ExtendedIntegrationPluginId): DropdownOptio
 // This generates the dropdown set of authentication methods available
 // for the given plugin/integration.
 function authTypeOptions({
+  enabledMethods,
+  allowNone = true,
+  apiKeyFormDisplayName,
+  pkceStartVersion,
+  excludedAuthTypes = [],
+  authTypeOrder
+}: {
+  enabledMethods: AuthMethods;
+  allowNone?: boolean;
+  apiKeyFormDisplayName?: string;
+  pkceStartVersion?: string;
+  excludedAuthTypes?: AuthType[];
+  authTypeOrder?: readonly string[];
+}): DropdownOption[] {
+  const options = baseAuthTypeOptions({ enabledMethods, allowNone, apiKeyFormDisplayName, pkceStartVersion }).filter(
+    (option) => !excludedAuthTypes.includes(option.value as AuthType)
+  );
+  if (!authTypeOrder) {
+    return options;
+  }
+  const rank = (option: DropdownOption): number => {
+    const index = authTypeOrder.indexOf(String(option.key));
+    return index === -1 ? authTypeOrder.length : index;
+  };
+  // Array.prototype.sort is stable, so unlisted options keep their order.
+  return [...options].sort((a, b) => rank(a) - rank(b));
+}
+
+function baseAuthTypeOptions({
   enabledMethods,
   allowNone = true,
   apiKeyFormDisplayName,
@@ -1865,6 +1972,43 @@ function authTypeOptions({
   }
   return options;
 }
+// The "Share access token across all users" checkbox. Rendered as a checkbox
+// but persisted as a TokenScope string; the saga and server normalize a raw
+// boolean that slips through (see normalizeTokenScope).
+function sharedTokenCheckbox({
+  startVersion,
+  pluginName,
+  defaultTokenScope
+}: {
+  startVersion: string;
+  pluginName: string;
+  defaultTokenScope?: TokenScope;
+}): FormItem {
+  return {
+    label: 'Share access token across all users',
+    name: 'authConfig.tokenScope',
+    startVersion: startVersion,
+    componentType: FormComponentType.CHECKBOX,
+    display: {
+      show: {
+        authType: [IntegrationAuthType.OAUTH2_CODE]
+      }
+    },
+    mapBooleansTo: {
+      true: TokenScope.DATASOURCE,
+      false: TokenScope.USER
+    },
+    initialValue: defaultTokenScope ?? TokenScope.DATASOURCE,
+    validateReduxPath: {
+      true: {
+        selector: 'selectHasConnectedTokens',
+        validValue: true,
+        errorMessage: `You must connect to ${pluginName} before you can share access token`
+      }
+    }
+  };
+}
+
 function addField(authFields: FormItem[], fieldsToAdd: FormItem[], fieldNamesToHide: string[]) {
   for (const field of fieldsToAdd) {
     authFields.push({ ...field, hidden: field.hidden || fieldNamesToHide.includes(field.name) });

package/src/plugins/templates/shared/aws.ts

@@ -1,4 +1,11 @@
-import { AgentType, AWSAuthType, FormComponentType, FormSection, getAWSAuthTypeDisplayName, InputDataType } from '../../../types/index.js';
+import {
+  AgentType,
+  AWSAuthType,
+  FormComponentType,
+  type FormSection,
+  getAWSAuthTypeDisplayName,
+  InputDataType
+} from '../../../types/index.js';
 
 export const getAWSAuthSection = (config: { startVersion: string; startVersionForRoleAssumption: string }): FormSection => {
   return {

package/src/plugins/templates/shared/openapi.ts

@@ -1,11 +1,11 @@
-import { isEmpty } from 'lodash';
+import { isEmpty } from 'lodash-es';
 
 import {
   ActionResponseType,
   EditorLanguage,
-  ExtendedIntegrationPluginId,
+  type ExtendedIntegrationPluginId,
   FormComponentType,
-  FormItem,
+  type FormItem,
   FormSectionLayout,
   GENERIC_HTTP_REQUEST,
   getMethodColor,
@@ -13,17 +13,17 @@ import {
   getRestApiDataTypeDisplayName,
   getRestApiFieldDisplayName,
   HttpMethod,
-  KVPair,
-  Plugin,
+  type KVPair,
+  type Plugin,
   PluginResponseType,
   PluginType,
   RestApiBodyDataType,
   RestApiFields,
   SUPERBLOCKS_OPENAPI_TENANT_KEYWORD,
-  TenantInput
+  type TenantInput
 } from '../../../types/index.js';
 import { PUBLIC_INTEGRATIONS_CDN_URL, PUBLIC_INTEGRATIONS_LOGO_URL, DOCS_BASE_URL } from '../constants.js';
-import { AuthMethods, authSections } from './auth.js';
+import { type AuthMethods, authSections } from './auth.js';
 import { RestApiIntegrationPluginMergedFieldNames, RestApiIntegrationPluginVersions } from './restapiintegration.js';
 
 // Automatically populated when getNativeOpenApiPlugin is called with

package/src/plugins/templates/shared/sshtunnel.ts

@@ -1,9 +1,9 @@
 import {
   AgentType,
-  DropdownOption,
+  type DropdownOption,
   FormComponentType,
-  FormItem,
-  FormSection,
+  type FormItem,
+  type FormSection,
   InputDataType,
   SharedSSHAuthMethod,
   PluginCommon,

package/src/plugins/templates/slack.ts

@@ -1,4 +1,4 @@
-import { ExtendedIntegrationPluginId, Plugin } from '../../types/index.js';
+import { ExtendedIntegrationPluginId, type Plugin } from '../../types/index.js';
 import { getNativeOpenApiPlugin } from './shared/index.js';
 
 export const SlackPlugin: Plugin = getNativeOpenApiPlugin({

package/src/plugins/templates/smtp.ts

@@ -1,4 +1,4 @@
-import { FormComponentType, FormItem, InputDataType, Plugin, PluginResponseType, PluginType } from '../../types/index.js';
+import { FormComponentType, type FormItem, InputDataType, type Plugin, PluginResponseType, PluginType } from '../../types/index.js';
 import { PUBLIC_INTEGRATIONS_LOGO_URL } from './constants.js';
 
 // TODO (jason) change these constant values as these are pulled from Sendgrid

package/src/plugins/templates/snowflake.ts

@@ -2,10 +2,10 @@ import {
   EditorLanguage,
   FormComponentType,
   InputDataType,
-  Plugin,
+  type Plugin,
   PluginResponseType,
   PluginType,
-  FormItem,
+  type FormItem,
   IntegrationAuthType
 } from '../../types/index.js';
 import { PARAMETERIZED_SQL_DESCRIPTION, SQL_INITIAL_TEXT, PUBLIC_INTEGRATIONS_LOGO_URL, DOCS_BASE_URL } from './constants.js';

package/src/plugins/templates/snowflakecortex.ts

@@ -1,4 +1,4 @@
-import { ExtendedIntegrationPluginId, Plugin } from '../../types/index.js';
+import { ExtendedIntegrationPluginId, type Plugin } from '../../types/index.js';
 import { DOCS_BASE_URL, PUBLIC_INTEGRATIONS_CDN_URL, PUBLIC_INTEGRATIONS_LOGO_URL } from './constants.js';
 import { getNativeOpenApiPlugin } from './shared/index.js';
 

package/src/plugins/templates/snowflakepostgres.ts

@@ -2,9 +2,9 @@ import {
   DB_SQL_INITIAL_TEXT,
   EditorLanguage,
   FormComponentType,
-  FormItem,
+  type FormItem,
   InputDataType,
-  Plugin,
+  type Plugin,
   PluginResponseType,
   PluginType
 } from '../../types/index.js';

package/src/plugins/templates/stabilityai.ts

@@ -1,4 +1,4 @@
-import { ExtendedIntegrationPluginId, Plugin } from '../../types/index.js';
+import { ExtendedIntegrationPluginId, type Plugin } from '../../types/index.js';
 import { getNativeOpenApiPlugin } from './shared/index.js';
 
 export const StabilityAiPlugin: Plugin = getNativeOpenApiPlugin({

package/src/plugins/templates/stripe.ts

@@ -1,4 +1,4 @@
-import { ExtendedIntegrationPluginId, Plugin } from '../../types/index.js';
+import { ExtendedIntegrationPluginId, type Plugin } from '../../types/index.js';
 import { getNativeOpenApiPlugin } from './shared/index.js';
 
 export const StripePlugin: Plugin = getNativeOpenApiPlugin({

package/src/plugins/templates/superblocks-ocr.ts

@@ -1,4 +1,4 @@
-import { FormComponentType, Plugin, PluginResponseType, PluginType } from '../../types/index.js';
+import { FormComponentType, type Plugin, PluginResponseType, PluginType } from '../../types/index.js';
 import { PUBLIC_INTEGRATIONS_LOGO_URL } from './constants.js';
 
 const SuperblocksOcrPluginVersions = {

package/src/plugins/templates/twilio.ts

@@ -1,4 +1,4 @@
-import { ExtendedIntegrationPluginId, Plugin } from '../../types/index.js';
+import { ExtendedIntegrationPluginId, type Plugin } from '../../types/index.js';
 import { getNativeOpenApiPlugin } from './shared/index.js';
 
 export const TwilioPlugin: Plugin = getNativeOpenApiPlugin({

package/src/plugins/templates/workflow.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginResponseType, PluginType } from '../../types/index.js';
+import { type Plugin, PluginResponseType, PluginType } from '../../types/index.js';
 import { PUBLIC_INTEGRATIONS_LOGO_URL } from './constants.js';
 
 export const WorkflowPlugin: Plugin = {

package/src/plugins/templates/zendesk.ts

@@ -1,4 +1,4 @@
-import { ExtendedIntegrationPluginId, IntegrationAuthType, Plugin, SUPERBLOCKS_OPENAPI_TENANT_KEYWORD } from '../../types/index.js';
+import { ExtendedIntegrationPluginId, IntegrationAuthType, type Plugin, SUPERBLOCKS_OPENAPI_TENANT_KEYWORD } from '../../types/index.js';
 import { PUBLIC_INTEGRATIONS_LOGO_URL } from './constants.js';
 import { ClientAuthMethod, getNativeOpenApiPlugin, RestApiIntegrationPluginVersions } from './shared/index.js';
 

package/src/plugins/templates/zoom.ts

@@ -1,4 +1,4 @@
-import { ExtendedIntegrationPluginId, Plugin } from '../../types/index.js';
+import { ExtendedIntegrationPluginId, type Plugin } from '../../types/index.js';
 import { PUBLIC_INTEGRATIONS_LOGO_URL } from './constants.js';
 import { getNativeOpenApiPlugin } from './shared/index.js';
 

package/src/refactoring/application.ts

@@ -1,9 +1,9 @@
-import { cloneDeep, set } from 'lodash';
+import { cloneDeep, set } from 'lodash-es';
 
-import { ApplicationConfiguration } from '../types/index.js';
-import { ScopedDataTree } from './refactor.js';
-import { Extractor } from './types.js';
-import { PropertyUpdate, updateNameInEntityMap } from './updates.js';
+import type { ApplicationConfiguration } from '../types/index.js';
+import type { ScopedDataTree } from './refactor.js';
+import type { Extractor } from './types.js';
+import { type PropertyUpdate, updateNameInEntityMap } from './updates.js';
 
 export async function renameInApplicationConfiguration({
   dsl,

package/src/refactoring/index.ts

@@ -1,5 +1,5 @@
 export * from './refactor.js';
 export * from './updates.js';
-export * from './types.js';
+export type * from './types.js';
 export * from './rename.js';
 export * from './application.js';

package/src/refactoring/refactor.test.ts

@@ -1,7 +1,7 @@
 import { tokenize } from 'esprima';
 import { describe, it, expect } from 'vitest';
 
-import { EvaluationPair, extractJsEvaluationPairsWithTokenizer, LanguagePluginID } from '../types/index.js';
+import { type EvaluationPair, extractJsEvaluationPairsWithTokenizer, LanguagePluginID } from '../types/index.js';
 import { refactorNameInCode, refactorNameInString, refactorNameInValue, refactorNameInStep } from './refactor.js';
 
 describe('Refactoring', () => {

package/src/refactoring/refactor.ts

@@ -1,8 +1,8 @@
-import { isArray, isEqual, isObject, isString } from 'lodash';
+import { isArray, isEqual, isObject, isString } from 'lodash-es';
 
-import { StringSegment, getDynamicStringSegments, isExactBinding, joinStringWithBindings } from '../bindings/index.js';
+import { type StringSegment, getDynamicStringSegments, isExactBinding, joinStringWithBindings } from '../bindings/index.js';
 import { LanguagePluginID } from '../types/plugin/language.js';
-import { Extractor } from './types.js';
+import type { Extractor } from './types.js';
 
 export type ScopedDataTree = { [entityName: string]: unknown };
 

package/src/refactoring/rename.ts

@@ -1,9 +1,9 @@
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
 import { v4 as uuidv4 } from 'uuid';
 
-import { isValidMultiStepDef, isValidStepDef, TriggerStepType, ValidStepDef } from '../types/page/event.js';
-import { refactorNameInCode, refactorNameInValue, ScopedDataTree } from './refactor.js';
-import { Extractor } from './types.js';
+import { isValidMultiStepDef, isValidStepDef, TriggerStepType, type ValidStepDef } from '../types/page/event.js';
+import { refactorNameInCode, refactorNameInValue, type ScopedDataTree } from './refactor.js';
+import type { Extractor } from './types.js';
 
 type AddUpdate = (value: { propertyName: string; propertyValue: unknown }) => void;
 

package/src/refactoring/types.ts

@@ -1,4 +1,4 @@
-import { EvaluationPair } from '../types/plugin/evaluation.js';
+import type { EvaluationPair } from '../types/plugin/evaluation.js';
 
 export type Extractor = (
   code: string,

package/src/refactoring/updates.ts

@@ -1,10 +1,10 @@
-import { get, isEqual, isArray } from 'lodash';
+import { get, isEqual, isArray } from 'lodash-es';
 
-import { PageDSL, isValidStepDef, ValidMultiStepDef, StepDef } from '../types/index.js';
-import { FlattenedWidgetProps } from '../utils/normalize.js';
-import { refactorNameInString, refactorNameInValue, ScopedDataTree } from './refactor.js';
+import { type PageDSL, isValidStepDef, type ValidMultiStepDef, type StepDef } from '../types/index.js';
+import type { FlattenedWidgetProps } from '../utils/normalize.js';
+import { refactorNameInString, refactorNameInValue, type ScopedDataTree } from './refactor.js';
 import { createTriggerStepRenamer } from './rename.js';
-import { Extractor } from './types.js';
+import type { Extractor } from './types.js';
 
 export type PropertyUpdate = { propertyName: string; propertyValue: unknown; entityId: string };
 

package/src/relay/builder.ts

@@ -1,4 +1,4 @@
-import { Relay } from './index.js';
+import type { Relay } from './index.js';
 
 export class RelayBuilder {
   private relay: Relay;