Fixed import inconsistencies

GuilhermeF03 · GuilhermeF03 · commit f7fafd73e5ad · 2024-05-15T14:12:13.000+01:00
diff --git a/code/client/src/domain/editor/crdt/fugue.ts b/code/client/src/domain/editor/crdt/fugue.ts
@@ -1,6 +1,6 @@
-import { type Id } from '@notespace/shared/src/document/types/nodes.ts';
+import { type Id } from '@notespace/shared/src/document/types/nodes';
 import { BlockStyle, InlineStyle } from '@notespace/shared/src/document/types/styles';
-import { FugueTree } from '@notespace/shared/src/document/FugueTree.ts';
+import { FugueTree } from '@notespace/shared/src/document/FugueTree';
 import { generateReplicaId, nodeInsert } from './utils';
 import { type FugueNode, type NodeInsert } from '@domain/editor/crdt/types';
 import { Cursor, Selection } from '@notespace/shared/src/document/types/cursor';
@@ -12,7 +12,7 @@ import {
   InsertOperation,
   Operation,
   ReviveOperation,
-} from '@notespace/shared/src/document/types/operations.ts';
+} from '@notespace/shared/src/document/types/operations';
 
 /**
  * Class that represents a local replica of a FugueTree
diff --git a/code/client/src/domain/editor/crdt/types.d.ts b/code/client/src/domain/editor/crdt/types.d.ts
@@ -1,5 +1,5 @@
 import { type InlineStyle } from '@notespace/shared/src/document/types/styles';
-import { NodeType } from '@notespace/shared/src/document/types/nodes.ts';
+import { NodeType } from '@notespace/shared/src/document/types/nodes';
 
 export type NodeInsert = {
   value: string;
diff --git a/code/client/src/domain/editor/operations/fugue/operations.ts b/code/client/src/domain/editor/operations/fugue/operations.ts
@@ -1,6 +1,6 @@
 import { Fugue } from '@domain/editor/crdt/fugue';
 import { FugueDomainOperations } from '@domain/editor/operations/fugue/types';
-import { Operation } from '@notespace/shared/src/document/types/operations.ts';
+import { Operation } from '@notespace/shared/src/document/types/operations';
 
 export default (fugue: Fugue): FugueDomainOperations => {
   const applyOperations = (operations: Operation[]) => fugue.applyOperations(operations);
diff --git a/code/client/src/domain/editor/operations/fugue/types.d.ts b/code/client/src/domain/editor/operations/fugue/types.d.ts
@@ -1,4 +1,4 @@
-import { Operation } from '@notespace/shared/src/document/types/operations.ts';
+import { Operation } from '@notespace/shared/src/document/types/operations';
 
 export type FugueDomainOperations = {
   applyOperations: (operations: Operation[]) => void;
diff --git a/code/client/src/domain/editor/operations/input/operations.ts b/code/client/src/domain/editor/operations/input/operations.ts
@@ -4,7 +4,7 @@ import { InputDomainOperations } from '@domain/editor/operations/input/types';
 import { Cursor, Selection } from '@notespace/shared/src/document/types/cursor';
 import { nodeInsert } from '@domain/editor/crdt/utils';
 import { InlineStyle } from '@notespace/shared/src/document/types/styles';
-import { Operation } from '@notespace/shared/src/document/types/operations.ts';
+import { Operation } from '@notespace/shared/src/document/types/operations';
 import { Communication } from '@services/communication/communication';
 
 export default (fugue: Fugue, { socket }: Communication): InputDomainOperations => {
diff --git a/code/client/src/domain/editor/operations/markdown/operations.ts b/code/client/src/domain/editor/operations/markdown/operations.ts
@@ -5,7 +5,7 @@ import { Selection } from '@notespace/shared/src/document/types/cursor';
 import { MarkdownDomainOperations } from '@domain/editor/operations/markdown/types';
 import { deleteAroundSelection } from '@domain/editor/operations/markdown/utils';
 import { Communication } from '@services/communication/communication';
-import { Operation } from '@notespace/shared/src/document/types/operations.ts';
+import { Operation } from '@notespace/shared/src/document/types/operations';
 import { isSelectionEmpty } from '@domain/editor/slate/utils/selection';
 
 /**
diff --git a/code/client/src/domain/editor/operations/markdown/utils.ts b/code/client/src/domain/editor/operations/markdown/utils.ts
@@ -1,6 +1,6 @@
 import { Fugue } from '@domain/editor/crdt/fugue';
-import { DeleteOperation } from '@notespace/shared/src/document/types/operations.ts';
-import { Id } from '@notespace/shared/src/document/types/nodes.ts';
+import { DeleteOperation } from '@notespace/shared/src/document/types/operations';
+import { Id } from '@notespace/shared/src/document/types/nodes';
 import { Selection } from '@notespace/shared/src/document/types/cursor';
 
 /**
diff --git a/code/client/src/domain/workspaces/tree/WorkspaceTree.ts b/code/client/src/domain/workspaces/tree/WorkspaceTree.ts
@@ -1,4 +1,4 @@
-import { ResourceType, WorkspaceResourceMetadata } from '@notespace/shared/src/workspace/types/resource.ts';
+import { ResourceType, WorkspaceResourceMetadata } from '@notespace/shared/src/workspace/types/resource';
 
 type WorkspaceTreeNode = WorkspaceResourceMetadata;
 
diff --git a/code/client/src/domain/workspaces/tree/useWorkspaceTree.ts b/code/client/src/domain/workspaces/tree/useWorkspaceTree.ts
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { WorkspaceTree } from '@domain/workspaces/tree/WorkspaceTree.ts';
+import { WorkspaceTree } from '@domain/workspaces/tree/WorkspaceTree';
 
 function useWorkspaceTree() {
   return useMemo(() => new WorkspaceTree(), []);
diff --git a/code/client/src/pwa/pwa-config.ts b/code/client/src/pwa/pwa-config.ts
@@ -1,7 +1,7 @@
-//import { injectConfig } from './inject-config.ts';
-import { manifestConfig } from './manifest-config.ts';
+//import { injectConfig } from './inject-config';
+import { manifestConfig } from '@pwa/manifest-config';
 import { VitePWAOptions } from 'vite-plugin-pwa';
-import { workboxConfig } from './workbox-config.ts';
+import { workboxConfig } from '@pwa/workbox-config';
 
 export const pwaConfig: Partial<VitePWAOptions> = {
   mode: 'development',
diff --git a/code/client/src/pwa/workbox-config.ts b/code/client/src/pwa/workbox-config.ts
@@ -47,6 +47,6 @@ export const workboxConfig: Partial<GenerateSWOptions> = {
       },
     },
   ],
-  //importScripts: ['./service-worker.ts'],
+  //importScripts: ['./service-worker'],
   //cleanupOutdatedCaches: true,
 };
diff --git a/code/client/src/services/communication/communication.ts b/code/client/src/services/communication/communication.ts
@@ -1,5 +1,5 @@
-import { socketCommunication, SocketCommunication } from '@services/communication/socket/socketCommunication.ts';
-import { httpCommunication, HttpCommunication } from '@services/communication/http/httpCommunication.ts';
+import { socketCommunication, SocketCommunication } from '@services/communication/socket/socketCommunication';
+import { httpCommunication, HttpCommunication } from '@services/communication/http/httpCommunication';
 
 export interface Communication {
   socket: SocketCommunication;
diff --git a/code/client/src/services/communication/http/httpCommunication.ts b/code/client/src/services/communication/http/httpCommunication.ts
@@ -1,4 +1,4 @@
-import config from '@/config.ts';
+import config from '@/config';
 
 export const BASE_URL = config.HTTP_SERVER_URL;
 
diff --git a/code/client/src/services/communication/socket/operationEmitter.ts b/code/client/src/services/communication/socket/operationEmitter.ts
@@ -1,4 +1,4 @@
-import { Operation } from '@notespace/shared/src/document/types/operations.ts';
+import { Operation } from '@notespace/shared/src/document/types/operations';
 import { isEmpty, range } from 'lodash';
 import { Socket } from 'socket.io-client';
 
diff --git a/code/client/src/services/communication/socket/socketCommunication.ts b/code/client/src/services/communication/socket/socketCommunication.ts
@@ -1,6 +1,6 @@
 import { io } from 'socket.io-client';
-import config from '@/config.ts';
-import { OperationEmitter } from '@services/communication/socket/operationEmitter.ts';
+import config from '@/config';
+import { OperationEmitter } from '@services/communication/socket/operationEmitter';
 
 type EmitType = (event: string, data?: any) => void;
 type ListenType = (eventHandlers: SocketEventHandlers) => void;
diff --git a/code/client/src/services/communication/socket/useSocketListeners.ts b/code/client/src/services/communication/socket/useSocketListeners.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { SocketCommunication, SocketEventHandlers } from '@services/communication/socket/socketCommunication.ts';
+import { SocketCommunication, SocketEventHandlers } from '@services/communication/socket/socketCommunication';
 
 function useSocketListeners(socket: SocketCommunication, eventHandlers: SocketEventHandlers) {
   useEffect(() => {
diff --git a/code/client/src/services/resource/resourceService.ts b/code/client/src/services/resource/resourceService.ts
@@ -1,5 +1,5 @@
-import { HttpCommunication } from '@services/communication/http/httpCommunication.ts';
-import { ResourceInputModel, ResourceType, WorkspaceResource } from '@notespace/shared/src/workspace/types/resource.ts';
+import { HttpCommunication } from '@services/communication/http/httpCommunication';
+import { ResourceInputModel, ResourceType, WorkspaceResource } from '@notespace/shared/src/workspace/types/resource';
 
 function resourceService(http: HttpCommunication, wid: string) {
   async function getResource(id: string): Promise<WorkspaceResource> {
diff --git a/code/client/src/services/resource/useResourceService.ts b/code/client/src/services/resource/useResourceService.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
-import { useCommunication } from '@ui/contexts/communication/useCommunication.ts';
+import { useCommunication } from '@ui/contexts/communication/useCommunication';
 import { useParams } from 'react-router-dom';
-import resourceService from '@services/resource/resourceService.ts';
+import resourceService from '@services/resource/resourceService';
 
 function useResourceService() {
   const { http } = useCommunication();
diff --git a/code/client/src/services/workspace/useWorkspaceService.ts b/code/client/src/services/workspace/useWorkspaceService.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
-import { useCommunication } from '@ui/contexts/communication/useCommunication.ts';
-import workspaceService from '@services/workspace/workspaceService.ts';
+import { useCommunication } from '@ui/contexts/communication/useCommunication';
+import workspaceService from '@services/workspace/workspaceService';
 
 function useWorkspaceService() {
   const { http } = useCommunication();
diff --git a/code/client/src/services/workspace/workspaceService.ts b/code/client/src/services/workspace/workspaceService.ts
@@ -1,6 +1,6 @@
-import { HttpCommunication } from '@services/communication/http/httpCommunication.ts';
-import { WorkspaceInputModel, WorkspaceMetaData } from '@notespace/shared/src/workspace/types/workspace.ts';
-import { Workspace } from '@notespace/shared/src/workspace/types/workspace.ts';
+import { HttpCommunication } from '@services/communication/http/httpCommunication';
+import { WorkspaceInputModel, WorkspaceMetaData } from '@notespace/shared/src/workspace/types/workspace';
+import { Workspace } from '@notespace/shared/src/workspace/types/workspace';
 
 function workspaceService(http: HttpCommunication) {
   async function getWorkspace(id: string): Promise<Workspace> {
diff --git a/code/client/src/ui/contexts/communication/useCommunication.ts b/code/client/src/ui/contexts/communication/useCommunication.ts
@@ -1,4 +1,4 @@
-import { Communication } from '@services/communication/communication.ts';
+import { Communication } from '@services/communication/communication';
 import { useContext } from 'react';
 import { CommunicationContext } from '@ui/contexts/communication/CommunicationContext.tsx';
 
diff --git a/code/client/src/ui/contexts/workspace/useResources.ts b/code/client/src/ui/contexts/workspace/useResources.ts
@@ -1,7 +1,7 @@
-import { ResourceType, WorkspaceResource } from '@notespace/shared/src/workspace/types/resource.ts';
-import useResourceService from '@services/resource/useResourceService.ts';
-import useSocketListeners from '@services/communication/socket/useSocketListeners.ts';
-import { useCommunication } from '@ui/contexts/communication/useCommunication.ts';
+import { ResourceType, WorkspaceResource } from '@notespace/shared/src/workspace/types/resource';
+import useResourceService from '@services/resource/useResourceService';
+import useSocketListeners from '@services/communication/socket/useSocketListeners';
+import { useCommunication } from '@ui/contexts/communication/useCommunication';
 import { useState } from 'react';
 
 function useResources() {
diff --git a/code/client/src/ui/pages/document/components/editor/hooks/useEvents.ts b/code/client/src/ui/pages/document/components/editor/hooks/useEvents.ts
@@ -1,5 +1,5 @@
 import useSocketListeners from '@services/communication/socket/useSocketListeners';
-import { type Operation } from '@notespace/shared/src/document/types/operations.ts';
+import { type Operation } from '@notespace/shared/src/document/types/operations';
 import { Communication } from '@services/communication/communication';
 import { FugueDomainOperations } from '@domain/editor/operations/fugue/types';
 
diff --git a/code/client/src/ui/pages/document/components/editor/hooks/useRenderers.ts b/code/client/src/ui/pages/document/components/editor/hooks/useRenderers.ts
@@ -4,7 +4,7 @@ import { getElementRenderer, getLeafRenderer } from '@domain/editor/slate/plugin
 import { Editor } from 'slate';
 import { Fugue } from '@domain/editor/crdt/fugue';
 import { BlockStyle } from '@notespace/shared/src/document/types/styles';
-import { Communication } from '@services/communication/communication.ts';
+import { Communication } from '@services/communication/communication';
 
 /**
  * Returns the renderers for the editor.
diff --git a/code/client/src/ui/pages/home/hooks/useWorkspaces.ts b/code/client/src/ui/pages/home/hooks/useWorkspaces.ts
@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
-import { WorkspaceInputModel, WorkspaceMetaData } from '@notespace/shared/src/workspace/types/workspace.ts';
-import useSocketListeners from '@services/communication/socket/useSocketListeners.ts';
-import { useCommunication } from '@ui/contexts/communication/useCommunication.ts';
-import useWorkspaceService from '@services/workspace/useWorkspaceService.ts';
+import { WorkspaceInputModel, WorkspaceMetaData } from '@notespace/shared/src/workspace/types/workspace';
+import useSocketListeners from '@services/communication/socket/useSocketListeners';
+import { useCommunication } from '@ui/contexts/communication/useCommunication';
+import useWorkspaceService from '@services/workspace/useWorkspaceService';
 
 function useWorkspaces() {
   const { socket } = useCommunication();
diff --git a/code/client/tests/editor/crdt/fugue.test.ts b/code/client/tests/editor/crdt/fugue.test.ts
@@ -4,7 +4,7 @@ import {
   DeleteOperation,
   InlineStyleOperation,
   BlockStyleOperation,
-} from '@notespace/shared/src/document/types/operations.ts';
+} from '@notespace/shared/src/document/types/operations';
 import { Selection, Cursor } from '@notespace/shared/src/document/types/cursor';
 import { describe, test, expect, beforeEach } from 'vitest';
 import { FugueNode } from '@domain/editor/crdt/types';
diff --git a/code/client/tests/editor/crdt/tree.test.ts b/code/client/tests/editor/crdt/tree.test.ts
@@ -1,8 +1,8 @@
-import { FugueTree } from '@notespace/shared/src/document/FugueTree.ts';
-import { InsertOperation } from '@notespace/shared/src/document/types/operations.ts';
+import { FugueTree } from '@notespace/shared/src/document/FugueTree';
+import { InsertOperation } from '@notespace/shared/src/document/types/operations';
 import { describe, test, expect, beforeEach } from 'vitest';
 import { FugueNode } from '@domain/editor/crdt/types';
-import { Node, Nodes } from '@notespace/shared/src/document/types/nodes.ts';
+import { Node, Nodes } from '@notespace/shared/src/document/types/nodes';
 
 describe('FugueTree', () => {
   let tree: FugueTree<string>;
diff --git a/code/client/tests/editor/domain/document/fugueOperations.test.ts b/code/client/tests/editor/domain/document/fugueOperations.test.ts
@@ -5,11 +5,11 @@ import {
   DeleteOperation,
   InlineStyleOperation,
   BlockStyleOperation,
-} from '@notespace/shared/src/document/types/operations.ts';
+} from '@notespace/shared/src/document/types/operations';
 import getFugueOperations from '@domain/editor/operations/fugue/operations';
 import { FugueDomainOperations } from '@domain/editor/operations/fugue/types';
-import { Document } from '@notespace/shared/src/workspace/types/document.ts';
-import { Node, RootNode } from '@notespace/shared/src/document/types/nodes.ts';
+import { Document } from '@notespace/shared/src/workspace/types/document';
+import { Node, RootNode } from '@notespace/shared/src/document/types/nodes';
 import { rootNode, treeNode } from '@notespace/shared/src/document/utils';
 
 describe('Fugue Operations', () => {
diff --git a/code/client/tsconfig.json b/code/client/tsconfig.json
@@ -7,7 +7,6 @@
     "skipLibCheck": false,
     "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
-    "allowImportingTsExtensions": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ES2022",
@@ -24,13 +23,13 @@
     "paths": {
       "@ui/*": ["./ui/*"],
       "@pwa/*": ["./pwa/*"],
+      "@services/*": ["./services/*"],
       "@domain/*": ["./domain/*"],
       "@assets/*": ["./assets/*"],
       "@tests/*": ["../tests/*"],
       "@/*": ["./*"]
     }
   },
   "include": ["src", "tests"],
-  "exclude": ["vite.config.ts"],
-  "references": [{ "path": "./tsconfig.node.json" }]
+  "exclude": ["vite.config.ts"]
 }
diff --git a/code/client/tsconfig.node.json b/code/client/tsconfig.node.json
@@ -5,6 +5,7 @@
     "module": "ESNext",
     "moduleResolution": "NodeNext",
     "allowImportingTsExtensions": true,
+    "baseUrl": "./src",
     "paths": {
       "@/*": ["./*"],
       "@domain/*": ["./domain/*"],
diff --git a/code/client/vite.config.ts b/code/client/vite.config.ts
@@ -7,7 +7,6 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 import { qrcode } from 'vite-plugin-qrcode';
 import { config } from 'dotenv';
 // import { VitePWA } from 'vite-plugin-pwa';
-// import { pwaConfig } from './src/pwa/pwa-config.ts';
 
 config();
 
diff --git a/code/server/tsconfig.json b/code/server/tsconfig.json
@@ -10,14 +10,14 @@
     "strict": true,
     "skipLibCheck": true,
     "downlevelIteration": true,
-    "baseUrl": "./",
+    "baseUrl": "./src",
     "paths": {
-      "@/*": ["./*"],
-      "@src/*": ["./src/ts/*"],
-      "@controllers/*": ["./src/ts/controllers/*"],
-      "@databases/*": ["./src/ts/databases/*"],
-      "@domain/*": ["./src/ts/domain/*"],
-      "@services/*": ["./src/ts/services/*"]
+      "@/*": ["../*"],
+      "@src/*": ["./ts/*"],
+      "@controllers/*": ["./ts/controllers/*"],
+      "@databases/*": ["./ts/databases/*"],
+      "@domain/*": ["./ts/domain/*"],
+      "@services/*": ["./ts/services/*"]
     }
   },
   "include": ["src/**/*"],
diff --git a/code/shared/tsconfig.json b/code/shared/tsconfig.json
@@ -14,5 +14,5 @@
     "skipLibCheck": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "**/__test__/**"]
+  "exclude": ["node_modules"]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Operation } from '@notespace/shared/src/document/types/operations.ts';`
	`1`	`+import { Operation } from '@notespace/shared/src/document/types/operations';`
`2`	`2`
`3`	`3`	`export type FugueDomainOperations = {`
`4`	`4`	`applyOperations: (operations: Operation[]) => void;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ResourceType, WorkspaceResourceMetadata } from '@notespace/shared/src/workspace/types/resource.ts';`
	`1`	`+import { ResourceType, WorkspaceResourceMetadata } from '@notespace/shared/src/workspace/types/resource';`
`2`	`2`
`3`	`3`	`type WorkspaceTreeNode = WorkspaceResourceMetadata;`
`4`	`4`