Skip to content

Commit 4ca34a8

Browse files
tstirrat15tstirrat15
authored
chore: add import sorting (#102)
1 parent 026605f commit 4ca34a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+299
-193
lines changed

‎.oxfmtrc.jsonc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
{
22
"$schema": "./node_modules/oxfmt/configuration_schema.json",
33
"ignorePatterns": ["src/spicedb-common/protodefs", "examples", "public"],
4+
"experimentalSortImports": {
5+
"groups": [
6+
["side-effect"],
7+
["builtin"],
8+
["external", "type-external"],
9+
["internal", "type-internal"],
10+
["parent", "type-parent"],
11+
["sibling", "type-sibling"],
12+
["index", "type-index"],
13+
],
14+
},
415
}

‎api/share.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { createHash } from "crypto";
2+
13
import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
24
import type { VercelRequest, VercelResponse } from "@vercel/node";
3-
import { createHash } from "crypto";
45

56
const encodeURL = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
67

‎eslint.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import js from "@eslint/js";
2-
import globals from "globals";
32
import reactHooks from "eslint-plugin-react-hooks";
43
import reactRefresh from "eslint-plugin-react-refresh";
4+
import globals from "globals";
55
import tseslint from "typescript-eslint";
66

77
export default tseslint.config(

‎src/App.tsx‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
import { ConfirmDialogProvider } from "./playground-ui/ConfirmDialogProvider";
2-
import { useGoogleAnalytics } from "./playground-ui/GoogleAnalyticsHook";
3-
import PlaygroundUIThemed from "./playground-ui/PlaygroundUIThemed";
41
import "react-reflex/styles.css";
52
import "typeface-roboto-mono/index.css"; // Import the Roboto Mono font.
63
import "./App.css";
7-
import { EmbeddedPlayground } from "./components/EmbeddedPlayground";
8-
import { FullPlayground } from "./components/FullPlayground";
9-
import { InlinePlayground } from "./components/InlinePlayground";
10-
import AppConfig from "./services/configservice";
11-
import { PLAYGROUND_UI_COLORS } from "./theme";
12-
import { ThemeProvider } from "@/components/ThemeProvider";
4+
5+
import { PostHogProvider } from "@posthog/react";
136
import {
147
Outlet,
158
RouterProvider,
@@ -18,9 +11,19 @@ import {
1811
createRootRoute,
1912
} from "@tanstack/react-router";
2013
import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
21-
import { Toaster } from "./components/ui/sonner";
2214
import posthog from "posthog-js";
23-
import { PostHogProvider } from "@posthog/react";
15+
16+
import { ThemeProvider } from "@/components/ThemeProvider";
17+
18+
import { EmbeddedPlayground } from "./components/EmbeddedPlayground";
19+
import { FullPlayground } from "./components/FullPlayground";
20+
import { InlinePlayground } from "./components/InlinePlayground";
21+
import { Toaster } from "./components/ui/sonner";
22+
import { ConfirmDialogProvider } from "./playground-ui/ConfirmDialogProvider";
23+
import { useGoogleAnalytics } from "./playground-ui/GoogleAnalyticsHook";
24+
import PlaygroundUIThemed from "./playground-ui/PlaygroundUIThemed";
25+
import AppConfig from "./services/configservice";
26+
import { PLAYGROUND_UI_COLORS } from "./theme";
2427

2528
const rootRoute = createRootRoute({
2629
component: () => (

‎src/components/CheckDebugTraceView.tsx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
import {
2-
CaveatEvalInfo,
3-
CaveatEvalInfo_Result,
4-
CheckDebugTrace,
5-
CheckDebugTrace_Permissionship,
6-
CheckDebugTrace_PermissionType,
7-
} from "../spicedb-common/protodefs/authzed/api/v1/debug_pb";
81
import type { JsonObject, JsonValue } from "@bufbuild/protobuf";
92
import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
103
import CheckCircleIcon from "@material-ui/icons/CheckCircle";
@@ -15,7 +8,15 @@ import HighlightOffIcon from "@material-ui/icons/HighlightOff";
158
import TreeItem from "@material-ui/lab/TreeItem";
169
import TreeView from "@material-ui/lab/TreeView";
1710
import clsx from "clsx";
11+
1812
import { LocalParseService } from "../services/localparse";
13+
import {
14+
CaveatEvalInfo,
15+
CaveatEvalInfo_Result,
16+
CheckDebugTrace,
17+
CheckDebugTrace_Permissionship,
18+
CheckDebugTrace_PermissionType,
19+
} from "../spicedb-common/protodefs/authzed/api/v1/debug_pb";
1920

2021
const useStyles = makeStyles((theme: Theme) =>
2122
createStyles({

‎src/components/DatastoreRelationshipEditor.tsx‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
import {
2-
RelationTupleHighlight,
3-
RelationshipEditor,
4-
} from "../spicedb-common/components/relationshipeditor/RelationshipEditor";
1+
import { Theme } from "@glideapps/glide-data-grid";
2+
import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
3+
import { useCallback, useMemo, useState } from "react";
4+
import useDeepCompareEffect from "use-deep-compare-effect";
5+
6+
import { DataStore, DataStoreItemKind } from "../services/datastore";
7+
import { Services } from "../services/services";
58
import { CommentCellPrefix } from "../spicedb-common/components/relationshipeditor/columns";
69
import {
710
RelationshipDatum,
811
relationshipToDatum,
912
toFullRelationshipString,
1013
} from "../spicedb-common/components/relationshipeditor/data";
14+
import {
15+
RelationTupleHighlight,
16+
RelationshipEditor,
17+
} from "../spicedb-common/components/relationshipeditor/RelationshipEditor";
1118
import { RelationshipOrComment, parseRelationshipsAndComments } from "../spicedb-common/parsing";
1219
import {
1320
DeveloperError,
1421
DeveloperError_Source,
1522
} from "../spicedb-common/protodefs/developer/v1/developer_pb";
16-
import { Theme } from "@glideapps/glide-data-grid";
17-
import { useCallback, useMemo, useState } from "react";
18-
import useDeepCompareEffect from "use-deep-compare-effect";
19-
import { DataStore, DataStoreItemKind } from "../services/datastore";
20-
import { Services } from "../services/services";
21-
import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
2223

2324
const partialRelationshipCommentPrefix = "partial relationship: ";
2425

‎src/components/EditorDisplay.tsx‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
1-
import registerDSLanguage, {
2-
DS_DARK_THEME_NAME,
3-
DS_LANGUAGE_NAME,
4-
DS_THEME_NAME,
5-
} from "../spicedb-common/lang/dslang";
6-
import { TextRange } from "../spicedb-common/include/protobuf-parser";
7-
import { RelationshipFound } from "../spicedb-common/parsing";
8-
import {
9-
DeveloperError,
10-
DeveloperWarning,
11-
} from "../spicedb-common/protodefs/developer/v1/developer_pb";
1+
import "react-reflex/styles.css";
2+
123
import { createStyles, makeStyles } from "@material-ui/core/styles";
134
import useMediaQuery from "@material-ui/core/useMediaQuery";
145
import Editor, { DiffEditor, useMonaco } from "@monaco-editor/react";
6+
import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
7+
import { useNavigate, useLocation } from "@tanstack/react-router";
158
import lineColumn from "line-column";
169
import monaco from "monaco-editor";
1710
import { useEffect, useMemo, useRef, useState } from "react";
1811
import { flushSync } from "react-dom";
19-
import "react-reflex/styles.css";
20-
import { useNavigate, useLocation } from "@tanstack/react-router";
12+
2113
import { ScrollLocation, useCookieService } from "../services/cookieservice";
2214
import { DataStore, DataStoreItem, DataStoreItemKind } from "../services/datastore";
2315
import { LocalParseState } from "../services/localparse";
2416
import { Services } from "../services/services";
17+
import { TextRange } from "../spicedb-common/include/protobuf-parser";
18+
import registerDSLanguage, {
19+
DS_DARK_THEME_NAME,
20+
DS_LANGUAGE_NAME,
21+
DS_THEME_NAME,
22+
} from "../spicedb-common/lang/dslang";
23+
import { RelationshipFound } from "../spicedb-common/parsing";
24+
import {
25+
DeveloperError,
26+
DeveloperWarning,
27+
} from "../spicedb-common/protodefs/developer/v1/developer_pb";
28+
2529
import { ERROR_SOURCE_TO_ITEM } from "./panels/errordisplays";
2630
import registerTupleLanguage, {
2731
TUPLE_DARK_THEME_NAME,
2832
TUPLE_LANGUAGE_NAME,
2933
TUPLE_THEME_NAME,
3034
} from "./tuplelang";
31-
import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
3235

3336
const useStyles = makeStyles(() =>
3437
createStyles({

‎src/components/EmbeddedPlayground.tsx‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
import { DS_EMBED_DARK_THEME_NAME } from "../spicedb-common/lang/dslang";
2-
import { RelationshipFound, parseRelationship } from "../spicedb-common/parsing";
3-
import {
4-
CheckOperationParametersSchema,
5-
CheckOperationsResult,
6-
CheckOperationsResult_Membership,
7-
CheckOperationsResultSchema,
8-
} from "../spicedb-common/protodefs/developer/v1/developer_pb";
9-
import { useDeveloperService } from "../spicedb-common/services/developerservice";
1+
import "./fonts.css";
2+
3+
import type { ParsedObjectDefinition } from "@authzed/spicedb-parser-js";
4+
import { create } from "@bufbuild/protobuf";
105
import {
116
faCaretDown,
127
faDatabase,
@@ -22,22 +17,29 @@ import ErrorOutlineIcon from "@material-ui/icons/ErrorOutline";
2217
import HelpOutlineIcon from "@material-ui/icons/HelpOutline";
2318
import clsx from "clsx";
2419
import React, { PropsWithChildren, useEffect, useMemo, useState } from "react";
20+
import { toast } from "sonner";
21+
2522
import { useLiveCheckService } from "../services/check";
2623
import AppConfig from "../services/configservice";
2724
import { DataStore, DataStoreItemKind, useReadonlyDatastore } from "../services/datastore";
2825
import { useLocalParseService } from "../services/localparse";
2926
import { useProblemService } from "../services/problem";
3027
import { Services } from "../services/services";
3128
import { useValidationService } from "../services/validation";
29+
import { DS_EMBED_DARK_THEME_NAME } from "../spicedb-common/lang/dslang";
30+
import { RelationshipFound, parseRelationship } from "../spicedb-common/parsing";
31+
import {
32+
CheckOperationParametersSchema,
33+
CheckOperationsResult,
34+
CheckOperationsResult_Membership,
35+
CheckOperationsResultSchema,
36+
} from "../spicedb-common/protodefs/developer/v1/developer_pb";
37+
import { useDeveloperService } from "../spicedb-common/services/developerservice";
38+
3239
import { DatastoreRelationshipEditor } from "./DatastoreRelationshipEditor";
3340
import { EditorDisplay } from "./EditorDisplay";
3441
import { ShareLoader } from "./ShareLoader";
3542

36-
import type { ParsedObjectDefinition } from "@authzed/spicedb-parser-js";
37-
import "./fonts.css";
38-
import { create } from "@bufbuild/protobuf";
39-
import { toast } from "sonner";
40-
4143
const useStyles = makeStyles(() =>
4244
createStyles({
4345
root: {

‎src/components/ExamplesDropdown.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { Example, LoadExamples } from "../spicedb-common/examples";
2-
3-
import { Select, SelectContent, SelectItem, SelectTrigger } from "@/components/ui/select";
1+
import { usePostHog } from "@posthog/react";
2+
import { useEffect, useState } from "react";
43

54
import {
65
AlertDialog,
@@ -12,9 +11,9 @@ import {
1211
AlertDialogHeader,
1312
AlertDialogTitle,
1413
} from "@/components/ui/alert-dialog";
14+
import { Select, SelectContent, SelectItem, SelectTrigger } from "@/components/ui/select";
1515

16-
import { useEffect, useState } from "react";
17-
import { usePostHog } from "@posthog/react";
16+
import { Example, LoadExamples } from "../spicedb-common/examples";
1817

1918
export function ExamplesDropdown({
2019
disabled,

‎src/components/FullPlayground.tsx‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
import { useEffect, useMemo, useState, type ReactNode, type ChangeEvent } from "react";
1+
import "react-reflex/styles.css";
22

3-
import { DiscordChatCrate } from "../playground-ui/DiscordChatCrate";
4-
import { useGoogleAnalytics } from "../playground-ui/GoogleAnalyticsHook";
5-
import TabLabel from "../playground-ui/TabLabel";
6-
import { Example } from "../spicedb-common/examples";
7-
import { useDeveloperService } from "../spicedb-common/services/developerservice";
8-
import { useZedTerminalService } from "../spicedb-common/services/zedterminalservice";
9-
import { parseValidationYAML } from "../spicedb-common/validationfileformat";
103
import { LinearProgress, Tab, Tabs } from "@material-ui/core";
114
import AppBar from "@material-ui/core/AppBar";
12-
import { Button } from "@/components/ui/button";
13-
import { ButtonGroup } from "@/components/ui/button-group";
14-
import TextField from "@material-ui/core/TextField";
155
import { Theme, createStyles, darken, makeStyles } from "@material-ui/core/styles";
166
import { alpha } from "@material-ui/core/styles/colorManipulator";
7+
import TextField from "@material-ui/core/TextField";
178
import useMediaQuery from "@material-ui/core/useMediaQuery";
189
import CheckCircleIcon from "@material-ui/icons/CheckCircle";
1910
import CodeIcon from "@material-ui/icons/Code";
@@ -26,17 +17,25 @@ import HighlightOffIcon from "@material-ui/icons/HighlightOff";
2617
import InsertDriveFileIcon from "@material-ui/icons/InsertDriveFile";
2718
import RefreshIcon from "@material-ui/icons/Refresh";
2819
import ShareIcon from "@material-ui/icons/Share";
29-
import { Alert, AlertTitle } from "./ui/alert";
30-
import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
20+
import { useNavigate, useLocation } from "@tanstack/react-router";
3121
import clsx from "clsx";
3222
import { saveAs } from "file-saver";
3323
import { fileDialog } from "file-select-dialog";
24+
import { CircleX, MessageCircleWarning } from "lucide-react";
25+
import { useEffect, useMemo, useState, type ReactNode, type ChangeEvent } from "react";
3426
import { useCookies } from "react-cookie";
35-
import "react-reflex/styles.css";
36-
import { useNavigate, useLocation } from "@tanstack/react-router";
3727
import sjcl from "sjcl";
28+
import { toast } from "sonner";
3829
import { useKeyboardShortcuts } from "use-keyboard-shortcuts";
30+
31+
import { Button } from "@/components/ui/button";
32+
import { ButtonGroup } from "@/components/ui/button-group";
33+
import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
34+
3935
import DISCORD from "../assets/discord.svg?react";
36+
import { DiscordChatCrate } from "../playground-ui/DiscordChatCrate";
37+
import { useGoogleAnalytics } from "../playground-ui/GoogleAnalyticsHook";
38+
import TabLabel from "../playground-ui/TabLabel";
4039
import { useLiveCheckService } from "../services/check";
4140
import AppConfig from "../services/configservice";
4241
import { RelationshipsEditorType, useCookieService } from "../services/cookieservice";
@@ -52,23 +51,27 @@ import { ProblemService, useProblemService } from "../services/problem";
5251
import { Services } from "../services/services";
5352
import { ValidationResult, ValidationStatus, useValidationService } from "../services/validation";
5453
import { createValidationYAML, normalizeValidationYAML } from "../services/validationfileformat";
54+
import { Example } from "../spicedb-common/examples";
55+
import { useDeveloperService } from "../spicedb-common/services/developerservice";
56+
import { useZedTerminalService } from "../spicedb-common/services/zedterminalservice";
57+
import { parseValidationYAML } from "../spicedb-common/validationfileformat";
58+
5559
import { DatastoreRelationshipEditor } from "./DatastoreRelationshipEditor";
5660
import { EditorDisplay, EditorDisplayProps } from "./EditorDisplay";
5761
import { ExamplesDropdown } from "./ExamplesDropdown";
5862
import { GuidedTour, TourElementClass } from "./GuidedTour";
5963
import { AT, ET, NS, VL } from "./KindIcons";
6064
import { NormalLogo, SmallLogo } from "./Logos";
61-
import { ShareLoader } from "./ShareLoader";
62-
import { ValidateButton } from "./ValidationButton";
6365
import { Panel, useSummaryStyles } from "./panels/base/common";
6466
import { ReflexedPanelDisplay } from "./panels/base/reflexed";
6567
import { ProblemsPanel, ProblemsSummary } from "./panels/problems";
6668
import { TerminalPanel, TerminalSummary } from "./panels/terminal";
6769
import { ValidationPanel, ValidationSummary } from "./panels/validation";
6870
import { VisualizerPanel, VisualizerSummary } from "./panels/visualizer";
6971
import { WatchesPanel, WatchesSummary } from "./panels/watches";
70-
import { toast } from "sonner";
71-
import { CircleX, MessageCircleWarning } from "lucide-react";
72+
import { ShareLoader } from "./ShareLoader";
73+
import { Alert, AlertTitle } from "./ui/alert";
74+
import { ValidateButton } from "./ValidationButton";
7275

7376
const TOOLBAR_BREAKPOINT = 1550; // pixels
7477

0 commit comments

Comments
 (0)