Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

chore(frontend): move query node guards next to the schema (#126850)

Paul D'Ambra7923a5d48afa
diff --git a/frontend/bin/layer-baseline.txt b/frontend/bin/layer-baseline.txt
index 95d99f0d38aa..ca85bcd5dad7 100644
--- a/frontend/bin/layer-baseline.txt
+++ b/frontend/bin/layer-baseline.txt
@@ -74,7 +74,6 @@ frontend/src/layout/today/todayAnalyticsLogic.ts -> frontend/src/scenes/analytic
frontend/src/layout/today/todayContextPanelLogic.ts -> frontend/src/scenes/notebooks/NotebookPanel/notebookPanelLogic.ts
frontend/src/layout/today/todayContextPanelLogic.ts -> products/conversations/frontend/components/SidePanel/sidepanelTicketsLogic.ts
frontend/src/layout/today/todayObjectGlanceLogic.ts -> frontend/src/scenes/library/libraryUtils.ts
-frontend/src/layout/today/todayObjectGlances.ts -> frontend/src/queries/utils.ts
frontend/src/layout/today/todayObjectGlances.ts -> frontend/src/scenes/library/libraryUtils.ts
frontend/src/layout/today/todayObjectGlances.ts -> frontend/src/scenes/project-homepage/today/todayNumbers.ts
frontend/src/layout/today/todayObjectGlances.ts -> products/experiments/frontend/experimentStatus.ts
@@ -119,7 +118,6 @@ frontend/src/lib/components/Cards/InsightCard/DashboardSqlDisplayOptions.tsx ->
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> frontend/src/exporter/exporterViewLogic.ts
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> frontend/src/queries/Query/Query.tsx
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> frontend/src/queries/nodes/InsightViz/utils.ts
-frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> frontend/src/scenes/insights/EmptyStates/index.ts
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> frontend/src/scenes/insights/insightDataLogic.tsx
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> frontend/src/scenes/insights/insightLogic.tsx
@@ -127,7 +125,6 @@ frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> products/busine
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> products/business_intelligence/frontend/BIDashboardTile.tsx
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> products/business_intelligence/frontend/biDashboardCrossFilters.ts
frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx -> products/dashboards/frontend/components/DashboardInsightResultMenu.tsx
-frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx -> frontend/src/scenes/insights/filters/ActionFilter/flagCallsSeries.ts
frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx -> frontend/src/scenes/insights/utils.tsx
frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx -> frontend/src/scenes/saved-insights/insightTypesMetadata.tsx
@@ -139,7 +136,6 @@ frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/qu
frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/queries/nodes/DataNode/queryScan.ts
frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/queries/nodes/DataNode/warehouseSyncWarnings.ts
frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/queries/nodes/InsightViz/exportAdapters.ts
-frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/scenes/dashboard/dashboardEvents.ts
frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/scenes/dashboard/dashboardUtils.ts
frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> frontend/src/scenes/insights/insightDataLogic.tsx
@@ -157,15 +153,12 @@ frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> products/produc
frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx -> products/product_analytics/frontend/insights/editor/insightDisplayOptions.tsx
frontend/src/lib/components/Cards/InsightCard/QueryCard.tsx -> frontend/src/queries/Query/Query.tsx
frontend/src/lib/components/Cards/InsightCard/RecordingsUniversalFiltersDisplay.tsx -> frontend/src/scenes/session-recordings/filters/DurationFilter.tsx
-frontend/src/lib/components/Cards/InsightCard/TopHeading.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/components/Cards/InsightCard/TopHeading.tsx -> frontend/src/scenes/saved-insights/insightTypesMetadata.tsx
frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx -> frontend/src/queries/nodes/DataVisualization/Components/SideBar.tsx
-frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx -> frontend/src/scenes/insights/insightLogic.tsx
frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx -> frontend/src/scenes/insights/insightVizDataLogic.ts
frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx -> products/product_analytics/frontend/insights/retention/filters/RetentionChartPicker.tsx
frontend/src/lib/components/Cards/InsightCard/dashboardWidgetMenusLogic.ts -> frontend/src/scenes/dashboard/liveDashboardIds.ts
-frontend/src/lib/components/Cards/InsightCard/visualizationShape.ts -> frontend/src/queries/utils.ts
frontend/src/lib/components/Cards/TextCard/textCardMarkdown.ts -> products/dashboards/frontend/components/ImageTile/imageTileMarkdown.ts
frontend/src/lib/components/Cards/TextCard/textCardModalLogic.ts -> products/dashboards/frontend/components/ImageTile/imageTileUtils.ts
frontend/src/lib/components/ChartFilter/ChartFilter.tsx -> frontend/src/scenes/insights/insightLogic.tsx
@@ -188,7 +181,6 @@ frontend/src/lib/components/ExportButton/exportNudge.ts -> products/subscription
frontend/src/lib/components/ExportButton/exportNudge.ts -> products/subscriptions/frontend/components/Subscriptions/exportNudge/exportNudgeLogic.ts
frontend/src/lib/components/ExportButton/exportNudge.ts -> products/subscriptions/frontend/components/Subscriptions/exportNudge/exportNudgeSubject.ts
frontend/src/lib/components/ExportButton/exportsLogic.ts -> frontend/src/scenes/cohorts/cohortSavedToast.ts
-frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts -> frontend/src/queries/utils.ts
frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts -> frontend/src/scenes/cohorts/CohortFilters/types.ts
frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts -> frontend/src/scenes/cohorts/cohortUtils.tsx
frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts -> frontend/src/scenes/feature-flags/flagEvaluationsTable.ts
@@ -197,7 +189,6 @@ frontend/src/lib/components/HedgehogMode/HedgehogMode.tsx -> frontend/src/toolba
frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts -> frontend/src/toolbar/shared/toolbarConfigLogic.ts
frontend/src/lib/components/HedgehogMode/hedgehogModeLogic.ts -> frontend/src/toolbar/shared/toolbarFetch.ts
frontend/src/lib/components/HighlightedJSONViewer.tsx -> products/ai_observability/frontend/ConversationDisplay/HighlightedContentWrapper.tsx
-frontend/src/lib/components/HogQLEditor/HogQLEditor.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/components/IngestionControls/TriggerMatchChoice.tsx -> frontend/src/queries/nodes/InsightViz/PropertyGroupFilters/AndOrFilterSelect.tsx
frontend/src/lib/components/IngestionControls/TriggerMatchChoice.tsx -> frontend/src/scenes/settings/environment/SessionRecordingSettings.tsx
frontend/src/lib/components/IngestionControls/triggers/EventTrigger.tsx -> frontend/src/scenes/settings/environment/replayTriggersLogic.ts
@@ -262,7 +253,6 @@ frontend/src/lib/components/SessionTimeline/timeline/items/exceptions.tsx -> pro
frontend/src/lib/components/SessionTimeline/timeline/items/logs.tsx -> products/error_tracking/frontend/components/RuntimeIcon.tsx
frontend/src/lib/components/SessionTimeline/timeline/items/page.tsx -> products/error_tracking/frontend/components/RuntimeIcon.tsx
frontend/src/lib/components/Sharing/SharingModal.tsx -> frontend/src/queries/nodes/InsightQuery/defaults.ts
-frontend/src/lib/components/Sharing/SharingModal.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/components/Sharing/SharingModal.tsx -> frontend/src/scenes/insights/insightVizDataLogic.ts
frontend/src/lib/components/SmoothingFilter/SmoothingFilter.tsx -> frontend/src/scenes/insights/insightLogic.tsx
frontend/src/lib/components/SmoothingFilter/SmoothingFilter.tsx -> frontend/src/scenes/insights/insightVizDataLogic.ts
@@ -329,7 +319,6 @@ frontend/src/lib/utils/accessControlUtils.ts -> frontend/src/scenes/sceneTypes.t
frontend/src/lib/utils/deleteWithUndo.tsx -> frontend/src/layout/panel-layout/ProjectTree/projectTreeLogic.tsx
frontend/src/lib/utils/deleteWithUndo.tsx -> frontend/src/scenes/dashboard/liveDashboardIds.ts
frontend/src/lib/utils/eventUsageLogic.ts -> frontend/src/lib/logic/preflightLogic.tsx
-frontend/src/lib/utils/eventUsageLogic.ts -> frontend/src/queries/utils.ts
frontend/src/lib/utils/eventUsageLogic.ts -> frontend/src/scenes/product-tours/constants.ts
frontend/src/lib/utils/eventUsageLogic.ts -> frontend/src/scenes/userLogic.ts
frontend/src/lib/utils/eventUsageLogic.ts -> products/experiments/frontend/experimentStatus.ts
@@ -353,7 +342,6 @@ frontend/src/posthogAiToolRenderers.ts -> products/error_tracking/frontend/posth
frontend/src/posthogAiToolRenderers.ts -> products/logs/frontend/posthogAiToolRenderers.tsx
frontend/src/posthogAiToolRenderers.ts -> products/posthog_ai/frontend/posthogAiToolRenderers.tsx
frontend/src/products.tsx -> frontend/src/queries/examples.ts
-frontend/src/products.tsx -> frontend/src/queries/utils.ts
frontend/src/products.tsx -> products/ai_observability/frontend/clusters/constants.ts
frontend/src/products.tsx -> products/ai_observability/frontend/scoreDefinitions/scoreDefinitionNavigation.ts
frontend/src/products.tsx -> products/error_tracking/frontend/settingsRedirects.ts
diff --git a/frontend/src/exporter/ExportedInsight/ExportedInsight.tsx b/frontend/src/exporter/ExportedInsight/ExportedInsight.tsx
index 7b17a960e1e3..8f7c676eb8e6 100644
--- a/frontend/src/exporter/ExportedInsight/ExportedInsight.tsx
+++ b/frontend/src/exporter/ExportedInsight/ExportedInsight.tsx
@@ -16,8 +16,10 @@ import { insightLogic } from 'scenes/insights/insightLogic'
import { DISPLAYS_WITH_IN_CHART_LEGEND } from 'scenes/insights/insightVizDataLogic'
import { Query } from '~/queries/Query/Query'
+import { getDisplay } from '~/queries/schema/node-accessors'
+import { isDataTableNode, isInsightVizNode, isTrendsQuery } from '~/queries/schema/node-guards'
import { SharingConfigurationSettings } from '~/queries/schema/schema-general'
-import { getDisplay, isDataTableNode, isInsightVizNode, isMetricInsightQuery, isTrendsQuery } from '~/queries/utils'
+import { isMetricInsightQuery } from '~/queries/utils'
import { ChartDisplayType, DataColorThemeModel, InsightLogicProps, InsightModel } from '~/types'
import { InsightsTable } from 'products/product_analytics/frontend/insights/shared/InsightsTable/InsightsTable'
diff --git a/frontend/src/exporter/scenes/ExporterQueryScene.tsx b/frontend/src/exporter/scenes/ExporterQueryScene.tsx
index e5866521f8bc..6ec90126e953 100644
--- a/frontend/src/exporter/scenes/ExporterQueryScene.tsx
+++ b/frontend/src/exporter/scenes/ExporterQueryScene.tsx
@@ -11,8 +11,10 @@ import { insightLogic } from 'scenes/insights/insightLogic'
import { DISPLAYS_WITH_IN_CHART_LEGEND } from 'scenes/insights/insightVizDataLogic'
import { Query } from '~/queries/Query/Query'
+import { getDisplay } from '~/queries/schema/node-accessors'
+import { isInsightVizNode, isTrendsQuery } from '~/queries/schema/node-guards'
import { SharingConfigurationSettings } from '~/queries/schema/schema-general'
-import { getDisplay, isInsightVizNode, isMetricInsightQuery, isTrendsQuery } from '~/queries/utils'
+import { isMetricInsightQuery } from '~/queries/utils'
import { ChartDisplayType, InsightLogicProps } from '~/types'
import { ExportedData } from '../types'
diff --git a/frontend/src/layout/today/todayObjectGlances.ts b/frontend/src/layout/today/todayObjectGlances.ts
index 3141c6c23208..5f6f2b7efda5 100644
--- a/frontend/src/layout/today/todayObjectGlances.ts
+++ b/frontend/src/layout/today/todayObjectGlances.ts
@@ -5,8 +5,8 @@ import { baseObjectType } from 'scenes/library/libraryUtils'
import { todayNumber } from 'scenes/project-homepage/today/todayNumbers'
import type { Noun } from '~/models/groupsModel'
+import { isInsightVizNode, isTrendsQuery } from '~/queries/schema/node-guards'
import type { CurrencyCode, TrendsFilter } from '~/queries/schema/schema-general'
-import { isInsightVizNode, isTrendsQuery } from '~/queries/utils'
import { type Experiment, ExperimentStatus, type FeatureFlagConfig } from '~/types'
import { cohortsRetrieve } from 'products/cohorts/frontend/generated/api'
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx
index 00d87c0dfd59..8eb879fc83d0 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightCard.tsx
@@ -31,8 +31,9 @@ import { isSharedView } from '~/exporter/exporterViewLogic'
import { ErrorBoundary } from '~/layout/ErrorBoundary'
import { extractValidationError, extractValidationErrorCode } from '~/queries/nodes/InsightViz/utils'
import { Query } from '~/queries/Query/Query'
+import { queryVizDefinitelyRendersToCanvas } from '~/queries/schema/node-accessors'
+import { isBIVisualizationNode } from '~/queries/schema/node-guards'
import { DashboardFilter, HogQLVariable } from '~/queries/schema/schema-general'
-import { isBIVisualizationNode, queryVizDefinitelyRendersToCanvas } from '~/queries/utils'
import {
AccessControlLevel,
AccessControlResourceType,
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx
index cf765868c1a2..37fb3a9e88fd 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightDetails.tsx
@@ -35,6 +35,25 @@ import { humanizePathsEventTypes, hasUnsupportedBreakdownForDataWarehouseTrends
import { QUERY_TYPES_METADATA } from 'scenes/saved-insights/insightTypesMetadata'
import { urls } from 'scenes/urls'
+import { getCompareFilter, getInterval } from '~/queries/schema/node-accessors'
+import {
+ isActionsNode,
+ isAnyDataWarehouseNode,
+ isDataTableNodeWithHogQLQuery,
+ isDataVisualizationNode,
+ isEventsNode,
+ isFunnelsQuery,
+ isHogQLQuery,
+ isInsightQueryWithBreakdown,
+ isInsightQueryWithSeries,
+ isInsightVizNode,
+ isLifecycleQuery,
+ isPathsQuery,
+ isPathsV2Query,
+ isRetentionQuery,
+ isTrendsQuery,
+ hasBreakdownFilter,
+} from '~/queries/schema/node-guards'
import {
AnyEntityNode,
BreakdownFilter,
@@ -56,26 +75,6 @@ import {
DashboardFilter,
TileFilters,
} from '~/queries/schema/schema-general'
-import {
- getCompareFilter,
- getInterval,
- isActionsNode,
- isAnyDataWarehouseNode,
- isDataTableNodeWithHogQLQuery,
- isDataVisualizationNode,
- isEventsNode,
- isFunnelsQuery,
- isHogQLQuery,
- isInsightQueryWithBreakdown,
- isInsightQueryWithSeries,
- isInsightVizNode,
- isLifecycleQuery,
- isPathsQuery,
- isPathsV2Query,
- isRetentionQuery,
- isTrendsQuery,
- hasBreakdownFilter,
-} from '~/queries/utils'
import {
AnyPropertyFilter,
BaseMathType,
diff --git a/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx b/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
index 6bf6dadf26dd..90808fd9d960 100644
--- a/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/InsightMeta.tsx
@@ -49,13 +49,13 @@ import { QueryScanTileTooltip } from '~/queries/nodes/DataNode/QueryScanTileTool
import { WarehouseSyncWarningList } from '~/queries/nodes/DataNode/WarehouseSyncWarningList'
import { outOfDateSyncWarnings } from '~/queries/nodes/DataNode/warehouseSyncWarnings'
import { copyTableData, getInsightExportAdapter } from '~/queries/nodes/InsightViz/exportAdapters'
-import { Node, NodeKind, ProductKey } from '~/queries/schema/schema-general'
import {
isDataVisualizationNode,
isDataVisualizationNodeWithHogQLQuery,
isInsightVizNode,
isTrendsQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { Node, NodeKind, ProductKey } from '~/queries/schema/schema-general'
import {
AccessControlLevel,
AccessControlResourceType,
diff --git a/frontend/src/lib/components/Cards/InsightCard/TopHeading.tsx b/frontend/src/lib/components/Cards/InsightCard/TopHeading.tsx
index 28844c42dd9c..40354c2ef8f4 100644
--- a/frontend/src/lib/components/Cards/InsightCard/TopHeading.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/TopHeading.tsx
@@ -3,15 +3,9 @@ import { dateFilterToText } from 'lib/utils/dateFilters'
import { alignResolvedDateRangeToInterval, formatResolvedDateRange } from 'lib/utils/datetime'
import { InsightTypeMetadata, QUERY_TYPES_METADATA } from 'scenes/saved-insights/insightTypesMetadata'
+import { dateRangeFor, getInterval } from '~/queries/schema/node-accessors'
+import { containsHogQLQuery, isDataTableNode, isInsightQueryNode, isInsightVizNode } from '~/queries/schema/node-guards'
import { Node, NodeKind, ResolvedDateRangeResponse } from '~/queries/schema/schema-general'
-import {
- containsHogQLQuery,
- dateRangeFor,
- getInterval,
- isDataTableNode,
- isInsightQueryNode,
- isInsightVizNode,
-} from '~/queries/utils'
import { InsightFreshness } from './InsightFreshness'
import { IgnoresDashboardFiltersNotice, TileOverridesWarning } from './TileOverridesWarning'
diff --git a/frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx b/frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx
index 1d4b9f29cf87..973ec4c2e98f 100644
--- a/frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx
+++ b/frontend/src/lib/components/Cards/InsightCard/dashboardVisualizationOptions.tsx
@@ -9,14 +9,14 @@ import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import { isDisplayTabSupported } from '~/queries/nodes/DataVisualization/Components/SideBar'
-import { VisualizationNode, HogQLVariable, Node, NodeKind } from '~/queries/schema/schema-general'
import {
isDataVisualizationNodeWithHogQLQuery,
isInsightVizNode,
isRetentionQuery,
isStickinessQuery,
isTrendsQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { VisualizationNode, HogQLVariable, Node, NodeKind } from '~/queries/schema/schema-general'
import { ChartDisplayType, InsightType, RetentionDashboardDisplayType } from '~/types'
import { RetentionChartPicker } from 'products/product_analytics/frontend/insights/retention/filters/RetentionChartPicker'
diff --git a/frontend/src/lib/components/Cards/InsightCard/visualizationShape.ts b/frontend/src/lib/components/Cards/InsightCard/visualizationShape.ts
index 87ed717432ab..4a41605340e5 100644
--- a/frontend/src/lib/components/Cards/InsightCard/visualizationShape.ts
+++ b/frontend/src/lib/components/Cards/InsightCard/visualizationShape.ts
@@ -1,12 +1,12 @@
+import { getDisplay } from '~/queries/schema/node-accessors'
import {
- getDisplay,
isDataTableNode,
isDataVisualizationNode,
isFunnelsQuery,
isInsightVizNode,
isPathsQuery,
isRetentionQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
import { ChartDisplayType, FunnelVizType, InsightModel } from '~/types'
type VisualizationShape = 'line' | 'bar' | 'pie' | 'donut' | 'number' | 'table' | 'heatmap' | 'funnel'
diff --git a/frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts b/frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts
index 39740dfd6041..353aa6b73a9d 100644
--- a/frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts
+++ b/frontend/src/lib/components/FlagCalledRebuildBanner/flagCalledDependencies.ts
@@ -3,7 +3,6 @@ import { BehavioralFilterKey } from 'scenes/cohorts/CohortFilters/types'
import { isCohortCriteriaGroup } from 'scenes/cohorts/cohortUtils'
import { FEATURE_FLAG_CALLED_EVENT } from 'scenes/feature-flags/flagEvaluationsTable'
-import { Node } from '~/queries/schema/schema-general'
import {
isEventsNode,
isFunnelsQuery,
@@ -11,7 +10,8 @@ import {
isInsightQueryWithSeries,
isInsightVizNode,
isRetentionQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { Node } from '~/queries/schema/schema-general'
import {
ActionType,
AnyCohortCriteriaType,
diff --git a/frontend/src/lib/components/HogQLEditor/HogQLEditor.tsx b/frontend/src/lib/components/HogQLEditor/HogQLEditor.tsx
index becd58bde37e..35f6c35d0257 100644
--- a/frontend/src/lib/components/HogQLEditor/HogQLEditor.tsx
+++ b/frontend/src/lib/components/HogQLEditor/HogQLEditor.tsx
@@ -6,8 +6,8 @@ import { CLICK_OUTSIDE_BLOCK_CLASS } from 'lib/hooks/useOutsideClickHandler'
import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { CodeEditorInline } from 'lib/monaco/CodeEditorInline'
+import { isActorsQuery } from '~/queries/schema/node-guards'
import { AnyDataNode } from '~/queries/schema/schema-general'
-import { isActorsQuery } from '~/queries/utils'
export interface HogQLEditorProps {
onChange: (value: string) => void
diff --git a/frontend/src/lib/components/Sharing/SharingModal.tsx b/frontend/src/lib/components/Sharing/SharingModal.tsx
index 5507e918904f..4a48a4e8f351 100644
--- a/frontend/src/lib/components/Sharing/SharingModal.tsx
+++ b/frontend/src/lib/components/Sharing/SharingModal.tsx
@@ -36,9 +36,9 @@ import { urls } from 'scenes/urls'
import { AccessControlPopoutCTA } from '~/layout/navigation-3000/sidepanel/panels/access_control/AccessControlPopoutCTA'
import { nodeKindToInsightType } from '~/queries/nodes/InsightQuery/defaults'
+import { isDataTableNode, isDataVisualizationNode, isInsightVizNode } from '~/queries/schema/node-guards'
import { AnyResponseType, Node } from '~/queries/schema/schema-general'
import { NodeKind } from '~/queries/schema/schema-general'
-import { isDataTableNode, isDataVisualizationNode, isInsightVizNode } from '~/queries/utils'
import { AccessControlLevel, AccessControlResourceType, AvailableFeature, InsightShortId, InsightModel } from '~/types'
import { InsightType } from '~/types'
diff --git a/frontend/src/lib/utils/eventUsageLogic.ts b/frontend/src/lib/utils/eventUsageLogic.ts
index 111ce2e02003..4d6363109613 100644
--- a/frontend/src/lib/utils/eventUsageLogic.ts
+++ b/frontend/src/lib/utils/eventUsageLogic.ts
@@ -15,24 +15,6 @@ import { ProductTourEvent } from 'scenes/product-tours/constants'
import { SURVEY_CREATED_SOURCE } from 'scenes/surveys/constants'
import { userLogic } from 'scenes/userLogic'
-import {
- Breakdown,
- ExperimentFunnelsQuery,
- ExperimentMetric,
- ExperimentExposureNode,
- ExperimentMetricSource,
- ExperimentRetentionMetric,
- ExperimentTrendsQuery,
- InsightQueryNode,
- isExperimentExposureNode,
- isExperimentFunnelMetric,
- isExperimentMeanMetric,
- isExperimentRatioMetric,
- isExperimentRetentionMetric,
- Node,
- NodeKind,
-} from '~/queries/schema/schema-general'
-import { isBIVisualizationNode } from '~/queries/utils'
import {
getBreakdown,
getCompareFilter,
@@ -40,6 +22,10 @@ import {
getFormula,
getInterval,
getSeries,
+ queryUsesDataWarehouse,
+} from '~/queries/schema/node-accessors'
+import {
+ isBIVisualizationNode,
isActionsNode,
isAnyDataWarehouseNode,
isEventsNode,
@@ -50,8 +36,24 @@ import {
isNodeWithSource,
isStickinessQuery,
isTrendsQuery,
- queryUsesDataWarehouse,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import {
+ Breakdown,
+ ExperimentFunnelsQuery,
+ ExperimentMetric,
+ ExperimentExposureNode,
+ ExperimentMetricSource,
+ ExperimentRetentionMetric,
+ ExperimentTrendsQuery,
+ InsightQueryNode,
+ isExperimentExposureNode,
+ isExperimentFunnelMetric,
+ isExperimentMeanMetric,
+ isExperimentRatioMetric,
+ isExperimentRetentionMetric,
+ Node,
+ NodeKind,
+} from '~/queries/schema/schema-general'
import {
ChartDisplayType,
CohortType,
diff --git a/frontend/src/products.tsx b/frontend/src/products.tsx
index b1b8af65a19b..0e89dca54ea8 100644
--- a/frontend/src/products.tsx
+++ b/frontend/src/products.tsx
@@ -12,6 +12,12 @@ import type { SurveysTabs } from 'scenes/surveys/surveysLogic'
import { urls } from 'scenes/urls'
import { examples } from '~/queries/examples'
+import {
+ isBIVisualizationNode,
+ isDataTableNode,
+ isDataVisualizationNode,
+ isHogQLQuery,
+} from '~/queries/schema/node-guards'
import type { FileSystemImport } from '~/queries/schema/schema-general'
import {
DashboardFilter,
@@ -28,7 +34,6 @@ import {
ProductKey,
TileFilters,
} from '~/queries/schema/schema-general'
-import { isBIVisualizationNode, isDataTableNode, isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
import { ExperimentsTabs } from '~/types'
import { AlertType } from 'products/alerts/frontend/types'
diff --git a/frontend/src/queries/Query/Query.tsx b/frontend/src/queries/Query/Query.tsx
index 1204363b398f..6ce0f36bac63 100644
--- a/frontend/src/queries/Query/Query.tsx
+++ b/frontend/src/queries/Query/Query.tsx
@@ -12,6 +12,13 @@ import { DataTable } from '~/queries/nodes/DataTable/DataTable'
import { InsightViz, insightVizDataNodeKey } from '~/queries/nodes/InsightViz/InsightViz'
import { WebOverview } from '~/queries/nodes/WebOverview/WebOverview'
import { QueryEditor } from '~/queries/QueryEditor/QueryEditor'
+import {
+ isDataTableNode,
+ isDataVisualizationNode,
+ isInsightVizNode,
+ isMetricsQuery,
+ isWebOverviewQuery,
+} from '~/queries/schema/node-guards'
import {
AnyResponseType,
DashboardFilter,
@@ -30,17 +37,12 @@ import { MetricsHistogramQueryNode, MetricsQueryNode } from 'products/metrics/fr
import { DataTableVisualization } from '../nodes/DataVisualization/DataVisualization'
import { SavedInsight } from '../nodes/SavedInsight/SavedInsight'
import {
- isDataTableNode,
- isDataVisualizationNode,
isEndpointsUsageOverviewQuery,
isEndpointsUsageTrendsQuery,
isHogQuery,
- isInsightVizNode,
isMarketingAnalyticsAggregatedQuery,
isMetricsHistogramQuery,
- isMetricsQuery,
isSavedInsightNode,
- isWebOverviewQuery,
isWebVitalsPathBreakdownQuery,
isWebVitalsQuery,
} from '../utils'
diff --git a/frontend/src/queries/nodes/DataNode/DateRange.tsx b/frontend/src/queries/nodes/DataNode/DateRange.tsx
index ca9cfd65fb2e..e1268de3724f 100644
--- a/frontend/src/queries/nodes/DataNode/DateRange.tsx
+++ b/frontend/src/queries/nodes/DataNode/DateRange.tsx
@@ -1,6 +1,7 @@
import { DateFilter } from 'lib/components/DateFilter/DateFilter'
import { LemonButtonProps } from 'lib/lemon-ui/LemonButton'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import {
EventsQuery,
HogQLQuery,
@@ -8,13 +9,7 @@ import {
SessionsQuery,
TracesQuery,
} from '~/queries/schema/schema-general'
-import {
- isEventsQuery,
- isHogQLQuery,
- isSessionAttributionExplorerQuery,
- isSessionsQuery,
- isTracesQuery,
-} from '~/queries/utils'
+import { isEventsQuery, isSessionAttributionExplorerQuery, isSessionsQuery, isTracesQuery } from '~/queries/utils'
interface DateRangeProps<
Q extends EventsQuery | HogQLQuery | SessionAttributionExplorerQuery | SessionsQuery | TracesQuery,
diff --git a/frontend/src/queries/nodes/DataNode/LoadNext.tsx b/frontend/src/queries/nodes/DataNode/LoadNext.tsx
index d4a5004c2e8c..8388ae5ace85 100644
--- a/frontend/src/queries/nodes/DataNode/LoadNext.tsx
+++ b/frontend/src/queries/nodes/DataNode/LoadNext.tsx
@@ -6,8 +6,8 @@ import { LemonButton } from 'lib/lemon-ui/LemonButton'
import { humanFriendlyNumber } from 'lib/utils/numbers'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
+import { isDataVisualizationNode, isHogQLQuery } from '~/queries/schema/node-guards'
import { DataNode } from '~/queries/schema/schema-general'
-import { isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
import { DEFAULT_PAGE_SIZE } from '../DataVisualization/Components/Table'
diff --git a/frontend/src/queries/nodes/DataNode/TestAccountFilters.tsx b/frontend/src/queries/nodes/DataNode/TestAccountFilters.tsx
index 3a163d726bfe..6a15a93f94f6 100644
--- a/frontend/src/queries/nodes/DataNode/TestAccountFilters.tsx
+++ b/frontend/src/queries/nodes/DataNode/TestAccountFilters.tsx
@@ -4,6 +4,7 @@ import { TestAccountFilterSwitch } from 'lib/components/TestAccountFiltersSwitch
import { filterTestAccountsDefaultsLogic } from 'scenes/settings/environment/filterTestAccountDefaultsLogic'
import { teamLogic } from 'scenes/teamLogic'
+import { isActorsQuery, isHogQLQuery } from '~/queries/schema/node-guards'
import {
ActorsQuery,
DataNode,
@@ -12,7 +13,7 @@ import {
SessionsQuery,
TracesQuery,
} from '~/queries/schema/schema-general'
-import { isActorsQuery, isEventsQuery, isHogQLQuery, isSessionsQuery, isTracesQuery } from '~/queries/utils'
+import { isEventsQuery, isSessionsQuery, isTracesQuery } from '~/queries/utils'
interface TestAccountFiltersProps {
query: DataNode
diff --git a/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts b/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts
index 4fca709c8f28..8caa7170cd10 100644
--- a/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts
+++ b/frontend/src/queries/nodes/DataNode/dataNodeLogic.ts
@@ -43,6 +43,14 @@ import {
validateQuery,
} from '~/queries/nodes/InsightViz/queryUtils'
import { performQuery } from '~/queries/query'
+import {
+ isActorsQuery,
+ isDataVisualizationNode,
+ isHogQLQuery,
+ isInsightQueryNode,
+ isPersonsNode,
+ isWebStatsTableQuery,
+} from '~/queries/schema/node-guards'
import {
AccountsQuery,
AccountsQueryResponse,
@@ -88,21 +96,15 @@ import {
import {
isAccountsQuery,
isAccountsTableQuery,
- isActorsQuery,
isErrorTrackingIssueEventsQuery,
isErrorTrackingQuery,
isEventsQuery,
isGroupsQuery,
- isDataVisualizationNode,
- isHogQLQuery,
isInsightActorsQuery,
- isInsightQueryNode,
isMarketingAnalyticsTableQuery,
- isPersonsNode,
isSessionQuery,
isSessionsQuery,
isTracesQuery,
- isWebStatsTableQuery,
} from '~/queries/utils'
import { TeamType } from '~/types'
diff --git a/frontend/src/queries/nodes/DataTable/ColumnConfigurator/ColumnConfigurator.tsx b/frontend/src/queries/nodes/DataTable/ColumnConfigurator/ColumnConfigurator.tsx
index c7428860da62..edf7c125fb0a 100644
--- a/frontend/src/queries/nodes/DataTable/ColumnConfigurator/ColumnConfigurator.tsx
+++ b/frontend/src/queries/nodes/DataTable/ColumnConfigurator/ColumnConfigurator.tsx
@@ -23,9 +23,9 @@ import { LemonModal } from 'lib/lemon-ui/LemonModal'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { dataTableLogic } from '~/queries/nodes/DataTable/dataTableLogic'
+import { isActorsQuery } from '~/queries/schema/node-guards'
import { DataTableNode } from '~/queries/schema/schema-general'
import {
- isActorsQuery,
isEventsQuery,
isGroupsQuery,
isSessionsQuery,
diff --git a/frontend/src/queries/nodes/DataTable/DataTable.tsx b/frontend/src/queries/nodes/DataTable/DataTable.tsx
index e29e0cabc5fc..0a391901ee25 100644
--- a/frontend/src/queries/nodes/DataTable/DataTable.tsx
+++ b/frontend/src/queries/nodes/DataTable/DataTable.tsx
@@ -55,6 +55,7 @@ import { PersonPropertyFilters } from '~/queries/nodes/PersonsNode/PersonPropert
import { PersonsSearch } from '~/queries/nodes/PersonsNode/PersonsSearch'
import { SessionPropertyFilters } from '~/queries/nodes/SessionsNode/SessionPropertyFilters'
import { TracesSearch } from '~/queries/nodes/TracesQuery/TracesSearch'
+import { isActorsQuery, isHogQLQuery } from '~/queries/schema/node-guards'
import {
ActorsQuery,
AnyResponseType,
@@ -73,11 +74,9 @@ import {
} from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
import {
- isActorsQuery,
isEventsQuery,
isGroupsQuery,
isHogQLAggregation,
- isHogQLQuery,
isInsightActorsQuery,
isMarketingAnalyticsTableQuery,
isSessionsQuery,
diff --git a/frontend/src/queries/nodes/DataTable/DataTableCount.tsx b/frontend/src/queries/nodes/DataTable/DataTableCount.tsx
index ea74da64a9bd..8a753a70f694 100644
--- a/frontend/src/queries/nodes/DataTable/DataTableCount.tsx
+++ b/frontend/src/queries/nodes/DataTable/DataTableCount.tsx
@@ -3,7 +3,8 @@ import { useValues } from 'kea'
import { pluralize } from 'lib/utils/strings'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
-import { isActorsQuery, isEventsQuery, isGroupsQuery, isSessionsQuery } from '~/queries/utils'
+import { isActorsQuery } from '~/queries/schema/node-guards'
+import { isEventsQuery, isGroupsQuery, isSessionsQuery } from '~/queries/utils'
export function DataTableCount({ nouns }: { nouns?: [string, string] }): JSX.Element | null {
const { totalCount, totalCountLoading, filteredCount, filteredCountLoading, hasActiveFilters, query } =
diff --git a/frontend/src/queries/nodes/DataTable/DataTableExport.tsx b/frontend/src/queries/nodes/DataTable/DataTableExport.tsx
index e74e2b7ccd6e..6e79faf674c5 100644
--- a/frontend/src/queries/nodes/DataTable/DataTableExport.tsx
+++ b/frontend/src/queries/nodes/DataTable/DataTableExport.tsx
@@ -26,16 +26,9 @@ import {
} from '~/queries/nodes/DataTable/exportTransformers'
import { defaultDataTableColumns, removeExpressionComment } from '~/queries/nodes/DataTable/utils'
import { getPersonsEndpoint } from '~/queries/query'
+import { isActorsQuery, isHogQLQuery, isPersonsNode } from '~/queries/schema/node-guards'
import { DataNode, DataTableNode } from '~/queries/schema/schema-general'
-import {
- isActorsQuery,
- isEventsQuery,
- isGroupsQuery,
- isHogQLQuery,
- isMarketingAnalyticsTableQuery,
- isPersonsNode,
- isSessionsQuery,
-} from '~/queries/utils'
+import { isEventsQuery, isGroupsQuery, isMarketingAnalyticsTableQuery, isSessionsQuery } from '~/queries/utils'
import { AccessControlLevel, AccessControlResourceType, ExportContext, ExporterFormat } from '~/types'
import { DataTableExportColumnsModal } from './DataTableExportColumnsModal'
diff --git a/frontend/src/queries/nodes/DataTable/clipboardUtils.ts b/frontend/src/queries/nodes/DataTable/clipboardUtils.ts
index e21bc2350d60..19c081e08345 100644
--- a/frontend/src/queries/nodes/DataTable/clipboardUtils.ts
+++ b/frontend/src/queries/nodes/DataTable/clipboardUtils.ts
@@ -5,14 +5,9 @@ import { lemonToast } from '@posthog/lemon-ui'
import { copyToClipboard } from 'lib/utils/copyToClipboard'
import { extractExpressionComment, removeExpressionComment } from '~/queries/nodes/DataTable/utils'
+import { isActorsQuery, isHogQLQuery, isPersonsNode } from '~/queries/schema/node-guards'
import { DataTableNode } from '~/queries/schema/schema-general'
-import {
- isActorsQuery,
- isEventsQuery,
- isHogQLQuery,
- isMarketingAnalyticsTableQuery,
- isPersonsNode,
-} from '~/queries/utils'
+import { isEventsQuery, isMarketingAnalyticsTableQuery } from '~/queries/utils'
import { asDisplay } from 'products/persons/frontend/person-utils'
diff --git a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
index c56c46d6ac0e..d02f0d0b8038 100644
--- a/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/dataTableLogic.ts
@@ -23,6 +23,7 @@ import { teamLogic } from 'scenes/teamLogic'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { QueryFeature, getQueryFeatures } from '~/queries/nodes/DataTable/queryFeatures'
import { insightVizDataCollectionId } from '~/queries/nodes/InsightViz/insightVizKeys'
+import { isDataTableNode } from '~/queries/schema/node-guards'
import {
AnyDataNode,
AnyResponseType,
@@ -32,7 +33,7 @@ import {
NodeKind,
} from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
-import { isDataTableNode, isEventsQuery } from '~/queries/utils'
+import { isEventsQuery } from '~/queries/utils'
import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
import type { TeamPublicType, TeamType } from '../../../types'
diff --git a/frontend/src/queries/nodes/DataTable/queryFeatures.ts b/frontend/src/queries/nodes/DataTable/queryFeatures.ts
index 830faf6d55bb..9e49918f85fb 100644
--- a/frontend/src/queries/nodes/DataTable/queryFeatures.ts
+++ b/frontend/src/queries/nodes/DataTable/queryFeatures.ts
@@ -1,22 +1,24 @@
+import {
+ isActorsQuery,
+ isHogQLQuery,
+ isPersonsNode,
+ isWebOverviewQuery,
+ isWebStatsTableQuery,
+} from '~/queries/schema/node-guards'
import { MarketingAnalyticsDrillDownLevel, Node } from '~/queries/schema/schema-general'
import {
isAccountsQuery,
isAccountsTableQuery,
- isActorsQuery,
isEndpointsUsageTableQuery,
isEventsQuery,
isGroupsQuery,
- isHogQLQuery,
isMarketingAnalyticsTableQuery,
- isPersonsNode,
isSessionAttributionExplorerQuery,
isSessionsQuery,
isTracesQuery,
isWebBotsTableQuery,
isWebExternalClicksQuery,
isWebGoalsQuery,
- isWebOverviewQuery,
- isWebStatsTableQuery,
} from '~/queries/utils'
export enum QueryFeature {
diff --git a/frontend/src/queries/nodes/DataTable/renderColumn.tsx b/frontend/src/queries/nodes/DataTable/renderColumn.tsx
index fda6bc4ee78f..001be5336f1a 100644
--- a/frontend/src/queries/nodes/DataTable/renderColumn.tsx
+++ b/frontend/src/queries/nodes/DataTable/renderColumn.tsx
@@ -23,6 +23,7 @@ import { urls } from 'scenes/urls'
import { errorColumn, loadingColumn } from '~/queries/nodes/DataTable/dataTableLogic'
import { renderHogQLX } from '~/queries/nodes/HogQLX/render'
import { DeletePersonButton } from '~/queries/nodes/PersonsNode/DeletePersonButton'
+import { isActorsQuery, isHogQLQuery, isPersonsNode } from '~/queries/schema/node-guards'
import {
CurrencyCode,
DataTableNode,
@@ -31,15 +32,7 @@ import {
LLMTracePerson,
} from '~/queries/schema/schema-general'
import { QueryContext, QueryContextColumn } from '~/queries/types'
-import {
- isActorsQuery,
- isEventsQuery,
- isGroupsQuery,
- isHogQLQuery,
- isPersonsNode,
- isTracesQuery,
- trimQuotes,
-} from '~/queries/utils'
+import { isEventsQuery, isGroupsQuery, isTracesQuery, trimQuotes } from '~/queries/utils'
import { AnyPropertyFilter, EventType, PersonType, PropertyFilterType, PropertyOperator } from '~/types'
import { aiObservabilityGlobalColumnRenderers } from 'products/ai_observability/frontend/aiObservabilityGlobalColumns'
diff --git a/frontend/src/queries/nodes/DataTable/renderColumnMeta.tsx b/frontend/src/queries/nodes/DataTable/renderColumnMeta.tsx
index cda6af4cfb1e..420c17d85111 100644
--- a/frontend/src/queries/nodes/DataTable/renderColumnMeta.tsx
+++ b/frontend/src/queries/nodes/DataTable/renderColumnMeta.tsx
@@ -4,6 +4,7 @@ import { SortingIndicator } from 'lib/lemon-ui/LemonTable/sorting'
import { QueryFeature, getQueryFeatures } from '~/queries/nodes/DataTable/queryFeatures'
import { extractExpressionComment, removeExpressionComment } from '~/queries/nodes/DataTable/utils'
+import { isDataTableNode, isHogQLQuery } from '~/queries/schema/node-guards'
import {
DataTableNode,
VisualizationNode,
@@ -11,13 +12,7 @@ import {
MarketingAnalyticsTableQuery,
} from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
-import {
- isDataTableNode,
- isGroupsQuery,
- isHogQLQuery,
- isMarketingAnalyticsTableQuery,
- trimQuotes,
-} from '~/queries/utils'
+import { isGroupsQuery, isMarketingAnalyticsTableQuery, trimQuotes } from '~/queries/utils'
export interface ColumnMeta {
title?: JSX.Element | string
diff --git a/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx b/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx
index 2af778c6da6a..e6d8258de8df 100644
--- a/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx
+++ b/frontend/src/queries/nodes/EventsNode/EventPropertyFilters.tsx
@@ -5,6 +5,7 @@ import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
import { groupsModel } from '~/models/groupsModel'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import {
EventsNode,
EventsQuery,
@@ -13,7 +14,7 @@ import {
SessionsQuery,
TracesQuery,
} from '~/queries/schema/schema-general'
-import { isHogQLQuery, isSessionAttributionExplorerQuery, isSessionsQuery } from '~/queries/utils'
+import { isSessionAttributionExplorerQuery, isSessionsQuery } from '~/queries/utils'
import { AnyPropertyFilter } from '~/types'
interface EventPropertyFiltersProps<
diff --git a/frontend/src/queries/nodes/InsightViz/daysOfWeekFilterUtils.ts b/frontend/src/queries/nodes/InsightViz/daysOfWeekFilterUtils.ts
index f18f917b0826..7e696e5c0753 100644
--- a/frontend/src/queries/nodes/InsightViz/daysOfWeekFilterUtils.ts
+++ b/frontend/src/queries/nodes/InsightViz/daysOfWeekFilterUtils.ts
@@ -1,5 +1,5 @@
+import { isFunnelsQuery, isStickinessQuery, isTrendsQuery } from '~/queries/schema/node-guards'
import { DateRange } from '~/queries/schema/schema-general'
-import { isFunnelsQuery, isStickinessQuery, isTrendsQuery } from '~/queries/utils'
export type IsoDayOfWeek = NonNullable<DateRange['daysOfWeek']>[number]
diff --git a/frontend/src/queries/nodes/InsightViz/exportAdapters.ts b/frontend/src/queries/nodes/InsightViz/exportAdapters.ts
index dffad7d923d8..cd636e6cd87b 100644
--- a/frontend/src/queries/nodes/InsightViz/exportAdapters.ts
+++ b/frontend/src/queries/nodes/InsightViz/exportAdapters.ts
@@ -6,6 +6,7 @@ import { copyToClipboard } from 'lib/utils/copyToClipboard'
import { ensureStringIsNotBlank } from 'lib/utils/strings'
import { getResultSeries } from 'scenes/insights/utils/resultSeries'
+import { isTrendsQuery } from '~/queries/schema/node-guards'
import {
EventsHeatMapColumnAggregationResult,
EventsHeatMapDataResult,
@@ -17,7 +18,6 @@ import {
TrendsQuery,
TrendsQueryResponse,
} from '~/queries/schema/schema-general'
-import { isTrendsQuery } from '~/queries/utils'
import { ChartDisplayType, ExporterFormat } from '~/types'
export interface ExportAdapter {
diff --git a/frontend/src/queries/nodes/InsightViz/queryUtils.ts b/frontend/src/queries/nodes/InsightViz/queryUtils.ts
index 7bfd5751d873..45e7a67365fa 100644
--- a/frontend/src/queries/nodes/InsightViz/queryUtils.ts
+++ b/frontend/src/queries/nodes/InsightViz/queryUtils.ts
@@ -4,6 +4,20 @@ import { objectCleanWithEmpty, objectsEqual, removeUndefinedAndNull } from 'lib/
import { Variable } from '~/queries/nodes/DataVisualization/types'
import { nodeKindToInsightType } from '~/queries/nodes/InsightQuery/defaults'
import { getDefaultQuery } from '~/queries/nodes/InsightViz/utils'
+import {
+ isEventsNode,
+ isFunnelsDataWarehouseNode,
+ isFunnelsQuery,
+ isHogQLQuery,
+ isInsightQueryNode,
+ isInsightQueryWithSeries,
+ isInsightVizNode,
+ isLifecycleQuery,
+ isPathsQuery,
+ isRetentionQuery,
+ isStickinessQuery,
+ isTrendsQuery,
+} from '~/queries/schema/node-guards'
import {
DataNode,
FunnelsQuery,
@@ -18,19 +32,7 @@ import {
filterForQuery,
filterKeyForQuery,
getMathTypeWarning,
- isEventsNode,
- isFunnelsDataWarehouseNode,
- isFunnelsQuery,
- isHogQLQuery,
- isInsightQueryNode,
isInsightQueryWithDisplay,
- isInsightQueryWithSeries,
- isInsightVizNode,
- isLifecycleQuery,
- isPathsQuery,
- isRetentionQuery,
- isStickinessQuery,
- isTrendsQuery,
isWebAnalyticsInsightQuery,
} from '~/queries/utils'
import { BaseMathType, ChartDisplayType } from '~/types'
diff --git a/frontend/src/queries/nodes/InsightViz/utils.ts b/frontend/src/queries/nodes/InsightViz/utils.ts
index f6511b536f58..55a1bc911be8 100644
--- a/frontend/src/queries/nodes/InsightViz/utils.ts
+++ b/frontend/src/queries/nodes/InsightViz/utils.ts
@@ -4,6 +4,7 @@ import { ApiError } from 'lib/api'
import { getEventNamesForAction } from 'lib/utils/events'
import { examples } from '~/queries/examples'
+import { isInsightQueryWithSeries } from '~/queries/schema/node-guards'
import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
DataTableNode,
@@ -15,7 +16,6 @@ import {
Node,
NodeKind,
} from '~/queries/schema/schema-general'
-import { isInsightQueryWithSeries } from '~/queries/utils'
import { ActionType, InsightModel, InsightType } from '~/types'
import { ProductAnalyticsInsightNodeKind, getNodeKindToDefaultQuery } from '../InsightQuery/defaults'
diff --git a/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx b/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx
index f38ac87990a2..ea350db17df7 100644
--- a/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx
+++ b/frontend/src/queries/nodes/PersonsNode/PersonPropertyFilters.tsx
@@ -3,8 +3,8 @@ import { useState } from 'react'
import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
+import { isActorsQuery } from '~/queries/schema/node-guards'
import { ActorsQuery, NodeKind, PersonsNode } from '~/queries/schema/schema-general'
-import { isActorsQuery } from '~/queries/utils'
import { PersonPropertyFilter } from '~/types'
interface PersonPropertyFiltersProps {
diff --git a/frontend/src/queries/query.ts b/frontend/src/queries/query.ts
index e3a84fc1ce29..7cdc4836b56d 100644
--- a/frontend/src/queries/query.ts
+++ b/frontend/src/queries/query.ts
@@ -7,6 +7,14 @@ import { uuid } from 'lib/utils/dom'
import { HogQLQueryString } from 'lib/utils/hogql'
import { isSharedView } from '~/exporter/exporterViewLogic'
+import { queryUsesDataWarehouse } from '~/queries/schema/node-accessors'
+import {
+ isDataTableNode,
+ isDataVisualizationNode,
+ isHogQLQuery,
+ isInsightQueryNode,
+ isPersonsNode,
+} from '~/queries/schema/node-guards'
import {
DashboardFilter,
DataNode,
@@ -21,16 +29,7 @@ import {
} from '~/queries/schema/schema-general'
import { OnlineExportContext, QueryExportContext } from '~/types'
-import {
- dataWarehouseSourcesFromResponse,
- isAsyncResponse,
- isDataTableNode,
- isDataVisualizationNode,
- isHogQLQuery,
- isInsightQueryNode,
- isPersonsNode,
- queryUsesDataWarehouse,
-} from './utils'
+import { dataWarehouseSourcesFromResponse, isAsyncResponse } from './utils'
export function waitForPageVisible(signal?: AbortSignal): Promise<void> {
if (typeof document === 'undefined' || document.visibilityState === 'visible') {
diff --git a/frontend/src/queries/schema/node-accessors.test.ts b/frontend/src/queries/schema/node-accessors.test.ts
new file mode 100644
index 000000000000..14bb5e72bee5
--- /dev/null
+++ b/frontend/src/queries/schema/node-accessors.test.ts
@@ -0,0 +1,191 @@
+import { InsightQueryNode, NodeKind } from '~/queries/schema/schema-general'
+import { ChartDisplayType, FunnelVizType } from '~/types'
+
+import {
+ getDisplay,
+ queryUsesDataWarehouse,
+ queryVizDefinitelyRendersToCanvas,
+ queryVizRendersToCanvas,
+} from './node-accessors'
+
+describe('queryVizRendersToCanvas', () => {
+ const insightViz = (source: InsightQueryNode): any => ({ kind: NodeKind.InsightVizNode, source })
+ const trends = (display?: ChartDisplayType): InsightQueryNode =>
+ ({ kind: NodeKind.TrendsQuery, series: [], trendsFilter: display ? { display } : {} }) as InsightQueryNode
+
+ it.each([
+ {
+ name: 'HogQL data table',
+ query: { kind: NodeKind.DataTableNode } as any,
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'SQL viz as chart',
+ query: { kind: NodeKind.DataVisualizationNode, display: ChartDisplayType.ActionsLineGraph } as any,
+ expectedMayRenderToCanvas: true,
+ expectedDefinitelyRendersToCanvas: true,
+ },
+ {
+ name: 'SQL viz as table (no display)',
+ query: { kind: NodeKind.DataVisualizationNode } as any,
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'SQL viz with auto display',
+ query: { kind: NodeKind.DataVisualizationNode, display: ChartDisplayType.Auto } as any,
+ expectedMayRenderToCanvas: true,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'trends line chart',
+ query: insightViz(trends(ChartDisplayType.ActionsLineGraph)),
+ expectedMayRenderToCanvas: true,
+ expectedDefinitelyRendersToCanvas: true,
+ },
+ {
+ name: 'trends default display',
+ query: insightViz(trends()),
+ expectedMayRenderToCanvas: true,
+ expectedDefinitelyRendersToCanvas: true,
+ },
+ {
+ name: 'trends bold number',
+ query: insightViz(trends(ChartDisplayType.BoldNumber)),
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'trends table',
+ query: insightViz(trends(ChartDisplayType.ActionsTable)),
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'trends world map',
+ query: insightViz(trends(ChartDisplayType.WorldMap)),
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'funnel steps (default)',
+ query: insightViz({ kind: NodeKind.FunnelsQuery, series: [] } as InsightQueryNode),
+ expectedMayRenderToCanvas: true,
+ expectedDefinitelyRendersToCanvas: true,
+ },
+ {
+ name: 'funnel flow (Sankey)',
+ query: insightViz({
+ kind: NodeKind.FunnelsQuery,
+ series: [],
+ funnelsFilter: { funnelVizType: FunnelVizType.Flow },
+ } as InsightQueryNode),
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'funnel time to convert (table)',
+ query: insightViz({
+ kind: NodeKind.FunnelsQuery,
+ series: [],
+ funnelsFilter: { funnelVizType: FunnelVizType.TimeToConvert },
+ } as InsightQueryNode),
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'funnel trends (line chart)',
+ query: insightViz({
+ kind: NodeKind.FunnelsQuery,
+ series: [],
+ funnelsFilter: { funnelVizType: FunnelVizType.Trends },
+ } as InsightQueryNode),
+ expectedMayRenderToCanvas: true,
+ expectedDefinitelyRendersToCanvas: true,
+ },
+ {
+ name: 'retention',
+ query: insightViz({ kind: NodeKind.RetentionQuery } as InsightQueryNode),
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'paths',
+ query: insightViz({ kind: NodeKind.PathsQuery } as InsightQueryNode),
+ expectedMayRenderToCanvas: false,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ {
+ name: 'null query',
+ query: null,
+ expectedMayRenderToCanvas: true,
+ expectedDefinitelyRendersToCanvas: false,
+ },
+ ])('classifies $name', ({ query, expectedMayRenderToCanvas, expectedDefinitelyRendersToCanvas }) => {
+ expect(queryVizRendersToCanvas(query)).toBe(expectedMayRenderToCanvas)
+ expect(queryVizDefinitelyRendersToCanvas(query)).toBe(expectedDefinitelyRendersToCanvas)
+ })
+})
+
+describe('queryUsesDataWarehouse', () => {
+ it('returns true for a trends query with a data warehouse series', () => {
+ expect(
+ queryUsesDataWarehouse({
+ kind: NodeKind.TrendsQuery,
+ series: [{ kind: NodeKind.DataWarehouseNode, id: 'my_table', table_name: 'stripe.charges' }],
+ } as any)
+ ).toBe(true)
+ })
+
+ it('unwraps InsightVizNode to inspect its source', () => {
+ expect(
+ queryUsesDataWarehouse({
+ kind: NodeKind.InsightVizNode,
+ source: {
+ kind: NodeKind.TrendsQuery,
+ series: [{ kind: NodeKind.DataWarehouseNode, id: 'my_table', table_name: 'stripe.charges' }],
+ },
+ } as any)
+ ).toBe(true)
+ })
+
+ it('returns false for an events-only trends query', () => {
+ expect(
+ queryUsesDataWarehouse({
+ kind: NodeKind.TrendsQuery,
+ series: [{ kind: NodeKind.EventsNode, event: '$pageview' }],
+ } as any)
+ ).toBe(false)
+ })
+
+ it('returns false for null/undefined', () => {
+ expect(queryUsesDataWarehouse(null)).toBe(false)
+ expect(queryUsesDataWarehouse(undefined)).toBe(false)
+ })
+})
+
+describe('getDisplay', () => {
+ // ActionsStackedBar is a deprecated trends/stickiness alias of ActionsBar; the API and MCP
+ // accept it, and nothing downstream of getDisplay knows how to render it.
+ it.each([
+ [
+ 'trends',
+ {
+ kind: NodeKind.TrendsQuery,
+ series: [],
+ trendsFilter: { display: ChartDisplayType.ActionsStackedBar },
+ },
+ ],
+ [
+ 'stickiness',
+ {
+ kind: NodeKind.StickinessQuery,
+ series: [],
+ stickinessFilter: { display: ChartDisplayType.ActionsStackedBar },
+ },
+ ],
+ ])('normalizes the deprecated ActionsStackedBar alias to ActionsBar for %s', (_, query) => {
+ expect(getDisplay(query as InsightQueryNode)).toEqual(ChartDisplayType.ActionsBar)
+ })
+})
diff --git a/frontend/src/queries/schema/node-accessors.ts b/frontend/src/queries/schema/node-accessors.ts
new file mode 100644
index 000000000000..ff274017c29e
--- /dev/null
+++ b/frontend/src/queries/schema/node-accessors.ts
@@ -0,0 +1,185 @@
+import { ChartDisplayType, FunnelVizType, IntervalType } from '~/types'
+
+import {
+ isActionsNode,
+ isAnyDataWarehouseNode,
+ isDataTableNode,
+ isDataVisualizationNode,
+ isEventsNode,
+ isFunnelsQuery,
+ isInsightQueryNode,
+ isInsightQueryWithBreakdown,
+ isInsightQueryWithCompare,
+ isInsightQueryWithSeries,
+ isInsightVizNode,
+ isPathsQuery,
+ isPersonsNode,
+ isRetentionQuery,
+ isStickinessQuery,
+ isTrendsQuery,
+ isWebOverviewQuery,
+ isWebStatsTableQuery,
+} from './node-guards'
+import {
+ AnyDataWarehouseNode,
+ AnyEntityNode,
+ BreakdownFilter,
+ CompareFilter,
+ DateRange,
+ GroupNode,
+ InsightQueryNode,
+ Node,
+} from './schema-general'
+
+export function dateRangeFor(node?: Node): DateRange | undefined {
+ if (isInsightVizNode(node)) {
+ return node.source.dateRange
+ } else if (isInsightQueryNode(node)) {
+ return node.dateRange
+ } else if (isActionsNode(node)) {
+ return undefined
+ } else if (isEventsNode(node)) {
+ return undefined
+ } else if (isPersonsNode(node)) {
+ return undefined
+ } else if (isDataTableNode(node)) {
+ return undefined
+ }
+
+ return undefined
+}
+
+export const getInterval = (query: InsightQueryNode): IntervalType | undefined => {
+ if (isInsightQueryWithSeries(query)) {
+ return query.interval
+ }
+ if (isWebStatsTableQuery(query) || isWebOverviewQuery(query)) {
+ return query.interval ?? 'day'
+ }
+ return undefined
+}
+
+// For trends/stickiness, ActionsStackedBar is a deprecated alias of ActionsBar (which renders stacked):
+// the UI never emits it, but the API and MCP accept it. Normalizing here — the point all `display`
+// selectors derive from — makes such insights behave exactly like their UI-created equivalents.
+export const normalizeDisplay = (display: ChartDisplayType | undefined): ChartDisplayType | undefined =>
+ display === ChartDisplayType.ActionsStackedBar ? ChartDisplayType.ActionsBar : display
+
+export const getDisplay = (query: InsightQueryNode): ChartDisplayType | undefined => {
+ if (isStickinessQuery(query)) {
+ return normalizeDisplay(query.stickinessFilter?.display)
+ } else if (isTrendsQuery(query)) {
+ return normalizeDisplay(query.trendsFilter?.display)
+ }
+ return undefined
+}
+
+// Display types whose viz paints to a <canvas> (Chart.js / quill-charts), which repaints on every resize
+// frame. Everything else renders as DOM/SVG and is cheap to keep mounted while a tile is resized.
+const CANVAS_CHART_DISPLAY_TYPES = new Set<ChartDisplayType>([
+ ChartDisplayType.Auto,
+ ChartDisplayType.ActionsLineGraph,
+ ChartDisplayType.ActionsLineGraphCumulative,
+ ChartDisplayType.ActionsAreaGraph,
+ ChartDisplayType.ActionsBar,
+ ChartDisplayType.ActionsUnstackedBar,
+ ChartDisplayType.ActionsStackedBar,
+ ChartDisplayType.ActionsBarValue,
+ ChartDisplayType.ActionsPie,
+ ChartDisplayType.ActionsDonut,
+ ChartDisplayType.ActionsProportionBar,
+ ChartDisplayType.Metric,
+ ChartDisplayType.BoxPlot,
+ ChartDisplayType.SlopeGraph,
+ ChartDisplayType.TwoDimensionalHeatmap,
+ ChartDisplayType.ScatterPlot,
+])
+
+type QueryVizCanvasClassification = 'canvas' | 'non-canvas' | 'unknown'
+
+function classifyQueryVizCanvas(query?: Node | null): QueryVizCanvasClassification {
+ if (isDataTableNode(query)) {
+ return 'non-canvas'
+ }
+ if (isDataVisualizationNode(query)) {
+ if (!query.display) {
+ return 'non-canvas'
+ }
+ if (query.display === ChartDisplayType.Auto) {
+ return 'unknown'
+ }
+ return CANVAS_CHART_DISPLAY_TYPES.has(query.display) ? 'canvas' : 'non-canvas'
+ }
+ if (isInsightVizNode(query)) {
+ const source = query.source
+ if (isRetentionQuery(source) || isPathsQuery(source)) {
+ return 'non-canvas'
+ }
+ if (isFunnelsQuery(source)) {
+ // Steps (default) and Trends paint to canvas; Flow (Sankey) is SVG and TimeToConvert is a DOM table.
+ const vizType = source.funnelsFilter?.funnelVizType
+ return vizType !== FunnelVizType.Flow && vizType !== FunnelVizType.TimeToConvert ? 'canvas' : 'non-canvas'
+ }
+ return CANVAS_CHART_DISPLAY_TYPES.has(getDisplay(source) ?? ChartDisplayType.Auto) ? 'canvas' : 'non-canvas'
+ }
+ return 'unknown'
+}
+
+/**
+ * Whether an insight's viz may paint to a <canvas>. Unknown visualizations count as canvas so resize throttling
+ * remains conservative.
+ */
+export function queryVizRendersToCanvas(query?: Node | null): boolean {
+ return classifyQueryVizCanvas(query) !== 'non-canvas'
+}
+
+/** Whether an insight's viz is definitely canvas-backed and safe to unmount when the page is hidden. */
+export function queryVizDefinitelyRendersToCanvas(query?: Node | null): boolean {
+ return classifyQueryVizCanvas(query) === 'canvas'
+}
+
+export const getFormula = (query: InsightQueryNode | null): string | undefined => {
+ if (isTrendsQuery(query)) {
+ return (
+ query.trendsFilter?.formulaNodes?.[0]?.formula ||
+ query.trendsFilter?.formulas?.[0] ||
+ query.trendsFilter?.formula
+ )
+ }
+ return undefined
+}
+
+export const getSeries = (query: InsightQueryNode): (AnyEntityNode<AnyDataWarehouseNode> | GroupNode)[] | undefined => {
+ if (isInsightQueryWithSeries(query)) {
+ return query.series
+ }
+ return undefined
+}
+
+/** Client-side check: does this query have a data-warehouse-backed series (insight surface)?
+ * For raw SQL / HogQL queries the client can't know without the backend — use
+ * `dataWarehouseSourcesFromResponse` on the query response instead. */
+export function queryUsesDataWarehouse(query?: Record<string, any> | null): boolean {
+ if (!query) {
+ return false
+ }
+ const source = isInsightVizNode(query) ? query.source : query
+ if (isInsightQueryNode(source)) {
+ return !!getSeries(source)?.some((entity) => isAnyDataWarehouseNode(entity))
+ }
+ return false
+}
+
+export const getBreakdown = (query: InsightQueryNode): BreakdownFilter | undefined => {
+ if (isInsightQueryWithBreakdown(query)) {
+ return query.breakdownFilter
+ }
+ return undefined
+}
+
+export const getCompareFilter = (query: InsightQueryNode): CompareFilter | undefined => {
+ if (isInsightQueryWithCompare(query)) {
+ return query.compareFilter
+ }
+ return undefined
+}
diff --git a/frontend/src/queries/schema/node-guards.ts b/frontend/src/queries/schema/node-guards.ts
new file mode 100644
index 000000000000..ffffabbe6485
--- /dev/null
+++ b/frontend/src/queries/schema/node-guards.ts
@@ -0,0 +1,223 @@
+import { BIVisualizationNode } from './schema-business-intelligence'
+import {
+ ActionsNode,
+ ActorsQuery,
+ AnyDataWarehouseNode,
+ BreakdownFilter,
+ DataTableNode,
+ DataWarehouseNode,
+ EventsNode,
+ FunnelsDataWarehouseNode,
+ FunnelsQuery,
+ GroupNode,
+ HogQLQuery,
+ InsightQueryNode,
+ InsightVizNode,
+ LifecycleDataWarehouseNode,
+ LifecycleQuery,
+ MetricsQuery,
+ Node,
+ NodeKind,
+ PathsQuery,
+ PathsV2Query,
+ PersonsNode,
+ RetentionQuery,
+ StickinessQuery,
+ TrendsQuery,
+ VisualizationNode,
+ WebOverviewQuery,
+ WebStatsTableQuery,
+} from './schema-general'
+
+export function isNodeWithSource(
+ node?: Record<string, any> | null
+): node is DataTableNode | VisualizationNode | InsightVizNode {
+ if (!node) {
+ return false
+ }
+
+ return isDataTableNode(node) || isDataVisualizationNode(node) || isInsightVizNode(node)
+}
+
+export function isEventsNode(node?: Record<string, any> | null): node is EventsNode {
+ return node?.kind === NodeKind.EventsNode
+}
+
+export function isGroupNode(node?: Record<string, any> | null): node is GroupNode {
+ return node?.kind === NodeKind.GroupNode
+}
+
+export function isActionsNode(node?: Record<string, any> | null): node is ActionsNode {
+ return node?.kind === NodeKind.ActionsNode
+}
+
+export function isDataWarehouseNode(node?: Record<string, any> | null): node is DataWarehouseNode {
+ return node?.kind === NodeKind.DataWarehouseNode
+}
+
+export function isFunnelsDataWarehouseNode(node?: Record<string, any> | null): node is FunnelsDataWarehouseNode {
+ return node?.kind === NodeKind.FunnelsDataWarehouseNode
+}
+
+export function isLifecycleDataWarehouseNode(node?: Record<string, any> | null): node is LifecycleDataWarehouseNode {
+ return node?.kind === NodeKind.LifecycleDataWarehouseNode
+}
+
+export function isAnyDataWarehouseNode(node?: Record<string, any> | null): node is AnyDataWarehouseNode {
+ return isDataWarehouseNode(node) || isFunnelsDataWarehouseNode(node) || isLifecycleDataWarehouseNode(node)
+}
+
+/** @deprecated `ActorsQuery` is now used instead of `PersonsNode`. */
+export function isPersonsNode(node?: Record<string, any> | null): node is PersonsNode {
+ return node?.kind === NodeKind.PersonsNode
+}
+
+export function isActorsQuery(node?: Record<string, any> | null): node is ActorsQuery {
+ return node?.kind === NodeKind.ActorsQuery
+}
+
+export function isDataTableNode(node?: Record<string, any> | null): node is DataTableNode {
+ return node?.kind === NodeKind.DataTableNode
+}
+
+/** Previously SQL queries by default were `DataTableNode`s. However now new SQL queries are `DataVisualizationNode`s */
+export function isDataTableNodeWithHogQLQuery(node?: Record<string, any> | null): node is DataTableNode & {
+ source: HogQLQuery
+} {
+ return isDataTableNode(node) && isHogQLQuery(node.source)
+}
+
+export function isBIVisualizationNode(node?: Record<string, any> | null): node is BIVisualizationNode {
+ return node?.kind === NodeKind.BIVisualizationNode
+}
+
+export function isDataVisualizationNode(node?: Record<string, any> | null): node is VisualizationNode {
+ return node?.kind === NodeKind.DataVisualizationNode || isBIVisualizationNode(node)
+}
+
+export function isDataVisualizationNodeWithHogQLQuery(
+ node?: Record<string, any> | null
+): node is VisualizationNode & { source: HogQLQuery } {
+ return isDataVisualizationNode(node) && isHogQLQuery(node.source)
+}
+
+export function isInsightVizNode(node?: Record<string, any> | null): node is InsightVizNode {
+ return node?.kind === NodeKind.InsightVizNode
+}
+
+export function isHogQLQuery(node?: Record<string, any> | null): node is HogQLQuery {
+ return node?.kind === NodeKind.HogQLQuery
+}
+
+export function isMetricsQuery(node?: Record<string, any> | null): node is MetricsQuery {
+ return node?.kind === NodeKind.MetricsQuery
+}
+
+export function isWebOverviewQuery(node?: Record<string, any> | null): node is WebOverviewQuery {
+ return node?.kind === NodeKind.WebOverviewQuery
+}
+
+export function isWebStatsTableQuery(node?: Record<string, any> | null): node is WebStatsTableQuery {
+ return node?.kind === NodeKind.WebStatsTableQuery
+}
+
+export function containsHogQLQuery(node?: Record<string, any> | null): boolean {
+ if (!node) {
+ return false
+ }
+ return isHogQLQuery(node) || (isNodeWithSource(node) && isHogQLQuery(node.source))
+}
+
+/*
+ * Insight Queries
+ */
+
+export function isTrendsQuery(node?: Record<string, any> | null): node is TrendsQuery {
+ return node?.kind === NodeKind.TrendsQuery
+}
+
+export function isFunnelsQuery(node?: Record<string, any> | null): node is FunnelsQuery {
+ return node?.kind === NodeKind.FunnelsQuery
+}
+
+export function isRetentionQuery(node?: Record<string, any> | null): node is RetentionQuery {
+ return node?.kind === NodeKind.RetentionQuery
+}
+
+export function isPathsQuery(node?: Record<string, any> | null): node is PathsQuery {
+ return node?.kind === NodeKind.PathsQuery
+}
+
+export function isPathsV2Query(node?: Record<string, any> | null): node is PathsV2Query {
+ return node?.kind === NodeKind.PathsV2Query
+}
+
+export function isStickinessQuery(node?: Record<string, any> | null): node is StickinessQuery {
+ return node?.kind === NodeKind.StickinessQuery
+}
+
+export function isLifecycleQuery(node?: Record<string, any> | null): node is LifecycleQuery {
+ return node?.kind === NodeKind.LifecycleQuery
+}
+
+export function isInsightQueryWithBreakdown(
+ node?: Record<string, any> | null
+): node is TrendsQuery | FunnelsQuery | RetentionQuery {
+ return isTrendsQuery(node) || isFunnelsQuery(node) || isRetentionQuery(node)
+}
+
+export function isInsightQueryWithCompare(
+ node?: Record<string, any> | null
+): node is TrendsQuery | StickinessQuery | WebStatsTableQuery | WebOverviewQuery | FunnelsQuery {
+ return (
+ isTrendsQuery(node) ||
+ isStickinessQuery(node) ||
+ isWebStatsTableQuery(node) ||
+ isWebOverviewQuery(node) ||
+ isFunnelsQuery(node)
+ )
+}
+
+export function isInsightQueryWithSeries(
+ node?: Node
+): node is TrendsQuery | FunnelsQuery | StickinessQuery | LifecycleQuery {
+ return isTrendsQuery(node) || isFunnelsQuery(node) || isStickinessQuery(node) || isLifecycleQuery(node)
+}
+
+export function isInsightQueryNode(node?: Record<string, any> | null): node is InsightQueryNode {
+ return (
+ isTrendsQuery(node) ||
+ isFunnelsQuery(node) ||
+ isRetentionQuery(node) ||
+ isPathsQuery(node) ||
+ isPathsV2Query(node) ||
+ isStickinessQuery(node) ||
+ isLifecycleQuery(node) ||
+ isWebStatsTableQuery(node) ||
+ isWebOverviewQuery(node)
+ )
+}
+
+type SingleBreakdownFilter = BreakdownFilter & {
+ breakdown: NonNullable<BreakdownFilter['breakdown']>
+}
+
+type MultiBreakdownFilter = BreakdownFilter & {
+ breakdowns: NonNullable<BreakdownFilter['breakdowns']>
+}
+
+type PopulatedBreakdownFilter = SingleBreakdownFilter | MultiBreakdownFilter
+
+export function hasSingleBreakdown(breakdownFilter?: BreakdownFilter | null): breakdownFilter is SingleBreakdownFilter {
+ return breakdownFilter?.breakdown != null
+}
+
+export function hasMultiBreakdown(breakdownFilter?: BreakdownFilter | null): breakdownFilter is MultiBreakdownFilter {
+ return (breakdownFilter?.breakdowns?.length ?? 0) > 0
+}
+
+export function hasBreakdownFilter(
+ breakdownFilter?: BreakdownFilter | null
+): breakdownFilter is PopulatedBreakdownFilter {
+ return hasSingleBreakdown(breakdownFilter) || hasMultiBreakdown(breakdownFilter)
+}
diff --git a/frontend/src/queries/utils.test.ts b/frontend/src/queries/utils.test.ts
index d35aa50af966..7f8794aa57f3 100644
--- a/frontend/src/queries/utils.test.ts
+++ b/frontend/src/queries/utils.test.ts
@@ -2,17 +2,13 @@ import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
import { DataTableNode, DataVisualizationNode, Node, NodeKind } from '~/queries/schema/schema-general'
import type { InsightQueryNode } from '~/queries/schema/schema-general'
-import { ChartDisplayType, FunnelVizType } from '~/types'
+import { ChartDisplayType } from '~/types'
import {
convertDataTableNodeToDataVisualizationNode,
dataWarehouseSourcesFromResponse,
- getDisplay,
getShowLegend,
isMetricInsightQuery,
- queryUsesDataWarehouse,
- queryVizDefinitelyRendersToCanvas,
- queryVizRendersToCanvas,
supportsBarValueStacking,
taxonomicSessionFilterToHogQL,
} from './utils'
@@ -157,163 +153,6 @@ describe('supportsBarValueStacking', () => {
})
})
-describe('queryVizRendersToCanvas', () => {
- const insightViz = (source: InsightQueryNode): any => ({ kind: NodeKind.InsightVizNode, source })
- const trends = (display?: ChartDisplayType): InsightQueryNode =>
- ({ kind: NodeKind.TrendsQuery, series: [], trendsFilter: display ? { display } : {} }) as InsightQueryNode
-
- it.each([
- {
- name: 'HogQL data table',
- query: { kind: NodeKind.DataTableNode } as any,
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'SQL viz as chart',
- query: { kind: NodeKind.DataVisualizationNode, display: ChartDisplayType.ActionsLineGraph } as any,
- expectedMayRenderToCanvas: true,
- expectedDefinitelyRendersToCanvas: true,
- },
- {
- name: 'SQL viz as table (no display)',
- query: { kind: NodeKind.DataVisualizationNode } as any,
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'SQL viz with auto display',
- query: { kind: NodeKind.DataVisualizationNode, display: ChartDisplayType.Auto } as any,
- expectedMayRenderToCanvas: true,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'trends line chart',
- query: insightViz(trends(ChartDisplayType.ActionsLineGraph)),
- expectedMayRenderToCanvas: true,
- expectedDefinitelyRendersToCanvas: true,
- },
- {
- name: 'trends default display',
- query: insightViz(trends()),
- expectedMayRenderToCanvas: true,
- expectedDefinitelyRendersToCanvas: true,
- },
- {
- name: 'trends bold number',
- query: insightViz(trends(ChartDisplayType.BoldNumber)),
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'trends table',
- query: insightViz(trends(ChartDisplayType.ActionsTable)),
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'trends world map',
- query: insightViz(trends(ChartDisplayType.WorldMap)),
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'funnel steps (default)',
- query: insightViz({ kind: NodeKind.FunnelsQuery, series: [] } as InsightQueryNode),
- expectedMayRenderToCanvas: true,
- expectedDefinitelyRendersToCanvas: true,
- },
- {
- name: 'funnel flow (Sankey)',
- query: insightViz({
- kind: NodeKind.FunnelsQuery,
- series: [],
- funnelsFilter: { funnelVizType: FunnelVizType.Flow },
- } as InsightQueryNode),
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'funnel time to convert (table)',
- query: insightViz({
- kind: NodeKind.FunnelsQuery,
- series: [],
- funnelsFilter: { funnelVizType: FunnelVizType.TimeToConvert },
- } as InsightQueryNode),
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'funnel trends (line chart)',
- query: insightViz({
- kind: NodeKind.FunnelsQuery,
- series: [],
- funnelsFilter: { funnelVizType: FunnelVizType.Trends },
- } as InsightQueryNode),
- expectedMayRenderToCanvas: true,
- expectedDefinitelyRendersToCanvas: true,
- },
- {
- name: 'retention',
- query: insightViz({ kind: NodeKind.RetentionQuery } as InsightQueryNode),
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'paths',
- query: insightViz({ kind: NodeKind.PathsQuery } as InsightQueryNode),
- expectedMayRenderToCanvas: false,
- expectedDefinitelyRendersToCanvas: false,
- },
- {
- name: 'null query',
- query: null,
- expectedMayRenderToCanvas: true,
- expectedDefinitelyRendersToCanvas: false,
- },
- ])('classifies $name', ({ query, expectedMayRenderToCanvas, expectedDefinitelyRendersToCanvas }) => {
- expect(queryVizRendersToCanvas(query)).toBe(expectedMayRenderToCanvas)
- expect(queryVizDefinitelyRendersToCanvas(query)).toBe(expectedDefinitelyRendersToCanvas)
- })
-})
-
-describe('queryUsesDataWarehouse', () => {
- it('returns true for a trends query with a data warehouse series', () => {
- expect(
- queryUsesDataWarehouse({
- kind: NodeKind.TrendsQuery,
- series: [{ kind: NodeKind.DataWarehouseNode, id: 'my_table', table_name: 'stripe.charges' }],
- } as any)
- ).toBe(true)
- })
-
- it('unwraps InsightVizNode to inspect its source', () => {
- expect(
- queryUsesDataWarehouse({
- kind: NodeKind.InsightVizNode,
- source: {
- kind: NodeKind.TrendsQuery,
- series: [{ kind: NodeKind.DataWarehouseNode, id: 'my_table', table_name: 'stripe.charges' }],
- },
- } as any)
- ).toBe(true)
- })
-
- it('returns false for an events-only trends query', () => {
- expect(
- queryUsesDataWarehouse({
- kind: NodeKind.TrendsQuery,
- series: [{ kind: NodeKind.EventsNode, event: '$pageview' }],
- } as any)
- ).toBe(false)
- })
-
- it('returns false for null/undefined', () => {
- expect(queryUsesDataWarehouse(null)).toBe(false)
- expect(queryUsesDataWarehouse(undefined)).toBe(false)
- })
-})
-
describe('dataWarehouseSourcesFromResponse', () => {
it('extracts sources from a response that has them', () => {
expect(
@@ -331,31 +170,6 @@ describe('dataWarehouseSourcesFromResponse', () => {
})
})
-describe('getDisplay', () => {
- // ActionsStackedBar is a deprecated trends/stickiness alias of ActionsBar; the API and MCP
- // accept it, and nothing downstream of getDisplay knows how to render it.
- it.each([
- [
- 'trends',
- {
- kind: NodeKind.TrendsQuery,
- series: [],
- trendsFilter: { display: ChartDisplayType.ActionsStackedBar },
- },
- ],
- [
- 'stickiness',
- {
- kind: NodeKind.StickinessQuery,
- series: [],
- stickinessFilter: { display: ChartDisplayType.ActionsStackedBar },
- },
- ],
- ])('normalizes the deprecated ActionsStackedBar alias to ActionsBar for %s', (_, query) => {
- expect(getDisplay(query as InsightQueryNode)).toEqual(ChartDisplayType.ActionsBar)
- })
-})
-
describe('isMetricInsightQuery', () => {
it.each([
[
diff --git a/frontend/src/queries/utils.ts b/frontend/src/queries/utils.ts
index 7fc682431e2a..679c7bba0eee 100644
--- a/frontend/src/queries/utils.ts
+++ b/frontend/src/queries/utils.ts
@@ -3,38 +3,48 @@ import { MAX_DEFAULT_PROPORTION_LEGEND_PARTS, PERCENT_STACK_VIEW_DISPLAY_TYPE }
import { escapePropertyAsHogQLIdentifier, isQuoted } from 'lib/utils/hogql'
import { ProductAnalyticsInsightNodeKind } from '~/queries/nodes/InsightQuery/defaults'
-import { BIVisualizationNode } from '~/queries/schema/schema-business-intelligence'
+import { getDisplay, getBreakdown } from '~/queries/schema/node-accessors'
+import {
+ isNodeWithSource,
+ isEventsNode,
+ isActionsNode,
+ isDataWarehouseNode,
+ isPersonsNode,
+ isActorsQuery,
+ isDataTableNode,
+ isDataTableNodeWithHogQLQuery,
+ isDataVisualizationNode,
+ isInsightVizNode,
+ isHogQLQuery,
+ isWebOverviewQuery,
+ isWebStatsTableQuery,
+ isTrendsQuery,
+ isFunnelsQuery,
+ isRetentionQuery,
+ isStickinessQuery,
+ isLifecycleQuery,
+ isInsightQueryNode,
+ hasBreakdownFilter,
+} from '~/queries/schema/node-guards'
import {
AccountsQuery,
AccountsTableQuery,
- ActionsNode,
ActorsQuery,
- AnyDataWarehouseNode,
- AnyEntityNode,
- BreakdownFilter,
- CompareFilter,
- DataTableNode,
DataVisualizationNode,
- VisualizationNode,
- DataWarehouseNode,
DataWarehouseSourceUsage,
DatabaseSchemaQuery,
- DateRange,
EndpointsUsageOverviewQuery,
EndpointsUsageTableQuery,
EndpointsUsageTrendsQuery,
ErrorTrackingIssueCorrelationQuery,
ErrorTrackingIssueEventsQuery,
ErrorTrackingQuery,
- EventsNode,
EventsQuery,
ExperimentFunnelsQuery,
ExperimentMetric,
ExperimentTrendsQuery,
- FunnelsDataWarehouseNode,
FunnelsQuery,
GoalLine,
- GroupNode,
GroupsQuery,
HogQLMetadata,
HogQLQuery,
@@ -43,18 +53,12 @@ import {
InsightFilter,
InsightFilterProperty,
InsightQueryNode,
- InsightVizNode,
- LifecycleDataWarehouseNode,
- LifecycleQuery,
MarketingAnalyticsAggregatedQuery,
MarketingAnalyticsTableQuery,
MathType,
MetricsHistogramQuery,
- MetricsQuery,
Node,
NodeKind,
- PathsQuery,
- PathsV2Query,
PersonsNode,
ProductAnalyticsInsightQueryNode,
QuerySchema,
@@ -78,7 +82,7 @@ import {
WebVitalsPathBreakdownQuery,
WebVitalsQuery,
} from '~/queries/schema/schema-general'
-import { AnnotationScope, BaseMathType, ChartDisplayType, FunnelVizType, GroupTypeIndex, IntervalType } from '~/types'
+import { AnnotationScope, BaseMathType, ChartDisplayType, GroupTypeIndex } from '~/types'
export function isDataNode(node?: Record<string, any> | null): node is EventsQuery | PersonsNode {
return (
@@ -92,24 +96,6 @@ export function isDataNode(node?: Record<string, any> | null): node is EventsQue
)
}
-export function isNodeWithSource(
- node?: Record<string, any> | null
-): node is DataTableNode | VisualizationNode | InsightVizNode {
- if (!node) {
- return false
- }
-
- return isDataTableNode(node) || isDataVisualizationNode(node) || isInsightVizNode(node)
-}
-
-export function isEventsNode(node?: Record<string, any> | null): node is EventsNode {
- return node?.kind === NodeKind.EventsNode
-}
-
-export function isGroupNode(node?: Record<string, any> | null): node is GroupNode {
- return node?.kind === NodeKind.GroupNode
-}
-
export function isEventsQuery(node?: Record<string, any> | null): node is EventsQuery {
return node?.kind === NodeKind.EventsQuery
}
@@ -118,64 +104,10 @@ export function isSessionsQuery(node?: Record<string, any> | null): node is Sess
return node?.kind === NodeKind.SessionsQuery
}
-export function isActionsNode(node?: Record<string, any> | null): node is ActionsNode {
- return node?.kind === NodeKind.ActionsNode
-}
-
-export function isDataWarehouseNode(node?: Record<string, any> | null): node is DataWarehouseNode {
- return node?.kind === NodeKind.DataWarehouseNode
-}
-
-export function isFunnelsDataWarehouseNode(node?: Record<string, any> | null): node is FunnelsDataWarehouseNode {
- return node?.kind === NodeKind.FunnelsDataWarehouseNode
-}
-
-export function isLifecycleDataWarehouseNode(node?: Record<string, any> | null): node is LifecycleDataWarehouseNode {
- return node?.kind === NodeKind.LifecycleDataWarehouseNode
-}
-
-export function isAnyDataWarehouseNode(node?: Record<string, any> | null): node is AnyDataWarehouseNode {
- return isDataWarehouseNode(node) || isFunnelsDataWarehouseNode(node) || isLifecycleDataWarehouseNode(node)
-}
-
-/** @deprecated `ActorsQuery` is now used instead of `PersonsNode`. */
-export function isPersonsNode(node?: Record<string, any> | null): node is PersonsNode {
- return node?.kind === NodeKind.PersonsNode
-}
-
-export function isActorsQuery(node?: Record<string, any> | null): node is ActorsQuery {
- return node?.kind === NodeKind.ActorsQuery
-}
-
export function isInsightActorsQuery(node?: Record<string, any> | null): node is InsightActorsQuery {
return node?.kind === NodeKind.InsightActorsQuery
}
-export function isDataTableNode(node?: Record<string, any> | null): node is DataTableNode {
- return node?.kind === NodeKind.DataTableNode
-}
-
-/** Previously SQL queries by default were `DataTableNode`s. However now new SQL queries are `DataVisualizationNode`s */
-export function isDataTableNodeWithHogQLQuery(node?: Record<string, any> | null): node is DataTableNode & {
- source: HogQLQuery
-} {
- return isDataTableNode(node) && isHogQLQuery(node.source)
-}
-
-export function isBIVisualizationNode(node?: Record<string, any> | null): node is BIVisualizationNode {
- return node?.kind === NodeKind.BIVisualizationNode
-}
-
-export function isDataVisualizationNode(node?: Record<string, any> | null): node is VisualizationNode {
- return node?.kind === NodeKind.DataVisualizationNode || isBIVisualizationNode(node)
-}
-
-export function isDataVisualizationNodeWithHogQLQuery(
- node?: Record<string, any> | null
-): node is VisualizationNode & { source: HogQLQuery } {
- return isDataVisualizationNode(node) && isHogQLQuery(node.source)
-}
-
export function convertDataTableNodeToDataVisualizationNode(node: Node | null): Node | null {
if (!isDataTableNodeWithHogQLQuery(node)) {
return node
@@ -218,26 +150,14 @@ export function isSavedInsightNode(node?: Record<string, any> | null): node is S
return node?.kind === NodeKind.SavedInsightNode
}
-export function isInsightVizNode(node?: Record<string, any> | null): node is InsightVizNode {
- return node?.kind === NodeKind.InsightVizNode
-}
-
export function isHogQuery(node?: Record<string, any> | null): node is HogQuery {
return node?.kind === NodeKind.HogQuery
}
-export function isHogQLQuery(node?: Record<string, any> | null): node is HogQLQuery {
- return node?.kind === NodeKind.HogQLQuery
-}
-
export function isHogQLMetadata(node?: Record<string, any> | null): node is HogQLMetadata {
return node?.kind === NodeKind.HogQLMetadata
}
-export function isMetricsQuery(node?: Record<string, any> | null): node is MetricsQuery {
- return node?.kind === NodeKind.MetricsQuery
-}
-
export function isMetricsHistogramQuery(node?: Record<string, any> | null): node is MetricsHistogramQuery {
return node?.kind === NodeKind.MetricsHistogramQuery
}
@@ -260,14 +180,6 @@ export function isEndpointsUsageQuery(
return isEndpointsUsageOverviewQuery(node) || isEndpointsUsageTableQuery(node) || isEndpointsUsageTrendsQuery(node)
}
-export function isWebOverviewQuery(node?: Record<string, any> | null): node is WebOverviewQuery {
- return node?.kind === NodeKind.WebOverviewQuery
-}
-
-export function isWebStatsTableQuery(node?: Record<string, any> | null): node is WebStatsTableQuery {
- return node?.kind === NodeKind.WebStatsTableQuery
-}
-
export function isWebAnalyticsInsightQuery(
node?: Record<string, any> | null
): node is WebStatsTableQuery | WebOverviewQuery {
@@ -346,69 +258,12 @@ export function isErrorTrackingIssueEventsQuery(
return node?.kind === NodeKind.ErrorTrackingIssueEventsQuery
}
-export function containsHogQLQuery(node?: Record<string, any> | null): boolean {
- if (!node) {
- return false
- }
- return isHogQLQuery(node) || (isNodeWithSource(node) && isHogQLQuery(node.source))
-}
-
-/*
- * Insight Queries
- */
-
-export function isTrendsQuery(node?: Record<string, any> | null): node is TrendsQuery {
- return node?.kind === NodeKind.TrendsQuery
-}
-
-export function isFunnelsQuery(node?: Record<string, any> | null): node is FunnelsQuery {
- return node?.kind === NodeKind.FunnelsQuery
-}
-
-export function isRetentionQuery(node?: Record<string, any> | null): node is RetentionQuery {
- return node?.kind === NodeKind.RetentionQuery
-}
-
-export function isPathsQuery(node?: Record<string, any> | null): node is PathsQuery {
- return node?.kind === NodeKind.PathsQuery
-}
-
-export function isPathsV2Query(node?: Record<string, any> | null): node is PathsV2Query {
- return node?.kind === NodeKind.PathsV2Query
-}
-
-export function isStickinessQuery(node?: Record<string, any> | null): node is StickinessQuery {
- return node?.kind === NodeKind.StickinessQuery
-}
-
-export function isLifecycleQuery(node?: Record<string, any> | null): node is LifecycleQuery {
- return node?.kind === NodeKind.LifecycleQuery
-}
-
export function isInsightQueryWithDisplay(
node?: Record<string, any> | null
): node is TrendsQuery | RetentionQuery | StickinessQuery {
return isTrendsQuery(node) || isStickinessQuery(node) || isRetentionQuery(node)
}
-export function isInsightQueryWithBreakdown(
- node?: Record<string, any> | null
-): node is TrendsQuery | FunnelsQuery | RetentionQuery {
- return isTrendsQuery(node) || isFunnelsQuery(node) || isRetentionQuery(node)
-}
-
-export function isInsightQueryWithCompare(
- node?: Record<string, any> | null
-): node is TrendsQuery | StickinessQuery | WebStatsTableQuery | WebOverviewQuery | FunnelsQuery {
- return (
- isTrendsQuery(node) ||
- isStickinessQuery(node) ||
- isWebStatsTableQuery(node) ||
- isWebOverviewQuery(node) ||
- isFunnelsQuery(node)
- )
-}
-
export function isDatabaseSchemaQuery(node?: Node): node is DatabaseSchemaQuery {
return node?.kind === NodeKind.DatabaseSchemaQuery
}
@@ -439,148 +294,10 @@ export function shouldQueryBeAsync(query: Node): boolean {
)
}
-export function isInsightQueryWithSeries(
- node?: Node
-): node is TrendsQuery | FunnelsQuery | StickinessQuery | LifecycleQuery {
- return isTrendsQuery(node) || isFunnelsQuery(node) || isStickinessQuery(node) || isLifecycleQuery(node)
-}
-
-export function isInsightQueryNode(node?: Record<string, any> | null): node is InsightQueryNode {
- return (
- isTrendsQuery(node) ||
- isFunnelsQuery(node) ||
- isRetentionQuery(node) ||
- isPathsQuery(node) ||
- isPathsV2Query(node) ||
- isStickinessQuery(node) ||
- isLifecycleQuery(node) ||
- isWebStatsTableQuery(node) ||
- isWebOverviewQuery(node)
- )
-}
-
-export function dateRangeFor(node?: Node): DateRange | undefined {
- if (isInsightVizNode(node)) {
- return node.source.dateRange
- } else if (isInsightQueryNode(node)) {
- return node.dateRange
- } else if (isActionsNode(node)) {
- return undefined
- } else if (isEventsNode(node)) {
- return undefined
- } else if (isPersonsNode(node)) {
- return undefined
- } else if (isDataTableNode(node)) {
- return undefined
- }
-
- return undefined
-}
-
-export const getInterval = (query: InsightQueryNode): IntervalType | undefined => {
- if (isInsightQueryWithSeries(query)) {
- return query.interval
- }
- if (isWebStatsTableQuery(query) || isWebOverviewQuery(query)) {
- return query.interval ?? 'day'
- }
- return undefined
-}
-
-// For trends/stickiness, ActionsStackedBar is a deprecated alias of ActionsBar (which renders stacked):
-// the UI never emits it, but the API and MCP accept it. Normalizing here — the point all `display`
-// selectors derive from — makes such insights behave exactly like their UI-created equivalents.
-export const normalizeDisplay = (display: ChartDisplayType | undefined): ChartDisplayType | undefined =>
- display === ChartDisplayType.ActionsStackedBar ? ChartDisplayType.ActionsBar : display
-
-export const getDisplay = (query: InsightQueryNode): ChartDisplayType | undefined => {
- if (isStickinessQuery(query)) {
- return normalizeDisplay(query.stickinessFilter?.display)
- } else if (isTrendsQuery(query)) {
- return normalizeDisplay(query.trendsFilter?.display)
- }
- return undefined
-}
-
export const isMetricInsightQuery = (query?: Record<string, any> | null): boolean =>
(isDataVisualizationNode(query) && query.display === ChartDisplayType.Metric) ||
(isInsightVizNode(query) && isTrendsQuery(query.source) && getDisplay(query.source) === ChartDisplayType.Metric)
-// Display types whose viz paints to a <canvas> (Chart.js / quill-charts), which repaints on every resize
-// frame. Everything else renders as DOM/SVG and is cheap to keep mounted while a tile is resized.
-const CANVAS_CHART_DISPLAY_TYPES = new Set<ChartDisplayType>([
- ChartDisplayType.Auto,
- ChartDisplayType.ActionsLineGraph,
- ChartDisplayType.ActionsLineGraphCumulative,
- ChartDisplayType.ActionsAreaGraph,
- ChartDisplayType.ActionsBar,
- ChartDisplayType.ActionsUnstackedBar,
- ChartDisplayType.ActionsStackedBar,
- ChartDisplayType.ActionsBarValue,
- ChartDisplayType.ActionsPie,
- ChartDisplayType.ActionsDonut,
- ChartDisplayType.ActionsProportionBar,
- ChartDisplayType.Metric,
- ChartDisplayType.BoxPlot,
- ChartDisplayType.SlopeGraph,
- ChartDisplayType.TwoDimensionalHeatmap,
- ChartDisplayType.ScatterPlot,
-])
-
-type QueryVizCanvasClassification = 'canvas' | 'non-canvas' | 'unknown'
-
-function classifyQueryVizCanvas(query?: Node | null): QueryVizCanvasClassification {
- if (isDataTableNode(query)) {
- return 'non-canvas'
- }
- if (isDataVisualizationNode(query)) {
- if (!query.display) {
- return 'non-canvas'
- }
- if (query.display === ChartDisplayType.Auto) {
- return 'unknown'
- }
- return CANVAS_CHART_DISPLAY_TYPES.has(query.display) ? 'canvas' : 'non-canvas'
- }
- if (isInsightVizNode(query)) {
- const source = query.source
- if (isRetentionQuery(source) || isPathsQuery(source)) {
- return 'non-canvas'
- }
- if (isFunnelsQuery(source)) {
- // Steps (default) and Trends paint to canvas; Flow (Sankey) is SVG and TimeToConvert is a DOM table.
- const vizType = source.funnelsFilter?.funnelVizType
- return vizType !== FunnelVizType.Flow && vizType !== FunnelVizType.TimeToConvert ? 'canvas' : 'non-canvas'
- }
- return CANVAS_CHART_DISPLAY_TYPES.has(getDisplay(source) ?? ChartDisplayType.Auto) ? 'canvas' : 'non-canvas'
- }
- return 'unknown'
-}
-
-/**
- * Whether an insight's viz may paint to a <canvas>. Unknown visualizations count as canvas so resize throttling
- * remains conservative.
- */
-export function queryVizRendersToCanvas(query?: Node | null): boolean {
- return classifyQueryVizCanvas(query) !== 'non-canvas'
-}
-
-/** Whether an insight's viz is definitely canvas-backed and safe to unmount when the page is hidden. */
-export function queryVizDefinitelyRendersToCanvas(query?: Node | null): boolean {
- return classifyQueryVizCanvas(query) === 'canvas'
-}
-
-export const getFormula = (query: InsightQueryNode | null): string | undefined => {
- if (isTrendsQuery(query)) {
- return (
- query.trendsFilter?.formulaNodes?.[0]?.formula ||
- query.trendsFilter?.formulas?.[0] ||
- query.trendsFilter?.formula
- )
- }
- return undefined
-}
-
export const getFormulas = (query: InsightQueryNode | null): string[] | undefined => {
if (isTrendsQuery(query)) {
return (
@@ -603,27 +320,6 @@ export const getFormulaNodes = (query: InsightQueryNode | null): TrendsFormulaNo
return undefined
}
-export const getSeries = (query: InsightQueryNode): (AnyEntityNode<AnyDataWarehouseNode> | GroupNode)[] | undefined => {
- if (isInsightQueryWithSeries(query)) {
- return query.series
- }
- return undefined
-}
-
-/** Client-side check: does this query have a data-warehouse-backed series (insight surface)?
- * For raw SQL / HogQL queries the client can't know without the backend — use
- * `dataWarehouseSourcesFromResponse` on the query response instead. */
-export function queryUsesDataWarehouse(query?: Record<string, any> | null): boolean {
- if (!query) {
- return false
- }
- const source = isInsightVizNode(query) ? query.source : query
- if (isInsightQueryNode(source)) {
- return !!getSeries(source)?.some((entity) => isAnyDataWarehouseNode(entity))
- }
- return false
-}
-
/** Extract the connector-synced warehouse sources a query touched from its response, if the
* backend populated them (currently HogQL / SQL-editor responses). Always returns an array. */
export function dataWarehouseSourcesFromResponse(response: unknown): DataWarehouseSourceUsage[] {
@@ -633,20 +329,6 @@ export function dataWarehouseSourcesFromResponse(response: unknown): DataWarehou
return []
}
-export const getBreakdown = (query: InsightQueryNode): BreakdownFilter | undefined => {
- if (isInsightQueryWithBreakdown(query)) {
- return query.breakdownFilter
- }
- return undefined
-}
-
-export const getCompareFilter = (query: InsightQueryNode): CompareFilter | undefined => {
- if (isInsightQueryWithCompare(query)) {
- return query.compareFilter
- }
- return undefined
-}
-
export const getAggregationGroupTypeIndex = (query: InsightQueryNode): GroupTypeIndex | null | undefined => {
if (!isStickinessQuery(query) && 'aggregation_group_type_index' in query) {
return query.aggregation_group_type_index as GroupTypeIndex | null | undefined
@@ -911,30 +593,6 @@ export function isHogQLAggregation(hogQl: string): boolean {
)
}
-type SingleBreakdownFilter = BreakdownFilter & {
- breakdown: NonNullable<BreakdownFilter['breakdown']>
-}
-
-type MultiBreakdownFilter = BreakdownFilter & {
- breakdowns: NonNullable<BreakdownFilter['breakdowns']>
-}
-
-type PopulatedBreakdownFilter = SingleBreakdownFilter | MultiBreakdownFilter
-
-export function hasSingleBreakdown(breakdownFilter?: BreakdownFilter | null): breakdownFilter is SingleBreakdownFilter {
- return breakdownFilter?.breakdown != null
-}
-
-export function hasMultiBreakdown(breakdownFilter?: BreakdownFilter | null): breakdownFilter is MultiBreakdownFilter {
- return (breakdownFilter?.breakdowns?.length ?? 0) > 0
-}
-
-export function hasBreakdownFilter(
- breakdownFilter?: BreakdownFilter | null
-): breakdownFilter is PopulatedBreakdownFilter {
- return hasSingleBreakdown(breakdownFilter) || hasMultiBreakdown(breakdownFilter)
-}
-
export function isValidQueryForExperiment(query: Node): boolean {
if (!isNodeWithSource(query) || !isFunnelsQuery(query.source)) {
return false
diff --git a/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx b/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx
index 16e406fc89df..027ec3a8f836 100644
--- a/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx
+++ b/frontend/src/scenes/activity/explore/eventsSceneLogic.tsx
@@ -27,8 +27,9 @@ import { urls } from 'scenes/urls'
import { getDefaultEventsQueryForTeam } from '~/queries/nodes/DataTable/defaultEventsQuery'
import { performQuery } from '~/queries/query'
+import { isDataTableNode } from '~/queries/schema/node-guards'
import { DataTableNode, EventsQuery, Node, ProductKey } from '~/queries/schema/schema-general'
-import { isDataTableNode, isEventsQuery } from '~/queries/utils'
+import { isEventsQuery } from '~/queries/utils'
import { ActivityTab, Breadcrumb } from '~/types'
import type { FeatureFlagsSet } from '../../../lib/logic/featureFlagLogic'
diff --git a/frontend/src/scenes/cohorts/cohortEditLogic.ts b/frontend/src/scenes/cohorts/cohortEditLogic.ts
index bfd51ca7d8dd..12e612ded027 100644
--- a/frontend/src/scenes/cohorts/cohortEditLogic.ts
+++ b/frontend/src/scenes/cohorts/cohortEditLogic.ts
@@ -57,8 +57,8 @@ import { refreshTreeItem } from '~/layout/panel-layout/ProjectTree/projectTreeLo
import { cohortsModel, processCohort } from '~/models/cohortsModel'
import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
+import { isDataTableNode } from '~/queries/schema/node-guards'
import { ActorsQuery, DataTableNode, HogQLQuery, Node, NodeKind } from '~/queries/schema/schema-general'
-import { isDataTableNode } from '~/queries/utils'
import {
AnyCohortCriteriaType,
AnyCohortGroupType,
diff --git a/frontend/src/scenes/dashboard/TileFiltersOverride.tsx b/frontend/src/scenes/dashboard/TileFiltersOverride.tsx
index 901b63a9a44d..9b94c55ace2b 100644
--- a/frontend/src/scenes/dashboard/TileFiltersOverride.tsx
+++ b/frontend/src/scenes/dashboard/TileFiltersOverride.tsx
@@ -15,8 +15,8 @@ import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { groupsModel } from '~/models/groupsModel'
+import { isInsightQueryWithBreakdown, isInsightQueryWithSeries, isInsightVizNode } from '~/queries/schema/node-guards'
import { BreakdownFilter, NodeKind } from '~/queries/schema/schema-general'
-import { isInsightQueryWithBreakdown, isInsightQueryWithSeries, isInsightVizNode } from '~/queries/utils'
import type { DashboardTile, InsightLogicProps, IntervalType } from '~/types'
import { TaxonomicBreakdownFilter } from 'products/product_analytics/frontend/insights/editor/filters/BreakdownFilter/TaxonomicBreakdownFilter'
diff --git a/frontend/src/scenes/dashboard/dashboardBreakdownColors.ts b/frontend/src/scenes/dashboard/dashboardBreakdownColors.ts
index d40ee10bfb90..cd332d7a2835 100644
--- a/frontend/src/scenes/dashboard/dashboardBreakdownColors.ts
+++ b/frontend/src/scenes/dashboard/dashboardBreakdownColors.ts
@@ -1,8 +1,14 @@
import { DataColorToken, dataColorVars } from 'lib/colors'
import { getFunnelDatasetKey, getTrendDatasetKey, isNullBreakdown, isOtherBreakdown } from 'scenes/insights/utils'
+import {
+ hasBreakdownFilter,
+ isFunnelsQuery,
+ isInsightVizNode,
+ isRetentionQuery,
+ isTrendsQuery,
+} from '~/queries/schema/node-guards'
import { BreakdownFilter } from '~/queries/schema/schema-general'
-import { hasBreakdownFilter, isFunnelsQuery, isInsightVizNode, isRetentionQuery, isTrendsQuery } from '~/queries/utils'
import { DashboardTile, FunnelVizType } from '~/types'
export type BreakdownColorSource = 'auto' | 'manual'
diff --git a/frontend/src/scenes/dashboard/dashboardControls.ts b/frontend/src/scenes/dashboard/dashboardControls.ts
index c7bb49ccc124..df255e9729a3 100644
--- a/frontend/src/scenes/dashboard/dashboardControls.ts
+++ b/frontend/src/scenes/dashboard/dashboardControls.ts
@@ -1,5 +1,5 @@
+import { isNodeWithSource } from '~/queries/schema/node-guards'
import { Node, NodeKind } from '~/queries/schema/schema-general'
-import { isNodeWithSource } from '~/queries/utils'
import { DashboardTile } from '~/types'
/** A filter control in the dashboard filter bar. */
diff --git a/frontend/src/scenes/dashboard/dashboardEvents.ts b/frontend/src/scenes/dashboard/dashboardEvents.ts
index 2c2bf51e438b..83111bc7e7f7 100644
--- a/frontend/src/scenes/dashboard/dashboardEvents.ts
+++ b/frontend/src/scenes/dashboard/dashboardEvents.ts
@@ -4,7 +4,8 @@ import type { Dayjs } from 'lib/dayjs'
import { now } from 'lib/dayjs'
import { DashboardEventSource, filtersForAnalytics, sanitizeInsight } from 'lib/utils/eventUsageLogic'
-import { isNodeWithSource, queryUsesDataWarehouse } from '~/queries/utils'
+import { queryUsesDataWarehouse } from '~/queries/schema/node-accessors'
+import { isNodeWithSource } from '~/queries/schema/node-guards'
import { DashboardMode, DashboardTile, DashboardTileSpacing, DashboardType, TileGroupDisplay } from '~/types'
export type DashboardFilterChangeType =
diff --git a/frontend/src/scenes/dashboard/newDashboardLogic.ts b/frontend/src/scenes/dashboard/newDashboardLogic.ts
index ea293b1b7927..47cf5c0803b5 100644
--- a/frontend/src/scenes/dashboard/newDashboardLogic.ts
+++ b/frontend/src/scenes/dashboard/newDashboardLogic.ts
@@ -27,8 +27,8 @@ import { urls } from 'scenes/urls'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
import { dashboardsModel } from '~/models/dashboardsModel'
+import { isInsightVizNode } from '~/queries/schema/node-guards'
import { NodeKind } from '~/queries/schema/schema-general'
-import { isInsightVizNode } from '~/queries/utils'
import {
DashboardTemplateStoredTile,
DashboardTemplateType,
diff --git a/frontend/src/scenes/dashboard/tileLayouts.ts b/frontend/src/scenes/dashboard/tileLayouts.ts
index 85685b99d2cf..878f198d84f2 100644
--- a/frontend/src/scenes/dashboard/tileLayouts.ts
+++ b/frontend/src/scenes/dashboard/tileLayouts.ts
@@ -12,11 +12,11 @@ import { BREAKPOINT_COLUMN_COUNTS } from 'scenes/dashboard/dashboardUtils'
import {
isFunnelsQuery,
isInsightVizNode,
- isMetricInsightQuery,
isPathsQuery,
isRetentionQuery,
isTrendsQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { isMetricInsightQuery } from '~/queries/utils'
import { ChartDisplayType, DashboardLayoutSize, DashboardTile } from '~/types'
import { getImageOnlyTextCardImage } from 'products/dashboards/frontend/components/ImageTile/imageTileUtils'
diff --git a/frontend/src/scenes/data-warehouse/editor/QueryFiltersMenu.tsx b/frontend/src/scenes/data-warehouse/editor/QueryFiltersMenu.tsx
index 53ea3167bd13..a958b5d0b1cc 100644
--- a/frontend/src/scenes/data-warehouse/editor/QueryFiltersMenu.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/QueryFiltersMenu.tsx
@@ -9,8 +9,8 @@ import { CLICK_OUTSIDE_BLOCK_CLASS } from 'lib/hooks/useOutsideClickHandler'
import { DateRange } from '~/queries/nodes/DataNode/DateRange'
import { TestAccountFilters } from '~/queries/nodes/DataNode/TestAccountFilters'
import { EventPropertyFilters } from '~/queries/nodes/EventsNode/EventPropertyFilters'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import type { HogQLFilters, HogQLQuery } from '~/queries/schema/schema-general'
-import { isHogQLQuery } from '~/queries/utils'
import { sqlEditorLogic } from './sqlEditorLogic'
diff --git a/frontend/src/scenes/debug/DebugSceneQuery.tsx b/frontend/src/scenes/debug/DebugSceneQuery.tsx
index 4e16b6883c42..e9b750147f31 100644
--- a/frontend/src/scenes/debug/DebugSceneQuery.tsx
+++ b/frontend/src/scenes/debug/DebugSceneQuery.tsx
@@ -8,8 +8,9 @@ import { QueryTabs } from 'scenes/debug/QueryTabs'
import { DataNodeLogicProps, dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'
import { QueryEditor } from '~/queries/QueryEditor/QueryEditor'
+import { isDataTableNode, isHogQLQuery, isInsightVizNode } from '~/queries/schema/node-guards'
import { Node } from '~/queries/schema/schema-general'
-import { isDataTableNode, isHogQLQuery, isHogQuery, isInsightVizNode } from '~/queries/utils'
+import { isHogQuery } from '~/queries/utils'
interface DebugSceneQueryProps {
queryKey: `new-${string}`
diff --git a/frontend/src/scenes/debug/QueryTabs.tsx b/frontend/src/scenes/debug/QueryTabs.tsx
index e02d2a938f2f..2df395c65715 100644
--- a/frontend/src/scenes/debug/QueryTabs.tsx
+++ b/frontend/src/scenes/debug/QueryTabs.tsx
@@ -9,8 +9,8 @@ import { CodeEditor } from 'lib/monaco/CodeEditor'
import { ErrorBoundary } from '~/layout/ErrorBoundary'
import { Timings } from '~/queries/nodes/DataNode/ElapsedTime'
import { Query } from '~/queries/Query/Query'
+import { isDataTableNode, isHogQLQuery, isInsightQueryNode, isInsightVizNode } from '~/queries/schema/node-guards'
import { HogQLMetadataResponse, InsightVizNode, Node, NodeKind, QueryTiming } from '~/queries/schema/schema-general'
-import { isDataTableNode, isHogQLQuery, isInsightQueryNode, isInsightVizNode } from '~/queries/utils'
import { QueryLogTable } from './QueryLogTable'
diff --git a/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/MetricEventDetails.tsx b/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/MetricEventDetails.tsx
index 48007cecf11d..ce0f60059516 100644
--- a/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/MetricEventDetails.tsx
+++ b/frontend/src/scenes/experiments/ExperimentForm/MetricsPanel/MetricEventDetails.tsx
@@ -4,6 +4,7 @@ import { IconArrowRight } from '@posthog/icons'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { isActionsNode, isDataWarehouseNode, isEventsNode } from '~/queries/schema/node-guards'
import type { ExperimentMetric } from '~/queries/schema/schema-general'
import type {
ExperimentFunnelMetric,
@@ -16,7 +17,6 @@ import {
isExperimentMeanMetric,
isExperimentRatioMetric,
} from '~/queries/schema/schema-general'
-import { isActionsNode, isDataWarehouseNode, isEventsNode } from '~/queries/utils'
const getSourceName = (source: ExperimentMetricSource): string =>
match(source)
diff --git a/frontend/src/scenes/experiments/utils.ts b/frontend/src/scenes/experiments/utils.ts
index d4c75245771a..92787fe86dff 100644
--- a/frontend/src/scenes/experiments/utils.ts
+++ b/frontend/src/scenes/experiments/utils.ts
@@ -6,6 +6,7 @@ import { uuid } from 'lib/utils/dom'
import { MathAvailability } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/types'
import { SeriesNode, isActionsSeriesNode, isEventsSeriesNode } from 'scenes/insights/filters/ActionFilter/seriesNode'
+import { isFunnelsQuery, isNodeWithSource, isTrendsQuery } from '~/queries/schema/node-guards'
import {
ActionsNode,
AnyEntityNode,
@@ -28,7 +29,7 @@ import {
isExperimentExposureNode,
isExperimentRetentionMetric,
} from '~/queries/schema/schema-general'
-import { isFunnelsQuery, isNodeWithSource, isTrendsQuery, isValidQueryForExperiment } from '~/queries/utils'
+import { isValidQueryForExperiment } from '~/queries/utils'
import {
AnyPropertyFilter,
BreakdownAttributionType,
diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
index 9665c3a852a9..0b6e88883a56 100644
--- a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
+++ b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
@@ -43,9 +43,9 @@ import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
+import { isFunnelsDataWarehouseNode } from '~/queries/schema/node-guards'
import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { EventsNode, Node, NodeKind, QueryStatus } from '~/queries/schema/schema-general'
-import { isFunnelsDataWarehouseNode } from '~/queries/utils'
import {
AccessControlLevel,
AccessControlResourceType,
diff --git a/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx b/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx
index cac6910b5062..0523ba93a74c 100644
--- a/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx
+++ b/frontend/src/scenes/insights/__mocks__/createInsightScene.tsx
@@ -11,8 +11,8 @@ import { App } from 'scenes/App'
import { sceneLayoutLogic } from '~/layout/scenes/sceneLayoutLogic'
import { mswDecorator, useStorybookMocks } from '~/mocks/browser'
+import { isInsightVizNode, isLifecycleQuery, isStickinessQuery, isTrendsQuery } from '~/queries/schema/node-guards'
import { InsightVizNode, Node } from '~/queries/schema/schema-general'
-import { isInsightVizNode, isLifecycleQuery, isStickinessQuery, isTrendsQuery } from '~/queries/utils'
import { InsightModel } from '~/types'
/** Spread into a `createInsightStory` story's `parameters`, merging `testOptions` for extra keys. */
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/useMathSelectorOptions.tsx b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/useMathSelectorOptions.tsx
index 112f89cc7425..2decf88a51d6 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/useMathSelectorOptions.tsx
+++ b/frontend/src/scenes/insights/filters/ActionFilter/ActionFilterRow/useMathSelectorOptions.tsx
@@ -6,14 +6,9 @@ import { LemonSelect, LemonSelectOption, LemonSelectOptions } from '@posthog/lem
import { capitalizeFirstLetter } from 'lib/utils/strings'
+import { isInsightVizNode, isStickinessQuery, isTrendsQuery } from '~/queries/schema/node-guards'
import { MathType } from '~/queries/schema/schema-general'
-import {
- TRAILING_MATH_TYPES,
- getMathTypeWarning,
- isInsightVizNode,
- isStickinessQuery,
- isTrendsQuery,
-} from '~/queries/utils'
+import { TRAILING_MATH_TYPES, getMathTypeWarning } from '~/queries/utils'
import { BaseMathType, ChartDisplayType, CountPerActorMathType, HogQLMathType, PropertyMathType } from '~/types'
import { GroupIntroductionFooter } from 'products/groups/frontend/components/GroupsIntroduction'
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/flagCallsSeries.ts b/frontend/src/scenes/insights/filters/ActionFilter/flagCallsSeries.ts
index e679e324a9b6..d2a58a01f48c 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/flagCallsSeries.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/flagCallsSeries.ts
@@ -5,6 +5,7 @@ import {
} from 'scenes/feature-flags/flagEvaluationsTable'
import { getHogQLValue } from 'scenes/insights/filters/aggregationTarget'
+import { isAnyDataWarehouseNode } from '~/queries/schema/node-guards'
import {
BreakdownFilter,
DataWarehouseNode,
@@ -13,7 +14,6 @@ import {
LifecycleDataWarehouseNode,
NodeKind,
} from '~/queries/schema/schema-general'
-import { isAnyDataWarehouseNode } from '~/queries/utils'
import { CORE_FILTER_DEFINITIONS_BY_GROUP } from '~/taxonomy/taxonomy'
import {
AnyPropertyFilter,
diff --git a/frontend/src/scenes/insights/insightDataLogic.tsx b/frontend/src/scenes/insights/insightDataLogic.tsx
index 80670aebe07c..bc37c8df588d 100644
--- a/frontend/src/scenes/insights/insightDataLogic.tsx
+++ b/frontend/src/scenes/insights/insightDataLogic.tsx
@@ -44,18 +44,16 @@ import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys
import { compareQuery, isDraftQueryWorthSaving } from '~/queries/nodes/InsightViz/queryUtils'
import { getDefaultQuery, queryFromKind } from '~/queries/nodes/InsightViz/utils'
import { queryExportContext } from '~/queries/query'
-import { VisualizationNode, HogQLVariable, InsightVizNode, Node, NodeKind } from '~/queries/schema/schema-general'
import {
isDataTableNode,
isDataVisualizationNode,
isDataVisualizationNodeWithHogQLQuery,
isHogQLQuery,
- isHogQuery,
isInsightQueryNode,
isInsightVizNode,
- isWebAnalyticsInsightQuery,
- shouldQueryBeAsync,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { VisualizationNode, HogQLVariable, InsightVizNode, Node, NodeKind } from '~/queries/schema/schema-general'
+import { isHogQuery, isWebAnalyticsInsightQuery, shouldQueryBeAsync } from '~/queries/utils'
import { ChartDisplayType, ExportContext, InsightLogicProps, InsightType } from '~/types'
import { DATAWAREHOUSE_EDITOR_ITEM_ID } from 'products/data_warehouse/frontend/utils'
diff --git a/frontend/src/scenes/insights/insightLogic.tsx b/frontend/src/scenes/insights/insightLogic.tsx
index 52b9ccb03aff..1223d12f12bc 100644
--- a/frontend/src/scenes/insights/insightLogic.tsx
+++ b/frontend/src/scenes/insights/insightLogic.tsx
@@ -53,9 +53,7 @@ import { groupsModel } from '~/models/groupsModel'
import { insightsModel } from '~/models/insightsModel'
import { tagsModel } from '~/models/tagsModel'
import { RESPONSE_CACHE_TTL } from '~/queries/nodes/DataNode/responseCache'
-import { DashboardFilter, HogQLVariable, Node, TileFilters } from '~/queries/schema/schema-general'
import {
- convertDataTableNodeToDataVisualizationNode,
isFunnelsQuery,
isLifecycleQuery,
isNodeWithSource,
@@ -63,8 +61,9 @@ import {
isRetentionQuery,
isStickinessQuery,
isTrendsQuery,
- isValidQueryForExperiment,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { DashboardFilter, HogQLVariable, Node, TileFilters } from '~/queries/schema/schema-general'
+import { convertDataTableNodeToDataVisualizationNode, isValidQueryForExperiment } from '~/queries/utils'
import {
AccessControlLevel,
AccessControlResourceType,
diff --git a/frontend/src/scenes/insights/insightSceneLogic.tsx b/frontend/src/scenes/insights/insightSceneLogic.tsx
index 2ab8461522ee..5f5b2731b415 100644
--- a/frontend/src/scenes/insights/insightSceneLogic.tsx
+++ b/frontend/src/scenes/insights/insightSceneLogic.tsx
@@ -42,6 +42,7 @@ import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigati
import { sceneLayoutLogic } from '~/layout/scenes/sceneLayoutLogic'
import { dashboardsModel } from '~/models/dashboardsModel'
import { getDefaultQuery } from '~/queries/nodes/InsightViz/utils'
+import { isDataTableNode, isInsightVizNode } from '~/queries/schema/node-guards'
import { checkLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
DashboardFilter,
@@ -52,7 +53,7 @@ import {
QueryLogTags,
TileFilters,
} from '~/queries/schema/schema-general'
-import { convertDataTableNodeToDataVisualizationNode, isDataTableNode, isInsightVizNode } from '~/queries/utils'
+import { convertDataTableNodeToDataVisualizationNode } from '~/queries/utils'
import {
ActivityScope,
Breadcrumb,
diff --git a/frontend/src/scenes/insights/insightUsageLogic.ts b/frontend/src/scenes/insights/insightUsageLogic.ts
index fdbdaaa7ab14..51c8069b7f60 100644
--- a/frontend/src/scenes/insights/insightUsageLogic.ts
+++ b/frontend/src/scenes/insights/insightUsageLogic.ts
@@ -12,8 +12,8 @@ import { userLogic } from 'scenes/userLogic'
import { isSharedView } from '~/exporter/exporterViewLogic'
import { DataNodeLogicProps, dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'
+import { isNodeWithSource } from '~/queries/schema/node-guards'
import { Node } from '~/queries/schema/schema-general'
-import { isNodeWithSource } from '~/queries/utils'
import { InsightLogicProps } from '~/types'
import type { DataNode } from '../../queries/schema/schema-general'
diff --git a/frontend/src/scenes/insights/insightVizDataLogic.ts b/frontend/src/scenes/insights/insightVizDataLogic.ts
index cd37d307cb83..2a0e7c001848 100644
--- a/frontend/src/scenes/insights/insightVizDataLogic.ts
+++ b/frontend/src/scenes/insights/insightVizDataLogic.ts
@@ -53,6 +53,34 @@ import {
getAllEventNames,
queryFromKind,
} from '~/queries/nodes/InsightViz/utils'
+import {
+ getBreakdown,
+ getCompareFilter,
+ getDisplay,
+ getFormula,
+ getInterval,
+ getSeries,
+} from '~/queries/schema/node-accessors'
+import {
+ isActionsNode,
+ isAnyDataWarehouseNode,
+ isDataWarehouseNode,
+ isEventsNode,
+ isFunnelsQuery,
+ isInsightQueryNode,
+ isInsightVizNode,
+ isLifecycleDataWarehouseNode,
+ isLifecycleQuery,
+ isNodeWithSource,
+ isPathsQuery,
+ isPathsV2Query,
+ isRetentionQuery,
+ isStickinessQuery,
+ isTrendsQuery,
+ isWebOverviewQuery,
+ isWebStatsTableQuery,
+ hasBreakdownFilter,
+} from '~/queries/schema/node-guards'
import {
AnyDataWarehouseNode,
AnyEntityNode,
@@ -82,17 +110,11 @@ import {
filterForQuery,
filterKeyForQuery,
getAggregationGroupTypeIndex,
- getBreakdown,
- getCompareFilter,
- getDisplay,
- getFormula,
getFormulaNodes,
getFormulas,
getGoalLines,
- getInterval,
getLegendPosition,
getResultCustomizationBy,
- getSeries,
getShowAlertThresholdLines,
getAnnotationsScope,
getShowAnnotations,
@@ -103,28 +125,10 @@ import {
getShowPercentStackView,
getShowValuesOnSeries,
getYAxisScaleType,
- isActionsNode,
- isAnyDataWarehouseNode,
- isDataWarehouseNode,
- isEventsNode,
- isFunnelsQuery,
- isInsightQueryNode,
- isInsightVizNode,
- isLifecycleDataWarehouseNode,
- isLifecycleQuery,
- isNodeWithSource,
- isPathsQuery,
- isPathsV2Query,
- isRetentionQuery,
- isStickinessQuery,
- isTrendsQuery,
isWebAnalyticsInsightQuery,
- isWebOverviewQuery,
- isWebStatsTableQuery,
nodeKindToFilterProperty,
supportsBarValueStacking,
supportsPercentStackView,
- hasBreakdownFilter,
} from '~/queries/utils'
import {
BaseMathType,
diff --git a/frontend/src/scenes/insights/summarizeInsight.ts b/frontend/src/scenes/insights/summarizeInsight.ts
index 3e064a892886..6e8426c3ddd9 100644
--- a/frontend/src/scenes/insights/summarizeInsight.ts
+++ b/frontend/src/scenes/insights/summarizeInsight.ts
@@ -11,16 +11,8 @@ import type { cohortsModelType } from '~/models/cohortsModel'
import { groupsModel } from '~/models/groupsModel'
import type { groupsModelType } from '~/models/groupsModel'
import { extractDisplayLabel } from '~/queries/nodes/DataTable/utils'
-import {
- Breakdown,
- BreakdownFilter,
- InsightQueryNode,
- MultipleBreakdownType,
- Node,
-} from '~/queries/schema/schema-general'
import {
isDataTableNode,
- isEventsQuery,
isFunnelsQuery,
isHogQLQuery,
isInsightVizNode,
@@ -33,7 +25,15 @@ import {
isTrendsQuery,
isWebOverviewQuery,
isWebStatsTableQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import {
+ Breakdown,
+ BreakdownFilter,
+ InsightQueryNode,
+ MultipleBreakdownType,
+ Node,
+} from '~/queries/schema/schema-general'
+import { isEventsQuery } from '~/queries/utils'
import { getCoreFilterDefinition } from '~/taxonomy/helpers'
import { CORE_FILTER_DEFINITIONS_BY_GROUP } from '~/taxonomy/taxonomy'
import { BreakdownKeyType, BreakdownType, EntityFilter, FilterType, FunnelVizType, StepOrderValue } from '~/types'
diff --git a/frontend/src/scenes/insights/utils.test.ts b/frontend/src/scenes/insights/utils.test.ts
index 8eb36a86966b..62509ce094e1 100644
--- a/frontend/src/scenes/insights/utils.test.ts
+++ b/frontend/src/scenes/insights/utils.test.ts
@@ -11,6 +11,7 @@ import {
} from 'scenes/insights/utils'
import { teamLogic } from 'scenes/teamLogic'
+import { isEventsNode } from '~/queries/schema/node-guards'
import {
ActionsNode,
BreakdownFilter,
@@ -20,7 +21,6 @@ import {
NodeKind,
TrendsQuery,
} from '~/queries/schema/schema-general'
-import { isEventsNode } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import { BaseMathType, CompareLabelType, Entity, FilterType, InsightType, TeamType } from '~/types'
diff --git a/frontend/src/scenes/insights/utils.tsx b/frontend/src/scenes/insights/utils.tsx
index 539abdab837e..98027bf22261 100644
--- a/frontend/src/scenes/insights/utils.tsx
+++ b/frontend/src/scenes/insights/utils.tsx
@@ -20,6 +20,16 @@ import { propertyFilterTypeToPropertyDefinitionType } from '~/lib/components/Pro
import { FormatPropertyValueForDisplayFunction } from '~/models/propertyDefinitionsModel'
import { examples } from '~/queries/examples'
import { cleanInsightQuery } from '~/queries/nodes/InsightViz/queryUtils'
+import {
+ containsHogQLQuery,
+ isBIVisualizationNode,
+ isDataTableNode,
+ isEventsNode,
+ isGroupNode,
+ isHogQLQuery,
+ isInsightVizNode,
+ isNodeWithSource,
+} from '~/queries/schema/node-guards'
import {
AnyDataWarehouseNode,
AnyEntityNode,
@@ -42,16 +52,6 @@ import {
ResultCustomizationByValue,
TileFilters,
} from '~/queries/schema/schema-general'
-import {
- containsHogQLQuery,
- isBIVisualizationNode,
- isDataTableNode,
- isEventsNode,
- isGroupNode,
- isHogQLQuery,
- isInsightVizNode,
- isNodeWithSource,
-} from '~/queries/utils'
import { getResultSeriesIndex } from '~/scenes/insights/utils/resultSeries'
import { CORE_FILTER_DEFINITIONS_BY_GROUP } from '~/taxonomy/taxonomy'
import {
diff --git a/frontend/src/scenes/insights/utils/resultSeries.ts b/frontend/src/scenes/insights/utils/resultSeries.ts
index 0cbc790e8388..99754a1ad5c9 100644
--- a/frontend/src/scenes/insights/utils/resultSeries.ts
+++ b/frontend/src/scenes/insights/utils/resultSeries.ts
@@ -7,8 +7,8 @@ import {
isWarehouseSeriesNode,
} from 'scenes/insights/filters/ActionFilter/seriesNode'
+import { isInsightQueryWithSeries, isLifecycleQuery, isTrendsQuery } from '~/queries/schema/node-guards'
import { InsightQueryNode } from '~/queries/schema/schema-general'
-import { isInsightQueryWithSeries, isLifecycleQuery, isTrendsQuery } from '~/queries/utils'
import { BaseMathType, ChartDisplayType, IntervalType } from '~/types'
export type ResultSeriesMath = Pick<SeriesNode, 'math' | 'math_property' | 'math_hogql' | 'math_group_type_index'>
diff --git a/frontend/src/scenes/max/messages/MultiVisualizationMosaic.tsx b/frontend/src/scenes/max/messages/MultiVisualizationMosaic.tsx
index 774fa30a78bc..7ed5cfb32300 100644
--- a/frontend/src/scenes/max/messages/MultiVisualizationMosaic.tsx
+++ b/frontend/src/scenes/max/messages/MultiVisualizationMosaic.tsx
@@ -12,8 +12,8 @@ import {
import { TopHeading } from 'lib/components/Cards/InsightCard/TopHeading'
import { Query } from '~/queries/Query/Query'
+import { isDataVisualizationNode, isHogQLQuery } from '~/queries/schema/node-guards'
import { DataVisualizationNode, InsightVizNode } from '~/queries/schema/schema-general'
-import { isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
import type { MultiVisualizationInsight } from './multiVisualizationInsights'
diff --git a/frontend/src/scenes/max/messages/NotebookArtifactAnswer.tsx b/frontend/src/scenes/max/messages/NotebookArtifactAnswer.tsx
index dfc3d0ac5093..cc0fc7018d0b 100644
--- a/frontend/src/scenes/max/messages/NotebookArtifactAnswer.tsx
+++ b/frontend/src/scenes/max/messages/NotebookArtifactAnswer.tsx
@@ -22,6 +22,7 @@ import { urls } from 'scenes/urls'
import { notebooksModel } from '~/models/notebooksModel'
import { Query } from '~/queries/Query/Query'
+import { isFunnelsQuery, isHogQLQuery, isInsightVizNode } from '~/queries/schema/node-guards'
import {
DocumentBlock,
ErrorBlock,
@@ -32,7 +33,6 @@ import {
} from '~/queries/schema/schema-assistant-artifacts'
import { NotebookArtifactContent } from '~/queries/schema/schema-assistant-messages'
import { DataVisualizationNode, InsightVizNode } from '~/queries/schema/schema-general'
-import { isFunnelsQuery, isHogQLQuery, isInsightVizNode } from '~/queries/utils'
import { MarkdownMessage, MessageTemplate } from 'products/posthog_ai/frontend/api/primitives'
diff --git a/frontend/src/scenes/max/utils.ts b/frontend/src/scenes/max/utils.ts
index 924100ac0567..46a5f0d9203c 100644
--- a/frontend/src/scenes/max/utils.ts
+++ b/frontend/src/scenes/max/utils.ts
@@ -5,6 +5,7 @@ import { FEATURE_FLAGS } from 'lib/constants'
import { dayjs } from 'lib/dayjs'
import { humanFriendlyDuration } from 'lib/utils/durations'
+import { isHogQLQuery, isInsightQueryNode } from '~/queries/schema/node-guards'
import { VisualizationBlock } from '~/queries/schema/schema-assistant-artifacts'
import {
AgentMode,
@@ -34,7 +35,6 @@ import {
QuerySchema,
QuerySchemaRoot,
} from '~/queries/schema/schema-general'
-import { isHogQLQuery, isInsightQueryNode } from '~/queries/utils'
import { ActionType, EventDefinition, InsightModel } from '~/types'
import { Scene } from '../sceneTypes'
diff --git a/frontend/src/scenes/max/utils/detectWebAnalyticsQuery.ts b/frontend/src/scenes/max/utils/detectWebAnalyticsQuery.ts
index dea17aaa6c60..1adc81dfb353 100644
--- a/frontend/src/scenes/max/utils/detectWebAnalyticsQuery.ts
+++ b/frontend/src/scenes/max/utils/detectWebAnalyticsQuery.ts
@@ -1,4 +1,3 @@
-import { BreakdownFilter, EventsNode, GroupNode, QuerySchema, TrendsQuery } from '~/queries/schema/schema-general'
import {
isActionsNode,
isDataVisualizationNode,
@@ -12,12 +11,11 @@ import {
isRetentionQuery,
isStickinessQuery,
isTrendsQuery,
- isWebGoalsQuery,
isWebOverviewQuery,
isWebStatsTableQuery,
- isWebVitalsPathBreakdownQuery,
- isWebVitalsQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { BreakdownFilter, EventsNode, GroupNode, QuerySchema, TrendsQuery } from '~/queries/schema/schema-general'
+import { isWebGoalsQuery, isWebVitalsPathBreakdownQuery, isWebVitalsQuery } from '~/queries/utils'
import { AnyPropertyFilter, PropertyGroupFilter, PropertyGroupFilterValue, RetentionEntity } from '~/types'
import { ThreadMessage } from '../maxThreadLogic'
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx b/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
index b0f0bd2b9c42..ebabf25379d2 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodeQuery.tsx
@@ -16,17 +16,16 @@ import { defineNotebookWidgetViews, getNotebookWidgetDefaultView } from 'scenes/
import { urls } from 'scenes/urls'
import { Query } from '~/queries/Query/Query'
-import { DataTableNode, InsightVizNode, NodeKind, QuerySchema } from '~/queries/schema/schema-general'
import {
containsHogQLQuery,
isDataTableNode,
- isEventsQuery,
isHogQLQuery,
isInsightVizNode,
isNodeWithSource,
- isSavedInsightNode,
isActorsQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { DataTableNode, InsightVizNode, NodeKind, QuerySchema } from '~/queries/schema/schema-general'
+import { isEventsQuery, isSavedInsightNode } from '~/queries/utils'
import { InsightLogicProps, InsightShortId } from '~/types'
import { NotebookInsightDataframe } from 'products/notebooks/frontend/NotebookInsightDataframe'
diff --git a/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.test.tsx b/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.test.tsx
index e8843d11f578..0371662c613c 100644
--- a/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.test.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.test.tsx
@@ -23,7 +23,7 @@ jest.mock('../notebookNodeLogic', () => ({
notebookNodeLogic: { __mock: 'notebookNodeLogic' },
}))
-jest.mock('~/queries/utils', () => ({
+jest.mock('~/queries/schema/node-guards', () => ({
isHogQLQuery: jest.fn((query: unknown) => (query as { kind?: string } | undefined)?.kind === 'HogQLQuery'),
}))
diff --git a/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.tsx b/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.tsx
index c6f966390472..9a17ad5861a4 100644
--- a/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/components/NotebookNodeTitle.tsx
@@ -7,7 +7,7 @@ import { LemonInput, LemonTag, Tooltip } from '@posthog/lemon-ui'
import { Spinner } from 'lib/lemon-ui/Spinner'
import { notebookLogic } from 'scenes/notebooks/Notebook/notebookLogic'
-import { isHogQLQuery } from '~/queries/utils'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import { NotebookNodeType } from '../../types'
import { notebookNodeLogic } from '../notebookNodeLogic'
diff --git a/frontend/src/scenes/notebooks/Nodes/components/NotebookSQLEditor.tsx b/frontend/src/scenes/notebooks/Nodes/components/NotebookSQLEditor.tsx
index 3a61725f46f3..f1985bca5247 100644
--- a/frontend/src/scenes/notebooks/Nodes/components/NotebookSQLEditor.tsx
+++ b/frontend/src/scenes/notebooks/Nodes/components/NotebookSQLEditor.tsx
@@ -9,8 +9,9 @@ import { SQLEditor, SQLEditorPanel } from 'scenes/data-warehouse/editor/SQLEdito
import { sqlEditorLogic } from 'scenes/data-warehouse/editor/sqlEditorLogic'
import { SQLEditorMode } from 'scenes/data-warehouse/editor/sqlEditorModes'
+import { isDataVisualizationNode, isHogQLQuery } from '~/queries/schema/node-guards'
import { DataVisualizationNode, HogQLQuery, NodeKind, ProductKey, QuerySchema } from '~/queries/schema/schema-general'
-import { convertDataTableNodeToDataVisualizationNode, isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
+import { convertDataTableNodeToDataVisualizationNode } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import { notebookKernelInfoLogic } from '../../Notebook/notebookKernelInfoLogic'
diff --git a/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts b/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts
index 8ad5ec49f825..69c8e1002b73 100644
--- a/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts
+++ b/frontend/src/scenes/notebooks/Nodes/notebookNodeLogic.ts
@@ -20,7 +20,7 @@ import { LemonMenuItems } from '@posthog/lemon-ui'
import type { NotebookComponentToolbarTitleStatus } from 'lib/components/MarkdownNotebook/componentToolbarExtras'
import { JSONContent, RichContentNode } from 'lib/components/RichContentEditor/types'
-import { isHogQLQuery, isNodeWithSource } from '~/queries/utils'
+import { isHogQLQuery, isNodeWithSource } from '~/queries/schema/node-guards'
import type { CommentType } from '../../../types'
import {
diff --git a/frontend/src/scenes/notebooks/Notebook/markdownNotebookV2.ts b/frontend/src/scenes/notebooks/Notebook/markdownNotebookV2.ts
index 19bcf44a7ac1..e84f9fa9fc34 100644
--- a/frontend/src/scenes/notebooks/Notebook/markdownNotebookV2.ts
+++ b/frontend/src/scenes/notebooks/Notebook/markdownNotebookV2.ts
@@ -21,6 +21,7 @@ import { removeProjectIdIfPresent } from 'lib/utils/kea-router'
import { OutputTab } from 'scenes/data-warehouse/editor/outputPaneLogic'
import { urlToResource } from 'scenes/urls'
+import { isDataVisualizationNode, isHogQLQuery, isInsightQueryNode } from '~/queries/schema/node-guards'
import { DocumentBlock, VisualizationBlock } from '~/queries/schema/schema-assistant-artifacts'
import {
ArtifactContentType,
@@ -28,7 +29,6 @@ import {
VisualizationArtifactContent,
} from '~/queries/schema/schema-assistant-messages'
import { DataVisualizationNode, InsightVizNode, NodeKind, QuerySchemaRoot } from '~/queries/schema/schema-general'
-import { isDataVisualizationNode, isHogQLQuery, isInsightQueryNode } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import { NotebookNodeType } from '../types'
diff --git a/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts b/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
index f6ec71c0e469..56f0cef99db4 100644
--- a/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
+++ b/frontend/src/scenes/notebooks/Notebook/notebookLogic.ts
@@ -55,9 +55,9 @@ import {
openNotebook,
} from '~/models/notebooksModel'
import { RESPONSE_CACHE_TTL } from '~/queries/nodes/DataNode/responseCache'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import type { NotebookArtifactContent } from '~/queries/schema/schema-assistant-messages'
import { AnyResponseType } from '~/queries/schema/schema-general'
-import { isHogQLQuery } from '~/queries/utils'
import {
AccessControlLevel,
InsightModel,
diff --git a/frontend/src/scenes/saved-insights/InsightIcon.tsx b/frontend/src/scenes/saved-insights/InsightIcon.tsx
index da82f5a32995..933764a11d64 100644
--- a/frontend/src/scenes/saved-insights/InsightIcon.tsx
+++ b/frontend/src/scenes/saved-insights/InsightIcon.tsx
@@ -2,7 +2,7 @@ import { ComponentType } from 'react'
import { isNonEmptyObject } from 'lib/utils/guards'
-import { isNodeWithSource } from '~/queries/utils'
+import { isNodeWithSource } from '~/queries/schema/node-guards'
import { InsightModel } from '~/types'
import { QUERY_TYPES_METADATA } from './insightTypesMetadata'
diff --git a/frontend/src/scenes/trends/persons-modal/persons-modal-utils.tsx b/frontend/src/scenes/trends/persons-modal/persons-modal-utils.tsx
index df02dbb957e3..d295addc5b0a 100644
--- a/frontend/src/scenes/trends/persons-modal/persons-modal-utils.tsx
+++ b/frontend/src/scenes/trends/persons-modal/persons-modal-utils.tsx
@@ -4,6 +4,7 @@ import { objectsEqual } from 'lib/utils/objects'
import { pluralize } from 'lib/utils/strings'
import { BREAKDOWN_BASELINE_STRING_LABEL } from 'scenes/insights/utils'
+import { isTrendsQuery } from '~/queries/schema/node-guards'
import {
BreakdownItem,
FunnelsActorsQuery,
@@ -11,7 +12,6 @@ import {
InsightActorsQueryOptionsResponse,
insightActorsQueryOptionsResponseKeys,
} from '~/queries/schema/schema-general'
-import { isTrendsQuery } from '~/queries/utils'
import { getCoreFilterDefinition } from '~/taxonomy/helpers'
import { StepOrderValue } from '~/types'
diff --git a/frontend/src/scenes/web-analytics/WebAnalyticsInsight.tsx b/frontend/src/scenes/web-analytics/WebAnalyticsInsight.tsx
index 61f33d9a1a44..090ebb81ae36 100644
--- a/frontend/src/scenes/web-analytics/WebAnalyticsInsight.tsx
+++ b/frontend/src/scenes/web-analytics/WebAnalyticsInsight.tsx
@@ -2,9 +2,9 @@ import { useValues } from 'kea'
import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'
import { Query } from '~/queries/Query/Query'
+import { isWebOverviewQuery, isWebStatsTableQuery } from '~/queries/schema/node-guards'
import { DataTableNode, InsightVizNode, NodeKind } from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
-import { isWebOverviewQuery, isWebStatsTableQuery } from '~/queries/utils'
import { insightLogic } from '../insights/insightLogic'
import { insightVizDataLogic } from '../insights/insightVizDataLogic'
diff --git a/frontend/src/scenes/web-analytics/webAnalyticsExportUtils.ts b/frontend/src/scenes/web-analytics/webAnalyticsExportUtils.ts
index 6487473bff03..d3bde34bce39 100644
--- a/frontend/src/scenes/web-analytics/webAnalyticsExportUtils.ts
+++ b/frontend/src/scenes/web-analytics/webAnalyticsExportUtils.ts
@@ -15,6 +15,7 @@ import {
} from '~/queries/nodes/InsightViz/exportAdapters'
import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'
import { GRADE_PER_BAND } from '~/queries/nodes/WebVitals/definitions'
+import { isWebStatsTableQuery } from '~/queries/schema/node-guards'
import {
DataTableNode,
NodeKind,
@@ -33,7 +34,6 @@ import {
import {
isWebExternalClicksQuery,
isWebGoalsQuery,
- isWebStatsTableQuery,
isWebVitalsPathBreakdownQuery,
isWebVitalsQuery,
} from '~/queries/utils'
diff --git a/products/ai_observability/frontend/AIObservabilityErrors.tsx b/products/ai_observability/frontend/AIObservabilityErrors.tsx
index 5b491ed10329..30bf30fa6703 100644
--- a/products/ai_observability/frontend/AIObservabilityErrors.tsx
+++ b/products/ai_observability/frontend/AIObservabilityErrors.tsx
@@ -10,8 +10,8 @@ import { copyToClipboard } from 'lib/utils/copyToClipboard'
import { urls } from 'scenes/urls'
import { DataTable } from '~/queries/nodes/DataTable/DataTable'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import { type InsightVizNode, NodeKind } from '~/queries/schema/schema-general'
-import { isHogQLQuery } from '~/queries/utils'
import { type AnyPropertyFilter, PropertyFilterType, PropertyOperator } from '~/types'
import { buildApplyUrlStatePayload, aiObservabilitySharedLogic } from './aiObservabilitySharedLogic'
diff --git a/products/ai_observability/frontend/AIObservabilityTools.tsx b/products/ai_observability/frontend/AIObservabilityTools.tsx
index 128b6e5844d2..e575120665f4 100644
--- a/products/ai_observability/frontend/AIObservabilityTools.tsx
+++ b/products/ai_observability/frontend/AIObservabilityTools.tsx
@@ -10,8 +10,8 @@ import { escapeRegex } from 'lib/utils/actions'
import { urls } from 'scenes/urls'
import { DataTable } from '~/queries/nodes/DataTable/DataTable'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import { type InsightVizNode, NodeKind } from '~/queries/schema/schema-general'
-import { isHogQLQuery } from '~/queries/utils'
import { PropertyFilterType, PropertyOperator } from '~/types'
import { buildApplyUrlStatePayload, aiObservabilitySharedLogic } from './aiObservabilitySharedLogic'
diff --git a/products/ai_observability/frontend/AIObservabilityUsers.tsx b/products/ai_observability/frontend/AIObservabilityUsers.tsx
index 6a29fd9184ff..56ef6adf625f 100644
--- a/products/ai_observability/frontend/AIObservabilityUsers.tsx
+++ b/products/ai_observability/frontend/AIObservabilityUsers.tsx
@@ -3,7 +3,7 @@ import { useActions, useValues } from 'kea'
import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { DataTable } from '~/queries/nodes/DataTable/DataTable'
-import { isHogQLQuery } from '~/queries/utils'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import { aiObservabilityColumnRenderers } from './aiObservabilityColumnRenderers'
import { buildApplyUrlStatePayload, aiObservabilitySharedLogic } from './aiObservabilitySharedLogic'
diff --git a/products/ai_observability/frontend/aiObservabilityColumnRenderers.tsx b/products/ai_observability/frontend/aiObservabilityColumnRenderers.tsx
index cfd2c53170a4..2b9c7f2512c7 100644
--- a/products/ai_observability/frontend/aiObservabilityColumnRenderers.tsx
+++ b/products/ai_observability/frontend/aiObservabilityColumnRenderers.tsx
@@ -9,10 +9,11 @@ import { Tooltip } from 'lib/lemon-ui/Tooltip'
import { hogql } from 'lib/utils/hogql'
import { urls } from 'scenes/urls'
+import { isDataTableNode } from '~/queries/schema/node-guards'
import { DataTableNode, VisualizationNode } from '~/queries/schema/schema-general'
import { LLMTrace } from '~/queries/schema/schema-general'
import { QueryContextColumn } from '~/queries/types'
-import { isDataTableNode, isEventsQuery } from '~/queries/utils'
+import { isEventsQuery } from '~/queries/utils'
import { AnyPropertyFilter, PropertyFilterType, PropertyOperator } from '~/types'
import { PersonDisplay, PersonIcon } from 'products/persons/frontend/components/PersonDisplay'
diff --git a/products/alerts/frontend/logic/alertFormLogic.ts b/products/alerts/frontend/logic/alertFormLogic.ts
index aa9c6665ec25..662e148acb78 100644
--- a/products/alerts/frontend/logic/alertFormLogic.ts
+++ b/products/alerts/frontend/logic/alertFormLogic.ts
@@ -13,6 +13,7 @@ import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import { urls } from 'scenes/urls'
import { userLogic } from 'scenes/userLogic'
+import { containsHogQLQuery, isFunnelsQuery, isInsightVizNode, isMetricsQuery } from '~/queries/schema/node-guards'
import {
AlertCalculationInterval,
AlertConditionType,
@@ -21,7 +22,6 @@ import {
InsightThresholdType,
InsightsThresholdBounds,
} from '~/queries/schema/schema-general'
-import { containsHogQLQuery, isFunnelsQuery, isInsightVizNode, isMetricsQuery } from '~/queries/utils'
import { AvailableFeature, InsightLogicProps, IntervalType, InsightModel } from '~/types'
import { alertsSimulateCreate } from 'products/alerts/frontend/generated/api'
diff --git a/products/alerts/frontend/logic/insightAlertsLogic.ts b/products/alerts/frontend/logic/insightAlertsLogic.ts
index 4f7088b70220..acb8d9c6f16e 100644
--- a/products/alerts/frontend/logic/insightAlertsLogic.ts
+++ b/products/alerts/frontend/logic/insightAlertsLogic.ts
@@ -6,13 +6,6 @@ import { NON_TIME_SERIES_DISPLAY_TYPES } from 'lib/constants'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-import {
- AlertConditionType,
- BreakdownFilter,
- GoalLine,
- InsightThresholdType,
- NodeKind,
-} from '~/queries/schema/schema-general'
import {
containsHogQLQuery,
hasBreakdownFilter,
@@ -20,7 +13,14 @@ import {
isInsightVizNode,
isMetricsQuery,
isTrendsQuery,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import {
+ AlertConditionType,
+ BreakdownFilter,
+ GoalLine,
+ InsightThresholdType,
+ NodeKind,
+} from '~/queries/schema/schema-general'
import { FunnelVizType, InsightLogicProps } from '~/types'
import type { Node } from '../../../../frontend/src/queries/schema/schema-general'
diff --git a/products/alerts/frontend/views/AlertModal.stories.tsx b/products/alerts/frontend/views/AlertModal.stories.tsx
index c97ecb7bf1e4..8245c117fd10 100644
--- a/products/alerts/frontend/views/AlertModal.stories.tsx
+++ b/products/alerts/frontend/views/AlertModal.stories.tsx
@@ -7,6 +7,7 @@ import { mswDecorator } from '~/mocks/browser'
import { EMPTY_PAGINATED_RESPONSE } from '~/mocks/handlers'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'
+import { isInsightVizNode } from '~/queries/schema/node-guards'
import {
AlertCalculationInterval,
AlertConditionType,
@@ -14,7 +15,6 @@ import {
InsightThresholdType,
NodeKind,
} from '~/queries/schema/schema-general'
-import { isInsightVizNode } from '~/queries/utils'
import type { AlertCheck, AlertType } from '../types'
import { EditAlertModal } from './EditAlertModal'
diff --git a/products/alerts/frontend/views/EditAlertModal.tsx b/products/alerts/frontend/views/EditAlertModal.tsx
index adaeab8ffb0d..94110b2a4f9b 100644
--- a/products/alerts/frontend/views/EditAlertModal.tsx
+++ b/products/alerts/frontend/views/EditAlertModal.tsx
@@ -14,8 +14,8 @@ import { getDisplayNameFromEntityNode } from 'scenes/insights/utils'
import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
+import { isFunnelsQuery, isInsightVizNode, isTrendsQuery } from '~/queries/schema/node-guards'
import { AlertCalculationInterval, AlertConditionType, InsightThresholdType } from '~/queries/schema/schema-general'
-import { isFunnelsQuery, isInsightVizNode, isTrendsQuery } from '~/queries/utils'
import { FunnelVizType, InsightLogicProps, InsightShortId, InsightModel } from '~/types'
import { AlertAdvancedOptionsSection } from 'products/alerts/frontend/components/AlertAdvancedOptionsSection'
diff --git a/products/business_intelligence/frontend/BusinessIntelligenceScene.tsx b/products/business_intelligence/frontend/BusinessIntelligenceScene.tsx
index c77f99b40d19..ae60e8e45aa0 100644
--- a/products/business_intelligence/frontend/BusinessIntelligenceScene.tsx
+++ b/products/business_intelligence/frontend/BusinessIntelligenceScene.tsx
@@ -15,7 +15,7 @@ import { SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
import { Query } from '~/queries/Query/Query'
-import { isDataVisualizationNode } from '~/queries/utils'
+import { isDataVisualizationNode } from '~/queries/schema/node-guards'
import { AccessControlLevel, AccessControlResourceType } from '~/types'
import { useMcpToolApplyBack } from 'products/posthog_ai/frontend/api/logics'
diff --git a/products/business_intelligence/frontend/biDashboardCrossFilters.ts b/products/business_intelligence/frontend/biDashboardCrossFilters.ts
index 0c5c3157a53c..6a418ae009a7 100644
--- a/products/business_intelligence/frontend/biDashboardCrossFilters.ts
+++ b/products/business_intelligence/frontend/biDashboardCrossFilters.ts
@@ -1,5 +1,5 @@
+import { isBIVisualizationNode } from '~/queries/schema/node-guards'
import { BIConfig, BIVisualizationNode } from '~/queries/schema/schema-business-intelligence'
-import { isBIVisualizationNode } from '~/queries/utils'
import { DashboardTile } from '~/types'
import { BIDrillSelection, getBIDrillSelection } from './biDrilldown'
diff --git a/products/business_intelligence/frontend/biHierarchyLogic.ts b/products/business_intelligence/frontend/biHierarchyLogic.ts
index aba1282be359..d787f22a3877 100644
--- a/products/business_intelligence/frontend/biHierarchyLogic.ts
+++ b/products/business_intelligence/frontend/biHierarchyLogic.ts
@@ -4,8 +4,8 @@ import { loaders } from 'kea-loaders'
import { uuid } from 'lib/utils/dom'
import { teamLogic } from 'scenes/teamLogic'
+import { isBIVisualizationNode } from '~/queries/schema/node-guards'
import { BIField, BIHierarchy } from '~/queries/schema/schema-business-intelligence'
-import { isBIVisualizationNode } from '~/queries/utils'
import { insightsList, insightsRetrieve } from 'products/product_analytics/frontend/generated/api'
diff --git a/products/business_intelligence/frontend/biSceneLogic.ts b/products/business_intelligence/frontend/biSceneLogic.ts
index be3935f14915..b1a5b199fc05 100644
--- a/products/business_intelligence/frontend/biSceneLogic.ts
+++ b/products/business_intelligence/frontend/biSceneLogic.ts
@@ -27,9 +27,9 @@ import { urls } from 'scenes/urls'
import { refreshTreeItem } from '~/layout/panel-layout/ProjectTree/projectTreeLogic'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
+import { isBIVisualizationNode } from '~/queries/schema/node-guards'
import { BIVisualizationNode } from '~/queries/schema/schema-business-intelligence'
import { ChartSettings, HogQLFilters, NodeKind, VisualizationNode } from '~/queries/schema/schema-general'
-import { isBIVisualizationNode } from '~/queries/utils'
import { AccessControlLevel, AccessControlResourceType, ChartDisplayType } from '~/types'
import { validateMetricName } from 'products/data_catalog/frontend/common'
diff --git a/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts b/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts
index 4924390bc3e1..6cedb5d9e177 100644
--- a/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts
+++ b/products/customer_analytics/frontend/components/CustomerJourneys/customerJourneysLogic.ts
@@ -8,8 +8,8 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
import { isUUIDLike } from 'lib/utils/guards'
+import { isInsightVizNode } from '~/queries/schema/node-guards'
import { FunnelsQuery, InsightVizNode } from '~/queries/schema/schema-general'
-import { isInsightVizNode } from '~/queries/utils'
import { insightsApi } from '~/scenes/insights/utils/api'
import { FunnelVizType, PropertyFilterType, PropertyOperator, InsightModel } from '~/types'
diff --git a/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts b/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts
index 1fdd9e84218d..a8bac3aec6fe 100644
--- a/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts
+++ b/products/customer_analytics/frontend/components/CustomerJourneys/journeyEditorLogic.ts
@@ -4,8 +4,8 @@ import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
import { eventNameToEventsNode } from '~/queries/nodes/InsightQuery/utils/eventNameToEventsNode'
+import { isInsightVizNode } from '~/queries/schema/node-guards'
import { EventsNode, FunnelsQuery, InsightVizNode } from '~/queries/schema/schema-general'
-import { isInsightVizNode } from '~/queries/utils'
import { insightsApi } from '~/scenes/insights/utils/api'
import { FunnelPathType } from '~/types'
diff --git a/products/customer_analytics/frontend/utils.ts b/products/customer_analytics/frontend/utils.ts
index 6ee4d886e700..867df50ea5f4 100644
--- a/products/customer_analytics/frontend/utils.ts
+++ b/products/customer_analytics/frontend/utils.ts
@@ -1,6 +1,6 @@
import type { SeriesNode } from 'scenes/insights/filters/ActionFilter/seriesNode'
-import { isEventsNode } from '~/queries/utils'
+import { isEventsNode } from '~/queries/schema/node-guards'
import { InsightLogicProps } from '~/types'
export const CUSTOMER_ANALYTICS_LOGIC_KEY = 'customerAnalytics'
diff --git a/products/dashboards/frontend/components/DashboardInsightResultMenu.tsx b/products/dashboards/frontend/components/DashboardInsightResultMenu.tsx
index 32e9f3c645c8..8beed72a095d 100644
--- a/products/dashboards/frontend/components/DashboardInsightResultMenu.tsx
+++ b/products/dashboards/frontend/components/DashboardInsightResultMenu.tsx
@@ -9,8 +9,13 @@ import {
} from 'lib/components/ResultMenu/resultMenuTrigger'
import { urls } from 'scenes/urls'
+import {
+ isBIVisualizationNode,
+ isDataTableNode,
+ isDataVisualizationNode,
+ isHogQLQuery,
+} from '~/queries/schema/node-guards'
import { DataTableNode, DataVisualizationNode, NodeKind } from '~/queries/schema/schema-general'
-import { isBIVisualizationNode, isDataTableNode, isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
import { ChartDisplayType, InsightModel } from '~/types'
import { DashboardInsightResultMenuPopover } from './DashboardInsightResultMenuPopover'
diff --git a/products/dashboards/frontend/components/DashboardInsightResultMenuPopover.tsx b/products/dashboards/frontend/components/DashboardInsightResultMenuPopover.tsx
index 7397269b79a6..28b6171c8c4e 100644
--- a/products/dashboards/frontend/components/DashboardInsightResultMenuPopover.tsx
+++ b/products/dashboards/frontend/components/DashboardInsightResultMenuPopover.tsx
@@ -8,8 +8,8 @@ import { getPersonsRecordingFilters } from 'scenes/trends/persons-modal/getPerso
import { openPersonsModal } from 'scenes/trends/persons-modal/PersonsModal'
import { urls } from 'scenes/urls'
+import { isActorsQuery } from '~/queries/schema/node-guards'
import { DataTableNode, DataVisualizationNode, NodeKind } from '~/queries/schema/schema-general'
-import { isActorsQuery } from '~/queries/utils'
import { ReplayTabs } from '~/types'
import { dashboardInsightResultMenuLogic } from './dashboardInsightResultMenuLogic'
diff --git a/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts b/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts
index a2f3a6517238..b6ad67cb94f7 100644
--- a/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts
+++ b/products/data_warehouse/frontend/sql_editor/aiChartRecommendationLogic.ts
@@ -28,8 +28,8 @@ import {
dataVisualizationLogic,
} from '~/queries/nodes/DataVisualization/dataVisualizationLogic'
import { performQuery } from '~/queries/query'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import { VisualizationNode, HogLanguage, HogQLMetadata, HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
-import { isHogQLQuery } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import * as decisionsApi from 'products/ml_inference/frontend/generated/api'
diff --git a/products/endpoints/frontend/EndpointHeader.tsx b/products/endpoints/frontend/EndpointHeader.tsx
index b6d48d2ba1de..86212bc4c0cd 100644
--- a/products/endpoints/frontend/EndpointHeader.tsx
+++ b/products/endpoints/frontend/EndpointHeader.tsx
@@ -11,8 +11,8 @@ import { copyToClipboard } from 'lib/utils/copyToClipboard'
import { objectsEqual } from 'lib/utils/objects'
import { SceneTitleSection } from '~/layout/scenes/components/SceneTitleSection'
+import { isInsightVizNode } from '~/queries/schema/node-guards'
import { EndpointRequest } from '~/queries/schema/schema-general'
-import { isInsightVizNode } from '~/queries/utils'
import { AccessControlLevel, AccessControlResourceType, EndpointType, EndpointVersionType } from '~/types'
import { endpointLogic } from './endpointLogic'
diff --git a/products/endpoints/frontend/Endpoints.tsx b/products/endpoints/frontend/Endpoints.tsx
index 499d726c161d..64ecec5d651b 100644
--- a/products/endpoints/frontend/Endpoints.tsx
+++ b/products/endpoints/frontend/Endpoints.tsx
@@ -18,7 +18,7 @@ import { copyToClipboard } from 'lib/utils/copyToClipboard'
import { urls } from 'scenes/urls'
import { SceneContent } from '~/layout/scenes/components/SceneContent'
-import { isHogQLQuery } from '~/queries/utils'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import { AccessControlLevel, AccessControlResourceType, EndpointType } from '~/types'
import { humanizeQueryKind } from './common'
diff --git a/products/endpoints/frontend/InsightPickerEndpointModal.tsx b/products/endpoints/frontend/InsightPickerEndpointModal.tsx
index d2210f22dd82..85824f42761e 100644
--- a/products/endpoints/frontend/InsightPickerEndpointModal.tsx
+++ b/products/endpoints/frontend/InsightPickerEndpointModal.tsx
@@ -12,8 +12,8 @@ import { INSIGHT_TYPES_METADATA } from 'scenes/saved-insights/insightTypesMetada
import { SavedInsightsTable } from 'scenes/saved-insights/SavedInsightsTable'
import { urls } from 'scenes/urls'
+import { isNodeWithSource } from '~/queries/schema/node-guards'
import { EndpointQueryNode, HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
-import { isNodeWithSource } from '~/queries/utils'
import { InsightType, InsightModel } from '~/types'
import { EndpointFromInsightModal } from './EndpointFromInsightModal'
diff --git a/products/endpoints/frontend/endpoint-tabs/EndpointQuery.tsx b/products/endpoints/frontend/endpoint-tabs/EndpointQuery.tsx
index b2ce086d0854..f064b8cb9107 100644
--- a/products/endpoints/frontend/endpoint-tabs/EndpointQuery.tsx
+++ b/products/endpoints/frontend/endpoint-tabs/EndpointQuery.tsx
@@ -8,8 +8,8 @@ import { sqlEditorLogic } from 'scenes/data-warehouse/editor/sqlEditorLogic'
import { SQLEditorMode } from 'scenes/data-warehouse/editor/sqlEditorModes'
import { Query } from '~/queries/Query/Query'
+import { isHogQLQuery } from '~/queries/schema/node-guards'
import { HogQLQuery, Node, NodeKind } from '~/queries/schema/schema-general'
-import { isHogQLQuery } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import { endpointLogic } from '../endpointLogic'
diff --git a/products/endpoints/frontend/endpointSceneLogic.tsx b/products/endpoints/frontend/endpointSceneLogic.tsx
index a423ef3bc064..6d1ec49ee4fc 100644
--- a/products/endpoints/frontend/endpointSceneLogic.tsx
+++ b/products/endpoints/frontend/endpointSceneLogic.tsx
@@ -9,8 +9,8 @@ import { SQLEditorMode } from 'scenes/data-warehouse/editor/sqlEditorModes'
import { Scene } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
+import { isHogQLQuery, isInsightQueryNode } from '~/queries/schema/node-guards'
import { DataTableNode, EndpointRunRequest, InsightVizNode, Node, NodeKind } from '~/queries/schema/schema-general'
-import { isHogQLQuery, isInsightQueryNode } from '~/queries/utils'
import { Breadcrumb, EndpointType, EndpointVersionType } from '~/types'
import { endpointLogic } from './endpointLogic'
diff --git a/products/groups/frontend/logics/groupLogic.ts b/products/groups/frontend/logics/groupLogic.ts
index 40b91ae2dfba..37bc64bc3ffb 100644
--- a/products/groups/frontend/logics/groupLogic.ts
+++ b/products/groups/frontend/logics/groupLogic.ts
@@ -16,8 +16,8 @@ import { urls } from 'scenes/urls'
import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
import { groupsModel } from '~/models/groupsModel'
import { defaultDataTableColumns } from '~/queries/nodes/DataTable/utils'
+import { isDataTableNode } from '~/queries/schema/node-guards'
import { DataTableNode, HogQLQuery, Node, NodeKind } from '~/queries/schema/schema-general'
-import { isDataTableNode } from '~/queries/utils'
import { ActivityScope, Breadcrumb, Group, GroupTypeIndex, PropertyFilterType, PropertyOperator } from '~/types'
import { CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS } from 'products/customer_analytics/frontend/constants'
diff --git a/products/posthog_ai/frontend/components/tool/widgets/VisualizationWidget.tsx b/products/posthog_ai/frontend/components/tool/widgets/VisualizationWidget.tsx
index 22158cfa4e62..7038dfac82d6 100644
--- a/products/posthog_ai/frontend/components/tool/widgets/VisualizationWidget.tsx
+++ b/products/posthog_ai/frontend/components/tool/widgets/VisualizationWidget.tsx
@@ -15,6 +15,7 @@ import { urls } from 'scenes/urls'
import { cohortsModel, getReferencedCohortIds } from '~/models/cohortsModel'
import { Query } from '~/queries/Query/Query'
+import { isFunnelsQuery, isHogQLQuery, isInsightVizNode } from '~/queries/schema/node-guards'
import {
ArtifactMessage,
ArtifactSource,
@@ -22,7 +23,6 @@ import {
} from '~/queries/schema/schema-assistant-messages'
import { DataVisualizationNode, InsightVizNode } from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
-import { isFunnelsQuery, isHogQLQuery, isInsightVizNode } from '~/queries/utils'
import { InsightShortId } from '~/types'
import { visualizationTypeToQuery } from '../../../utils/visualizationQuery'
diff --git a/products/posthog_ai/frontend/components/tool/widgets/extractors.ts b/products/posthog_ai/frontend/components/tool/widgets/extractors.ts
index ffd04675dff2..0bcd3b319ea8 100644
--- a/products/posthog_ai/frontend/components/tool/widgets/extractors.ts
+++ b/products/posthog_ai/frontend/components/tool/widgets/extractors.ts
@@ -1,5 +1,12 @@
import { recordingsQueryToUniversalFilters } from 'scenes/session-recordings/filters/recordingsQueryConversions'
+import {
+ isDataTableNode,
+ isDataVisualizationNode,
+ isHogQLQuery,
+ isInsightQueryNode,
+ isInsightVizNode,
+} from '~/queries/schema/node-guards'
import {
ArtifactContentType,
ArtifactMessage,
@@ -8,13 +15,6 @@ import {
VisualizationArtifactContent,
} from '~/queries/schema/schema-assistant-messages'
import { DataTableNode, NodeKind, RecordingsQuery } from '~/queries/schema/schema-general'
-import {
- isDataTableNode,
- isDataVisualizationNode,
- isHogQLQuery,
- isInsightQueryNode,
- isInsightVizNode,
-} from '~/queries/utils'
import { RecordingUniversalFilters } from '~/types'
import type { ToolCallMessage } from 'products/posthog_ai/frontend/types/toolTypes'
diff --git a/products/posthog_ai/frontend/utils/visualizationQuery.ts b/products/posthog_ai/frontend/utils/visualizationQuery.ts
index 51a728f44099..70f77e660cef 100644
--- a/products/posthog_ai/frontend/utils/visualizationQuery.ts
+++ b/products/posthog_ai/frontend/utils/visualizationQuery.ts
@@ -1,3 +1,4 @@
+import { isHogQLQuery, isInsightQueryNode } from '~/queries/schema/node-guards'
import { VisualizationBlock } from '~/queries/schema/schema-assistant-artifacts'
import {
AnyAssistantGeneratedQuery,
@@ -11,7 +12,6 @@ import {
QuerySchema,
QuerySchemaRoot,
} from '~/queries/schema/schema-general'
-import { isHogQLQuery, isInsightQueryNode } from '~/queries/utils'
export function castAssistantQuery(query: AnyAssistantGeneratedQuery | QuerySchemaRoot | null): QuerySchemaRoot | null {
if (query) {
diff --git a/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.tsx b/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.tsx
index f9a0df1f2058..82bcc7ce0f4c 100644
--- a/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.tsx
+++ b/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.tsx
@@ -20,6 +20,26 @@ import { urls } from 'scenes/urls'
import { nodeKindToInsightType } from '~/queries/nodes/InsightQuery/defaults'
import { getDefaultQuery } from '~/queries/nodes/InsightViz/utils'
+import { normalizeDisplay } from '~/queries/schema/node-accessors'
+import {
+ containsHogQLQuery,
+ isAnyDataWarehouseNode,
+ isDataTableNode,
+ isDataVisualizationNode,
+ isDataWarehouseNode,
+ isFunnelsQuery,
+ isFunnelsDataWarehouseNode,
+ isInsightQueryWithBreakdown,
+ isInsightVizNode,
+ isLifecycleDataWarehouseNode,
+ isLifecycleQuery,
+ isMetricsQuery,
+ isPathsQuery,
+ isPathsV2Query,
+ isRetentionQuery,
+ isStickinessQuery,
+ isTrendsQuery,
+} from '~/queries/schema/node-guards'
import {
ActionsNode,
AnyDataWarehouseNode,
@@ -54,30 +74,12 @@ import {
} from '~/queries/schema/schema-general'
import type { Node } from '~/queries/schema/schema-general'
import {
- containsHogQLQuery,
getResultCustomizations,
filterForQuery,
- isAnyDataWarehouseNode,
- isDataTableNode,
- isDataVisualizationNode,
- isDataWarehouseNode,
isEndpointsUsageQuery,
isEventsQuery,
- isFunnelsQuery,
- isFunnelsDataWarehouseNode,
isHogQuery,
- isInsightQueryWithBreakdown,
- isInsightVizNode,
- isLifecycleDataWarehouseNode,
- isLifecycleQuery,
- isMetricsQuery,
- isPathsQuery,
- isPathsV2Query,
- isRetentionQuery,
- isStickinessQuery,
- isTrendsQuery,
isWebAnalyticsInsightQuery,
- normalizeDisplay,
} from '~/queries/utils'
import {
BaseMathType,
diff --git a/products/product_analytics/frontend/insights/activityDescriptions.tsx b/products/product_analytics/frontend/insights/activityDescriptions.tsx
index 78670173b621..6d329368571d 100644
--- a/products/product_analytics/frontend/insights/activityDescriptions.tsx
+++ b/products/product_analytics/frontend/insights/activityDescriptions.tsx
@@ -26,14 +26,14 @@ import { Link } from 'lib/lemon-ui/Link'
import { areObjectValuesEmpty } from 'lib/utils/objects'
import { urls } from 'scenes/urls'
-import { HogQLQuery, InsightQueryNode, QuerySchema } from '~/queries/schema/schema-general'
import {
isDataTableNodeWithHogQLQuery,
isDataVisualizationNode,
isHogQLQuery,
isInsightQueryNode,
isInsightVizNode,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { HogQLQuery, InsightQueryNode, QuerySchema } from '~/queries/schema/schema-general'
import { FilterType, InsightModel, InsightShortId } from '~/types'
const nameOrLinkToInsight = (short_id?: InsightShortId | null, name?: string | null): string | JSX.Element => {
diff --git a/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.ts b/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.ts
index c36bc3cd2e94..15acbdb1c6ef 100644
--- a/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.ts
+++ b/products/product_analytics/frontend/insights/chartAlternatives/chartAlternativesLogic.ts
@@ -16,8 +16,8 @@ import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import type { FeatureFlagsSet } from '~/lib/logic/featureFlagLogic'
+import { isTrendsQuery } from '~/queries/schema/node-guards'
import type { Node, TrendsQuery } from '~/queries/schema/schema-general'
-import { isTrendsQuery } from '~/queries/utils'
import type { InsightLogicProps } from '~/types'
import { ChartDisplayType } from '~/types'
diff --git a/products/product_analytics/frontend/insights/chartAlternatives/chartRecommendations.ts b/products/product_analytics/frontend/insights/chartAlternatives/chartRecommendations.ts
index 876e6a5d5a15..8ef1a255753f 100644
--- a/products/product_analytics/frontend/insights/chartAlternatives/chartRecommendations.ts
+++ b/products/product_analytics/frontend/insights/chartAlternatives/chartRecommendations.ts
@@ -8,8 +8,8 @@ import { convertPropertyGroupToProperties } from 'lib/components/PropertyFilters
import { DISPLAY_TYPES_TO_CATEGORIES, NON_BREAKDOWN_DISPLAY_TYPES, PART_OF_WHOLE_DISPLAY_TYPES } from 'lib/constants'
import { isPropertyValueMath } from 'scenes/insights/filters/ActionFilter/ActionFilterRow/mathUtils'
+import { hasBreakdownFilter } from '~/queries/schema/node-guards'
import type { BreakdownFilter, TrendsQuery } from '~/queries/schema/schema-general'
-import { hasBreakdownFilter } from '~/queries/utils'
import { ChartDisplayCategory, ChartDisplayType, PropertyMathType } from '~/types'
import type { AnyPropertyFilter } from '~/types'
diff --git a/products/product_analytics/frontend/insights/dataChecks/insightDataChecksLogic.ts b/products/product_analytics/frontend/insights/dataChecks/insightDataChecksLogic.ts
index 404af159828d..efe49260a518 100644
--- a/products/product_analytics/frontend/insights/dataChecks/insightDataChecksLogic.ts
+++ b/products/product_analytics/frontend/insights/dataChecks/insightDataChecksLogic.ts
@@ -20,6 +20,14 @@ import { teamLogic } from 'scenes/teamLogic'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
import { cancelQueryOnServer, concurrencyController } from '~/queries/nodes/DataNode/dataNodeLogic'
+import {
+ isActionsNode,
+ isEventsNode,
+ isFunnelsQuery,
+ isGroupNode,
+ isInsightQueryWithSeries,
+ isInsightVizNode,
+} from '~/queries/schema/node-guards'
import { NodeKind } from '~/queries/schema/schema-general'
import type {
FunnelsQuery,
@@ -29,15 +37,7 @@ import type {
StickinessQuery,
TrendsQuery,
} from '~/queries/schema/schema-general'
-import {
- isActionsNode,
- isEventsNode,
- isFunnelsQuery,
- isGroupNode,
- isInsightQueryWithSeries,
- isInsightVizNode,
- shouldQueryBeAsync,
-} from '~/queries/utils'
+import { shouldQueryBeAsync } from '~/queries/utils'
import { SidePanelTab } from '~/types'
import type { AnyPropertyFilter, InsightLogicProps, TeamPublicType, TeamType } from '~/types'
diff --git a/products/product_analytics/frontend/insights/dataRetention/exceedsRetention.ts b/products/product_analytics/frontend/insights/dataRetention/exceedsRetention.ts
index 0fe290fd5adc..4f7435b96ba1 100644
--- a/products/product_analytics/frontend/insights/dataRetention/exceedsRetention.ts
+++ b/products/product_analytics/frontend/insights/dataRetention/exceedsRetention.ts
@@ -1,13 +1,13 @@
import { dayjs } from 'lib/dayjs'
-import { Node } from '~/queries/schema/schema-general'
import {
isAnyDataWarehouseNode,
isDataVisualizationNode,
isHogQLQuery,
isInsightQueryWithSeries,
isInsightVizNode,
-} from '~/queries/utils'
+} from '~/queries/schema/node-guards'
+import { Node } from '~/queries/schema/schema-general'
/** Whether one insight's date range reaches past the team's events retention window.
*
diff --git a/products/product_analytics/frontend/insights/editor/DisplayOptions.tsx b/products/product_analytics/frontend/insights/editor/DisplayOptions.tsx
index 14e76100fa30..e44b85ae6ec3 100644
--- a/products/product_analytics/frontend/insights/editor/DisplayOptions.tsx
+++ b/products/product_analytics/frontend/insights/editor/DisplayOptions.tsx
@@ -12,7 +12,7 @@ import { DEFAULT_DECIMAL_PLACES } from 'lib/utils/numbers'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-import { isTrendsQuery } from '~/queries/utils'
+import { isTrendsQuery } from '~/queries/schema/node-guards'
import { ChartDisplayType } from '~/types'
import { AnnotationsPicker } from 'products/product_analytics/frontend/insights/editor/filters/AnnotationsPicker'
diff --git a/products/product_analytics/frontend/insights/editor/EditorFiltersShell.tsx b/products/product_analytics/frontend/insights/editor/EditorFiltersShell.tsx
index e4cb2c15a69b..8085d30c296a 100644
--- a/products/product_analytics/frontend/insights/editor/EditorFiltersShell.tsx
+++ b/products/product_analytics/frontend/insights/editor/EditorFiltersShell.tsx
@@ -11,6 +11,7 @@ import MaxTool from 'scenes/max/MaxTool'
import { castAssistantQuery } from 'scenes/max/utils'
import { QUERY_TYPES_METADATA } from 'scenes/saved-insights/insightTypesMetadata'
+import { isHogQLQuery, isInsightQueryNode } from '~/queries/schema/node-guards'
import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { AnyAssistantGeneratedQuery } from '~/queries/schema/schema-assistant-messages'
import {
@@ -27,7 +28,6 @@ import {
NodeKind,
QuerySchema,
} from '~/queries/schema/schema-general'
-import { isHogQLQuery, isInsightQueryNode } from '~/queries/utils'
import { useAttachedContext, useMcpToolApplyBack } from 'products/posthog_ai/frontend/api/logics'
diff --git a/products/product_analytics/frontend/insights/editor/GlobalAndOrFilters.tsx b/products/product_analytics/frontend/insights/editor/GlobalAndOrFilters.tsx
index 7f3b0f68d9b9..c93fe2c2e49d 100644
--- a/products/product_analytics/frontend/insights/editor/GlobalAndOrFilters.tsx
+++ b/products/product_analytics/frontend/insights/editor/GlobalAndOrFilters.tsx
@@ -7,8 +7,8 @@ import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import { actionsModel } from '~/models/actionsModel'
import { groupsModel } from '~/models/groupsModel'
import { getAllEventNames } from '~/queries/nodes/InsightViz/utils'
+import { isActionsNode, isInsightQueryWithSeries } from '~/queries/schema/node-guards'
import { ProductAnalyticsInsightQueryNode } from '~/queries/schema/schema-general'
-import { isActionsNode, isInsightQueryWithSeries } from '~/queries/utils'
import { EditorFilterProps } from '~/types'
import { getInsightPropertyFilterGroupTypes } from 'products/product_analytics/frontend/insights/editor/propertyTaxonomicGroupTypes'
diff --git a/products/product_analytics/frontend/insights/editor/InsightDisplayConfig.tsx b/products/product_analytics/frontend/insights/editor/InsightDisplayConfig.tsx
index 6023cc7def1d..7bf86e0772af 100644
--- a/products/product_analytics/frontend/insights/editor/InsightDisplayConfig.tsx
+++ b/products/product_analytics/frontend/insights/editor/InsightDisplayConfig.tsx
@@ -13,7 +13,8 @@ import { alignResolvedDateRangeToInterval, formatResolvedDateRange } from 'lib/u
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-import { hasBreakdownFilter, isWebAnalyticsInsightQuery } from '~/queries/utils'
+import { hasBreakdownFilter } from '~/queries/schema/node-guards'
+import { isWebAnalyticsInsightQuery } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import { InsightDateFilter } from 'products/product_analytics/frontend/insights/editor/filters/InsightDateFilter'
diff --git a/products/product_analytics/frontend/insights/editor/TrendsSeries.tsx b/products/product_analytics/frontend/insights/editor/TrendsSeries.tsx
index 07a289714729..8125e8fa0771 100644
--- a/products/product_analytics/frontend/insights/editor/TrendsSeries.tsx
+++ b/products/product_analytics/frontend/insights/editor/TrendsSeries.tsx
@@ -12,8 +12,8 @@ import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import { groupsModel } from '~/models/groupsModel'
+import { isInsightQueryNode } from '~/queries/schema/node-guards'
import { NodeKind } from '~/queries/schema/schema-general'
-import { isInsightQueryNode } from '~/queries/utils'
import { ChartDisplayType, InsightType } from '~/types'
import { getInsightPropertyFilterGroupTypes } from 'products/product_analytics/frontend/insights/editor/propertyTaxonomicGroupTypes'
diff --git a/products/product_analytics/frontend/insights/editor/displayTypes.ts b/products/product_analytics/frontend/insights/editor/displayTypes.ts
index 3d4f49f52c80..ae00c083412f 100644
--- a/products/product_analytics/frontend/insights/editor/displayTypes.ts
+++ b/products/product_analytics/frontend/insights/editor/displayTypes.ts
@@ -1,4 +1,4 @@
-import { isTrendsQuery } from '~/queries/utils'
+import { isTrendsQuery } from '~/queries/schema/node-guards'
import { ChartDisplayType } from '~/types'
// Their own module so an option component can read these groupings without importing the
diff --git a/products/product_analytics/frontend/insights/editor/filters/BreakdownFilter/TaxonomicBreakdownPopover.tsx b/products/product_analytics/frontend/insights/editor/filters/BreakdownFilter/TaxonomicBreakdownPopover.tsx
index 003431c0f775..21a5f5cc2abe 100644
--- a/products/product_analytics/frontend/insights/editor/filters/BreakdownFilter/TaxonomicBreakdownPopover.tsx
+++ b/products/product_analytics/frontend/insights/editor/filters/BreakdownFilter/TaxonomicBreakdownPopover.tsx
@@ -10,8 +10,13 @@ import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import { actionsModel } from '~/models/actionsModel'
import { groupsModel } from '~/models/groupsModel'
+import {
+ isActionsNode,
+ isInsightQueryWithSeries,
+ isInsightVizNode,
+ isRetentionQuery,
+} from '~/queries/schema/node-guards'
import { NodeKind } from '~/queries/schema/schema-general'
-import { isActionsNode, isInsightQueryWithSeries, isInsightVizNode, isRetentionQuery } from '~/queries/utils'
import { taxonomicBreakdownFilterLogic } from './taxonomicBreakdownFilterLogic'
diff --git a/products/product_analytics/frontend/insights/editor/filters/HideIncompleteConversionWindowPeriodsFilter.tsx b/products/product_analytics/frontend/insights/editor/filters/HideIncompleteConversionWindowPeriodsFilter.tsx
index c9ac11ea8c5f..e96fb3caeaae 100644
--- a/products/product_analytics/frontend/insights/editor/filters/HideIncompleteConversionWindowPeriodsFilter.tsx
+++ b/products/product_analytics/frontend/insights/editor/filters/HideIncompleteConversionWindowPeriodsFilter.tsx
@@ -6,7 +6,7 @@ import { LemonCheckbox, Tooltip } from '@posthog/lemon-ui'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-import { isFunnelsQuery } from '~/queries/utils'
+import { isFunnelsQuery } from '~/queries/schema/node-guards'
export function HideIncompleteConversionWindowPeriodsFilter(): JSX.Element | null {
const { insightProps } = useValues(insightLogic)
diff --git a/products/product_analytics/frontend/insights/editor/filters/ShowTrendLinesFilter.tsx b/products/product_analytics/frontend/insights/editor/filters/ShowTrendLinesFilter.tsx
index 17f169411488..64db5a114536 100644
--- a/products/product_analytics/frontend/insights/editor/filters/ShowTrendLinesFilter.tsx
+++ b/products/product_analytics/frontend/insights/editor/filters/ShowTrendLinesFilter.tsx
@@ -5,7 +5,7 @@ import { LemonCheckbox } from '@posthog/lemon-ui'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-import { isFunnelsQuery, isRetentionQuery, isTrendsQuery } from '~/queries/utils'
+import { isFunnelsQuery, isRetentionQuery, isTrendsQuery } from '~/queries/schema/node-guards'
import { ChartDisplayType } from '~/types'
import { funnelDataLogic } from 'products/product_analytics/frontend/insights/funnels/funnelDataLogic'
diff --git a/products/product_analytics/frontend/insights/editor/filters/WebAnalyticsEditorFilters.tsx b/products/product_analytics/frontend/insights/editor/filters/WebAnalyticsEditorFilters.tsx
index cd9f6c5b4bc8..6d78cc45ad37 100644
--- a/products/product_analytics/frontend/insights/editor/filters/WebAnalyticsEditorFilters.tsx
+++ b/products/product_analytics/frontend/insights/editor/filters/WebAnalyticsEditorFilters.tsx
@@ -11,8 +11,8 @@ import { PathCleaningToggle } from 'scenes/web-analytics/PathCleaningToggle'
import { WebConversionGoal } from 'scenes/web-analytics/WebConversionGoal'
import { WebPropertyFilters } from 'scenes/web-analytics/WebPropertyFilters'
+import { isWebStatsTableQuery } from '~/queries/schema/node-guards'
import { WebOverviewQuery, WebStatsBreakdown, WebStatsTableQuery } from '~/queries/schema/schema-general'
-import { isWebStatsTableQuery } from '~/queries/utils'
export interface WebAnalyticsEditorFiltersProps {
query: WebStatsTableQuery | WebOverviewQuery
diff --git a/products/product_analytics/frontend/insights/editor/filters/goalLinesLogic.ts b/products/product_analytics/frontend/insights/editor/filters/goalLinesLogic.ts
index 259b68da627e..18c9195126e0 100644
--- a/products/product_analytics/frontend/insights/editor/filters/goalLinesLogic.ts
+++ b/products/product_analytics/frontend/insights/editor/filters/goalLinesLogic.ts
@@ -5,6 +5,7 @@ import { keyForInsightLogicProps } from 'lib/insights/sharedUtils'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import type { QuerySourceUpdate } from 'scenes/insights/insightVizDataLogic'
+import { isFunnelsQuery, isRetentionQuery, isTrendsQuery } from '~/queries/schema/node-guards'
import {
FunnelsQuery,
GoalLine,
@@ -20,7 +21,6 @@ import type {
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
import type { PathsV2Query } from '~/queries/schema/schema-general'
-import { isFunnelsQuery, isRetentionQuery, isTrendsQuery } from '~/queries/utils'
import { InsightLogicProps } from '~/types'
export type PoeModeTypes = HogQLQueryModifiers['personsOnEventsMode'] | null
diff --git a/products/product_analytics/frontend/insights/editor/insightDisplayOptions.tsx b/products/product_analytics/frontend/insights/editor/insightDisplayOptions.tsx
index 4f4fdfa7c2fd..6408cff98bbd 100644
--- a/products/product_analytics/frontend/insights/editor/insightDisplayOptions.tsx
+++ b/products/product_analytics/frontend/insights/editor/insightDisplayOptions.tsx
@@ -7,8 +7,8 @@ import { PART_OF_WHOLE_DISPLAY_TYPES, PIE_DISPLAY_TYPES } from 'lib/constants'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
+import { hasBreakdownFilter } from '~/queries/schema/node-guards'
import type { RetentionFilter, TrendsFilter } from '~/queries/schema/schema-general'
-import { hasBreakdownFilter } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import { funnelDataLogic } from 'products/product_analytics/frontend/insights/funnels/funnelDataLogic'
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowGraph.tsx b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowGraph.tsx
index f045db071075..0ffde641e9d4 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowGraph.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelFlowGraph/FunnelFlowGraph.tsx
@@ -17,7 +17,7 @@ import { useCallback, useEffect, useRef } from 'react'
import { insightLogic } from 'scenes/insights/insightLogic'
import { themeLogic } from '~/layout/navigation-3000/themeLogic'
-import { isInsightVizNode } from '~/queries/utils'
+import { isInsightVizNode } from '~/queries/schema/node-guards'
import { JOURNEY_BUILDER_INSIGHT_PROPS } from 'products/customer_analytics/frontend/components/CustomerJourneys/journeyBuilderLogic'
diff --git a/products/product_analytics/frontend/insights/funnels/FunnelLineChart/FunnelLineChart.tsx b/products/product_analytics/frontend/insights/funnels/FunnelLineChart/FunnelLineChart.tsx
index 6e66ef1a225f..aca4c94e0ca6 100644
--- a/products/product_analytics/frontend/insights/funnels/FunnelLineChart/FunnelLineChart.tsx
+++ b/products/product_analytics/frontend/insights/funnels/FunnelLineChart/FunnelLineChart.tsx
@@ -23,7 +23,7 @@ import { cohortsModel } from '~/models/cohortsModel'
import type { Noun } from '~/models/groupsModel'
import { groupsModel } from '~/models/groupsModel'
import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
-import { isFunnelsQuery } from '~/queries/utils'
+import { isFunnelsQuery } from '~/queries/schema/node-guards'
import { ChartParams, type FlattenedFunnelStepByBreakdown } from '~/types'
import { InsightSeriesTooltip } from '../../shared/InsightSeriesTooltip'
diff --git a/products/product_analytics/frontend/insights/funnels/editor/FunnelsQuerySteps.tsx b/products/product_analytics/frontend/insights/funnels/editor/FunnelsQuerySteps.tsx
index c35a1c90312f..861568a8b985 100644
--- a/products/product_analytics/frontend/insights/funnels/editor/FunnelsQuerySteps.tsx
+++ b/products/product_analytics/frontend/insights/funnels/editor/FunnelsQuerySteps.tsx
@@ -9,8 +9,8 @@ import { SeriesActionFilter } from 'scenes/insights/filters/ActionFilter/ActionF
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import { groupsModel } from '~/models/groupsModel'
+import { isInsightQueryNode } from '~/queries/schema/node-guards'
import { NodeKind } from '~/queries/schema/schema-general'
-import { isInsightQueryNode } from '~/queries/utils'
import { EditorFilterProps, InsightType } from '~/types'
import { getInsightPropertyFilterGroupTypes } from 'products/product_analytics/frontend/insights/editor/propertyTaxonomicGroupTypes'
diff --git a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts
index 0b4b950c0d14..8374ccf95b8f 100644
--- a/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts
+++ b/products/product_analytics/frontend/insights/funnels/funnelDataLogic.ts
@@ -32,6 +32,7 @@ import {
import { Noun, groupsModel } from '~/models/groupsModel'
import { isFunnelWithEnoughSteps, isFunnelWithIncompleteDataWarehouseStep } from '~/queries/nodes/InsightViz/queryUtils'
+import { isFunnelsQuery, isWebOverviewQuery, isWebStatsTableQuery } from '~/queries/schema/node-guards'
import { FunnelExclusion, FunnelExclusionEventsNode, FunnelExclusionSteps } from '~/queries/schema/schema-general'
import { FunnelsFilter, FunnelsQuery, FunnelsQueryResponse, NodeKind } from '~/queries/schema/schema-general'
import type {
@@ -53,7 +54,6 @@ import type {
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
import type { PathsV2Query } from '~/queries/schema/schema-general'
-import { isFunnelsQuery, isWebOverviewQuery, isWebStatsTableQuery } from '~/queries/utils'
import {
FlattenedFunnelStepByBreakdown,
EntityType,
diff --git a/products/product_analytics/frontend/insights/home/HomeTabDefault.test.tsx b/products/product_analytics/frontend/insights/home/HomeTabDefault.test.tsx
index 3d19b306b7a1..970182541b1f 100644
--- a/products/product_analytics/frontend/insights/home/HomeTabDefault.test.tsx
+++ b/products/product_analytics/frontend/insights/home/HomeTabDefault.test.tsx
@@ -18,8 +18,8 @@ import trendsNumber from '~/mocks/fixtures/api/projects/team_id/insights/trendsN
import { useMocks } from '~/mocks/jest'
import { dataNodeCollectionLogic } from '~/queries/nodes/DataNode/dataNodeCollectionLogic'
import { performQuery } from '~/queries/query'
+import { isInsightQueryNode, isRetentionQuery, isTrendsQuery } from '~/queries/schema/node-guards'
import type { DataNode } from '~/queries/schema/schema-general'
-import { isInsightQueryNode, isRetentionQuery, isTrendsQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import { ChartDisplayType } from '~/types'
diff --git a/products/product_analytics/frontend/insights/home/InsightHomeGuide.tsx b/products/product_analytics/frontend/insights/home/InsightHomeGuide.tsx
index 5ee426af7eea..6cb82a1a2d4d 100644
--- a/products/product_analytics/frontend/insights/home/InsightHomeGuide.tsx
+++ b/products/product_analytics/frontend/insights/home/InsightHomeGuide.tsx
@@ -10,8 +10,8 @@ import { LemonButton, LemonCard } from '@posthog/lemon-ui'
import { pngHoggie } from 'lib/brand/hoggies'
import { Link } from 'lib/lemon-ui/Link'
+import { isInsightVizNode } from '~/queries/schema/node-guards'
import { Node, NodeKind } from '~/queries/schema/schema-general'
-import { isInsightVizNode } from '~/queries/utils'
import { InsightType } from '~/types'
type GuidedInsightType = InsightType.FUNNELS | InsightType.PATHS | InsightType.STICKINESS
diff --git a/products/product_analytics/frontend/insights/insightScene/InsightAsScene.tsx b/products/product_analytics/frontend/insights/insightScene/InsightAsScene.tsx
index 721eb4aeeb47..ec9b8624ac4b 100644
--- a/products/product_analytics/frontend/insights/insightScene/InsightAsScene.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/InsightAsScene.tsx
@@ -13,8 +13,13 @@ import { teamLogic } from 'scenes/teamLogic'
import { SceneContent } from '~/layout/scenes/components/SceneContent'
import { Query } from '~/queries/Query/Query'
+import {
+ containsHogQLQuery,
+ isBIVisualizationNode,
+ isDataVisualizationNode,
+ isInsightVizNode,
+} from '~/queries/schema/node-guards'
import { Node } from '~/queries/schema/schema-general'
-import { containsHogQLQuery, isBIVisualizationNode, isDataVisualizationNode, isInsightVizNode } from '~/queries/utils'
import { InsightShortId, ItemMode } from '~/types'
import { insightDataChecksLogic } from 'products/product_analytics/frontend/insights/dataChecks/insightDataChecksLogic'
diff --git a/products/product_analytics/frontend/insights/insightScene/InsightPageHeader.tsx b/products/product_analytics/frontend/insights/insightScene/InsightPageHeader.tsx
index ecd474620f58..b8aec5b5881c 100644
--- a/products/product_analytics/frontend/insights/insightScene/InsightPageHeader.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/InsightPageHeader.tsx
@@ -17,7 +17,8 @@ import { breadcrumbsLogic } from '~/layout/navigation/Breadcrumbs/breadcrumbsLog
import { iconForType } from '~/layout/panel-layout/ProjectTree/defaultTree'
import { getLastNewFolder } from '~/layout/panel-layout/ProjectTree/projectTreeLogic'
import { SceneTitleSection } from '~/layout/scenes/components/SceneTitleSection'
-import { isActorsQuery, isBIVisualizationNode, isEventsQuery, isGroupsQuery, isInsightQueryNode } from '~/queries/utils'
+import { isActorsQuery, isBIVisualizationNode, isInsightQueryNode } from '~/queries/schema/node-guards'
+import { isEventsQuery, isGroupsQuery } from '~/queries/utils'
import { AccessControlLevel, AccessControlResourceType, InsightLogicProps, ItemMode } from '~/types'
import { areAlertsSupportedForInsight } from 'products/alerts/frontend/logic/insightAlertsLogic'
diff --git a/products/product_analytics/frontend/insights/insightScene/InsightScene.tsx b/products/product_analytics/frontend/insights/insightScene/InsightScene.tsx
index eb23190f1ab4..42c355fdfe10 100644
--- a/products/product_analytics/frontend/insights/insightScene/InsightScene.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/InsightScene.tsx
@@ -9,8 +9,8 @@ import { insightSceneLogic } from 'scenes/insights/insightSceneLogic'
import { SceneExport } from 'scenes/sceneTypes'
import { urls } from 'scenes/urls'
+import { isBIVisualizationNode, isDataVisualizationNode } from '~/queries/schema/node-guards'
import { ProductKey } from '~/queries/schema/schema-general'
-import { isBIVisualizationNode, isDataVisualizationNode } from '~/queries/utils'
import { ItemMode } from '~/types'
import { useAttachedContext } from 'products/posthog_ai/frontend/api/logics'
diff --git a/products/product_analytics/frontend/insights/insightScene/QuillInsightPageHeaderActions.tsx b/products/product_analytics/frontend/insights/insightScene/QuillInsightPageHeaderActions.tsx
index 9d4b9c94cf37..de57cb726754 100644
--- a/products/product_analytics/frontend/insights/insightScene/QuillInsightPageHeaderActions.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/QuillInsightPageHeaderActions.tsx
@@ -20,7 +20,7 @@ import { getOverrideWarningPropsForButton } from 'scenes/insights/utils'
import { urls } from 'scenes/urls'
import { SceneTitleSecondaryActions } from '~/layout/scenes/components/SceneTitleSecondaryActions'
-import { isBIVisualizationNode } from '~/queries/utils'
+import { isBIVisualizationNode } from '~/queries/schema/node-guards'
import { AccessControlLevel, AccessControlResourceType, InsightLogicProps, ItemMode } from '~/types'
import { insightModalsLogic } from 'products/product_analytics/frontend/insights/insightScene/insightModalsLogic'
diff --git a/products/product_analytics/frontend/insights/insightScene/SqlInsightFilters.tsx b/products/product_analytics/frontend/insights/insightScene/SqlInsightFilters.tsx
index 7d2f48ea16d2..2861613351f0 100644
--- a/products/product_analytics/frontend/insights/insightScene/SqlInsightFilters.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/SqlInsightFilters.tsx
@@ -8,8 +8,8 @@ import { dateMapping } from 'lib/utils/dateFilters'
import { insightSceneLogic } from 'scenes/insights/insightSceneLogic'
import { EventPropertyFilters } from '~/queries/nodes/EventsNode/EventPropertyFilters'
+import { isDataTableNode, isDataVisualizationNode, isHogQLQuery } from '~/queries/schema/node-guards'
import { HogQLQuery, Node } from '~/queries/schema/schema-general'
-import { isDataTableNode, isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
import { ItemMode } from '~/types'
const FILTERS_PLACEHOLDER = /\{\s*filters\b/
diff --git a/products/product_analytics/frontend/insights/insightScene/openInsightEditor.ts b/products/product_analytics/frontend/insights/insightScene/openInsightEditor.ts
index f1e65b1db831..3ae86842070a 100644
--- a/products/product_analytics/frontend/insights/insightScene/openInsightEditor.ts
+++ b/products/product_analytics/frontend/insights/insightScene/openInsightEditor.ts
@@ -2,8 +2,8 @@ import { combineUrl, router } from 'kea-router'
import { urls } from 'scenes/urls'
+import { isBIVisualizationNode, isDataVisualizationNode } from '~/queries/schema/node-guards'
import { Node } from '~/queries/schema/schema-general'
-import { isBIVisualizationNode, isDataVisualizationNode } from '~/queries/utils'
import { DashboardType, InsightShortId } from '~/types'
export function openInsightEditor({
diff --git a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelActions.tsx b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelActions.tsx
index 461e4486d0d1..656aa928ecc2 100644
--- a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelActions.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightPanelActions.tsx
@@ -25,13 +25,8 @@ import { urls } from 'scenes/urls'
import { ScenePanelActionsSection } from '~/layout/scenes/SceneLayout'
import { sceneLayoutLogic } from '~/layout/scenes/sceneLayoutLogic'
import { INSIGHT_GRAPH_SELECTOR, INSIGHT_SCREENSHOT_KEY } from '~/queries/nodes/InsightViz/insightImageCapture'
-import {
- isDataTableNode,
- isDataVisualizationNode,
- isEventsQuery,
- isHogQLQuery,
- isInsightVizNode,
-} from '~/queries/utils'
+import { isDataTableNode, isDataVisualizationNode, isHogQLQuery, isInsightVizNode } from '~/queries/schema/node-guards'
+import { isEventsQuery } from '~/queries/utils'
import { AccessControlLevel, AccessControlResourceType, ExporterFormat, InsightLogicProps, InsightModel } from '~/types'
import { metricsLogic } from 'products/data_catalog/frontend/metricsLogic'
diff --git a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx
index d916fd14c9e1..a92ef214f07f 100644
--- a/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx
+++ b/products/product_analytics/frontend/insights/insightScene/sidePanel/InsightSceneMenuBar.tsx
@@ -52,14 +52,9 @@ import {
} from '~/layout/scenes/components/SceneMenuBar'
import { tagsModel } from '~/models/tagsModel'
import { INSIGHT_GRAPH_SELECTOR, INSIGHT_SCREENSHOT_KEY } from '~/queries/nodes/InsightViz/insightImageCapture'
+import { isDataTableNode, isDataVisualizationNode, isHogQLQuery, isInsightVizNode } from '~/queries/schema/node-guards'
import { NodeKind } from '~/queries/schema/schema-general'
-import {
- isDataTableNode,
- isDataVisualizationNode,
- isEventsQuery,
- isHogQLQuery,
- isInsightVizNode,
-} from '~/queries/utils'
+import { isEventsQuery } from '~/queries/utils'
import {
AccessControlLevel,
AccessControlResourceType,
diff --git a/products/product_analytics/frontend/insights/paths/pathsDataLogic.ts b/products/product_analytics/frontend/insights/paths/pathsDataLogic.ts
index b25439aa27d3..cbf7cd864494 100644
--- a/products/product_analytics/frontend/insights/paths/pathsDataLogic.ts
+++ b/products/product_analytics/frontend/insights/paths/pathsDataLogic.ts
@@ -12,6 +12,7 @@ import { pathsTitle } from 'scenes/trends/persons-modal/persons-modal-utils'
import { OpenPersonsModalProps, openPersonsModal } from 'scenes/trends/persons-modal/PersonsModal'
import { urls } from 'scenes/urls'
+import { isPathsQuery } from '~/queries/schema/node-guards'
import { InsightActorsQuery, InsightVizNode, NodeKind, PathsLink, PathsQuery } from '~/queries/schema/schema-general'
import type {
DataNode,
@@ -29,7 +30,6 @@ import type {
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
import type { PathsV2Query } from '~/queries/schema/schema-general'
-import { isPathsQuery } from '~/queries/utils'
import { FunnelVizType, InsightLogicProps, PathType, PropertyFilterType, PropertyOperator } from '~/types'
import { pathNodeKeys } from './pathsChartTransforms'
diff --git a/products/product_analytics/frontend/insights/retention/RetentionHeatmap/retentionHeatmapLogic.ts b/products/product_analytics/frontend/insights/retention/RetentionHeatmap/retentionHeatmapLogic.ts
index 3102586187b6..617897d25e2f 100644
--- a/products/product_analytics/frontend/insights/retention/RetentionHeatmap/retentionHeatmapLogic.ts
+++ b/products/product_analytics/frontend/insights/retention/RetentionHeatmap/retentionHeatmapLogic.ts
@@ -5,9 +5,9 @@ import { keyForInsightLogicProps } from 'lib/insights/sharedUtils'
import { capitalizeFirstLetter } from 'lib/utils/strings'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
+import { isRetentionQuery } from '~/queries/schema/node-guards'
import { InsightQueryNode } from '~/queries/schema/schema-general'
import type { DataNode, DateRange, RetentionFilter, VizSpecificOptions } from '~/queries/schema/schema-general'
-import { isRetentionQuery } from '~/queries/utils'
import { InsightLogicProps, InsightType } from '~/types'
import { dateOptionPlurals } from '../constants'
diff --git a/products/product_analytics/frontend/insights/retention/retentionLogic.ts b/products/product_analytics/frontend/insights/retention/retentionLogic.ts
index 3f7509a1c712..c431b7dd759e 100644
--- a/products/product_analytics/frontend/insights/retention/retentionLogic.ts
+++ b/products/product_analytics/frontend/insights/retention/retentionLogic.ts
@@ -20,6 +20,7 @@ import { BREAKDOWN_OTHER_DISPLAY, BREAKDOWN_OTHER_STRING_LABEL, formatBreakdownL
import { teamLogic } from 'scenes/teamLogic'
import { cohortsModel } from '~/models/cohortsModel'
+import { isRetentionQuery, hasBreakdownFilter } from '~/queries/schema/node-guards'
import { RetentionFilter, RetentionResult } from '~/queries/schema/schema-general'
import type {
BreakdownFilter,
@@ -36,7 +37,6 @@ import type {
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
import type { PathsV2Query } from '~/queries/schema/schema-general'
-import { isRetentionQuery, hasBreakdownFilter } from '~/queries/utils'
import { BreakdownKeyType, CohortType, DateMappingOption, InsightLogicProps, RetentionPeriod } from '~/types'
import { ProcessedRetentionPayload } from './types'
diff --git a/products/product_analytics/frontend/insights/retention/retentionModalLogic.ts b/products/product_analytics/frontend/insights/retention/retentionModalLogic.ts
index 1e5fa3502f90..3b80b73cb20a 100644
--- a/products/product_analytics/frontend/insights/retention/retentionModalLogic.ts
+++ b/products/product_analytics/frontend/insights/retention/retentionModalLogic.ts
@@ -13,6 +13,7 @@ import { urls } from 'scenes/urls'
import { cohortsModel } from '~/models/cohortsModel'
import { Noun, groupsModel } from '~/models/groupsModel'
+import { isLifecycleQuery, isRetentionQuery, isStickinessQuery } from '~/queries/schema/node-guards'
import {
ActorsQuery,
DataTableNode,
@@ -31,7 +32,7 @@ import type {
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
import type { PathsV2Query } from '~/queries/schema/schema-general'
-import { isInsightActorsQuery, isLifecycleQuery, isRetentionQuery, isStickinessQuery } from '~/queries/utils'
+import { isInsightActorsQuery } from '~/queries/utils'
import { InsightLogicProps } from '~/types'
import { AGGREGATION_LABEL_FOR_CUSTOM_DATA_WAREHOUSE } from 'products/product_analytics/frontend/insights/shared/aggregationTargetUtils'
diff --git a/products/product_analytics/frontend/insights/shared/AggregationSelect.tsx b/products/product_analytics/frontend/insights/shared/AggregationSelect.tsx
index 3825c31675db..ccb4a5e55d1a 100644
--- a/products/product_analytics/frontend/insights/shared/AggregationSelect.tsx
+++ b/products/product_analytics/frontend/insights/shared/AggregationSelect.tsx
@@ -8,14 +8,9 @@ import { UNIQUE_USERS, getHogQLValue, hogQLToFilterValue } from 'scenes/insights
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
import { groupsModel } from '~/models/groupsModel'
+import { isFunnelsQuery, isInsightQueryNode, isLifecycleQuery, isRetentionQuery } from '~/queries/schema/node-guards'
import { FunnelsQuery, LifecycleQuery, RetentionQuery } from '~/queries/schema/schema-general'
-import {
- getAggregationGroupTypeIndex,
- isFunnelsQuery,
- isInsightQueryNode,
- isLifecycleQuery,
- isRetentionQuery,
-} from '~/queries/utils'
+import { getAggregationGroupTypeIndex } from '~/queries/utils'
import { InsightLogicProps } from '~/types'
import { GroupIntroductionFooter } from 'products/groups/frontend/components/GroupsIntroduction'
diff --git a/products/product_analytics/frontend/insights/shared/InsightsTable/InsightsTable.tsx b/products/product_analytics/frontend/insights/shared/InsightsTable/InsightsTable.tsx
index dfef485e714f..bf31d13925c7 100644
--- a/products/product_analytics/frontend/insights/shared/InsightsTable/InsightsTable.tsx
+++ b/products/product_analytics/frontend/insights/shared/InsightsTable/InsightsTable.tsx
@@ -18,7 +18,7 @@ import { teamLogic } from 'scenes/teamLogic'
import { cohortsModel } from '~/models/cohortsModel'
import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
import { extractDisplayLabel } from '~/queries/nodes/DataTable/utils'
-import { hasBreakdownFilter } from '~/queries/utils'
+import { hasBreakdownFilter } from '~/queries/schema/node-guards'
import { ChartDisplayType, TrendsFilterType } from '~/types'
import { getResultSeriesName } from 'products/product_analytics/frontend/insights/shared/resultSeriesName'
diff --git a/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.ts b/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.ts
index 35ddab196e87..922302c9d499 100644
--- a/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.ts
+++ b/products/product_analytics/frontend/insights/shared/InsightsTable/insightsTableDataLogic.ts
@@ -12,6 +12,7 @@ import { teamLogic } from 'scenes/teamLogic'
import { cancelQueryOnServer, concurrencyController } from '~/queries/nodes/DataNode/dataNodeLogic'
import { compareDataNodeQuery } from '~/queries/nodes/InsightViz/queryUtils'
import { performQuery } from '~/queries/query'
+import { hasBreakdownFilter } from '~/queries/schema/node-guards'
import type {
AnyDataWarehouseNode,
AnyEntityNode,
@@ -32,7 +33,6 @@ import type {
WebOverviewQuery,
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
-import { hasBreakdownFilter } from '~/queries/utils'
import { ChartDisplayType, CompareLabelType, InsightLogicProps, TrendResult } from '~/types'
import { trendsDataLogic } from 'products/product_analytics/frontend/insights/trends/trendsDataLogic'
diff --git a/products/product_analytics/frontend/insights/shared/selectorMatchChange/selectorMatchChange.ts b/products/product_analytics/frontend/insights/shared/selectorMatchChange/selectorMatchChange.ts
index 983f3fa974f4..63d89afc2f36 100644
--- a/products/product_analytics/frontend/insights/shared/selectorMatchChange/selectorMatchChange.ts
+++ b/products/product_analytics/frontend/insights/shared/selectorMatchChange/selectorMatchChange.ts
@@ -1,4 +1,4 @@
-import { isActionsNode } from '~/queries/utils'
+import { isActionsNode } from '~/queries/schema/node-guards'
const ACTIONS_ENTITY_TYPE = 'actions'
diff --git a/products/product_analytics/frontend/insights/trends/TrendsBarChart/TrendsBarChart.tsx b/products/product_analytics/frontend/insights/trends/TrendsBarChart/TrendsBarChart.tsx
index 51388abb9040..b0fb8aeb975a 100644
--- a/products/product_analytics/frontend/insights/trends/TrendsBarChart/TrendsBarChart.tsx
+++ b/products/product_analytics/frontend/insights/trends/TrendsBarChart/TrendsBarChart.tsx
@@ -25,9 +25,10 @@ import { openPersonsModal } from 'scenes/trends/persons-modal/PersonsModal'
import { cohortsModel } from '~/models/cohortsModel'
import { groupsModel } from '~/models/groupsModel'
import { propertyDefinitionsModel } from '~/models/propertyDefinitionsModel'
+import { hasBreakdownFilter } from '~/queries/schema/node-guards'
import { InsightVizNode } from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
-import { getStackBreakdownValues, hasBreakdownFilter } from '~/queries/utils'
+import { getStackBreakdownValues } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import type { SeriesDatum } from 'products/product_analytics/frontend/insights/shared/InsightTooltip/insightTooltipUtils'
diff --git a/products/product_analytics/frontend/insights/trends/filters/ConfidenceLevelInput.tsx b/products/product_analytics/frontend/insights/trends/filters/ConfidenceLevelInput.tsx
index 21e1ae3db4de..8bd6e05a1bf0 100644
--- a/products/product_analytics/frontend/insights/trends/filters/ConfidenceLevelInput.tsx
+++ b/products/product_analytics/frontend/insights/trends/filters/ConfidenceLevelInput.tsx
@@ -7,7 +7,7 @@ import { LemonInput, Tooltip } from '@posthog/lemon-ui'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-import { isTrendsQuery } from '~/queries/utils'
+import { isTrendsQuery } from '~/queries/schema/node-guards'
import { trendsDataLogic } from 'products/product_analytics/frontend/insights/trends/trendsDataLogic'
diff --git a/products/product_analytics/frontend/insights/trends/filters/MovingAverageIntervalsInput.tsx b/products/product_analytics/frontend/insights/trends/filters/MovingAverageIntervalsInput.tsx
index 293508e40f63..c6e02138299c 100644
--- a/products/product_analytics/frontend/insights/trends/filters/MovingAverageIntervalsInput.tsx
+++ b/products/product_analytics/frontend/insights/trends/filters/MovingAverageIntervalsInput.tsx
@@ -7,7 +7,7 @@ import { LemonInput, Tooltip } from '@posthog/lemon-ui'
import { insightLogic } from 'scenes/insights/insightLogic'
import { insightVizDataLogic } from 'scenes/insights/insightVizDataLogic'
-import { isTrendsQuery } from '~/queries/utils'
+import { isTrendsQuery } from '~/queries/schema/node-guards'
import {
INTERVAL_TO_DEFAULT_MOVING_AVERAGE_PERIOD,
diff --git a/products/product_analytics/frontend/insights/trends/trendsDataLogic.ts b/products/product_analytics/frontend/insights/trends/trendsDataLogic.ts
index b72aa1d414ec..425ba1bee244 100644
--- a/products/product_analytics/frontend/insights/trends/trendsDataLogic.ts
+++ b/products/product_analytics/frontend/insights/trends/trendsDataLogic.ts
@@ -30,6 +30,7 @@ import {
import { ActionNames, getResultSeriesIndex } from 'scenes/insights/utils/resultSeries'
import { isSharedView } from '~/exporter/exporterViewLogic'
+import { hasBreakdownFilter } from '~/queries/schema/node-guards'
import {
BreakdownFilter,
EventsNode,
@@ -78,7 +79,6 @@ import type {
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
import type { PathsV2Query } from '~/queries/schema/schema-general'
-import { hasBreakdownFilter } from '~/queries/utils'
import {
ChartDisplayType,
CountPerActorMathType,
diff --git a/products/product_analytics/manifest.tsx b/products/product_analytics/manifest.tsx
index fe31a69d0544..ceb1c2deb7ae 100644
--- a/products/product_analytics/manifest.tsx
+++ b/products/product_analytics/manifest.tsx
@@ -4,6 +4,12 @@ import { FEATURE_FLAGS, INSIGHT_VISUAL_ORDER } from 'lib/constants'
import { urls } from 'scenes/urls'
import { examples } from '~/queries/examples'
+import {
+ isBIVisualizationNode,
+ isDataTableNode,
+ isDataVisualizationNode,
+ isHogQLQuery,
+} from '~/queries/schema/node-guards'
import {
DashboardFilter,
HogQLFilters,
@@ -15,7 +21,6 @@ import {
ProductKey,
TileFilters,
} from '~/queries/schema/schema-general'
-import { isBIVisualizationNode, isDataTableNode, isDataVisualizationNode, isHogQLQuery } from '~/queries/utils'
import { AlertType } from 'products/alerts/frontend/types'
diff --git a/products/signals/frontend/inbox/components/detail/ReportChart.tsx b/products/signals/frontend/inbox/components/detail/ReportChart.tsx
index 77c23b58c732..78cc10eadd7f 100644
--- a/products/signals/frontend/inbox/components/detail/ReportChart.tsx
+++ b/products/signals/frontend/inbox/components/detail/ReportChart.tsx
@@ -9,8 +9,9 @@ import { Spinner } from 'lib/lemon-ui/Spinner'
import { insightLogic } from 'scenes/insights/insightLogic'
import { Query } from '~/queries/Query/Query'
+import { isDataVisualizationNode, isInsightVizNode } from '~/queries/schema/node-guards'
import { DataVisualizationNode, InsightVizNode, Node, SavedInsightNode } from '~/queries/schema/schema-general'
-import { isDataVisualizationNode, isInsightVizNode, isSavedInsightNode } from '~/queries/utils'
+import { isSavedInsightNode } from '~/queries/utils'
import { ChartDisplayType, InsightLogicProps } from '~/types'
import type { ReportChartApi, SizeEnumApi } from 'products/signals/frontend/generated/api.schemas'
diff --git a/products/signals/frontend/inbox/utils/chartOpenTarget.ts b/products/signals/frontend/inbox/utils/chartOpenTarget.ts
index 51b0d5811788..28b90818e1dc 100644
--- a/products/signals/frontend/inbox/utils/chartOpenTarget.ts
+++ b/products/signals/frontend/inbox/utils/chartOpenTarget.ts
@@ -1,7 +1,8 @@
import { urls } from 'scenes/urls'
+import { isDataVisualizationNode, isHogQLQuery } from '~/queries/schema/node-guards'
import { Node, SavedInsightNode } from '~/queries/schema/schema-general'
-import { isDataVisualizationNode, isHogQLQuery, isSavedInsightNode } from '~/queries/utils'
+import { isSavedInsightNode } from '~/queries/utils'
import { InsightShortId } from '~/types'
export interface ChartOpenTarget {
diff --git a/products/signals/frontend/inbox/utils/reportChartQuery.ts b/products/signals/frontend/inbox/utils/reportChartQuery.ts
index efdd67ca7fdc..ae4747968402 100644
--- a/products/signals/frontend/inbox/utils/reportChartQuery.ts
+++ b/products/signals/frontend/inbox/utils/reportChartQuery.ts
@@ -1,5 +1,6 @@
+import { isDataVisualizationNode, isInsightVizNode, isTrendsQuery } from '~/queries/schema/node-guards'
import { DataVisualizationNode, InsightVizNode, Node } from '~/queries/schema/schema-general'
-import { isDataVisualizationNode, isInsightVizNode, isSavedInsightNode, isTrendsQuery } from '~/queries/utils'
+import { isSavedInsightNode } from '~/queries/utils'
import { ChartDisplayType } from '~/types'
import type { ReportChartApi } from 'products/signals/frontend/generated/api.schemas'
diff --git a/products/signals/frontend/inbox/utils/reportMetrics.ts b/products/signals/frontend/inbox/utils/reportMetrics.ts
index d6310f4297a8..930268a00a93 100644
--- a/products/signals/frontend/inbox/utils/reportMetrics.ts
+++ b/products/signals/frontend/inbox/utils/reportMetrics.ts
@@ -4,8 +4,8 @@ import { formatCurrency } from 'lib/utils/currency'
import { formatDurationMilliseconds, humanFriendlyDuration } from 'lib/utils/durations'
import { humanFriendlyNumber, percentage, significantDecimalPlaces } from 'lib/utils/numbers'
+import { isInsightVizNode, isTrendsQuery } from '~/queries/schema/node-guards'
import { CurrencyCode, InsightVizNode, Node, NodeKind, TrendsQuery } from '~/queries/schema/schema-general'
-import { isInsightVizNode, isTrendsQuery } from '~/queries/utils'
import { ChartDisplayType, PropertyMathType } from '~/types'
import type { ReportMetricApi, SignalReportMetricSnapshotsApi } from 'products/signals/frontend/generated/api.schemas'