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 version stamping next to the schema (#126849)

Paul D'Ambra34638e362428
diff --git a/.gitattributes b/.gitattributes
index 87efd5489b25..2cef41d7f658 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,7 +9,7 @@ CODE_OF_CONDUCT.md export-ignore
frontend/src/generated/** linguist-generated
frontend/src/lib/posthog-typed.ts linguist-generated
frontend/src/products.tsx linguist-generated
-frontend/src/queries/latest-versions.json linguist-generated
+frontend/src/queries/schema/latest-versions.json linguist-generated
frontend/src/queries/schema.json linguist-generated
frontend/src/queries/validators.js linguist-generated
frontend/src/taxonomy/core-filter-definitions-by-group.json linguist-generated
diff --git a/bin/build-schema-latest-versions.py b/bin/build-schema-latest-versions.py
index 0499b6655d8d..d2def0bcbad8 100755
--- a/bin/build-schema-latest-versions.py
+++ b/bin/build-schema-latest-versions.py
@@ -12,7 +12,7 @@ from posthog.utils import to_json
# Ensure migrations are discovered before accessing LATEST_VERSIONS
_discover_migrations()
-filename = "frontend/src/queries/latest-versions.json"
+filename = "frontend/src/queries/schema/latest-versions.json"
# Make LATEST_VERSIONS accessible frontend-side
with open(filename, "wb") as f:
diff --git a/frontend/bin/layer-baseline.txt b/frontend/bin/layer-baseline.txt
index 86f9698c9bc3..7eecf12e1263 100644
--- a/frontend/bin/layer-baseline.txt
+++ b/frontend/bin/layer-baseline.txt
@@ -94,7 +94,6 @@ frontend/src/layout/today/todayWorkItems.ts -> products/tasks/frontend/spaces/ta
frontend/src/lib/api.ts -> frontend/src/exporter/exporterViewLogic.ts
frontend/src/lib/api.ts -> frontend/src/lib/apiRequestTiming.ts
frontend/src/lib/api.ts -> frontend/src/lib/logic/apiStatusLogic.ts
-frontend/src/lib/api.ts -> frontend/src/queries/utils.ts
frontend/src/lib/api.ts -> frontend/src/scenes/surveys/constants.tsx
frontend/src/lib/components/Account/ProjectFreshnessIndicator.tsx -> frontend/src/scenes/onboarding/shared/utils.tsx
frontend/src/lib/components/ActivityLog/ActivityLogSubscribeMenu.tsx -> frontend/src/scenes/hog-functions/sub-templates/sub-templates.ts
@@ -301,7 +300,6 @@ frontend/src/lib/components/heatmaps/heatmapDataLogic.ts -> frontend/src/toolbar
frontend/src/lib/components/heatmaps/useScrollSync.ts -> frontend/src/toolbar/shared/toolbarConfigLogic.ts
frontend/src/lib/components/openPublishToCommunityDialog.tsx -> products/skills/frontend/PublishToCommunityContents.tsx
frontend/src/lib/hog.ts -> frontend/src/queries/query.ts
-frontend/src/lib/hog.ts -> frontend/src/queries/utils.ts
frontend/src/lib/hooks/useFeatureFlag.ts -> frontend/src/lib/logic/featureFlagLogic.ts
frontend/src/lib/hooks/useFileSystemLogView.ts -> frontend/src/exporter/exporterViewLogic.ts
frontend/src/lib/hooks/useFileSystemLogView.ts -> frontend/src/models/recentItemsModel.ts
@@ -322,9 +320,7 @@ frontend/src/lib/lemon-ui/ProfilePicture/ProfilePicture.tsx -> frontend/src/lib/
frontend/src/lib/lemon-ui/ProfilePicture/ProfilePicture.tsx -> frontend/src/scenes/userLogic.ts
frontend/src/lib/logic/apiStatusLogic.ts -> frontend/src/scenes/authentication/two-factor-setup/twoFactorLogic.ts
frontend/src/lib/monaco/codeEditorLogic.tsx -> frontend/src/queries/query.ts
-frontend/src/lib/monaco/codeEditorLogic.tsx -> frontend/src/queries/utils.ts
frontend/src/lib/monaco/hogQLAutocompleteProvider.ts -> frontend/src/queries/query.ts
-frontend/src/lib/monaco/hogQLAutocompleteProvider.ts -> frontend/src/queries/utils.ts
frontend/src/lib/oauth/oauthLogic.ts -> products/data_warehouse/frontend/sqlEditorDraftCleanup.ts
frontend/src/lib/signals/SignalReportFixOrStatus.tsx -> products/signals/frontend/inbox/components/badges/SignalReportStatusBadge.tsx
frontend/src/lib/signals/SignalReportFixOrStatus.tsx -> products/signals/frontend/inbox/utils/reportPresentation.ts
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index a6048fa6ab84..9c606734f1a6 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -34,6 +34,7 @@ import { SURVEY_PAGE_SIZE } from 'scenes/surveys/constants'
import { getCurrentExporterData, isSharedView } from '~/exporter/exporterViewLogic'
import { OrganizationOAuthApplicationApi, ProjectSecretAPIKeyApi } from '~/generated/core/api.schemas'
import { Variable } from '~/queries/nodes/DataVisualization/types'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
AggregatedSpanRow,
AnyResponseType,
@@ -70,7 +71,6 @@ import {
SpanTreeNode,
TileFilters,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
ActionType,
ActivityScope,
diff --git a/frontend/src/lib/hog.ts b/frontend/src/lib/hog.ts
index c77dcf31de15..579fc6f065f5 100644
--- a/frontend/src/lib/hog.ts
+++ b/frontend/src/lib/hog.ts
@@ -15,8 +15,8 @@ import {
export { convertHogToJS }
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { HogQLQuery, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
const external = {
crypto, // TODO: switch to webcrypto and polyfill on the node side
diff --git a/frontend/src/lib/logic/tabUiStateLogic.test.ts b/frontend/src/lib/logic/tabUiStateLogic.test.ts
index 7e908adc841b..6f7e8d240fee 100644
--- a/frontend/src/lib/logic/tabUiStateLogic.test.ts
+++ b/frontend/src/lib/logic/tabUiStateLogic.test.ts
@@ -2,8 +2,8 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { tabUiStateLogic } from 'lib/logic/tabUiStateLogic'
import { dataTableLogic } from '~/queries/nodes/DataTable/dataTableLogic'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
jest.mock('~/queries/query')
diff --git a/frontend/src/lib/monaco/codeEditorLogic.tsx b/frontend/src/lib/monaco/codeEditorLogic.tsx
index fb3d1f3db26c..f86932702d4e 100644
--- a/frontend/src/lib/monaco/codeEditorLogic.tsx
+++ b/frontend/src/lib/monaco/codeEditorLogic.tsx
@@ -14,6 +14,7 @@ import { MarkerSeverity, editor } from 'monaco-editor'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
AnyDataNode,
HogLanguage,
@@ -23,7 +24,6 @@ import {
HogQLNotice,
NodeKind,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import type { FeatureFlagsSet } from '../logic/featureFlagLogic'
import { noticeLink } from './noticeLink'
diff --git a/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts b/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts
index aaf5c7b9672b..d7efd54993c2 100644
--- a/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts
+++ b/frontend/src/lib/monaco/hogQLAutocompleteProvider.ts
@@ -4,13 +4,13 @@ import { languages } from 'monaco-editor'
import type { codeEditorLogicType } from 'lib/monaco/codeEditorLogic'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
AutocompleteCompletionItemKind,
HogLanguage,
HogQLAutocomplete,
NodeKind,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { findStatementAtOffset, splitQueries } from './multiQueryUtils'
import { getContextSourceQuery } from './sourceQueryUtils'
diff --git a/frontend/src/queries/examples.ts b/frontend/src/queries/examples.ts
index c51a6d9af3e8..330de2c7e6b8 100644
--- a/frontend/src/queries/examples.ts
+++ b/frontend/src/queries/examples.ts
@@ -2,6 +2,7 @@
import { RETENTION_FIRST_OCCURRENCE_MATCHING_FILTERS } from 'lib/constants'
import { defaultDataTableColumns } from '~/queries/nodes/DataTable/utils'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
ActionsNode,
DataTableNode,
@@ -40,7 +41,6 @@ import {
} from '~/types'
import { WEB_VITALS_THRESHOLDS } from './nodes/WebVitals/definitions'
-import { setLatestVersionsOnQuery } from './utils'
const Events: EventsQuery = {
kind: NodeKind.EventsQuery,
diff --git a/frontend/src/queries/nodes/DataNode/dataNodeLogic.test.ts b/frontend/src/queries/nodes/DataNode/dataNodeLogic.test.ts
index 883241409973..5259a5a7c556 100644
--- a/frontend/src/queries/nodes/DataNode/dataNodeLogic.test.ts
+++ b/frontend/src/queries/nodes/DataNode/dataNodeLogic.test.ts
@@ -14,8 +14,8 @@ import {
dataNodeLogic,
} from '~/queries/nodes/DataNode/dataNodeLogic'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { DashboardFilter, HogQLVariable, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import { ABANDONED_QUERY_GRACE_PERIOD, RESPONSE_CACHE_TTL } from './responseCache'
diff --git a/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts b/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts
index b9e0d2fb6335..79d257fa93c3 100644
--- a/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts
+++ b/frontend/src/queries/nodes/DataTable/dataTableLogic.test.ts
@@ -8,8 +8,8 @@ import { teamLogic } from 'scenes/teamLogic'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { DataTableRow, dataTableLogic } from '~/queries/nodes/DataTable/dataTableLogic'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
jest.mock('~/queries/query')
diff --git a/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts b/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts
index c7dc1e50ab86..44e95893e4f1 100644
--- a/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts
+++ b/frontend/src/queries/nodes/DataTable/insightActorsQueryOptionsLogic.ts
@@ -2,13 +2,14 @@ import { MakeLogicType, actions, afterMount, kea, path, props, propsChanged } fr
import { loaders } from 'kea-loaders'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
InsightActorsQuery,
InsightActorsQueryOptions,
InsightActorsQueryOptionsResponse,
NodeKind,
} from '~/queries/schema/schema-general'
-import { isInsightActorsQuery, setLatestVersionsOnQuery } from '~/queries/utils'
+import { isInsightActorsQuery } from '~/queries/utils'
// Generated by kea-typegen. Update if you're an agent, ignore if you're human.
export interface insightActorsQueryOptionsLogicValues {
diff --git a/frontend/src/queries/nodes/DataTable/renderColumn.test.tsx b/frontend/src/queries/nodes/DataTable/renderColumn.test.tsx
index df8165c8e63f..ddd2d1083d6b 100644
--- a/frontend/src/queries/nodes/DataTable/renderColumn.test.tsx
+++ b/frontend/src/queries/nodes/DataTable/renderColumn.test.tsx
@@ -4,8 +4,8 @@ import { cleanup, render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { Provider } from 'kea'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import { renderColumn } from './renderColumn'
diff --git a/frontend/src/queries/nodes/DataTable/renderColumnMeta.test.tsx b/frontend/src/queries/nodes/DataTable/renderColumnMeta.test.tsx
index 76d45519514e..1354409bf105 100644
--- a/frontend/src/queries/nodes/DataTable/renderColumnMeta.test.tsx
+++ b/frontend/src/queries/nodes/DataTable/renderColumnMeta.test.tsx
@@ -1,7 +1,7 @@
import { render } from '@testing-library/react'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { DataTableNode, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { renderColumnMeta } from './renderColumnMeta'
diff --git a/frontend/src/queries/nodes/InsightViz/utils.ts b/frontend/src/queries/nodes/InsightViz/utils.ts
index 5866a9b0dd44..f6511b536f58 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 { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
DataTableNode,
DataVisualizationNode,
@@ -14,7 +15,7 @@ import {
Node,
NodeKind,
} from '~/queries/schema/schema-general'
-import { isInsightQueryWithSeries, setLatestVersionsOnQuery } from '~/queries/utils'
+import { isInsightQueryWithSeries } from '~/queries/utils'
import { ActionType, InsightModel, InsightType } from '~/types'
import { ProductAnalyticsInsightNodeKind, getNodeKindToDefaultQuery } from '../InsightQuery/defaults'
diff --git a/frontend/src/queries/query.test.ts b/frontend/src/queries/query.test.ts
index d801e700c070..828e633d694a 100644
--- a/frontend/src/queries/query.test.ts
+++ b/frontend/src/queries/query.test.ts
@@ -6,12 +6,11 @@ import { NetworkError } from 'lib/api-error'
import { useMocks } from '~/mocks/jest'
import { performQuery, pollForResults, queryExportContext, waitForPageVisible } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { EventsQuery, HogQLQuery, NodeKind, RefreshType, WebStatsBreakdown } from '~/queries/schema/schema-general'
import { initKeaTests } from '~/test/init'
import { PropertyFilterType, PropertyOperator } from '~/types'
-import { setLatestVersionsOnQuery } from './utils'
-
describe('query', () => {
beforeEach(() => {
useMocks({
diff --git a/frontend/src/queries/latest-versions.json b/frontend/src/queries/schema/latest-versions.json
similarity index 100%
rename from frontend/src/queries/latest-versions.json
rename to frontend/src/queries/schema/latest-versions.json
diff --git a/frontend/src/queries/latest-versions.ts b/frontend/src/queries/schema/latest-versions.ts
similarity index 76%
rename from frontend/src/queries/latest-versions.ts
rename to frontend/src/queries/schema/latest-versions.ts
index bb74790f82e5..264d8662fefa 100644
--- a/frontend/src/queries/latest-versions.ts
+++ b/frontend/src/queries/schema/latest-versions.ts
@@ -1,6 +1,6 @@
import * as latestVersions from './latest-versions.json'
-import { NodeKind } from './schema'
-import { integer } from './schema/type-utils'
+import { NodeKind } from './schema-general'
+import { integer } from './type-utils'
// strip comment
const sanitizedVersions = Object.fromEntries(Object.entries(latestVersions).filter(([key]) => key !== '//'))
diff --git a/frontend/src/queries/utils.checkLatestVersionsOnQuery.test.ts b/frontend/src/queries/schema/query-versions.checkLatestVersionsOnQuery.test.ts
similarity index 97%
rename from frontend/src/queries/utils.checkLatestVersionsOnQuery.test.ts
rename to frontend/src/queries/schema/query-versions.checkLatestVersionsOnQuery.test.ts
index b372a7dd90df..2af3f1571265 100644
--- a/frontend/src/queries/utils.checkLatestVersionsOnQuery.test.ts
+++ b/frontend/src/queries/schema/query-versions.checkLatestVersionsOnQuery.test.ts
@@ -10,7 +10,7 @@ jest.mock('./latest-versions', () => {
jest.resetModules()
-const { checkLatestVersionsOnQuery } = require('./utils')
+const { checkLatestVersionsOnQuery } = require('./query-versions')
describe('checkLatestVersionsOnQuery', () => {
it('returns true if all nodes have the latest version', () => {
diff --git a/frontend/src/queries/utils.setLatestVersionsOnQuery.test.ts b/frontend/src/queries/schema/query-versions.setLatestVersionsOnQuery.test.ts
similarity index 97%
rename from frontend/src/queries/utils.setLatestVersionsOnQuery.test.ts
rename to frontend/src/queries/schema/query-versions.setLatestVersionsOnQuery.test.ts
index 6b7de6fc0c45..102f9dab1ccd 100644
--- a/frontend/src/queries/utils.setLatestVersionsOnQuery.test.ts
+++ b/frontend/src/queries/schema/query-versions.setLatestVersionsOnQuery.test.ts
@@ -10,7 +10,7 @@ jest.mock('./latest-versions', () => {
jest.resetModules()
-const { setLatestVersionsOnQuery } = require('./utils')
+const { setLatestVersionsOnQuery } = require('./query-versions')
// in a separate file to make it easier to mock the LATEST_VERSIONS
describe('setLatestVersionsOnQuery', () => {
diff --git a/frontend/src/queries/schema/query-versions.ts b/frontend/src/queries/schema/query-versions.ts
new file mode 100644
index 000000000000..a2d02fa4fff0
--- /dev/null
+++ b/frontend/src/queries/schema/query-versions.ts
@@ -0,0 +1,67 @@
+import { LATEST_VERSIONS } from './latest-versions'
+import { NodeKind } from './schema-general'
+
+/**
+ * **Needs to be used on all hardcoded queries.**
+ *
+ * Recursively adds the latest version for the respective kind to each node. This
+ * is necessary so that schema migrations don't run on hardcoded queries that
+ * are already the latest version. */
+export function setLatestVersionsOnQuery<T = any>(node: T, options?: { recursion?: boolean }): T {
+ const recursion = options?.recursion ?? true
+
+ if (node === null || typeof node !== 'object') {
+ return node
+ }
+
+ if (recursion === true && Array.isArray(node)) {
+ return (node as unknown as any[]).map((value) => setLatestVersionsOnQuery(value)) as unknown as T
+ }
+
+ const cloned: Record<string, any> = { ...(node as any) }
+
+ if (
+ 'kind' in cloned &&
+ Object.values(NodeKind).includes(cloned.kind) &&
+ LATEST_VERSIONS[cloned.kind as NodeKind] > 1
+ ) {
+ const latest = LATEST_VERSIONS[cloned.kind as NodeKind]
+ cloned.version = latest || 1
+ }
+
+ if (recursion === true) {
+ for (const [key, value] of Object.entries(cloned)) {
+ if (value !== null && typeof value === 'object') {
+ cloned[key] = setLatestVersionsOnQuery(value)
+ }
+ }
+ }
+
+ return cloned as T
+}
+
+/** Checks whether a given query node satisfies all latest versions of the query schema. */
+export function checkLatestVersionsOnQuery(node: any): boolean {
+ if (node === null || typeof node !== 'object') {
+ return true
+ }
+
+ if (Array.isArray(node)) {
+ return node.every((value) => checkLatestVersionsOnQuery(value))
+ }
+
+ if ('kind' in node && Object.values(NodeKind).includes(node.kind)) {
+ const latest = LATEST_VERSIONS[node.kind as NodeKind]
+ if (node.version !== latest) {
+ return false
+ }
+ }
+
+ for (const value of Object.values(node)) {
+ if (!checkLatestVersionsOnQuery(value)) {
+ return false
+ }
+ }
+
+ return true
+}
diff --git a/frontend/src/queries/utils.ts b/frontend/src/queries/utils.ts
index 2ace9880d19a..7fc682431e2a 100644
--- a/frontend/src/queries/utils.ts
+++ b/frontend/src/queries/utils.ts
@@ -80,8 +80,6 @@ import {
} from '~/queries/schema/schema-general'
import { AnnotationScope, BaseMathType, ChartDisplayType, FunnelVizType, GroupTypeIndex, IntervalType } from '~/types'
-import { LATEST_VERSIONS } from './latest-versions'
-
export function isDataNode(node?: Record<string, any> | null): node is EventsQuery | PersonsNode {
return (
isEventsNode(node) ||
@@ -987,68 +985,3 @@ export function getMathTypeWarning(
return warning
}
-
-/**
- * **Needs to be used on all hardcoded queries.**
- *
- * Recursively adds the latest version for the respective kind to each node. This
- * is necessary so that schema migrations don't run on hardcoded queries that
- * are already the latest version. */
-export function setLatestVersionsOnQuery<T = any>(node: T, options?: { recursion?: boolean }): T {
- const recursion = options?.recursion ?? true
-
- if (node === null || typeof node !== 'object') {
- return node
- }
-
- if (recursion === true && Array.isArray(node)) {
- return (node as unknown as any[]).map((value) => setLatestVersionsOnQuery(value)) as unknown as T
- }
-
- const cloned: Record<string, any> = { ...(node as any) }
-
- if (
- 'kind' in cloned &&
- Object.values(NodeKind).includes(cloned.kind) &&
- LATEST_VERSIONS[cloned.kind as NodeKind] > 1
- ) {
- const latest = LATEST_VERSIONS[cloned.kind as NodeKind]
- cloned.version = latest || 1
- }
-
- if (recursion === true) {
- for (const [key, value] of Object.entries(cloned)) {
- if (value !== null && typeof value === 'object') {
- cloned[key] = setLatestVersionsOnQuery(value)
- }
- }
- }
-
- return cloned as T
-}
-
-/** Checks whether a given query node satisfies all latest versions of the query schema. */
-export function checkLatestVersionsOnQuery(node: any): boolean {
- if (node === null || typeof node !== 'object') {
- return true
- }
-
- if (Array.isArray(node)) {
- return node.every((value) => checkLatestVersionsOnQuery(value))
- }
-
- if ('kind' in node && Object.values(NodeKind).includes(node.kind)) {
- const latest = LATEST_VERSIONS[node.kind as NodeKind]
- if (node.version !== latest) {
- return false
- }
- }
-
- for (const value of Object.values(node)) {
- if (!checkLatestVersionsOnQuery(value)) {
- return false
- }
- }
-
- return true
-}
diff --git a/frontend/src/scenes/dashboard/dashboardTemplateEntities.ts b/frontend/src/scenes/dashboard/dashboardTemplateEntities.ts
index ae90704b81a1..3b1e81c4af26 100644
--- a/frontend/src/scenes/dashboard/dashboardTemplateEntities.ts
+++ b/frontend/src/scenes/dashboard/dashboardTemplateEntities.ts
@@ -7,6 +7,7 @@ import {
} from 'scenes/insights/filters/ActionFilter/cleanSeriesNodes'
import { cleanEntityProperties } from '~/queries/nodes/InsightQuery/utils/cleanProperties'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
ActionsNode,
AnyDataWarehouseNode,
@@ -19,7 +20,6 @@ import {
MathType,
NodeKind,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
ActionFilter,
AnyDataWarehouseFilter,
diff --git a/frontend/src/scenes/data-management/database/databaseTableListLogic.ts b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
index 82b5682da323..bc7e0d477b0a 100644
--- a/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
+++ b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
@@ -4,6 +4,7 @@ import { loaders } from 'kea-loaders'
import { objectsEqual } from 'lib/utils/objects'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
DatabaseSchemaDataWarehouseTable,
DatabaseSchemaEndpointTable,
@@ -14,7 +15,6 @@ import {
DatabaseSchemaViewTable,
NodeKind,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { parseEndpointModelName } from 'products/data_modeling/frontend/endpointModelName'
diff --git a/frontend/src/scenes/data-management/events/propertyGroupTrendsQuery.ts b/frontend/src/scenes/data-management/events/propertyGroupTrendsQuery.ts
index e529964a8e2e..7ea994e6c7d4 100644
--- a/frontend/src/scenes/data-management/events/propertyGroupTrendsQuery.ts
+++ b/frontend/src/scenes/data-management/events/propertyGroupTrendsQuery.ts
@@ -1,7 +1,7 @@
import { dayjs } from 'lib/dayjs'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { EventsNode, InsightVizNode, NodeKind, TrendsQuery } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { BaseMathType, PropertyFilterType, PropertyOperator } from '~/types'
import { SchemaPropertyGroupProperty } from '../schema/schemaManagementLogic'
diff --git a/frontend/src/scenes/experiments/ExperimentView/ExperimentExecutionPathComparison.tsx b/frontend/src/scenes/experiments/ExperimentView/ExperimentExecutionPathComparison.tsx
index fa69477b9c08..b7579e6ea204 100644
--- a/frontend/src/scenes/experiments/ExperimentView/ExperimentExecutionPathComparison.tsx
+++ b/frontend/src/scenes/experiments/ExperimentView/ExperimentExecutionPathComparison.tsx
@@ -11,6 +11,7 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { runWithLimit } from 'scenes/dashboard/dashboardUtils'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
ExperimentMetric,
ExperimentQueryResponse,
@@ -20,7 +21,6 @@ import {
NewExperimentQueryResponse,
NodeKind,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { experimentLogic } from '../experimentLogic'
import { getExperimentRefreshMode } from '../metricQueryUtils'
diff --git a/frontend/src/scenes/experiments/experimentLogic.tsx b/frontend/src/scenes/experiments/experimentLogic.tsx
index f453219b9b24..4c8780e5fe9b 100644
--- a/frontend/src/scenes/experiments/experimentLogic.tsx
+++ b/frontend/src/scenes/experiments/experimentLogic.tsx
@@ -45,6 +45,7 @@ import { refreshTreeItem } from '~/layout/panel-layout/ProjectTree/projectTreeLo
import { cohortsModel } from '~/models/cohortsModel'
import { tagsModel } from '~/models/tagsModel'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
Breakdown,
ExperimentExposureCriteria,
@@ -57,7 +58,6 @@ import {
NodeKind,
TrendsQuery,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
BreakdownAttributionType,
BreakdownType,
diff --git a/frontend/src/scenes/experiments/metricQueryUtils.test.ts b/frontend/src/scenes/experiments/metricQueryUtils.test.ts
index 1eaf34809c32..a25b69230e26 100644
--- a/frontend/src/scenes/experiments/metricQueryUtils.test.ts
+++ b/frontend/src/scenes/experiments/metricQueryUtils.test.ts
@@ -4,6 +4,7 @@ import { getDefaultEventLabel, getDefaultEventName } from 'lib/utils/getAppConte
import { entityFilterLogic } from 'scenes/insights/filters/ActionFilter/entityFilterLogic'
import { SeriesNode } from 'scenes/insights/filters/ActionFilter/seriesNode'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import type {
ActionsNode,
EventsNode,
@@ -12,7 +13,6 @@ import type {
ExperimentMetric,
} from '~/queries/schema/schema-general'
import { ExperimentMetricType, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import {
ChartDisplayType,
diff --git a/frontend/src/scenes/experiments/metricQueryUtils.ts b/frontend/src/scenes/experiments/metricQueryUtils.ts
index 07833f2030f6..f365b0c87158 100644
--- a/frontend/src/scenes/experiments/metricQueryUtils.ts
+++ b/frontend/src/scenes/experiments/metricQueryUtils.ts
@@ -14,6 +14,7 @@ import {
isWarehouseSeriesNode,
} from 'scenes/insights/filters/ActionFilter/seriesNode'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import type {
ActionsNode,
BreakdownFilter,
@@ -35,7 +36,6 @@ import type {
TrendsQuery,
} from '~/queries/schema/schema-general'
import { ExperimentMetricType, ExperimentWarehouseNativeMathType, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import type { IntervalType } from '~/types'
import { ChartDisplayType, ExperimentMetricMathType } from '~/types'
diff --git a/frontend/src/scenes/feature-flags/featureFlagUsageQueries.ts b/frontend/src/scenes/feature-flags/featureFlagUsageQueries.ts
index 302fdfbd7f07..ab350b378c1a 100644
--- a/frontend/src/scenes/feature-flags/featureFlagUsageQueries.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagUsageQueries.ts
@@ -12,6 +12,7 @@ import { escapeHogQLString } from 'lib/utils/hogql'
import { BREAKDOWN_NULL_DISPLAY } from 'scenes/insights/utils'
import { Noun } from '~/models/groupsModel'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
ChartSettings,
DataVisualizationNode,
@@ -23,7 +24,6 @@ import {
TrendsQuery,
} from '~/queries/schema/schema-general'
import { QueryContext } from '~/queries/types'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
AnyPropertyFilter,
BaseMathType,
diff --git a/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx b/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx
index 2830c737186b..f6afa5668111 100644
--- a/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx
+++ b/frontend/src/scenes/hog-functions/configuration/hogFunctionConfigurationLogic.tsx
@@ -45,6 +45,7 @@ import { userLogic } from 'scenes/userLogic'
import { deleteFromTree, refreshTreeItem } from '~/layout/panel-layout/ProjectTree/projectTreeLogic'
import { groupsModel } from '~/models/groupsModel'
import { defaultDataTableColumns } from '~/queries/nodes/DataTable/utils'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
DataTableNode,
EventsNode,
@@ -54,7 +55,6 @@ import {
ProductKey,
TrendsQuery,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
AnyPropertyFilter,
AvailableFeature,
diff --git a/frontend/src/scenes/hog-functions/filters/flagCallsMatching.ts b/frontend/src/scenes/hog-functions/filters/flagCallsMatching.ts
index 72b41f0fd49d..7ab6bcfcac3f 100644
--- a/frontend/src/scenes/hog-functions/filters/flagCallsMatching.ts
+++ b/frontend/src/scenes/hog-functions/filters/flagCallsMatching.ts
@@ -3,8 +3,8 @@ import { hogql } from 'lib/utils/hogql'
import { FEATURE_FLAG_CALLED_EVENT, storesFlagCallsOutsideEvents } from 'scenes/feature-flags/flagEvaluationsTable'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { EventsQuery, NodeKind, TrendsQuery } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
CyclotronJobFilterPropertyFilter,
CyclotronJobInvocationGlobals,
diff --git a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
index 422104f8e8e5..9665c3a852a9 100644
--- a/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
+++ b/frontend/src/scenes/insights/EmptyStates/EmptyStates.tsx
@@ -43,8 +43,9 @@ import { teamLogic } from 'scenes/teamLogic'
import { urls } from 'scenes/urls'
import { sidePanelStateLogic } from '~/layout/navigation-3000/sidepanel/sidePanelStateLogic'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { EventsNode, Node, NodeKind, QueryStatus } from '~/queries/schema/schema-general'
-import { isFunnelsDataWarehouseNode, setLatestVersionsOnQuery } from '~/queries/utils'
+import { isFunnelsDataWarehouseNode } from '~/queries/utils'
import {
AccessControlLevel,
AccessControlResourceType,
diff --git a/frontend/src/scenes/insights/filters/ActionFilter/seriesNode.ts b/frontend/src/scenes/insights/filters/ActionFilter/seriesNode.ts
index 7429eebdf441..d9b3134d931b 100644
--- a/frontend/src/scenes/insights/filters/ActionFilter/seriesNode.ts
+++ b/frontend/src/scenes/insights/filters/ActionFilter/seriesNode.ts
@@ -1,5 +1,6 @@
import { getDefaultEventLabel, getDefaultEventName } from 'lib/utils/getAppContext'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
ActionsNode,
AnyDataWarehouseNode,
@@ -9,7 +10,6 @@ import {
GroupNode,
NodeKind,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { EntityType, EntityTypes } from '~/types'
/**
diff --git a/frontend/src/scenes/insights/insightDataLogic.test.ts b/frontend/src/scenes/insights/insightDataLogic.test.ts
index 3595dfd97186..711d4d858d32 100644
--- a/frontend/src/scenes/insights/insightDataLogic.test.ts
+++ b/frontend/src/scenes/insights/insightDataLogic.test.ts
@@ -25,6 +25,7 @@ import { insightsModel } from '~/models/insightsModel'
import { examples } from '~/queries/examples'
import { getDefaultQuery } from '~/queries/nodes/InsightViz/utils'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { BIVisualizationNode } from '~/queries/schema/schema-business-intelligence'
import {
DataVisualizationNode,
@@ -35,7 +36,6 @@ import {
ResultCustomizationBy,
TrendsQuery,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import { ChartDisplayType, FilterLogicalOperator, FunnelVizType, InsightShortId, InsightType } from '~/types'
diff --git a/frontend/src/scenes/insights/insightSceneLogic.test.ts b/frontend/src/scenes/insights/insightSceneLogic.test.ts
index de864f5bc6a7..97280d93dc80 100644
--- a/frontend/src/scenes/insights/insightSceneLogic.test.ts
+++ b/frontend/src/scenes/insights/insightSceneLogic.test.ts
@@ -19,8 +19,8 @@ import { dashboardsModel } from '~/models/dashboardsModel'
import { examples } from '~/queries/examples'
import { dataNodeLogic } from '~/queries/nodes/DataNode/dataNodeLogic'
import { insightVizDataNodeKey } from '~/queries/nodes/InsightViz/insightVizKeys'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { DashboardFilter, HogQLVariable, InsightVizNode, NodeKind, ProductKey } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import { ActivityScope, CohortType, DashboardType, InsightShortId, InsightType, ItemMode } from '~/types'
diff --git a/frontend/src/scenes/insights/insightSceneLogic.tsx b/frontend/src/scenes/insights/insightSceneLogic.tsx
index 6a1824467702..2ab8461522ee 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 { checkLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
DashboardFilter,
FileSystemIconType,
@@ -51,12 +52,7 @@ import {
QueryLogTags,
TileFilters,
} from '~/queries/schema/schema-general'
-import {
- checkLatestVersionsOnQuery,
- convertDataTableNodeToDataVisualizationNode,
- isDataTableNode,
- isInsightVizNode,
-} from '~/queries/utils'
+import { convertDataTableNodeToDataVisualizationNode, isDataTableNode, isInsightVizNode } from '~/queries/utils'
import {
ActivityScope,
Breadcrumb,
diff --git a/frontend/src/scenes/insights/insightVizDataLogic.test.ts b/frontend/src/scenes/insights/insightVizDataLogic.test.ts
index 4009e2bf0123..c8f4b4a00ba1 100644
--- a/frontend/src/scenes/insights/insightVizDataLogic.test.ts
+++ b/frontend/src/scenes/insights/insightVizDataLogic.test.ts
@@ -9,8 +9,9 @@ import { QuerySourceUpdate, insightVizDataLogic } from 'scenes/insights/insightV
import { useMocks } from '~/mocks/jest'
import { actionsModel } from '~/models/actionsModel'
-import { LATEST_VERSIONS } from '~/queries/latest-versions'
import { funnelsQueryDefault, trendsQueryDefault } from '~/queries/nodes/InsightQuery/defaults'
+import { LATEST_VERSIONS } from '~/queries/schema/latest-versions'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
FunnelsQuery,
LifecycleQuery,
@@ -19,7 +20,6 @@ import {
RetentionQuery,
TrendsQuery,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import {
BaseMathType,
diff --git a/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts b/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts
index c69204287197..c4c669a4a2e9 100644
--- a/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts
+++ b/frontend/src/scenes/notebooks/Nodes/NotebookNodePersonFeed/notebookNodePersonFeedLogic.ts
@@ -2,8 +2,8 @@ import { MakeLogicType, afterMount, kea, key, path, props } from 'kea'
import { loaders } from 'kea-loaders'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { NodeKind, SessionsTimelineQuery, SessionsTimelineQueryResponse } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { CUSTOMER_ANALYTICS_DEFAULT_QUERY_TAGS } from 'products/customer_analytics/frontend/constants'
diff --git a/frontend/src/scenes/notebooks/Notebook/migrations/migrate.test.ts b/frontend/src/scenes/notebooks/Notebook/migrations/migrate.test.ts
index 3bdf6b8bb235..c77b13c02242 100644
--- a/frontend/src/scenes/notebooks/Notebook/migrations/migrate.test.ts
+++ b/frontend/src/scenes/notebooks/Notebook/migrations/migrate.test.ts
@@ -2,7 +2,7 @@ import { JSONContent } from 'lib/components/RichContentEditor/types'
import { NotebookType } from 'scenes/notebooks/types'
import { useMocks } from '~/mocks/jest'
-import { LATEST_VERSIONS } from '~/queries/latest-versions'
+import { LATEST_VERSIONS } from '~/queries/schema/latest-versions'
import { NodeKind } from '~/queries/schema/schema-general'
import { initKeaTests } from '~/test/init'
import { AccessControlLevel } from '~/types'
diff --git a/frontend/src/scenes/notebooks/Notebook/migrations/migrate.ts b/frontend/src/scenes/notebooks/Notebook/migrations/migrate.ts
index a0d3be3e3b12..8a9df24b42bf 100644
--- a/frontend/src/scenes/notebooks/Notebook/migrations/migrate.ts
+++ b/frontend/src/scenes/notebooks/Notebook/migrations/migrate.ts
@@ -5,8 +5,8 @@ import { NotebookNodePlaylistAttributes } from 'scenes/notebooks/Nodes/NotebookN
import { NotebookNodeType, NotebookType } from 'scenes/notebooks/types'
import { convertLegacyFiltersToUniversalFilters } from 'scenes/session-recordings/playlist/sessionRecordingsPlaylistLogic'
+import { checkLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { NodeKind } from '~/queries/schema/schema-general'
-import { checkLatestVersionsOnQuery } from '~/queries/utils'
import { LegacyRecordingFilters } from '~/types'
import { convertMarkdownTablesInContent } from './convertMarkdownTablesInContent'
diff --git a/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts b/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts
index 46894a9d4eda..365d26fc271e 100644
--- a/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts
+++ b/frontend/src/scenes/trends/persons-modal/personsModalLogic.ts
@@ -26,6 +26,7 @@ import { cohortsModel } from '~/models/cohortsModel'
import { groupsModel } from '~/models/groupsModel'
import { extractValidationError } from '~/queries/nodes/InsightViz/utils'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
ActorsQuery,
DataTableNode,
@@ -39,7 +40,6 @@ import {
TrendsQuery,
insightActorsQueryOptionsResponseKeys,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
ActivityTab,
ActorType,
diff --git a/frontend/src/scenes/web-analytics/pageReportsLogic.ts b/frontend/src/scenes/web-analytics/pageReportsLogic.ts
index 553bb9068be3..b07adc7f0d6d 100644
--- a/frontend/src/scenes/web-analytics/pageReportsLogic.ts
+++ b/frontend/src/scenes/web-analytics/pageReportsLogic.ts
@@ -8,6 +8,7 @@ import { FEATURE_FLAGS } from 'lib/constants'
import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
import { teamLogic } from 'scenes/teamLogic'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
CompareFilter,
InsightVizNode,
@@ -19,7 +20,6 @@ import {
WebStatsBreakdown,
WebStatsTableQuery,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
BaseMathType,
ChartDisplayType,
diff --git a/posthog/schema_migrations/README.md b/posthog/schema_migrations/README.md
index 375a67330496..28fff79697c4 100644
--- a/posthog/schema_migrations/README.md
+++ b/posthog/schema_migrations/README.md
@@ -23,9 +23,9 @@ Write-time (backfill): a Temporal schedule (`upgrade-queries-schedule`, every 6
## Adding a migration
-1. Create `NNNN_description.py` (next free number, must match `^\d{4}[a-zA-Z_]*\.py$`) with a `Migration(SchemaMigration)` class. Target the _current_ latest version of each kind (see `LATEST_VERSIONS` or `frontend/src/queries/latest-versions.json`).
+1. Create `NNNN_description.py` (next free number, must match `^\d{4}[a-zA-Z_]*\.py$`) with a `Migration(SchemaMigration)` class. Target the _current_ latest version of each kind (see `LATEST_VERSIONS` or `frontend/src/queries/schema/latest-versions.json`).
2. Add a test in `test/` covering the transform, including the no-op cases below.
-3. Regenerate the frontend versions file: `python bin/build-schema-latest-versions.py` (part of `hogli build:schema` / `pnpm run schema:build`) and commit `frontend/src/queries/latest-versions.json` **in the same PR**, otherwise `test_discovery.py::test_frontend_latest_versions_file_in_sync` fails. A stale file makes the frontend stamp outdated versions on new queries, which double-applies your migration to already-new-shape queries.
+3. Regenerate the frontend versions file: `python bin/build-schema-latest-versions.py` (part of `hogli build:schema` / `pnpm run schema:build`) and commit `frontend/src/queries/schema/latest-versions.json` **in the same PR**, otherwise `test_discovery.py::test_frontend_latest_versions_file_in_sync` fails. A stale file makes the frontend stamp outdated versions on new queries, which double-applies your migration to already-new-shape queries.
4. Keep the schema backward compatible: leave the old field in `frontend/src/queries/schema/*.ts` (and thus `posthog/schema.py`) until the backfill has completed and no writer emits it anymore. Removing it immediately breaks validation of not-yet-upgraded JSON everywhere.
## Invariants for `transform`
diff --git a/posthog/schema_migrations/test/test_discovery.py b/posthog/schema_migrations/test/test_discovery.py
index 74108115b2b4..7502799690ae 100644
--- a/posthog/schema_migrations/test/test_discovery.py
+++ b/posthog/schema_migrations/test/test_discovery.py
@@ -77,7 +77,7 @@ def test_discover_migrations_recovers_after_failed_discovery():
def test_frontend_latest_versions_file_in_sync():
_discover_migrations()
- path = Path(__file__).parents[3] / "frontend" / "src" / "queries" / "latest-versions.json"
+ path = Path(__file__).parents[3] / "frontend" / "src" / "queries" / "schema" / "latest-versions.json"
committed = json.loads(path.read_text())
committed.pop("//", None)
@@ -85,7 +85,7 @@ def test_frontend_latest_versions_file_in_sync():
expected = json.loads(to_json(LATEST_VERSIONS))
assert committed == expected, (
- "frontend/src/queries/latest-versions.json is out of sync with posthog/schema_migrations. "
+ "frontend/src/queries/schema/latest-versions.json is out of sync with posthog/schema_migrations. "
"Run `python bin/build-schema-latest-versions.py` (part of `pnpm run schema:build` / `hogli build:schema`) "
"and commit the result."
)
diff --git a/products/early_access_features/frontend/earlyAccessFeatureLogic.ts b/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
index 0dbbf760a214..6cd1abf3d6ba 100644
--- a/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
+++ b/products/early_access_features/frontend/earlyAccessFeatureLogic.ts
@@ -19,8 +19,8 @@ import { urls } from 'scenes/urls'
import { SIDE_PANEL_CONTEXT_KEY, SidePanelSceneContext } from '~/layout/navigation-3000/sidepanel/types'
import { deleteFromTree, refreshTreeItem } from '~/layout/panel-layout/ProjectTree/projectTreeLogic'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { ActorsQuery, NodeKind } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
ActivityScope,
Breadcrumb,
diff --git a/products/error_tracking/frontend/queries.ts b/products/error_tracking/frontend/queries.ts
index ba694c1dbecd..821a1ca606f2 100644
--- a/products/error_tracking/frontend/queries.ts
+++ b/products/error_tracking/frontend/queries.ts
@@ -1,6 +1,7 @@
import { isUniversalGroupFilterLike } from 'lib/components/UniversalFilters/utils'
import { HogQLQueryString, escapeHogQLString, hogql } from 'lib/utils/hogql'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
DataTableNode,
DateRange,
@@ -18,7 +19,6 @@ import {
NodeKind,
ProductKey,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import {
AnyPropertyFilter,
BaseMathType,
diff --git a/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.test.ts b/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.test.ts
index 571a7dd19f24..30bfc3302249 100644
--- a/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.test.ts
+++ b/products/product_analytics/frontend/insights/InsightNav/insightNavLogic.test.ts
@@ -9,8 +9,9 @@ import { insightLogic } from 'scenes/insights/insightLogic'
import { useMocks } from '~/mocks/jest'
import { examples } from '~/queries/examples'
-import { LATEST_VERSIONS } from '~/queries/latest-versions'
import { nodeKindToDefaultQuery } from '~/queries/nodes/InsightQuery/defaults'
+import { LATEST_VERSIONS } from '~/queries/schema/latest-versions'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import {
Breakdown,
BreakdownFilter,
@@ -26,7 +27,6 @@ import {
StickinessQuery,
TrendsQuery,
} from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { initKeaTests } from '~/test/init'
import {
BaseMathType,
diff --git a/products/product_analytics/frontend/insights/editor/EditorFiltersShell.test.ts b/products/product_analytics/frontend/insights/editor/EditorFiltersShell.test.ts
index 33621fb4d163..c4cad4636687 100644
--- a/products/product_analytics/frontend/insights/editor/EditorFiltersShell.test.ts
+++ b/products/product_analytics/frontend/insights/editor/EditorFiltersShell.test.ts
@@ -1,5 +1,5 @@
+import { checkLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { InsightVizNode, NodeKind, TrendsQuery } from '~/queries/schema/schema-general'
-import { checkLatestVersionsOnQuery } from '~/queries/utils'
import { buildInsightNodeFromQueryTool, withCurrentQueryMetadata } from './EditorFiltersShell'
diff --git a/products/product_analytics/frontend/insights/editor/EditorFiltersShell.tsx b/products/product_analytics/frontend/insights/editor/EditorFiltersShell.tsx
index 74890e871577..e4cb2c15a69b 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 { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { AnyAssistantGeneratedQuery } from '~/queries/schema/schema-assistant-messages'
import {
AssistantFunnelsQuery,
@@ -26,7 +27,7 @@ import {
NodeKind,
QuerySchema,
} from '~/queries/schema/schema-general'
-import { isHogQLQuery, isInsightQueryNode, setLatestVersionsOnQuery } from '~/queries/utils'
+import { isHogQLQuery, isInsightQueryNode } from '~/queries/utils'
import { useAttachedContext, useMcpToolApplyBack } from 'products/posthog_ai/frontend/api/logics'
diff --git a/products/product_analytics/frontend/insights/retention/queries.ts b/products/product_analytics/frontend/insights/retention/queries.ts
index 565d067b2bf1..32b06e53bf57 100644
--- a/products/product_analytics/frontend/insights/retention/queries.ts
+++ b/products/product_analytics/frontend/insights/retention/queries.ts
@@ -1,8 +1,8 @@
import { sceneLogic } from 'scenes/sceneLogic'
import { performQuery } from '~/queries/query'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { ActorsQuery, NodeKind, RetentionQuery } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { RetentionTableAppearanceType, RetentionTablePeoplePayload } from './types'
diff --git a/products/workflows/frontend/Workflows/hogflows/steps/triggerVolume.ts b/products/workflows/frontend/Workflows/hogflows/steps/triggerVolume.ts
index 21e1daddb066..9a45e7d3439d 100644
--- a/products/workflows/frontend/Workflows/hogflows/steps/triggerVolume.ts
+++ b/products/workflows/frontend/Workflows/hogflows/steps/triggerVolume.ts
@@ -1,7 +1,7 @@
import { matchingFiltersToPropertyGroup } from 'scenes/hog-functions/filters/matchingFilters'
+import { setLatestVersionsOnQuery } from '~/queries/schema/query-versions'
import { EventsNode, NodeKind, TrendsQuery } from '~/queries/schema/schema-general'
-import { setLatestVersionsOnQuery } from '~/queries/utils'
import { BaseMathType, ChartDisplayType } from '~/types'
import { HogFlowAction } from '../types'