netlify-cli 12.2.6 → 12.2.8

package/src/lib/functions/{form-submissions-handler.cjs → form-submissions-handler.mjs}

@@ -1,15 +1,33 @@
 // @ts-check
-const { Readable } = require('stream')
+import { Readable } from 'stream'
 
-const { parse: parseContentType } = require('content-type')
-const multiparty = require('multiparty')
-const getRawBody = require('raw-body')
+import { parse as parseContentType } from 'content-type'
+import multiparty from 'multiparty'
+import getRawBody from 'raw-body'
 
-const { warn } = require('../../utils/command-helpers.cjs')
-const { BACKGROUND } = require('../../utils/index.cjs')
-const { capitalize } = require('../string.cjs')
+import { warn } from '../../utils/command-helpers.cjs'
+import { BACKGROUND } from '../../utils/functions/index.mjs'
+import { capitalize } from '../string.cjs'
 
-const createFormSubmissionHandler = function ({ functionsRegistry, siteUrl }) {
+const getFormHandler = function ({ functionsRegistry }) {
+  const handlers = ['submission-created', `submission-created${BACKGROUND}`]
+    .map((name) => functionsRegistry.get(name))
+    .filter(Boolean)
+    .map(({ name }) => name)
+
+  if (handlers.length === 0) {
+    warn(`Missing form submission function handler`)
+    return
+  }
+
+  if (handlers.length === 2) {
+    warn(`Detected both '${handlers[0]}' and '${handlers[1]}' form submission functions handlers, using ${handlers[0]}`)
+  }
+
+  return handlers[0]
+}
+
+export const createFormSubmissionHandler = function ({ functionsRegistry, siteUrl }) {
   return async function formSubmissionHandler(req, res, next) {
     if (req.url.startsWith('/.netlify/') || req.method !== 'POST') return next()
 
@@ -126,23 +144,3 @@ const createFormSubmissionHandler = function ({ functionsRegistry, siteUrl }) {
     next()
   }
 }
-
-const getFormHandler = function ({ functionsRegistry }) {
-  const handlers = ['submission-created', `submission-created${BACKGROUND}`]
-    .map((name) => functionsRegistry.get(name))
-    .filter(Boolean)
-    .map(({ name }) => name)
-
-  if (handlers.length === 0) {
-    warn(`Missing form submission function handler`)
-    return
-  }
-
-  if (handlers.length === 2) {
-    warn(`Detected both '${handlers[0]}' and '${handlers[1]}' form submission functions handlers, using ${handlers[0]}`)
-  }
-
-  return handlers[0]
-}
-
-module.exports = { createFormSubmissionHandler }

package/src/lib/functions/{scheduled.cjs → scheduled.mjs}

@@ -1,12 +1,12 @@
-const AnsiToHtml = require('ansi-to-html')
+import AnsiToHtml from 'ansi-to-html'
 
-const ansiToHtml = new AnsiToHtml()
+import { CLOCKWORK_USERAGENT } from '../../utils/functions/index.mjs'
 
-const { CLOCKWORK_USERAGENT } = require('../../utils/index.cjs')
+import { formatLambdaError } from './utils.cjs'
 
-const { formatLambdaError } = require('./utils.cjs')
+const ansiToHtml = new AnsiToHtml()
 
-const buildHelpResponse = ({ error, headers, path, result }) => {
+export const buildHelpResponse = ({ error, headers, path, result }) => {
   const acceptsHtml = headers.accept && headers.accept.includes('text/html')
 
   const paragraph = (text) => {
@@ -84,7 +84,7 @@ At the moment, Netlify does nothing about that. In the future, there might be a
       }
 }
 
-const handleScheduledFunction = ({ error, request, response, result }) => {
+export const handleScheduledFunction = ({ error, request, response, result }) => {
   const { contentType, message, statusCode } = buildHelpResponse({
     error,
     headers: request.headers,
@@ -96,5 +96,3 @@ const handleScheduledFunction = ({ error, request, response, result }) => {
   response.set('Content-Type', contentType)
   response.send(message)
 }
-
-module.exports = { handleScheduledFunction, buildHelpResponse }

package/src/lib/functions/{server.cjs → server.mjs}

@@ -1,23 +1,18 @@
 // @ts-check
-const { get } = require('dot-prop')
-const jwtDecode = require('jwt-decode')
-
-const {
-  CLOCKWORK_USERAGENT,
-  NETLIFYDEVERR,
-  NETLIFYDEVLOG,
-  error: errorExit,
-  generateNetlifyGraphJWT,
-  getInternalFunctionsDir,
-  log,
-} = require('../../utils/index.cjs')
-
-const { handleBackgroundFunction, handleBackgroundFunctionResult } = require('./background.cjs')
-const { createFormSubmissionHandler } = require('./form-submissions-handler.cjs')
-const { FunctionsRegistry } = require('./registry.cjs')
-const { handleScheduledFunction } = require('./scheduled.cjs')
-const { handleSynchronousFunction } = require('./synchronous.cjs')
-const { shouldBase64Encode } = require('./utils.cjs')
+import { get } from 'dot-prop'
+import jwtDecode from 'jwt-decode'
+
+import { CLOCKWORK_USERAGENT, getInternalFunctionsDir } from '../../utils/functions/index.mjs'
+import utils from '../../utils/index.cjs'
+
+import { handleBackgroundFunction, handleBackgroundFunctionResult } from './background.cjs'
+import { createFormSubmissionHandler } from './form-submissions-handler.mjs'
+import { FunctionsRegistry } from './registry.cjs'
+import { handleScheduledFunction } from './scheduled.mjs'
+import { handleSynchronousFunction } from './synchronous.cjs'
+import { shouldBase64Encode } from './utils.cjs'
+
+const { NETLIFYDEVERR, NETLIFYDEVLOG, error: errorExit, generateNetlifyGraphJWT, log } = utils
 
 const buildClientContext = function (headers) {
   // inject a client context based on auth header, ported over from netlify-lambda (https://github.com/netlify/netlify-lambda/pull/57)
@@ -46,7 +41,7 @@ const buildClientContext = function (headers) {
   }
 }
 
-const createHandler = function (options) {
+export const createHandler = function (options) {
   const { config, functionsRegistry } = options
 
   return async function handler(request, response) {
@@ -168,13 +163,11 @@ const createHandler = function (options) {
   }
 }
 
-const getFunctionsServer = function (options) {
+const getFunctionsServer = async function (options) {
   const { buildersPrefix = '', functionsPrefix = '', functionsRegistry, siteUrl } = options
   // performance optimization, load express on demand
-  // eslint-disable-next-line n/global-require
-  const express = require('express')
-  // eslint-disable-next-line n/global-require
-  const expressLogging = require('express-logging')
+  const { default: express } = await import('express')
+  const { default: expressLogging } = await import('express-logging')
   const app = express()
   const functionHandler = createHandler(options)
 
@@ -204,7 +197,7 @@ const getFunctionsServer = function (options) {
   return app
 }
 
-const startFunctionsServer = async (options) => {
+export const startFunctionsServer = async (options) => {
   const { capabilities, config, settings, site, siteUrl, timeouts } = options
   const internalFunctionsDir = await getInternalFunctionsDir({ base: site.root })
 
@@ -224,7 +217,7 @@ const startFunctionsServer = async (options) => {
 
     await functionsRegistry.scan(functionsDirectories)
 
-    const server = getFunctionsServer(Object.assign(options, { functionsRegistry }))
+    const server = await getFunctionsServer(Object.assign(options, { functionsRegistry }))
 
     await startWebServer({ server, settings })
   }
@@ -242,5 +235,3 @@ const startWebServer = async ({ server, settings }) => {
     })
   })
 }
-
-module.exports = { startFunctionsServer, createHandler }

package/src/lib/geo-location.cjs

@@ -41,7 +41,7 @@ const mockLocation = {
  * @param {"cache"|"update"|"mock"} params.mode
  * @param {string} params.geoCountry
  * @param {boolean} params.offline
- * @param {import('../utils/state-config').StateConfig} params.state
+ * @param {import('../utils/state-config.mjs').default} params.state
  * @returns {Promise<GeoLocation>}
  */
 const getGeoLocation = async ({ geoCountry, mode, offline, state }) => {

package/src/lib/{http-agent.cjs → http-agent.mjs}

@@ -1,12 +1,13 @@
 // @ts-check
-const { readFile } = require('fs').promises
+import { readFile } from 'fs/promises'
 
-const { HttpsProxyAgent } = require('https-proxy-agent')
-const waitPort = require('wait-port')
+import HttpsProxyAgent from 'https-proxy-agent'
+import waitPort from 'wait-port'
 
-const { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } = require('../utils/index.cjs')
+import { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } from '../utils/command-helpers.cjs'
 
 // https://github.com/TooTallNate/node-https-proxy-agent/issues/89
+// Maybe replace with https://github.com/delvedor/hpagent
 class HttpsProxyAgentWithCA extends HttpsProxyAgent {
   constructor(opts) {
     super(opts)
@@ -26,7 +27,7 @@ const DEFAULT_HTTPS_PORT = 443
 // 50 seconds
 const AGENT_PORT_TIMEOUT = 50
 
-const tryGetAgent = async ({ certificateFile, httpProxy }) => {
+export const tryGetAgent = async ({ certificateFile, httpProxy }) => {
   if (!httpProxy) {
     return {}
   }
@@ -85,7 +86,7 @@ const tryGetAgent = async ({ certificateFile, httpProxy }) => {
   return response
 }
 
-const getAgent = async ({ certificateFile, httpProxy }) => {
+export const getAgent = async ({ certificateFile, httpProxy }) => {
   const { agent, error, message, warning } = await tryGetAgent({ httpProxy, certificateFile })
   if (error) {
     log(NETLIFYDEVERR, error, message || '')
@@ -96,5 +97,3 @@ const getAgent = async ({ certificateFile, httpProxy }) => {
   }
   return agent
 }
-
-module.exports = { getAgent, tryGetAgent }

package/src/lib/one-graph/{cli-client.cjs → cli-client.mjs}

@@ -2,33 +2,21 @@
 /* eslint-disable eslint-comments/disable-enable-pair */
 /* eslint-disable fp/no-loops */
 /* eslint-disable no-underscore-dangle */
-const crypto = require('crypto')
-const { readFileSync, writeFileSync } = require('fs')
-const os = require('os')
-const path = require('path')
-const process = require('process')
-
-const gitRepoInfo = require('git-repo-info')
-const WSL = require('is-wsl')
-const {
-  // eslint-disable-next-line no-unused-vars
-  CliEventHelper,
-  // eslint-disable-next-line no-unused-vars
-  CodegenHelpers,
-  GraphQL,
-  InternalConsole,
-  NetlifyGraph,
-  NetlifyGraphLockfile,
-  OneGraphClient,
-} = require('netlify-onegraph-internal')
-
-const frameworkInfoPromise = import('@netlify/framework-info')
-
-const { version } = require('../../../package.json')
-// eslint-disable-next-line no-unused-vars
-const { StateConfig, USER_AGENT, chalk, error, execa, log, warn, watchDebounced } = require('../../utils/index.cjs')
-
-const {
+import crypto from 'crypto'
+import { readFileSync, writeFileSync } from 'fs'
+import os from 'os'
+import path from 'path'
+import process from 'process'
+
+import { listFrameworks } from '@netlify/framework-info'
+import gitRepoInfo from 'git-repo-info'
+import WSL from 'is-wsl'
+import { GraphQL, InternalConsole, NetlifyGraph, NetlifyGraphLockfile, OneGraphClient } from 'netlify-onegraph-internal'
+
+import getPackageJson from '../../utils/get-package-json.mjs'
+import utils from '../../utils/index.cjs'
+
+import {
   generateFunctionsFile,
   generateHandlerByOperationId,
   getCodegenFunctionById,
@@ -38,11 +26,14 @@ const {
   setNetlifyTomlCodeGeneratorModule,
   writeGraphQLOperationsSourceFile,
   writeGraphQLSchemaFile,
-} = require('./cli-netlify-graph.cjs')
+} from './cli-netlify-graph.mjs'
 
+const { chalk, error, execa, log, warn, watchDebounced } = utils
 const { parse } = GraphQL
 const { defaultExampleOperationsDoc, extractFunctionsFromOperationDoc } = NetlifyGraph
 
+const { version } = await getPackageJson()
+
 const internalConsole = {
   log,
   warn,
@@ -51,6 +42,7 @@ const internalConsole = {
 }
 
 /** @type {string | null} */
+// eslint-disable-next-line import/no-mutable-exports
 let currentPersistedDocId = null
 
 /**
@@ -72,11 +64,11 @@ InternalConsole.registerConsole(internalConsole)
  * @param {function} input.onEvents A function to call when CLI events are received and need to be processed
  * @param {function} input.onSchemaIdChange A function to call when the CLI schemaId has changed
  * @param {string} input.sessionId The session id to monitor CLI events for
- * @param {StateConfig} input.state A function to call to set/get the current state of the local Netlify project
+ * @param {import('../../utils/state-config.mjs').default} input.state A function to call to set/get the current state of the local Netlify project
  * @param {any} input.site The site object
  * @returns
  */
-const monitorCLISessionEvents = (input) => {
+export const monitorCLISessionEvents = (input) => {
   const { appId, config, netlifyGraphConfig, netlifyToken, onClose, onError, onEvents, site, state } = input
   const currentSessionId = input.sessionId
   // TODO (sg): Track changing schemaId for a session
@@ -239,7 +231,7 @@ const monitorOperationFile = async ({ netlifyGraphConfig, onAdd, onChange, onUnl
  * @param {string} input.jwt The Graph JWT
  * @param {string} input.sessionId The session ID for the current session
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig A standalone config object that contains all the information necessary for Netlify Graph to process events
- * @param {StateConfig} input.state A function to call to set/get the current state of the local Netlify project
+ * @param {import('../../utils/state-config.mjs').default} input.state A function to call to set/get the current state of the local Netlify project
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
  * @returns {Promise<Record<string, unknown> | undefined>}
  */
@@ -276,11 +268,11 @@ const fetchCliSessionSchema = async (input) => {
  * @param {string} input.sessionId The session ID for the current session
  * @param {string} input.schemaId The schemaId for the current session
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig A standalone config object that contains all the information necessary for Netlify Graph to process events
- * @param {StateConfig} input.state A function to call to set/get the current state of the local Netlify project
+ * @param {import('../../utils/state-config.mjs').default} input.state A function to call to set/get the current state of the local Netlify project
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
  * @returns {Promise<void>}
  */
-const refetchAndGenerateFromOneGraph = async (input) => {
+export const refetchAndGenerateFromOneGraph = async (input) => {
   const { config, jwt, logger, netlifyGraphConfig, schemaId, siteId, state } = input
 
   await OneGraphClient.ensureAppForSite(jwt, siteId)
@@ -378,7 +370,7 @@ const regenerateFunctionsFileFromOperationsFile = (input) => {
  * @param {string} input.siteRoot The GraphQL schema to use when generating code
  * @return {NetlifyGraphLockfile.V0_format | undefined}
  */
-const readLockfile = ({ siteRoot }) => {
+export const readLockfile = ({ siteRoot }) => {
   try {
     const buf = readFileSync(path.join(siteRoot, NetlifyGraphLockfile.defaultLockFileName))
     return JSON.parse(buf.toString('utf8'))
@@ -431,7 +423,7 @@ const mergeLockfile = ({ operationsHash, schemaId, siteRoot }) => {
  * @param {string} input.siteRoot The GraphQL schema to use when generating code
  * @return {string | undefined}
  */
-const readSchemaIdFromLockfile = ({ siteRoot }) => {
+export const readSchemaIdFromLockfile = ({ siteRoot }) => {
   try {
     const lockfile = readLockfile({ siteRoot })
     return lockfile && lockfile.locked.schemaId
@@ -544,7 +536,7 @@ const handleOperationsLibraryPersistedEvent = async (input) => {
  *
  * @param {object} input
  * @param {any} input.site The site object
- * @param {CliEventHelper.CliEvent} input.event
+ * @param {import('netlify-onegraph-internal').CliEventHelper.CliEvent} input.event
  * @param {GraphQL.GraphQLSchema} input.schema The GraphQL schema to use when generating code
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig A standalone config object that contains all the information necessary for Netlify Graph to process events
  * @param {object} input.config The parsed netlify.toml config file
@@ -556,7 +548,7 @@ const handleOperationsLibraryPersistedEvent = async (input) => {
  * @param {string} input.siteRoot Path to the root of the project
  * @returns {Promise<void>}
  */
-const handleCliSessionEvent = async ({
+export const handleCliSessionEvent = async ({
   config,
   docId,
   event,
@@ -634,7 +626,7 @@ ${JSON.stringify(payload, null, 2)}`)
 
       const editor = process.env.EDITOR || null
 
-      /** @type {CliEventHelper.OneGraphNetlifyCliSessionFilesWrittenEvent} */
+      /** @type {import('netlify-onegraph-internal').CliEventHelper.OneGraphNetlifyCliSessionFilesWrittenEvent} */
       const filesWrittenEvent = {
         id: crypto.randomUUID(),
         createdAt: new Date().toString(),
@@ -780,12 +772,9 @@ const getCLISessionMetadata = async ({ jwt, oneGraphSessionId, siteId }) => {
  * Look at the current project, filesystem, etc. and determine relevant metadata for a cli session
  * @param {object} input
  * @param {string} input.siteRoot The root file path for the site
- * @returns {Promise<CliEventHelper.DetectedLocalCLISessionMetadata>} Any locally detected facts that are relevant to include in the cli session metadata
+ * @returns {Promise<import('netlify-onegraph-internal').CliEventHelper.DetectedLocalCLISessionMetadata>} Any locally detected facts that are relevant to include in the cli session metadata
  */
 const detectLocalCLISessionMetadata = async ({ siteRoot }) => {
-  // @ts-ignore
-  const { listFrameworks } = await frameworkInfoPromise
-
   /** @type {string | null} */
   let framework = null
 
@@ -835,7 +824,7 @@ const detectLocalCLISessionMetadata = async ({ siteRoot }) => {
 const publishCliSessionMetadataPublishEvent = async ({ config, docId, jwt, schemaId, sessionId, siteRoot }) => {
   const detectedMetadata = await detectLocalCLISessionMetadata({ siteRoot })
 
-  /** @type {CodegenHelpers.CodegenModuleMeta | null} */
+  /** @type {import('netlify-onegraph-internal').CodegenHelpers.CodegenModuleMeta | null} */
   let codegen = null
 
   const codegenModule = await getCodegenModule({ config })
@@ -854,7 +843,7 @@ const publishCliSessionMetadataPublishEvent = async ({ config, docId, jwt, schem
     }
   }
 
-  /** @type {CliEventHelper.OneGraphNetlifyCliSessionMetadataPublishEvent} */
+  /** @type {import('netlify-onegraph-internal').CliEventHelper.OneGraphNetlifyCliSessionMetadataPublishEvent} */
   const event = {
     __typename: 'OneGraphNetlifyCliSessionMetadataPublishEvent',
     audience: 'UI',
@@ -900,7 +889,7 @@ const publishCliSessionMetadataPublishEvent = async ({ config, docId, jwt, schem
  * @param {object} input.newMetadata The metadata to merge into (with priority) the existing metadata
  * @returns {Promise<object>}
  */
-const upsertMergeCLISessionMetadata = async ({ jwt, newMetadata, oneGraphSessionId, siteId, siteRoot }) => {
+export const upsertMergeCLISessionMetadata = async ({ jwt, newMetadata, oneGraphSessionId, siteId, siteRoot }) => {
   const { errors, metadata } = await getCLISessionMetadata({ jwt, oneGraphSessionId, siteId })
   if (errors) {
     warn(`Error fetching cli session metadata: ${JSON.stringify(errors, null, 2)}`)
@@ -916,7 +905,7 @@ const upsertMergeCLISessionMetadata = async ({ jwt, newMetadata, oneGraphSession
   return result
 }
 
-const persistNewOperationsDocForSession = async ({
+export const persistNewOperationsDocForSession = async ({
   config,
   netlifyGraphConfig,
   netlifyToken,
@@ -1011,7 +1000,7 @@ const persistNewOperationsDocForSession = async ({
   }
 }
 
-const createCLISession = async ({ metadata, netlifyToken, sessionName, siteId }) => {
+export const createCLISession = async ({ metadata, netlifyToken, sessionName, siteId }) => {
   const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
   const result = OneGraphClient.createCLISession(jwt, siteId, sessionName, metadata)
   return result
@@ -1019,10 +1008,10 @@ const createCLISession = async ({ metadata, netlifyToken, sessionName, siteId })
 
 /**
  * Load the CLI session id from the local state
- * @param {StateConfig} state
+ * @param {import('../../utils/state-config.mjs').default} state
  * @returns
  */
-const loadCLISession = (state) => state.get('oneGraphSessionId')
+export const loadCLISession = (state) => state.get('oneGraphSessionId')
 
 /**
  * Idemponentially save the CLI session id to the local state and start monitoring for CLI events, upstream schema changes, and local operation file changes
@@ -1031,10 +1020,10 @@ const loadCLISession = (state) => state.get('oneGraphSessionId')
  * @param {string} input.netlifyToken The (typically netlify) access token that is used for authentication, if any
  * @param {string | undefined} input.oneGraphSessionId The session ID to use for this CLI session (default: read from state)
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig A standalone config object that contains all the information necessary for Netlify Graph to process events
- * @param {StateConfig} input.state A function to call to set/get the current state of the local Netlify project
+ * @param {import('../../utils/state-config.mjs').default} input.state A function to call to set/get the current state of the local Netlify project
  * @param {any} input.site The site object
  */
-const startOneGraphCLISession = async (input) => {
+export const startOneGraphCLISession = async (input) => {
   const { config, netlifyGraphConfig, netlifyToken, site, state } = input
   const getJwt = async () => {
     const accessToken = await OneGraphClient.getGraphJwtForSite({ siteId: site.id, nfToken: netlifyToken })
@@ -1222,7 +1211,7 @@ ${JSON.stringify(error_, null, 2)}`)
  * @param {string} input.siteId A function to call to set/get the current state of the local Netlify project
  * @param {string} input.sessionId The session id to monitor CLI events for
  */
-const markCliSessionInactive = async ({ netlifyToken, sessionId, siteId }) => {
+export const markCliSessionInactive = async ({ netlifyToken, sessionId, siteId }) => {
   const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
   const result = await OneGraphClient.executeMarkCliSessionInactive(jwt, siteId, sessionId)
   if (!result || result.errors) {
@@ -1234,7 +1223,7 @@ const markCliSessionInactive = async ({ netlifyToken, sessionId, siteId }) => {
  * Generate a session name that can be identified as belonging to the current checkout
  * @returns {string} The name of the session to create
  */
-const generateSessionName = () => {
+export const generateSessionName = () => {
   const userInfo = os.userInfo({ encoding: 'utf-8' })
   const sessionName = `${userInfo.username}-${Date.now()}`
   log(`Generated Netlify Graph session name: ${sessionName}`)
@@ -1273,11 +1262,11 @@ const idempotentlyUpdateSessionSchemaIdFromLockfile = async (input) => {
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig A standalone config object that contains all the information necessary for Netlify Graph to process events
  * @param {object} input.metadata
  * @param {string} input.netlifyToken
- * @param {StateConfig} input.state
+ * @param {import('../../utils/state-config.mjs').default} input.state
  * @param {string} [input.oneGraphSessionId]
  * @param {any} input.site The site object
  */
-const ensureCLISession = async (input) => {
+export const ensureCLISession = async (input) => {
   const { config, metadata, netlifyGraphConfig, netlifyToken, site, state } = input
   let oneGraphSessionId = input.oneGraphSessionId ? input.oneGraphSessionId : loadCLISession(state)
   let parentCliSessionId = null
@@ -1389,7 +1378,7 @@ const ensureCLISession = async (input) => {
   return oneGraphSessionId
 }
 
-const OneGraphCliClient = {
+export const OneGraphCliClient = {
   ackCLISessionEvents: OneGraphClient.ackCLISessionEvents,
   executeCreatePersistedQueryMutation: OneGraphClient.executeCreatePersistedQueryMutation,
   executeCreateApiTokenMutation: OneGraphClient.executeCreateApiTokenMutation,
@@ -1400,21 +1389,4 @@ const OneGraphCliClient = {
   getGraphJwtForSite: OneGraphClient.getGraphJwtForSite,
 }
 
-module.exports = {
-  OneGraphCliClient,
-  createCLISession,
-  currentPersistedDocId,
-  ensureCLISession,
-  extractFunctionsFromOperationDoc,
-  handleCliSessionEvent,
-  generateSessionName,
-  loadCLISession,
-  markCliSessionInactive,
-  monitorCLISessionEvents,
-  persistNewOperationsDocForSession,
-  readSchemaIdFromLockfile,
-  refetchAndGenerateFromOneGraph,
-  startOneGraphCLISession,
-  upsertMergeCLISessionMetadata,
-  readLockfile,
-}
+export { currentPersistedDocId, extractFunctionsFromOperationDoc }