chore to move critical path files (#1314)

moves them into a core folder, this allows us to easily track when core files are modified via path

no changeset because no version bump required

fixes HDX-2589

packages/api/src/clickhouse/__tests__/renderChartConfig.test.ts

@@ -2,8 +2,8 @@
 
 import { ChSql } from '@hyperdx/common-utils/dist/clickhouse';
 import { ClickhouseClient } from '@hyperdx/common-utils/dist/clickhouse/node';
-import { getMetadata } from '@hyperdx/common-utils/dist/metadata';
-import { renderChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
+import { getMetadata } from '@hyperdx/common-utils/dist/core/metadata';
+import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import {
   AggregateFunctionSchema,
   DerivedColumn,

packages/api/src/routers/api/ai.ts

@@ -3,7 +3,7 @@ import { ClickhouseClient } from '@hyperdx/common-utils/dist/clickhouse/node';
 import {
   getMetadata,
   TableMetadata,
-} from '@hyperdx/common-utils/dist/metadata';
+} from '@hyperdx/common-utils/dist/core/metadata';
 import {
   AggregateFunctionSchema,
   ChartConfigWithDateRange,

packages/api/src/routers/external-api/v2/charts.ts

@@ -1,11 +1,11 @@
 import { ClickhouseClient } from '@hyperdx/common-utils/dist/clickhouse/node';
-import { getMetadata } from '@hyperdx/common-utils/dist/metadata';
+import { getMetadata } from '@hyperdx/common-utils/dist/core/metadata';
+import { Granularity } from '@hyperdx/common-utils/dist/core/utils';
 import {
   ChartConfigWithOptDateRange,
   DisplayType,
 } from '@hyperdx/common-utils/dist/types';
 import { SourceKind } from '@hyperdx/common-utils/dist/types';
-import { Granularity } from '@hyperdx/common-utils/dist/utils';
 import opentelemetry, { SpanStatusCode } from '@opentelemetry/api';
 import express from 'express';
 import _ from 'lodash';

packages/api/src/tasks/checkAlerts/__tests__/checkAlerts.test.ts

@@ -744,8 +744,8 @@ describe('checkAlerts', () => {
       };
 
       // Mock the getMetadata function
-      jest.mock('@hyperdx/common-utils/dist/metadata', () => ({
-        ...jest.requireActual('@hyperdx/common-utils/dist/metadata'),
+      jest.mock('@hyperdx/common-utils/dist/core/metadata', () => ({
+        ...jest.requireActual('@hyperdx/common-utils/dist/core/metadata'),
         getMetadata: jest.fn().mockReturnValue(mockMetadata),
       }));
 
@@ -1009,8 +1009,8 @@ describe('checkAlerts', () => {
       };
 
       // Mock the getMetadata function
-      jest.mock('@hyperdx/common-utils/dist/metadata', () => ({
-        ...jest.requireActual('@hyperdx/common-utils/dist/metadata'),
+      jest.mock('@hyperdx/common-utils/dist/core/metadata', () => ({
+        ...jest.requireActual('@hyperdx/common-utils/dist/core/metadata'),
         getMetadata: jest.fn().mockReturnValue(mockMetadata),
       }));
 
@@ -1264,8 +1264,8 @@ describe('checkAlerts', () => {
       };
 
       // Mock the getMetadata function
-      jest.mock('@hyperdx/common-utils/dist/metadata', () => ({
-        ...jest.requireActual('@hyperdx/common-utils/dist/metadata'),
+      jest.mock('@hyperdx/common-utils/dist/core/metadata', () => ({
+        ...jest.requireActual('@hyperdx/common-utils/dist/core/metadata'),
         getMetadata: jest.fn().mockReturnValue(mockMetadata),
       }));
 
@@ -1496,8 +1496,8 @@ describe('checkAlerts', () => {
       };
 
       // Mock the getMetadata function
-      jest.mock('@hyperdx/common-utils/dist/metadata', () => ({
-        ...jest.requireActual('@hyperdx/common-utils/dist/metadata'),
+      jest.mock('@hyperdx/common-utils/dist/core/metadata', () => ({
+        ...jest.requireActual('@hyperdx/common-utils/dist/core/metadata'),
         getMetadata: jest.fn().mockReturnValue(mockMetadata),
       }));
 

packages/api/src/tasks/checkAlerts/__tests__/singleInvocationAlert.test.ts

@@ -424,8 +424,8 @@ describe('Single Invocation Alert Test', () => {
     };
 
     // Mock the getMetadata function
-    jest.mock('@hyperdx/common-utils/dist/metadata', () => ({
-      ...jest.requireActual('@hyperdx/common-utils/dist/metadata'),
+    jest.mock('@hyperdx/common-utils/dist/core/metadata', () => ({
+      ...jest.requireActual('@hyperdx/common-utils/dist/core/metadata'),
       getMetadata: jest.fn().mockReturnValue(mockMetadata),
     }));
 

packages/api/src/tasks/checkAlerts/index.ts

@@ -4,7 +4,10 @@
 import PQueue from '@esm2cjs/p-queue';
 import * as clickhouse from '@hyperdx/common-utils/dist/clickhouse';
 import { ClickhouseClient } from '@hyperdx/common-utils/dist/clickhouse/node';
-import { getMetadata, Metadata } from '@hyperdx/common-utils/dist/metadata';
+import {
+  getMetadata,
+  Metadata,
+} from '@hyperdx/common-utils/dist/core/metadata';
 import {
   ChartConfigWithOptDateRange,
   DisplayType,

packages/api/src/tasks/checkAlerts/template.ts

@@ -1,6 +1,7 @@
 import { ClickhouseClient } from '@hyperdx/common-utils/dist/clickhouse/node';
-import { Metadata } from '@hyperdx/common-utils/dist/metadata';
-import { renderChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
+import { Metadata } from '@hyperdx/common-utils/dist/core/metadata';
+import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
+import { _useTry, formatDate } from '@hyperdx/common-utils/dist/core/utils';
 import {
   AlertChannelType,
   ChartConfigWithOptDateRange,
@@ -8,7 +9,6 @@ import {
   WebhookService,
   zAlertChannelType,
 } from '@hyperdx/common-utils/dist/types';
-import { _useTry, formatDate } from '@hyperdx/common-utils/dist/utils';
 import { isValidSlackUrl } from '@hyperdx/common-utils/dist/validation';
 import Handlebars, { HelperOptions } from 'handlebars';
 import _ from 'lodash';

packages/api/src/utils/common.ts

@@ -1,4 +1,4 @@
-import { Granularity } from '@hyperdx/common-utils/dist/utils';
+import { Granularity } from '@hyperdx/common-utils/dist/core/utils';
 
 export type JSONBlob = Record<string, Json>;
 

packages/app/src/DBDashboardImportPage.tsx

@@ -8,8 +8,8 @@ import { Controller, useForm } from 'react-hook-form';
 import { StringParam, useQueryParam } from 'use-query-params';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { convertToDashboardDocument } from '@hyperdx/common-utils/dist/core/utils';
 import { DashboardTemplateSchema } from '@hyperdx/common-utils/dist/types';
-import { convertToDashboardDocument } from '@hyperdx/common-utils/dist/utils';
 import {
   Button,
   Collapse,

packages/app/src/DBDashboardPage.tsx

@@ -14,7 +14,8 @@ import { parseAsString, useQueryState } from 'nuqs';
 import { ErrorBoundary } from 'react-error-boundary';
 import RGL, { WidthProvider } from 'react-grid-layout';
 import { Controller, useForm } from 'react-hook-form';
-import { TableConnection } from '@hyperdx/common-utils/dist/metadata';
+import { TableConnection } from '@hyperdx/common-utils/dist/core/metadata';
+import { convertToDashboardTemplate } from '@hyperdx/common-utils/dist/core/utils';
 import {
   AlertState,
   DashboardFilter,
@@ -28,7 +29,6 @@ import {
   SearchConditionLanguage,
   SQLInterval,
 } from '@hyperdx/common-utils/dist/types';
-import { convertToDashboardTemplate } from '@hyperdx/common-utils/dist/utils';
 import {
   Box,
   Button,

packages/app/src/DBSearchPage.tsx

@@ -23,17 +23,17 @@ import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { ClickHouseQueryError } from '@hyperdx/common-utils/dist/clickhouse';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
+import {
+  isBrowser,
+  splitAndTrimWithBracket,
+} from '@hyperdx/common-utils/dist/core/utils';
 import {
   ChartConfigWithDateRange,
   DisplayType,
   Filter,
   SourceKind,
 } from '@hyperdx/common-utils/dist/types';
-import {
-  isBrowser,
-  splitAndTrimWithBracket,
-} from '@hyperdx/common-utils/dist/utils';
 import {
   ActionIcon,
   Box,

packages/app/src/DBSearchPageAlertModal.tsx

@@ -4,7 +4,7 @@ import { useForm } from 'react-hook-form';
 import { NativeSelect, NumberInput } from 'react-hook-form-mantine';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   type Alert,
   AlertIntervalSchema,

packages/app/src/DashboardFiltersModal.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Controller, FieldError, useForm } from 'react-hook-form';
-import { TableConnection } from '@hyperdx/common-utils/dist/metadata';
+import { TableConnection } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   DashboardFilter,
   MetricsDataType,

packages/app/src/NamespaceDetailsSidePanel.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Link from 'next/link';
 import { StringParam, useQueryParam, withDefault } from 'use-query-params';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import { TSource } from '@hyperdx/common-utils/dist/types';
 import {
   Anchor,

packages/app/src/NodeDetailsSidePanel.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Link from 'next/link';
 import { StringParam, useQueryParam, withDefault } from 'use-query-params';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   SearchConditionLanguage,
   TSource,

packages/app/src/PodDetailsSidePanel.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import Link from 'next/link';
 import { StringParam, useQueryParam, withDefault } from 'use-query-params';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import { TSource } from '@hyperdx/common-utils/dist/types';
 import {
   Anchor,

packages/app/src/SearchInputV2.tsx

@@ -4,7 +4,7 @@ import { useHotkeys } from 'react-hotkeys-hook';
 import {
   Field,
   TableConnectionChoice,
-} from '@hyperdx/common-utils/dist/metadata';
+} from '@hyperdx/common-utils/dist/core/metadata';
 import { genEnglishExplanation } from '@hyperdx/common-utils/dist/queryParser';
 
 import AutocompleteInput from '@/AutocompleteInput';

packages/app/src/ServicesDashboardPage.tsx

@@ -7,7 +7,7 @@ import {
   useQueryStates,
 } from 'nuqs';
 import { UseControllerProps, useForm } from 'react-hook-form';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   DisplayType,
   Filter,

packages/app/src/SessionSubpanel.tsx

@@ -4,7 +4,7 @@ import throttle from 'lodash/throttle';
 import { parseAsInteger, useQueryState } from 'nuqs';
 import ReactDOM from 'react-dom';
 import { useForm } from 'react-hook-form';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   ChartConfigWithOptDateRange,
   DateRange,

packages/app/src/SessionsPage.tsx

@@ -15,7 +15,7 @@ import {
   useQueryParams,
   withDefault,
 } from 'use-query-params';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   DateRange,
   SearchCondition,

packages/app/src/TeamPage.tsx

@@ -8,7 +8,7 @@ import type { ZodIssue } from 'zod';
 import { json, jsonParseLinter } from '@codemirror/lang-json';
 import { linter } from '@codemirror/lint';
 import { EditorView } from '@codemirror/view';
-import { DEFAULT_METADATA_MAX_ROWS_TO_READ } from '@hyperdx/common-utils/dist/metadata';
+import { DEFAULT_METADATA_MAX_ROWS_TO_READ } from '@hyperdx/common-utils/dist/core/metadata';
 import { SourceKind, WebhookService } from '@hyperdx/common-utils/dist/types';
 import {
   isValidSlackUrl,

packages/app/src/components/ContextSidePanel.tsx

@@ -3,7 +3,7 @@ import { sq } from 'date-fns/locale';
 import ms from 'ms';
 import { parseAsString, useQueryState } from 'nuqs';
 import { useForm } from 'react-hook-form';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   ChartConfigWithDateRange,
   TSource,

packages/app/src/components/DBEditTimeChartForm.tsx

@@ -19,7 +19,7 @@ import {
 import { NativeSelect, NumberInput } from 'react-hook-form-mantine';
 import z from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   ChartAlertBaseSchema,
   ChartConfigWithDateRange,

packages/app/src/components/DBRowTable.tsx

@@ -29,12 +29,12 @@ import {
   isJSDataTypeJSONStringifiable,
   JSDataType,
 } from '@hyperdx/common-utils/dist/clickhouse';
+import { splitAndTrimWithBracket } from '@hyperdx/common-utils/dist/core/utils';
 import {
   ChartConfigWithDateRange,
   SelectList,
   TSource,
 } from '@hyperdx/common-utils/dist/types';
-import { splitAndTrimWithBracket } from '@hyperdx/common-utils/dist/utils';
 import {
   Box,
   Button,

packages/app/src/components/DBSearchPageFilters.tsx

@@ -12,7 +12,7 @@ import {
   TableMetadata,
   tcFromChartConfig,
   tcFromSource,
-} from '@hyperdx/common-utils/dist/metadata';
+} from '@hyperdx/common-utils/dist/core/metadata';
 import { ChartConfigWithDateRange } from '@hyperdx/common-utils/dist/types';
 import {
   Accordion,

packages/app/src/components/DBTimeChart.tsx

@@ -3,7 +3,7 @@ import Link from 'next/link';
 import cx from 'classnames';
 import { add } from 'date-fns';
 import { ClickHouseQueryError } from '@hyperdx/common-utils/dist/clickhouse';
-import { isMetricChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
+import { isMetricChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import {
   ChartConfigWithDateRange,
   DisplayType,

packages/app/src/components/DBTracePanel.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { parseAsJson, useQueryState } from 'nuqs';
 import { useForm } from 'react-hook-form';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import { SourceKind } from '@hyperdx/common-utils/dist/types';
 import {
   Button,

packages/app/src/components/KubeComponents.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import Link from 'next/link';
 import { sub } from 'date-fns';
 import type { ResponseJSON } from '@hyperdx/common-utils/dist/clickhouse';
-import { renderChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
+import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import {
   ChartConfigWithDateRange,
   DateRange,

packages/app/src/components/KubernetesFilters.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { tcFromSource } from '@hyperdx/common-utils/dist/metadata';
+import { tcFromSource } from '@hyperdx/common-utils/dist/core/metadata';
 import {
   ChartConfigWithDateRange,
   TSource,

packages/app/src/components/SQLInlineEditor.tsx

@@ -12,7 +12,7 @@ import { sql, SQLDialect } from '@codemirror/lang-sql';
 import {
   Field,
   TableConnectionChoice,
-} from '@hyperdx/common-utils/dist/metadata';
+} from '@hyperdx/common-utils/dist/core/metadata';
 import { Flex, Paper, Text, Tooltip } from '@mantine/core';
 import { IconInfoCircle } from '@tabler/icons-react';
 import CodeMirror, {

packages/app/src/components/Search/DBSearchHeatmapChart.tsx

@@ -5,7 +5,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import {
   TableConnection,
   tcFromSource,
-} from '@hyperdx/common-utils/dist/metadata';
+} from '@hyperdx/common-utils/dist/core/metadata';
 import {
   ChartConfigWithDateRange,
   DisplayType,

packages/app/src/hdxMTViews.ts

@@ -9,7 +9,7 @@ import {
   isNonEmptyWhereExpr,
   isUsingGroupBy,
   renderChartConfig,
-} from '@hyperdx/common-utils/dist/renderChartConfig';
+} from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import {
   AggregateFunction,
   ChartConfigWithOptDateRange,

packages/app/src/hooks/__tests__/useAutoCompleteOptions.test.tsx

@@ -1,5 +1,5 @@
 import { JSDataType } from '@hyperdx/common-utils/dist/clickhouse';
-import { Field } from '@hyperdx/common-utils/dist/metadata';
+import { Field } from '@hyperdx/common-utils/dist/core/metadata';
 import { renderHook } from '@testing-library/react';
 
 import { LuceneLanguageFormatter } from '../../SearchInputV2';

packages/app/src/hooks/__tests__/useMetadata.test.tsx

@@ -1,7 +1,10 @@
 import React from 'react';
 import * as metadataModule from '@hyperdx/app/src/metadata';
 import { ClickhouseClient } from '@hyperdx/common-utils/dist/clickhouse/browser';
-import { Metadata, MetadataCache } from '@hyperdx/common-utils/dist/metadata';
+import {
+  Metadata,
+  MetadataCache,
+} from '@hyperdx/common-utils/dist/core/metadata';
 import { ChartConfigWithDateRange } from '@hyperdx/common-utils/dist/types';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { renderHook, waitFor } from '@testing-library/react';

packages/app/src/hooks/__tests__/useOffsetPaginatedQuery.test.tsx

@@ -28,13 +28,13 @@ jest.mock('@hyperdx/app/src/metadata', () => ({
 }));
 
 // Mock the renderChartConfig function
-jest.mock('@hyperdx/common-utils/dist/renderChartConfig', () => ({
+jest.mock('@hyperdx/common-utils/dist/core/renderChartConfig', () => ({
   renderChartConfig: jest.fn(),
 }));
 
 // Import mocked modules after jest.mock calls
 import { getClickhouseClient } from '@hyperdx/app/src/clickhouse';
-import { renderChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
+import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
 
 // Create a mock ChartConfig based on the Zod schema
 const createMockChartConfig = (

packages/app/src/hooks/useAutoCompleteOptions.tsx

@@ -1,5 +1,8 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Field, TableConnection } from '@hyperdx/common-utils/dist/metadata';
+import {
+  Field,
+  TableConnection,
+} from '@hyperdx/common-utils/dist/core/metadata';
 import { ChartConfigWithDateRange } from '@hyperdx/common-utils/dist/types';
 
 import {

packages/app/src/hooks/useChartConfig.tsx

@@ -10,7 +10,7 @@ import {
   isMetricChartConfig,
   isUsingGranularity,
   renderChartConfig,
-} from '@hyperdx/common-utils/dist/renderChartConfig';
+} from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import { format } from '@hyperdx/common-utils/dist/sqlFormatter';
 import {
   ChartConfigWithDateRange,

packages/app/src/hooks/useExplainQuery.tsx

@@ -1,4 +1,4 @@
-import { renderChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
+import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import { ChartConfigWithDateRange } from '@hyperdx/common-utils/dist/types';
 import { useQuery, UseQueryOptions } from '@tanstack/react-query';
 

packages/app/src/hooks/useMetadata.tsx

@@ -9,7 +9,7 @@ import {
   Field,
   TableConnection,
   TableMetadata,
-} from '@hyperdx/common-utils/dist/metadata';
+} from '@hyperdx/common-utils/dist/core/metadata';
 import { ChartConfigWithDateRange } from '@hyperdx/common-utils/dist/types';
 import {
   keepPreviousData,

packages/app/src/hooks/useOffsetPaginatedQuery.tsx

@@ -6,12 +6,12 @@ import {
   ClickHouseQueryError,
   ColumnMetaType,
 } from '@hyperdx/common-utils/dist/clickhouse';
-import { renderChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
-import { ChartConfigWithOptTimestamp } from '@hyperdx/common-utils/dist/types';
+import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import {
   isFirstOrderByAscending,
   isTimestampExpressionInFirstOrderBy,
-} from '@hyperdx/common-utils/dist/utils';
+} from '@hyperdx/common-utils/dist/core/utils';
+import { ChartConfigWithOptTimestamp } from '@hyperdx/common-utils/dist/types';
 import {
   QueryClient,
   QueryFunction,

packages/app/src/metadata.ts

@@ -1,4 +1,4 @@
-import { getMetadata as _getMetadata } from '@hyperdx/common-utils/dist/metadata';
+import { getMetadata as _getMetadata } from '@hyperdx/common-utils/dist/core/metadata';
 
 import { getClickhouseClient } from '@/clickhouse';
 

packages/app/src/sessions.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import produce from 'immer';
 import type { ResponseJSON } from '@hyperdx/common-utils/dist/clickhouse';
 import { chSql } from '@hyperdx/common-utils/dist/clickhouse';
-import { renderChartConfig } from '@hyperdx/common-utils/dist/renderChartConfig';
+import { renderChartConfig } from '@hyperdx/common-utils/dist/core/renderChartConfig';
 import {
   DateRange,
   SearchCondition,

packages/app/src/source.ts

@@ -9,16 +9,16 @@ import {
   filterColumnMetaByType,
   JSDataType,
 } from '@hyperdx/common-utils/dist/clickhouse';
+import {
+  hashCode,
+  splitAndTrimWithBracket,
+} from '@hyperdx/common-utils/dist/core/utils';
 import {
   MetricsDataType,
   SourceKind,
   TSource,
   TSourceUnion,
 } from '@hyperdx/common-utils/dist/types';
-import {
-  hashCode,
-  splitAndTrimWithBracket,
-} from '@hyperdx/common-utils/dist/utils';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 
 import { hdxServer } from '@/api';

packages/app/src/timeQuery.ts

@@ -24,8 +24,8 @@ import {
   useQueryParams,
   withDefault,
 } from 'use-query-params';
+import { formatDate } from '@hyperdx/common-utils/dist/core/utils';
 import { DateRange } from '@hyperdx/common-utils/dist/types';
-import { formatDate } from '@hyperdx/common-utils/dist/utils';
 
 import { parseTimeRangeInput } from './components/TimePicker/utils';
 import { useUserPreferences } from './useUserPreferences';

packages/app/src/useFormatTime.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { formatDate } from '@hyperdx/common-utils/dist/utils';
+import { formatDate } from '@hyperdx/common-utils/dist/core/utils';
 
 import { useUserPreferences } from './useUserPreferences';
 

packages/common-utils/src/__tests__/metadata.int.test.ts

@@ -2,7 +2,7 @@ import { createClient } from '@clickhouse/client';
 import { ClickHouseClient } from '@clickhouse/client-common';
 
 import { ClickhouseClient as HdxClickhouseClient } from '@/clickhouse/node';
-import { Metadata, MetadataCache } from '@/metadata';
+import { Metadata, MetadataCache } from '@/core/metadata';
 import { ChartConfigWithDateRange } from '@/types';
 
 describe('Metadata Integration Tests', () => {

packages/common-utils/src/__tests__/metadata.test.ts

@@ -1,6 +1,6 @@
 import { ClickhouseClient } from '../clickhouse/node';
-import { Metadata, MetadataCache } from '../metadata';
-import * as renderChartConfigModule from '../renderChartConfig';
+import { Metadata, MetadataCache } from '../core/metadata';
+import * as renderChartConfigModule from '../core/renderChartConfig';
 import { ChartConfigWithDateRange } from '../types';
 
 // Mock ClickhouseClient
@@ -14,7 +14,7 @@ const mockCache = {
   set: jest.fn(),
 } as any;
 
-jest.mock('../renderChartConfig', () => ({
+jest.mock('../core/renderChartConfig', () => ({
   renderChartConfig: jest
     .fn()
     .mockResolvedValue({ sql: 'SELECT 1', params: {} }),

packages/common-utils/src/__tests__/queryParser.test.ts

@@ -1,5 +1,5 @@
 import { ClickhouseClient } from '@/clickhouse/node';
-import { getMetadata } from '@/metadata';
+import { getMetadata } from '@/core/metadata';
 import { CustomSchemaSQLSerializerV2 } from '@/queryParser';
 
 describe('CustomSchemaSQLSerializerV2 - json', () => {

packages/common-utils/src/__tests__/renderChartConfig.test.ts

@@ -1,12 +1,12 @@
 import { chSql, ColumnMeta, parameterizedQueryToSql } from '@/clickhouse';
-import { Metadata } from '@/metadata';
+import { Metadata } from '@/core/metadata';
 import {
   ChartConfigWithOptDateRange,
   DisplayType,
   MetricsDataType,
 } from '@/types';
 
-import { renderChartConfig, timeFilterExpr } from '../renderChartConfig';
+import { renderChartConfig, timeFilterExpr } from '../core/renderChartConfig';
 
 describe('renderChartConfig', () => {
   let mockMetadata: jest.Mocked<Metadata>;

packages/common-utils/src/__tests__/utils.test.ts

@@ -21,7 +21,7 @@ import {
   replaceJsonExpressions,
   splitAndTrimCSV,
   splitAndTrimWithBracket,
-} from '../utils';
+} from '../core/utils';
 
 describe('utils', () => {
   describe('formatDate', () => {

packages/common-utils/src/clickhouse/index.ts

@@ -11,18 +11,18 @@ import type { ClickHouseClient as WebClickHouseClient } from '@clickhouse/client
 import * as SQLParser from 'node-sql-parser';
 import objectHash from 'object-hash';
 
-import { Metadata } from '@/metadata';
+import { Metadata } from '@/core/metadata';
 import {
   renderChartConfig,
   setChartSelectsAlias,
   splitChartConfigs,
-} from '@/renderChartConfig';
-import { ChartConfigWithOptDateRange } from '@/types';
+} from '@/core/renderChartConfig';
 import {
   hashCode,
   replaceJsonExpressions,
   splitAndTrimWithBracket,
-} from '@/utils';
+} from '@/core/utils';
+import { ChartConfigWithOptDateRange } from '@/types';
 
 // export @clickhouse/client-common types
 export type {

packages/common-utils/src/core/metadata.ts

@@ -11,7 +11,7 @@ import {
   JSDataType,
   tableExpr,
 } from '@/clickhouse';
-import { renderChartConfig } from '@/renderChartConfig';
+import { renderChartConfig } from '@/core/renderChartConfig';
 import type { ChartConfig, ChartConfigWithDateRange, TSource } from '@/types';
 
 // If filters initially are taking too long to load, decrease this number.

packages/common-utils/src/core/renderChartConfig.ts

@@ -3,7 +3,7 @@ import * as SQLParser from 'node-sql-parser';
 import SqlString from 'sqlstring';
 
 import { ChSql, chSql, concatChSql, wrapChSqlIfNotEmpty } from '@/clickhouse';
-import { Metadata } from '@/metadata';
+import { Metadata } from '@/core/metadata';
 import { CustomSchemaSQLSerializerV2, SearchQueryBuilder } from '@/queryParser';
 
 /**
@@ -20,6 +20,14 @@ function createMetricNameFilter(
   }
   return SqlString.format('MetricName = ?', [metricName]);
 }
+import {
+  convertDateRangeToGranularityString,
+  convertGranularityToSeconds,
+  getFirstTimestampValueExpression,
+  optimizeTimestampValueExpression,
+  parseToStartOfFunction,
+  splitAndTrimWithBracket,
+} from '@/core/utils';
 import {
   AggregateFunction,
   AggregateFunctionWithCombinators,
@@ -38,14 +46,6 @@ import {
   SqlAstFilter,
   SQLInterval,
 } from '@/types';
-import {
-  convertDateRangeToGranularityString,
-  convertGranularityToSeconds,
-  getFirstTimestampValueExpression,
-  optimizeTimestampValueExpression,
-  parseToStartOfFunction,
-  splitAndTrimWithBracket,
-} from '@/utils';
 
 /** The default maximum number of buckets setting when determining a bucket duration for 'auto' granularity */
 export const DEFAULT_AUTO_GRANULARITY_MAX_BUCKETS = 60;

packages/common-utils/src/queryParser.ts

@@ -2,8 +2,8 @@ import lucene from '@hyperdx/lucene';
 import SqlString from 'sqlstring';
 
 import { convertCHTypeToPrimitiveJSType, JSDataType } from '@/clickhouse';
-import { Metadata } from '@/metadata';
-import { splitAndTrimWithBracket } from '@/utils';
+import { Metadata } from '@/core/metadata';
+import { splitAndTrimWithBracket } from '@/core/utils';
 
 function encodeSpecialTokens(query: string): string {
   return query