Move entity types to @/core (#767)

packages/graph-explorer/src/components/Graph/hooks/useRenderBadges.ts

@@ -1,5 +1,5 @@
 import { useEffect, useRef } from "react";
-import { Vertex } from "@/@types/entities";
+import { Vertex } from "@/core";
 import { DrawBoxWithAdornmentOptions } from "@/components/utils";
 import drawBoxWithAdornment from "@/components/utils/canvas/drawBoxWithAdornment";
 import type {

packages/graph-explorer/src/connector/gremlin/fetchNeighbors/index.test.ts

@@ -1,7 +1,7 @@
 import globalMockFetch from "@/connector/testUtils/globalMockFetch";
 import mockGremlinFetch from "@/connector/testUtils/mockGremlinFetch";
 import fetchNeighbors from ".";
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 
 describe("Gremlin > fetchNeighbors", () => {
   beforeEach(globalMockFetch);

packages/graph-explorer/src/connector/gremlin/fetchNeighbors/oneHopTemplate.test.ts

@@ -1,6 +1,6 @@
 import { normalizeWithNoSpace as normalize } from "@/utils/testing";
 import oneHopTemplate from "./oneHopTemplate";
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 
 describe("Gremlin > oneHopTemplate", () => {
   it("Should return a template for a simple vertex id", () => {

packages/graph-explorer/src/connector/gremlin/fetchNeighborsCount/index.test.ts

@@ -1,7 +1,7 @@
 import globalMockFetch from "@/connector/testUtils/globalMockFetch";
 import mockGremlinFetch from "@/connector/testUtils/mockGremlinFetch";
 import fetchNeighborsCount from ".";
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 
 describe("Gremlin > fetchNeighborsCount", () => {
   beforeEach(globalMockFetch);

packages/graph-explorer/src/connector/gremlin/fetchNeighborsCount/neighborsCountTemplate.test.ts

@@ -1,4 +1,4 @@
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 import neighborsCountTemplate from "./neighborsCountTemplate";
 import { normalizeWithNoSpace as normalize } from "@/utils/testing";
 

packages/graph-explorer/src/connector/gremlin/mappers/detectIdType.ts

@@ -1,4 +1,4 @@
-import { EntityIdType } from "@/@types/entities";
+import { EntityIdType } from "@/core";
 import { GInt64, JanusID } from "../types";
 import { isJanusID } from "./toStringId";
 

packages/graph-explorer/src/connector/gremlin/mappers/mapApiEdge.ts

@@ -1,4 +1,4 @@
-import type { Edge, EdgeId, VertexId } from "@/@types/entities";
+import type { Edge, EdgeId, VertexId } from "@/core";
 import type { GEdge } from "../types";
 import parseEdgePropertiesValues from "./parseEdgePropertiesValues";
 import toStringId from "./toStringId";

packages/graph-explorer/src/connector/gremlin/mappers/mapApiVertex.ts

@@ -1,4 +1,4 @@
-import type { Vertex, VertexId } from "@/@types/entities";
+import type { Vertex, VertexId } from "@/core";
 import type { GVertex } from "../types";
 import { detectIdType } from "./detectIdType";
 import parsePropertiesValues from "./parsePropertiesValues";

packages/graph-explorer/src/connector/gremlin/mappers/mapResults.ts

@@ -1,4 +1,4 @@
-import { Vertex, Edge } from "@/@types/entities";
+import { Vertex, Edge } from "@/core";
 import { GAnyValue } from "../types";
 import mapApiEdge from "./mapApiEdge";
 import mapApiVertex from "./mapApiVertex";

packages/graph-explorer/src/connector/openCypher/fetchNeighbors/oneHopTemplate.test.ts

@@ -1,6 +1,6 @@
 import { normalize } from "@/utils/testing";
 import oneHopTemplate from "./oneHopTemplate";
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 
 describe("OpenCypher > oneHopTemplate", () => {
   it("Should return a template for a simple vertex id", () => {

packages/graph-explorer/src/connector/openCypher/fetchNeighborsCount/neighborsCountTemplate.test.ts

@@ -1,6 +1,6 @@
 import { normalize } from "@/utils/testing";
 import neighborsCountTemplate from "./neighborsCountTemplate";
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 
 describe("OpenCypher > neighborsCountTemplate", () => {
   it("Should return a template for the given vertex id", () => {

packages/graph-explorer/src/connector/openCypher/keywordSearch/index.ts

@@ -1,4 +1,4 @@
-import { Vertex } from "@/@types/entities";
+import { Vertex } from "@/core";
 import type {
   ErrorResponse,
   KeywordSearchRequest,

packages/graph-explorer/src/connector/openCypher/mappers/mapApiEdge.ts

@@ -1,4 +1,4 @@
-import type { Edge, EdgeId, VertexId } from "@/@types/entities";
+import type { Edge, EdgeId, VertexId } from "@/core";
 import type { OCEdge } from "../types";
 
 const mapApiEdge = (

packages/graph-explorer/src/connector/openCypher/mappers/mapApiVertex.test.ts

@@ -1,5 +1,5 @@
 import mapApiVertex from "./mapApiVertex";
-import { Vertex, VertexId } from "@/@types/entities";
+import { Vertex, VertexId } from "@/core";
 
 test("maps empty vertex", () => {
   const input = {

packages/graph-explorer/src/connector/openCypher/mappers/mapApiVertex.ts

@@ -1,4 +1,4 @@
-import type { Vertex, VertexId } from "@/@types/entities";
+import type { Vertex, VertexId } from "@/core";
 import type { OCVertex } from "../types";
 
 export default function mapApiVertex(apiVertex: OCVertex): Vertex {

packages/graph-explorer/src/connector/queries.ts

@@ -11,7 +11,7 @@ import {
   VertexDetailsResponse,
   VertexRef,
 } from "./useGEFetchTypes";
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 
 /**
  * Performs a search with the provided parameters.

packages/graph-explorer/src/connector/sparql/edgeDetails.ts

@@ -1,4 +1,4 @@
-import { Edge } from "@/@types/entities";
+import { Edge } from "@/core";
 import { EdgeDetailsRequest, EdgeDetailsResponse } from "../useGEFetchTypes";
 import {
   parseEdgeId,

packages/graph-explorer/src/connector/sparql/fetchNeighbors/index.ts

@@ -1,5 +1,5 @@
 import groupBy from "lodash/groupBy";
-import { Edge } from "@/@types/entities";
+import { Edge } from "@/core";
 import type { NeighborsResponse } from "@/connector/useGEFetchTypes";
 import mapIncomingToEdge, {
   IncomingPredicate,

packages/graph-explorer/src/connector/sparql/mappers/mapIncomingToEdge.ts

@@ -1,4 +1,4 @@
-import { Edge, EdgeId, VertexId } from "@/@types/entities";
+import { Edge, EdgeId, VertexId } from "@/core";
 import { RawValue } from "../types";
 
 export type IncomingPredicate = {

packages/graph-explorer/src/connector/sparql/mappers/mapOutgoingToEdge.ts

@@ -1,4 +1,4 @@
-import { Edge, EdgeId, VertexId } from "@/@types/entities";
+import { Edge, EdgeId, VertexId } from "@/core";
 import { RawValue } from "../types";
 
 export type OutgoingPredicate = {

packages/graph-explorer/src/connector/sparql/mappers/mapRawResultToVertex.ts

@@ -1,4 +1,4 @@
-import { Vertex, VertexId } from "@/@types/entities";
+import { Vertex, VertexId } from "@/core";
 import { RawResult } from "../types";
 
 const mapRawResultToVertex = (rawResult: RawResult): Vertex => {

packages/graph-explorer/src/connector/sparql/types.test.ts

@@ -1,4 +1,4 @@
-import { EdgeId } from "@/@types/entities";
+import { EdgeId } from "@/core";
 import { parseEdgeId } from "./types";
 
 test("parseEdgeId", () => {

packages/graph-explorer/src/connector/sparql/types.ts

@@ -1,4 +1,4 @@
-import { Edge, EdgeId, Vertex, VertexId } from "@/types/entities";
+import { Edge, EdgeId, Vertex, VertexId } from "@/core";
 import type { NeighborsCountResponse } from "../useGEFetchTypes";
 import { z } from "zod";
 import { logger } from "@/utils";

packages/graph-explorer/src/connector/sparql/vertexDetails.ts

@@ -12,7 +12,7 @@ import {
   SparqlValue,
 } from "./types";
 import { z } from "zod";
-import { Vertex, VertexId } from "@/@types/entities";
+import { Vertex, VertexId } from "@/core";
 import isErrorResponse from "../utils/isErrorResponse";
 
 const bindingSchema = z.object({

packages/graph-explorer/src/connector/useGEFetchTypes.ts

@@ -5,13 +5,7 @@ import {
 } from "@/core";
 import { ConnectionConfig } from "@shared/types";
 import { MappedQueryResults } from "./gremlin/mappers/mapResults";
-import {
-  Edge,
-  EdgeId,
-  Vertex,
-  VertexId,
-  EntityIdType,
-} from "@/@types/entities";
+import { Edge, EdgeId, Vertex, VertexId, EntityIdType } from "@/core";
 
 export type QueryOptions = RequestInit & {
   queryId?: string;

packages/graph-explorer/src/core/StateProvider/displayAttribute.ts

@@ -1,4 +1,4 @@
-import { Vertex, Edge } from "@/@types/entities";
+import { Vertex, Edge } from "@/core";
 import { MISSING_DISPLAY_VALUE, formatDate } from "@/utils";
 import { TextTransformer } from "@/hooks";
 import { AttributeConfig } from "@/core";

packages/graph-explorer/src/core/StateProvider/displayEdge.test.ts

@@ -1,4 +1,4 @@
-import { Edge } from "@/@types/entities";
+import { Edge } from "@/core";
 import {
   createRandomEdge,
   createRandomEdgeTypeConfig,

packages/graph-explorer/src/core/StateProvider/displayEdge.ts

@@ -1,4 +1,4 @@
-import { Edge, EdgeId, EntityIdType, VertexId } from "@/@types/entities";
+import { Edge, EdgeId, EntityIdType, VertexId } from "@/core";
 import { selector, selectorFamily, useRecoilValue } from "recoil";
 import { textTransformSelector } from "@/hooks";
 import {

packages/graph-explorer/src/core/StateProvider/displayVertex.test.ts

@@ -6,7 +6,7 @@ import {
   renderHookWithRecoilRoot,
 } from "@/utils/testing";
 import { useDisplayVertexFromVertex } from "./displayVertex";
-import { Vertex, VertexId } from "@/@types/entities";
+import { Vertex, VertexId } from "@/core";
 import { formatDate, sanitizeText } from "@/utils";
 import { Schema } from "../ConfigurationProvider";
 import { MutableSnapshot } from "recoil";

packages/graph-explorer/src/core/StateProvider/displayVertex.ts

@@ -1,5 +1,5 @@
 import { selector, selectorFamily, useRecoilValue } from "recoil";
-import { Vertex, VertexId, EntityIdType } from "@/@types/entities";
+import { Vertex, VertexId, EntityIdType } from "@/core";
 import {
   DisplayAttribute,
   getSortedDisplayAttributes,

packages/graph-explorer/src/core/StateProvider/edges.ts

@@ -1,5 +1,5 @@
 import { atom, selector, selectorFamily } from "recoil";
-import type { Edge, EdgeId } from "@/types/entities";
+import type { Edge, EdgeId } from "@/core";
 import isDefaultValue from "./isDefaultValue";
 import { nodesFilteredIdsAtom, nodesTypesFilteredAtom } from "./nodes";
 

packages/graph-explorer/src/core/StateProvider/entitiesSelector.ts

@@ -2,7 +2,7 @@ import isEqual from "lodash/isEqual";
 import isEqualWith from "lodash/isEqualWith";
 import type { GetRecoilValue, RecoilState, SetRecoilState } from "recoil";
 import { selector } from "recoil";
-import type { Edge, EdgeId, Vertex, VertexId } from "@/types/entities";
+import type { Edge, EdgeId, Vertex, VertexId } from "@/core";
 import {
   edgesAtom,
   edgesSelectedIdsAtom,

packages/graph-explorer/src/core/StateProvider/neighbors.test.ts

@@ -1,4 +1,4 @@
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 import { calculateNeighbors, useNeighbors } from "./neighbors";
 import {
   createRandomVertex,

packages/graph-explorer/src/core/StateProvider/neighbors.ts

@@ -1,4 +1,4 @@
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 import { selectorFamily, useRecoilCallback, useRecoilValue } from "recoil";
 import { edgesAtom } from "./edges";
 import { nodesAtom } from "./nodes";

packages/graph-explorer/src/core/StateProvider/nodes.ts

@@ -1,5 +1,5 @@
 import { atom, selector, selectorFamily, useRecoilValue } from "recoil";
-import type { Vertex, VertexId } from "@/types/entities";
+import type { Vertex, VertexId } from "@/core";
 import isDefaultValue from "./isDefaultValue";
 
 export function toNodeMap(nodes: Vertex[]): Map<VertexId, Vertex> {

packages/graph-explorer/src/core/StateProvider/schema.ts

@@ -7,7 +7,7 @@ import {
 import localForageEffect from "./localForageEffect";
 import { activeConfigurationAtom } from "./configuration";
 import isDefaultValue from "./isDefaultValue";
-import { Edge, Vertex } from "@/@types/entities";
+import { Edge, Vertex } from "@/core";
 import { sanitizeText } from "@/utils";
 import { Entities } from "./entitiesSelector";
 

packages/graph-explorer/src/core/index.ts

@@ -3,3 +3,4 @@ export * from "./ThemeProvider";
 export * from "./featureFlags";
 export * from "./StateProvider";
 export * from "./connector";
+export * from "./entities";

packages/graph-explorer/src/hooks/useAddToGraph.ts

@@ -1,4 +1,4 @@
-import { Edge, Vertex } from "@/types/entities";
+import { Edge, Vertex } from "@/core";
 import { toNodeMap } from "@/core/StateProvider/nodes";
 import { toEdgeMap } from "@/core/StateProvider/edges";
 import entitiesSelector from "@/core/StateProvider/entitiesSelector";

packages/graph-explorer/src/hooks/useEntities.test.tsx

@@ -1,6 +1,6 @@
 import { useRecoilValue } from "recoil";
 import useEntities from "./useEntities";
-import { Edge, Vertex, VertexId } from "@/types/entities";
+import { Edge, Vertex, VertexId } from "@/core";
 import {
   createRandomEdge,
   createRandomEntities,

packages/graph-explorer/src/hooks/useExpandNode.tsx

@@ -14,7 +14,7 @@ import {
 import useEntities from "./useEntities";
 import { useRecoilValue } from "recoil";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { Vertex } from "@/types/entities";
+import { Vertex } from "@/core";
 import { createDisplayError } from "@/utils/createDisplayError";
 import { toNodeMap } from "@/core/StateProvider/nodes";
 import { toEdgeMap } from "@/core/StateProvider/edges";

packages/graph-explorer/src/hooks/useHasVertexBeenAddedToGraph.ts

@@ -1,4 +1,4 @@
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 import { nodesAtom } from "@/core";
 import { useRecoilValue } from "recoil";
 

packages/graph-explorer/src/hooks/useNeighborsOptions.ts

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { Vertex } from "@/types/entities";
+import { Vertex } from "@/core";
 import { SelectOption } from "@/components";
 import {
   DisplayVertexTypeConfig,

packages/graph-explorer/src/hooks/useRemoveFromGraph.ts

@@ -1,4 +1,4 @@
-import { EdgeId, VertexId } from "@/types/entities";
+import { EdgeId, VertexId } from "@/core";
 import useEntities from "./useEntities";
 
 export function useRemoveNodeFromGraph(nodeId: VertexId) {

packages/graph-explorer/src/modules/GraphViewer/GraphViewer.tsx

@@ -1,6 +1,6 @@
 import { MouseEvent, useCallback, useMemo, useRef, useState } from "react";
 import { useRecoilState, useRecoilValue } from "recoil";
-import { EdgeId, Vertex, VertexId } from "@/types/entities";
+import { EdgeId, Vertex, VertexId } from "@/core";
 import {
   Panel,
   PanelContent,

packages/graph-explorer/src/modules/GraphViewer/internalComponents/ContextMenu.tsx

@@ -28,7 +28,7 @@ import {
 } from "@/core/StateProvider/userPreferences";
 import { useEntities, useTranslations } from "@/hooks";
 import useGraphGlobalActions from "../useGraphGlobalActions";
-import { EdgeId, VertexId } from "@/@types/entities";
+import { EdgeId, VertexId } from "@/core";
 import { MinusCircleIcon } from "lucide-react";
 
 export type ContextMenuProps = {

packages/graph-explorer/src/modules/GraphViewer/useContextMenu.ts

@@ -1,6 +1,6 @@
 import { useCallback, useRef, useState } from "react";
 import { useLayer, useMousePositionAsTrigger } from "react-laag";
-import type { Edge, EdgeId, Vertex, VertexId } from "@/types/entities";
+import type { Edge, EdgeId, Vertex, VertexId } from "@/core";
 import type {
   ElementEventCallback,
   GraphEventCallback,

packages/graph-explorer/src/modules/GraphViewer/useGraphStyles.ts

@@ -1,6 +1,6 @@
 import Color from "color";
 import { useEffect, useState } from "react";
-import { EdgeId } from "@/types/entities";
+import { EdgeId } from "@/core";
 import type { GraphProps } from "@/components";
 import useTextTransform from "@/hooks/useTextTransform";
 import { renderNode } from "./renderNode";

packages/graph-explorer/src/modules/GraphViewer/useNodeBadges.ts

@@ -1,6 +1,6 @@
 import { useCallback } from "react";
 import { BadgeRenderer } from "@/components/Graph/hooks/useRenderBadges";
-import { VertexId } from "@/@types/entities";
+import { VertexId } from "@/core";
 import { useDisplayVerticesInCanvas } from "@/core";
 import { useAllNeighbors } from "@/core";
 

packages/graph-explorer/src/modules/NodeExpand/NodeExpandContent.tsx

@@ -1,5 +1,5 @@
 import { useState } from "react";
-import type { Vertex, VertexId } from "@/types/entities";
+import type { Vertex, VertexId } from "@/core";
 import { PanelError, PanelFooter, VertexRow } from "@/components";
 import Button from "@/components/Button";
 import ExpandGraphIcon from "@/components/icons/ExpandGraphIcon";

packages/graph-explorer/src/modules/SearchSidebar/NodeSearchResult.tsx

@@ -1,4 +1,4 @@
-import { Vertex } from "@/@types/entities";
+import { Vertex } from "@/core";
 import {
   Button,
   Tooltip,

packages/graph-explorer/src/modules/common/NeighborsList/NeighborsList.tsx

@@ -1,5 +1,5 @@
 import { cn } from "@/utils";
-import { Vertex, VertexId } from "@/@types/entities";
+import { Vertex, VertexId } from "@/core";
 import {
   Button,
   Chip,

packages/graph-explorer/src/utils/testing/DbState.ts

@@ -1,4 +1,4 @@
-import { Vertex } from "@/@types/entities";
+import { Vertex } from "@/core";
 import {
   activeConfigurationAtom,
   configurationAtom,

packages/graph-explorer/src/utils/testing/randomData.ts

@@ -6,7 +6,7 @@ import {
   Schema,
   VertexTypeConfig,
 } from "@/core";
-import { Edge, EdgeId, Vertex, VertexId } from "@/types/entities";
+import { Edge, EdgeId, Vertex, VertexId } from "@/core";
 import { Entities } from "@/core/StateProvider/entitiesSelector";
 import {
   createArray,

packages/graph-explorer/src/workspaces/DataExplorer/DataExplorer.tsx

@@ -8,7 +8,7 @@ import {
 } from "@tanstack/react-query";
 import { Link, useNavigate, useParams, useSearchParams } from "react-router";
 import { useRecoilValue, useSetRecoilState } from "recoil";
-import { Vertex } from "@/types/entities";
+import { Vertex } from "@/core";
 import {
   CheckIcon,
   ChevronLeftIcon,